tpokorra · gresakg · Aug 14, 2013 · Aug 19, 2013 · Aug 28, 2013 · Sep 2, 2013
diff --git a/README → README.md b/README → README.md
@@ -2,6 +2,7 @@ Message label plugin for roundcube
 
 Attention! Latest version plugin use new roundcube class storage and don't work with version < 0.8.
 For version < 0.8 use version plugin (1.0)
+Require managesieve plugin for the filters.
 
 Install
 -------------------------------------------
@@ -21,10 +22,29 @@ This is plugin for roundcube to add labels like Google labels.
 * remove label on one click on label in subject
 * search all labels in all folder on one click (manual select folder search on filter search label) 
 * display label list on left panel under folder list
-
-
-Contact
-----------------------------------------
-Comments and suggestions are welcome.
-
-Email: dns.sobol@gmail.com
+* filters implemented with sieve require managesieve plugin to be installed
+
+<h2>Instructions message_label</h2>
+
+Create first label:<br/>
+<img src="doc/01_createFirstLabel.png">
+<br/><br/>
+
+Edit labels:<br/>
+<img src="doc/02_createLabel.png">
+<br/><br/>
+
+Create a filter that sets the label when the email comes in:<br/>
+<img src="doc/03_createFilter.png">
+<br/>
+Note: need to set the w flag for the user in Cyrus for this to work:
+<pre>
+cyradm --user cyrus-admin localhost
+setacl user/max.mustermann@example.org max^mustermann@example.org w
+</pre>
+<br/><br/>
+Manually assign labels:<br/>
+<img src="doc/04_markMessage.png">
+<br/>
+You can either use the Mark drop down menu, or drag the message to the label folder on the left side.<br/>
+For removing a label from a message, you can just click the label in the message list.
diff --git a/doc/01_createFirstLabel.png b/doc/01_createFirstLabel.png
diff --git a/doc/02_createLabel.png b/doc/02_createLabel.png
diff --git a/doc/03_createFilter.png b/doc/03_createFilter.png
diff --git a/doc/04_markMessage.png b/doc/04_markMessage.png
diff --git a/doc/index.html b/doc/index.html
@@ -0,0 +1,33 @@
+<html>
+<head>
+<title>message_label Roundcube plugin modified by TBits</title>
+</head>
+<body>
+<h2>Instructions message_label</h2>
+
+Create first label:<br/>
+<img src="01_createFirstLabel.png">
+<br/><br/>
+
+Edit labels:<br/>
+<img src="02_createLabel.png">
+<br/><br/>
+
+Create a filter that sets the label when the email comes in:<br/>
+<img src="03_createFilter.png">
+<br/>
+Note: need to set the w flag for the user in Cyrus for this to work:
+<pre>
+cyradm --user cyrus-admin localhost
+setacl user/max.mustermann@example.org max^mustermann@example.org w
+</pre>
+<br/><br/>
+Manually assign labels:<br/>
+<img src="04_markMessage.png">
+<br/>
+You can either use the Mark drop down menu, or drag the message to the label folder on the left side.<br/>
+For removing a label from a message, you can just click the label in the message list.
+
+
+</body>
+</html>
diff --git a/localization/en_US.inc b/localization/en_US.inc
@@ -9,6 +9,8 @@ $labels['label_name'] = 'name';
 $labels['label_folder'] = 'search in ';
 $labels['label_all'] = 'All folder';
 $labels['label_pref'] = 'Management of labels';
+$labels['help_filter_caption'] = "Help";
+$labels['label_help_filter'] = 'You can %ssetup filters%s to mark incoming emails with these labels';
 
 $labels['deleteconfirm'] = 'Do you really want to delete this label?';
 $labels['add_row'] = 'add';
@@ -32,4 +34,4 @@ $labels['search_info'] = 'Search information';
 $labels['display_label_on'] = 'Display labels list on';
 $labels['display_label_off'] = 'Display labels list off';
 
-?>
+?>
diff --git a/localization/sl_SI.inc b/localization/sl_SI.inc
@@ -0,0 +1,48 @@
+<?php
+/*
+ * Slovenian language file for the message labels plugin
+ * to enable forward / out of office replies.
+ *
+ * @package        plugins
+ * @uses        rcube_plugin
+ * @author       Gregor Gresak razvoj@gresak.net 
+ * @version        1.0
+ * @license     GPL
+ * @link        https://github.com/gresakg/rcubevacation-virtualmin
+*/
+$labels['label_title'] = 'Oznake';
+$labels['label_create'] = 'Ustvari oznako';
+$labels['label_set'] = 'Označi kot';
+$labels['label_matches'] = 'zadetkov';
+$labels['label_color'] = 'barva';
+$labels['label_delete'] = 'zbriši';
+$labels['label_name'] = 'ime';
+$labels['label_folder'] = 'išči v ';
+$labels['label_all'] = 'Vse mape';
+$labels['label_pref'] = 'Upravljanje oznak';
+$labels['help_filter_caption'] = "Pomoč";
+$labels['label_help_filter'] = 'S pomočjo %snastavitve filtrov%s lahko nastaviš samodejno označevanje elektronske pošte';
+
+$labels['deleteconfirm'] = 'Ali resnično želiš odstraniti oznako?';
+$labels['add_row'] = 'dodaj';
+$labels['delete_row'] = 'zbriši';
+
+$labels['headererror'] = 'Napaka v nastavitvi pravila';
+$labels['inputempty'] = 'Eden ali več zadetkov je prazen';
+$labels['invalidcolor'] = 'Neveljavna barva';
+
+$labels['check_highlighting'] = 'Preverjam delovanje načina barv';
+$labels['highlighting'] = 'Način barv';
+
+$labels['check_labels'] = 'Preverjam delovanje načina oznak';
+$labels['labels'] = 'Način oznak';
+
+$labels['check_error'] = 'Napaka pri preverjanju načina';
+
+$labels['label_mode'] = 'Način prikaza';
+$labels['search_info'] = 'Informacije o iskanju';
+
+$labels['display_label_on'] = 'Prikaz seznama oznak vključen';
+$labels['display_label_off'] = 'Prikaz seznama oznak izključen';
+
+?>
diff --git a/message_label.js b/message_label.js
@@ -38,11 +38,11 @@ rcube_webmail.prototype.unlabel_messages = function(row, label, type) {
     remove = 'tr#'+row+' span.'+label;
     a_uids[0] = row.replace(/^rcmrow/, '');
     if (type == 'filter') {
-        label_string = 'u'+label;
+        label_string = 'u_'+label;
     } else if (type == 'flabel') {
         label_string = label;
     } else {
-        label_string = 'un'+label;
+        label_string = 'un_'+label;
     }
     $(remove).parent().remove();
 
@@ -51,7 +51,7 @@ rcube_webmail.prototype.unlabel_messages = function(row, label, type) {
             rcmail.message_list.remove_row(a_uids[0]);
     }
 
-    rcmail.toggle_label_status(label_string, a_uids, type, false);
+    rcmail.toggle_label_status(label_string, a_uids, type, true);
 
 }
 
@@ -246,7 +246,7 @@ if(window.rcmail) {
                 +'<span class="lmessage '+message.flags.plugin_label[i].id+'" style="background-color:'
                 +message.flags.plugin_label[i].color+';">'
                 +'<a onclick=\"rcmail.unlabel_messages(\''+evt.row.obj.id+'\',\''
-                +message.flags.plugin_label[i].id+'\''
+                +message.flags.plugin_label[i].text+'\''
                 +',\''+message.flags.plugin_label[i].type+'\')">'
                 +message.flags.plugin_label[i].text+'</a></span></span>';
 
@@ -301,4 +301,4 @@ $(document).ready(function(){
         }
     });
 
-});
+});