summaryrefslogtreecommitdiff
path: root/plugins/kolab_notes
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2014-09-11 13:54:15 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2014-09-11 13:54:15 (GMT)
commit6b7fc6729d23e273f4e5a9cbbd2f6cd7ec8b9ba8 (patch)
treefde4fe65588483c3bd7fabbf08edb3fff796b661 /plugins/kolab_notes
parentc3151bea8aaea994ba4cb98a95ee15eb64194ed5 (diff)
downloadroundcubemail-plugins-kolab-6b7fc6729d23e273f4e5a9cbbd2f6cd7ec8b9ba8.tar.gz
Added 'actions' bar and new icons for groupware folders as suggested by the product feature description
Diffstat (limited to 'plugins/kolab_notes')
-rw-r--r--plugins/kolab_notes/kolab_notes_ui.php12
-rw-r--r--plugins/kolab_notes/localization/en_US.inc2
-rw-r--r--plugins/kolab_notes/notes.js5
-rw-r--r--plugins/kolab_notes/skins/larry/notes.css60
-rw-r--r--plugins/kolab_notes/skins/larry/sprites.pngbin5282 -> 5503 bytes
5 files changed, 67 insertions, 12 deletions
diff --git a/plugins/kolab_notes/kolab_notes_ui.php b/plugins/kolab_notes/kolab_notes_ui.php
index 527e89b..817a228 100644
--- a/plugins/kolab_notes/kolab_notes_ui.php
+++ b/plugins/kolab_notes/kolab_notes_ui.php
@@ -217,9 +217,15 @@ class kolab_notes_ui
''
) .
html::span('handle', '') .
- (isset($prop['subscribed']) ?
- html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('foldersubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') :
- ''
+ html::span('actions',
+ (!$prop['default'] ?
+ html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist')), ' ') :
+ ''
+ ) .
+ (isset($prop['subscribed']) ?
+ html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('foldersubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') :
+ ''
+ )
)
)
);
diff --git a/plugins/kolab_notes/localization/en_US.inc b/plugins/kolab_notes/localization/en_US.inc
index 21e6e1a..939946c 100644
--- a/plugins/kolab_notes/localization/en_US.inc
+++ b/plugins/kolab_notes/localization/en_US.inc
@@ -33,7 +33,7 @@ $labels['findnotebooks'] = 'Find notebooks...';
$labels['listsearchresults'] = 'Additional notebooks';
$labels['nrnotebooksfound'] = '$nr notebooks found';
$labels['nonotebooksfound'] = 'No notebooks found';
-$labels['removelist'] = 'Remove';
+$labels['removelist'] = 'Remove from list';
$labels['savingdata'] = 'Saving data...';
$labels['recordnotfound'] = 'Record not found';
diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index 5f514c1..911e8a7 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -130,6 +130,11 @@ function rcube_kolab_notes_ui(settings)
rcmail.http_post('list', { _do:'subscribe', _list:{ id:p.id, permanent:list.subscribed?1:0 } });
}
});
+ notebookslist.addEventListener('remove', function(p) {
+ if (me.notebooks[p.id] && !me.notebooks[p.id].default) {
+ list_remove(p.id);
+ }
+ });
notebookslist.addEventListener('insert-item', function(p) {
var list = p.data;
if (list && list.id && !list.virtual) {
diff --git a/plugins/kolab_notes/skins/larry/notes.css b/plugins/kolab_notes/skins/larry/notes.css
index b5efa37..24daa9d 100644
--- a/plugins/kolab_notes/skins/larry/notes.css
+++ b/plugins/kolab_notes/skins/larry/notes.css
@@ -325,7 +325,8 @@
position: relative;
}
-.notesview #notebooks li > div.folder {
+.notesview #notebooks li > div.folder,
+.notesview #notebooksbox .searchresults li > div.folder {
position: relative;
padding: 0;
height: 28px;
@@ -354,11 +355,37 @@
padding-top: 3px;
}
-.notesview #notebooksbox .treelist li a.subscribed {
+.notesview #notebooksbox .treelist div span.actions {
display: inline-block;
position: absolute;
- top: 6px;
- right: 5px;
+ top: 2px;
+ right: 2px;
+ padding: 5px 20px 0 6px;
+ min-width: 20px;
+ height: 19px;
+ text-align: right;
+}
+
+.notesview #notebooksbox .treelist div:hover span.actions {
+ top: 1px;
+ right: 1px;
+ border: 1px solid #c6c6c6;
+ border-radius: 4px;
+ background: #f7f7f7;
+ background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
+ background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+ background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+ background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
+}
+
+.notesview #notebooksbox .treelist div a.remove,
+.notesview #notebooksbox .treelist div a.subscribed {
+ display: inline-block;
+ position: absolute;
+ top: 5px;
+ right: 4px;
height: 16px;
width: 16px;
padding: 0;
@@ -368,20 +395,37 @@
cursor: pointer;
}
-.notesview #notebooksbox .treelist div > a.subscribed:focus,
-.notesview #notebooksbox .treelist div:hover > a.subscribed {
- background-position: 2px -266px;
+.notesview #notebooksbox .treelist div a.subscribed:focus,
+.notesview #notebooksbox .treelist div:hover a.subscribed {
+ background-position: 0 -266px;
}
.notesview #notebooksbox .treelist div.subscribed a.subscribed {
background-position: -16px -266px;
}
-.notesview #notebooksbox .treelist li a.subscribed:focus {
+.notesview #notebooksbox .treelist div a.remove {
+ position: relative;
+ top: 0;
+ left: 0;
+ margin-right: 4px;
+}
+
+.notesview #notebooksbox .treelist div a.remove:focus,
+.notesview #notebooksbox .treelist div:hover a.remove {
+ background-position: 0 -284px;
+}
+
+.notesview #notebooksbox .treelist div a.remove:focus,
+.notesview #notebooksbox .treelist div a.subscribed:focus {
border-radius: 3px;
outline: 2px solid rgba(30,150,192, 0.5);
}
+.notesview #notebooksbox .searchresults .treelist div a.remove {
+ display: none;
+}
+
.notesview #notebooksbox .treelist input {
position: absolute;
top: 4px;
diff --git a/plugins/kolab_notes/skins/larry/sprites.png b/plugins/kolab_notes/skins/larry/sprites.png
index ceead25..99ac3a2 100644
--- a/plugins/kolab_notes/skins/larry/sprites.png
+++ b/plugins/kolab_notes/skins/larry/sprites.png
Binary files differ