From 311c8a00a21868f30e571b4a9803025038d900c2 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.be>
Date: Wed, 2 Jul 2014 12:28:14 +0200
Subject: [PATCH] Improvements on tagline.

---
 app/coffee/modules/issues/detail.coffee | 35 ++++++++++++++++++-------
 app/partials/issues-detail.jade         |  7 +----
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/app/coffee/modules/issues/detail.coffee b/app/coffee/modules/issues/detail.coffee
index 8c2767c6..088bf038 100644
--- a/app/coffee/modules/issues/detail.coffee
+++ b/app/coffee/modules/issues/detail.coffee
@@ -108,15 +108,27 @@ module.directive("tgIssueDetail", ["$log", "$tgLocation", IssueDirective])
 #############################################################################
 
 TagLineDirective = ($log) ->
-    template = _.template("""
+    # Main directive template (rendered by angular)
+    template = """
+    <div class="tags-container"></div>
+    <input type="text" placeholder="Write tag..." class="hidden"/>
+    """
+
+    # Tags template (rendered manually using lodash)
+    templateTags = _.template("""
     <% _.each(tags, function(tag) { %>
-        <span class="tag"><%= tag.name %></span>
+        <div class="tag">
+            <span class="tag-name"><%- tag.name %></span>
+            <% if (editable) { %>
+            <a href="" title="delete tag" class="icon icon-delete"></a>
+            <% } %>
+        </div>
     <% }); %>""")
 
-    renderTags = ($el, tags) ->
+    renderTags = ($el, tags, editable) ->
         tags = _.map(tags, (t) -> {name: t})
-        html = template({tags: tags})
-        $el.find("span.tags-container").html(html)
+        html = templateTags({tags: tags, editable:editable})
+        $el.find("div.tags-container").html(html)
 
     normalizeTags = (tags) ->
         tags = _.map(tags, trim)
@@ -124,12 +136,13 @@ TagLineDirective = ($log) ->
         return _.uniq(tags)
 
     link = ($scope, $el, $attrs, $model) ->
+        editable = if $attrs.editable == "true" then true else false
+
         $scope.$watch $attrs.ngModel, (val) ->
             return if not val
-            renderTags($el, val)
+            renderTags($el, val, editable)
 
-        if $attrs.tgTagLine != "editable"
-            $el.find("input").remove()
+        $el.find("input").remove() if not editable
 
         $el.on "keyup", "input", (event) ->
             return if event.keyCode != 13
@@ -148,6 +161,10 @@ TagLineDirective = ($log) ->
                 $model.$setViewValue(normalizeTags(tags))
 
 
-    return {link:link, require:"ngModel"}
+    return {
+        link:link,
+        require:"ngModel"
+        template: template
+    }
 
 module.directive("tgTagLine", ["$log", TagLineDirective])
diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade
index 03a2412d..89c6334c 100644
--- a/app/partials/issues-detail.jade
+++ b/app/partials/issues-detail.jade
@@ -22,12 +22,7 @@ block content
                 //     p We need Pilar to make a prototype out of this or we are not sure
                 //     a.button.button-red.button-block(href="", title="Unblock US") Unblock
 
-                div.user-story-tags(tg-tag-line="editable", ng-model="issue.tags")
-                    div.tags-container
-                        div.tag
-                            span.tag-name attachments
-                            a.icon.icon-delete(href="", title="delete tag")
-                    input.hidden(type="text", placeholder="Write tag...")
+                div.user-story-tags(tg-tag-line editable="true", ng-model="issue.tags")
 
             section.us-content(tg-bind-html="issue.description_html")