From 3c0883fac72368814e527325fc4e42d59f1339fc Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 16 Sep 2011 10:27:24 -0400 Subject: [PATCH] Fix for Bug 6884, Improve TinyMCE configuration on Koha News page MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - Increases the width of the editor to fill the space provided - Adjusts the layout of the toolbars to better fit the space - Adds a custom editor stylesheet to make the contents of the editor better match the expected output In changing the toolbar configuration I chose to make the display of each button explicit rather than assuming a default set of buttons and adding or subtracting from that. I think this is clearer for someone approaching the configuration trying to under- stand how buttons are displayed. I also chose to use the shorthand "|" instead of "separator" for brevity. This last change is the only one made to the edithelp configuration. [2011.09.20] F. Demians. This patch is compatible with bug 6649 patch, fixing help pages editing, and so could be applied before or after it. Signed-off-by: Frédéric Demians Signed-off-by: Ian Walls Signed-off-by: Chris Cormack --- koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css | 4 ++++ .../prog/en/modules/help/edithelp.tt | 9 +++++---- .../prog/en/modules/tools/koha-news.tt | 16 +++++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css b/koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css new file mode 100644 index 0000000000..57fec753e7 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css @@ -0,0 +1,4 @@ +body, td, pre { + font-family: Arial,Helvetica,sans-serif; + font-size: 13px; +} \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt index 3a40f2d1f1..ad4b4a13c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt @@ -5,12 +5,13 @@ tinyMCE.init({ mode : "textareas", theme : "advanced", + content_css : "[% themelang %]/css/tinymce.css", plugins : "table,save,advhr,advlink,iespell,searchreplace,print,contextmenu", theme_advanced_disable : "underline,strikethrough,styleselect,image", - theme_advanced_buttons1_add_before : "save,separator", - theme_advanced_buttons2_add_before: "cut,copy,paste,separator,search,replace,separator", - theme_advanced_buttons3_add_before : "tablecontrols,separator", - theme_advanced_buttons3_add : "iespell,advhr,separator,print", + theme_advanced_buttons1_add_before : "save,|", + theme_advanced_buttons2_add_before: "cut,copy,paste,|,search,replace,|", + theme_advanced_buttons3_add_before : "tablecontrols,|", + theme_advanced_buttons3_add : "iespell,advhr,|,print", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left", theme_advanced_path_location : "bottom", diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt index 313701bb86..dfee834904 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt @@ -17,19 +17,21 @@ $(document).ready(function() { -- 2.39.5