Merge pull request #450 from wallabag/dev1.5.0

1.5.0

4 files changed, 30 insertions, 12 deletions

diff --git a/themes/default/_footer.twig b/themes/default/_footer.twig
index f837ae38..3057cb75 100644
--- a/themes/default/_footer.twig
+++ b/themes/default/_footer.twig
@@ -1,4 +1,4 @@
         <footer class="w600p center mt3 mb3 smaller txtright">
             <p>{% trans "powered by" %} <a href="http://wallabag.org">wallabag</a></p>
-            {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your poche version:" %}{{constant('POCHE')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
+            {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your wallabag version:" %}{{constant('POCHE')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
         </footer>
\ No newline at end of file
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index 577cc693..f310e420 100644
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -1,11 +1,12 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/favicon.ico" />
-        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/apple-touch-icon-144x144-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/apple-touch-icon-72x72-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/apple-touch-icon-precomposed.png">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/knacss.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/style.css" media="all">
+        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}/themes/default/img/favicon.ico" />
+        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/default/img/apple-touch-icon-144x144-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/default/img/apple-touch-icon-72x72-precomposed.png">
+        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/default/img/apple-touch-icon-precomposed.png">
+        <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/knacss.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/style.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print">
-        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script>
-        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/autoClose.js"></script>
\ No newline at end of file
+        <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/messages.css" media="all">
+        <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/print.css" media="print">
+        <script src="{{ poche_url }}/themes/default/js/jquery-2.0.3.min.js"></script>
+        <script src="{{ poche_url }}/themes/default/js/autoClose.js"></script>
+        <script src="{{ poche_url }}/themes/default/js/closeMessage.js"></script>
\ No newline at end of file
diff --git a/themes/default/js/closeMessage.js b/themes/default/js/closeMessage.js
new file mode 100644
index 00000000..b57fe4a8
--- /dev/null
+++ b/themes/default/js/closeMessage.js
@@ -0,0 +1,17 @@
+$(function(){
+     //---------------------------------------------------------------------------
+     // Show the close icon when the user hover over a message 
+     //---------------------------------------------------------------------------
+     $('.messages').on('mouseenter', function(){
+          $(this).find('a.closeMessage').stop(true, true).show();
+     }).on('mouseleave', function(){
+          $(this).find('a.closeMessage').stop(true, true).hide();
+     });
+     //---------------------------------------------------------------------------
+     // Close the message box when the user clicks the close icon
+     //---------------------------------------------------------------------------
+     $('a.closeMessage').on('click', function(){
+          $(this).parents('div.messages').slideUp(300, function(){ $(this).remove(); });
+          return false;
+     });
+});
\ No newline at end of file
diff --git a/themes/default/view.twig b/themes/default/view.twig
index d09977a8..9858996f 100644
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -21,7 +21,7 @@
                 <h1>{{ entry.title|raw }}</h1>
             </header>
             <aside class="tags">
-                tags: {% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "Edit tags" %}">✎</a>
+                {% trans "tags:" %} {% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "Edit tags" %}">✎</a>
             </aside>
             <article>
                 {{ content | raw }}