diff --git a/dbd/qq/SYS_CACHE_DELETE_ALL.php b/dbd/qq/SYS_CACHE_DELETE_ALL.php
index f8dff08..14546ca 100644
--- a/dbd/qq/SYS_CACHE_DELETE_ALL.php
+++ b/dbd/qq/SYS_CACHE_DELETE_ALL.php
@@ -5,6 +5,7 @@ class SYS_CACHE_DELETE_ALL extends \SYSTEM\DB\QQ {
protected static function query(){
return new \SYSTEM\DB\QQuery(get_class(),
//pg
-'DELETE FROM system.cache;'
+'DELETE FROM system.cache;',
//mys
+'DELETE FROM system_cache;'
);}}
\ No newline at end of file
diff --git a/dbd/sql/mysql/data/system_page.sql b/dbd/sql/mysql/data/system_page.sql
index 3524733..9dda537 100644
--- a/dbd/sql/mysql/data/system_page.sql
+++ b/dbd/sql/mysql/data/system_page.sql
@@ -40,6 +40,7 @@ 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 (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 (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_text.sql b/dbd/sql/mysql/data/system_text.sql
index 197799d..01317bc 100644
--- a/dbd/sql/mysql/data/system_text.sql
+++ b/dbd/sql/mysql/data/system_text.sql
@@ -506,6 +506,20 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_close_all', 'enUS', 'Close all', 2, 1, '2015-04-16 23:11:18', '2015-04-16 23:11:18');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_close_all', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_close_all', 'sai_todo');
+
+ DELETE FROM `system_text` WHERE id = 'basic_git';
+ DELETE FROM `system_text_tag` WHERE id = 'basic_git';
+ INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_git', 'deDE', 'Git', 1, 1, '2015-04-16 23:11:18', '2015-04-16 16:48:36');
+ INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_git', 'enUS', 'Git', 2, 1, '2015-04-16 23:11:18', '2015-04-16 23:11:18');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_git', 'basic');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_git', 'sai_start');
+
+ DELETE FROM `system_text` WHERE id = 'basic_open';
+ DELETE FROM `system_text_tag` WHERE id = 'basic_open';
+ INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_open', 'deDE', 'Öffnen', 1, 1, '2015-04-16 23:11:18', '2015-04-16 16:48:36');
+ INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_open', 'enUS', 'Open', 2, 1, '2015-04-16 23:11:18', '2015-04-16 23:11:18');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_open', 'basic');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_open', 'sai_todo');
-- SAI
DELETE FROM `system_text` WHERE id = 'sai_api_title';
@@ -815,6 +829,7 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_class', 'deDE', 'Klasse(class)', 2, 2, '2015-04-23 01:58:51', '2015-04-23 01:58:51');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_class', 'enUS', 'Class', 2, 2, '2015-04-18 14:42:56', '2015-04-18 14:42:56');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_class', 'sai_log');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_class', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_class', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_class', 'table');
@@ -824,6 +839,13 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_code', 'enUS', 'Code', 2, 2, '2015-04-18 13:50:05', '2015-04-18 13:50:05');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_code', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_code', 'table');
+
+ DELETE FROM `system_text` WHERE id = 'table_count';
+ DELETE FROM `system_text_tag` WHERE id = 'table_count';
+ INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_count', 'deDE', '#Anzahl', 2, 2, '2015-04-18 14:43:20', '2015-04-18 14:43:20');
+ INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_count', 'enUS', '#Count', 2, 2, '2015-04-18 14:43:20', '2015-04-18 14:43:20');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_count', 'sai_todo');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_count', 'table');
DELETE FROM `system_text` WHERE id = 'table_file';
DELETE FROM `system_text_tag` WHERE id = 'table_file';
@@ -831,6 +853,7 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_file', 'enUS', 'File', 2, 2, '2015-04-18 14:43:20', '2015-04-18 14:43:20');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_file', 'frFR', 'Fichier', 3, 3, '2015-04-20 19:03:04', '2015-04-20 19:03:04');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_file', 'sai_log');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_file', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_file', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_file', 'table');
@@ -861,6 +884,7 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_ip', 'deDE', 'IP', 2, 2, '2015-04-23 01:59:06', '2015-04-23 01:59:06');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_ip', 'enUS', 'IP', 2, 2, '2015-04-18 14:43:51', '2015-04-18 14:43:51');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_ip', 'sai_log');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_ip', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_ip', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_ip', 'table');
@@ -878,6 +902,7 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_line', 'enUS', 'Line', 2, 2, '2015-04-18 14:43:31', '2015-04-18 14:43:31');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_line', 'frFR', 'Ligne', 3, 3, '2015-04-20 19:03:28', '2015-04-20 19:03:28');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_line', 'sai_log');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_line', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_line', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_line', 'table');
@@ -886,6 +911,7 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_message', 'deDE', 'Nachricht(message)', 2, 2, '2015-04-23 01:57:28', '2015-04-23 01:57:28');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_message', 'enUS', 'Message', 2, 2, '2015-04-18 14:43:09', '2015-04-18 14:43:09');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_message', 'sai_log');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_message', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_message', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_message', 'table');
@@ -908,6 +934,7 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_querytime', 'deDE', 'Antwortzeit', 2, 2, '2015-04-18 14:44:18', '2015-04-18 14:44:18');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_querytime', 'enUS', 'Querytime', 2, 2, '2015-04-18 14:44:18', '2015-04-18 14:44:18');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_querytime', 'sai_log');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_querytime', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_querytime', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_querytime', 'table');
@@ -985,6 +1012,7 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_url', 'deDE', 'URL', 2, 2, '2015-04-23 01:59:19', '2015-04-23 01:59:19');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_url', 'enUS', 'URL', 2, 2, '2015-04-18 14:44:00', '2015-04-18 14:44:00');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_url', 'sai_log');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_url', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_url', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_url', 'table');
@@ -993,6 +1021,7 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_user', 'deDE', 'Nutzer', 2, 2, '2015-04-18 14:44:09', '2015-04-18 14:44:09');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('table_user', 'enUS', 'User', 2, 2, '2015-04-18 14:44:09', '2015-04-18 14:44:09');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_user', 'sai_log');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_user', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_user', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_user', 'table');
@@ -1011,6 +1040,7 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('time_ago', 'enUS', 'Time Ago', 2, 2, '2015-04-18 14:42:32', '2015-04-18 14:42:32');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('time_ago', 'frFR', 'temps passé', 3, 3, '2015-04-20 14:39:52', '2015-04-20 14:39:52');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago', 'sai_log');
+ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago', 'time');
diff --git a/sai/modules/saimod_sys_text/saimod_sys_text.php b/sai/modules/saimod_sys_text/saimod_sys_text.php
index 430bb07..dcbb352 100644
--- a/sai/modules/saimod_sys_text/saimod_sys_text.php
+++ b/sai/modules/saimod_sys_text/saimod_sys_text.php
@@ -42,7 +42,7 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule {
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl'), $vars);
}
- public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_edittext($lang,$id){
+ public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_edittext($id,$lang){
$langs = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS);
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TEXT);
$vars['tabopts'] = '';
diff --git a/sai/modules/saimod_sys_todo/tpl/todo_list.tpl b/sai/modules/saimod_sys_todo/tpl/todo_list.tpl
index e2c195d..ab068c4 100644
--- a/sai/modules/saimod_sys_todo/tpl/todo_list.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/todo_list.tpl
@@ -3,9 +3,9 @@
User ToDo's
- | time ago |
- message |
- user |
+ ${time_ago} |
+ ${table_message} |
+ ${table_user} |
${todo_user_list_elements}
@@ -13,16 +13,16 @@
Generated ToDo's
- | time ago |
- class |
- message |
- file |
- line |
- ip |
- url |
- user |
- querytime |
- count |
+ ${time_ago} |
+ ${table_class} |
+ ${table_message} |
+ ${table_file} |
+ ${table_line} |
+ ${table_ip} |
+ ${table_url} |
+ ${table_user} |
+ ${table_querytime} |
+ ${table_count} |
${todo_list_elements}
diff --git a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
index 359e147..c8d14df 100644
--- a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
+++ b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
@@ -61,7 +61,7 @@
-
Git
+
Current Project Version: ${git_project}
diff --git a/sai/page/default_page.php b/sai/page/default_page.php
index 94c8dc7..e924801 100644
--- a/sai/page/default_page.php
+++ b/sai/page/default_page.php
@@ -55,7 +55,7 @@ class default_page extends \SYSTEM\PAGE\Page {
$vars['js'] = '';
if(!$_escaped_fragment_){
$vars['js'] = self::js();}
- $vars['menu_languages'] = \SYSTEM\SAI\saimod_sys_langswitcher::lang_menu();
+ $vars['menu_languages'] = \SYSTEM\SAI\saimod_sys_langswitcher::lang_menu('./sai.php');
$vars['menu_start'] = self::menu_start();
$vars['menu_sys'] = self::menu_sys();
$vars['menu_proj'] = self::menu_proj();