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 35a356e..609fd2a 100644 --- a/sai/modules/saimod_sys_text/js/saimod_sys_text.js +++ b/sai/modules/saimod_sys_text/js/saimod_sys_text.js @@ -84,9 +84,7 @@ function init_saimod_sys_text_editor(){ function init_tinymce(){ tinymce.init({ // General options - /*mode : "textareas", - theme : "modern", - + /* formats : { italic : {inline : 'span', 'classes' : 'italic'}}, // Theme options @@ -103,8 +101,7 @@ function init_tinymce(){ content_css : "../../page/index.css"*/ // General options /* mode : "textareas", - //theme : "advanced", - theme : "modern", + plugins : "autolink,lists,pagebreak,layer,table,save,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,template,code",*/ //xhtmlxtras,emotions,advimage,advlink,iespell,inlinepopups,advhr,style,spellchecker, @@ -133,9 +130,6 @@ function init_tinymce(){ external_link_list_url : "js/link_list.js", external_image_list_url : "js/image_list.js", media_external_list_url : "js/media_list.js", - forced_root_block : "", - force_br_newlines : true, - force_p_newlines : false, // Replace values for the template plugin template_replace_values : { @@ -145,6 +139,7 @@ function init_tinymce(){ selector: "textarea", theme: "modern", + //theme : "advanced", plugins: [ "advlist autolink lists link image charmap print preview hr anchor pagebreak", "searchreplace wordcount visualblocks visualchars code fullscreen", @@ -158,8 +153,9 @@ function init_tinymce(){ {title: 'Test template 1', content: 'Test 1'}, {title: 'Test template 2', content: 'Test 2'} ], + //remove p tag forced_root_block : "", force_br_newlines : true, - force_p_newlines : false, + force_p_newlines : false }); } diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS.php index 92511d8..7c3eace 100644 --- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS.php +++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS.php @@ -17,5 +17,6 @@ class SYS_SAIMOD_TEXT_GETTEXTS extends \SYSTEM\DB\QP { WHERE tag = ? ORDER BY time_edit DESC ) AS sub - GROUP BY sub.id;' + GROUP BY sub.id + ORDER BY time_edit ASC;' );}} diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS_ALL.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS_ALL.php index c88e4f4..437977a 100644 --- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS_ALL.php +++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS_ALL.php @@ -16,5 +16,6 @@ class SYS_SAIMOD_TEXT_GETTEXTS_ALL extends \SYSTEM\DB\QQ { LEFT JOIN system_user as ae ON system_text.author_edit = ae.id ORDER BY time_edit DESC ) AS sub - GROUP BY sub.id;' + GROUP BY sub.id + ORDER BY time_edit ASC;' );}}