summaryrefslogtreecommitdiff
path: root/plugins/kolab_notes
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2014-08-19 10:34:52 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2014-08-19 10:35:00 (GMT)
commitda430777b15fe2d3e1f6c31322001ea1fb5ac5ca (patch)
tree05b412ccf6c979f9af156053e8141f5f3ad0de67 /plugins/kolab_notes
parentf9d152525ef93283fde9437113063b6e8af83502 (diff)
downloadroundcubemail-plugins-kolab-da430777b15fe2d3e1f6c31322001ea1fb5ac5ca.tar.gz
Make note input fields look as regular input fields (#3241)
Diffstat (limited to 'plugins/kolab_notes')
-rw-r--r--plugins/kolab_notes/notes.js11
-rw-r--r--plugins/kolab_notes/skins/larry/notes.css46
2 files changed, 39 insertions, 18 deletions
diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index aaafe3d..a176370 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -777,7 +777,7 @@ function rcube_kolab_notes_ui(settings)
content = $('#notecontent').val(data.description),
readonly = data.readonly || !list.editable,
attachmentslist = $(rcmail.gui_objects.notesattachmentslist).html('');
- $('.notetitle', rcmail.gui_objects.noteviewtitle).val(data.title).prop('disabled', readonly);
+ $('.notetitle', rcmail.gui_objects.noteviewtitle).val(data.title).prop('disabled', readonly).show();
$('.dates .notecreated', rcmail.gui_objects.noteviewtitle).html(Q(data.created || ''));
$('.dates .notechanged', rcmail.gui_objects.noteviewtitle).html(Q(data.changed || ''));
$(rcmail.gui_objects.notebooks).filter('select').val(list.id);
@@ -786,7 +786,7 @@ function rcube_kolab_notes_ui(settings)
}
// tag-edit line
- var tagline = $('.tagline', rcmail.gui_objects.noteviewtitle).empty().show();
+ var tagline = $('.tagline', rcmail.gui_objects.noteviewtitle).empty()[readonly?'addClass':'removeClass']('disabled').show();
$.each(typeof data.categories == 'object' && data.categories.length ? data.categories : [''], function(i,val){
$('<input>')
.attr('name', 'tags[]')
@@ -797,7 +797,10 @@ function rcube_kolab_notes_ui(settings)
});
if (!data.categories || !data.categories.length) {
- $('<span>').addClass('placeholder').html(rcmail.gettext('notags', 'kolab_notes')).appendTo(tagline);
+ $('<span>').addClass('placeholder')
+ .html(rcmail.gettext('notags', 'kolab_notes'))
+ .appendTo(tagline)
+ .click(function(e) { $(this).parent().find('.tagedit-list').trigger('click'); });
}
$('.tagline input.tag', rcmail.gui_objects.noteviewtitle).tagedit({
@@ -1093,7 +1096,7 @@ function rcube_kolab_notes_ui(settings)
function reset_view()
{
me.selected_note = null;
- $('.notetitle', rcmail.gui_objects.noteviewtitle).val('');
+ $('.notetitle', rcmail.gui_objects.noteviewtitle).val('').hide();
$('.tagline, .dates', rcmail.gui_objects.noteviewtitle).hide();
$(rcmail.gui_objects.noteseditform).hide();
$(rcmail.gui_objects.notesdetailview).hide();
diff --git a/plugins/kolab_notes/skins/larry/notes.css b/plugins/kolab_notes/skins/larry/notes.css
index d5d794a..b5efa37 100644
--- a/plugins/kolab_notes/skins/larry/notes.css
+++ b/plugins/kolab_notes/skins/larry/notes.css
@@ -213,14 +213,13 @@
.notesview #notedetailstitle {
height: auto;
+ min-height: 20px;
}
-.notesview #notedetailstitle .tagedit-list,
-.notesview #notedetailstitle input.inline-edit,
-.notesview #notedetailstitle input.inline-edit:focus {
+.notesview #notedetailstitle .disabled .tagedit-list,
+.notesview #notedetailstitle input.inline-edit:disabled {
outline: none;
- padding: 0;
- margin: 0;
+ padding-left: 0;
border: 0;
background: rgba(255,255,255,0.01);
-webkit-box-shadow: none;
@@ -235,6 +234,10 @@
font-size: 14px;
font-weight: bold;
color: #333;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
}
.notesview #notedetailstitle .dates,
@@ -246,29 +249,40 @@
margin-top: 6px;
}
-.notesview #notedetailstitle .dates,
-.notesview #notedetailstitle .notebookselect {
+.notesview .notebookselect {
margin-top: 4px;
- margin-bottom: 4px;
}
.notesview #notedetailstitle .tagline {
position: relative;
cursor: text;
- margin: 6px -2px -2px -2px;
+ margin: 4px 0 0 0;
+}
+
+.notesview #notedetailstitle .tagline.disabled {
+ margin-top: 0;
}
.notesview #notedetailstitle .tagline .placeholder {
position: absolute;
- top: 4px;
- left: 0;
- z-index: 1;
+ top: 6px;
+ left: 6px;
+ z-index: 2;
}
.notesview #notedetailstitle .tagedit-list {
position: relative;
- z-index: 2;
- padding: 2px;
+ z-index: 1;
+ min-height: 32px;
+/* padding: 2px; */
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
+.notesview #notedetailstitle .disabled .tagedit-list {
+ min-height: 26px;
}
.notesview #notedetailstitle #tagedit-input {
@@ -456,6 +470,10 @@
.notesdialog #notesdialogheader {
height: auto;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
}
#kolabnotesinlinegui {