diff --git a/sai/modules/saimod_sys_locale/saimod_sys_locale.js b/sai/modules/saimod_sys_locale/saimod_sys_locale.js index c5e1736..c70adbf 100644 --- a/sai/modules/saimod_sys_locale/saimod_sys_locale.js +++ b/sai/modules/saimod_sys_locale/saimod_sys_locale.js @@ -25,6 +25,8 @@ function init__SYSTEM_SAI_saimod_sys_locale() { $('#newtext').click(function(){ $('#addtext').show(); saimod_sys_locale_savenewcontent(); + $('#new_text_id_input').val(''); + $('#new_category_id_input').val(''); cData.editmode = false;}); $('.groups').click(function(){ @@ -75,19 +77,23 @@ function saimod_sys_locale_newtext(){ type: 'GET', success: function(data) { $('#contenttextarea').text(''); - $('#new_text_id').attr('placeholder', 'new title here...').blur(); + $('#new_category_id input').attr('value', cData.group); + $('#new_category_id').show(); $('#new_text_id').show(); $('#newtext').show(); $('#changetext').hide(); $('#newcontenttextarea').hide(); - $('#modal').modal('show'); + $('#modal_main').modal('show'); } }); } function saimod_sys_locale_savecontent(id, lang){ - tinyMCE.triggerSave(); + tinyMCE.triggerSave(); newtext = $('#contenttextarea').val(); + newgroup = $('#new_category_id_input').val(); + console.log($('#new_category_id_input')); + console.log(newgroup); $.ajax({ url: SAI_ENDPOINT, data: { sai_mod: '.SYSTEM.SAI.saimod_sys_locale', @@ -112,10 +118,10 @@ function saimod_sys_locale_savecontent(id, lang){ function saimod_sys_locale_savenewcontent(){ tinyMCE.triggerSave(); - newtext = $('#contenttextarea').val(); - id = $('#new_text_id').val(); - console.log("id "+id); - category = cData.group; + id = $('#new_text_id_input').val(); + cData.group = $('#new_category_id_input').val(); + console.log("id: "+id); + console.log("category: "+cData.group); $.ajax({ url: SAI_ENDPOINT, data: { sai_mod: '.SYSTEM.SAI.saimod_sys_locale', @@ -132,6 +138,7 @@ function saimod_sys_locale_savenewcontent(){ function saimod_sys_locale_loadsinglecontent(id, lang){ $('#new_text_id').hide(); + $('#new_category_id').hide(); $('#newtext').hide(); $('#modaltextarea').show(); $('#changetext').show(); @@ -152,7 +159,7 @@ function saimod_sys_locale_loadsinglecontent(id, lang){ $('#modaltitle').html(id); $('#modaltitle').show(); cData.id = id; - $('#modal').modal('show'); + $('#modal_main').modal('show'); } }); } @@ -173,15 +180,16 @@ function saimod_sys_locale_delete(buttonID){ saimod_sys_locale_loadcontent(cData.lang,cData.group);}}); saimod_sys_locale_loadcontent(cData.lang,cData.group); - $('#modal').modal('hide'); + $('#modal_main').modal('hide'); } function init_tinymce(){ tinymce.init({ // General options mode : "textareas", theme : "modern", - plugins : "anchor,bbcode,charmap,code,contextmenu,directionality,link,textcolor,table,hr,fullscreen,autolink,lists,spellchecker,pagebreak,layer,table,save,emoticons,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,template", - + + formats : { + italic : {inline : 'span', 'classes' : 'italic'}}, // Theme options theme_modern_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect", theme_modern_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor", diff --git a/sai/modules/saimod_sys_locale/saimod_sys_locale.php b/sai/modules/saimod_sys_locale/saimod_sys_locale.php index ac52139..1925d7e 100644 --- a/sai/modules/saimod_sys_locale/saimod_sys_locale.php +++ b/sai/modules/saimod_sys_locale/saimod_sys_locale.php @@ -74,7 +74,7 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_add($id, $category){ return \SYSTEM\DBD\SYS_SAIMOD_LOCALE_ADD::QI(array($id, $category)) ? \SYSTEM\LOG\JsonResult::ok() : \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("no data added"));} - + public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_delete($id){ return \SYSTEM\DBD\SYS_SAIMOD_LOCALE_DEL::QI(array($id)) ? \SYSTEM\LOG\JsonResult::ok() : \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("could not delete the permitted data"));} diff --git a/sai/modules/saimod_sys_locale/tabs.tpl b/sai/modules/saimod_sys_locale/tabs.tpl index 1d787fd..00cd6b6 100644 --- a/sai/modules/saimod_sys_locale/tabs.tpl +++ b/sai/modules/saimod_sys_locale/tabs.tpl @@ -10,12 +10,19 @@