From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Thu, 13 Mar 2014 16:37:08 +0000 (+0200)
Subject: saving link form now sends ajax request, article view is now justified
X-Git-Tag: 1.6.0^2~32^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=3ee27ee6ba8d44182ddeac7b54d75cc54affeec7;p=github%2Fwallabag%2Fwallabag.git

saving link form now sends ajax request, article view is now justified
---

diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index ff911515..505ec368 100755
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -1,9 +1,10 @@
 <div id="bagit-form" class="messages info">
-    <form method="get" action="index.php" target="_blank">
+    <form method="get" action="index.php" target="_blank" id="bagit-form-form">
         <h2><a href="javascript: void(null);" id="bagit-form-close">X</a>
         {% trans "Save a link" %}</h2>
         <input type="hidden" name="autoclose" value="1" />
         <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
         <input type="submit" value="{% trans "save link!" %}" />
+        <div id="add-link-result"></div>
     </form>
 </div>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index ba4b7c7f..61e0b47e 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -607,6 +607,11 @@ a#bagit-form-close:hover {
   padding: 0 3px 2px 3px;
 }
 
+#add-link-result {
+  font-weight: bold;
+  margin-top: 10px;
+}
+
 /* ==========================================================================
    3 = Pictos
    ========================================================================== */
@@ -741,6 +746,7 @@ a#bagit-form-close:hover {
 #article {
   width: 70%;
   margin-bottom: 3em;
+  text-align: justify;
 }
 
 #article .tags {
diff --git a/themes/baggy/js/init.js b/themes/baggy/js/init.js
index 4830bd25..da644fbe 100755
--- a/themes/baggy/js/init.js
+++ b/themes/baggy/js/init.js
@@ -4,6 +4,7 @@ $.fn.ready(function() {
       $listentries = $("#list-entries"),
       $bagit = $('#bagit'),
       $bagitForm = $('#bagit-form');
+      $bagitFormForm = $('#bagit-form-form');
 
   /* ==========================================================================
      Menu
@@ -69,9 +70,30 @@ $.fn.ready(function() {
     toggleSaveLinkForm();
   });
 
-  $('#bagit-form form').submit(function(){
-    toggleSaveLinkForm();
-    return true;
+
+  //send "bag it link" form request via ajax
+  $bagitFormForm.submit( function(event) {
+    $bagitFormForm.css("cursor", "wait");
+    $("#add-link-result").empty();
+
+    $.ajax({
+        type: $bagitFormForm.attr('method'),
+        url: $bagitFormForm.attr('action'),
+        data: $bagitFormForm.serialize(),
+        success: function(data) {
+          $('#add-link-result').html("Done!");
+          $('#plainurl').val('');
+          $('#plainurl').blur('');
+          $bagitFormForm.css("cursor", "auto");
+          //setTimeout( function() { toggleSaveLinkForm(); }, 1000); //close form after 1000 delay
+        },
+        error: function(data) {
+          $('#add-link-result').html("Failed!");
+          $bagitFormForm.css("cursor", "auto");
+        }
+    });
+
+    event.preventDefault();
   });
 
   /* ==========================================================================
@@ -94,9 +116,8 @@ $.fn.ready(function() {
   });
 
   $(".add-to-wallabag-link-after").click(function(event){
-    event.preventDefault();
     toggleSaveLinkForm($(this).attr('href'));
-    return false;
+    event.preventDefault();
   });