aragonc 9 years ago
parent
commit
3178b0fce3

+ 61 - 2
app/Resources/public/css/base.css

@@ -2089,8 +2089,9 @@ div.system_announcement {
 }
 
 .RequirementHeading, .RequirementText, .RequirementContent  {
-    margin-top:12px;
-    line-height: 18px;
+  margin-top:12px;
+  line-height: 18px;
+  margin-bottom: 20px;
 }
 
 #toolshortcuts_horizontal {
@@ -5928,6 +5929,64 @@ div#chat-remote-video video {
 #children .parent .big-icon .sequence-deleted{
   font-size: 12px;
 }
+/* INSTALL CHAMILO */
+#page-install .logo{
+  text-align: center;
+}
+#page-install .icon-install{
+  text-align: center;
+}
+#page-install .title{
+  text-align: center;
+  color:#2E75A3;
+}
+#page-install .text{
+  text-align: center;
+}
+#page-install .download-info{
+  padding-top: 10px;
+  text-align: center;
+}
+.RequirementHeading h2{
+  font-size: 25px;
+}
+#page-install{
+  background: #d2ebf9; /* Old browsers */
+  background: -moz-linear-gradient(top, #d2ebf9 0%, #feffff 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d2ebf9), color-stop(100%,#feffff)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #d2ebf9 0%,#feffff 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #d2ebf9 0%,#feffff 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #d2ebf9 0%,#feffff 100%); /* IE10+ */
+  background: linear-gradient(to bottom, #d2ebf9 0%,#feffff 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#d2ebf9', endColorstr='#feffff',GradientType=0 ); /* IE6-9 */
+}
+#page-install footer{
+  color: #666666;
+}
+#page-install footer a{
+  color: #333333;
+}
+#page-install footer a:hover{
+  color: #666666;
+}
+#page-install pre{
+  margin-top: 5px !important;
+}
+#page-install .page-header{
+  margin: 20px 0px 20px;
+}
+#page-install .normal-message{
+  padding: 20px;
+  margin: 20px 0;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-width: 1px 1px 1px 5px;
+  border-color: #eeeeee;
+  border-style: solid;
+  font-size: 12px;
+  color: #666666;
+}
 #about-session .description-course{
   padding: 10px;
   color: #666666;

File diff suppressed because it is too large
+ 205 - 188
main/coursecopy/classes/CourseBuilder.class.php


BIN
main/img/install-chamilo.gif


+ 78 - 67
main/inc/global_error_message.inc.php

@@ -56,15 +56,18 @@ if (is_int($global_error_code) && $global_error_code > 0) {
         $theme = 'chamilo';
     }
 
-	$css_path = 'app/Resources/public/css/';
+	//$css_path = 'app/Resources/public/css/';
+
 	$themePath = $css_path.'themes/'.$theme.'/';
 
-	$css_web_path = 'web/assets/';
-	$bootstrap_file = $css_web_path.'bootstrap/dist/css/bootstrap.min.css';
-	$css_base_file = $css_path.'base.css';
+	$css_web_assets = 'web/assets/';
+    $css_web_fontawesome = $css_web_assets.'fontawesome/css/font-awesome.css';
+    $css_web_path = 'web/css/';
+	$bootstrap_file = $css_web_assets.'bootstrap/dist/css/bootstrap.min.css';
+	$css_base_file = $css_web_path.'base.css';
 
     $css_list = array($bootstrap_file, $css_base_file);
