Changeset 406 for veekun/trunk/templates/forum/common.tt

Timestamp:

02/08/08 02:44:39 (2 years ago)

Author:

eevee

Message:

Database refactoring. Renamed columns and tables to be more consistent and more readable. (#58)

Files:

• veekun/trunk/templates/forum/common.tt (modified) (11 diffs)

veekun/trunk/templates/forum/common.tt

@@ -34 +34 @@
 [%             END %]
 [%         END %]
- [% '<dt>' IF style == 2 %]<img src="/images/icons/pm/[% user.pmicon %].png" alt="Send private message" title="Send private message" class="disabled"/> [% 'PM<dd>not yet' IF style == 2 %]
+ [% '<dt>' IF style == 2 %]<img src="/images/icons/pm/[% user.pm_icon %].png" alt="Send private message" title="Send private message" class="disabled"/> [% 'PM<dd>not yet' IF style == 2 %]
  </dl>
 [% END %]
@@ -44 +44 @@
  <p>[% IF form.exists('subject'); '<label>Subject: '; form.get_tag('subject'); '</label>'; END %]</p>
  <p>[% IF form.exists('blurb'); '<label>Blurb: '; form.get_tag('blurb'); '</label>'; END %]</p>
- <p>[% form.get_tag('id') %][% IF form.exists('message'); form.get_tag('message'); END %]</p>
+ <p>[% form.get_tag('id') %][% IF form.exists('content'); form.get_tag('content'); END %]</p>
  <p> <input type="submit" name="submit" value="Post"/> <input type="submit" name="submit" value="Preview"/> <input type="reset" value="Clear"/> </p>
 </form>
@@ -53 +53 @@
 [% BLOCK post_buttons -%][%# post, thread, forum %]
 [%     is_deleted = post.flags.match('deleted') %]
-[%     IF c.can_i("postedit", post) OR post.userid == c.user.obj.id; can_edit = 1; END %]
-[%     IF c.can_i("postdelete", post) OR (post.userid == c.user.obj.id AND post.id == thread.lastpostid); can_delete = 1; END %]
+[%     IF c.can_i("postedit", post) OR post.user_id == c.user.obj.id; can_edit = 1; END %]
+[%     IF c.can_i("postdelete", post) OR (post.user_id == c.user.obj.id AND post.id == thread.last_post_id); can_delete = 1; END %]
 [%     IF c.can_i("postnuke"); can_nuke = 1; END %] 
 [%     RETURN UNLESS can_edit || can_delete || can_nuke %]
@@ -93 +93 @@
  <div class="sidebar">
   <img src="/images/icons/delete.png" alt=""/>
-  This post by <a href="[% c.uri('Users', 'info', post.userid) %]">[% post.user.name %]</a> has been deleted.
+  This post by <a href="[% c.uri('Users', 'info', post.user_id) %]">[% post.user.name %]</a> has been deleted.
 [%         IF c.can_i("postdelete", post) %]
   <a href="/forum/post/[% post.id %]/undelete">Restore it?</a>  Or <a href="/forum/post/[% post.id %]/edits">read it</a>?
@@ -103 +103 @@
     <div class="sidebar-wrapper"><div class="sidebar">
 [%     groups = post.user.groups.split(' '); primary_group = groups.shift %]
-        <div class="username"><a href="[% c.uri('Users', 'info', post.userid) %]"><img src="/images/groups/[% UserGroups.$primary_group.icon %]" alt="[% UserGroups.$primary_group.name %]" title="[% UserGroups.$primary_group.name %]"/> [% post.user.name %]</a></div>
-        <div class="title[% IF post.user.customtitle -%] custom">[% post.user.customtitle %][% ELSE %]">[% UserGroups.$primary_group.name %][% END %]</div>
+        <div class="username"><a href="[% c.uri('Users', 'info', post.user_id) %]"><img src="/images/groups/[% UserGroups.$primary_group.icon %]" alt="[% UserGroups.$primary_group.name %]" title="[% UserGroups.$primary_group.name %]"/> [% post.user.name %]</a></div>
+        <div class="title[% IF post.user.custom_title -%] custom">[% post.user.custom_title %][% ELSE %]">[% UserGroups.$primary_group.name %][% END %]</div>
         <div class="avatar">[% IF post.user.is_dumb %]<img src="/images/dumb.png" alt="PSA: THIS USER IS DUMB" class="dumb"/>[% END %][% IF post.user.avatar %]<img src="/images/avatars/[% post.user.avatar %]" alt="">[% ELSE %]No avatar[% END %]</div>
         <div class="postbar">
-            <span class="postrank">[%# postrank(post.user.postct) %]</span>
-            <span class="postcount">Posts: [% post.user.postct %]</span>
-            [% INCLUDE postbar posts=post.user.postct %]
+            <span class="postrank">[%# postrank(post.user.post_count) %]</span>
+            <span class="postcount">Posts: [% post.user.post_count %]</span>
+            [% INCLUDE postbar posts=post.user.post_count %]
         </div>
     </div></div>
@@ -124 +124 @@
     </div>
     <div class="content">
-[%     IF post.newspic %]
-        <img src="/images/news/[% post.user.newspic %]" alt="[% post.name %]'s newspic" class="forum-post-newspic"/>
+[%     IF post.news_pic %]
+        <img src="/images/news/[% post.user.news_pic %]" alt="[% post.name %]'s news pic" class="forum-post-newspic"/>
 [%     END %]
 [%     IF post.lastedit %]
@@ -131 +131 @@
 [%     END %]
         <div class="message">
-[%+    post.message | bbcode | indent(12) %]
+[%+    post.content | bbcode | indent(12) %]
         </div>
 [%     IF post.user.signature %]
@@ -172 +172 @@
     </a> <!-- [ <a>2</a>, <a>3</a>, <a>4</a>, ... <a>9</a>, <a>10</a> ] -->
 [%     IF show_forum %]
-    <div class="inforum">in forum "<a href="/forum/[% thread.forumid %]">[% thread.forum.name %]</a>"</div>
-[%     END %]
-</td>
-<td class="postinfo"><a href="[% c.uri('Users', 'info', thread.firstpost.userid) %]">[% thread.firstpost.user.name %]</a> <a href="/forum/post/[% thread.firstpost.id %]">[% thread.firstpost.time | date %]</a></td>
-<td class="count">[%# this is stupid fix it lati, but if all posts are deleted this will show -1 %][% IF thread.postct > 0; thread.postct - 1; ELSE; thread.postct; END %]</td><td class="count">[% thread.hitct %]</td>
+    <div class="inforum">in forum "<a href="/forum/[% thread.forum_id %]">[% thread.forum.name %]</a>"</div>
+[%     END %]
+</td>
+<td class="postinfo"><a href="[% c.uri('Users', 'info', thread.firstpost.user_id) %]">[% thread.firstpost.user.name %]</a> <a href="/forum/post/[% thread.firstpost.id %]">[% thread.firstpost.time | date %]</a></td>
+<td class="count">[%# this is stupid fix it lati, but if all posts are deleted this will show -1 %][% IF thread.post_count > 0; thread.post_count - 1; ELSE; thread.post_count; END %]</td><td class="count">[% thread.view_count %]</td>
 <td class="postinfo">
-[%     IF thread.postct <= 1 -%]
+[%     IF thread.post_count <= 1 -%]
 -
 [%     ELSE %]
-<a href="[% c.uri('Users', 'info', thread.lastpost.userid) %]">[% thread.lastpost.user.name %]</a> <a href="/forum/post/[% thread.lastpost.id %]">[% thread.lastpost.time | date %]</a>
+<a href="[% c.uri('Users', 'info', thread.lastpost.user_id) %]">[% thread.lastpost.user.name %]</a> <a href="/forum/post/[% thread.lastpost.id %]">[% thread.lastpost.time | date %]</a>
 [%     END -%]
 </td>
@@ -188 +188 @@
 [% END -%]
 
-[% BLOCK threads_message %][%# message -%]
-<tr><td class="forum-message" colspan="7">[% message %]</td></tr>
+[% BLOCK threads_message %][%# content -%]
+<tr><td class="forum-message" colspan="7">[% content %]</td></tr>
 [% END -%]
 
@@ -222 +222 @@
     </a>
 </td>
-<td class="count">[% forum.threadct %]</td><td class="count">[% forum.postct %]</td>
+<td class="count">[% forum.thread_count %]</td><td class="count">[% forum.post_count %]</td>
 <td class="postinfo">
-[%     IF forum.lastpostid %]
+[%     IF forum.last_post_id %]
 [%         IF 25 < forum.lastpost.thread.subject.length; subject = last_thread.subject.substr(0, 22) _ '...'; ELSE; subject = forum.lastpost.thread.subject; END -%]
-[%             subject %] <a href="[% c.uri('Users', 'info', forum.lastpost.userid) %]">[% forum.lastpost.user.name %]</a> <a href="/forum/post/[% forum.lastpostid %]">[% forum.lastpost.time | date %]</a>
+[%             subject %] <a href="[% c.uri('Users', 'info', forum.lastpost.user_id) %]">[% forum.lastpost.user.name %]</a> <a href="/forum/post/[% forum.last_post_id %]">[% forum.lastpost.time | date %]</a>
 [%     ELSE %]
 (no posts)
@@ -235 +235 @@
 [% END %]
 
-[% BLOCK forums_message %][%# message -%]
-<tr><td class="message" colspan="5">[% message %]</td></tr>
+[% BLOCK forums_message %][%# content -%]
+<tr><td class="message" colspan="5">[% content %]</td></tr>
 [% END %]