Explorar o código

Fixing install page

Julio Montoya %!s(int64=13) %!d(string=hai) anos
pai
achega
b3b8a4a11a

+ 3 - 4
main/css/base.css

@@ -68,16 +68,15 @@ label, input, button, select, textarea, p {
 }
 
 
+
 /* button with image */
 button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
     padding-left:30px;
     background-position:8px !important;
-    background-repeat:no-repeat;
+    background-repeat:no-repeat;    
 }
 
-
 /* Fixing old chamilo forms */
-
 form .label {
     color: #404040;
     float: left;    
@@ -825,7 +824,7 @@ button:hover {
 
 button.next.disabled, .a_button.disabled {
     cursor: default;
-    opacity: 0.65;
+    opacity: 0.65;    
 }
 
 .a_button {

+ 1 - 1
main/css/chamilo/default.css

@@ -191,7 +191,7 @@ button.minus {
 }
 /*including "next" image*/
 button.next {
-    background-image:url(images/button_next.gif);
+    background-image:url(images/button_next.gif) !important;
 }
 /*including "back" image*/
 button.back {

+ 18 - 8
main/css/responsive.css

@@ -1,18 +1,24 @@
 
 /* media queries responsive */
 
-/* Responsive Docs
--------------------------------------------------- */
+/* Responsive Docs */
+
+/* Phone */
 @media (max-width: 479px) {
-    /* No chat in mobiles*/
+    /* No chat in mobiles */
     #chatmain {
         display:none;
     }
     
-    #footer .container .row {
-        padding-top:25px;
+    #footer_right #admin_name, #footer_right #software_name {
+        text-align: center !important;
+    }    
+    
+    footer .container .row {
+        padding-top: 15px;        
     }
     
+    /* No resize font */
     .resize_font {
         display:none;
     }
@@ -35,10 +41,14 @@
     #chatmain {
         display:none;
     }
-    #footer .container .row {
-        padding-top:25px;
-    }
     
+     #footer_right #admin_name, #footer_right #software_name {
+        text-align: center !important;
+    }    
+    
+    footer .container .row {
+        padding-top: 15px;        
+    }
     .notification-panel {
         display:none;
     }

+ 12 - 14
main/inc/global_error_message.inc.php