-
+    $web_img = 'main/img';
 	$root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/';
 	$root_rel = htmlentities($_SERVER['PHP_SELF']);
 	if (!empty($root_rel)) {
@@ -122,13 +125,17 @@ if (is_int($global_error_code) && $global_error_code > 0) {
 			}
 			$read_installation_guide = substr($InstallationDescription, $pos + 2);
 			$InstallationDescription = '<form action="'.$root_rel.'main/install/index.php" method="get">
-										<div class="install-mascot">
-                                        <p class="download-info">
-                                            <button class="btn btn-primary btn-large" type="submit" value="INSTALL Chamilo" >INSTALL Chamilo</button>
-                                            <a class="btn btn-default btn-large" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>
-                                        </p>
-                                        </div>
-										</form>';
+			<div class="row"><div class="col-md-12">
+
+                    <div class="office">
+                    <h2 class="title">Welcome to the Chamilo installation wizard</h2>
+                    <p class="text">Let\'s start hunting knowledge down with Chamilo LMS. The installation wizard will guide you through the Chamilo installation and configuration process.</p>
+                          <p class="download-info">
+                              <button class="btn btn-primary btn-lg" type="submit" value="INSTALL Chamilo" ><i class="fa fa-download"></i> Install Chamilo</button>
+                              <a class="btn btn-success btn-lg" href="'.$installation_guide_url.'" target="_blank"> <i class="fa fa-file-text-o"></i> '.$read_installation_guide.'</a>
+                          </p>
+                    </div>
+            </form>';
 			$global_error_message['description'] = $InstallationDescription;
 			break;
 		case 3:
@@ -158,7 +165,10 @@ if (is_int($global_error_code) && $global_error_code > 0) {
 	$global_error_message['powered_by'] = $PoweredBy;
 
 	$global_error_message['encoding'] = 'UTF-8';
-	$global_error_message['css'] = $css_def;
+	$global_error_message['css'] = $css_base_file;
+    $global_error_message['fontawesome'] = $css_web_fontawesome;
+    $global_error_message['bootstrap'] = $bootstrap_file;
+    $global_error_message['theme'] = $css_web_path.'themes/'.$theme.'/default.css';
 	$global_error_message['chamilo_logo'] = $css_web_path.'themes/'.$theme.'/images/header-logo.png';
 
 
@@ -170,64 +180,65 @@ if (is_int($global_error_code) && $global_error_code > 0) {
 		<head>
 			<title>{TITLE}</title>
             <meta charset="{ENCODING}" />
-			<style type="text/css" media="screen, projection">
-				/*<![CDATA[*/
-				{CSS}
-				/*]]>*/
-			</style>
+            <link rel="stylesheet" href="{BOOTSTRAP}">
+            <link rel="stylesheet" href="{FONTAWESOME}">
+            <link rel="stylesheet" href="{CSS}">
+            <link rel="stylesheet" href="{THEME}">
+            <style type="text/css">
+                    body{
+                        background: #d2ebf9; /* Old browsers */
+background: -moz-linear-gradient(top, #d2ebf9 0%, #feffff 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d2ebf9), color-stop(100%,#feffff)); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, #d2ebf9 0%,#feffff 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, #d2ebf9 0%,#feffff 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, #d2ebf9 0%,#feffff 100%); /* IE10+ */
+background: linear-gradient(to bottom, #d2ebf9 0%,#feffff 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#d2ebf9', endColorstr='#feffff',GradientType=0 ); /* IE6-9 */
+                    }
+                    .chamilo{
+                        background: url("$web_img/install-chamilo.gif") no-repeat center 0;
+                        margin:auto;
+                    }
+                    .office{
+                        padding-top:250px;
+                    }
+
+                    @media (max-width: 480px) {
+                    body{
+                        background-image: url("$web_img/install-chamilo.gif");
+                        background-repeat: no-repeat;
+                        background-position: -10px -5px;
+                        background-color: #DFF1FA;
+
+                     }
+                     .chamilo{
+                        background: none;
+                        height:300px;
+                        width:100%;
+                        margin:auto;
+                        }
+                     .download-info .btn-success{
+                            margin-top: 10px;
+                     }
+                }
+            </style>
 		</head>
 		<body>
-		<div id="page-wrap">
-			<header>
-				<section id="menu-bar">
-					<nav class="navbar navbar-default">
-					<div class="container">
-						<div class="navbar-header">
-						    <a class="navbar-brand" href="#">Chamilo</a>
-							<button type="button" class="navbar-toggle btn" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="true">
-								<span class="sr-only">Toggle navigation</span>
-								<span class="icon-bar"></span>
-								<span class="icon-bar"></span>
-								<span class="icon-bar"></span>
-							</button>
-						</div>
-						<!-- Collect the nav links, forms, and other content for toggling -->
-						<div class="navbar-collapse collapse in" id="bs-example-navbar-collapse-1" aria-expanded="true">
-							<ul class="nav navbar-nav">
-								<li id="current" class="active tab-homepage">
-								<a target="_top" href="index.php">Homepage</a>
-								</li>
-							</ul>
-						</div><!-- /.navbar-collapse -->
-					</div><!-- /.container-fluid -->
-				</nav>
-				</section>
-                <!--
-				<section id="breadcrumb-bar">
-					<div class="container">
-						<ul class="breadcrumb"> <li> <a href="#">{SECTION}</a></li></ul>
-					</div>
-				</section>
-				!-->
-			</header>
-			<div id="top_main_content" class="container">
-				<div class="col-md-12">
-					<div style="text-align:center">
-						{DESCRIPTION}
-						{CODE}
-					</div>
-				</div>
+		<div id="page-install">
+			<div class="container chamilo">
+			    <div class="row">
+			        <div class="col-md-12">
+			            <div class="logo">
+			                <img src="{CHAMILO_LOGO}"/>
+			            </div>
+			        </div>
+			    </div>
+                <div class="welcome-install">
+                        {DESCRIPTION}
+                        {CODE}
+                </div>
 			</div>
 		</div>
-		<footer>
-            <div class="container">
-                <div class="row">
-                    <div style="text-align: center;">
-                    &nbsp;<br />{POWERED_BY}
-                    </div>
-                </div>
-            </div>
-		</footer>
 		</body>
 </html>
 EOM;

+ 2 - 0
main/install/configuration.dist.php

@@ -210,3 +210,5 @@ $_configuration['system_stable'] = NEW_VERSION_STABLE;
 
 // Detail view of gradebook categories.
 //$_configuration['gradebook_detailed_admin_view'] = false;
+// E-mail accounts to send notifications to when executing cronjobs - works for main/cron/import_csv.php
+//$_configuration['cron_notification_mails'] = array('email@example.com', 'email2@example.com');

+ 36 - 31
main/install/index.php

@@ -352,24 +352,26 @@ if ($encryptPassForm == '1') {
     </script>
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo api_get_system_encoding(); ?>" />
 </head>
-<body dir="<?php echo api_get_text_direction(); ?>" class="install-chamilo">
-
-<div id="page-wrap">
-<div id="main" class="container well-install">
-    <header>
-        <div class="row">
-            <div id="header_left" class="col-md-4">
-                <div id="logo">
-                    <img src="<?php echo api_get_path(WEB_CSS_PATH) ?>themes/chamilo/images/header-logo.png" hspace="10" vspace="10" alt="Chamilo" />
-                </div>
+<body dir="<?php echo api_get_text_direction(); ?>">
+
+<div id="page-install">
+<div id="main" class="container">
+    <header class="row">
+        <div class="col-md-12">
+            <div class="logo">
+                <img src="<?php echo api_get_path(WEB_CSS_PATH) ?>themes/chamilo/images/header-logo.png" hspace="10" vspace="10" alt="Chamilo" />
             </div>
         </div>
     </header>
-    <?php
-    echo '<div class="page-header"><h1>'.get_lang('ChamiloInstallation').' &ndash; '.get_lang('Version_').' '.$new_version.'</h1></div>';
-    ?>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <?php
+            echo '<h4>'.get_lang('ChamiloInstallation').' &ndash; '.get_lang('Version_').' '.$new_version.'</h4>';
+            ?>
+        </div>
+    <div class="panel-body">
     <div class="row">
-        <div class="col-md-3">
+        <div class="col-md-4">
             <div class="well">
                 <ol>
                     <li <?php step_active('1'); ?>><?php echo get_lang('InstallationLanguage'); ?></li>
@@ -383,12 +385,12 @@ if ($encryptPassForm == '1') {
             </div>
             <div id="note">
                 <a class="btn btn-default" href="../../documentation/installation_guide.html" target="_blank">
-                    <?php echo get_lang('ReadTheInstallationGuide'); ?>
+                    <i class="fa fa-file-text-o"></i> <?php echo get_lang('ReadTheInstallationGuide'); ?>
                 </a>
             </div>
         </div>
 
-        <div class="col-md-9">
+        <div class="col-md-8">
 
 <form class="form-horizontal" id="install_form" method="post" action="<?php echo api_get_self(); ?>?running=1&amp;installType=<?php echo $installType; ?>&amp;updateFromConfigFile=<?php echo urlencode($updateFromConfigFile); ?>">
 <?php
@@ -616,7 +618,14 @@ if (@$_POST['step2']) {
     }
     echo '<div class="RequirementHeading">
           <h2>'.display_step_sequence().$msg.'</h2>
-          <div id="pleasewait" class="warning-message">'.get_lang('PleaseWaitThisCouldTakeAWhile').'</div>
+          <div id="pleasewait" class="alert alert-success">'.get_lang('PleaseWaitThisCouldTakeAWhile').'
+
+          <div class="progress">
+          <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
+            <span class="sr-only">100% Complete</span>
+          </div>
+        </div>
+          </div>
           </div>';
 
     // Push the web server to send these strings before we start the real
@@ -750,20 +759,16 @@ if (@$_POST['step2']) {
 $poweredBy = 'Powered by <a href="http://www.chamilo.org" target="_blank"> Chamilo </a> &copy; '.date('Y');
 ?>
           </form>
-        </div> <!-- col-md-9-->
-      </div> <!-- row -->
-    </div> <!-- main end-->
-    <div class="push"></div>
-  </div><!-- wrapper end-->
-  <footer>
-      <div class="container">
-          <div class="row">
-              <div style="text-align: center;">
-                  &nbsp;<br />
-                  <?php echo $poweredBy; ?>
-              </div>
-          </div>
+        </div>
       </div>
-  </footer>
+    </div>
+    </div>
+        <footer class="panel panel-default">
+            <div class="panel-body">
+                <div style="text-align: center;">
+                    <?php echo $poweredBy; ?>
+                </div>
+            </div>
+        </footer>
   </body>
 </html>

+ 183 - 181
main/install/install.lib.php

@@ -633,13 +633,20 @@ function display_language_selection()
         </h2>
         <p><?php echo get_lang('PleaseSelectInstallationProcessLanguage'); ?>:</p>
         <form id="lang_form" method="post" action="<?php echo api_get_self(); ?>">
-        <?php display_language_selection_box('language_list', api_get_interface_language()); ?>
-        <button type="submit" name="step1" class="btn btn-success" value="<?php echo get_lang('Next'); ?>">
-            <i class="fa fa-forward"> </i>
-            <?php echo get_lang('Next'); ?></button>
+        <div class="form-group">
+            <div class="col-sm-2">
+                <?php display_language_selection_box('language_list', api_get_interface_language()); ?>
+            </div>
+            <div class="col-sm-8">
+                <button type="submit" name="step1" class="btn btn-success" value="<?php echo get_lang('Next'); ?>">
+                    <i class="fa fa-forward"> </i>
+                    <?php echo get_lang('Next'); ?></button>
+            </div>
+        </div>
+
         <input type="hidden" name="is_executable" id="is_executable" value="-" />
         </form>
-        <br /><br />
+
     </div>
     <div class="RequirementHeading">
         <?php echo get_lang('YourLanguageNotThereContactUs'); ?>
@@ -958,7 +965,7 @@ function display_requirements(
 
     if ($installType == 'update' && (empty($updatePath) || $badUpdatePath)) {
         if ($badUpdatePath) { ?>
-            <div class="error-message">
+            <div class="alert alert-warning">
                 <?php echo get_lang('Error'); ?>!<br />
                 Chamilo <?php echo implode('|', $update_from_version_8).' '.get_lang('HasNotBeenFoundInThatDir'); ?>.
             </div>
@@ -967,25 +974,23 @@ function display_requirements(
             echo '<br />';
         }
         ?>
-            <table border="0" cellpadding="5" align="center">
-            <tr>
-            <td><?php echo get_lang('OldVersionRootPath'); ?>:</td>
-            <td>
-                <input type="text" name="updatePath" size="50" value="<?php echo ($badUpdatePath && !empty($updatePath)) ? htmlentities($updatePath) : api_get_path(SYS_SERVER_ROOT_PATH).'old_version/'; ?>" />
-            </td>
-            </tr>
-            <tr>
-            <td colspan="2" align="center">
-                <button type="submit" class="btn btn-default" name="step1" value="<?php echo get_lang('Back'); ?>" >
-                    <i class="fa fa-backward"> <?php echo get_lang('Back'); ?></i>
-                </button>
-                <input type="hidden" name="is_executable" id="is_executable" value="-" />
-                <button type="submit" class="btn btn-success" name="<?php echo (isset($_POST['step2_update_6']) ? 'step2_update_6' : 'step2_update_8'); ?>" value="<?php echo get_lang('Next'); ?> &gt;" >
-                    <i class="fa fa-forward"> </i> <?php echo get_lang('Next'); ?>
-                </button>
-            </td>
-            </tr>
-            </table>
+            <div class="row">
+                <div class="col-md-12">
+                    <p><?php echo get_lang('OldVersionRootPath'); ?>:
+                        <input type="text" name="updatePath" size="50" value="<?php echo ($badUpdatePath && !empty($updatePath)) ? htmlentities($updatePath) : api_get_path(SYS_SERVER_ROOT_PATH).'old_version/'; ?>" />
+                    </p>
+                    <p>
+                        <button type="submit" class="btn btn-default" name="step1" value="<?php echo get_lang('Back'); ?>" >
+                            <i class="fa fa-backward"> <?php echo get_lang('Back'); ?></i>
+                        </button>
+                        <input type="hidden" name="is_executable" id="is_executable" value="-" />
+                        <button type="submit" class="btn btn-success" name="<?php echo (isset($_POST['step2_update_6']) ? 'step2_update_6' : 'step2_update_8'); ?>" value="<?php echo get_lang('Next'); ?> &gt;" >
+                            <i class="fa fa-forward"> </i> <?php echo get_lang('Next'); ?>
+                        </button>
+                    </p>
+                </div>
+            </div>
+
         <?php
     } else {
         $error = false;
@@ -1040,7 +1045,7 @@ function display_requirements(
             echo '</ul>';
         } elseif (file_exists(api_get_path(CONFIGURATION_PATH).'configuration.php')) {
             // Check wether a Chamilo configuration file already exists.
-            echo '<div class="warning-message"><h4><center>';
+            echo '<div class="alert alert-warning"><h4><center>';
             echo get_lang('WarningExistingLMSInstallationDetected');
             echo '</center></h4></div>';
         }
@@ -1078,42 +1083,31 @@ function display_license_agreement()
     echo '<p><a href="../../documentation/license.html" target="_blank">'.get_lang('PrintVers').'</a></p>';
     echo '</div>';
     ?>
-    <table>
-        <tr><td>
-            <pre style="overflow: auto; height: 150px; margin-top: 5px;" class="col-md-7">
+    <div class="row">
+        <div class="col-md-12">
+            <pre style="overflow: auto; height: 200px; margin-top: 5px;">
                 <?php echo api_htmlentities(@file_get_contents(api_get_path(SYS_PATH).'documentation/license.txt')); ?>
             </pre>
-        </td>
-        </tr>
-        <tr><td>
-            <p>
-                <label class="checkbox">
+            <div class="checkbox">
+                <label>
                     <input type="checkbox" name="accept" id="accept_licence" value="1" />
                     <?php echo get_lang('IAccept'); ?>
                 </label>
-            </p>
-            </td>
-        </tr>
-        <tr><td><p style="color:#666"><br /><?php echo get_lang('LMSMediaLicense'); ?></p></td></tr>
-        <tr>
-            <td>
-            <table width="100%">
-                <tr>
-                    <td></td>
-                    <td align="center">
-                        <button type="submit" class="btn btn-default" name="step1" value="&lt; <?php echo get_lang('Previous'); ?>" >
-                            <i class="fa fa-backward"> </i> <?php echo get_lang('Previous'); ?>
-                        </button>
-                        <input type="hidden" name="is_executable" id="is_executable" value="-" />
-                        <button type="submit" class="btn btn-success" name="step3" onclick="javascript: if(!document.getElementById('accept_licence').checked) { alert('<?php echo get_lang('YouMustAcceptLicence')?>');return false;}" value="<?php echo get_lang('Next'); ?> &gt;" >
-                            <i class="fa fa-forward"> </i> <?php echo get_lang('Next'); ?>
-                        </button>
-                    </td>
-                </tr>
-            </table>
-            </td>
-        </tr>
-    </table>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <p class="alert alert-info"><?php echo get_lang('LMSMediaLicense'); ?></p>
+            <button type="submit" class="btn btn-default" name="step1" value="&lt; <?php echo get_lang('Previous'); ?>" >
+                <i class="fa fa-backward"> </i> <?php echo get_lang('Previous'); ?>
+            </button>
+            <input type="hidden" name="is_executable" id="is_executable" value="-" />
+            <button type="submit" class="btn btn-success" name="step3" onclick="javascript: if(!document.getElementById('accept_licence').checked) { alert('<?php echo get_lang('YouMustAcceptLicence')?>');return false;}" value="<?php echo get_lang('Next'); ?> &gt;" >
+                <i class="fa fa-forward"> </i> <?php echo get_lang('Next'); ?>
+            </button>
+        </div>
+    </div>
 
     <!-- Contact information form -->
     <div>
@@ -1140,23 +1134,24 @@ function get_contact_registration_form()
 
     $html ='
    <form class="form-horizontal">
-   <fieldset style="width:95%;padding:15px;border:1pt solid #eee">
+    <div class="panel panel-default">
+    <div class="panel-body">
     <div id="div_sent_information"></div>
-    <div class="control-group">
-            <label class="control-label"><span class="form_required">*</span>'.get_lang('Name').'</label>
-            <div class="controls"><input id="person_name" type="text" name="person_name" size="30" /></div>
+    <div class="form-group">
+            <label class="col-sm-3"><span class="form_required">*</span>'.get_lang('Name').'</label>
+            <div class="col-sm-9"><input id="person_name" type="text" name="person_name" size="30" /></div>
     </div>
-    <div class="control-group">
-            <label class="control-label"><span class="form_required">*</span>'.get_lang('Email').'</label>
-            <div class="controls"><input id="person_email" type="text" name="person_email" size="30" /></div>
+    <div class="form-group">
+            <label class="col-sm-3"><span class="form_required">*</span>'.get_lang('Email').'</label>
+            <div class="col-sm-9"><input id="person_email" type="text" name="person_email" size="30" /></div>
     </div>
-    <div class="control-group">
-            <label class="control-label"><span class="form_required">*</span>'.get_lang('CompanyName').'</label>
-            <div class="controls"><input id="company_name" type="text" name="company_name" size="30" /></div>
+    <div class="form-group">
+            <label class="col-sm-3"><span class="form_required">*</span>'.get_lang('CompanyName').'</label>
+            <div class="col-sm-9"><input id="company_name" type="text" name="company_name" size="30" /></div>
     </div>
-    <div class="control-group">
-            <label class="control-label"><span class="form_required">*</span>'.get_lang('CompanyActivity').'</label>
-            <div class="controls">
+    <div class="form-group">
+            <label class="col-sm-3"><span class="form_required">*</span>'.get_lang('CompanyActivity').'</label>
+            <div class="col-sm-9">
                     <select name="company_activity" id="company_activity" >
                             <option value="">--- '.get_lang('SelectOne').' ---</option>
                             <Option value="Advertising/Marketing/PR">Advertising/Marketing/PR</Option><Option value="Agriculture/Forestry">Agriculture/Forestry</Option>
@@ -1178,9 +1173,9 @@ function get_contact_registration_form()
             </div>
     </div>
 
-    <div class="control-group">
-            <label class="control-label"><span class="form_required">*</span>'.get_lang('PersonRole').'</label>
-            <div class="controls">
+    <div class="form-group">
+            <label class="col-sm-3"><span class="form_required">*</span>'.get_lang('PersonRole').'</label>
+            <div class="col-sm-9">
                     <select name="person_role" id="person_role" >
                             <option value="">--- '.get_lang('SelectOne').' ---</option>
                             <Option value="Administration">Administration</Option><Option value="CEO/President/ Owner">CEO/President/ Owner</Option>
@@ -1198,19 +1193,19 @@ function get_contact_registration_form()
             </div>
     </div>
 
-    <div class="control-group">
-            <label class="control-label"><span class="form_required">*</span>'.get_lang('CompanyCountry').'</label>
-            <div class="controls">'.get_countries_list_from_array(true).'</div>
+    <div class="form-group">
+            <label class="col-sm-3"><span class="form_required">*</span>'.get_lang('CompanyCountry').'</label>
+            <div class="col-sm-9">'.get_countries_list_from_array(true).'</div>
     </div>
-    <div class="control-group">
-            <label class="control-label">'.get_lang('CompanyCity').'</label>
-            <div class="controls">
+    <div class="form-group">
+            <label class="col-sm-3">'.get_lang('CompanyCity').'</label>
+            <div class="col-sm-9">
                     <input type="text" id="company_city" name="company_city" size="30" />
             </div>
     </div>
-    <div class="control-group">
-            <label class="control-label">'.get_lang('WhichLanguageWouldYouLikeToUseWhenContactingYou').'</label>
-            <div class="controls">
+    <div class="form-group">
+            <label class="col-sm-3">'.get_lang('WhichLanguageWouldYouLikeToUseWhenContactingYou').'</label>
+            <div class="col-sm-9">
                     <select id="language" name="language">
                             <option value="bulgarian">Bulgarian</option>
                             <option value="indonesian">Bahasa Indonesia</option>
@@ -1229,23 +1224,23 @@ function get_contact_registration_form()
             </div>
     </div>
 
-    <div class="control-group">
-            <label class="control-label">'.get_lang('HaveYouThePowerToTakeFinancialDecisions').'</label>
-            <div class="controls">
+    <div class="form-group">
+            <label class="col-sm-3">'.get_lang('HaveYouThePowerToTakeFinancialDecisions').'</label>
+            <div class="col-sm-9">
                     <input type="radio" name="financial_decision" id="financial_decision1" value="1" checked />'.get_lang('Yes').'
                     <input type="radio" name="financial_decision" id="financial_decision2" value="0" />'.get_lang('No').'
             </div>
     </div>
     <div class="clear"></div>
-    <div class="control-group">
-            <div class="control-label">&nbsp;</div>
-            <div class="controls"><button type="button" class="btn btn-default" onclick="javascript:send_contact_information();" value="'.get_lang('SendInformation').'" ><i class="fa fa-floppy-o"> </i> '.get_lang('SendInformation').'</button></div>
-    </div>
-    <div class="control-group">
-            <div class="control-label">&nbsp;</div>
-            <div class="controls"><span class="form_required">*</span><small>'.get_lang('FieldRequired').'</small></div>
+    <div class="form-group">
+            <div class="col-sm-3">&nbsp;</div>
+            <div class="col-sm-9"><button type="button" class="btn btn-default" onclick="javascript:send_contact_information();" value="'.get_lang('SendInformation').'" ><i class="fa fa-floppy-o"> </i> '.get_lang('SendInformation').'</button></div>
     </div>
-</fieldset></form>';
+    <div class="form-group">
+            <div class="col-sm-3">&nbsp;</div>
+            <div class="col-sm-9"><span class="form_required">*</span><small>'.get_lang('FieldRequired').'</small></div>
+    </div></div></div>
+</form>';
 
     return $html;
 }
@@ -1271,11 +1266,11 @@ function displayDatabaseParameter(
     $displayWhenUpdate = true,
     $tr_attribute = ''
 ) {
-    echo "<tr ".$tr_attribute.">";
-    echo "<td>$parameterName&nbsp;&nbsp;</td>";
+    //echo "<tr ".$tr_attribute.">";
+    echo "<label class='col-sm-4'>$parameterName</label>";
 
     if ($installType == INSTALL_TYPE_UPDATE && $displayWhenUpdate) {
-        echo '<td><input type="hidden" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />'.$parameterValue."</td>";
+        echo '<input type="hidden" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />'.$parameterValue;
     } else {
         $inputType = $formFieldName == 'dbPassForm' ? 'password' : 'text';
 
@@ -1283,14 +1278,14 @@ function displayDatabaseParameter(
         $maxLength = $formFieldName == 'dbPrefixForm' ? '15' : MAX_FORM_FIELD_LENGTH;
         if ($installType == INSTALL_TYPE_UPDATE) {
             echo '<input type="hidden" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />';
-            echo '<td>'.api_htmlentities($parameterValue)."</td>";
+            echo api_htmlentities($parameterValue);
         } else {
-            echo '<td><input type="'.$inputType.'" size="'.DATABASE_FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.$maxLength.'" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />'."</td>";
-            echo "<td>$extra_notice</td>";
+            echo '<div class="col-sm-5"><input type="'.$inputType.'" size="'.DATABASE_FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.$maxLength.'" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />'."</div>";
+            echo '<div class="col-sm-3">' . $extra_notice . '</div>';
         }
 
     }
-    echo "</tr>";
+
 }
 
 /**
@@ -1323,62 +1318,71 @@ function display_database_settings_form(
         echo '</div>';
     }
     ?>
-    </td>
-    </tr>
-    <tr>
-    <td>
-    <table class="table">
-    <tr>
-      <td width="40%"><?php echo get_lang('DBHost'); ?> </td>
-      <?php if ($installType == 'update'): ?>
-      <td width="30%"><input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?></td>
-      <td width="30%">&nbsp;</td>
-      <?php else: ?>
-      <td width="30%"><input type="text" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /></td>
-      <td width="30%"><?php echo get_lang('EG').' localhost'; ?></td>
-      <?php endif; ?>
-    </tr>
-    <tr>
-    <?php
-    //database user username
-    $example_login = get_lang('EG').' root';
-    displayDatabaseParameter($installType, get_lang('DBLogin'), 'dbUsernameForm', $dbUsernameForm, $example_login);
-
-    //database user password
-    $example_password = get_lang('EG').' '.api_generate_password();
-    displayDatabaseParameter($installType, get_lang('DBPassword'), 'dbPassForm', $dbPassForm, $example_password);
-
-    //Database Name fix replace weird chars
-    if ($installType != INSTALL_TYPE_UPDATE) {
-        $dbNameForm = str_replace(array('-','*', '$', ' ', '.'), '', $dbNameForm);
-        $dbNameForm = api_replace_dangerous_char($dbNameForm);
-    }
+    <div class="panel panel-default">
+        <div class="panel-body">
+        <div class="form-group">
+            <label class="col-sm-4"><?php echo get_lang('DBHost'); ?> </label>
+            <?php if ($installType == 'update'){ ?>
+            <div class="col-sm-5">
+                <input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?>
+            </div>
+            <div class="col-sm-3"></div>
+            <?php }else{ ?>
+            <div class="col-sm-5">
+                <input type="text" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" />
+            </div>
+            <div class="col-sm-3"><?php echo get_lang('EG').' localhost'; ?></div>
+            <?php } ?>
+        </div>
+        <div class="form-group">
+            <?php
+                //database user username
+                $example_login = get_lang('EG').' root';
+                displayDatabaseParameter($installType, get_lang('DBLogin'), 'dbUsernameForm', $dbUsernameForm, $example_login);
+            ?>
+        </div>
+        <div class="form-group">
+            <?php
+            //database user password
+            $example_password = get_lang('EG').' '.api_generate_password();
+            displayDatabaseParameter($installType, get_lang('DBPassword'), 'dbPassForm', $dbPassForm, $example_password);
 
-    displayDatabaseParameter(
-        $installType,
-        get_lang('MainDB'),
-        'dbNameForm',
-        $dbNameForm,
-        '&nbsp;',
-        null,
-        'id="optional_param1"'
-    );
+            ?>
+        </div>
+        <div class="form-group">
+            <?php
+            //Database Name fix replace weird chars
+            if ($installType != INSTALL_TYPE_UPDATE) {
+                $dbNameForm = str_replace(array('-','*', '$', ' ', '.'), '', $dbNameForm);
+                $dbNameForm = api_replace_dangerous_char($dbNameForm);
+            }
 
-    if ($installType != INSTALL_TYPE_UPDATE) {
-    ?>
-    <tr>
-        <td></td>
-        <td>
+            displayDatabaseParameter(
+                $installType,
+                get_lang('MainDB'),
+                'dbNameForm',
+                $dbNameForm,
+                '&nbsp;',
+                null,
+                'id="optional_param1"'
+                );
+            ?>
+        </div>
+       <?php if ($installType != INSTALL_TYPE_UPDATE) { ?>
+        <div class="form-group">
+            <div class="col-sm-3"></div>
+            <div class="col-sm-9">
             <button type="submit" class="btn btn-primary" name="step3" value="step3">
                 <i class="fa fa-refresh"> </i>
                 <?php echo get_lang('CheckDatabaseConnection'); ?>
             </button>
-        </td>
-    </tr>
-    <?php } ?>
+            </div>
+        </div>
+        <?php } ?>
+
+        </div>
+    </div>
 
-    <tr>
-        <td>
         <?php
 
         $database_exists_text = '';
@@ -1392,53 +1396,51 @@ function display_database_settings_form(
             );
             $databases = $manager->getConnection()->getSchemaManager()->listDatabases();
             if (in_array($dbNameForm, $databases)) {
-                $database_exists_text = '<div class="warning-message">'.get_lang('ADatabaseWithTheSameNameAlreadyExists').'</div>';
+                $database_exists_text = '<div class="alert alert-warning">'.get_lang('ADatabaseWithTheSameNameAlreadyExists').'</div>';
             }
         } catch (Exception $e) {
             $database_exists_text = $e->getMessage();
         }
 
         if ($manager->getConnection()->isConnected()): ?>
-        <td colspan="2">
+
             <?php echo $database_exists_text ?>
-            <div id="db_status" class="confirmation-message">
+            <div id="db_status" class="alert alert-success">
                 Database host: <strong><?php echo $manager->getConnection()->getHost(); ?></strong><br />
                 Database driver: <strong><?php echo $manager->getConnection()->getDriver()->getName(); ?></strong><br />
-                <div style="clear:both;"></div>
+
             </div>
-        </td>
+
         <?php else: ?>
-        <td colspan="2">
+
             <?php echo $database_exists_text ?>
-            <div id="db_status" style="float:left;" class="error-message">
+            <div id="db_status" style="float:left;" class="alert alert-danger">
                 <div style="float:left;">
-                    <strong><?php echo get_lang('FailedConectionDatabase'); ?></strong><br />
+                    <?php echo get_lang('FailedConectionDatabase'); ?></strong>
                 </div>
             </div>
-        </td>
+
         <?php endif; ?>
-    </tr>
-    <tr>
-      <td>
-          <button type="submit" name="step2" class="btn btn-default" value="&lt; <?php echo get_lang('Previous'); ?>" >
-          <i class="fa fa-backward"> </i> <?php echo get_lang('Previous'); ?>
-          </button>
-      </td>
-      <td>&nbsp;</td>
-      <td align="right">
-          <input type="hidden" name="is_executable" id="is_executable" value="-" />
-           <?php if ($manager) { ?>
-            <button type="submit"  class="btn btn-success" name="step4" value="<?php echo get_lang('Next'); ?> &gt;" >
-                <i class="fa fa-forward"> </i> <?php echo get_lang('Next'); ?>
-            </button>
-          <?php } else { ?>
-            <button disabled="disabled" type="submit" class="btn btn-success disabled" name="step4" value="<?php echo get_lang('Next'); ?> &gt;" >
-                <i class="fa fa-forward"> </i> <?php echo get_lang('Next'); ?>
-            </button>
-          <?php } ?>
-      </td>
-    </tr>
-    </table>
+   <div class="form-group">
+       <div class="col-sm-6">
+           <button type="submit" name="step2" class="btn btn-default pull-right" value="&lt; <?php echo get_lang('Previous'); ?>" >
+               <i class="fa fa-backward"> </i> <?php echo get_lang('Previous'); ?>
+           </button>
+       </div>
+      <div class="col-sm-6">
+       <input type="hidden" name="is_executable" id="is_executable" value="-" />
+       <?php if ($manager) { ?>
+           <button type="submit"  class="btn btn-success" name="step4" value="<?php echo get_lang('Next'); ?> &gt;" >
+               <i class="fa fa-forward"> </i> <?php echo get_lang('Next'); ?>
+           </button>
+       <?php } else { ?>
+           <button disabled="disabled" type="submit" class="btn btn-success disabled" name="step4" value="<?php echo get_lang('Next'); ?> &gt;" >
+               <i class="fa fa-forward"> </i> <?php echo get_lang('Next'); ?>
+           </button>
+       <?php } ?>
+      </div>
+   </div>
+
     <?php
 }
 
@@ -1643,7 +1645,7 @@ function display_configuration_settings_form(
 function display_after_install_message($installType)
 {
     echo '<div class="RequirementContent">'.get_lang('FirstUseTip').'</div>';
-    echo '<div class="warning-message">';
+    echo '<div class="alert alert-warning">';
     echo '<strong>'.get_lang('SecurityAdvice').'</strong>';
     echo ': ';
     printf(get_lang('ToProtectYourSiteMakeXReadOnlyAndDeleteY'), 'main/inc/conf/', 'main/install/');

+ 10 - 0
main/newscorm/learnpath.class.php

@@ -9814,7 +9814,17 @@ EOD;
     public function verify_document_size($s)
     {
         $post_max = ini_get('post_max_size');
+        if (substr($post_max, -1, 1) == 'M') {
+            $post_max = intval(substr($post_max, 0, -1)) * 1024 * 1024;
+        } elseif (substr($post_max, -1, 1) == 'G') {
+            $post_max = intval(substr($post_max, 0, -1)) * 1024 * 1024 * 1024;
+        }
         $upl_max = ini_get('upload_max_filesize');
+        if (substr($upl_max, -1, 1) == 'M') {
+            $upl_max = intval(substr($upl_max, 0, -1)) * 1024 * 1024;
+        } elseif (substr($upl_max, -1, 1) == 'G') {
+            $upl_max = intval(substr($upl_max, 0, -1)) * 1024 * 1024 * 1024;
+        }
         $documents_total_space = DocumentManager::documents_total_space();
         $course_max_space = DocumentManager::get_course_quota();
         $total_size = filesize($s) + $documents_total_space;

Some files were not shown because too many files changed in this diff