8 files changed, 31 insertions, 22 deletions

diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 9ca51cd2..e959ec3e 100755
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -45,7 +45,6 @@
 
         <script>
         var baseurl = "{{ poche_url }}";
-        console.log(baseurl);
         var data = {
 
                 "name": "wallabag",
diff --git a/themes/baggy/css/messages.css b/themes/baggy/css/messages.css
index 42da70b3..5854e731 100755
--- a/themes/baggy/css/messages.css
+++ b/themes/baggy/css/messages.css
@@ -1,3 +1,20 @@
+.messages {
+    display: block;
+    clear: both;
+    width: 400px;
+    margin: 10px auto 10px;
+    padding: 10px 0;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+}
+
+.messages p {
+    margin: 3px 0 3px 10px !important;
+    padding: 0 10px 0 23px !important;
+    font-size: 14px;
+    line-height: 16px;
+}
+
 .messages.error.install {
     border: 1px solid #c42608;
     color: #c00 !important;
@@ -16,4 +33,10 @@
     border: 1px solid #6dc70c;
     background: #e0fbcc !important;
     text-align: left;
+}
+
+.messages.information,
+.messages.info {
+    border: 1px solid #82aee7;
+    background: #dfebfb;
 }
\ No newline at end of file
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index e1b78a26..9518332f 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -47,7 +47,7 @@
                         {{ nb_results }} {% trans "articles" %}
                     {% endif %}
                     {% if view == 'home' or view == 'fav' or view == 'archive' %}
-                    <a href="?action=random&amp;view={{ view }}" class="icon icon-random"><span> {% trans "random" %}</span></a>{% endif %}
+                    <a href="?action=random&amp;view={{ view }}" title="{% trans "random" %}" class="icon icon-random"><span> {% trans "random" %}</span></a>{% endif %}
                     </div>
                         {{ page_links | raw }}
                 </div>
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index 9ee64fc0..1381519c 100755
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -113,14 +113,5 @@
 
         // use keyboard to do actions
         actionArticle('{{ entry.id|e }}');
-
-        // swipe to right or left on mobile to navigate
-        $('article').on("swiperight", function(){
-            goLeft('?view=view&id={{ navigate.nextid|e }}');
-        });
-        $('article').on("swipeleft", function(){
-            goRight('?view=view&id={{ navigate.previousid|e }}');
-        });
-
         </script>
 {% endblock %}
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index e3841c77..2785fd23 100755
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -42,7 +42,6 @@
 
         <script>
         var baseurl = "{{ poche_url }}";
-        console.log(baseurl);
         var data = {
 
                 "name": "wallabag",
diff --git a/themes/default/_messages.twig b/themes/default/_messages.twig
index 679aa098..80ae456d 100644
--- a/themes/default/_messages.twig
+++ b/themes/default/_messages.twig
@@ -1 +1,6 @@
-                {{ messages | raw }}
\ No newline at end of file
+                {{ messages | raw }}
+                {% if view == 'home' %}
+                <div class="messages information">
+                    <p><a href="http://doc.wallabag.org">wallabag v2 is out, please read the documentation to upgrade.</a></p>
+                </div>
+                {% endif %}
\ No newline at end of file
diff --git a/themes/default/home.twig b/themes/default/home.twig
index a320cc7f..08e33fad 100755
--- a/themes/default/home.twig
+++ b/themes/default/home.twig
@@ -52,7 +52,7 @@
                         {{ nb_results }} {% trans "articles" %}
                     {% endif %}
                     {% if view == 'home' or view == 'fav' or view == 'archive' %}
-                    <a href="?action=random&amp;view={{ view }}" class="icon icon-random"><span> {% trans "random" %}</span></a>{% endif %}
+                    <a href="?action=random&amp;view={{ view }}" title="{% trans "random" %}" class="icon icon-random"><span> {% trans "random" %}</span></a>{% endif %}
                     </div>
                         {{ page_links | raw }}
                 </div>
diff --git a/themes/default/view.twig b/themes/default/view.twig
index 0010d18f..d1b6496e 100755
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -129,13 +129,5 @@
         // Use left and right arrow to navigate on with keyboard
         navigateKeyboard('?view=view&id={{ navigate.nextid|e }}','?view=view&id={{ navigate.previousid|e }}');
 
-        // swipe to right or left on mobile to navigate
-        $('article').on("swiperight", function(){
-            goLeft('?view=view&id={{ navigate.nextid|e }}');
-        });
-        $('article').on("swipeleft", function(){
-            goRight('?view=view&id={{ navigate.previousid|e }}');
-        });
-
         </script>
 {% endblock %}