webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

saimod text ordering rework, cleanup

Browse Source
This commit is contained in:
Ulf Gebhardt 2015-04-16 19:38:06 +02:00
parent dc1fd6e230
commit 712f95b83e
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sai/modules/saimod_sys_text/js/saimod_sys_text.js
View File

@ -84,9 +84,7 @@ function init_saimod_sys_text_editor(){
function init_tinymce(){ function init_tinymce(){
tinymce.init({ // General options tinymce.init({ // General options
/*mode : "textareas", /*
theme : "modern",
formats : { formats : {
italic : {inline : 'span', 'classes' : 'italic'}}, italic : {inline : 'span', 'classes' : 'italic'}},
// Theme options // Theme options
@ -103,8 +101,7 @@ function init_tinymce(){
content_css : "../../page/index.css"*/ content_css : "../../page/index.css"*/
// General options // General options
/* mode : "textareas", /* 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",*/ 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, //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_link_list_url : "js/link_list.js",
external_image_list_url : "js/image_list.js", external_image_list_url : "js/image_list.js",
media_external_list_url : "js/media_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 // Replace values for the template plugin
template_replace_values : { template_replace_values : {
@ -145,6 +139,7 @@ function init_tinymce(){
selector: "textarea", selector: "textarea",
theme: "modern", theme: "modern",
//theme : "advanced",
plugins: [ plugins: [
"advlist autolink lists link image charmap print preview hr anchor pagebreak", "advlist autolink lists link image charmap print preview hr anchor pagebreak",
"searchreplace wordcount visualblocks visualchars code fullscreen", "searchreplace wordcount visualblocks visualchars code fullscreen",
@ -158,8 +153,9 @@ function init_tinymce(){
{title: 'Test template 1', content: 'Test 1'}, {title: 'Test template 1', content: 'Test 1'},
{title: 'Test template 2', content: 'Test 2'} {title: 'Test template 2', content: 'Test 2'}
], ],
//remove p tag
forced_root_block : "", forced_root_block : "",
force_br_newlines : true, force_br_newlines : true,
force_p_newlines : false, force_p_newlines : false
}); });
} }

3
sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS.php
View File

@ -17,5 +17,6 @@ class SYS_SAIMOD_TEXT_GETTEXTS extends \SYSTEM\DB\QP {
WHERE tag = ? WHERE tag = ?
ORDER BY time_edit DESC ORDER BY time_edit DESC
) AS sub ) AS sub
GROUP BY sub.id;' GROUP BY sub.id
ORDER BY time_edit ASC;'
);}} );}}

3
sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_GETTEXTS_ALL.php
View File

@ -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 LEFT JOIN system_user as ae ON system_text.author_edit = ae.id
ORDER BY time_edit DESC ORDER BY time_edit DESC
) AS sub ) AS sub
GROUP BY sub.id;' GROUP BY sub.id
ORDER BY time_edit ASC;'
);}} );}}