From c4bab4a85b1a68590d84402825906cd503c5f6ac Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 6 Apr 2015 04:41:06 +0200 Subject: [PATCH] sai statesystem fixes, project percentage on frontpage --- files/sys/system.css | 9 +++++++++ sai/modules/saimod_sys_api/js/saimod_sys_api.js | 9 ++++----- sai/modules/saimod_sys_cron/js/saimod_sys_cron.js | 12 ++++++------ sai/modules/saimod_sys_text/saimod_sys_text.php | 2 +- .../saistart_sys_sai/css/saistart_sys_sai.css | 4 ++++ sai/modules/saistart_sys_sai/saistart_sys_sai.php | 12 +++--------- sai/modules/saistart_sys_sai/tpl/content.tpl | 8 ++++++-- sai/page/css/sai_table.css | 9 --------- sai/page/default_page.php | 6 ++---- 9 files changed, 35 insertions(+), 36 deletions(-) create mode 100644 sai/modules/saistart_sys_sai/css/saistart_sys_sai.css delete mode 100644 sai/page/css/sai_table.css diff --git a/files/sys/system.css b/files/sys/system.css index e69de29..b9d8e72 100644 --- a/files/sys/system.css +++ b/files/sys/system.css @@ -0,0 +1,9 @@ +table.sai_table tr:nth-child(even) { + background-color: #FFFFFF; +} +table.sai_table tr:nth-child(odd) { + background-color: #EEEEEE; +} +table.sai_table tr:hover { + background-color: #FFEFD5; +} \ No newline at end of file diff --git a/sai/modules/saimod_sys_api/js/saimod_sys_api.js b/sai/modules/saimod_sys_api/js/saimod_sys_api.js index ea8b3ad..7bfe99a 100644 --- a/sai/modules/saimod_sys_api/js/saimod_sys_api.js +++ b/sai/modules/saimod_sys_api/js/saimod_sys_api.js @@ -7,7 +7,7 @@ function init_saimod_sys_api() { } function saimod_sys_api_loadcontent(){ - $('#api_wrapper').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_api', function(){ + $('#api_wrapper').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_api', function(){ console.log('api module loaded'); saimod_sys_api_register_clickevents(); }); @@ -16,10 +16,9 @@ function saimod_sys_api_loadcontent(){ function saimod_sys_api_register_clickevents(){ $('tr.api_entries').click(function() { - console.log("ahsf"); currentID = $(this).attr("id"); $.ajax({ - url: SAI_ENDPOINT, + url: './sai.php', data: { sai_mod: '.SYSTEM.SAI.saimod_sys_api', action: 'deletedialog', ID: currentID}, @@ -35,7 +34,7 @@ function saimod_sys_api_register_clickevents(){ }); $('#del_api_del').click(function() { $.ajax({ - url: SAI_ENDPOINT, + url: './sai.php', data: { sai_mod: '.SYSTEM.SAI.saimod_sys_api', action: 'deletecall', ID: currentID}, @@ -55,7 +54,7 @@ function saimod_sys_api_register_clickevents(){ var name = $('#new_call_name').val(); var verify = $('#new_call_verify').val(); $.ajax({ - url: SAI_ENDPOINT, + url: './sai.php', data: { sai_mod: '.SYSTEM.SAI.saimod_sys_api', action: 'addcall', ID: id, diff --git a/sai/modules/saimod_sys_cron/js/saimod_sys_cron.js b/sai/modules/saimod_sys_cron/js/saimod_sys_cron.js index ae5f618..5b17e6f 100644 --- a/sai/modules/saimod_sys_cron/js/saimod_sys_cron.js +++ b/sai/modules/saimod_sys_cron/js/saimod_sys_cron.js @@ -8,12 +8,12 @@ function init_saimod_sys_cron() { function register_cron_change(){ $('.btn_cron_status').click(function(){ $.ajax({ type :'GET', - url : SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_cron&action=change'+ + url : './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_cron&action=change'+ '&cls='+$(this).attr('_class')+ '&status='+$('#select_status_'+$(this).attr('_i')).val(), success : function(data) { if(data.status){ - $('#content-wrapper').load(SAI_ENDPOINT + 'sai_mod=.SYSTEM.SAI.saimod_sys_cron',function(){ + $('#content-wrapper').load('./sai.php' + 'sai_mod=.SYSTEM.SAI.saimod_sys_cron',function(){ init__SYSTEM_SAI_saimod_sys_cron(); }); }else{ @@ -26,11 +26,11 @@ function register_cron_change(){ function register_cron_del(){ $('.btn_cron_del').click(function(){ $.ajax({ type :'GET', - url : SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_cron&action=del'+ + url : './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_cron&action=del'+ '&cls='+$(this).attr('_class'), success : function(data) { if(data.status){ - $('#content-wrapper').load(SAI_ENDPOINT + 'sai_mod=.SYSTEM.SAI.saimod_sys_cron',function(){ + $('#content-wrapper').load('./sai.php' + 'sai_mod=.SYSTEM.SAI.saimod_sys_cron',function(){ init__SYSTEM_SAI_saimod_sys_cron(); }); }else{ @@ -60,7 +60,7 @@ function register_cron_add(){ var day = $('#input_cron_day').val(); var day_week = $('#input_cron_day_week').val(); var month = $('#input_cron_month').val(); - $.ajax({url: SAI_ENDPOINT, + $.ajax({url: './sai.php', data: { sai_mod: '.SYSTEM.SAI.saimod_sys_cron', action: 'add', cls: cls, @@ -72,7 +72,7 @@ function register_cron_add(){ type: 'GET', success: function(data) { if(data.status){ - $('#content-wrapper').load(SAI_ENDPOINT + 'sai_mod=.SYSTEM.SAI.saimod_sys_cron',function(){ + $('#content-wrapper').load('./sai.php' + 'sai_mod=.SYSTEM.SAI.saimod_sys_cron',function(){ init__SYSTEM_SAI_saimod_sys_cron(); }); }else{ diff --git a/sai/modules/saimod_sys_text/saimod_sys_text.php b/sai/modules/saimod_sys_text/saimod_sys_text.php index 7931d09..058bcaa 100644 --- a/sai/modules/saimod_sys_text/saimod_sys_text.php +++ b/sai/modules/saimod_sys_text/saimod_sys_text.php @@ -89,6 +89,6 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule { //public static function css(){} public static function js(){ - return array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tinymce/tinymce.min.js'), + return array( // \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tinymce/tinymce.min.js'), \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/js/saimod_sys_text.js'));} } \ No newline at end of file diff --git a/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css b/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css new file mode 100644 index 0000000..73c2ddb --- /dev/null +++ b/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css @@ -0,0 +1,4 @@ +#project { + font-size: 22px; + margin: 15px; +} \ 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 bfa25e8..f697a72 100644 --- a/sai/modules/saistart_sys_sai/saistart_sys_sai.php +++ b/sai/modules/saistart_sys_sai/saistart_sys_sai.php @@ -12,14 +12,8 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule { public static function right_public(){return true;} public static function right_right(){return true;} - //public static function sai_mod__SYSTEM_SAI_saistart_sys_sai_flag_css(){} - /*public static function sai_mod__SYSTEM_SAI_saistart_sys_sai_flag_js(){ - return \SYSTEM\LOG\JsonResult::toString( - array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/jqBootstrapValidation.js'), - \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/saistart_sys_sai.js'), - \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.md5.js'), - \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.sha1.js') - ));} */ + public static function css(){ + return array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/css/saistart_sys_sai.css'));} public static function js(){ return array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/jqBootstrapValidation.js'), \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/js/saistart_sys_sai.js'), @@ -28,7 +22,7 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule { } protected static function html_content(){ - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content.tpl'), array());} + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content.tpl'), \SYSTEM\SAI\saimod_sys_todo::statistics());} protected static function html_login(){ return \SYSTEM\SECURITY\Security::isLoggedIn() ? \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/logout.tpl'), array()) : \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/login.tpl'), array());} diff --git a/sai/modules/saistart_sys_sai/tpl/content.tpl b/sai/modules/saistart_sys_sai/tpl/content.tpl index 30df80a..d502706 100644 --- a/sai/modules/saistart_sys_sai/tpl/content.tpl +++ b/sai/modules/saistart_sys_sai/tpl/content.tpl @@ -1,13 +1,17 @@ Welcome to the SYSTEM Admin Interface - short SAI.
From here you can control and manage your Website. +
+ ${project}% Project Progress +
+