From e93062f3d8d2217a79bbc0232bf86c2f0a0786b6 Mon Sep 17 00:00:00 2001
From: Jeromy <fuji246@gmail.com>
Date: Sun, 24 Feb 2013 01:14:16 +0800
Subject: [PATCH] add pagination for meetings list

---
 .../bbb/locale/zh_CN/LC_MESSAGES/django.mo    | Bin 3603 -> 3659 bytes
 .../bbb/locale/zh_CN/LC_MESSAGES/django.po    |  10 ++++++++--
 bbb_django/bbb/templates/meetings.html        |   6 ++++++
 bbb_django/settings.py                        |   2 ++
 requirements.txt                              |   1 +
 5 files changed, 17 insertions(+), 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
index 9d0b44e6abe3c3c07fdd3b97e023d5556be63739..feea84aaa215e54a7de9e62e37e942827fafacf4 100644
GIT binary patch
delta 1169
zcmXZbO-NKx6u|L2%~MBb##FMj(ZWyy6|8JBCuvg{LRPpCEh@nz6tWMsq`(2A60N}A
zxG2F&szD+vC#BGYh#(4DMA0Ish0ds;v@s}g(f{Om%zeLm?#H<wkFm2pW(9wwS$&2l
zK*^%aJB&Gq6HZ<{e=K8a@Gr(=RosfTYMpvgZN@O;+E7wtGs%THxEk{@83UMNOwd$N
z$)w>hreiD0#BL;qxrwZ8Lh5bw5Dy?f^H?3h1magH{clhf{)BG)rtuUu63=4->zit3
z$wJ348&BXS?8IDrh~@YJGcc8`k~m*2#zf*WB&R9IRIEff$Z>72M}DS>7pY7OdRX6F
z(vB`nBkn~x@dIri!hOUe8ZV(N<Yd((OhQSRj<S(#UNV0(%1soaTzx6}`Mec)ggD6L
zpiKNug`8#zC7xFowS5`o2I9C!Nw^<n1GO60si)M7>NS)Dg)|N$YnvA+^C#Whza)I8
z13qiVPc^14X#b+>V3H(CMwy?%>j36yd#kp0;2PR{)O#o!8pS>MUhZE8c)TkKbJPNq
z9r}^6rcA9+tF^ygZBox_f4h1G<?3%~|DZaAdue}GqYb~+Wt0V-{72-3De8KZ4dtSo
zpa5muZse2x|9mAVbL81!KX>kO`0WMfy2PEtKFSu`Yn5bfr?!ETM=7EdQr1#R?W0za
zW1D@$+UO{@pIAQcR$AqckxvOkzFJS6R&zspt9{v3<vMe&;e6xiwwA~jSK2CHY^*=l
z`DiwLb#AbCdg9LP@bFAzd}jRauZin+oO{j_ecc!B8jJQ1#6pviC3lA-e)?t4-2GAe
Og13@tw^ZMH5B&oUsE&OA

delta 1113
zcmXZbT}V@57{KxOw38n@Tjlz+tp;L2p{y+DEGXHe!HAh;5R5JgB9$<L8Fit%sfeVD
zI(g9tMctTz>ta|JS~o@)SwR<}fpj6t6rzZTh(755xaY9<{Lb?{@7H;cPKMl2?o+@X
zG+Z%Sh&E#x(}s6F+_<J~V~*lSEW?K7C7ab2HL0d?h<-;<rud5$Xfb#tdT|AA#8t-R
z%r+jXN$kP3*nu*z8yRbQkhM)#y?{RAe&lBc)Eih%d<&)i0A=AkI`~ZE3G5<%gXOGm
zqKuM-_TeUM#Tq<;wRi~+;A7l?-%uv@auZi`tHcm8r`d{CSda1|`!%0HekR3@Da>K?
zvA)S@p%VkdXEnZvN#biL6MsN2&Y(<CL|OPN$_f2KdGmiLN9|B-<Z}iwL)^|_88?D-
zF{7B1#0xFF(!x7Tk)J}Du!i%K4Mb4lsG3j@smD-Wpj+cUlnq`*8GlprchpA?=P!j(
z?J%xRXouJ86v{+%8h^nw@o&wi*p+OogWDQBuAW2L&;Tazp5|v!=KCq<FAtW#v_l7}
znSdHr>$Kjiwx~(1r_~I~(RXV7Jhl?&G=7OP|0K$~(=mOR)efIgcKjWsV;TP|e8Q#g
z)rc}kuHEi?&t7Yn>$lf0rGn(5ZoS=9-N4gk+7?=bR!3V$YjXSSh_%xlvBQ>e-`YX{
z4zluxznvB<{IH*R+~JD$f~T@-SvcNxDt@~6WV|<<J=3!=bb0aN^||re3;BGpFjgG9
d??#+OUnw#Fd~p8C(?YGU-*Sij2i-sZw*Ti*e4hXS

diff --git a/bbb_django/bbb/locale/zh_CN/LC_MESSAGES/django.po b/bbb_django/bbb/locale/zh_CN/LC_MESSAGES/django.po
index 03ae351..5b7be78 100644
--- 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
index 69cc78f..142a6b6 100644
--- 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
index 54928cf..658973d 100644
--- 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
index 562dd4f..6ba8d42 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,3 +10,4 @@ flup
 South
 pytz
 icalendar
+django-pagination