add pagination for meetings list

fuji246 · Feb 23, 2013 · e93062f · e93062f
1 parent 0380a87
commit e93062f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/bbb_django/bbb/locale/zh_CN/LC_MESSAGES/django.mo b/bbb_django/bbb/locale/zh_CN/LC_MESSAGES/django.mo
diff --git a/bbb_django/bbb/locale/zh_CN/LC_MESSAGES/django.po b/bbb_django/bbb/locale/zh_CN/LC_MESSAGES/django.po
@@ -162,7 +162,7 @@ msgid ""
 "<p>Welcome to the Django BigBlueButton web conferencing server. If you are "
 "here to attend a webinar then you should have been issued a URL to log into "
 "the meeting.</p>"
-msgstr "<p>欢迎使用BigBlueButton视频会议系统请登陆后继续使用</p>"
+msgstr "<p>欢迎使用涛悦视频会议系统，请登陆后继续使用</p>"
 
 #: templates/join.html:5 templates/join.html.py:10
 msgid "Join meeting"
@@ -198,7 +198,7 @@ msgstr "结束会议"
 
 #: templates/meetings.html:20
 msgid "Playback"
-msgstr "会议录制"
+msgstr "录制回放"
 
 #: templates/meetings.html:22
 msgid "Ended"
@@ -329,3 +329,9 @@ msgstr "会议管理"
 
 #~ msgid "info"
 #~ msgstr "其他信息"
+
+msgid "previous"
+msgstr "上页"
+
+msgid "next"
+msgstr "下页"
diff --git a/bbb_django/bbb/templates/meetings.html b/bbb_django/bbb/templates/meetings.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% load pagination_tags %}
+
 
 {% load i18n %}
 
@@ -8,6 +10,7 @@
 <h2>{% trans "Meetings" %}</h2>
 {% if meetings %}
     <ul class="large">
+    {% autopaginate meetings 2 %}
     {% for meeting in meetings %}
         <li>
             <span class="right">
@@ -40,8 +43,11 @@ <h2>{% trans "Meetings" %}</h2>
             </table>
         </li>
     {% endfor %}
+    <br/>
+    {% paginate %}
     </ul>
 {% else %}
     <p>{% trans "There are no meetings at the moment." %}</p>
 {% endif %}
 {% endblock %}
+
diff --git a/bbb_django/settings.py b/bbb_django/settings.py
@@ -84,6 +84,7 @@
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
+    'pagination.middleware.PaginationMiddleware',
 )
 
 AUTHENTICATION_BACKENDS = (
@@ -125,6 +126,7 @@
     'django.contrib.admin',
     'bbb',
     'south',
+    'pagination',
     #'gunicorn',
 
 )

diff --git a/requirements.txt b/requirements.txt
@@ -10,3 +10,4 @@ flup
 South
 pytz
 icalendar
+django-pagination
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,4 @@ flup @@
     South
     pytz
     icalendar
+    django-pagination