diff --git a/plugins/kolab_notes/localization/en_US.inc b/plugins/kolab_notes/localization/en_US.inc
index 5e3d1bbe..71a26cd4 100644
--- a/plugins/kolab_notes/localization/en_US.inc
+++ b/plugins/kolab_notes/localization/en_US.inc
@@ -17,7 +17,8 @@ $labels['changed'] = 'Last Modified';
$labels['title'] = 'Title';
$labels['now'] = 'Now';
$labels['sortby'] = 'Sort by';
-$labels['createlist'] = 'New Notebook';
+$labels['newnotebook'] = 'Create a new notebook';
+$labels['addnotebook'] = 'Add notebook';
$labels['editlist'] = 'Edit Notebook';
$labels['listname'] = 'Name';
$labels['tabsharing'] = 'Sharing';
@@ -39,3 +40,9 @@ $labels['invalidlistproperties'] = 'Invalid notebook properties! Please set a va
$labels['entertitle'] = 'Please enter a title for this note.';
$labels['aclnorights'] = 'You do not have administrator rights for this notebook.';
+$labels['arialabelnoteslist'] = 'List of notes';
+$labels['arialabelnotesearchform'] = 'Notes search form';
+$labels['arialabelnotesquicksearchbox'] = 'Notes search input';
+$labels['arialabelnotessortmenu'] = 'Notes list sorting options';
+$labels['arialabelnotesoptionsmenu'] = 'Notebook actions menu';
+$labels['arialabelnotebookform'] = 'Notebook properties';
diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index a9202817..c52e0b92 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -135,7 +135,7 @@ function rcube_kolab_notes_ui(settings)
// initialize notes list widget
if (rcmail.gui_objects.noteslist) {
noteslist = new rcube_list_widget(rcmail.gui_objects.noteslist,
- { multiselect:true, draggable:true, keyboard:false });
+ { multiselect:true, draggable:true, keyboard:true });
noteslist.addEventListener('select', function(list) {
var selection_changed = list.selection.length != 1 || !me.selected_note || list.selection[0] != me.selected_note.id;
selection_changed && warn_unsaved_changes(function(){
@@ -175,7 +175,7 @@ function rcube_kolab_notes_ui(settings)
}
folder_drop_target = null;
})
- .init();
+ .init().focus();
}
if (settings.sort_col) {
diff --git a/plugins/kolab_notes/skins/larry/notes.css b/plugins/kolab_notes/skins/larry/notes.css
index e52332c9..f85890ed 100644
--- a/plugins/kolab_notes/skins/larry/notes.css
+++ b/plugins/kolab_notes/skins/larry/notes.css
@@ -49,7 +49,7 @@
}
.notesview #quicksearchbar {
- top: 8px;
+ top: 2px;
}
.notesview #searchmenulink {
diff --git a/plugins/kolab_notes/skins/larry/templates/dialogview.html b/plugins/kolab_notes/skins/larry/templates/dialogview.html
index 1acab5b1..722eb1bc 100644
--- a/plugins/kolab_notes/skins/larry/templates/dialogview.html
+++ b/plugins/kolab_notes/skins/larry/templates/dialogview.html
@@ -42,8 +42,8 @@ $(document).ready(function(e){
h = form.outerHeight();
content.width(w).height(h);
- $('#notecontent_tbl').width(w+'px').height('').css('margin-top', '-1px');
- $('#notecontent_ifr').width(w+'px').height((h-54)+'px');
+ $('#noteform > div.mce-tinymce').width(w);
+ $('#notecontent_ifr').width(w).height(h - 4 - $('div.mce-toolbar').height());
}
$(window).resize(function(e){
diff --git a/plugins/kolab_notes/skins/larry/templates/notes.html b/plugins/kolab_notes/skins/larry/templates/notes.html
index 88574d91..2904cf0b 100644
--- a/plugins/kolab_notes/skins/larry/templates/notes.html
+++ b/plugins/kolab_notes/skins/larry/templates/notes.html
@@ -9,17 +9,22 @@