# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1371827343 -7200
# Node ID d5f4dde387a911f6755787030a7da362a2ffa1d3
# Parent  758b9289aa9aa7cd597b06b6109fbb31706f4161
- Correct pagination on page load
- Ensure that page range always contains valid page nb

diff -r 758b9289aa9a -r d5f4dde387a9 src/jocondelab/static/jocondelab/js/jocondelab.js
--- a/src/jocondelab/static/jocondelab/js/jocondelab.js	Fri Jun 21 15:20:24 2013 +0200
+++ b/src/jocondelab/static/jocondelab/js/jocondelab.js	Fri Jun 21 17:09:03 2013 +0200
@@ -155,3 +155,15 @@
     });
 }
 
+function init_edit_page(page) {
+    var values = $('#term-filter-form').serialize();
+    // add page
+    if(typeof(page) !== "undefined" && page) { 
+        values += "&page="+page;
+    }
+    $('#term-explorer-container').load(term_list_table_url, values, function() {
+        $('#term-list-table #term-'+term_id).addClass('currenttermline');
+    });
+
+}
+
diff -r 758b9289aa9a -r d5f4dde387a9 src/jocondelab/templates/jocondelab/term_edit.html
--- a/src/jocondelab/templates/jocondelab/term_edit.html	Fri Jun 21 15:20:24 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/term_edit.html	Fri Jun 21 17:09:03 2013 +0200
@@ -21,7 +21,7 @@
     $(document).ready(function(){
         init_term_events();
         init_filter_events();
-        $('#term-filter-form').submit();
+        init_edit_page('{{request.GET.page}}');
     });
     
     </script>
@@ -74,9 +74,11 @@
     <tr>
         <td>{% trans 'alternative labels' %}</td>
         <td>
+            <ul>
             {% for label in term.alternative_labels_list %}
-                <div>{{ label }}</div>
+                <li>{{ label }}</li>
             {% endfor %}
+            </ul>
         </td>    
     </tr>
     <tr>
diff -r 758b9289aa9a -r d5f4dde387a9 src/jocondelab/utils.py
--- a/src/jocondelab/utils.py	Fri Jun 21 15:20:24 2013 +0200
+++ b/src/jocondelab/utils.py	Fri Jun 21 17:09:03 2013 +0200
@@ -56,9 +56,10 @@
         prev = None
         res = []
         for i in sorted(ranges):
-            if prev and i-prev > 1:
-                res.append(0)
-            res.append(i)
-            prev = i
+            if 1 <= i <= self.paginator.num_pages:
+                if prev and i-prev > 1:
+                    res.append(0)
+                res.append(i)
+                prev = i
         return res
     
\ No newline at end of file