From 693b3f86776ae236d69ac6ed085b5e46b9054642 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <thomas.citharet@gmail.com>
Date: Sun, 8 Sep 2013 21:07:59 +0200
Subject: Implemented Add Button

Added a button to add an URL when directly into Poche. If JS isn't
enabled, nothing happens.
---
 tpl/_menu.twig | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'tpl/_menu.twig')

diff --git a/tpl/_menu.twig b/tpl/_menu.twig
index 699d6a0c..8341c49c 100644
--- a/tpl/_menu.twig
+++ b/tpl/_menu.twig
@@ -4,4 +4,13 @@
                 <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></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
+            	<li><a id="addurlbutton" onclick="showinput();" href="#" title="{% trans "addlink" %}">{% trans "addlink" %}</a></li>
+	            <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
+	       	</ul>
+           	<div id="inputform">
+               	<form method="get" action="index.php">
+            			<label class="addurl" for="plainurl">Entrez ici votre URL</label><br />
+                		<input autofocus required placeholder="Ex:monsite.net/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+                		<input type="submit" value="Envoyer" />
+            		</form>
+               </div>
\ No newline at end of file
-- 
cgit v1.2.3


From d5ce28df67fcddfb957ce28424f3e5751f433695 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <thomas.citharet@gmail.com>
Date: Sun, 8 Sep 2013 21:26:30 +0200
Subject: Fixed bugs due to migration

---
 tpl/_menu.twig | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tpl/_menu.twig')

diff --git a/tpl/_menu.twig b/tpl/_menu.twig
index 8341c49c..b39ce35f 100644
--- a/tpl/_menu.twig
+++ b/tpl/_menu.twig
@@ -3,7 +3,6 @@
                 <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=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
-                <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
             	<li><a id="addurlbutton" onclick="showinput();" href="#" title="{% trans "addlink" %}">{% trans "addlink" %}</a></li>
 	            <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
 	       	</ul>
-- 
cgit v1.2.3


From ce4a1dcc193d3124fc51c4942137621d3d806a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Tue, 10 Sep 2013 14:41:58 +0200
Subject: changes to add url directly from poche

---
 tpl/_menu.twig | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'tpl/_menu.twig')

diff --git a/tpl/_menu.twig b/tpl/_menu.twig
index b39ce35f..523d63cc 100644
--- a/tpl/_menu.twig
+++ b/tpl/_menu.twig
@@ -3,13 +3,5 @@
                 <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=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
-            	<li><a id="addurlbutton" onclick="showinput();" href="#" title="{% trans "addlink" %}">{% trans "addlink" %}</a></li>
-	            <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
-	       	</ul>
-           	<div id="inputform">
-               	<form method="get" action="index.php">
-            			<label class="addurl" for="plainurl">Entrez ici votre URL</label><br />
-                		<input autofocus required placeholder="Ex:monsite.net/article" class="addurl" id="plainurl" name="plainurl" type="url" />
-                		<input type="submit" value="Envoyer" />
-            		</form>
-               </div>
\ No newline at end of file
+                <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
+         	  </ul>
\ No newline at end of file
-- 
cgit v1.2.3


From 00dbaf90bc44ef3ed0abaebb15307756e054a027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 20 Sep 2013 10:21:39 +0200
Subject: merge #224

---
 tpl/_menu.twig | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 tpl/_menu.twig

(limited to 'tpl/_menu.twig')

diff --git a/tpl/_menu.twig b/tpl/_menu.twig
deleted file mode 100644
index 523d63cc..00000000
--- a/tpl/_menu.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-            <ul id="links">
-                <li><a href="./" {% if view == 'home' %}class="current"{% endif %}>{% trans "home" %}</a></li>
-                <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=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
-- 
cgit v1.2.3