sai menu and structure rework

This commit is contained in:
Messerbill 2015-06-01 18:45:03 +02:00
parent d685f4076f
commit 0d17e24ced
3 changed files with 58 additions and 20 deletions

View File

@ -1,4 +1,4 @@
<?php <?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SAI'); \SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SAI');
\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_langswitcher'); //\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_langswitcher');

View File

@ -17,15 +17,45 @@
} }
#content { #content {
padding-left: 15px; padding-top: 20px;
padding-top: 15px; padding-left: 10px;
padding-right: 10px;
box-sizing: border-box; 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{ .carousel-img{
width: 1200px; width: 1200px;
height: 650px; height: 650px;
@ -54,15 +84,20 @@
.sai_left_divider { .sai_left_divider {
border-left: 1px solid #e7e7e7; border-left: 1px solid #e7e7e7;
box-sizing: border-box; }
.sai_right_divider {
border-right: 1px solid #e7e7e7;
} }
.sai_navbar_top { .sai_navbar_top {
margin-bottom: 0; margin-bottom: 0;
} }
.sai_main_menu {
border-radius: 3px 3px 3px 0;
}
/* auto collapsing navbar */ /* auto collapsing navbar */
#sys_autocollapse.collapsed .navbar-header { #sys_autocollapse.collapsed .navbar-header {
float: none; float: none;
} }

View File

@ -9,36 +9,39 @@
${js} ${js}
</head> </head>
<body> <body>
<div class="container-fluid"> <div class="container">
<nav id="sys_autocollapse" class="navbar navbar-default sai_navbar_top" role="navigation"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
<nav id="sys_autocollapse_" class="navbar sai_margin_bottom_off" role="navigation">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navHeaderCollapse"> <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> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a id="sai_brand" class="navbar-brand" href="#!start">SAI</a>
</div> </div>
</div> </nav>
<!-- div class="col-md-10 sai_menu_first sai_left_divider" --> </div>
<!-- Collect the nav links, forms, and other content for toggling --> <!-- div class="col-md-10 sai_menu_first sai_left_divider" -->
<div class="col-md-10"> <!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navHeaderCollapse"> <div class="col-md-10 sai_margin_left_off sai_padding_left_off sai_padding_right_off">
<ul class="nav navbar-nav sai_menu_first sai_left_divider"> <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_start}
${menu_sys} ${menu_sys}
</ul> </ul>
</div><!-- /.navbar-collapse --> </div><!-- /.navbar-collapse -->
</div> </nav>
</nav> </div>
</div>
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
<ul class="nav nav-tabs nav-stacked sai_project_modules"> <ul class="nav nav-tabs nav-stacked sai_project_modules">
${menu_proj} ${menu_proj}
</ul> </ul>
</div> </div>
<div class="col-md-10 sai_left_divider"> <div class="col-md-10 sai_margin_left_off">
<div class="row"> <div class="row">
<div id="content"> <div id="content">
</div> </div>