From: <pk...@us...> - 2008-03-31 20:23:46
|
Revision: 12288 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12288&view=rev Author: pkdille Date: 2008-03-31 13:23:50 -0700 (Mon, 31 Mar 2008) Log Message: ----------- [MOD] + [ADD] wiki listpages: put comment field under page name + new pref wiki_list_comment_len to give the admin the opportunity to limit the length of the comment field (limited by db design to 200 chars) Modified Paths: -------------- branches/1.10/lib/setup/prefs.php branches/1.10/templates/tiki-admin-include-wiki.tpl branches/1.10/templates/tiki-listpages_content.tpl branches/1.10/tiki-admin_include_wiki.php Modified: branches/1.10/lib/setup/prefs.php =================================================================== --- branches/1.10/lib/setup/prefs.php 2008-03-31 19:34:22 UTC (rev 12287) +++ branches/1.10/lib/setup/prefs.php 2008-03-31 20:23:50 UTC (rev 12288) @@ -119,6 +119,7 @@ $prefs['wiki_left_column'] = 'y'; $prefs['wiki_list_backlinks'] = 'y'; $prefs['wiki_list_comment'] = 'y'; + $prefs['wiki_list_comment_len'] = '200'; $prefs['wiki_list_creator'] = 'y'; $prefs['wiki_list_hits'] = 'y'; $prefs['wiki_list_lastmodif'] = 'y'; Modified: branches/1.10/templates/tiki-admin-include-wiki.tpl =================================================================== --- branches/1.10/templates/tiki-admin-include-wiki.tpl 2008-03-31 19:34:22 UTC (rev 12287) +++ branches/1.10/templates/tiki-admin-include-wiki.tpl 2008-03-31 20:23:50 UTC (rev 12288) @@ -1,3 +1,4 @@ +{* $Id$ *} <div class="rbox" name="tip"> <div class="rbox-title" name="tip">{tr}Tip{/tr}</div> @@ -329,6 +330,12 @@ </td> </tr> <tr> + <td class="form">{tr}Comment length{/tr}:</td> + <td class="form"> + <input type="text" name="wiki_list_comment_len" value="{$prefs.wiki_list_comment_len}" size="3" /> + </td> + </tr> + <tr> <td class="form">{tr}Status{/tr}</td> <td class="form"> <input type="checkbox" name="wiki_list_status" {if $prefs.wiki_list_status eq 'y'}checked="checked"{/if} /> Modified: branches/1.10/templates/tiki-listpages_content.tpl =================================================================== --- branches/1.10/templates/tiki-listpages_content.tpl 2008-03-31 19:34:22 UTC (rev 12287) +++ branches/1.10/templates/tiki-listpages_content.tpl 2008-03-31 20:23:50 UTC (rev 12288) @@ -55,14 +55,9 @@ {if $prefs.wiki_list_lastver eq 'y'} {assign var='cntcol' value=$cntcol+1} - <td class="heading">{self_link _class='tableheading' _sort_arg='sort_mode' _sort_field='version' _title='{tr}Last version{/tr}'}{tr}Last ver{/tr}{/self_link}</td> + <td class="heading">{self_link _class='tableheading' _sort_arg='sort_mode' _sort_field='version' _title='{tr}Last version{/tr}'}{tr}Last ver.{/tr}{/self_link}</td> {/if} - {if $prefs.wiki_list_comment eq 'y'} - {assign var='cntcol' value=$cntcol+1} - <td class="heading">{self_link _class='tableheading' _sort_arg='sort_mode' _sort_field='comment' _title='{tr}Comment{/tr}}{tr}Com{/tr}{/self_link}</td> - {/if} - {if $prefs.wiki_list_status eq 'y'} {assign var='cntcol' value=$cntcol+1} <td class="heading">{self_link _class='tableheading' _sort_arg='sort_mode' _sort_field='flag' _title='{tr}Status of the page{/tr}'}{tr}Lock{/tr}{/self_link}</td> @@ -70,7 +65,7 @@ {if $prefs.wiki_list_versions eq 'y'} {assign var='cntcol' value=$cntcol+1} - <td class="heading">{self_link _class='tableheading' _sort_arg='sort_mode' _sort_field='versions' _title='{tr}Versions{/tr}'}{tr}Vers{/tr}{/self_link}</td> + <td class="heading">{self_link _class='tableheading' _sort_arg='sort_mode' _sort_field='versions' _title='{tr}Versions{/tr}'}{tr}Vers.{/tr}{/self_link}</td> {/if} {if $prefs.wiki_list_links eq 'y'} @@ -136,6 +131,11 @@ {if $prefs.wiki_list_name eq 'y'} <td class="{cycle advance=false}"> <a href="{$listpages[changes].pageName|sefurl}" class="link" title="{tr}View page{/tr} {$listpages[changes].pageName}">{$listpages[changes].pageName|truncate:$prefs.wiki_list_name_len:"...":true}</a> + {if $prefs.wiki_list_comment eq 'y' && $listpages[changes].comment neq ""} + <div class="subcomment"> + {$listpages[changes].comment|truncate:$prefs.wiki_list_comment_len:"...":true} + </div> + {/if} </td> {/if} @@ -159,10 +159,6 @@ <td style="text-align:right;" class="{cycle advance=false}">{$listpages[changes].version}</td> {/if} - {if $prefs.wiki_list_comment eq 'y'} - <td class="{cycle advance=false}">{if $listpages[changes].comment eq ""} {else}{$listpages[changes].comment}{/if}</td> - {/if} - {if $prefs.wiki_list_status eq 'y'} <td style="text-align:center;" class="{cycle advance=false}"> {if $listpages[changes].flag eq 'locked'} Modified: branches/1.10/tiki-admin_include_wiki.php =================================================================== --- branches/1.10/tiki-admin_include_wiki.php 2008-03-31 19:34:22 UTC (rev 12287) +++ branches/1.10/tiki-admin_include_wiki.php 2008-03-31 20:23:50 UTC (rev 12288) @@ -109,6 +109,7 @@ simple_set_toggle($toggle); } simple_set_int('wiki_list_name_len'); + simple_set_int('wiki_list_comment_len'); simple_set_value('wiki_list_sortorder'); simple_set_value('wiki_list_sortdirection'); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |