From: <sy...@us...> - 2009-10-30 19:56:47
|
Revision: 22771 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=22771&view=rev Author: sylvieg Date: 2009-10-30 19:56:40 +0000 (Fri, 30 Oct 2009) Log Message: ----------- [FIX] calendar plugin: fix title + option viewnavbar Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_calendar.php trunk/templates/modules/mod-calendar_new.tpl trunk/templates/tiki-calendar.tpl trunk/templates/tiki-calendar_nav.tpl Modified: trunk/lib/wiki-plugins/wikiplugin_calendar.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_calendar.php 2009-10-30 19:29:10 UTC (rev 22770) +++ trunk/lib/wiki-plugins/wikiplugin_calendar.php 2009-10-30 19:56:40 UTC (rev 22771) @@ -41,6 +41,13 @@ 'description' => tra('Decide or not to show the list of events at the bottom.'), 'filter' => 'alpha', ), + 'viewnavbar' => array( + 'required' => false, + 'name' => tra('View the navigation bar'), + 'description' => tra('Decide or not to show the navigation bar.'), + 'filter' => 'alpha', + ), + ), ); } @@ -64,11 +71,14 @@ if ( empty($params['viewmode']) ) { $params['viewmode'] = 'month'; } + if ( empty($params['viewnavbar']) ) { + $params['viewnavbar'] = 'n'; + } $module_reference = array( 'moduleId' => null, 'name' => 'calendar_new', - 'params' => array( 'calIds' => $params['calIds'], + 'params' => array( 'calIds' => $params['calIds'], 'viewnavbar'=> $params['viewnavbar'], 'viewlist'=> $params['viewlist'], 'viewmode' => $params['viewmode'] ), 'position' => null, Modified: trunk/templates/modules/mod-calendar_new.tpl =================================================================== --- trunk/templates/modules/mod-calendar_new.tpl 2009-10-30 19:29:10 UTC (rev 22770) +++ trunk/templates/modules/mod-calendar_new.tpl 2009-10-30 19:56:40 UTC (rev 22771) @@ -4,38 +4,7 @@ {if $viewlist eq 'list'} {include file='tiki-calendar_listmode.tpl'} {else} -<div style="text-align:center; font-size:110%" class="cal_title"> -<div style="width:100%; white-space: nowrap">{strip} -{if $viewmode eq "day"} -{self_link _class="next" todate=$daybefore _title="{tr}Day{/tr}" _alt="{tr}Day{/tr}" _icon=resultset_previous"}{/self_link} -{elseif $viewmode eq "week"} -{self_link _class="next" todate=$weekbefore _title="{tr}Week{/tr}" _alt="{tr}Week{/tr}" _icon=resultset_previous"}{/self_link} -{elseif $viewmode eq "month"} -{self_link _class="next" todate=$monthbefore _title="{tr}Month{/tr}" _alt="{tr}Month{/tr}" _icon=resultset_previous"}{/self_link} -{elseif $viewmode eq "quarter"} -{self_link _class="next" todate=$quarterbefore _title="{tr}Quarter{/tr}" _alt="{tr}Quarter{/tr}" _icon=resultset_previous"}{/self_link} -{elseif $viewmode eq "semester"} -{self_link _class="next" todate=$semesterbefore _title="{tr}Semester{/tr}" _alt="{tr}Semester{/tr}" _icon=resultset_previous"}{/self_link} -{elseif $viewmode eq "year"} -{self_link _class="next" todate=$yearbefore _title="{tr}Semester{/tr}" _alt="{tr}Semester{/tr}" _icon=resultset_previous"}{/self_link} -{/if} - <a href="tiki-calendar.php?todate={$focusdate}&viewmode={$viewmode}">{tr}{$focusdate|tiki_date_format:"%B"|ucfirst}{/tr}</a> -{if $viewmode eq "day"} -{self_link _class="next" todate=$dayafter _title="{tr}Day{/tr}" _alt="{tr}Day{/tr}" _icon=resultset_next"}{/self_link} -{elseif $viewmode eq "week"} -{self_link _class="next" todate=$weekafter _title="{tr}Week{/tr}" _alt="{tr}Week{/tr}" _icon=resultset_next"}{/self_link} -{elseif $viewmode eq "month"} -{self_link _class="next" todate=$monthafter _title="{tr}Month{/tr}" _alt="{tr}Month{/tr}" _icon=resultset_next"}{/self_link} -{elseif $viewmode eq "quarter"} -{self_link _class="next" todate=$quarterafter _title="{tr}Quarter{/tr}" _alt="{tr}Quarter{/tr}" _icon=resultset_next"}{/self_link} -{elseif $viewmode eq "semester"} -{self_link _class="next" todate=$semesterafter _title="{tr}Semester{/tr}" _alt="{tr}Semester{/tr}" _icon=resultset_next"}{/self_link} -{elseif $viewmode eq "year"} -{self_link _class="next" todate=$yearafter _title="{tr}Semester{/tr}" _alt="{tr}Semester{/tr}" _icon=resultset_next"}{/self_link} -{/if} -{/strip} -</div> -</div> + {include file='tiki-calendar_nav.tpl'} <table cellpadding="0" cellspacing="0" border="0" id="caltable" style="text-align:center;"> <tr> Modified: trunk/templates/tiki-calendar.tpl =================================================================== --- trunk/templates/tiki-calendar.tpl 2009-10-30 19:29:10 UTC (rev 22770) +++ trunk/templates/tiki-calendar.tpl 2009-10-30 19:56:40 UTC (rev 22771) @@ -1,5 +1,4 @@ {* $Id$ *} -{popup_init src="lib/overlib.js"} {title admpage="calendar"} {if $displayedcals|@count eq 1} Modified: trunk/templates/tiki-calendar_nav.tpl =================================================================== --- trunk/templates/tiki-calendar_nav.tpl 2009-10-30 19:29:10 UTC (rev 22770) +++ trunk/templates/tiki-calendar_nav.tpl 2009-10-30 19:56:40 UTC (rev 22771) @@ -1,3 +1,4 @@ +{if empty($module_params.viewnavbar) || $module_params.viewnavbar ne 'n'} <div class="clearfix tabrow"><div class="tabrowRight"></div><div class="tabrowLeft"></div> <div class="viewmode"> {if $calendar_type neq "tiki_actions"} @@ -42,6 +43,7 @@ {self_link _class="next" todate=$yearafter _title="{tr}Semester{/tr}" _alt="{tr}Semester{/tr}" _icon=resultset_next"}{/self_link} {/if} </div></div></div><br style="clear:both" /> +{/if} {if $viewmode ne 'day'} <div class="calnavigation"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |