Merge branch 'dev' of github.com:inthepoche/poche into dev

diff --git a/tpl/_head.twig b/tpl/_head.twig
index 6a8258a2dcbea9c827e0aabbf8657476018d90fe..cab317a84f780cf9f420b31430bbe23e7158438d 100644 (file)
--- a/tpl/_head.twig
+++ b/tpl/_head.twig
@@ -9,4 +9,4 @@
         <link rel="stylesheet" href="./tpl/css/print.css" media="print">
         <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
         <script src="./tpl/js/jquery-2.0.3.min.js"></script>
-        <script type="text/javascript">$(document).ready(function(){$("body").prepend('<a href="#top" class="top_link" title="{% trans "back to top" %}"><img src="./tpl/img/{{ constant("THEME") }}/backtotop.png" alt={% trans "back to top" %}"/></a>');$(".top_link").css({position:"fixed",right:"15px",bottom:"15px",display:"none",padding:"20px",background:"#ccc","-moz-border-radius":"40px","-webkit-border-radius":"40px","border-radius":"40px",opacity:"0.9","z-index":"2000"});$(window).scroll(function(){posScroll=$(document).scrollTop();if(posScroll>=400)$(".top_link").fadeIn(600);else $(".top_link").fadeOut(600)})})</script>
\ No newline at end of file
+        <script type="text/javascript">$(document).ready(function(){$("body").prepend('<a href="#top" class="top_link" title="{% trans "back to top" %}"><img src="./tpl/img/{{ constant("THEME") }}/backtotop.png" alt={% trans "back to top" %}"/></a>');$(window).scroll(function(){posScroll=$(document).scrollTop();if(posScroll>=400)$(".top_link").fadeIn(600);else $(".top_link").fadeOut(600)})})</script>
\ No newline at end of file

diff --git a/tpl/config.twig b/tpl/config.twig
index b41cd3065d132be2535af42ae57cd3f9f2eff657..c838c319bcb4e58b2d4bddaedd223b0054161f8f 100644 (file)
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -17,7 +17,7 @@
                 <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>bookmarklet: drag & drop this link to your bookmarks bar <a ondragend="this.click();" style="cursor: move; border: 1px dashed grey; background: white; padding: 5px;" 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>
+                <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>
 
             <h2>{% trans "Updating poche" %}</h2>

diff --git a/tpl/css/style.css b/tpl/css/style.css
index 1ae3a601f23a6e8a3d0db76961aed2ce647dbf4d..7633534c3a428b307bae56880cdafa45164c8dbc 100644 (file)
--- a/tpl/css/style.css
+++ b/tpl/css/style.css
@@ -229,6 +229,27 @@ a, a:hover, a:visited {
     font-weight: bold;
 }
 
+#bookmarklet {
+    padding: 5px;
+    border: 1px dashed #808080;
+    background: #fff;
+    cursor: move;
+}
+
+.top_link {
+    position: fixed;
+    right: 15px;
+    bottom: 15px;
+    display: none;
+    padding: 20px;
+    background: #ccc;
+    -moz-border-radius: 40px;
+    -webkit-border-radius: 40px;
+    border-radius: 40px;
+    opacity: 0.9;
+    z-index: 2000;
+}
+
 footer {
     clear: both;
 }