From 77e15302398ba26dc209521e257adbc1bed3e710 Mon Sep 17 00:00:00 2001
From: Chaoyi Zha <Cydrobolt@users.noreply.github.com>
Date: Jun 18 2014 13:05:22 +0000
Subject: pagination UI fixes


---

diff --git a/pkgdb2/templates/list_packagers.html b/pkgdb2/templates/list_packagers.html
index 61a5e0b..c4db39a 100644
--- a/pkgdb2/templates/list_packagers.html
+++ b/pkgdb2/templates/list_packagers.html
@@ -12,7 +12,7 @@
 <table>
     <tr>
         <td>
-        {% if page > 1%}
+        {% if page > 1 %}
             <a href="{{ url_for('.list_packagers', motif=motif) }}?page={{page - 1}}">
                 < Previous
             </a>
@@ -30,17 +30,26 @@
             Next >
             {% endif %}
         </td>
+
     </tr>
 </table>
 {% endif %}
 
 <ul>
-{% for packager in packagers %}
-    <li>
-        <a href="{{url_for('.packager_info', packager=packager)}}">
-            {{ packager }}</a>
+{% if total_page >= page and page > 0 %}
+    {% for packager in packagers %}
+        <li>
+            <a href="{{url_for('.packager_info', packager=packager)}}">
+                {{ packager }}</a>
+        </li>
+    {% endfor %}
+{% else %}
+    <li>Sorry, but the page you are requesting is unavailable. <br />
+        <a href="{{ url_for('.list_packagers', motif=motif) }}">
+            Back to the list
+        </a>
     </li>
-{% endfor %}
+{% endif %}
 </ul>
 
 {% endblock %}
diff --git a/pkgdb2/templates/list_packages.html b/pkgdb2/templates/list_packages.html
index 086fa6c..306b76b 100644
--- a/pkgdb2/templates/list_packages.html
+++ b/pkgdb2/templates/list_packages.html
@@ -52,7 +52,7 @@ or <a href="{{ url_for('.list_orphaned') }}">orphaned</a> packages</p>
 <table>
     <tr>
         <td>
-        {% if page > 1%}
+        {% if page > 1 %}
             <a href="{{ url_for('.%s' % origin, motif=motif, page=page-1,
                 branches=branches, status=status, owner=owner) }}">
                 &lt; Previous
@@ -77,25 +77,33 @@ or <a href="{{ url_for('.list_orphaned') }}">orphaned</a> packages</p>
 {% endif %}
 
 <ul>
-{% for pkg in packages %}
-    <li>
-    <a href="{{url_for('.package_info', package=pkg.name)}}">
-            {{ pkg.name }}</a>
-    -- {{ pkg.summary }}
-    (
-    {% for listing in pkg.listings | sort(attribute="collection.branchname", reverse=True)
-        %} {% if listing.collection.status != 'EOL' %}
-        {% if origin == 'list_packages' and listing.status == 'Approved' %}
-            {{ listing.collection.branchname }}
-        {% elif origin == 'list_retired' and listing.status == 'Retired' %}
-            {{ listing.collection.branchname }}
-        {% elif origin == 'list_orphaned' and listing.status == 'Orphaned' %}
-            {{ listing.collection.branchname }}
-        {% endif %}
-    {% endif %}{% endfor %}
-    )
+{% if total_page >= page and page > 0 %}
+    {% for pkg in packages %}
+        <li>
+        <a href="{{url_for('.package_info', package=pkg.name)}}">
+                {{ pkg.name }}</a>
+        -- {{ pkg.summary }}
+        (
+        {% for listing in pkg.listings | sort(attribute="collection.branchname", reverse=True)
+            %} {% if listing.collection.status != 'EOL' %}
+            {% if origin == 'list_packages' and listing.status == 'Approved' %}
+                {{ listing.collection.branchname }}
+            {% elif origin == 'list_retired' and listing.status == 'Retired' %}
+                {{ listing.collection.branchname }}
+            {% elif origin == 'list_orphaned' and listing.status == 'Orphaned' %}
+                {{ listing.collection.branchname }}
+            {% endif %}
+        {% endif %}{% endfor %}
+        )
+        </li>
+    {% endfor %}
+{% else %}
+    <li>Sorry, but the page you are requesting is unavailable. <br />
+        <a href="{{ url_for('.list_packagers', motif=motif) }}">
+            Back to the list
+        </a>
     </li>
-{% endfor %}
+{% endif %}
 </ul>
 
 {% endblock %}