From 0174d467886da4a0a967d5d2d97d925806ecf129 Mon Sep 17 00:00:00 2001
From: Mokaddem <mokaddem.sami@gmail.com>
Date: Fri, 8 Jul 2016 12:09:33 +0200
Subject: [PATCH] Added loading GIF when searching and fixed small display bug
 in modal

---
 var/www/Flask_server.py                 |   2 +-
 var/www/static/image/loading.gif        | Bin 0 -> 8077 bytes
 var/www/templates/search.html           |   4 ++++
 var/www/templates/searchbox.html        |   9 +++++++--
 var/www/templates/show_saved_paste.html |   2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 var/www/static/image/loading.gif

diff --git a/var/www/Flask_server.py b/var/www/Flask_server.py
index 142671fb..41ff187a 100755
--- a/var/www/Flask_server.py
+++ b/var/www/Flask_server.py
@@ -161,7 +161,7 @@ def getmoredata():
     requested_path = request.args.get('paste', '')
     paste = Paste.Paste(requested_path)
     p_content = paste.get_p_content().decode('utf-8', 'ignore')
-    to_return = p_content[max_preview_modal:]
+    to_return = p_content[max_preview_modal-1:]
     return to_return 
 
 
diff --git a/var/www/static/image/loading.gif b/var/www/static/image/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b60c1615d25bc79b16c81fdb5231ed02c6d11e40
GIT binary patch
literal 8077
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

literal 0
HcmV?d00001

diff --git a/var/www/templates/search.html b/var/www/templates/search.html
index 0bafa147..2fef368a 100644
--- a/var/www/templates/search.html
+++ b/var/www/templates/search.html
@@ -70,6 +70,7 @@
           <div id="mymodalcontent" class="modal-content">
             <div id="mymodalbody" class="modal-body" max-width="850px">
               <p>Loading paste information...</p>
+              <img id="loading-gif-modal" src="{{url_for('static', filename='image/loading.gif') }}" height="26" width="26" style="margin: 4px;">
             </div>
             <div class="modal-footer">
               <a id="button_show_path" target="_blank" href=""><button type="button" class="btn btn-info">Show saved paste</button></a>
@@ -160,6 +161,7 @@
 
             $("#button_show_path").attr('href', $(modal).attr('data-url'));
             $("#button_show_path").show('fast');
+            $("#loading-gif-modal").css("visibility", "hidden"); // Hide the loading GIF
             if ($("[data-initsize]").attr('data-initsize') < char_to_display) { // All the content is displayed
                 nothing_to_display();
             }
@@ -180,6 +182,8 @@
     // When the modal goes out, refresh it to normal content
     $("#mymodal").on('hidden.bs.modal', function () {
         $("#mymodalbody").html("<p>Loading paste information...</p>");
+        var loading_gif = "<img id='loading-gif-modal' class='img-center' src=\"{{url_for('static', filename='image/loading.gif') }}\" height='26' width='26' style='margin: 4px;'>";
+        $("#mymodalbody").append(loading_gif); // Show the loading GIF
         $("#button_show_path").attr('href', '');
         $("#button_show_path").hide();
         complete_paste = null;
diff --git a/var/www/templates/searchbox.html b/var/www/templates/searchbox.html
index 415ab15a..ee960f40 100644
--- a/var/www/templates/searchbox.html
+++ b/var/www/templates/searchbox.html
@@ -1,11 +1,16 @@
                           <div class="input-group custom-search-form">
-                              <form action="/search" method=POST>
+                              <form action="/search" id="form-search" method=POST>
                               <input type="text" name="query" class="form-control" placeholder="Search Paste">
                               <span class="input-group-btn">
                               <button class="btn btn-default" type="submit">
                                   <i class="fa fa-search"></i>
                               </button>
+                              <img id="loading-gif" src="{{url_for('static', filename='image/loading2.gif') }}" height="26" width="26" style="margin: 4px; visibility: hidden;">
                               </form>
                           </span>
                           </div>
-
+                          <script> 
+                              $("#form-search").submit(function( event ) {
+                                  $("#loading-gif").css("visibility", "visible");
+                              });
+                          </script>
diff --git a/var/www/templates/show_saved_paste.html b/var/www/templates/show_saved_paste.html
index 924fd2da..ce68465c 100644
--- a/var/www/templates/show_saved_paste.html
+++ b/var/www/templates/show_saved_paste.html
@@ -43,7 +43,7 @@
   </div>
   <div class="panel-body" id="panel-body">
   <h4> Content: </h4>
-  <p data-initsize="{{ initsize }}"> <xmp id="paste-holder"> {{ content }} </xmp> </p>
+  <p data-initsize="{{ initsize }}"> <xmp id="paste-holder">{{ content }}</xmp></p>
   </div>
 </div>