diff --git a/lib/system/lib/system.css b/lib/system/lib/system.css index b9d8e72..59d53c2 100644 --- a/lib/system/lib/system.css +++ b/lib/system/lib/system.css @@ -6,4 +6,36 @@ table.sai_table tr:nth-child(odd) { } table.sai_table tr:hover { background-color: #FFEFD5; +} +table.sai_table { + word-break: break-all; +} + +a.active{ + background-color: #e7e7e7; +} + +#menu_start { + height: 50px; + font-size: 20px; + padding-top: 12px; + padding-left: 15px; + padding-right: 15px; + display: block; + color: #777; +} + +#menu_start:hover{ + text-decoration: none; + color: #555; +} + +#menu_start:focus{ + text-decoration: none; + color: #555; +} + +#menu_start:active{ + text-decoration: none; + color: #555; } \ No newline at end of file diff --git a/sai/modules/saimod_sys_api/saimod_sys_api.php b/sai/modules/saimod_sys_api/saimod_sys_api.php index fddda93..2ee3548 100644 --- a/sai/modules/saimod_sys_api/saimod_sys_api.php +++ b/sai/modules/saimod_sys_api/saimod_sys_api.php @@ -145,7 +145,7 @@ class saimod_sys_api extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_api/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_api/tpl/menu.tpl b/sai/modules/saimod_sys_api/tpl/menu.tpl new file mode 100644 index 0000000..7d45be2 --- /dev/null +++ b/sai/modules/saimod_sys_api/tpl/menu.tpl @@ -0,0 +1,6 @@ +
  • + + + + +
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_api/tpl/saimod_sys_api_list.tpl b/sai/modules/saimod_sys_api/tpl/saimod_sys_api_list.tpl index 7e921f1..718c458 100644 --- a/sai/modules/saimod_sys_api/tpl/saimod_sys_api_list.tpl +++ b/sai/modules/saimod_sys_api/tpl/saimod_sys_api_list.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/sai/modules/saimod_sys_cache/saimod_sys_cache.php b/sai/modules/saimod_sys_cache/saimod_sys_cache.php index c084323..e0966db 100644 --- a/sai/modules/saimod_sys_cache/saimod_sys_cache.php +++ b/sai/modules/saimod_sys_cache/saimod_sys_cache.php @@ -56,7 +56,7 @@ class saimod_sys_cache extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_cache/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_cache/tpl/menu.tpl b/sai/modules/saimod_sys_cache/tpl/menu.tpl new file mode 100644 index 0000000..c9f696f --- /dev/null +++ b/sai/modules/saimod_sys_cache/tpl/menu.tpl @@ -0,0 +1,6 @@ +
  • + + + + +
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_config/saimod_sys_config.php b/sai/modules/saimod_sys_config/saimod_sys_config.php index e2f39d5..bac8582 100644 --- a/sai/modules/saimod_sys_config/saimod_sys_config.php +++ b/sai/modules/saimod_sys_config/saimod_sys_config.php @@ -181,7 +181,7 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_config/tpl/config.tpl b/sai/modules/saimod_sys_config/tpl/config.tpl index b411ede..d473fd4 100644 --- a/sai/modules/saimod_sys_config/tpl/config.tpl +++ b/sai/modules/saimod_sys_config/tpl/config.tpl @@ -7,23 +7,4 @@
  • System Admin Interface
    • - - - \ No newline at end of file + \ No newline at end of file diff --git a/sai/modules/saimod_sys_config/tpl/menu.tpl b/sai/modules/saimod_sys_config/tpl/menu.tpl new file mode 100644 index 0000000..b085261 --- /dev/null +++ b/sai/modules/saimod_sys_config/tpl/menu.tpl @@ -0,0 +1,6 @@ +
  • + + + + +
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_cron/saimod_sys_cron.php b/sai/modules/saimod_sys_cron/saimod_sys_cron.php index 9d03a77..7cc27f1 100644 --- a/sai/modules/saimod_sys_cron/saimod_sys_cron.php +++ b/sai/modules/saimod_sys_cron/saimod_sys_cron.php @@ -93,7 +93,7 @@ class saimod_sys_cron extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_cron/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_cron/tpl/list_entry.tpl b/sai/modules/saimod_sys_cron/tpl/list_entry.tpl index 2cb647f..0e98691 100644 --- a/sai/modules/saimod_sys_cron/tpl/list_entry.tpl +++ b/sai/modules/saimod_sys_cron/tpl/list_entry.tpl @@ -17,14 +17,8 @@ - - - \ No newline at end of file diff --git a/sai/modules/saimod_sys_cron/tpl/menu.tpl b/sai/modules/saimod_sys_cron/tpl/menu.tpl new file mode 100644 index 0000000..2693f21 --- /dev/null +++ b/sai/modules/saimod_sys_cron/tpl/menu.tpl @@ -0,0 +1,6 @@ +
  • + + + + +
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_cron/tpl/tabs.tpl b/sai/modules/saimod_sys_cron/tpl/tabs.tpl index 6f861fb..e359bfa 100644 --- a/sai/modules/saimod_sys_cron/tpl/tabs.tpl +++ b/sai/modules/saimod_sys_cron/tpl/tabs.tpl @@ -3,7 +3,7 @@ Last Visit: ${last_visit}
    Start Cron
    -
    ID - - -
    +
    @@ -15,25 +15,19 @@ Last Visit: ${last_visit}
    - - - ${content} - - - - - - - - - + + + + + + diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.php b/sai/modules/saimod_sys_docu/saimod_sys_docu.php index 1d7a047..a419c15 100644 --- a/sai/modules/saimod_sys_docu/saimod_sys_docu.php +++ b/sai/modules/saimod_sys_docu/saimod_sys_docu.php @@ -75,7 +75,7 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_docu/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_docu/tpl/menu.tpl b/sai/modules/saimod_sys_docu/tpl/menu.tpl new file mode 100644 index 0000000..3c965df --- /dev/null +++ b/sai/modules/saimod_sys_docu/tpl/menu.tpl @@ -0,0 +1,7 @@ +
  • + + + + + +
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_files/saimod_sys_files.php b/sai/modules/saimod_sys_files/saimod_sys_files.php index f8bb84d..ba80ae5 100644 --- a/sai/modules/saimod_sys_files/saimod_sys_files.php +++ b/sai/modules/saimod_sys_files/saimod_sys_files.php @@ -94,7 +94,7 @@ class saimod_sys_files extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_files/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_files/tpl/menu.tpl b/sai/modules/saimod_sys_files/tpl/menu.tpl new file mode 100644 index 0000000..a881f02 --- /dev/null +++ b/sai/modules/saimod_sys_files/tpl/menu.tpl @@ -0,0 +1,6 @@ +
  • + + + + +
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl index 05ee318..bdac84a 100644 --- a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl +++ b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl @@ -1,4 +1,4 @@ -
    class last_run next_run status action
    +
    diff --git a/sai/modules/saimod_sys_git/saimod_sys_git.php b/sai/modules/saimod_sys_git/saimod_sys_git.php index cc5ba6a..c37be9b 100644 --- a/sai/modules/saimod_sys_git/saimod_sys_git.php +++ b/sai/modules/saimod_sys_git/saimod_sys_git.php @@ -58,7 +58,7 @@ class saimod_sys_git extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return ' +
    • Name
    +
    diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl index 947a271..3b28257 100644 --- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl +++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl @@ -6,7 +6,7 @@
    ${basic_rows}: ${count} ${basic_page}: ${page}
    -
    ${table_property}${table_value}
    ${table_id}${ID}
    ${table_class}${class}
    +
    diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_table_row.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_table_row.tpl index ad525d7..7b33c08 100644 --- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_table_row.tpl +++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_table_row.tpl @@ -1,11 +1,11 @@ - - + + - + \ 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 1204f2e..411f051 100644 --- a/sai/modules/saimod_sys_login/saimod_sys_login.php +++ b/sai/modules/saimod_sys_login/saimod_sys_login.php @@ -70,7 +70,7 @@ class saimod_sys_login extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return '
  • '.(\SYSTEM\SECURITY\security::isLoggedIn() ? '' : '').'
    • ';} + public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_login/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_login/tpl/menu.tpl b/sai/modules/saimod_sys_login/tpl/menu.tpl new file mode 100644 index 0000000..ac4bd1c --- /dev/null +++ b/sai/modules/saimod_sys_login/tpl/menu.tpl @@ -0,0 +1,7 @@ +
  • + + + + + +
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_mod/saimod_sys_mod.php b/sai/modules/saimod_sys_mod/saimod_sys_mod.php index cc849a6..7b33d84 100644 --- a/sai/modules/saimod_sys_mod/saimod_sys_mod.php +++ b/sai/modules/saimod_sys_mod/saimod_sys_mod.php @@ -96,7 +96,7 @@ class saimod_sys_mod extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_mod/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_mod/tpl/menu.tpl b/sai/modules/saimod_sys_mod/tpl/menu.tpl new file mode 100644 index 0000000..dc629b3 --- /dev/null +++ b/sai/modules/saimod_sys_mod/tpl/menu.tpl @@ -0,0 +1,6 @@ +
  • + + + + +
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_page/saimod_sys_page.php b/sai/modules/saimod_sys_page/saimod_sys_page.php index d63c760..278ae21 100644 --- a/sai/modules/saimod_sys_page/saimod_sys_page.php +++ b/sai/modules/saimod_sys_page/saimod_sys_page.php @@ -140,7 +140,7 @@ class saimod_sys_page extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_page/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_page/tpl/menu.tpl b/sai/modules/saimod_sys_page/tpl/menu.tpl new file mode 100644 index 0000000..e050cf8 --- /dev/null +++ b/sai/modules/saimod_sys_page/tpl/menu.tpl @@ -0,0 +1,6 @@ +
  • + + + + +
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_page/tpl/saimod_sys_page_list.tpl b/sai/modules/saimod_sys_page/tpl/saimod_sys_page_list.tpl index 13a6851..f84485b 100644 --- a/sai/modules/saimod_sys_page/tpl/saimod_sys_page_list.tpl +++ b/sai/modules/saimod_sys_page/tpl/saimod_sys_page_list.tpl @@ -1,4 +1,4 @@ -
    ${time_ago} ${table_class}
    ${time} ${class}${message}${file}${message}${file} ${line} ${ip}${server_name}:${server_port}${request_uri}${server_name}:${server_port}${request_uri} ${username} ${querytime}
    +
    diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.php b/sai/modules/saimod_sys_security/saimod_sys_security.php index 76faef8..c240808 100644 --- a/sai/modules/saimod_sys_security/saimod_sys_security.php +++ b/sai/modules/saimod_sys_security/saimod_sys_security.php @@ -353,7 +353,7 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_security/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_security/tpl/menu.tpl b/sai/modules/saimod_sys_security/tpl/menu.tpl new file mode 100644 index 0000000..df3e6c8 --- /dev/null +++ b/sai/modules/saimod_sys_security/tpl/menu.tpl @@ -0,0 +1,6 @@ +
  • + + + + +
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_users.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_users.tpl index 5000547..61ae243 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_users.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_users.tpl @@ -6,7 +6,7 @@
    ${basic_rows}: ${count} ${basic_page}: ${page}
    -
    id
    +
    diff --git a/sai/modules/saimod_sys_text/saimod_sys_text.php b/sai/modules/saimod_sys_text/saimod_sys_text.php index 6aa1bc7..04bce0b 100644 --- a/sai/modules/saimod_sys_text/saimod_sys_text.php +++ b/sai/modules/saimod_sys_text/saimod_sys_text.php @@ -185,7 +185,7 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_text/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_text/tpl/menu.tpl b/sai/modules/saimod_sys_text/tpl/menu.tpl new file mode 100644 index 0000000..9440730 --- /dev/null +++ b/sai/modules/saimod_sys_text/tpl/menu.tpl @@ -0,0 +1,6 @@ +
  • + + + + +
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_todo/saimod_sys_todo.php b/sai/modules/saimod_sys_todo/saimod_sys_todo.php index aa0bbf4..1e0fa1c 100644 --- a/sai/modules/saimod_sys_todo/saimod_sys_todo.php +++ b/sai/modules/saimod_sys_todo/saimod_sys_todo.php @@ -399,7 +399,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return '
    • ';} + public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_todo/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_todo/tpl/menu.tpl b/sai/modules/saimod_sys_todo/tpl/menu.tpl new file mode 100644 index 0000000..078c739 --- /dev/null +++ b/sai/modules/saimod_sys_todo/tpl/menu.tpl @@ -0,0 +1,6 @@ +
  • + + + + +
    • \ 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 3b59aaf..79cc85a 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 @@ -1,5 +1,5 @@

    ToDo ${ID}

    -
    ${table_id} ${table_username}
    +
    diff --git a/sai/modules/saistart_sys_sai/js/saistart_sys_sai.js b/sai/modules/saistart_sys_sai/js/saistart_sys_sai.js index fddb595..b540562 100644 --- a/sai/modules/saistart_sys_sai/js/saistart_sys_sai.js +++ b/sai/modules/saistart_sys_sai/js/saistart_sys_sai.js @@ -1,11 +1,6 @@ function init_saistart_sys_sai() { - - var heights = $(".inner-page").map(function() { - return $(this).height(); - }).get(), - maxHeight = Math.max.apply(null, heights); - - $(".inner-page").height(maxHeight); + // Set all Panels the same height + $(".inner-page").height(Math.max.apply(null, $(".inner-page").map(function(){return $(this).height();}).get())); //jqBootstrapValidation $("#login_form input").not("[type=submit]").jqBootstrapValidation({ preventSubmit: true, diff --git a/sai/modules/saistart_sys_sai/saistart_sys_sai.php b/sai/modules/saistart_sys_sai/saistart_sys_sai.php index 4a5c88e..c9553b1 100644 --- a/sai/modules/saistart_sys_sai/saistart_sys_sai.php +++ b/sai/modules/saistart_sys_sai/saistart_sys_sai.php @@ -22,7 +22,7 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule { */ public static function sai_mod__SYSTEM_SAI_saistart_sys_sai(){ if(!\SYSTEM\SECURITY\security::isLoggedIn() || !\SYSTEM\SECURITY\security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI)){ - return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saistart_sys_sai/tpl/content.tpl'))->SERVERPATH(),\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_START));} + return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saistart_sys_sai/tpl/content_loggedout.tpl'))->SERVERPATH(),\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_START));} //create timestamp $week_number = date("W", time()); $date = date("l M Y", time()); @@ -51,11 +51,11 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule { } /** - * Generate
  • Menu for the Saimod + * Generate Menu-Link for the Saimod * - * @return string Returns
  • Menu for the Saimod + * @return string Returns Html Menu for the Saimod */ - public static function html_li_menu(){return '
    • ';} + public static function html_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saistart_sys_sai/tpl/menu.tpl'))->SERVERPATH());} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saistart_sys_sai/tpl/carousel.tpl b/sai/modules/saistart_sys_sai/tpl/carousel.tpl deleted file mode 100644 index b4a0336..0000000 --- a/sai/modules/saistart_sys_sai/tpl/carousel.tpl +++ /dev/null @@ -1,61 +0,0 @@ -
    -

    Design. Simple. Fast. Reliable. Innovative.

    -

    We write awesome code and we use Twitter Bootstrap.

    -
    -
    - \ 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 f77c403..9a5ce25 100644 --- a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl +++ b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl @@ -1,94 +1,113 @@ -

    ${sai_start_welcome}

    -

    ${sai_start_welcome_description}

    -
    -
    Week of the year: ${week_number}, ${date}
    -
    -
    -
    ${basic_project}
    -
    -
    - ${basic_name}: ${project_name}
    - ${basic_url}: ${project_url}
    - ${basic_progress}: ${project}%
    -
    -
    PropertyValue
    ID${ID}
    class${class}
    - - - - - - - - ${userstats} -
    ${table_username}${table_open}${table_closed}${table_all}${table_percentage}
    - - - - -
    -
    -
    ${basic_logout}
    +
    +
    +

    ${sai_start_welcome}

    +
    +
    +

    ${sai_start_welcome_description}

    +
    +
    +
    +
    +
    + Week of the year: ${week_number}, ${date} +
    +
    +
    +
    +
    +
    ${basic_project}
    -
    - +
    + ${basic_name}: ${project_name}
    + ${basic_url}: ${project_url}
    + ${basic_progress}: ${project}%
    +
    +
    - - - - - - - - - - + + + + + + ${userstats}
    ${basic_username}${username}
    ${basic_locale}${locale}
    ${basic_admin_rights}${isadmin}${table_username}${table_open}${table_closed}${table_all}${table_percentage}
    - ${basic_text_logout} -
    - -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    ${basic_analytics}
    -
    -
    - ${analytics} -
    -
    -
    -
    -
    -
    ${basic_git}
    -
    -
    - Current Project Version: ${git_project}
    - Current SYSTEM Version: ${git_system} +
    +
    +
    +
    +
    ${basic_logout}
    +
    +
    + + + + + + + + + + + + + +
    ${basic_username}${username}
    ${basic_locale}${locale}
    ${basic_admin_rights}${isadmin}
    + ${basic_text_logout} +
    + +
    +
    + +
    -
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    ${basic_analytics}
    +
    +
    + ${analytics} +
    +
    +
    +
    +
    +
    +
    ${basic_git}
    +
    +
    + Current Project Version: ${git_project}
    + Current SYSTEM Version: ${git_system}
    -
    -

    ${basic_todo}

    - ${basic_status}: ${project_closed}/${project_all}
    - ${basic_progress}: ${project}% -
    -
    -
    -

    ${basic_log}

    -

    100 ${sai_log_latest_entries}

    -
    -
    \ No newline at end of file +
    +
    +
    +
    +
    +

    ${basic_todo}

    + ${basic_status}: ${project_closed}/${project_all}
    + ${basic_progress}: ${project}% +
    +
    +
    +
    +
    +
    +
    +

    ${basic_log}

    +

    100 ${sai_log_latest_entries}

    +
    +
    +
    +
    \ No newline at end of file diff --git a/sai/modules/saistart_sys_sai/tpl/content.tpl b/sai/modules/saistart_sys_sai/tpl/content_loggedout.tpl similarity index 69% rename from sai/modules/saistart_sys_sai/tpl/content.tpl rename to sai/modules/saistart_sys_sai/tpl/content_loggedout.tpl index 86c7a85..49a4efb 100644 --- a/sai/modules/saistart_sys_sai/tpl/content.tpl +++ b/sai/modules/saistart_sys_sai/tpl/content_loggedout.tpl @@ -1,22 +1,14 @@ - -

    Design. Simple. Fast. Reliable. Innovative.

    -

    We write awesome Software using SYSTEM and Twitter Bootstrap.

    -
    -
    - -
    +
    +
    +

    Design. Simple. Fast. Reliable. Innovative.

    +
    +
    +
    +
    +

    We write awesome Software using SYSTEM and Twitter Bootstrap.

    +
    +
    +
    ${basic_login}
    diff --git a/sai/modules/saistart_sys_sai/tpl/menu.tpl b/sai/modules/saistart_sys_sai/tpl/menu.tpl new file mode 100644 index 0000000..7f0cd4b --- /dev/null +++ b/sai/modules/saistart_sys_sai/tpl/menu.tpl @@ -0,0 +1,3 @@ + +   SAI + \ No newline at end of file diff --git a/sai/page/css/sai.css b/sai/page/css/sai.css index ddcac5d..a83d9d1 100644 --- a/sai/page/css/sai.css +++ b/sai/page/css/sai.css @@ -34,29 +34,4 @@ .nav-tabs { border: none; -} -/* auto collapsing navbar */ -#sys_autocollapse.collapsed .navbar-header { - float: none; -} -#sys_autocollapse.collapsed .navbar-toggle { - display: block; -} -#sys_autocollapse.collapsed .navbar-collapse { - border-top: 1px solid transparent; - box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); -} -#sys_autocollapse.collapsed .navbar-collapse.collapse { - display: none!important; -} -#sys_autocollapse.collapsed .navbar-nav { - float: none!important; - margin: 7.5px -15px; -} -#sys_autocollapse.collapsed .navbar-nav>li { - float: none; -} -#sys_autocollapse.collapsed .navbar-nav>li>a { - padding-top: 10px; - padding-bottom: 10px; } \ No newline at end of file diff --git a/sai/page/default_page.php b/sai/page/default_page.php index 3115918..a35d547 100644 --- a/sai/page/default_page.php +++ b/sai/page/default_page.php @@ -56,7 +56,7 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { $mod = \SYSTEM\SAI\sai::getStartModule(); if(\call_user_func(array($mod, 'right_public')) || \call_user_func(array($mod, 'right_right'))){ - return \call_user_func(array($mod, 'html_li_menu'));} + return \call_user_func(array($mod, 'html_menu'));} throw new \SYSTEM\LOG\ERROR('Your SAI-Start-Module has a Problem - either it does not exist or it is not public - which is required!');} /** @@ -87,8 +87,7 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { \LIB\lib_system::js(), new \SYSTEM\PSAI('page/js/sai.js')))). \SYSTEM\HTML\html::script( \LIB\lib_tinymce::js()->WEBPATH(false)). - \SYSTEM\HTML\html::script('https://www.google.com/jsapi'). - ''; + \SYSTEM\HTML\html::script('https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221.0%22%2C%22packages%22%3A%5B%22corechart%22%5D%7D%5D%7D'); } /** @@ -123,7 +122,7 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { $result = ''; $langs = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS); foreach($langs as $lang){ - $result .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('page/tpl/language.tpl'))->SERVERPATH(),array('lang' => $lang,'endpoint' => $endpoint));} + $result .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('page/tpl/language.tpl'))->SERVERPATH(),array('lang' => $lang));} return $result; } } \ No newline at end of file diff --git a/sai/page/js/sai.js b/sai/page/js/sai.js index b4fb77a..5e960dc 100644 --- a/sai/page/js/sai.js +++ b/sai/page/js/sai.js @@ -1,28 +1,18 @@ $(document).ready(function() { new SYSTEM('./sai.php',42,'start',sys_hashchange); - $('.brand').click(function(){ - location.reload(); - }); $('[data-toggle="tooltip"]').tooltip(); - //autocollapse(); - $(window).on('resize', autocollapse); + $('.navbar-collapse a').click(function(){ + $(".navbar-collapse").collapse('hide'); + }); }); function sys_hashchange(state){ var state_ = state ? state.split(';')[0].split('(')[0] : state; var state_ = state_ ? state_.split('#')[0] : state; - $('.nav li,#sai_navbar li, #project_navbar li').each(function(){ + $('.nav li,#sai_navbar li, #project_navbar li, #menu_start').each(function(){ $(this).removeClass('active');}); if($('#menu_'+state_).parent().length){ $('#menu_'+state_).parent().addClass('active'); } else { - $('#menu_start').parent().addClass('active');} -} - -function autocollapse() { - $('.navbar-collapse').collapse('show'); - var navbar = $('#sys_autocollapse'); - navbar.removeClass('collapsed'); // set standart view - if(navbar.innerHeight() > 50) // check if we've got 2 lines - navbar.addClass('collapsed'); // force collapse mode + $('#menu_start').addClass('active');} } \ No newline at end of file diff --git a/sai/page/tpl/language.tpl b/sai/page/tpl/language.tpl index 6d45b57..07810a6 100644 --- a/sai/page/tpl/language.tpl +++ b/sai/page/tpl/language.tpl @@ -1 +1 @@ -${lang}  \ No newline at end of file +${lang}  \ No newline at end of file diff --git a/sai/page/tpl/sai.tpl b/sai/page/tpl/sai.tpl index f746ac0..1f05e33 100644 --- a/sai/page/tpl/sai.tpl +++ b/sai/page/tpl/sai.tpl @@ -3,8 +3,8 @@ ${sai_title} - - + + ${css} ${js} @@ -17,20 +17,21 @@
    -