added sai_classes.css -> simple sai classes outsourced

2015-06-03 00:18:45 +02:00 · 2015-06-03 00:18:45 +02:00 · 0f968bebee
commit 0f968bebee
parent aab54f32a9
6 changed files with 80 additions and 76 deletions
--- a/sai/modules/saimod_sys_git/saimod_sys_git.php
+++ b/sai/modules/saimod_sys_git/saimod_sys_git.php
@ -32,7 +32,7 @@ class saimod_sys_git extends \SYSTEM\SAI\SaiModule {
    }
    
    //public static function html_li_menu(){return '<li><a id="menu_git" href="#!git"><span class="glyphicon glyphicon-saved" aria-hidden="true"></span>${sai_menu_git}</a></li>';}
-    public static function html_li_menu(){return '</ul><ul class="nav navbar-nav navbar-right sai_left_divider"><li><a id="menu_git" href="#!git"><span class="glyphicon glyphicon-saved" aria-hidden="true"></span></a></li>';}
+    public static function html_li_menu(){return '</ul><ul class="nav navbar-nav navbar-right sai_divider_left"><li><a id="menu_git" href="#!git"><span class="glyphicon glyphicon-saved" aria-hidden="true"></span></a></li>';}
    public static function right_public(){return false;}    
    public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
    
--- a/sai/modules/saimod_sys_login/saimod_sys_login.php
+++ b/sai/modules/saimod_sys_login/saimod_sys_login.php
@ -39,7 +39,7 @@ class saimod_sys_login extends \SYSTEM\SAI\SaiModule {
        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_login/tpl/register.tpl'), $vars);}

    //public static function html_li_menu(){return '<li><a id="menu_login" href="#!login">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '<span class="glyphicon glyphicon-log-out" aria-hidden="true"></span> ${sai_menu_logout}' : '<span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> ${sai_menu_login}').'</a></li>';}
-        public static function html_li_menu(){return '<li class="sai_left_divider"><a id="menu_login" href="#!login">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '<span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>' : '<span class="glyphicon glyphicon-log-in" aria-hidden="true"></span>').'</a></li>';}
+        public static function html_li_menu(){return '<li class="sai_divider_left"><a id="menu_login" href="#!login">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '<span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>' : '<span class="glyphicon glyphicon-log-in" aria-hidden="true"></span>').'</a></li>';}
    public static function right_public(){return true;}    
    public static function right_right(){return true;}
    
--- a/sai/page/css/sai.css
+++ b/sai/page/css/sai.css
@ -1,101 +1,28 @@
 #project_navbar{
-/*    width:224px;*/
-/*    position: fixed;*/
    left: 0px;
    bottom: 0px;
    top: 38px;
 }
-
 #footer{
    text-align: right;
    padding-right: 20px;
    color: #777;
 }
-
 #footer a{
    color: #777;
 }
-
 #content {
    padding-top: 20px;
    box-sizing: border-box;
 }
-
-.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;
 }
-
-.sai_p_modules {
-    border-left: 3px solid #1C569C;
-}
-.sai_p_modules:hover {
-    border-right: 3px solid #1C569C;
-    border-left: 0;
-}
-.sai_p_modules:active {
-    border-right: 3px solid #1C569C;
-    border-left: 0;
-}
-
-.sys_top_padding {
-    padding-top: 10px;
-}
-
 .sai_menu_first {
    padding-left: 0;
    margin-left: 0;
 }
-
-.sai_left_divider {
-    border-left: 1px solid #e7e7e7;
-}
-
-.sai_right_divider {
-    border-right: 1px solid #e7e7e7;
-}
-
-.sai_project_menu_box {
-    border: 1px solid #e7e7e7;
-}
-
-.sai_navbar_top {
-    margin-bottom: 0;
-}
-
 .sai_main_menu {
    border-radius: 3px 3px 3px 0;
 }
--- a/sai/page/css/sai_classes.css
+++ b/sai/page/css/sai_classes.css
@ -0,0 +1,76 @@
+/*
+    remove margins and paddings
+*/
+
+.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_margin_off {
+    margin: 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;}
+.sai_padding_off {
+    padding: 0;}
+
+/* margins and paddings 10px */
+
+.sys_padding_top_10 {
+    padding-top: 10px;}
+.sys_padding_left_10 {
+    padding-left: 10px;}
+.sys_padding_right_10 {
+    padding-right: 10px;}
+.sys_padding_bottom_10 {
+    padding-bottom: 10px;}
+.sys_padding_10 {
+    padding: 10px;}
+.sys_margin_top_10 {
+    margin-top: 10px;}
+.sys_margin_left_10 {
+    margin-left: 10px;}
+.sys_margin_right_10 {
+    margin-right: 10px;}
+.sys_margin_bottom_10 {
+    margin-bottom: 10px;}
+.sys_margin_10 {
+    margin: 10px;}
+
+/* floatings */
+
+.sai_float_left {
+    float: left;}
+.sai_float_right {
+    float: right;}
+.sai_float_clear {
+    clear: both;}
+
+/* borders */
+
+.sai_divider_left {
+    border-left: 1px solid #e7e7e7;}
+.sai_divider_right {
+    border-right: 1px solid #e7e7e7;}
+
+/* borders modules */
+
+.sai_project_menu_box {
+    border: 1px solid #e7e7e7;}
+.sai_p_modules {
+    border-left: 3px solid #1C569C;}
+.sai_p_modules:hover {
+    border-right: 3px solid #1C569C;
+    border-left: 0;}
+.sai_p_modules:active {
+    border-right: 3px solid #1C569C;
+    border-left: 0;}
--- a/sai/page/default_page.php
+++ b/sai/page/default_page.php
@ -33,6 +33,7 @@ class default_page extends \SYSTEM\PAGE\Page {
    private static function css(){
        $result =   '<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/libs/bootstrap.min.css').'" type="text/css" />'.
                    '<link rel="stylesheet" href="./sai.php?call=files&amp;cat=sys&amp;id=system.css" type="text/css" />'.
+                    '<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/sai_classes.css').'" type="text/css" />'.
                    '<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/sai.css').'" type="text/css" />';
        return $result;
    }
--- a/sai/page/tpl/sai.tpl
+++ b/sai/page/tpl/sai.tpl
@ -17,7 +17,7 @@
                <!-- 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">
+                    <nav id="sys_autocollapse" class="navbar navbar-default 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>