Browse Source

Mobile: updated responsive theme to enable login box to appear first - this still MUST be tested with IEs

Yannick Warnier 12 năm trước cách đây
mục cha
commit
7bed9587e8
3 tập tin đã thay đổi với 88 bổ sung56 xóa
  1. 6 0
      main/css/base.css
  2. 26 0
      main/css/responsive.css
  3. 56 56
      main/template/default/layout/layout_2_col.tpl

+ 6 - 0
main/css/base.css

@@ -253,6 +253,12 @@ form .formw input {
 
 /* end chamilo forms fixes */
 
+#main_content .span3 {
+  float: right;
+}
+#main_content .span9 {
+  float: left;
+}
 
 
 /* New changes Chamilo 1.9 */

+ 26 - 0
main/css/responsive.css

@@ -12,6 +12,16 @@
     .navbar .brand {
          font-size: 14px;
     }
+    #main_content .span3 #login_block {
+        width: 160px;
+        float: left;
+    }
+    #main_content .span3 #help_block {
+        width: 60px;
+        float: right;
+        margin-left: 10px;
+        margin-right: 10px;
+    }
     
     /* No view as link*/
     #view_as_link {
@@ -27,6 +37,12 @@
     .subnav .navbar-inner .in{
         margin-top: 45px 
     }
+    #main_content .span3 #login_block {
+        width: 180px;
+    }
+    #main_content .span3 #help_block {
+        width: 100px;
+    }
 }
 
 @media (max-width: 480px) {
@@ -122,6 +138,16 @@
     .subbav .dropdown-menu a:hover {
         background-color: #555;
     }
+    #main_content .span3 #login_block {
+        width: 280px;
+        float: left;
+    }
+    #main_content .span3 #help_block {
+        width: 100px;
+        float: right;
+        margin-left: 10px;
+        margin-right: 10px;
+    }
 }
 
 @media (max-width: 767px) {

+ 56 - 56
main/template/default/layout/layout_2_col.tpl

@@ -3,6 +3,61 @@
 {% block body %}	
 	{# Main content #}
    
+	{#  Right column  #}
+	<div class="span3">		        
+        {% if plugin_menu_top %}
+            <div id="plugin_menu_top">
+                {{plugin_menu_top}}
+            </div>
+        {% endif %}  	
+        
+	    {# if user is not login show the login form #}
+		{% if _u.logged  == 0 %}
+			{% include "default/layout/login_form.tpl" %}
+		{% endif %}
+
+		{#  User picture  #}
+        {{ user_image_block }}
+        
+        {#  User Profile links #}
+		{{ profile_block }}
+        
+        {#  Course block - admin #}
+		{{ course_block }}
+        
+        {#  Course block - teacher #}
+		{{ teacher_block }}
+		
+		{#  Notice  #}
+		{{ notice_block }}
+                    
+        {#  Help #}
+		{{ help_block }}
+		
+		{#  Links that are not added in the tabs #}
+		{{ navigation_course_links }}
+		
+		{#  Reservation block  #}
+		{{ reservation_block }}
+		
+		{#  Search (xapian) #}
+		{{ search_block }}
+		
+		{#  Classes  #}
+		{{ classes_block }}
+		
+		{#  Skills #}
+		{{ skills_block }}
+        	
+		{#  Plugin courses sidebar  #}		
+        {#  Plugins for footer section  #}		
+        
+        {% if plugin_menu_bottom %}
+            <div id="plugin_menu_bottom">
+                {{ plugin_menu_bottom }}
+            </div>
+        {% endif %}        
+	</div>
 	<div class="span9">
         
         {#  Plugin bottom  #}
@@ -71,59 +126,4 @@
         &nbsp;
 	</div>
 		
-	{#  Right column  #}
-	<div class="span3">		        
-        {% if plugin_menu_top %}
-            <div id="plugin_menu_top">
-                {{plugin_menu_top}}
-            </div>
-        {% endif %}  	
-        
-	    {# if user is not login show the login form #}
-		{% if _u.logged  == 0 %}
-			{% include "default/layout/login_form.tpl" %}
-		{% endif %}
-
-		{#  User picture  #}
-        {{ user_image_block }}
-        
-        {#  User Profile links #}
-		{{ profile_block }}
-        
-        {#  Course block - admin #}
-		{{ course_block }}
-        
-        {#  Course block - teacher #}
-		{{ teacher_block }}
-		
-		{#  Notice  #}
-		{{ notice_block }}
-                    
-        {#  Help #}
-		{{ help_block }}
-		
-		{#  Links that are not added in the tabs #}
-		{{ navigation_course_links }}
-		
-		{#  Reservation block  #}
-		{{ reservation_block }}
-		
-		{#  Search (xapian) #}
-		{{ search_block }}
-		
-		{#  Classes  #}
-		{{ classes_block }}
-		
-		{#  Skills #}
-		{{ skills_block }}
-        	
-		{#  Plugin courses sidebar  #}		
-        {#  Plugins for footer section  #}		
-        
-        {% if plugin_menu_bottom %}
-            <div id="plugin_menu_bottom">
-                {{ plugin_menu_bottom }}
-            </div>
-        {% endif %}        
-	</div>
-{% endblock %}
+{% endblock %}