# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: eric@themoritzfamily.com-20080526020015-\
#   3ree2etqelamf63b
# target_branch: http://bazaar.launchpad.net/%7Estevem-\
#   gnulinux/meow/pagination/
# testament_sha1: 57748302de17d9024aa4674ed57b6b6244ea7593
# timestamp: 2008-05-25 22:06:07 -0400
# source_branch: .
# base_revision_id: steve@tachikoman-20080525193610-9xbvik7efopxvfca
# 
# Begin patch
=== modified file 'settings.py'
--- settings.py	2008-05-24 22:37:49 +0000
+++ settings.py	2008-05-25 01:44:00 +0000
@@ -27,7 +27,7 @@
 PUBLIC_MESSAGE_COUNT = 50
 FEED_MESSAGE_COUNT = 10
 
-MESSAGE_QUERY_LIMIT = 350
+MESSAGE_QUERY_LIMIT = 1000
 
 ROOT_URLCONF = 'urls'
 TIME_ZONE = "UTC"

=== modified file 'templates/base.html'
--- templates/base.html	2008-05-25 19:30:12 +0000
+++ templates/base.html	2008-05-26 01:50:15 +0000
@@ -17,16 +17,17 @@
 </div>
 
 <div id="content">
+{% block pre-content %}{% endblock %}
 {% block content %}
 {% endblock %}
 </div>
-
-{% block pagination %}{% endblock %}
-
-{% block tail %}{% endblock %}
+{% block post-content %}{% endblock %}
+
 <div id="footer">
 <span><a href="https://launchpad.net/meow/">Code</a></span>
 </div>
+
+{% block tail %}{% endblock %}
 {% include "tracking.html" %}
 </body>
 </html>

=== modified file 'templates/index.html'
--- templates/index.html	2008-05-25 19:30:12 +0000
+++ templates/index.html	2008-05-26 01:50:15 +0000
@@ -14,10 +14,6 @@
 {% endif %}
 </div>
 {% endblock %}
-
-{% block pagination %}
+{% block post-content %}
 {% include "pagination.html" %}
 {% endblock %}
-
-{% block tail %}
-{% endblock %}

=== modified file 'templates/user.html'
--- templates/user.html	2008-05-25 19:30:12 +0000
+++ templates/user.html	2008-05-26 01:50:15 +0000
@@ -8,7 +8,7 @@
 {% if message_list %}
 <ul>
 {% for message in message_list %}
-<li class="{% if forloop.first %}first{% endif %}">
+<li class="{% if forloop.first and firstpage %}first{% endif %}">
 {% include "message.html" %}
 </li>
 {% endfor %}
@@ -17,6 +17,8 @@
 </div>
 {% endblock %}
 
-{% block pagination %}
+{% block post-content %}
 {% include "pagination.html" %}
 {% endblock %}
+
+

