Kaynağa Gözat

Fix UI, fix warnings.

Julio Montoya 10 yıl önce
ebeveyn
işleme
71a56be6a1
2 değiştirilmiş dosya ile 17 ekleme ve 20 silme
  1. 14 18
      main/install/index.php
  2. 3 2
      main/install/update-configuration.inc.php

+ 14 - 18
main/install/index.php

@@ -274,12 +274,10 @@ if ($encryptPassForm == '1') {
 <head>
     <title>&mdash; <?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title>
     <style type="text/css" media="screen, projection">
-        /*<![CDATA[*/
         @import "../../web/assets/bootstrap/dist/css/bootstrap.min.css";
         @import "../../web/assets/fontawesome/css/font-awesome.min.css";
-        @import "../css/base.css";
-        @import "../css/<?php echo api_get_visual_theme(); ?>/default.css";
-        /*]]>*/
+        @import "../../web/css/base.css";
+        @import "../../web/css/themes/chamilo/default.css";
     </style>
     <script type="text/javascript" src="../../web/assets/jquery/dist/jquery.min.js"></script>
     <script type="text/javascript">
@@ -360,19 +358,6 @@ if ($encryptPassForm == '1') {
                 </div>
             </div>
         </div>
-        <div class="navbar subnav">
-            <div class="navbar-inner">
-                <div class="container">
-                    <div class="nav-collapse">
-                        <ul class="nav nav-pills">
-                            <li id="current" class="active">
-                                <a target="_top" href="index.php"><?php echo get_lang('Homepage'); ?></a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
     </header>
     <?php
     echo '<div class="page-header"><h1>'.get_lang('ChamiloInstallation').' &ndash; '.get_lang('Version_').' '.$new_version.'</h1></div>';
@@ -759,6 +744,8 @@ if (@$_POST['step2']) {
     // This is the start screen.
     display_language_selection();
 }
+
+$poweredBy = 'Platform <a href="http://www.chamilo.org" target="_blank"> Chamilo </a> &copy; '.date('Y');
 ?>
           </form>
         </div> <!-- col-md-9-->
@@ -766,6 +753,15 @@ if (@$_POST['step2']) {
     </div> <!-- main end-->
     <div class="push"></div>
   </div><!-- wrapper end-->
-  <footer></footer>
+  <footer>
+      <div class="container">
+          <div class="row">
+              <div style="text-align: center;">
+                  &nbsp;<br />
+                  <?php echo $poweredBy; ?>
+              </div>
+          </div>
+      </div>
+  </footer>
   </body>
 </html>

+ 3 - 2
main/install/update-configuration.inc.php

@@ -17,8 +17,9 @@ if (defined('SYSTEM_INSTALLATION')) {
     $newConfFile = api_get_path(CONFIGURATION_PATH) . 'configuration.php';
 
     if (file_exists($oldConfFile)) {
-        rename($oldConfFile, $newConfFile);
-        chmod($newConfFile, $perm);
+        copy($oldConfFile, $newConfFile);
+        @chmod($newConfFile, $perm);
+        @rmdir($oldConfFile);
     }
 
     // Edit the configuration file.