Merge branch 'dev' of git://github.com/mariroz/wallabag into dev

diff --git a/themes/default/_menu.twig b/themes/default/_menu.twig
index 02bec1dcdbf94d99050d4cb68188e1c43d125ad0..55583b3d1947769864bcdd9ad504a7ba45ea0bc1 100644 (file)
--- a/themes/default/_menu.twig
+++ b/themes/default/_menu.twig
@@ -3,6 +3,9 @@
                 <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li>
                 <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li>
                 <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li>
+                <li><a href="javascript: void(null);" id="pocheit">{% trans "save a link" %}</a><span id="pocheit-arrow"></span></li>
                 <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
                 <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
-            </ul>
\ No newline at end of file
+            </ul>
+            {% include '_pocheit-form.twig' %}
+

diff --git a/themes/default/_pocheit-form.twig b/themes/default/_pocheit-form.twig
new file mode 100755 (executable)
index 0000000..1309615
--- /dev/null
+++ b/themes/default/_pocheit-form.twig
@@ -0,0 +1,22 @@
+<div id="pocheit-form" class="messages info">
+    <center>
+    <form method="get" action="index.php">
+        <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+        <input type="submit" value="{% trans "save link!" %}" />
+    </form>
+    </center>
+</div>
+<script type="text/javascript">
+    $(document).ready(function() {
+
+        $("#pocheit-form").hide();
+
+        $("#pocheit").click(function(){
+            $("#pocheit-form").toggle();
+            $("#pocheit").toggleClass("current");
+            $("#pocheit-arrow").toggleClass("arrow-down");
+        });
+
+
+    });
+</script>

diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 2088ee2ee9c5b97522dcaeab9150ccae590e0018..286759076461908e4607574c10f059f8ab1991dc 100644 (file)
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -334,3 +334,16 @@ a.bad-display span,
 a.reading-time span {
     background-repeat: no-repeat;
 }
+
+.arrow-down {
+    width: 0px;
+    height: 0px;
+    border-style: solid;
+    border-width: 10px 10px 0 10px;
+    border-color: #000 transparent transparent transparent;
+
+    position: absolute;
+    margin-top: 1.5em;
+    margin-left: -30px;
+}
+

diff --git a/themes/default/home.twig b/themes/default/home.twig
index cbe8c62f5c4f71995b7544f878c531fb902a3e3b..21013ec816c9a127b085fc7e74163cd22a77d20b 100644 (file)
--- a/themes/default/home.twig
+++ b/themes/default/home.twig
@@ -46,4 +46,5 @@
                 {% endfor %}
             {% endif %}
             {{ block('pager') }}
+            {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "mark all the entries as read" %}"  href="./?action=archive_all">{% trans "mark all the entries as read" %}</a>{% endif %}{% endif %}
 {% endblock %}