Merge pull request #634 from wallabag/dev1.6.1b

1.6.1

7 files changed, 41 insertions, 31 deletions

diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 04898d85..be11673f 100755
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -12,4 +12,5 @@
         <script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script>
         <script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script>
         <script src="{{ poche_url }}themes/default/js/saveLink.js"></script>
+        <script src="{{ poche_url }}themes/default/js/popupForm.js"></script>
         <script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script>
diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index 1fd4154e..b8ac3bfa 100644
--- a/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@ -1,21 +1,7 @@
-<div id="search-form" class="messages info">                    
+<div id="search-form" class="messages info">
 <form method="get" action="index.php">
-                <input type="hidden" name="view" value="search"></input>
+        <input type="hidden" name="view" value="search"></input>
         <label><a href="javascript: void(null);" id="search-form-close">X</a>{% trans "Search" %}</label> : <input type="text" name="search" />
-                <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
+        <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
 </form>
-</div>
-<script type="text/javascript">
-    $(document).ready(function() {
-
-        $("#search-form").hide();
-
-        $("#search").click(function(){
-            $("#search-form").toggle();
-            $("#search").toggleClass("current");
-            $("#search-arrow").toggleClass("arrow-down");
-        });
-
-
-    });
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 0dd552de..0991dbed 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -352,10 +352,10 @@ footer a {
   letter-spacing:normal;
   box-shadow: 0 3px 7px rgba(0,0,0,0.3);
   display: inline-block;
-  width: 32%!important;
+  width: 32%;
   margin-bottom: 1.5em;
   vertical-align: top;
-  margin-left: 1.5%!important;
+  margin-left: 1.5%;
   position: relative;
   overflow: hidden;
   padding: 1.5em 1.5em 3em 1.5em;
@@ -492,7 +492,7 @@ footer a {
   }
 
 .entrie:nth-child(3n+1) {
-  margin-left: 0!important;
+  margin-left: 0;
 }
 
 .results {
@@ -540,7 +540,7 @@ footer a {
   2.1 = "save a link" popup div related styles
   ========================================================================== */
 
-#bagit-form {
+#bagit-form, #search-form {
   background: rgba(0,0,0,0.5);
   position: absolute;
   top: 0;
@@ -555,7 +555,7 @@ footer a {
   border-left: 1px #EEE solid;
 }
 
-#bagit-form form {
+#bagit-form form, #search-form form {
   background: #FFF;
   position: absolute;
   top: 0;
@@ -568,7 +568,7 @@ footer a {
   padding: 2em;
 }
 
-a#bagit-form-close {
+a#bagit-form-close, a#search-form-close {
   background: #000;
   color: #FFF;
   padding: 0.2em 0.5em;
@@ -577,7 +577,7 @@ a#bagit-form-close {
   float: right;
   font-size: 0.6em;
 }
-a#bagit-form-close:hover {
+a#bagit-form-close:hover, a#search-form-close:hover {
   background: #999;
   color: #000;
 }
@@ -1028,7 +1028,7 @@ blockquote {
     display: none;
   }
 
-  #bagit-form {
+  #bagit-form, #search-form {
     left: 0;
   }
 }
diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig
index 5c0aa4b1..6e1a9043 100755
--- a/themes/courgette/config.twig
+++ b/themes/courgette/config.twig
@@ -9,9 +9,11 @@
             <h2>{% trans "Poching a link" %}</h2>
             <p>{% trans "There are several ways to save an article:" %} (<a class="special" href="http://doc.wallabag.org" title="{% trans "read the documentation" %}">?</a>)</p>
             <ul>
-                <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">{% trans "download the extension" %}</a></li>
-                <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">{% trans "download the extension" %}</a></li>
-                <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">{% trans "download the application" %}</a></li>
+                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
+                <li>Chrome: <a href="http://doc.wallabag.org/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
+                <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
+                <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
+                <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" title="download the window phone application">{% trans "download the application" %}</a></li>
                 <li>
                     <form method="get" action="index.php">
                         <label class="addurl" for="plainurl">{% trans "by filling this field" %}:</label>
@@ -79,4 +81,4 @@
             <h2>{% trans "Export your wallabag data" %}</h2>
             <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
         </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index ffbfc22e..8c939e30 100755
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -11,3 +11,4 @@
         <script src="{{ poche_url }}themes/default/js/autoClose.js"></script>
         <script src="{{ poche_url }}themes/default/js/closeMessage.js"></script>
         <script src="{{ poche_url }}themes/default/js/saveLink.js"></script>
+        <script src="{{ poche_url }}themes/default/js/popupForm.js"></script>
\ No newline at end of file
diff --git a/themes/default/js/popupForm.js b/themes/default/js/popupForm.js
new file mode 100644
index 00000000..06be3f0c
--- /dev/null
+++ b/themes/default/js/popupForm.js
@@ -0,0 +1,20 @@
+$(document).ready(function() {
+
+    $("#search-form").hide();
+
+    function closeSearch() {
+        $("#search-form").toggle();
+        $("#search").toggleClass("current");
+        $("#search-arrow").toggleClass("arrow-down");
+    }
+
+    $("#search").click(function(){
+        closeSearch();
+    });
+
+    $("#search-form-close").click(function(){
+        closeSearch();
+    });
+
+
+});
\ No newline at end of file
diff --git a/themes/default/js/saveLink.js b/themes/default/js/saveLink.js
index ccc00d1e..bee453c0 100755
--- a/themes/default/js/saveLink.js
+++ b/themes/default/js/saveLink.js
@@ -75,7 +75,7 @@ $.fn.ready(function() {
    ========================================================================== */
 
   $(window).keydown(function(e){
-    if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || e.keyCode == 27 ) {
+    if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || (e.keyCode == 27 && $bagitForm.is(':visible') ) ) {
       $bagit.removeClass("current");
       $("#bagit-arrow").removeClass("arrow-down");
       toggleSaveLinkForm();