Changeset 5

Timestamp:

02/15/07 23:23:25 (3 years ago)

Author:

eevee

Message:

Added: Forum view (thread list) is now paged.
Changed: While I was at it, shuffled options around because the names made me sick. Paging options are now in a subhash called page_sizes.

Location:

veekun

Files:

• lib/Vee/Controller/Forum.pm (modified) (5 diffs)
• lib/Vee/Controller/Index.pm (modified) (1 diff)
• lib/Vee/Controller/Shoutbox.pm (modified) (1 diff)
• lib/Vee/Controller/Users.pm (modified) (3 diffs)
• site_options.yml (modified) (1 diff)
• templates/forum/thread/view.tt (modified) (2 diffs)
• templates/forum/view.tt (modified) (2 diffs)
• templates/shoutbox.tt (modified) (1 diff)

veekun/lib/Vee/Controller/Forum.pm

@@ -67 +67 @@
         or $c->vee_abort('There is no forum with id ' . $c->vee_cleanse($id) . '.  You may have followed an old link, or might be playing with URLs.');
 
-    $s->{page_title } = $forum->name . ' - Forums';
+    my $skip = $c->req->params->{skip} || 0;
+    my $perpage = $c->site_opts->{page_sizes}{threads};
+
+    $s->{page_title}  = $forum->name . ' - Forums';
     $s->{page_header} = $forum->name;
-    $s->{link_name  } = 'forum';
-    $s->{extra_css  } = 'forum';
-    $s->{crumbs     } = [ '<a href="/forum">Forum Index</a>', '<a href="/forum/'.$forum->id.'">'.$forum->name.'</a>' ];
+    $s->{link_name}   = 'forum';
+    $s->{extra_css}   = 'forum';
+    $s->{crumbs}      = [ '<a href="/forum">Forum Index</a>', '<a href="/forum/'.$forum->id.'">'.$forum->name.'</a>' ];
 
     $s->{announcements} = [ $c->model('DBIC::Threads')->search_announcements ];
-    $s->{forum        } = $forum;
-    $s->{threads      } = [ $forum->search_related('threads', \ 'NOT FIND_IN_SET("deleted", me.flags)', { order_by => 'FIND_IN_SET("sticky", me.flags) > 0 DESC, lastpost.time DESC', prefetch => { firstpost => 'user', lastpost => 'user' } }) ];
+    $s->{forum}         = $forum;
+    $s->{threads}       = [ $forum->search_related('threads', \ 'NOT FIND_IN_SET("deleted", me.flags)', {
+        order_by => 'FIND_IN_SET("sticky", me.flags) > 0 DESC, lastpost.time DESC',
+        prefetch => { firstpost => 'user', lastpost => 'user' },
+        offset => $skip,
+        rows => $perpage,
+    } ) ];
 
     $s->{template} = 'forum/view.tt';
@@ -113 +121 @@
     }
     
-    my $perpage = $c->site_opts->{perpage_posts};
+    my $perpage = $c->site_opts->{page_sizes}{posts};
     my $lastpage = ($skip + $perpage >= $thread->postct);
-    #my @posts = $c->model('DBIC::Posts')->search({ threadid => $id, ( $filter_user ? ( userid => $filter_user->id ) : () ) }, { order_by => 'me.time ASC', prefetch => [ 'user', { lastedit => 'user' } ], page => $skip / $perpage, rows => $perpage } );
     my @posts = $c->model('DBIC::Posts')->search(
         { 'me.threadid' => $id, ( $filter_user ? ( 'me.userid' => $filter_user->id ) : () ) },
@@ -141 +148 @@
     $s->{postbar_color} = sub { Vee::Utils::hsv2rgb(shift, 192, 192) }; # Remove after making global
 
-    # probably don't want announcements here?  not in template anyway
-    #$s->{announcements} = [ $c->model('DBIC::Threads')->search_announcements ];
     $s->{forum}       = $thread->forum;
     $s->{thread}      = $thread;
@@ -150 +155 @@
 #    $s->{can_post    = !$sess->test_post($thread, $thread->forumid),
     $s->{skip}        = $skip;
-    $s->{perpage}     = $perpage;
     $s->{filter}      = $filter;
 
@@ -174 +178 @@
         ],
     });
-    my $perpage = $c->site_opts->{perpage_posts};
+    my $perpage = $c->site_opts->{page_sizes}{posts};
     my $skip = $offset - $offset % $perpage;
     $c->res->redirect( $c->uri('Forum', 'thread', $post->threadid, ($skip ? { skip => $skip } : ()) ) . "#p$id" );

veekun/lib/Vee/Controller/Index.pm

@@ -41 +41 @@
 
     # TODO: omit deleted postses: by thread or post or what?
-    my $news_forum = $c->model('DBIC::Forums')->find( $c->site_opts->{index_news_forum} );
-    $s->{recent_news  } = [ $news_forum->threads( undef, { prefetch => 'firstpost', order_by => 'me.id DESC', rows => $c->site_opts->{index_news_count} } ) ];
-    $s->{recent_shouts} = [ $c->model('DBIC::Shoutbox')->search( undef,  { order_by => 'me.time DESC', rows => $c->site_opts->{index_shout_count} } ) ];
-    $s->{recent_art   } = [ $c->model('DBIC::Gallery')->search( undef, { order_by => 'me.time DESC', rows => $c->site_opts->{index_gallery_count} } ) ];
+    my $news_forum = $c->model('DBIC::Forums')->find( $c->site_opts->{special_forums}{news} );
+    my $page_sizes = $c->site_opts->{page_sizes};
+    $s->{recent_news  } = [ $news_forum->threads( undef, { prefetch => 'firstpost', order_by => 'me.id DESC', rows => $page_sizes->{news} } ) ];
+    $s->{recent_shouts} = [ $c->model('DBIC::Shoutbox')->search( undef,  { order_by => 'me.time DESC', rows => $page_sizes->{shoutbox} } ) ];
+    $s->{recent_art   } = [ $c->model('DBIC::Gallery')->search( undef, { order_by => 'me.time DESC', rows => $page_sizes->{gallery} } ) ];
     $s->{recent_posts } = [ $c->model('DBIC::Threads')->search( undef, {
         order_by => 'lastpost.time DESC',
-        rows => $c->site_opts->{index_posts_count},
+        rows => $page_sizes->{forum},
         prefetch => { 'lastpost' => 'user' }
     } ) ];
 
     $s->{recent_users } = [ $c->model('DBIC::Users')->search(
-        { lastactive => { '>', time - $c->site_opts->{stat_user_activetime} } },
+        { lastactive => { '>', time - $c->site_opts->{user_activity_timeout} } },
         { order_by => 'me.lastactive DESC' }
     ) ];    

