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

---
 inc/poche/Poche.class.php |  7 +------
 index.php                 |  7 ++++---
 tpl/_menu.twig            | 12 ++----------
 tpl/config.twig           | 15 ++++++++-------
 tpl/css/style.css         |  3 ++-
 tpl/layout.twig           |  1 -
 6 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 4fe938fb..5030c9aa 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -182,7 +182,7 @@ class Poche
                 }
 
                 if (!$import) {
-                    Tools::redirect();
+                    Tools::redirect('?view=home');
                 }
                 break;
             case 'delete':
@@ -558,9 +558,4 @@ class Poche
         }
         return $version;
     }
-
-    function convertURLToBase64($plainurl){
-        $convertedURL = base64_encode($plainurl);
-        $this->action('add', new Url($convertedURL));
-   }
 }
\ No newline at end of file
diff --git a/index.php b/index.php
index e81a9247..7b775c41 100644
--- a/index.php
+++ b/index.php
@@ -43,9 +43,10 @@ elseif (isset($_GET['import'])) {
 elseif (isset($_GET['export'])) {
     $poche->export();
 }
-
-if (isset($_GET['plainurl'])){
-  $poche->convertURLToBase64($_GET['plainurl']);}
+elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) {
+    $plain_url = new Url(base64_encode($_GET['plainurl']));
+    $poche->action('add', $plain_url);
+}
 
 # vars to send to templates
 $tpl_vars = array(
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
diff --git a/tpl/config.twig b/tpl/config.twig
index c838c319..e24e58d4 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -2,13 +2,7 @@
 
 {% block title %}{% trans "config" %}{% endblock %}
 {% block menu %}
-            <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>
+{% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
             <h2>{% trans "Poching a link" %}</h2>
@@ -17,6 +11,13 @@
                 <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">download the extension</a></li>
                 <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">download the extension</a></li>
                 <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">download the application</a></li>
+                <li>
+                    <form method="get" action="index.php">
+                        <label class="addurl" for="plainurl">{% trans "by filling this field" %}:</label>
+                        <input autofocus required placeholder="Ex:mywebsite.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+                        <input type="submit" value="{% trans "poche it!" %}" />
+                    </form>
+                </li>
                 <li>bookmarklet: drag & drop this link to your bookmarks bar <a id="bookmarklet" ondragend="this.click();" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "poche it!" %}</a></li>
             </ul>
 
diff --git a/tpl/css/style.css b/tpl/css/style.css
index 7d2c143f..d644814d 100644
--- a/tpl/css/style.css
+++ b/tpl/css/style.css
@@ -258,13 +258,14 @@ footer {
     font-size: 0.8em;
 }
 
-#inputform{
+#inputform {
     display: none;
     text-align:center;
     max-width:300px;
     margin-left:auto;
     margin-right:auto;
     margin-top:5px;
+    padding-bottom: 5px;
     background-color: rgba(0, 0, 0, 0.9);
     opacity:0.8;
     color:white;
diff --git a/tpl/layout.twig b/tpl/layout.twig
index b2484019..07ca231c 100644
--- a/tpl/layout.twig
+++ b/tpl/layout.twig
@@ -12,7 +12,6 @@
         <![endif]-->
         <title>{% block title %}{% endblock %} - poche</title>
 {% include '_head.twig' %}
-<script src="./tpl/js/poche.js"></script>
 {% include '_bookmarklet.twig' %}
     </head>
     <body>
-- 
2.41.0