summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules-available/news/style.css6
-rw-r--r--modules-available/news/templates/page-news.html6
-rw-r--r--modules-available/summernote/clientscript.js7
3 files changed, 9 insertions, 10 deletions
diff --git a/modules-available/news/style.css b/modules-available/news/style.css
new file mode 100644
index 00000000..c11567ec
--- /dev/null
+++ b/modules-available/news/style.css
@@ -0,0 +1,6 @@
+/* Make things look more like they will show up in vmchooser (Qt) */
+
+.note-editor pre {
+ background: none;
+ border: none;
+}
diff --git a/modules-available/news/templates/page-news.html b/modules-available/news/templates/page-news.html
index c698e408..7750137e 100644
--- a/modules-available/news/templates/page-news.html
+++ b/modules-available/news/templates/page-news.html
@@ -102,9 +102,3 @@
</div>
</div>
</div>
-{{#hasSummernote}}
-<script>
-document.addEventListener("DOMContentLoaded", function () {
-});
-</script>
-{{/hasSummernote}}
diff --git a/modules-available/summernote/clientscript.js b/modules-available/summernote/clientscript.js
index 725db47d..69d7da93 100644
--- a/modules-available/summernote/clientscript.js
+++ b/modules-available/summernote/clientscript.js
@@ -14,13 +14,12 @@ $.getScript(filename, function () {
toolbar: [
// [groupName, [list of button]]
['para', ['style']],
- ['style', ['bold', 'italic', 'underline', 'strikethrough', 'clear']],
- // ['fontsize', ['fontsize']],
+ ['style', ['bold', 'italic', 'underline', 'clear']],
['color', ['color']],
- ['para', ['ul', 'ol', 'paragraph']],
+ ['para', ['ul', 'ol']],
['misc', ['codeview', 'fullscreen']]
- //['height', ['height']]
],
+ styleTags: ['p', 'pre', 'h1', 'h2', 'h3'],
lang: LANG,
height: '300px',
});