Bladeren bron

Some more template fixes

Julio Montoya 13 jaren geleden
bovenliggende
commit
4d1c47f49d
2 gewijzigde bestanden met toevoegingen van 7 en 3 verwijderingen
  1. 4 1
      main/inc/lib/template.lib.php
  2. 3 2
      main/template/default/layout/header.tpl

+ 4 - 1
main/inc/lib/template.lib.php

@@ -228,6 +228,8 @@ class Template extends Smarty {
 		
 		//Base CSS
 		$style_html = '@import "'.api_get_path(WEB_CSS_PATH).'base.css";';
+        
+        $style_html .= '@import "'.api_get_path(WEB_CSS_PATH).'bootstrap-responsive.css";';
 		
 		//Default theme CSS
 		$style_html .= '@import "'.api_get_path(WEB_CSS_PATH).$this->theme.'/default.css";';
@@ -318,7 +320,8 @@ class Template extends Smarty {
 			'jquery.menu.js',
 			'dtree/dtree.js',
 			'email_links.lib.js.php',
-			'bootstrap/bootstrap-dropdown.js'			
+			'bootstrap/bootstrap-dropdown.js',            
+            'bootstrap/bootstrap-collapse.js'
 		);
 		
 		if (api_get_setting('allow_global_chat') == 'true') {            

+ 3 - 2
main/template/default/layout/header.tpl

@@ -82,7 +82,8 @@
                 </div>         
             </div> <!-- /container-->
         </div><!-- /navbar-inner -->
-    </div><!-- /navbar -->    
+    </div><!-- /navbar -->
+    <div id="topbar_push"></div>
 {else}
 <style>
     body {
@@ -93,7 +94,7 @@
     }
 </style>
 {/if}
-    <div id="topbar_push"></div>
+    
 <div id="header">
     {* header *}
     {$header1}