From: <sy...@us...> - 2011-01-20 23:00:42
|
Revision: 32051 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32051&view=rev Author: sylvieg Date: 2011-01-20 23:00:36 +0000 (Thu, 20 Jan 2011) Log Message: ----------- [ENH]tracker: level to a header field Modified Paths: -------------- trunk/lib/trackers/trackerlib.php trunk/templates/tiki-view_tracker.tpl trunk/templates/tiki-view_tracker_item.tpl trunk/templates/tracker_item_field_input.tpl trunk/templates/tracker_item_field_value.tpl Modified: trunk/lib/trackers/trackerlib.php =================================================================== --- trunk/lib/trackers/trackerlib.php 2011-01-20 21:58:31 UTC (rev 32050) +++ trunk/lib/trackers/trackerlib.php 2011-01-20 23:00:36 UTC (rev 32051) @@ -3391,9 +3391,13 @@ </dl>')); $type['h'] = array( 'label'=>tra('header'), - 'opt'=>false, + 'opt'=>true, 'help'=>tra('<dl> - <dt>Function: will display trhe field name as a html header h2; + <dt>Function: will display the field name as a html header h2; + <dt>Usage: <strong>level</strong> + <dt>Example: 2 + <dt>Description: + <dd><strong>[level]</strong> level of the html header (default 2) </dl>')); $type['S'] = array( 'label'=>tra('static text'), Modified: trunk/templates/tiki-view_tracker.tpl =================================================================== --- trunk/templates/tiki-view_tracker.tpl 2011-01-20 21:58:31 UTC (rev 32050) +++ trunk/templates/tiki-view_tracker.tpl 2011-01-20 23:00:36 UTC (rev 32051) @@ -254,7 +254,7 @@ {if $field_value.type ne 'x' and $field_value.type ne 'l' and $field_value.type ne 'q' and (($field_value.type ne 'u' and $field_value.type ne 'g' and $field_value.type ne 'I') or !$field_value.options_array[0] or $tiki_p_admin_trackers eq 'y') and (empty($field_value.visibleBy) or in_array($default_group, $field_value.visibleBy) or $tiki_p_admin_trackers eq 'y')and (empty($field_value.editableBy) or in_array($default_group, $field_value.editableBy) or $tiki_p_admin_trackers eq 'y') and ($field_value.type ne 'A' or $tiki_p_attach_trackers eq 'y') and $field_value.type ne 'N' and $field_value.type ne '*' and !($field_value.type eq 's' and $field_value.name eq 'Rating') and $field_value.type ne 'usergroups'} {if $field_value.type eq 'h'} </table> -<h2>{$field_value.name|escape}</h2> +{include file='tracker_item_field_value.tpl'} <table class="formcolor"> {else} {if ($field_value.type eq 'c' or $field_value.type eq 't' or $field_value.type eq 'n' or $field_value.type eq 'b') and $field_value.options_array[0] eq '1'} Modified: trunk/templates/tiki-view_tracker_item.tpl =================================================================== --- trunk/templates/tiki-view_tracker_item.tpl 2011-01-20 21:58:31 UTC (rev 32050) +++ trunk/templates/tiki-view_tracker_item.tpl 2011-01-20 23:00:36 UTC (rev 32051) @@ -74,7 +74,7 @@ {if ($cur_field.isHidden ne 'y' or $tiki_p_admin_trackers eq 'y') and !($tracker_info.doNotShowEmptyField eq 'y' and empty($cur_field.value) and empty($cur_field.cat) and empty($cur_field.links) and $cur_field.type ne 'S' and $cur_field.type ne 's' and $cur_field.type ne 'h') and ($cur_field.type ne 'p' or $cur_field.options_array[0] ne 'password') and (empty($cur_field.visibleBy) or in_array($default_group, $cur_field.visibleBy) or $tiki_p_admin_trackers eq 'y')} {if $cur_field.type eq 'h'} </table> - <h2>{$cur_field.name|escape}</h2> + {include file='tracker_item_field_value.tpl' field_value=$cur_field list_mode=n item=$item_info} <table class="formcolor"> {elseif $cur_field.type ne 'x'} {if $stick ne 'y'} Modified: trunk/templates/tracker_item_field_input.tpl =================================================================== --- trunk/templates/tracker_item_field_input.tpl 2011-01-20 21:58:31 UTC (rev 32050) +++ trunk/templates/tracker_item_field_input.tpl 2011-01-20 23:00:36 UTC (rev 32051) @@ -523,6 +523,11 @@ {* -------------------- in group -------------------- *} {elseif $field_value.type eq 'N'} {include file='tracker_item_field_value.tpl'} + +{* -------------------- header ------------------------- *} +{elseif $field_value.type eq 'h'} + {include file='tracker_item_field_value.tpl'} + {/if} {if $field_value.isMandatory eq 'y' and $showmandatory eq 'y'} Modified: trunk/templates/tracker_item_field_value.tpl =================================================================== --- trunk/templates/tracker_item_field_value.tpl 2011-01-20 21:58:31 UTC (rev 32050) +++ trunk/templates/tracker_item_field_value.tpl 2011-01-20 23:00:36 UTC (rev 32051) @@ -92,7 +92,7 @@ {* -------------------- empty field -------------------- *} {elseif empty($field_value.value) and $field_value.value != '0' and $field_value.type ne 'U' and $field_value.type ne '*' and $field_value.type ne 's' - and $field_value.type ne 'q' and $field_value.type ne 'n' and $field_value.type ne 'C'} + and $field_value.type ne 'q' and $field_value.type ne 'n' and $field_value.type ne 'C' and $field_value.type ne 'h'} {if $list_mode ne 'csv' and $is_link eq 'y'} {/if} {* to have something to click on *} {* -------------------- text field, numeric, drop down, radio,user/group/IP selector, autopincrement, dynamic list *} @@ -402,7 +402,11 @@ {* -------------------- header ------------------------- *} {elseif $field_value.type eq 'h'} - <h2>{$field_value.value}</h2> + {if !empty($field_value.options_array[0]) && $field_value.options_array[0] > 0} + <h{$field_value.options_array[0]}>{$field_value.name|escape}</h{$field_value.options_array[0]}> + {else} + <h2>{$field_value.name|escape}</h2> + {/if} {* -------------------- subscription -------------------- *} {elseif $field_value.type eq 'U'} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |