Menu
▾
▴
[Tikiwiki-cvs] tiki/templates tiki-calendar.tpl, 1.72, 1.73 tiki-calendar_calmode.tpl, 1.7, 1.8 tiki-calendar_daymode.tpl, 1.4, 1.5 tiki-calendar_nav.tpl, 1.3, 1.4
|
From: <ny...@us...> - 2007-05-11 08:41:36
|
Update of /cvsroot/tikiwiki/tiki/templates In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10892/templates Modified Files: tiki-calendar.tpl tiki-calendar_calmode.tpl tiki-calendar_daymode.tpl tiki-calendar_nav.tpl Log Message: [MOD] calendar CSS: trying to have a calendar a bit more pretty and fixing the fact that it goes to much on the right side. Removing TABLE tag that is only used for design (DIV tag + CSS is better for that). Index: tiki-calendar.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-calendar.tpl,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- tiki-calendar.tpl 7 Apr 2007 10:48:26 -0000 1.72 +++ tiki-calendar.tpl 11 May 2007 08:41:33 -0000 1.73 @@ -55,7 +55,6 @@ </form> -<div style="margin:5px;"> {include file="tiki-calendar_nav.tpl"} {if $viewlist eq 'list'} @@ -68,8 +67,5 @@ {include file="tiki-calendar_calmode.tpl"} {/if} -</div> - -</div> </div> Index: tiki-calendar_calmode.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-calendar_calmode.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- tiki-calendar_calmode.tpl 8 Apr 2007 00:32:04 -0000 1.7 +++ tiki-calendar_calmode.tpl 11 May 2007 08:41:33 -0000 1.8 @@ -1,4 +1,4 @@ -<table cellpadding="0" cellspacing="0" border="0" width="100%" id="caltable"> +<table cellpadding="0" cellspacing="0" border="0" id="caltable"> <tr><td width="10px"> </td> {section name=dn loop=$daysnames} <th class="days" width="14%">{$daysnames[dn]}</td> @@ -35,7 +35,7 @@ {/if} {if $calendar_sticky_popup eq "y" and $cell[w][d].items[items].calitemId}{popup sticky=true fullhtml="1" text=$over|escape:"javascript"|escape:"html"}{else} {popup fullhtml="1" text=$over|escape:"javascript"|escape:"html"}{/if} -class="linkmenu">{$cell[w][d].items[items].name|truncate:$trunc:".."|default:"..."}</a> +>{$cell[w][d].items[items].name|truncate:$trunc:".."|default:"..."}</a> {if $cell[w][d].items[items].web} <a href="{$cell[w][d].items[items].web}" target="_other" class="calweb" title="{$cell[w][d].items[items].web}"><img src="img/icons/external_link.gif" width="7" height="7" alt=">" border="0"/></a> {/if} Index: tiki-calendar_daymode.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-calendar_daymode.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- tiki-calendar_daymode.tpl 19 Jan 2007 23:25:44 -0000 1.4 +++ tiki-calendar_daymode.tpl 11 May 2007 08:41:33 -0000 1.5 @@ -1,5 +1,4 @@ -<div class="wikitext"> -<table cellpadding="0" cellspacing="0" border="0" id="caltable" width="100%"> +<table cellpadding="0" cellspacing="0" border="0" id="caltable"> <tr><td width="42" class="heading">{tr}Hours{/tr}</td><td class="heading">{tr}Events{/tr}</td></tr> {cycle values="odd,even" print=false} {foreach key=k item=h from=$hours} @@ -28,4 +27,3 @@ </td></tr> {/foreach} </table> -</div> Index: tiki-calendar_nav.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-calendar_nav.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- tiki-calendar_nav.tpl 7 Apr 2007 11:24:20 -0000 1.3 +++ tiki-calendar_nav.tpl 11 May 2007 08:41:33 -0000 1.4 @@ -1,26 +1,24 @@ {* calendar view to be included in tiki-calendar.tpl, tiki-action_calendar.tpl, and wikiplugin-calendar *} <div class="tabrow"> -<table cellpadding="0" cellspacing="0" border="0" width="100%"> -<tr> -<td align="left" nowrap="nowrap"> + +<div class="viewmode"> <a href="{$myurl}?viewmode=day" class="viewmode{if $viewmode eq 'day'}on{else}off{/if}" title="{tr}day{/tr}"><img src="img/icons/cal_day.gif" width="30" height="24" border="0" alt="{tr}day{/tr}" /></a> <a href="{$myurl}?viewmode=week" class="viewmode{if $viewmode eq 'week'}on{else}off{/if}" title="{tr}week{/tr}"><img src="img/icons/cal_week.gif" width="30" height="24" border="0" alt="{tr}week{/tr}" /></a> <a href="{$myurl}?viewmode=month" class="viewmode{if $viewmode eq 'month'}on{else}off{/if}" title="{tr}month{/tr}"><img src="img/icons/cal_month.gif" width="30" height="24" border="0" alt="{tr}month{/tr}" /></a> <a href="{$myurl}?viewmode=quarter" class="viewmode{if $viewmode eq 'quarter'}on{else}off{/if}" title="{tr}quater{/tr}"><img src="img/icons/cal_quarter.gif" width="30" height="24" border="0" alt="{tr}quarter{/tr}" /></a> <a href="{$myurl}?viewmode=semester" class="viewmode{if $viewmode eq 'semester'}on{else}off{/if}" title="{tr}semester{/tr}"><img src="img/icons/cal_semester.gif" width="30" height="24" border="0" alt="{tr}semester{/tr}" /></a> <a href="{$myurl}?viewmode=year" class="viewmode{if $viewmode eq 'year'}on{else}off{/if}" title="{tr}year{/tr}"><img src="img/icons/cal_year.gif" width="30" height="24" border="0" alt="{tr}year{/tr}" /></a> -</td> -<td align="right" nowrap="nowrap" style="text-align:right;"> +</div> {if $feature_jscalendar eq 'y'} +<div class="jscalrow"> <form action="{$myurl}" method="post" name="f"> {jscalendar date="$focusdate" id="trig" goto="$jscal_url" align="Bc"} </form> - +</div> {else} <div class="daterow"> - -<table cellspacing="0" cellpadding="0" border="0" width="100%"> +<table cellspacing="0" cellpadding="0" border="0"> <tr> <td><a href="{$myurl}?todate={$daybefore}" class="link" title="{$daybefore|tiki_long_date}">« {tr}day{/tr}</a></td> <td style="text-align:center; padding-right:5px; padding-left: 5px;" class="middle" rowspan="3" nowrap="nowrap"><b>{tr}Focus:{/tr}<br />{$focusdate|tiki_long_date}</b></td> @@ -35,9 +33,6 @@ </div> {/if} -</td> -</tr></table> - <div class="calnavigation"> {if $viewmode eq "day"} <a href="{$myurl}?todate={$daybefore}" title="« {tr}day{/tr}" class="prev">«</a> |