Issue #649: Refactor Tags

5 files changed, 35 insertions, 41 deletions

diff --git a/web-ui/app/templates/mails/draft.hbs b/web-ui/app/templates/mails/draft.hbs
index 82533ac4..675f1481 100644
--- a/web-ui/app/templates/mails/draft.hbs
+++ b/web-ui/app/templates/mails/draft.hbs
@@ -19,7 +19,7 @@
         {{t 'no_recipient'}}
       {{/if}}
     </div>
-    <div class="subject-and-tags">
+    <div class="subject">
       <i class="fa fa-pencil"></i>
       {{#if header.subject }}
         {{header.subject}}
diff --git a/web-ui/app/templates/mails/full_view.hbs b/web-ui/app/templates/mails/full_view.hbs
index 0bc9d999..4c0863de 100644
--- a/web-ui/app/templates/mails/full_view.hbs
+++ b/web-ui/app/templates/mails/full_view.hbs
@@ -42,24 +42,24 @@
 
         <nav id="mail-actions" class="mail-read-view__header-actions"></nav>
 
-        <div class="mail-read-view__header-tags">
-            <ul class="tags">
-                <i class="tags-label fa fa-tags"></i>
-                {{#each tags }}
-                <li class="tag" data-tag="{{this}}">{{ this }}</li>
-                {{/each }}
+        <ul class="mail-read-view__header-tags">
+            <li class="mail-read-view__header-tags-label">
+                <i class="fa fa-tags"></i>
+            </li>
 
-                <li class="new-tag">
-                    <input type="text" id="new-tag-input" placeholder="{{t 'Press Enter to add tag'}}"
-                    />
-                </li>
+            {{#each tags }}
+                <li class="mail-read-view__header-tags-tag" data-tag="{{this}}">{{ this }}</li>
+            {{/each }}
 
-                <li class="add-new">
-                    <button id="new-tag-button" class="no-style"><i class="fa fa-plus"></i>
-                    </button>
-                </li>
-            </ul>
-        </div>
+            <li class="mail-read-view__header-tags-name-input">
+                <input type="text" id="new-tag-input" placeholder="{{t 'Press Enter to add tag'}}"
+                />
+            </li>
+
+            <li class="mail-read-view__header-tags-new-button">
+                <button id="new-tag-button" class="no-style"><i class="fa fa-plus"></i></button>
+            </li>
+        </ul>
     </header>
 
     <iframe class="mail-read-view__body" id="read-sandbox" sandbox="allow-popups allow-scripts" src="sandbox/sandbox.html" scrolling="no"></iframe>
diff --git a/web-ui/app/templates/mails/sent.hbs b/web-ui/app/templates/mails/sent.hbs
index b3cf110f..86b6e607 100644
--- a/web-ui/app/templates/mails/sent.hbs
+++ b/web-ui/app/templates/mails/sent.hbs
@@ -19,19 +19,17 @@
               {{t 'no_recipient'}}
           {{/if}}
       </div>
-      <div class="subject-and-tags">
+      <div class="subject">
           {{#if header.subject }}
               {{header.subject}}
           {{else}}
               {{t 'no_subject'}}
           {{/if}}
       </div>
-      <div class="subject-and-tags">
-          <ul class="tags">
-              {{#each tagsForListView }}
-                  <li class="tag" data-tag="{{this}}">{{ this }}</li>
-              {{/each }}
-          </ul>
-      </div>
+      <ul class="tags">
+          {{#each tagsForListView }}
+              <li class="tags-tag" data-tag="{{this}}">{{ this }}</li>
+          {{/each }}
+      </ul>
   </a>
 </span>
diff --git a/web-ui/app/templates/mails/single.hbs b/web-ui/app/templates/mails/single.hbs
index 47d600fb..95f9adb7 100644
--- a/web-ui/app/templates/mails/single.hbs
+++ b/web-ui/app/templates/mails/single.hbs
@@ -11,15 +11,13 @@
       {{/if}}
     </span>
     <div class="from">{{#if header.from }}{{ header.from }}{{else}}{{t "you"}}{{/if}}</div>
-    <div class="subject-and-tags">
+    <div class="subject">
       {{ header.subject }}
     </div>
-    <div class="subject-and-tags">
-      <ul class="tags">
-        {{#each tagsForListView }}
-            <li class="tag" data-tag="{{this}}">{{ this }}</li>
-        {{/each }}
-      </ul>
-    </div>
+    <ul class="tags">
+      {{#each tagsForListView }}
+          <li class="tags-tag" data-tag="{{this}}">{{ this }}</li>
+      {{/each }}
+    </ul>
   </a>
 </span>
diff --git a/web-ui/app/templates/mails/trash.hbs b/web-ui/app/templates/mails/trash.hbs
index 4475aeb0..ea8fe07f 100644
--- a/web-ui/app/templates/mails/trash.hbs
+++ b/web-ui/app/templates/mails/trash.hbs
@@ -11,16 +11,14 @@
       {{/if}}
     </span>
     <div class="from">{{#if header.from }}{{ header.from }}{{else}}{{t "you"}}{{/if}}</div>
-    <div class="subject-and-tags">
+    <div class="subject">
       <i class="fa fa-trash-o"></i>
       {{ header.subject }}
     </div>
-    <div class="subject-and-tags">
-      <ul class="tags">
-        {{#each tagsForListView }}
-            <li class="tag" data-tag="{{this}}">{{ this }}</li>
-        {{/each }}
-      </ul>
-    </div>
+    <ul class="tags">
+      {{#each tagsForListView }}
+          <li class="tags-tag" data-tag="{{this}}">{{ this }}</li>
+      {{/each }}
+    </ul>
   </a>
 </span>