From f1c138da858450300fd7b0e15b021eb29741cd0c Mon Sep 17 00:00:00 2001 From: Messerbill Date: Mon, 1 Jun 2015 17:18:42 +0200 Subject: [PATCH] sai menu fix, buttons not hardcoded anymore --- sai/modules/saimod_sys_git/saimod_sys_git.php | 2 +- .../saimod_sys_log/tpl/saimod_sys_log.tpl | 10 ++-- .../saimod_sys_login/saimod_sys_login.php | 2 +- .../saimod_sys_security.php | 6 +- .../tpl/saimod_sys_security.tpl | 2 +- .../tpl/saimod_sys_security_deleteright.tpl | 4 +- .../tpl/saimod_sys_security_newright.tpl | 2 +- .../tpl/saimod_sys_security_user.tpl | 2 +- .../saimod_sys_security_user_rights_add.tpl | 2 +- .../saimod_sys_todo/tpl/saimod_sys_todo.tpl | 6 +- .../tpl/saimod_sys_todo_new.tpl | 4 +- .../tpl/saimod_sys_todo_todo.tpl | 6 +- .../tpl/saimod_sys_todo_todo_user.tpl | 8 +-- .../saistart_sys_sai/saistart_sys_sai.php | 2 +- sai/modules/saistart_sys_sai/tpl/content.tpl | 5 +- .../saistart_sys_sai/tpl/content_loggedin.tpl | 7 +-- sai/page/css/sai.css | 28 +++++++++ sai/page/tpl/sai.tpl | 57 ++++++++----------- 18 files changed, 86 insertions(+), 69 deletions(-) diff --git a/sai/modules/saimod_sys_git/saimod_sys_git.php b/sai/modules/saimod_sys_git/saimod_sys_git.php index 3ea116f..e421c77 100644 --- 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 '
  • ${sai_menu_git}
    • ';} - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return ' -
    -
    + +
    +
    +
    -
    \ No newline at end of file + \ No newline at end of file diff --git a/sai/modules/saimod_sys_login/saimod_sys_login.php b/sai/modules/saimod_sys_login/saimod_sys_login.php index 8a3e2a7..f124974 100644 --- 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 '
  • '.(\SYSTEM\SECURITY\Security::isLoggedIn() ? ' ${sai_menu_logout}' : ' ${sai_menu_login}').'
    • ';} - public static function html_li_menu(){return '
  • '.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '' : '').'
    • ';} + public static function html_li_menu(){return '
  • '.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '' : '').'
    • ';} public static function right_public(){return true;} public static function right_right(){return true;} diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.php b/sai/modules/saimod_sys_security/saimod_sys_security.php index df04182..6b072e9 100644 --- a/sai/modules/saimod_sys_security/saimod_sys_security.php +++ b/sai/modules/saimod_sys_security/saimod_sys_security.php @@ -15,13 +15,13 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule { $res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_RIGHTS::QQ(); while($r = $res->next()){ $r['right_edit_btn'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT) ? - ' - ' : + ' + ' : 'Missing rights.'; $rows .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_right.tpl'),$r);} $vars['rows'] = $rows; $vars['addright_btn'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT) ? - '
    ' : + '
    ' : 'You are missing the required rights for adding or removing rights.'; return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_rights.tpl'),$vars); } diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl index d5d2a45..a68f964 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl @@ -5,7 +5,7 @@
  • Users
  • Rights
    • - +
    diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl index c0e9675..e0c762e 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl @@ -13,5 +13,5 @@ ${description} - - \ No newline at end of file + + \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl index a03bc88..d581166 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl @@ -13,4 +13,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user.tpl index ed12cec..c7d3dc9 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user.tpl @@ -11,6 +11,6 @@ --> - + \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl index d6bf69b..bc8bd20 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl index 63116ab..590e29f 100644 --- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl +++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl @@ -6,9 +6,9 @@
  • DoTo
  • Statistics
    • - - - + + +
    diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_new.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_new.tpl index 276f63d..d8bf9ba 100644 --- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_new.tpl +++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_new.tpl @@ -1,5 +1,5 @@
    Message
    - - \ No newline at end of file + + \ No newline at end of file diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl index 5e011c2..cd21a6b 100644 --- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl +++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl @@ -21,6 +21,6 @@ thrown${thrown} message${message} - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl index 9154f9b..b9389e3 100644 --- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl +++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl @@ -10,7 +10,7 @@ user${username} message - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/sai/modules/saistart_sys_sai/saistart_sys_sai.php b/sai/modules/saistart_sys_sai/saistart_sys_sai.php index 6876525..cace188 100644 --- a/sai/modules/saistart_sys_sai/saistart_sys_sai.php +++ b/sai/modules/saistart_sys_sai/saistart_sys_sai.php @@ -7,7 +7,7 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule { \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_START)); return \SYSTEM\PAGE\replace::replaceFile( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/saistart.tpl'),$vars);} //public static function html_li_menu(){return '
  • ${sai_menu_start}
    • ';} - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return '
    • ';} public static function right_public(){return true;} public static function right_right(){return true;} diff --git a/sai/modules/saistart_sys_sai/tpl/content.tpl b/sai/modules/saistart_sys_sai/tpl/content.tpl index ad672f5..460c4a6 100644 --- a/sai/modules/saistart_sys_sai/tpl/content.tpl +++ b/sai/modules/saistart_sys_sai/tpl/content.tpl @@ -1,4 +1,4 @@ -
    +

    Design. Simple. Fast. Reliable. Innovative.

    We write awesome Software using SYSTEM and Twitter Bootstrap.

    @@ -57,5 +57,4 @@
    -
    -
    \ No newline at end of file + \ No newline at end of file diff --git a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl index 22c181c..359e147 100644 --- a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl +++ b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl @@ -1,5 +1,5 @@ -
    -

    ${sai_start_welcome}

    + +

    ${sai_start_welcome}

    ${sai_start_welcome_description}

    @@ -81,5 +81,4 @@

    ${basic_log}

    100 ${sai_log_latest_entries}

    -
    -
    \ No newline at end of file +
    \ No newline at end of file diff --git a/sai/page/css/sai.css b/sai/page/css/sai.css index 6f65eab..381aa47 100644 --- a/sai/page/css/sai.css +++ b/sai/page/css/sai.css @@ -16,6 +16,16 @@ color: #777; } +#content { + padding-left: 15px; + padding-top: 15px; + box-sizing: border-box; +} + +.sai_menu_no_right_margin { + +} + .carousel-img{ width: 1200px; height: 650px; @@ -33,6 +43,24 @@ 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; + box-sizing: border-box; +} + +.sai_navbar_top { + margin-bottom: 0; +} + /* auto collapsing navbar */ #sys_autocollapse.collapsed .navbar-header { diff --git a/sai/page/tpl/sai.tpl b/sai/page/tpl/sai.tpl index 45f3aea..cdae1ab 100644 --- a/sai/page/tpl/sai.tpl +++ b/sai/page/tpl/sai.tpl @@ -9,9 +9,8 @@ ${js} - -
    -
    -
    -
    -
      - ${menu_proj} -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    + +
    +
    +
      + ${menu_proj} +
    +
    +
    +
    +
    +
    +
    + +