Fix UI, fix warnings.

1.10.x
Julio Montoya 11 years ago
parent 36f1d9c2a8
commit 71a56be6a1
  1. 32
      main/install/index.php
  2. 5
      main/install/update-configuration.inc.php

@ -274,12 +274,10 @@ if ($encryptPassForm == '1') {
<head> <head>
<title>&mdash; <?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title> <title>&mdash; <?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title>
<style type="text/css" media="screen, projection"> <style type="text/css" media="screen, projection">
/*<![CDATA[*/
@import "../../web/assets/bootstrap/dist/css/bootstrap.min.css"; @import "../../web/assets/bootstrap/dist/css/bootstrap.min.css";
@import "../../web/assets/fontawesome/css/font-awesome.min.css"; @import "../../web/assets/fontawesome/css/font-awesome.min.css";
@import "../css/base.css"; @import "../../web/css/base.css";
@import "../css/<?php echo api_get_visual_theme(); ?>/default.css"; @import "../../web/css/themes/chamilo/default.css";
/*]]>*/
</style> </style>
<script type="text/javascript" src="../../web/assets/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="../../web/assets/jquery/dist/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
@ -360,19 +358,6 @@ if ($encryptPassForm == '1') {
</div> </div>
</div> </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> </header>
<?php <?php
echo '<div class="page-header"><h1>'.get_lang('ChamiloInstallation').' &ndash; '.get_lang('Version_').' '.$new_version.'</h1></div>'; 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. // This is the start screen.
display_language_selection(); display_language_selection();
} }
$poweredBy = 'Platform <a href="http://www.chamilo.org" target="_blank"> Chamilo </a> &copy; '.date('Y');
?> ?>
</form> </form>
</div> <!-- col-md-9--> </div> <!-- col-md-9-->
@ -766,6 +753,15 @@ if (@$_POST['step2']) {
</div> <!-- main end--> </div> <!-- main end-->
<div class="push"></div> <div class="push"></div>
</div><!-- wrapper end--> </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> </body>
</html> </html>

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

Loading…
Cancel
Save