diff --git a/sai/modules/saimod_sys_config/tpl/config.tpl b/sai/modules/saimod_sys_config/tpl/config.tpl index ff85c8c..70db09d 100644 --- a/sai/modules/saimod_sys_config/tpl/config.tpl +++ b/sai/modules/saimod_sys_config/tpl/config.tpl @@ -1,24 +1,24 @@

${sai_config_title}


- - - - + + + + - + ${basics} - + ${database} - + diff --git a/sai/modules/saimod_sys_cron/tpl/list_entry.tpl b/sai/modules/saimod_sys_cron/tpl/list_entry.tpl index 25d788f..a2226b8 100644 --- a/sai/modules/saimod_sys_cron/tpl/list_entry.tpl +++ b/sai/modules/saimod_sys_cron/tpl/list_entry.tpl @@ -14,10 +14,14 @@ - + + \ 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 c6af6c0..779ad6f 100644 --- a/sai/modules/saimod_sys_cron/tpl/tabs.tpl +++ b/sai/modules/saimod_sys_cron/tpl/tabs.tpl @@ -14,7 +14,9 @@ Last Visit: ${last_visit}
+ + ${content} @@ -27,6 +29,8 @@ Last Visit: ${last_visit}
+ +
Config IDConfig NameValue
Config IDConfig NameValue
Basics
Database
System Admin Interface - - + + + + +
last_run next_run status action
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 8f33ab0..3654bd6 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 @@ -4,6 +4,8 @@ Extension URL Action + + ${content} @@ -11,6 +13,8 @@
+ +
\ No newline at end of file diff --git a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl index 0ac16df..9e7e5e4 100644 --- a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl +++ b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl @@ -6,7 +6,11 @@ + + + + \ 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 b53f940..d9fb925 100644 --- a/sai/modules/saimod_sys_mod/saimod_sys_mod.php +++ b/sai/modules/saimod_sys_mod/saimod_sys_mod.php @@ -9,8 +9,8 @@ class saimod_sys_mod extends \SYSTEM\SAI\SaiModule { foreach($sys_mods as $mod){ $v = array(); $v['mod'] = $mod; - $v['public'] = \call_user_func(array($mod, 'right_public')) ? 'true' : 'false'; - $v['you'] = \call_user_func(array($mod, 'right_right')) ? 'true' : 'false'; + $v['public'] = \call_user_func(array($mod, 'right_public')) ? '' : ''; + $v['you'] = \call_user_func(array($mod, 'right_right')) ? '' : ''; $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_mod/tpl/mod_tr.tpl'),$v); } return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_mod/tpl/mod_table.tpl'),$vars); @@ -23,8 +23,8 @@ class saimod_sys_mod extends \SYSTEM\SAI\SaiModule { foreach($mods as $mod){ $v = array(); $v['mod'] = $mod; - $v['public'] = \call_user_func(array($mod, 'right_public')) ? 'true' : 'false'; - $v['you'] = \call_user_func(array($mod, 'right_right')) ? 'true' : 'false'; + $v['public'] = \call_user_func(array($mod, 'right_public')) ? '' : ''; + $v['you'] = \call_user_func(array($mod, 'right_right')) ? '' : ''; $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_mod/tpl/mod_tr.tpl'),$v); } return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_mod/tpl/mod_table.tpl'),$vars); diff --git a/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl b/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl index 4c0ddf1..84b1eb8 100644 --- a/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl +++ b/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl @@ -8,5 +8,5 @@ -
+
diff --git a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_edit_editor.tpl b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_edit_editor.tpl index dbffece..5f9de67 100644 --- a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_edit_editor.tpl +++ b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_edit_editor.tpl @@ -1,8 +1,6 @@ -Text ID: +
-
- -
+
\ No newline at end of file diff --git a/sai/page/css/sai_classes.css b/sai/page/css/sai_classes.css index 6c39396..642233b 100644 --- a/sai/page/css/sai_classes.css +++ b/sai/page/css/sai_classes.css @@ -23,29 +23,50 @@ .sai_padding_off { padding: 0;} -/* margins and paddings 10px */ +/* margins and paddings 10px and 20px */ -.sys_padding_top_10 { +.sai_padding_top_10 { padding-top: 10px;} -.sys_padding_left_10 { +.sai_padding_left_10 { padding-left: 10px;} -.sys_padding_right_10 { +.sai_padding_right_10 { padding-right: 10px;} -.sys_padding_bottom_10 { +.sai_padding_bottom_10 { padding-bottom: 10px;} -.sys_padding_10 { +.sai_padding_10 { padding: 10px;} -.sys_margin_top_10 { +.sai_margin_top_10 { margin-top: 10px;} -.sys_margin_left_10 { +.sai_margin_left_10 { margin-left: 10px;} -.sys_margin_right_10 { +.sai_margin_right_10 { margin-right: 10px;} -.sys_margin_bottom_10 { +.sai_margin_bottom_10 { margin-bottom: 10px;} -.sys_margin_10 { +.sai_margin_10 { margin: 10px;} +.sai_padding_top_20 { + padding-top: 20px;} +.sai_padding_left_20 { + padding-left: 20px;} +.sai_padding_right_20 { + padding-right: 20px;} +.sai_padding_bottom_20 { + padding-bottom: 20px;} +.sai_padding_20 { + padding: 20px;} +.sai_margin_top_20 { + margin-top: 20px;} +.sai_margin_left_20 { + margin-left: 20px;} +.sai_margin_right_20 { + margin-right: 20px;} +.sai_margin_bottom_20 { + margin-bottom: 20px;} +.sai_margin_20 { + margin: 20px;} + /* floatings */ .sai_float_left { @@ -73,4 +94,6 @@ border-left: 0;} .sai_p_modules:active { border-right: 3px solid #1C569C; - border-left: 0;} \ No newline at end of file + border-left: 0;} + +/* widthes and heights */ diff --git a/sai/page/js/sai.js b/sai/page/js/sai.js index 7f481d1..cf3f056 100644 --- a/sai/page/js/sai.js +++ b/sai/page/js/sai.js @@ -5,6 +5,7 @@ $(document).ready(function() { }); //autocollapse(); $(window).on('resize', autocollapse); + sai_sort_tables(); }); function sys_hashchange(state){ @@ -22,4 +23,23 @@ function autocollapse() { navbar.removeClass('collapsed'); // set standart view if(navbar.innerHeight() > 50) // check if we've got 2 lines navbar.addClass('collapsed'); // force collapse mode +} + +function sai_sort_tables(col) { + //console.log($('tr')); + //console.log($('tr.sai_not_sortable')); + var tableRows = $('tr'); + var sortArray = []; + for (var i = 0; i < tableRows.length; i++){ + sortArray.push(tableRows[i]); + if (tableRows[i].className === 'sai_not_sortable') { + array_sort(sortArray, col); + } + } +} + +function array_sort(sortArray, col){ + for (var i = 0; i < sortArray.length; i++){ + //console.log(sortArray[i].children[col]); + } } \ No newline at end of file