Browse Source

Chamilo design update installer - refs BT#7683

Alex Aragon 8 years ago
parent
commit
bfc6de7f50
3 changed files with 70 additions and 50 deletions
  1. 40 10
      app/Resources/public/css/base.css
  2. 2 2
      main/inc/global_error_message.inc.php
  3. 28 38
      main/install/index.php

+ 40 - 10
app/Resources/public/css/base.css

@@ -4589,9 +4589,15 @@ div#chat-remote-video video {
     padding-bottom: 50px;
 }
 /* INSTALL CHAMILO */
-
-#page-install .logo{
+#page-install{
+    margin-top: 40px;
+}
+#page-install .logo-install{
   text-align: center;
+  margin-bottom: 10px;
+}
+#page-install .panel-default{
+  border-color: #DDD;
 }
 .installer .logo{
   text-align: center;
@@ -4616,14 +4622,30 @@ div#chat-remote-video video {
   text-align: center;
 }
 .RequirementHeading h2{
-  font-size: 25px;
+  font-weight: bold;
+  font-size: 22px;
+  color: #2E75A3;
+  padding-bottom: 10px;
+  margin-bottom: 30px;
 }
-#page-install{
-  background: #8EC1DA; /* Old browsers */
-  
+#page-install .page-header h2{
+    font-weight: bold;
+    font-size: 28px;
+}
+#page-install .checkbox{
+    margin-bottom: 10px;
 }
-#page-install footer{
+#page-install .footer-install p{
+    padding: 0;
+    margin: 0;
+}
+#page-install .footer-install{
   color: #666666;
+  background: none;
+  border: 1px solid #DDD;
+  border-radius: 5px;
+  padding-bottom: 15px;
+  padding-top: 15px;
 }
 #page-install footer a{
   color: #333333;
@@ -4637,9 +4659,17 @@ div#chat-remote-video video {
 #page-install .page-header{
   margin: 20px 0px 20px;
 }
-.page-header h2{
-    font-size: 22px;
-    margin-top: 25px;
+#page-install .content{
+    padding-left: 3%;
+    padding-right: 3%;
+}
+#page-install .install-steps-menu{
+    background: #c9f4ff;
+    border: none;
+}
+#page-install .install-steps-menu ol li{
+    padding-bottom: 5px;
+    padding-top: 5px;
 }
 #page-install .normal-message{
   padding: 20px;

+ 2 - 2
main/inc/global_error_message.inc.php

@@ -127,6 +127,7 @@ if (is_int($global_error_code) && $global_error_code > 0) {
             $global_error_message['description'] = $IncorrectPhpVersionDescription;
             break;
         case 2:
+            require __DIR__ . '/../install/version.php';
             $global_error_message['section'] = $SectionInstallation;
             $global_error_message['title'] = $InstallationTitle;
             if (($pos = strpos($InstallationDescription, '%s')) === false) {
@@ -137,7 +138,7 @@ if (is_int($global_error_code) && $global_error_code > 0) {
             <div class="row"><div class="col-md-12">
 
                     <div class="office">
-                    <h2 class="title">Welcome to the Chamilo installation wizard</h2>
+                    <h2 class="title">Welcome to the Chamilo '.$new_version.' installation wizard</h2>
                     <p class="text">Let\'s start hunting skills down with Chamilo LMS! This 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" aria-hidden="true"></i> Install Chamilo</button>
@@ -230,7 +231,6 @@ if (is_int($global_error_code) && $global_error_code > 0) {
                     display: initial;
                 }
                 .office{
-                    margin-top: 70px;
                     padding: 10px 20px;
                     //background-color: rgba(35, 40, 56, 0.7);
                     background-color: rgba(0, 22, 48, 0.8);

+ 28 - 38
main/install/index.php

@@ -402,43 +402,12 @@ if ($encryptPassForm == '1') {
 
 <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>
     <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-4">
-            <div class="well install-steps-menu">
-                <ol>
-                    <li <?php step_active('1'); ?>><?php echo get_lang('InstallationLanguage'); ?></li>
-                    <li <?php step_active('2'); ?>><?php echo get_lang('Requirements'); ?></li>
-                    <li <?php step_active('3'); ?>><?php echo get_lang('Licence'); ?></li>
-                    <li <?php step_active('4'); ?>><?php echo get_lang('DBSetting'); ?></li>
-                    <li <?php step_active('5'); ?>><?php echo get_lang('CfgSetting'); ?></li>
-                    <li <?php step_active('6'); ?>><?php echo get_lang('PrintOverview'); ?></li>
-                    <li <?php step_active('7'); ?>><?php echo get_lang('Installing'); ?></li>
-                </ol>
-            </div>
-            <div id="note">
-                <a class="btn btn-default" href="<?php echo $installationGuideLink; ?>" target="_blank">
-                    <em class="fa fa-file-text-o"></em> <?php echo get_lang('ReadTheInstallationGuide'); ?>
-                </a>
-            </div>
-        </div>
-
         <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); ?>">
+            <div class="content">
+        <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
 
 $instalation_type_label = '';
@@ -1084,14 +1053,35 @@ $poweredBy = 'Powered by <a href="http://www.chamilo.org" target="_blank"> Chami
 ?>
           </form>
         </div>
+        </div>
+        <div class="col-md-4">
+            <div class="logo-install">
+                <img src="<?php echo api_get_path(WEB_CSS_PATH) ?>themes/chamilo/images/header-logo.png" hspace="10" vspace="10" alt="Chamilo" />
+            </div>
+            <div class="well install-steps-menu">
+                <ol>
+                    <li <?php step_active('1'); ?>><?php echo get_lang('InstallationLanguage'); ?></li>
+                    <li <?php step_active('2'); ?>><?php echo get_lang('Requirements'); ?></li>
+                    <li <?php step_active('3'); ?>><?php echo get_lang('Licence'); ?></li>
+                    <li <?php step_active('4'); ?>><?php echo get_lang('DBSetting'); ?></li>
+                    <li <?php step_active('5'); ?>><?php echo get_lang('CfgSetting'); ?></li>
+                    <li <?php step_active('6'); ?>><?php echo get_lang('PrintOverview'); ?></li>
+                    <li <?php step_active('7'); ?>><?php echo get_lang('Installing'); ?></li>
+                </ol>
+            </div>
+            <div id="note">
+                <a class="btn btn-primary btn-block" href="<?php echo $installationGuideLink; ?>" target="_blank">
+                    <em class="fa fa-file-text-o"></em> <?php echo get_lang('ReadTheInstallationGuide'); ?>
+                </a>
+            </div>
+        </div>
+
       </div>
     </div>
     </div>
-        <footer class="panel panel-default">
-            <div class="panel-body">
-                <div style="text-align: center;">
-                    <?php echo $poweredBy; ?>
-                </div>
+        <footer class="footer-install">
+            <div style="text-align: center;">
+                <?php echo $poweredBy; ?>
             </div>
         </footer>
   </body>