Merge branch 'dev' into savewithtags

diff --git a/themes/_global/js/saveLink.js b/themes/_global/js/saveLink.js
index a7acd84c3e808969cac189ca5cf57d267cdba8d6..9f66b73f14e908f632314090a9f4e11d6f7648c6 100755 (executable)
--- a/themes/_global/js/saveLink.js
+++ b/themes/_global/js/saveLink.js
@@ -4,6 +4,8 @@ $.fn.ready(function() {
       $bagitForm = $('#bagit-form'),
       $bagitFormForm = $('#bagit-form-form');
 
+$("#tags2add").hide();
+
   /* ==========================================================================
    bag it link and close button
    ========================================================================== */
@@ -78,6 +80,11 @@ $.fn.ready(function() {
     event.preventDefault();
   });
 
+$('#showtaginput').click(function(){
+  $('#tags2add').toggle();
+});
+
+
   /* ==========================================================================
    Keyboard gestion
    ========================================================================== */

diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index bf2ae903769637405f2fadfecf03200d4a19e91f..bc43913478443d31be77572d9d9d320b515814f7 100755 (executable)
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -4,6 +4,8 @@
         <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
         <input type="hidden" name="autoclose" value="1" />
         <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+        <span id="showtaginput">Add tags</span>
+        <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/>
         <span id="add-link-result"></span>
         <input type="submit" value="{% trans "save link!" %}" />
     </form>

diff --git a/themes/default/_pocheit-form.twig b/themes/default/_pocheit-form.twig
index 8c982db09dae6192287d65324f1e09b36bf7e496..f4518fcebd48a5600d2d23d730af4233b15bd6b8 100755 (executable)
--- a/themes/default/_pocheit-form.twig
+++ b/themes/default/_pocheit-form.twig
@@ -2,6 +2,8 @@
     <a href="javascript: void(null);" id="bagit-form-close">&nbsp;</a>
     <form method="get" action="index.php" id="bagit-form-form">
       <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+      <span id="showtaginput">Add tags</span>
+      <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/>
       <input type="submit" value="{% trans "save link!" %}" />
       <div id="add-link-result"></div>
     </form>