From: <sy...@us...> - 2009-12-02 15:44:58
|
Revision: 23628 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23628&view=rev Author: sylvieg Date: 2009-12-02 15:44:51 +0000 (Wed, 02 Dec 2009) Log Message: ----------- [MOD]tracker: possibility to use a pretty display in tiki-view_tracker_item.php Modified Paths: -------------- trunk/templates/tiki-admin_trackers.tpl trunk/templates/tiki-plugin_trackerlist.tpl trunk/templates/tiki-view_tracker_item.tpl trunk/tiki-admin_trackers.php Added Paths: ----------- trunk/templates/tracker_pretty_item.tpl Modified: trunk/templates/tiki-admin_trackers.tpl =================================================================== --- trunk/templates/tiki-admin_trackers.tpl 2009-12-02 15:23:37 UTC (rev 23627) +++ trunk/templates/tiki-admin_trackers.tpl 2009-12-02 15:44:51 UTC (rev 23628) @@ -493,6 +493,12 @@ {/if} <tr class="formcolor"> + <td>{tr}Wiki page to display an item{/tr}</td> + <td><input type="text" name="viewItemPretty" value="{$info.viewItemPretty|escape}" /> + <br /><em>{tr}wiki:pageName for a wiki page or tpl:tplName for a template{/tr}</td> + </tr> + + <tr class="formcolor"> <td></td> <td><input type="submit" name="save" value="{tr}Save{/tr}" /></td> </tr> Modified: trunk/templates/tiki-plugin_trackerlist.tpl =================================================================== --- trunk/templates/tiki-plugin_trackerlist.tpl 2009-12-02 15:23:37 UTC (rev 23627) +++ trunk/templates/tiki-plugin_trackerlist.tpl 2009-12-02 15:44:51 UTC (rev 23628) @@ -149,27 +149,7 @@ {else}{* a pretty tpl *} {* ------------------------------------ *} - {if !isset($list_mode)}{assign var=list_mode value="n"}{/if} - {section name=ix loop=$items[user].field_values} - {if $items[user].field_values[ix].isPublic eq 'y' and ($items[user].field_values[ix].isHidden eq 'n' or ($items[user].field_values[ix].isHidden eq 'c' and $items[user].itemUser eq $user) or $items[user].field_values[ix].isHidden eq 'p' or $tiki_p_admin_trackers eq 'y') and $items[user].field_values[ix].type ne 'x' and $items[user].field_values[ix].type ne 'h' and in_array($items[user].field_values[ix].fieldId, $listfields) and ($items[user].field_values[ix].type ne 'p' or $items[user].field_values[ix].options_array[0] ne 'password') and (empty($items[user].field_values[ix].visibleBy) or in_array($default_group, $items[user].field_values[ix].visibleBy) or $tiki_p_admin_trackers eq 'y')} - {capture name=value} - {if isset($perms)} - {include file='tracker_item_field_value.tpl' item=$items[user] field_value=$items[user].field_values[ix] list_mode=$list_mode - tiki_p_view_trackers=$perms.tiki_p_view_trackers tiki_p_modify_tracker_items=$perms.tiki_p_modify_tracker_items tiki_p_modify_tracker_items_pending=$perms.tiki_p_modify_tracker_items_pending tiki_p_modify_tracker_items_closed=$perms.tiki_p_modify_tracker_items_closed tiki_p_comment_tracker_items=$perms.tiki_p_comment_tracker_items} - {else} - {include file='tracker_item_field_value.tpl' item=$items[user] field_value=$items[user].field_values[ix] list_mode=$list_mode} - {/if} - {/capture} - {set var=f_`$items[user].field_values[ix].fieldId` value=$smarty.capture.value} - {else} - {set var=f_`$items[user].field_values[ix].fieldId` value=''} - {/if} - {/section} - {set var=f_created value=$items[user].created} - {set var=f_lastmodif value=$items[user].lastModif} - {set var=f_itemId value=$items[user].itemId} -{* ------------------------------------ *} - {include file="$tpl" item=$items[user]} + {include file='tracker_pretty_item.tpl' fields=$items[user].field_values item=$items[user] wiki=$tpl} {/if} {/section} Modified: trunk/templates/tiki-view_tracker_item.tpl =================================================================== --- trunk/templates/tiki-view_tracker_item.tpl 2009-12-02 15:23:37 UTC (rev 23627) +++ trunk/templates/tiki-view_tracker_item.tpl 2009-12-02 15:44:51 UTC (rev 23628) @@ -74,7 +74,7 @@ {tab name="{tr}View{/tr}"} {* --- tab with view ------------------------------------------------------------------------- *} - +{if empty($tracker_info.viewItemPretty)} <h2>{tr}View Item{/tr}</h2> <table class="normal"> {if $tracker_info.showStatus eq 'y' and ($tracker_info.showStatusAdminOnly ne 'y' or $tiki_p_admin_trackers eq 'y')} @@ -133,6 +133,10 @@ </tr> {/if} </table> + +{else} + {include file='tracker_pretty_item.tpl' item=$item_info fields=$ins_fields wiki=$tracker_info.viewItemPretty} +{/if} {/tab} {* -------------------------------------------------- tab with comments --- *} Added: trunk/templates/tracker_pretty_item.tpl =================================================================== --- trunk/templates/tracker_pretty_item.tpl (rev 0) +++ trunk/templates/tracker_pretty_item.tpl 2009-12-02 15:44:51 UTC (rev 23628) @@ -0,0 +1,32 @@ +{strip} +{* $Id: tiki-plugin_trackerlist.tpl 22986 2009-11-09 14:21:19Z sylvieg $ *} +{* param item, fields, wiki(wiki:page or tpl:tpl), list_mode, perms, default_group, listfields *} +{if !isset($list_mode)}{assign var=list_mode value="n"}{/if} +{foreach from=$fields item=field} + {if $field.isPublic eq 'y' + and ($field.isHidden eq 'n' or ($field.isHidden eq 'c' and $item.itemUser eq $user) or $field.isHidden eq 'p' or $tiki_p_admin_trackers eq 'y') + and $field.type ne 'x' + and $field.type ne 'h' + and (empty($listfields) or in_array($field.fieldId, $listfields)) + and ($field.type ne 'p' or $field.options_array[0] ne 'password') + and (empty($field.visibleBy) or in_array($default_group, $field.visibleBy) or $tiki_p_admin_trackers eq 'y') + } + {capture name=value} + {if isset($perms)} + {include file='tracker_item_field_value.tpl' item=$item field_value=$field list_mode=$list_mode + tiki_p_view_trackers=$perms.tiki_p_view_trackers tiki_p_modify_tracker_items=$perms.tiki_p_modify_tracker_items tiki_p_modify_tracker_items_pending=$perms.tiki_p_modify_tracker_items_pending tiki_p_modify_tracker_items_closed=$perms.tiki_p_modify_tracker_items_closed tiki_p_comment_tracker_items=$perms.tiki_p_comment_tracker_items} + {else} + {include file='tracker_item_field_value.tpl' item=$item field_value=$field list_mode=$list_mode} + {/if} + {/capture} + {set var=f_`$field.fieldId` value=$smarty.capture.value} + {else} + {set var=f_`$field.fieldId` value=''} + {/if} +{/foreach} +{set var=f_created value=$item.created} +{set var=f_lastmodif value=$item.lastModif} +{set var=f_itemId value=$item.itemId} +{* ------------------------------------ *} +{include file="$wiki" item=$item} +{/strip} \ No newline at end of file Modified: trunk/tiki-admin_trackers.php =================================================================== --- trunk/tiki-admin_trackers.php 2009-12-02 15:23:37 UTC (rev 23627) +++ trunk/tiki-admin_trackers.php 2009-12-02 15:44:51 UTC (rev 23628) @@ -315,6 +315,11 @@ } else { $tracker_options['showPopup'] = ''; } + if (isset($_REQUEST['viewItemPretty'])) { + $tracker_options['viewItemPretty'] = $_REQUEST['viewItemPretty']; + } else { + $tracker_options['viewItemPretty'] = ''; + } if (isset($_REQUEST['descriptionIsParsed']) && ($_REQUEST['descriptionIsParsed'] == 'on' || $_REQUEST['descriptionIsParsed'] == 'y')) { $tracker_options['descriptionIsParsed'] = 'y'; } else { @@ -346,6 +351,7 @@ $info["useExplicitNames"] = ''; $info['doNotShowEmptyField'] = ''; $info['showPopup'] = ''; +$info['viewItemPretty'] = ''; $info["showStatus"] = ''; $info["showStatusAdminOnly"] = ''; $info["simpleEmail"] = ''; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |