5 files changed, 66 insertions, 3 deletions

diff --git a/themes/_global/js/autoCompleteTags.js b/themes/_global/js/autoCompleteTags.js
index 986e71d1..8b32f8ca 100755
--- a/themes/_global/js/autoCompleteTags.js
+++ b/themes/_global/js/autoCompleteTags.js
@@ -48,6 +48,9 @@ jQuery(function($) {
     var value = input.val();
     var tag = $(this).text();
     var terms = value.split(','); // tags into the <input>
+    $(".alreadytagged").each(function(index) {
+      terms.push($(this).text() );
+    });
     if (jQuery.inArray(tag, terms) == -1 ) { // if the tag hasn't already been added
       value += tag + ",";
       input.val(value);
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 5319fd68..91c1ab9f 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -960,6 +960,35 @@ pre code {
                 font-size: 0.96em;
 }
 
+/* ==========================================================================
+   5.1 = Tags-related styles
+   ========================================================================== */
+
+.suggestedtag {
+    padding: 4px;
+    cursor: pointer;
+    display: inline-block;
+}
+
+#tagcloud .smallesttag {
+    font-size: x-small;
+}
+
+#tagcloud .smalltag {
+    font-size: small;
+}
+
+#tagcloud .mediumtag {
+    font-size:medium;
+}
+
+#tagcloud .largetag {
+    font-size:large;
+}
+
+#tagcloud .largesttag {
+    font-size:larger;
+}
 
 /* ==========================================================================
    6 = Media Queries
diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig
index ae6684f2..3b829eae 100755
--- a/themes/baggy/edit-tags.twig
+++ b/themes/baggy/edit-tags.twig
@@ -26,6 +26,6 @@
     {% trans "You can enter multiple tags, separated by commas." %}</p>
 </form>
 All existing tags :
-<ul>{% for eachtag in alltags %}<li class="suggestedtag" style="display: inline-block; margin:10px;">{{ eachtag.value }}</li>{% endfor %}</ul>
+<ul id="tagcloud">{% for eachtag in alltags %}<li class="suggestedtag {{ eachtag.cssclass }}">{{ eachtag.value }}</li>{% endfor %}</ul>
 <a class="icon icon-reply return" href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
 {% endblock %}
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index a122dc54..58d908ee 100755
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -455,3 +455,33 @@ pre code {
                 border: 1px solid #ddd;
                 font-size: 0.96em;
 }
+
+/* ==========================================================================
+   Tags-related styles
+   ========================================================================== */
+
+.suggestedtag {
+    padding: 4px;
+    cursor: pointer;
+    display: inline-block;
+}
+
+#tagcloud .smallesttag {
+    font-size: x-small;
+}
+
+#tagcloud .smalltag {
+    font-size: small;
+}
+
+#tagcloud .mediumtag {
+    font-size:medium;
+}
+
+#tagcloud .largetag {
+    font-size:large;
+}
+
+#tagcloud .largesttag {
+    font-size:larger;
+}
diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
index c29427e0..61cc94f1 100755
--- a/themes/default/edit-tags.twig
+++ b/themes/default/edit-tags.twig
@@ -19,7 +19,7 @@
 {% trans "no tags" %}
 {% endif %}
 <ul>
-{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
+{% for tag in tags %}<li><span class="alreadytagged">{{ tag.value }}</span> <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
 </ul>
 <form method="post" action="./?action=add_tag" id="editTags">
     <input type="hidden" name="entry_id" value="{{ entry_id }}" />
@@ -30,6 +30,7 @@
     {% trans "You can enter multiple tags, separated by commas." %}</p>
 
 </form>
-<br>
+All existing tags :
+<ul id="tagcloud">{% for eachtag in alltags %}<li class="suggestedtag {{ eachtag.cssclass }}">{{ eachtag.value }}</li>{% endfor %}</ul>
 <a href="./?view=view&id={{ entry_id }}">&laquo; {% trans "return to article" %}</a>
 {% endblock %}