From 4b51170869993dbc2540bbd2456cc72ea7db5ad4 Mon Sep 17 00:00:00 2001 From: Messerbill Date: Sun, 24 May 2015 03:44:18 +0200 Subject: [PATCH] added glyphicons --- sai/modules/saimod_sys_api/saimod_sys_api.php | 3 ++- sai/modules/saimod_sys_cache/saimod_sys_cache.php | 3 ++- sai/modules/saimod_sys_config/saimod_sys_config.php | 3 ++- sai/modules/saimod_sys_cron/saimod_sys_cron.php | 3 ++- sai/modules/saimod_sys_docu/saimod_sys_docu.php | 3 ++- sai/modules/saimod_sys_files/saimod_sys_files.php | 3 ++- sai/modules/saimod_sys_git/saimod_sys_git.php | 3 ++- sai/modules/saimod_sys_log/saimod_sys_log.php | 3 ++- sai/modules/saimod_sys_login/saimod_sys_login.php | 3 ++- sai/modules/saimod_sys_login/tpl/login.tpl | 2 +- sai/modules/saimod_sys_login/tpl/logout.tpl | 2 +- sai/modules/saimod_sys_mod/saimod_sys_mod.php | 3 ++- sai/modules/saimod_sys_page/saimod_sys_page.php | 3 ++- sai/modules/saimod_sys_security/saimod_sys_security.php | 3 ++- sai/modules/saimod_sys_text/saimod_sys_text.php | 3 ++- sai/modules/saimod_sys_todo/saimod_sys_todo.php | 3 ++- sai/modules/saistart_sys_sai/saistart_sys_sai.php | 3 ++- sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl | 2 +- 18 files changed, 33 insertions(+), 18 deletions(-) diff --git a/sai/modules/saimod_sys_api/saimod_sys_api.php b/sai/modules/saimod_sys_api/saimod_sys_api.php index 4ed564f..4a0d311 100644 --- a/sai/modules/saimod_sys_api/saimod_sys_api.php +++ b/sai/modules/saimod_sys_api/saimod_sys_api.php @@ -71,7 +71,8 @@ class saimod_sys_api extends \SYSTEM\SAI\SaiModule { } } - public static function html_li_menu(){return '
  • ${sai_menu_api}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_api}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) && \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_API);} diff --git a/sai/modules/saimod_sys_cache/saimod_sys_cache.php b/sai/modules/saimod_sys_cache/saimod_sys_cache.php index df88d2d..2b3f499 100644 --- a/sai/modules/saimod_sys_cache/saimod_sys_cache.php +++ b/sai/modules/saimod_sys_cache/saimod_sys_cache.php @@ -39,7 +39,8 @@ class saimod_sys_cache extends \SYSTEM\SAI\SaiModule { return 'success'; } - public static function html_li_menu(){return '
  • ${sai_menu_cache}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_cache}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} diff --git a/sai/modules/saimod_sys_config/saimod_sys_config.php b/sai/modules/saimod_sys_config/saimod_sys_config.php index 83d836f..b926a2a 100644 --- a/sai/modules/saimod_sys_config/saimod_sys_config.php +++ b/sai/modules/saimod_sys_config/saimod_sys_config.php @@ -64,7 +64,8 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule { 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT))); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config.tpl'),$vars); } - public static function html_li_menu(){return '
  • ${sai_menu_config}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_config}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} diff --git a/sai/modules/saimod_sys_cron/saimod_sys_cron.php b/sai/modules/saimod_sys_cron/saimod_sys_cron.php index 39061af..7a9513e 100644 --- a/sai/modules/saimod_sys_cron/saimod_sys_cron.php +++ b/sai/modules/saimod_sys_cron/saimod_sys_cron.php @@ -39,7 +39,8 @@ class saimod_sys_cron extends \SYSTEM\SAI\SaiModule { \SYSTEM\DBD\SYS_SAIMOD_CRON_DEL::QI(array($cls)); return \SYSTEM\LOG\JsonResult::ok();} - public static function html_li_menu(){return '
  • ${sai_menu_cron}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_cron}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_CRON);} diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.php b/sai/modules/saimod_sys_docu/saimod_sys_docu.php index 7c7c4c1..9ec4c5d 100644 --- a/sai/modules/saimod_sys_docu/saimod_sys_docu.php +++ b/sai/modules/saimod_sys_docu/saimod_sys_docu.php @@ -33,7 +33,8 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule { return 'not found'; } - public static function html_li_menu(){return '
  • ${sai_menu_docu}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_docu}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} diff --git a/sai/modules/saimod_sys_files/saimod_sys_files.php b/sai/modules/saimod_sys_files/saimod_sys_files.php index 1fee37e..a799dbe 100644 --- a/sai/modules/saimod_sys_files/saimod_sys_files.php +++ b/sai/modules/saimod_sys_files/saimod_sys_files.php @@ -43,7 +43,8 @@ class saimod_sys_files extends \SYSTEM\SAI\SaiModule { $vars['content'] = $result; return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl'), $vars);} - public static function html_li_menu(){return '
  • ${sai_menu_files}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_files}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) && \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_FILES);} diff --git a/sai/modules/saimod_sys_git/saimod_sys_git.php b/sai/modules/saimod_sys_git/saimod_sys_git.php index 3cb18e6..3ea116f 100644 --- a/sai/modules/saimod_sys_git/saimod_sys_git.php +++ b/sai/modules/saimod_sys_git/saimod_sys_git.php @@ -31,7 +31,8 @@ class saimod_sys_git extends \SYSTEM\SAI\SaiModule { return 'success'; } - public static function html_li_menu(){return '
  • ${sai_menu_git}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_git}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.php b/sai/modules/saimod_sys_log/saimod_sys_log.php index 023a352..7e06a13 100644 --- a/sai/modules/saimod_sys_log/saimod_sys_log.php +++ b/sai/modules/saimod_sys_log/saimod_sys_log.php @@ -343,7 +343,8 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { } } - public static function html_li_menu(){return '
  • ${sai_menu_log}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_log}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} diff --git a/sai/modules/saimod_sys_login/saimod_sys_login.php b/sai/modules/saimod_sys_login/saimod_sys_login.php index a6c666a..8a3e2a7 100644 --- a/sai/modules/saimod_sys_login/saimod_sys_login.php +++ b/sai/modules/saimod_sys_login/saimod_sys_login.php @@ -38,7 +38,8 @@ class saimod_sys_login extends \SYSTEM\SAI\SaiModule { $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOGIN); 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() ? ' ${sai_menu_logout}' : ' ${sai_menu_login}').'
  • ';} + 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_login/tpl/login.tpl b/sai/modules/saimod_sys_login/tpl/login.tpl index de58a03..b72e9f0 100644 --- a/sai/modules/saimod_sys_login/tpl/login.tpl +++ b/sai/modules/saimod_sys_login/tpl/login.tpl @@ -26,7 +26,7 @@
    - + ${basic_text_register}
    diff --git a/sai/modules/saimod_sys_login/tpl/logout.tpl b/sai/modules/saimod_sys_login/tpl/logout.tpl index 5fa742e..375c89f 100644 --- a/sai/modules/saimod_sys_login/tpl/logout.tpl +++ b/sai/modules/saimod_sys_login/tpl/logout.tpl @@ -96,7 +96,7 @@
    - +
    diff --git a/sai/modules/saimod_sys_mod/saimod_sys_mod.php b/sai/modules/saimod_sys_mod/saimod_sys_mod.php index e71249d..b53f940 100644 --- a/sai/modules/saimod_sys_mod/saimod_sys_mod.php +++ b/sai/modules/saimod_sys_mod/saimod_sys_mod.php @@ -32,7 +32,8 @@ class saimod_sys_mod extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_mod(){ return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_mod/tpl/mods.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_MOD));} - public static function html_li_menu(){return '
  • ${sai_menu_mod}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_mod}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} diff --git a/sai/modules/saimod_sys_page/saimod_sys_page.php b/sai/modules/saimod_sys_page/saimod_sys_page.php index 728fd7e..48ede75 100644 --- a/sai/modules/saimod_sys_page/saimod_sys_page.php +++ b/sai/modules/saimod_sys_page/saimod_sys_page.php @@ -66,7 +66,8 @@ class saimod_sys_page extends \SYSTEM\SAI\SaiModule { } } - public static function html_li_menu(){return '
  • ${sai_menu_page}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_page}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) && \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_API);} diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.php b/sai/modules/saimod_sys_security/saimod_sys_security.php index 72bea91..b9bd3a1 100644 --- a/sai/modules/saimod_sys_security/saimod_sys_security.php +++ b/sai/modules/saimod_sys_security/saimod_sys_security.php @@ -153,7 +153,8 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule { return 'error'; } - public static function html_li_menu(){return '
  • ${sai_menu_security}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_security}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) && \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY);} diff --git a/sai/modules/saimod_sys_text/saimod_sys_text.php b/sai/modules/saimod_sys_text/saimod_sys_text.php index 4a957ad..430bb07 100644 --- a/sai/modules/saimod_sys_text/saimod_sys_text.php +++ b/sai/modules/saimod_sys_text/saimod_sys_text.php @@ -75,7 +75,8 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_delete($id, $lang = null){ return \SYSTEM\PAGE\text::delete($id, $lang) ? \SYSTEM\LOG\JsonResult::ok() : \SYSTEM\LOG\JsonResult::fail();} - public static function html_li_menu(){return '
  • ${sai_menu_text}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_text}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) && \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_LOCALE);} diff --git a/sai/modules/saimod_sys_todo/saimod_sys_todo.php b/sai/modules/saimod_sys_todo/saimod_sys_todo.php index fa8b6af..c02b1e3 100644 --- a/sai/modules/saimod_sys_todo/saimod_sys_todo.php +++ b/sai/modules/saimod_sys_todo/saimod_sys_todo.php @@ -163,7 +163,8 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl'), $vars) : \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl'), $vars);} - public static function html_li_menu(){return '
  • ${sai_menu_todo}
  • ';} + //public static function html_li_menu(){return '
  • ${sai_menu_todo}
  • ';} + public static function html_li_menu(){return '
  • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} diff --git a/sai/modules/saistart_sys_sai/saistart_sys_sai.php b/sai/modules/saistart_sys_sai/saistart_sys_sai.php index c9d1c97..6876525 100644 --- a/sai/modules/saistart_sys_sai/saistart_sys_sai.php +++ b/sai/modules/saistart_sys_sai/saistart_sys_sai.php @@ -6,7 +6,8 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule { $vars = array_merge(array( 'content' => self::html_content()), \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 '
  • ${sai_menu_start}
  • ';} + 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_loggedin.tpl b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl index c670f19..7ccf4c2 100644 --- a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl +++ b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl @@ -39,7 +39,7 @@
    - +