veekun/lib/Vee/Controller/Shoutbox.pm

@@ -42 +42 @@
             order_by => 'time DESC',
             prefetch => ['user'],
-            rows     => $c->site_opts->{shoutbox_page},
+            rows     => $c->site_opts->{page_sizes}{shoutbox},
             offset   => $skip,
         }

veekun/lib/Vee/Controller/Users.pm

@@ -189 +189 @@
     
     my @recent_users = $c->model('DBIC::Users')->search(
-            { lastactive => { '>', time - $c->site_opts->{stat_user_activetime} } },
+            { lastactive => { '>', time - $c->site_opts->{user_activity_timeout} } },
             { order_by => 'me.lastactive DESC' }
     );
@@ -199 +199 @@
     # TODO: these are probably completely unnecessary
     
-    $s->{postrank     } = sub { Vee::Utils::postrank(shift, $c->site_opts->{postranks}) };
+    $s->{postrank     } = sub { Vee::Utils::postrank(shift, $c->site_opts->{post_ranks}) };
     $s->{postwidth    } = \&Vee::Utils::post_width;
     $s->{postbar_color} = sub { Vee::Utils::hsv2rgb(shift, 192, 192) };
@@ -226 +226 @@
 
     # TODO: these are probably completely unnecessary
-    $s->{postrank} = sub { Vee::Utils::postrank(shift, $c->site_opts->{postranks}) };
+    $s->{postrank} = sub { Vee::Utils::postrank(shift, $c->site_opts->{post_ranks}) };
     $s->{postwidth} = \&Vee::Utils::post_width;
     $s->{postbar_color} = sub { Vee::Utils::hsv2rgb(shift, 192, 192) };

veekun/site_options.yml

@@ -43 +43 @@
 #   news link
 
+# Numbers of certain thingies to show per page.
+page_sizes:
+    index:
+        # Boxes on the index page
+        shoutbox: 10
+        news: 5
+        gallery: 10
+        forum: 20
+        users: 10
+    posts: 20
+    shoutbox: 50
+    threads: 30
+    users: 50
 
-index_news_forum: 1
-index_news_count: 5
-index_shout_count: 10
-index_gallery_count: 10
-index_posts_count: 20
+# Forum ids of some forums used for non-forum purposes.
+special_forums:
+    news: 1
 
-shoutbox_page: 50
+# Number of seconds before a user is considered inactive
+user_activity_timeout: 900
 
-userlist_page: 10
-
-stat_user_activetime: 900
-
-perpage_posts: 20
-perpage_threads: 30
-
+# Number of posts => rank you get
 postranks:
     0: Uninterested

veekun/templates/forum/thread/view.tt

@@ -4 +4 @@
 [% IF thread.blurb %]<div class="forum-blurb">[% thread.blurb %]</div>[% END %]
 <div class="forum-postct">[% thread.postct %] post[% 's' IF thread.postct != 1 %], [% thread.hitct %] view[% 's' IF thread.hitct != 1 %]</div>
-[% pagelist(skip, perpage, thread.postct, c.uri('Forum', 'thread', thread.id), c.req.params) %]
+[% this_pagelist = pagelist(skip, c.site_opts.page_sizes.posts, thread.postct, c.uri('Forum', 'thread', thread.id), c.req.params); this_pagelist %]
 [% INCLUDE posts_start %]
 [% FOREACH p IN posts %]
@@ -43 +43 @@
 </div>
 [% END %]
-[% page_list %]
+[% this_pagelist %]
 
 [% IF can_post(thread) %]

veekun/templates/forum/view.tt

@@ +1 @@
+[% PROCESS 'common.tt' %]
 [% PROCESS 'forum/common.tt' %]
 
 [% IF forum.blurb %]<div class="forum-blurb">[% forum.blurb %]</div>[% END %]
+[% this_pagelist = pagelist(skip, c.site_opts.page_sizes.threads, forum.threadct, c.uri('Forum', 'forum', forum.id), c.req.params); this_pagelist %]
 [% INCLUDE show_announcements announcements=announcements %]
 [% forum_flags = BLOCK %]
@@ -17 +19 @@
 [% INCLUDE threads_end %]
 [% forum_flags %]
+[% this_pagelist %]
 
 <h1>Create a new thread</h1>

veekun/templates/shoutbox.tt

@@ -7 +7 @@
 
 <p class="total center">[% shout_total %] shoutbox comments total</p>
-[% pagelist(skip, c.site_opts.shoutbox_page, shout_total, '/shoutbox', {}) %]
-
-<!-- hay vee throw in some IPs and stuff I dunno? -->
+[% pagelist(skip, c.site_opts.page_sizes.shoutbox, shout_total, '/shoutbox', {}) %]
 
 [% can_nuke = has_permission('shoutbox_nuke') %]