Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[21480] branches/proposed/templates/modules/ mod-action_calendar.tpl

[Sylvie G. <sgr...@gm...>]

-1 - duplication of code

On Mon, 2009-09-14 at 14:00 +0000, Jy...@us... wrote:
> Revision: 21480
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=21480&view=rev
> Author:   Jyhem
> Date:     2009-09-14 14:00:58 +0000 (Mon, 14 Sep 2009)
> 
> Log Message:
> -----------
> [FIX] Using the day viewmode only makes sense for calendar, not action calendar where it is not implemented. Using the same template for both brings no benefit for stable branch. (trunk #21470) 
> 
> Modified Paths:
> --------------
>     branches/proposed/templates/modules/mod-action_calendar.tpl
> 
> Property Changed:
> ----------------
>     branches/proposed/templates/modules/mod-action_calendar.tpl
> 
> Modified: branches/proposed/templates/modules/mod-action_calendar.tpl
> ===================================================================
> --- branches/proposed/templates/modules/mod-action_calendar.tpl	2009-09-14 13:21:19 UTC (rev 21479)
> +++ branches/proposed/templates/modules/mod-action_calendar.tpl	2009-09-14 14:00:58 UTC (rev 21480)
> @@ -1 +1,47 @@
> -{include file='modules/mod-calendar_new.tpl'}
> +{* $Id: mod-calendar_new.tpl 12242 2008-03-30 13:22:01Z luciash $ *}
> +{tikimodule error=$module_params.error title=$module_params.title name=$module_params.name flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle}
> +{popup_init src="lib/overlib.js"}
> +<div style="text-align:center; font-size:110%" class="cal_title">
> +	<a href="tiki-calendar.php?todate={$focusdate}&amp;viewmode={$viewmode}">
> +	 	{tr}{$focusdate|tiki_date_format:"%B"|ucfirst}{/tr}
> +	</a>
> +</div>
> +<table cellpadding="0" cellspacing="0" border="0" id="caltable" style="text-align:center;">
> +<tr>
> +{section name=dn loop=$daysnames}
> +<th class="days" width="14%">{$daysnames[dn][0]|ucfirst}</th>
> +{/section}
> +</tr>
> +{cycle values="odd,even" print=false}
> +{section name=w loop=$cell}
> +<tr>
> +{section name=d loop=$weekdays}
> +{assign var=day_cursor value=$cell[w][d].day|tiki_date_format:"%d"}
> +{assign var=month_cursor value=$cell[w][d].day|tiki_date_format:"%m"}
> +{assign var=day_today value=$smarty.now|tiki_date_format:"%d"}
> +{assign var=month_today value=$smarty.now|tiki_date_format:"%m"}
> +
> +{if $cell[w][d].focus}
> +{cycle values="calodd,caleven" print=false}
> +{else}
> +{cycle values="caldark" print=false}
> +{/if}
> +<td class="{if $cell[w][d].day eq $smarty.session.CalendarFocusDate}calfocuson{else}{cycle advance=false}{/if}{if isset($cell[w][d].items[0]) and ($cell[w][d].items[0].modifiable eq "y" || $cell[w][d].items[0].visible eq 'y')} focus{/if}" width="14%" style="text-align:center; font-size:0.8em;">
> +
> +{if isset($cell[w][d].items[0])}{assign var=over value=$cell[w][d].items[0].over}{else}{assign var=over value=""}{/if}
> +{if $month_cursor neq $focusmonth }
> +<span style="color:lightgrey">{$day_cursor}</span>
> +{elseif isset($cell[w][d].items[0]) and ($cell[w][d].items[0].modifiable eq "y" || $cell[w][d].items[0].visible eq 'y')}
> +<a style="text-decoration: underline; font-weight: bold" href="{$myurl}?todate={$cell[w][d].day}&amp;viewmode=day"
> +{if $prefs.calendar_sticky_popup eq "y" and $cell[w][d].items[0].calitemId}{popup sticky=true fullhtml="1" text=$over|escape:"javascript"|escape:"html"}{else}{popup fullhtml="1" text=$over|escape:"javascript"|escape:"html"}{/if}
> +>{$day_cursor}</a>
> +{else}
> +{$day_cursor}
> +{/if}
> +
> +</td>
> +{/section}
> +</tr>
> +{/section}
> +</table>
> +{/tikimodule}
> 
> 
> Property changes on: branches/proposed/templates/modules/mod-action_calendar.tpl
> ___________________________________________________________________
> Deleted: svn:keywords
>    - Id
> 
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> ------------------------------------------------------------------------------
> Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
> trial. Simplify your report design, integration and deployment - and focus on 
> what you do best, core application coding. Discover what's new with 
> Crystal Reports now.  http://p.sf.net/sfu/bobj-july
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tik...@li...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs