diff --git a/dbd/sql/mysql/data/system_page.sql b/dbd/sql/mysql/data/system_page.sql index 4cd2088..170bd28 100644 --- a/dbd/sql/mysql/data/system_page.sql +++ b/dbd/sql/mysql/data/system_page.sql @@ -43,8 +43,8 @@ INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (105, 42, 'delright', 'security', 100, 0, 1, '#tab_security', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action=deleterightconfirm&id=${id}', 'init_saimod_sys_security_delright', '\\SYSTEM\\SAI\\saimod_sys_security'); INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (110, 42, 'text', 'text', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_text', 'init_saimod_sys_text', '\\SYSTEM\\SAI\\saimod_sys_text'); -INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (111, 42, 'tag', 'text', 110, 0, 0, '#tab_content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_text&action=tag&tag=${tag}', 'init_saimod_sys_text_tag', '\\SYSTEM\\SAI\\saimod_sys_text'); -INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (112, 42, 'notag', 'text', 110, 0, 1, '#tab_content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_text&action=notag', 'init_saimod_sys_text_notag', '\\SYSTEM\\SAI\\saimod_sys_text'); +INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (111, 42, 'tag', 'text', 110, 0, 0, '#tab_content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_text&action=tag&tag=${tag}&filter=${filter}&search=${search}&page=${page}', 'init_saimod_sys_text_tag', '\\SYSTEM\\SAI\\saimod_sys_text'); +-- INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (112, 42, 'notag', 'text', 110, 0, 1, '#tab_content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_text&action=notag', 'init_saimod_sys_text_notag', '\\SYSTEM\\SAI\\saimod_sys_text'); INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (115, 42, 'edittext', 'text', 110, 0, 1, '#tab_content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_text&action=edittext&id=${id}&lang=${lang}', '', ''); INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (116, 42, 'editor', 'text', 115, 0, 1, '#tab_editor', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_text&action=editor&id=${id}&lang=${lang}', 'init_saimod_sys_text_editor', '\\SYSTEM\\SAI\\saimod_sys_text'); diff --git a/dbd/sql/mysql/data/system_sai_api.sql b/dbd/sql/mysql/data/system_sai_api.sql index 15735cd..b79db12 100644 --- a/dbd/sql/mysql/data/system_sai_api.sql +++ b/dbd/sql/mysql/data/system_sai_api.sql @@ -102,7 +102,10 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (700, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_text', 'action', NULL); -- INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (703, 42, 3, 700, 'tag', 'tag', 'STRING'); -INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (705, 42, 2, 700, 'loadByTag', 'lang', 'LANG'); +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (704, 42, 3, 700, 'tag', 'filter', 'STRING'); +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (705, 42, 3, 700, 'tag', 'search', 'STRING'); +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (706, 42, 3, 700, 'tag', 'page', 'UINT0'); +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (710, 42, 2, 700, 'loadByTag', 'lang', 'LANG'); -- INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (712, 42, 2, 700, 'edittext', 'id', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (713, 42, 2, 700, 'edittext', 'lang', 'LANG'); diff --git a/dbd/sql/mysql/data/system_text.sql b/dbd/sql/mysql/data/system_text.sql index 34b9ba5..ed3a0d2 100644 --- a/dbd/sql/mysql/data/system_text.sql +++ b/dbd/sql/mysql/data/system_text.sql @@ -270,6 +270,7 @@ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_search', 'sai_todo'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_search', 'sai_security'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_search', 'sai_log'); + INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_search', 'sai_text'); DELETE FROM `system_text` WHERE id = 'basic_progress'; DELETE FROM `system_text_tag` WHERE id = 'basic_progress'; @@ -306,6 +307,7 @@ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_rows', 'basic'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_rows', 'sai_log'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_rows', 'sai_todo'); + INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_rows', 'sai_text'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_rows', 'sai_security'); DELETE FROM `system_text` WHERE id = 'basic_save'; @@ -467,6 +469,7 @@ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_search', 'basic'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_search', 'sai_security'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_search', 'sai_todo'); + INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_search', 'sai_text'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_search', 'sai_log'); DELETE FROM `system_text` WHERE id = 'basic_send_email'; @@ -604,6 +607,7 @@ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_page', 'basic'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_page', 'sai_todo'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_page', 'sai_log'); + INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_page', 'sai_text'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_page', 'sai_security'); DELETE FROM `system_text` WHERE id = 'basic_add_right'; diff --git a/sai/modules/saimod_sys_text/js/saimod_sys_text.js b/sai/modules/saimod_sys_text/js/saimod_sys_text.js index 9a18ae9..c100e49 100644 --- a/sai/modules/saimod_sys_text/js/saimod_sys_text.js +++ b/sai/modules/saimod_sys_text/js/saimod_sys_text.js @@ -13,11 +13,17 @@ function init_saimod_sys_text() { }); } +function register_search(){ + $('#btn_search').click(function(){ + system.load($(this).attr('state')+$('#input_search').val(),true); + }); +} + function text_menu(){ $('#tabs_text li').each(function(){ $(this).removeClass('active');}); if(system.cur_state().split('.')[1]){ - $('#menu_tag_'+system.cur_state().split(';')[1].split('.')[1]).parent().addClass('active'); + $('#menu_tag_'+system.cur_state().split(';')[1].split('.')[1].split(';')[0]).parent().addClass('active'); } else { $('#menu_tag_all').parent().addClass('active');} }; @@ -26,22 +32,16 @@ function text2_menu(){ $('#tabs2_text li').each(function(){ $(this).removeClass('active');}); if($('#menu_lang_'+system.cur_state().split('.')[2]).length){ - $('#menu_lang_'+system.cur_state().split('.')[2]).parent().addClass('active'); + $('#menu_lang_'+system.cur_state().split('.')[2].split(';')[0]).parent().addClass('active'); } else { $('.menu_lang_default').parent().addClass('active');} }; -function init_saimod_sys_text_notag(){ - $("#sai_mod_text_table").tablesorter(); - $('#tabs_text li').each(function(){ - $(this).removeClass('active');}); - $('#menu_tag_notag').parent().addClass('active'); -} - function init_saimod_sys_text_tag(){ $("#sai_mod_text_table").tablesorter(); text_menu(); text2_menu(); + register_search(); }; function init_saimod_sys_text_editor(){ diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT.php new file mode 100644 index 0000000..04f13c5 --- /dev/null +++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT.php @@ -0,0 +1,15 @@ +next()){ - $entries .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list_entry.tpl'), $r); + if($filter == 'all'){ + $count = \SYSTEM\DBD\SYS_SAIMOD_TEXT_COUNT_TAG::Q1(array($tag,$search,$search,$search))['count']; + $res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_TEXT_TAG::QQ(array($tag,$search,$search,$search)); + } else { + $count = \SYSTEM\DBD\SYS_SAIMOD_TEXT_COUNT_TAG_FILTER::Q1(array($tag,$filter,$search,$search,$search))['count']; + $res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_TEXT_TAG_FILTER::QQ(array($tag,$filter,$search,$search,$search)); + } } - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TEXT); - $vars['entries'] = $entries; + $vars = array(); + $vars['tag'] = $tag; + $vars['filter'] = $filter; + $vars['search'] = $search; + $vars['page'] = $page; + $vars['entries'] = ''; + $count_filtered = 0; + $res->seek(100*$page); + while(($r = $res->next()) && ($count_filtered < 100)){ + $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list_entry.tpl'), $r); + $count_filtered++;} + $vars['pagination'] = ''; + $vars['page_last'] = ceil($count/100)-1; + for($i=0;$i < ceil($count/100);$i++){ + $data = array('page' => $i,'search' => $search, 'filter' => $filter, 'active' => ($i == $page) ? 'active' : '', 'tag' => $tag); + $vars['pagination'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_pagination.tpl'), $data); + } + $vars['count'] = $count_filtered.'/'.$count; + $vars['lang_filter'] = ''; + $res = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS); + foreach($res as $lang){ + $data = array('active' => ($filter == $lang ? 'active' : ''), 'filter' => $lang, 'search' => $search, 'name' => $lang, 'tag' => $tag); + $vars['lang_filter'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_lang_filter.tpl'),$data);} + $vars['active'] = ($filter == 'all' ? 'active' : ''); + $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TEXT)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list.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 84b1eb8..f72f450 100644 --- a/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl +++ b/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl @@ -3,7 +3,7 @@
\ No newline at end of file diff --git a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_list_entry.tpl b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_list_entry.tpl index bcc0694..0fd81ff 100644 --- a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_list_entry.tpl +++ b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_list_entry.tpl @@ -1,6 +1,6 @@ ${id} - ${lang} (${count}) + ${lang} ${text} ${author_name} ${time_create} diff --git a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_pagination.tpl b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_pagination.tpl new file mode 100644 index 0000000..900428f --- /dev/null +++ b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_pagination.tpl @@ -0,0 +1 @@ +
  • ${page}
    • \ No newline at end of file