From 56349e470ab9e4fd5f4fd4754f4a6c9989701795 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sun, 14 Feb 2016 20:12:03 +0100
Subject: [PATCH] improve baggy theme (add new tag panel)

---
 .../public/themes/baggy/css/main.css          | 12 +++++++----
 .../Resources/public/themes/baggy/js/init.js  | 12 +++++++++++
 .../views/themes/baggy/Entry/entry.html.twig  | 21 ++++++++++++-------
 .../views/themes/baggy/layout.html.twig       |  8 +++----
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css
index 62f2964c0..1cb2ddf34 100755
--- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css
@@ -298,7 +298,7 @@ h2:after {
    ========================================================================== */
 
 #content {
-  margin-top: 5em;
+  margin-top: 2em;
   min-height: 30em;
 }
 
@@ -884,9 +884,13 @@ blockquote {
   text-decoration: none;
 }
 
-  #article_toolbar a:hover, #article_toolbar a:focus {
-    background-color: #999;
-  }
+#article_toolbar a:hover, #article_toolbar a:focus {
+  background-color: #999;
+}
+
+#nav-btn-add-tag {
+    cursor: pointer;
+}
 
 .shaarli:before {
   content: "*";
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js
index 74cbae683..9bdc6f212 100755
--- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js
@@ -48,4 +48,16 @@ $.fn.ready(function() {
     $listmode.addClass("tablemode");
   }
 
+  /* ==========================================================================
+     Add tag panel
+     ========================================================================== */
+
+
+  $('#nav-btn-add-tag').on('click', function(){
+       $(".nav-panel-add-tag").toggle(100);
+       $(".nav-panel-menu").addClass('hidden');
+       $("#tag_label").focus();
+       return false;
+    });
+
 });
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 27a88287b..a3a9baa2c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -3,13 +3,19 @@
 {% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %}
 
 {% block content %}
-    <div id="article_toolbar">
+    <div id="article">
+        <header class="mbm">
+            <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit tags{% endtrans %}">✎</a></h1>
+        </header>
+
+        <div id="article_toolbar">
         <ul class="links">
             <li class="topPosF"><a href="#top" title="{% trans %}Back to top{% endtrans %}" class="tool top icon icon-arrow-up-thick"><span>{% trans %}Back to top{% endtrans %}</span></a></li>
             <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li>
             <li><a title="{% trans %}Reload content{% endtrans %}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{% trans %}Reload content{% endtrans %}</span></a></li>
             <li><a title="{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}</span></a></li>
             <li><a title="{% trans %}Favorite{% endtrans %}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle favorite{% endtrans %}</span></a></li>
+            <li><a id="nav-btn-add-tag" title="{% trans %}Add a tag{% endtrans %}"><span>{% trans %}Tag{% endtrans %}</span></a></li>
             <li><a title="{% trans %}Delete{% endtrans %}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{% trans %}Delete{% endtrans %}</span></a></li>
             {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans %}Tweet{% endtrans %}"><span>{% trans %}Tweet{% endtrans %}</span></a></li>{% endif %}
             {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans %}Email{% endtrans %}"><span>{% trans %}Email{% endtrans %}</span></a></li>{% endif %}
@@ -23,13 +29,14 @@
             <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}" class="tool bad-display icon icon-delete"><span>{% trans %}Does this article appear wrong?{% endtrans %}</span></a></li>
         </ul>
     </div>
-    <div id="article">
-        <header class="mbm">
-            <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit tags{% endtrans %}">✎</a></h1>
-        </header>
+
         <aside class="tags">
-            {% for tag in entry.tags %}<span class="mdi-action-label-outline">{{ tag.label }}</span>{% endfor %}
-            {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
+            {% for tag in entry.tags %}
+                <span class="mdi-action-label-outline">{{ tag.label }}</span><a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i>✘</i></a>
+                {% endfor %}
+            <div class="input-field nav-panel-add-tag" style="display: none">
+                {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
+            </div>
         </aside>
         {% if entry.previewPicture is not null %}
             <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
index b630070ca..84604762d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -35,8 +35,8 @@
     <ul id="links" class="links">
         <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
         <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
-        <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li>
-        <li><a href="{{ path('all') }}"}>{% trans %}all{% endtrans %}</a></li>
+        <li><a href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
+        <li><a href="{{ path('all') }}">{% trans %}all{% endtrans %}</a></li>
         <li><a href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li>
         <li><a href="{{ path('new') }}">{% trans %}save a link{% endtrans %}</a></li>
         <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
@@ -44,9 +44,9 @@
                 <form method="get" action="index.php">
                     <h2>{% trans %}Search{% endtrans %}</h2>
                     <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
-                    <input type="hidden" name="view" value="search"></input>
+                    <input type="hidden" name="view" value="search">
                     <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br>
-                    <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}"></input>
+                    <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}">
                 </form>
             </div>
         </li>