=== modified file 'urls.py'
--- urls.py	2008-05-25 19:36:10 +0000
+++ urls.py	2008-05-26 02:00:15 +0000
@@ -21,7 +21,7 @@
 
 # main mappings
 urlpatterns = patterns('views.main',
-                       (r'^$', 'index'),
+                       (r'^$', 'pagination_redirect'),
                        (r'^page/(?P<page>\d+)/$', 'public_timeline'),
                        (r'^message/(?P<key>\d+)/$', 'message_detail'),
                        (r'^logout/$', 'logout'),
@@ -55,5 +55,7 @@
 # user patterns, this has to last because the user_page pattern
 # will match many things
 urlpatterns += patterns('views.user',
-                       (r'^(?P<nickname>[\w\._-]+)/$', 'user_page'),
+                       (r'^(?P<nickname>[\w\._-]+)/page/(?P<page>\d+)/$',
+                        'user_page'),
+                       (r'^(?P<nickname>[\w\._-]+)/$', 'user_redirect'),
 )

=== modified file 'views/main.py'
--- views/main.py	2008-05-25 19:36:10 +0000
+++ views/main.py	2008-05-26 02:00:15 +0000
@@ -14,8 +14,11 @@
 # along with Meow.  If not, see <http://www.gnu.org/licenses/>.
 """Main views."""
 
-from django.http import HttpResponse, HttpResponseRedirect
-from django.core.paginator import ObjectPaginator, InvalidPage
+from django.http import HttpResponse
+from django.http import HttpResponseRedirect
+from django.http import Http404
+from django.core.paginator import ObjectPaginator
+from django.core.paginator import InvalidPage
 from google.appengine.ext.webapp import template
 from google.appengine.ext import db
 from models import Message
@@ -43,7 +46,11 @@
     page_no = int(page)
 
     paginator = ObjectPaginator(data_list, items_per_page)
-    context_dict['message_list'] = paginator.get_page(page)
+
+    try:
+        context_dict['message_list'] = paginator.get_page(page)
+    except InvalidPage:
+        raise Http404
 
     if page_no > 0:
         context_dict['prev_page'] = page_no - 1
@@ -53,9 +60,9 @@
     return context_dict
 
 
-def index(request):
-    """Main view that pushes the user to the first paginated public page"""
-    return HttpResponseRedirect('/page/0/')
+def pagination_redirect(request):
+    """Forwards the user to first page of home results"""
+    return HttpResponseRedirect('page/0/')
 
 
 def public_timeline(request, page = 0):

=== modified file 'views/profile.py'
--- views/profile.py	2008-05-25 19:36:10 +0000
+++ views/profile.py	2008-05-26 02:00:15 +0000
@@ -14,22 +14,23 @@
 # along with Meow.  If not, see <http://www.gnu.org/licenses/>.
 """Views related to a user's profile"""
 from django.http import HttpResponse
-from django.http import HttpResponseRedirect
 from google.appengine.ext.webapp import template
 from models import Message
 from google.appengine.api import users
 from django.conf import settings
 from views.main import require_login
 from views.main import paginate_results
+from views.main import pagination_redirect
+from django.core.paginator import InvalidPage
 
 
 def home_redirect(request):
     """Forwards the user to first page of home results"""
-    return HttpResponseRedirect('page/0/')
+    return pagination_redirect(request)
 
 
 @require_login
-def home(request, page = 0):
+def home(request, page=0):
     """Shows the user's personal information and displays their most recent
     messages"""
     author = users.get_current_user()
@@ -43,10 +44,10 @@
                     'author': author}
 
     # Pagination related code
-    context_dict = paginate_results(page, message_list,
-                                    context_dict, settings.MESSAGE_COUNT)
+    context_dict = paginate_results(page, message_list, context_dict,
+                                        settings.MESSAGE_COUNT)
 
     profile_template = template.load("templates/profile.html")
 
-    return HttpResponse(profile_template.render(
-                          template.Context(context_dict)))
+    return HttpResponse(profile_template.render(template.Context(
+                context_dict)))

=== modified file 'views/user.py'
--- views/user.py	2008-05-24 05:44:22 +0000
+++ views/user.py	2008-05-26 02:00:15 +0000
@@ -19,21 +19,33 @@
 from google.appengine.api import users
 from templatefilters import unsafe_google_nickname
 from django.conf import settings
-
-
-def user_page(request, nickname):
+from views.main import paginate_results
+from views.main import pagination_redirect
+
+
+def user_redirect(request, nickname):
+    """Redirects the user to the paginated page"""
+    return pagination_redirect(request)
+
+
+def user_page(request, nickname, page=0):
     """Displays the user's most recent messages."""
     email = unsafe_google_nickname(nickname)
     author = users.User(email=email)
+    page = int(page)
 
     query = Message.all()
     query.filter("author", author)
-    message_list = query.order("-date").fetch(settings.MESSAGE_COUNT)
+    message_list = query.order("-date").fetch(settings.MESSAGE_QUERY_LIMIT)
+
+    # The context might be modified hence why it is defined early
+    context_dict = {'user': request.user, 'author': author,
+                    'firstpage': page == 0}
+
+    # Pagination related code
+    context_dict = paginate_results(page, message_list, context_dict,
+                                        settings.MESSAGE_COUNT)
 
     user_template = template.load("templates/user.html")
 
-    return HttpResponse(user_template.render(template.Context({
-                    'user': request.user,
-                    'author': author,
-                    'message_list': message_list,
-                    })))
+    return HttpResponse(user_template.render(template.Context(context_dict)))

# Begin bundle
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
0m6fZByFJGcXyHMZD/F3JFOFCQabnj+w