Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[24545] trunk
|
From: <sy...@us...> - 2010-01-19 13:46:10
|
Revision: 24545
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24545&view=rev
Author: sylvieg
Date: 2010-01-19 13:46:04 +0000 (Tue, 19 Jan 2010)
Log Message:
-----------
[NEW]forum: option to display in the list topics author avatar or last post user avatar
Modified Paths:
--------------
trunk/db/tiki.sql
trunk/lib/profilelib/installlib.php
trunk/templates/tiki-admin_forums.tpl
trunk/templates/tiki-view_forum.tpl
trunk/tiki-admin_forums.php
Added Paths:
-----------
trunk/installer/schema/20100118_forum_display_tiki.sql
Modified: trunk/db/tiki.sql
===================================================================
--- trunk/db/tiki.sql 2010-01-19 09:42:55 UTC (rev 24544)
+++ trunk/db/tiki.sql 2010-01-19 13:46:04 UTC (rev 24545)
@@ -862,6 +862,7 @@
`topics_list_lastpost_title` char(1) default NULL,
`topics_list_lastpost_avatar` char(1) default NULL,
`topics_list_author` char(1) default NULL,
+ `topics_list_author_avatar` char(1) default NULL,
`vote_threads` char(1) default NULL,
`forum_last_n` int(2) default 0,
`threadStyle` varchar(100) default NULL,
Added: trunk/installer/schema/20100118_forum_display_tiki.sql
===================================================================
--- trunk/installer/schema/20100118_forum_display_tiki.sql (rev 0)
+++ trunk/installer/schema/20100118_forum_display_tiki.sql 2010-01-19 13:46:04 UTC (rev 24545)
@@ -0,0 +1,2 @@
+alter table `tiki_forums` add column `topics_list_lastpost_avatar` char(1) default NULL AFTER `topics_list_lastpost_title`;
+alter table `tiki_forums` add column `topics_list_author_avatar` char(1) default NULL AFTER `topics_list_author`;
Modified: trunk/lib/profilelib/installlib.php
===================================================================
--- trunk/lib/profilelib/installlib.php 2010-01-19 09:42:55 UTC (rev 24544)
+++ trunk/lib/profilelib/installlib.php 2010-01-19 13:46:04 UTC (rev 24545)
@@ -1770,7 +1770,9 @@
'list_topic_points' => 'n',
'list_topic_last_post' => 'n',
'list_topic_last_post_title' => 'n',
+ 'list_topic_last_post_avatar' => 'n',
'list_topic_author' => 'n',
+ 'list_topic_author_avatar' => 'n',
'show_description' => 'n',
@@ -1884,7 +1886,9 @@
$data['thread_style'],
$data['is_flat'],
$data['list_att_nb'],
- $data['list_topic_last_post_title']
+ $data['list_topic_last_post_title'],
+ $data['list_topic_last_post_avatar'],
+ $data['list_topic_author_avatar']
);
return $id;
Modified: trunk/templates/tiki-admin_forums.tpl
===================================================================
--- trunk/templates/tiki-admin_forums.tpl 2010-01-19 09:42:55 UTC (rev 24544)
+++ trunk/templates/tiki-admin_forums.tpl 2010-01-19 13:46:04 UTC (rev 24545)
@@ -235,7 +235,9 @@
<td class="formcolor">{tr}Points{/tr}</td>
<td class="formcolor">{tr}Last post{/tr}</td>
<td class="formcolor">{tr}Last post title{/tr}</td>
+ <td class="formcolor">{tr}Last post avatar{/tr}</td>
<td class="formcolor">{tr}Author{/tr}</td>
+ <td class="formcolor">{tr}Author avatar{/tr}</td>
</tr>
<tr>
<td>
@@ -254,8 +256,15 @@
<input type="checkbox" name="topics_list_lastpost_title" {if $topics_list_lastpost_title eq 'y'}checked="checked"{/if} />
</td>
<td>
+ <input type="checkbox" name="topics_list_lastpost_avatar" {if $topics_list_lastpost_avatar eq 'y'}checked="checked"{/if} />
+ </td>
+ <td>
<input type="checkbox" name="topics_list_author" {if $topics_list_author eq 'y'}checked="checked"{/if} />
</td>
+ <td>
+ <input type="checkbox" name="topics_list_author_avatar" {if $topics_list_author_avatar eq 'y'}checked="checked"{/if} />
+ </td>
+
</tr>
</table>
</td>
Modified: trunk/templates/tiki-view_forum.tpl
===================================================================
--- trunk/templates/tiki-view_forum.tpl 2010-01-19 09:42:55 UTC (rev 24544)
+++ trunk/templates/tiki-view_forum.tpl 2010-01-19 13:46:04 UTC (rev 24545)
@@ -375,10 +375,10 @@
{if $forum_info.topics_list_pts eq 'y'}
<th>{self_link _sort_arg='thread_sort_mode' _sort_field='average'}{tr}pts{/tr}{/self_link}</th>
{/if}
- {if $forum_info.topics_list_lastpost eq 'y'}
+ {if $forum_info.topics_list_lastpost eq 'y' or $forum_info.topics_list_lastpost_avatar eq 'y'}
<th>{self_link _sort_arg='thread_sort_mode' _sort_field='lastPost'}{tr}Last Post{/tr}{/self_link}</th>
{/if}
- {if $forum_info.topics_list_author eq 'y'}
+ {if $forum_info.topics_list_author eq 'y' or $forum_info.topics_list_author_avatar eq 'y'}
<th>{self_link _sort_arg='thread_sort_mode' _sort_field='userName'}{tr}Author{/tr}{/self_link}</th>
{/if}
{if $forum_info.att_list_nb eq 'y'}
@@ -453,14 +453,29 @@
{/if}
{if $forum_info.topics_list_lastpost eq 'y'}
<td class="{cycle advance=false}">{$comments_coms[ix].lastPost|tiki_short_datetime} {* date_format:"%b %d [%H:%M]" *}
+ {if $forum_info.topics_list_lastpost_avatar eq 'y' and $prefs.feature_userPreferences eq 'y'}
+ <div style="float:right;padding-left:1px"><img src="tiki-show_user_avatar.php?user={$comments_coms[ix].lastPostData.userName|escape:"url"}" title="{$comments_coms[ix].lastPostData.userName|username}" /></div>
+ {/if}
{if $comments_coms[ix].replies}
<br />
<small>{if $forum_info.topics_list_lastpost_title eq 'y'}<i>{$comments_coms[ix].lastPostData.title|escape}</i> {/if}{tr}by{/tr} {$comments_coms[ix].lastPostData.userName|userlink}</small>
{/if}
</td>
+ {elseif $forum_info.topics_list_lastpost_avatar eq 'y' and $prefs.feature_userPreferences eq 'y'}
+ <td class="{cycle advance=false}">
+ <img src="tiki-show_user_avatar.php?user={$comments_coms[ix].lastPostData.userName|escape:"url"}" title="{$comments_coms[ix].lastPostData.userName|username}" />
+ </td>
{/if}
{if $forum_info.topics_list_author eq 'y'}
- <td class="{cycle advance=false}">{$comments_coms[ix].userName|userlink}</td>
+ <td class="{cycle advance=false}">
+ {if $forum_info.topics_list_author_avatar eq 'y' and $prefs.feature_userPreferences eq 'y'}
+ <div style="float:right;padding-left:1px"><img src="tiki-show_user_avatar.php?user={$comments_coms[ix].userName|escape:"url"}" title="{$comments_coms[ix].userName|username}" /></div>
+ {/if}
+ {$comments_coms[ix].userName|userlink}</td>
+ {elseif $forum_info.topics_list_author_avatar eq 'y' and $prefs.feature_userPreferences eq 'y'}
+ <td class="{cycle advance=false}">
+ <img src="tiki-show_user_avatar.php?user={$comments_coms[ix].userName|escape:"url"}" title="{$comments_coms[ix].userName|username}" />
+ </td>
{/if}
{if $forum_info.att_list_nb eq 'y'}
Modified: trunk/tiki-admin_forums.php
===================================================================
--- trunk/tiki-admin_forums.php 2010-01-19 09:42:55 UTC (rev 24544)
+++ trunk/tiki-admin_forums.php 2010-01-19 13:46:04 UTC (rev 24545)
@@ -99,7 +99,9 @@
$_REQUEST['topics_list_pts'] = isset($_REQUEST['topics_list_pts']) ? 'y' : 'n';
$_REQUEST['topics_list_lastpost'] = isset($_REQUEST['topics_list_lastpost']) ? 'y' : 'n';
$_REQUEST['topics_list_lastpost_title'] = isset($_REQUEST['topics_list_lastpost_title']) ? 'y' : 'n';
+ $_REQUEST['topics_list_lastpost_avatar'] = isset($_REQUEST['topics_list_lastpost_avatar']) ? 'y' : 'n';
$_REQUEST['topics_list_author'] = isset($_REQUEST['topics_list_author']) ? 'y' : 'n';
+ $_REQUEST['topics_list_author_avatar'] = isset($_REQUEST['topics_list_author_avatar']) ? 'y' : 'n';
$_REQUEST['att_list_nb'] = isset($_REQUEST['att_list_nb']) ? 'y' : 'n';
if (empty($_REQUEST['threadOrdering'])) $_REQUEST['threadOrdering'] = '';
if (empty($_REQUEST['threadStyle'])) $_REQUEST['threadStyle'] = '';
@@ -109,7 +111,7 @@
if (substr($_REQUEST["att_store_dir"], -1) != "\\" && substr($_REQUEST["att_store_dir"], -1) != "/" && $_REQUEST["att_store_dir"] != "") {
$_REQUEST["att_store_dir"].= "/";
}
- $fid = $commentslib->replace_forum($_REQUEST["forumId"], $_REQUEST["name"], $_REQUEST["description"], $controlFlood, $_REQUEST["floodInterval"], $_REQUEST["moderator"], $_REQUEST["mail"], $useMail, $usePruneUnreplied, $_REQUEST["pruneUnrepliedAge"], $usePruneOld, $_REQUEST["pruneMaxAge"], $_REQUEST["topicsPerPage"], $_REQUEST["topicOrdering"], $_REQUEST["threadOrdering"], $_REQUEST["section"], $_REQUEST['topics_list_reads'], $_REQUEST['topics_list_replies'], $_REQUEST['topics_list_pts'], $_REQUEST['topics_list_lastpost'], $_REQUEST['topics_list_author'], $_REQUEST['vote_threads'], $_REQUEST['show_description'], $_REQUEST['inbound_pop_server'], 110, $_REQUEST['inbound_pop_user'], $_REQUEST['inbound_pop_password'], trim($_REQUEST['outbound_address']) , $_REQUEST['outbound_mails_for_inbound_mails'], $_REQUEST['outbound_mails_reply_link'], $_REQUEST['outbound_from'], $_REQUEST['topic_smileys'], $_REQUEST['topic_summary'], $_REQUEST['ui_avatar'], $_REQUEST['ui_flag'], $_REQUEST['ui_posts'], $_REQUEST['ui_level'], $_REQUEST['ui_email'], $_REQUEST['ui_online'], $_REQUEST['approval_type'], $_REQUEST['moderator_group'], $_REQUEST['forum_password'], $_REQUEST['forum_use_password'], $_REQUEST['att'], $_REQUEST['att_store'], $_REQUEST['att_store_dir'], $_REQUEST['att_max_size'], $_REQUEST['forum_last_n'], $_REQUEST['commentsPerPage'], $_REQUEST['threadStyle'], $_REQUEST['is_flat'], $_REQUEST['att_list_nb'], $_REQUEST['topics_list_lastpost_title']);
+ $fid = $commentslib->replace_forum($_REQUEST["forumId"], $_REQUEST["name"], $_REQUEST["description"], $controlFlood, $_REQUEST["floodInterval"], $_REQUEST["moderator"], $_REQUEST["mail"], $useMail, $usePruneUnreplied, $_REQUEST["pruneUnrepliedAge"], $usePruneOld, $_REQUEST["pruneMaxAge"], $_REQUEST["topicsPerPage"], $_REQUEST["topicOrdering"], $_REQUEST["threadOrdering"], $_REQUEST["section"], $_REQUEST['topics_list_reads'], $_REQUEST['topics_list_replies'], $_REQUEST['topics_list_pts'], $_REQUEST['topics_list_lastpost'], $_REQUEST['topics_list_author'], $_REQUEST['vote_threads'], $_REQUEST['show_description'], $_REQUEST['inbound_pop_server'], 110, $_REQUEST['inbound_pop_user'], $_REQUEST['inbound_pop_password'], trim($_REQUEST['outbound_address']) , $_REQUEST['outbound_mails_for_inbound_mails'], $_REQUEST['outbound_mails_reply_link'], $_REQUEST['outbound_from'], $_REQUEST['topic_smileys'], $_REQUEST['topic_summary'], $_REQUEST['ui_avatar'], $_REQUEST['ui_flag'], $_REQUEST['ui_posts'], $_REQUEST['ui_level'], $_REQUEST['ui_email'], $_REQUEST['ui_online'], $_REQUEST['approval_type'], $_REQUEST['moderator_group'], $_REQUEST['forum_password'], $_REQUEST['forum_use_password'], $_REQUEST['att'], $_REQUEST['att_store'], $_REQUEST['att_store_dir'], $_REQUEST['att_max_size'], $_REQUEST['forum_last_n'], $_REQUEST['commentsPerPage'], $_REQUEST['threadStyle'], $_REQUEST['is_flat'], $_REQUEST['att_list_nb'], $_REQUEST['topics_list_lastpost_title'], $_REQUEST['topics_list_lastpost_avatar'], $_REQUEST['topics_list_author_avatar']);
$cat_type = 'forum';
$cat_objid = $fid;
$cat_desc = substr($_REQUEST["description"], 0, 200);
@@ -189,7 +191,9 @@
$info["topics_list_pts"] = 'n';
$info["topics_list_lastpost"] = 'y';
$info['topics_list_lastpost_title'] = 'y';
+ $info['topics_list_lastpost_avatar'] = 'n';
$info["topics_list_author"] = 'y';
+ $info['topics_list_author_avatar'] = 'n';
$info["vote_threads"] = 'n';
$info["forum_last_n"] = 0;
$info["is_flat"] = 'n';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|