plugins/kolab_notes
Thomas Brüderli
bruederli at kolabsys.com
Mon Aug 11 15:35:36 CEST 2014
plugins/kolab_notes/notes.js | 2 +-
plugins/kolab_notes/skins/larry/notes.css | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 666055db46c804b8e787a29bb704eb12b0925fb1
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Mon Aug 11 15:35:13 2014 +0200
Avoid an empty space being added to the editor; add watermark background (#3241)
diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index 7edded5..f761f54 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -848,7 +848,7 @@ function rcube_kolab_notes_ui(settings)
var html = data.html || data.description;
// convert plain text to HTML and make URLs clickable
- if (!data.html || !html.match(/<(html|body)/)) {
+ if (html != '' && (!data.html || !html.match(/<(html|body)/))) {
html = text2html(html);
}
diff --git a/plugins/kolab_notes/skins/larry/notes.css b/plugins/kolab_notes/skins/larry/notes.css
index 282df72..5d5d0a5 100644
--- a/plugins/kolab_notes/skins/larry/notes.css
+++ b/plugins/kolab_notes/skins/larry/notes.css
@@ -129,6 +129,9 @@
left: 252px;
right: 0;
bottom: 0px;
+ background-image: url(../../../../skins/larry/images/watermark.jpg);
+ background-position: center;
+ background-repeat: no-repeat;
}
.notesdialog #notedetailsbox {
More information about the commits
mailing list