From ec61bd8cdcbb486a4364063fbde03f4db3cd5855 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Thu, 29 Aug 2013 11:45:48 +0200 Subject: [PATCH] Fixed #854: IE fix for ckeditor's plugin insertpre: Removed 'class' attribute to fix viw in IE8+. Use monospace in insertpre dialog in IE. Updated German translation file. --- .../javascript/ckeditor/plugins/insertpre/lang/de.js | 4 ++-- .../javascript/ckeditor/plugins/insertpre/plugin.js | 10 ++++------ openslides/static/styles/ckeditor.css | 5 ++++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/openslides/static/javascript/ckeditor/plugins/insertpre/lang/de.js b/openslides/static/javascript/ckeditor/plugins/insertpre/lang/de.js index b5d29c2ee..2827af95c 100644 --- a/openslides/static/javascript/ckeditor/plugins/insertpre/lang/de.js +++ b/openslides/static/javascript/ckeditor/plugins/insertpre/lang/de.js @@ -1,6 +1,6 @@ CKEDITOR.plugins.setLang( 'insertpre', 'de', { - title : 'Blocksatz-Text eingeben', - code : 'Blocksatz', + title : 'Text mit fester Laufweite eingeben', + code : 'Text', edit : 'Text bearbeiten', notEmpty : 'Das Textfeld darf nicht leer bleiben.' }); diff --git a/openslides/static/javascript/ckeditor/plugins/insertpre/plugin.js b/openslides/static/javascript/ckeditor/plugins/insertpre/plugin.js index e69af543a..f01ee9906 100644 --- a/openslides/static/javascript/ckeditor/plugins/insertpre/plugin.js +++ b/openslides/static/javascript/ckeditor/plugins/insertpre/plugin.js @@ -54,8 +54,8 @@ CKEDITOR.plugins.add( 'insertpre', { return { title : editor.lang.insertpre.title, - minWidth : 540, - minHeight : 380, + minWidth : 400, + minHeight : 200, contents : [ { id : 'general', @@ -65,10 +65,8 @@ CKEDITOR.plugins.add( 'insertpre', type : 'textarea', id : 'contents', label : editor.lang.insertpre.code, - cols: 140, - rows: 22, - class: "blocksize", - style: "font-family: Courier;", + cols: 80, + rows: 13, validate : CKEDITOR.dialog.validate.notEmpty( editor.lang.insertpre.notEmpty ), required : true, setup : function( element ) diff --git a/openslides/static/styles/ckeditor.css b/openslides/static/styles/ckeditor.css index 2a9a121d1..e8f580992 100644 --- a/openslides/static/styles/ckeditor.css +++ b/openslides/static/styles/ckeditor.css @@ -103,4 +103,7 @@ body.ckeditor_html background-color: Yellow; } -.cke_dialog_contents textarea.blocksize { font-family: Courier; font-size: 14px; } +.cke_dialog_contents textarea { + font-family: Courier New, monospace; + font-size: 14px; +}