Merge pull request #60 from adulau/master

Bug fixes
PidgeyL · Mar 27, 2015 · 1b06453 · 1b06453
2 parents 103c1f4 + b2cf3cb
commit 1b06453
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 16 deletions.
diff --git a/web/templates/index-minimal.html b/web/templates/index-minimal.html
@@ -29,14 +29,15 @@
       form.action = url;
       form.submit();
     }
-    function next(){
+    function next(n){
       setSettings();
-      var url = "/r/{{ r + pageLength }}";
+      var multiplier = {{ r }} + ( n * {{ pageLength }});
+      var url = "/r/"+multiplier;
       postURL(url);
     }
-    function previous(){
+    function previous(n){
       setSettings();
-      var page = {{ r - pageLength }};
+      var page = {{ r }} - ( n * {{ pageLength }});
       if(page < 0){
         page = 0;}
       var url = "/r/" + page;
@@ -106,23 +107,39 @@
             </form>
           </div>
           <!-- Pager -->
+          {% if (r/pageLength)|int < 3 %}
+            {% set prev = (r/pageLength)|int %}
+          {% else %}
+            {% set prev = 3 %}
+          {% endif %}
+
           <ul class="pager">
             {% if r > 0 %}
-              <li><a href="javascript:previous()">Previous</a></li>
+              {% for n in range(prev,0,-1) %}
+                <li><a href="javascript:previous({{n}})">- {{n}}</a></li>
+              {% endfor %}
             {% endif %}
+            ||
             {% if cve|length == pageLength %}
-              <li><a href="javascript:next()">Next</a></li>
+              {% for n in range(1, 4) %}
+                <li><a href="javascript:next({{n}})">+ {{n}}</a></li>
+              {% endfor %}
             {% endif %}
           </ul>
           <!-- Search results -->
           {% include 'table.html' %}
           <!-- Pager -->
           <ul class="pager">
             {% if r > 0 %}
-              <li><a href="javascript:previous()">Previous</a></li>
+              {% for n in range(prev,0,-1) %}
+                <li><a href="javascript:previous({{n}})">- {{n}}</a></li>
+              {% endfor %}
             {% endif %}
+            ||
             {% if cve|length == pageLength %}
-              <li><a href="javascript:next()">Next</a></li>
+              {% for n in range(1, 4) %}
+                <li><a href="javascript:next({{n}})">+ {{n}}</a></li>
+              {% endfor %}
             {% endif %}
           </ul>
         <!-- end content -->

diff --git a/web/templates/index.html b/web/templates/index.html
@@ -32,14 +32,15 @@
       form.action = url;
       form.submit();
     }
-    function next(){
+    function next(n){
       setSettings();
-      var url = "/r/{{ r + pageLength }}";
+      var multiplier = {{ r }} + ( n * {{ pageLength }});
+      var url = "/r/"+multiplier;
       postURL(url);
     }
-    function previous(){
+    function previous(n){
       setSettings();
-      var page = {{ r - pageLength }};
+      var page = {{ r }} - ( n * {{ pageLength }});
       if(page < 0){
         page = 0;}
       var url = "/r/" + page;
@@ -135,23 +136,39 @@
             </form>
           </div>
           <!-- Pager -->
+          {% if (r/pageLength)|int < 3 %}
+            {% set prev = (r/pageLength)|int %}
+          {% else %}
+            {% set prev = 3 %}
+          {% endif %}
+
           <ul class="pager">
             {% if r > 0 %}
-              <li><a href="javascript:previous()">Previous</a></li>
+              {% for n in range(prev,0,-1) %}
+                <li><a href="javascript:previous({{n}})">- {{n}}</a></li>
+              {% endfor %}
             {% endif %}
+            ||
             {% if cve|length == pageLength %}
-              <li><a href="javascript:next()">Next</a></li>
+              {% for n in range(1, 4) %}
+                <li><a href="javascript:next({{n}})">+ {{n}}</a></li>
+              {% endfor %}
             {% endif %}
           </ul>
           <!-- Search results -->
           {% include 'table.html' %}
           <!-- Pager -->
           <ul class="pager">
             {% if r > 0 %}
-              <li><a href="javascript:previous()">Previous</a></li>
+              {% for n in range(prev,0,-1) %}
+                <li><a href="javascript:previous({{n}})">- {{n}}</a></li>
+              {% endfor %}
             {% endif %}
+            ||
             {% if cve|length == pageLength %}
-              <li><a href="javascript:next()">Next</a></li>
+              {% for n in range(1, 4) %}
+                <li><a href="javascript:next({{n}})">+ {{n}}</a></li>
+              {% endfor %}
             {% endif %}
           </ul>
         <!-- end content -->