@@ -167,8 +167,8 @@ if (is_int($global_error_code) && $global_error_code > 0) {
 <!DOCTYPE html>
 <html>
 		<head>
-			<title>{TITLE}</title>
-			<meta http-equiv="Content-Type" content="text/html; charset={ENCODING}" />
+			<title>{TITLE}</title>			
+            <meta charset="{ENCODING}" />
 			<style type="text/css" media="screen, projection">
 				/*<![CDATA[*/
 				{CSS}
@@ -177,18 +177,14 @@ if (is_int($global_error_code) && $global_error_code > 0) {
 		</head>
 		<body>
 		<div id="wrapper">
-			<div id="header">
-				<div id="header1">	
-				    <div id="logo">    
-                        <img vspace="10" hspace="10" alt="Chamilo" src="{CHAMILO_LOGO}">        
-                    </div>
-				</div>
-				<div class="clear"></div>				
-				<div class="subnav">
+			<div id="header">				
+                <div id="logo">    
+                    <img vspace="10" hspace="10" alt="Chamilo" src="{CHAMILO_LOGO}">        
+                </div>				
+				<div class="breadcrumb">
 					<ul>
-						<li id="current"><a href="#"><span id="tab_active">{SECTION}</span></a></li>
-					</ul>
-					<div style="clear: both;" class="clear"></div>
+						<li><a href="#">{SECTION}</a></li>
+					</ul>					
 				</div>
 			</div>
 			<div class="clear"> </div>
@@ -205,10 +201,12 @@ if (is_int($global_error_code) && $global_error_code > 0) {
 
 		<footer>
             <div class="container">
-                <div class="row">
+                <div class="row">  
+                <div style="text-align: center;">
                 &nbsp;<br />{POWERED_BY}
                 </div>
                 </div>
+                </div>
 			
 		</footer>
 		</body>

+ 3 - 1
main/install/index.php

@@ -325,7 +325,9 @@ if ($encryptPassForm == '1') {
 					$('#dbStatsForm').attr('value','chamilo_main');
 					$('#dbUserForm').attr('value','chamilo_main');
 			}
-			
+            
+			$("button").addClass('btn');
+            
     		//Allow Chamilo install in IE
     		$("button").click(function() {
     			$("#is_executable").attr("value",$(this).attr("name"));

+ 11 - 9
main/install/install.lib.php

@@ -1035,7 +1035,7 @@ function display_language_selection() { ?>
         <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="next" value="<?php echo get_lang('Next'); ?>"><?php echo get_lang('Next'); ?></button>
+    <button type="submit" name="step1" class="btn next" value="<?php echo get_lang('Next'); ?>"><?php echo get_lang('Next'); ?></button>
     <input type="hidden" name="is_executable" id="is_executable" value="-" />
     </form>
     </div>
@@ -1282,7 +1282,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
             <td colspan="2" align="center">
                 <button type="submit" class="back" name="step1" value="&lt; <?php echo get_lang('Back'); ?>" ><?php echo get_lang('Back'); ?></button>
                 <input type="hidden" name="is_executable" id="is_executable" value="-" />
-                <button type="submit" class="next" name="<?php echo (isset($_POST['step2_update_6']) ? 'step2_update_6' : 'step2_update_8'); ?>" value="<?php echo get_lang('Next'); ?> &gt;" ><?php echo get_lang('Next'); ?></button>
+                <button type="submit" class="btn next" name="<?php echo (isset($_POST['step2_update_6']) ? 'step2_update_6' : 'step2_update_8'); ?>" value="<?php echo get_lang('Next'); ?> &gt;" ><?php echo get_lang('Next'); ?></button>
             </td>
             </tr>
             </table>
@@ -1382,7 +1382,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
         //echo ' disabled="disabled"';
         //end temp code
         echo ' >'.get_lang('UpgradeFromDokeos18x').'</button>';
-        echo '<button type="submit" class="save" name="step2_update_6" value="Upgrade from Dokeos 1.6.x"';
+        echo ' <button type="submit" class="save" name="step2_update_6" value="Upgrade from Dokeos 1.6.x"';
         if ($error) echo ' disabled="disabled"';
         echo ' >'.get_lang('UpgradeFromDokeos16x').'</button>';
         echo '</p>';
@@ -1423,9 +1423,9 @@ function display_license_agreement() {
             	<tr>
                 	<td></td>
                 	<td align="center">
-                    	<button type="submit" class="back" name="step1" value="&lt; <?php echo get_lang('Previous'); ?>" ><?php echo get_lang('Previous'); ?></button>
+                    	<button type="submit" class="btn back" name="step1" value="&lt; <?php echo get_lang('Previous'); ?>" ><?php echo get_lang('Previous'); ?></button>
                     	<input type="hidden" name="is_executable" id="is_executable" value="-" />
-                    	<button type="submit" class="next" 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;" ><?php echo get_lang('Next'); ?></button>
+                    	<button type="submit" class="btn next" 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;" ><?php echo get_lang('Next'); ?></button>
                 	</td>
             	</tr>
             </table>
@@ -1805,9 +1805,9 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
       <td align="right">
           <input type="hidden" name="is_executable" id="is_executable" value="-" />
            <?php if ($dbConnect == 1) { ?>          
-            <button type="submit"  class="next" name="step4" value="<?php echo get_lang('Next'); ?> &gt;" /><?php echo get_lang('Next'); ?></button>
+            <button type="submit"  class="btn next" name="step4" value="<?php echo get_lang('Next'); ?> &gt;" /><?php echo get_lang('Next'); ?></button>
           <?php } else { ?>
-            <button disabled="disabled" type="submit" class="next disabled" name="step4" value="<?php echo get_lang('Next'); ?> &gt;" /><?php echo get_lang('Next'); ?></button>
+            <button disabled="disabled" type="submit" class="btn next disabled" name="step4" value="<?php echo get_lang('Next'); ?> &gt;" /><?php echo get_lang('Next'); ?></button>
           <?php } ?>  
       </td>
     </tr>
@@ -1998,9 +1998,11 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
     </tr>
     <tr>
         <td>
-            <button type="submit" class="back" name="step3" value="&lt; <?php echo get_lang('Previous'); ?>" /><?php echo get_lang('Previous'); ?></button>
+            <button type="submit" class="btn back" name="step3" value="&lt; <?php echo get_lang('Previous'); ?>" /><?php echo get_lang('Previous'); ?></button>
         </td>
-        <td align="right"><input type="hidden" name="is_executable" id="is_executable" value="-" /><button class="next" type="submit" name="step5" value="<?php echo get_lang('Next'); ?> &gt;" /><?php echo get_lang('Next'); ?></button></td>
+        <td align="right">
+            <input type="hidden" name="is_executable" id="is_executable" value="-" />
+            <button class="btn next" type="submit" name="step5" value="<?php echo get_lang('Next'); ?> &gt;" /><?php echo get_lang('Next'); ?></button></td>
     </tr>
     </fieldset>
     </table>

+ 5 - 0
main/template/default/layout/head.tpl

@@ -92,6 +92,11 @@ $(document).scroll(function() {
 });
 
 $(document).ready(function() {
+    
+    
+    if (!$('#button').hasClass('btn')) {
+        $("button").addClass('btn');
+    }
 
     //Dropdown effect
     $('.dropdown-toggle').dropdown();