From 0d17e24ced2ca480ff4196431b29880870165d79 Mon Sep 17 00:00:00 2001
From: Messerbill <ole.hoppe@gmx.de>
Date: Mon, 1 Jun 2015 18:45:03 +0200
Subject: [PATCH] sai menu and structure rework

---
 .../saimod_sys_langswitcher/autoload.inc      |  2 +-
 sai/page/css/sai.css                          | 47 ++++++++++++++++---
 sai/page/tpl/sai.tpl                          | 29 +++++++-----
 3 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/sai/modules/saimod_sys_langswitcher/autoload.inc b/sai/modules/saimod_sys_langswitcher/autoload.inc
index 5c529af..3dbdd12 100644
--- a/sai/modules/saimod_sys_langswitcher/autoload.inc
+++ b/sai/modules/saimod_sys_langswitcher/autoload.inc
@@ -1,4 +1,4 @@
 <?php
 \SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SAI');
 
-\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_langswitcher');
\ No newline at end of file
+//\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_langswitcher');
\ No newline at end of file
diff --git a/sai/page/css/sai.css b/sai/page/css/sai.css
index 381aa47..f5086a2 100644
--- a/sai/page/css/sai.css
+++ b/sai/page/css/sai.css
@@ -17,15 +17,45 @@
 }
 
 #content {
-    padding-left: 15px;
-    padding-top: 15px;
+    padding-top: 20px;
+    padding-left: 10px;
+    padding-right: 10px;
     box-sizing: border-box;
 }
 
-.sai_menu_no_right_margin {
- 
+.sai_margin_left_off {
+    margin-left: 0;
 }
 
+.sai_margin_right_off {
+    margin-right: 0;
+}
+
+.sai_margin_top_off {
+    margin-top: 0;
+}
+
+.sai_margin_bottom_off {
+    margin-bottom: 0;
+}
+
+.sai_padding_left_off {
+    padding-left: 0;
+}
+
+.sai_padding_right_off {
+    padding-right: 0;
+}
+
+.sai_padding_top_off {
+    padding-top: 0;
+}
+
+.sai_padding_bottom_off {
+    padding-bottom: 0;
+}
+
+
 .carousel-img{
     width: 1200px;
     height: 650px;
@@ -54,15 +84,20 @@
 
 .sai_left_divider {
     border-left: 1px solid #e7e7e7;
-    box-sizing: border-box;
+}
+
+.sai_right_divider {
+    border-right: 1px solid #e7e7e7;
 }
 
 .sai_navbar_top {
     margin-bottom: 0;
 }
 
+.sai_main_menu {
+    border-radius: 3px 3px 3px 0;
+}
 /* auto collapsing navbar */
-
 #sys_autocollapse.collapsed .navbar-header {
   float: none;
 }
diff --git a/sai/page/tpl/sai.tpl b/sai/page/tpl/sai.tpl
index cdae1ab..063abc1 100644
--- a/sai/page/tpl/sai.tpl
+++ b/sai/page/tpl/sai.tpl
@@ -9,36 +9,39 @@
         ${js}
     </head>
     <body>
-        <div class="container-fluid"> 
-            <nav id="sys_autocollapse" class="navbar navbar-default sai_navbar_top" role="navigation">
-                    <div class="col-md-2">
+        <div class="container"> 
+            <div class="row">
+                <div class="col-md-2">
+                    <nav id="sys_autocollapse_" class="navbar sai_margin_bottom_off" role="navigation">
                         <div class="navbar-header">
                             <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navHeaderCollapse">
                               <span class="icon-bar"></span>
                               <span class="icon-bar"></span>
                               <span class="icon-bar"></span>
                             </button>
-                            <a id="sai_brand" class="navbar-brand" href="#!start">SAI</a>
                         </div>
-                    </div>  
-                    <!-- div class="col-md-10 sai_menu_first sai_left_divider" -->
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                    <div class="col-md-10">    
-                        <div class="collapse navbar-collapse navHeaderCollapse">
-                            <ul class="nav navbar-nav sai_menu_first sai_left_divider">
+                    </nav>    
+                </div>  
+                <!-- div class="col-md-10 sai_menu_first sai_left_divider" -->
+                    <!-- Collect the nav links, forms, and other content for toggling -->
+                <div class="col-md-10 sai_margin_left_off sai_padding_left_off sai_padding_right_off"> 
+                    <nav id="sys_autocollapse" class="navbar navbar-default sai_navbar_top sai_margin_bottom_off" role="navigation">
+                        <div class="collapse navbar-collapse navHeaderCollapse sai_margin_left_off sai_padding_left_off">
+                            <ul class="nav navbar-nav sai_menu_first">
                                    ${menu_start}
                                    ${menu_sys}
                             </ul>
                         </div><!-- /.navbar-collapse -->
-                    </div>
-            </nav>
+                    </nav>
+                </div>
+            </div>    
             <div class="row">
                 <div class="col-md-2">
                     <ul class="nav nav-tabs nav-stacked sai_project_modules">                
                         ${menu_proj}
                     </ul>
                 </div>
-                <div class="col-md-10 sai_left_divider">
+                <div class="col-md-10 sai_margin_left_off">
                     <div class="row">
                         <div id="content">
                         </div>
