Menu
▾
▴
[Tikiwiki-cvs] tiki/templates tiki-admin-include-wiki.tpl,1.47.2.32,1.47.2.33 tiki-calendar.tpl,1.46.2.53,1.46.2.54 tiki-show_page.tpl,1.74.2.25,1.74.2.26
|
From: <fma...@us...> - 2006-01-18 19:44:42
|
Update of /cvsroot/tikiwiki/tiki/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22118/templates Modified Files: Tag: BRANCH-1-9 tiki-admin-include-wiki.tpl tiki-calendar.tpl tiki-show_page.tpl Log Message: [FIX] excluding printer frendly pages at robots.txt according to http://dev.tikiwiki.org/tiki-view_tracker_item.php?itemId=443&show=view&offset=0&reloff=5&status=p&trackerId=5&sort_mode=f_59_desc [FIX] harmonized "Like pages" to "Similar" according to http://dev.tikiwiki.org/tiki-view_tracker_item.php?itemId=127&show=view&offset=0&reloff=8&status=p&trackerId=5&sort_mode=f_59_desc [FIX] module users_rank now disables the "Top users" box when feature is off according to http://dev.tikiwiki.org/tiki-view_tracker_item.php?itemId=269&show=view&offset=0&reloff=21&status=p&trackerId=5&sort_mode=f_59_desc [FIX] icon print now is optional at wiki preferences according to http://dev.tikiwiki.org/tiki-view_tracker_item.php?itemId=74&show=view&offset=0&reloff=3&status=p&trackerId=5&sort_mode=f_59_desc wow...that's all Index: tiki-admin-include-wiki.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin-include-wiki.tpl,v retrieving revision 1.47.2.32 retrieving revision 1.47.2.33 diff -u -d -r1.47.2.32 -r1.47.2.33 --- tiki-admin-include-wiki.tpl 16 Dec 2005 01:33:25 -0000 1.47.2.32 +++ tiki-admin-include-wiki.tpl 18 Jan 2006 19:43:59 -0000 1.47.2.33 @@ -399,7 +399,7 @@ <tr><td class="form">{tr}History{/tr}:</td><td><input type="checkbox" name="feature_history" {if $feature_history eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}List pages{/tr}:</td><td><input type="checkbox" name="feature_listPages" {if $feature_listPages eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}Backlinks{/tr}:</td><td><input type="checkbox" name="feature_backlinks" {if $feature_backlinks eq 'y'}checked="checked"{/if}/></td></tr> - <tr><td class="form">{tr}Like pages{/tr}:</td><td><input type="checkbox" name="feature_likePages" {if $feature_likePages eq 'y'}checked="checked"{/if}/></td></tr> + <tr><td class="form">{tr}Similar{/tr}:</td><td><input type="checkbox" name="feature_likePages" {if $feature_likePages eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}Rankings{/tr}:</td><td><input type="checkbox" name="feature_wiki_rankings" {if $feature_wiki_rankings eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}Undo{/tr}:</td><td><input type="checkbox" name="feature_wiki_undo" {if $feature_wiki_undo eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}MultiPrint{/tr}:</td><td><input type="checkbox" name="feature_wiki_multiprint" {if $feature_wiki_multiprint eq 'y'}checked="checked"{/if}/></td></tr> @@ -465,6 +465,7 @@ <option value="none" {if $wiki_authors_style eq 'none'}selected="selected"{/if}>{tr}no (disabled){/tr}</option> </select> </td></tr> + <tr><td class="form">{tr}Print Page{/tr}:</td><td><input type="checkbox" name="feature_wiki_print" {if $feature_wiki_print eq 'y'}checked="checked"{/if}/></td></tr> <tr><td colspan="2" class="button"><input type="submit" name="wikifeatures" value="{tr}Set features{/tr}" /></td></tr> </table> </form> Index: tiki-calendar.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-calendar.tpl,v retrieving revision 1.46.2.53 retrieving revision 1.46.2.54 diff -u -d -r1.46.2.53 -r1.46.2.54 --- tiki-calendar.tpl 21 Dec 2005 16:23:30 -0000 1.46.2.53 +++ tiki-calendar.tpl 18 Jan 2006 19:43:59 -0000 1.46.2.54 @@ -169,7 +169,7 @@ <div {if $hrows[$h][hr].calname ne ""}class="Cal{$hrows[$h][hr].type}"{/if} style="clear:both"> {$hours[$h]}:{$hrows[$h][hr].mins} : {if $hrows[$h][hr].calname eq ""}{$hrows[$h][hr].type} : {/if} <a href="{$hrows[$h][hr].url}" class="linkmenu">{$hrows[$h][hr].name}</a> -{if $hrows[$h][hr].calname ne ""}{$hrows[$h][hr].parsedDescription}{else}{$hrows[$h][hr].description}{/if}{if ($calendar_view_tab eq "y" or $tiki_p_change_events eq "y") and $hrows[$h][hr].calname ne ""}<span style="float:right;">{if $calendar_view_tab eq "y"}<a href="tiki-calendar.php?calitemId={$hrows[$h][hr].calitemId}&editmode=details"{if $feature_tabs ne 'y'}#details{/if}" title="{tr}details{/tr}"><img src="img/icons/zoom.gif" border="0" width="16" height="16" alt="{tr}zoom{/tr}" /></a> {/if}{if $hrows[$h][hr].modifiable eq "y"}<a href="tiki-calendar.php?calitemId={$hrows[$h][hr].calitemId}&editmode=1{if $feature_tabs ne 'y'}#add{/if}" title="{tr}edit{/tr}"><img src="img/icons/edit.gif" border="0" width="20" height="16" alt="{tr}edit{/tr}" /></a><a href="tiki-calendar.php?calitemId={$hrows[$h][hr].calitemId}&delete=1" title="{tr}remove{/tr}" /><img src="img/icons2/delete.gif" border="0" width="16" height="16" alt="{tr}remove{/tr}" /></a>{/if}</span>{/if} +{if $hrows[$h][hr].calname ne ""}{$hrows[$h][hr].parsedDescription}{else}{$hrows[$h][hr].description}{/if}{if ($calendar_view_tab eq "y" or $tiki_p_change_events eq "y") and $hrows[$h][hr].calname ne ""}<span style="float:right;">{if $calendar_view_tab eq "y"}<a href="tiki-calendar.php?calitemId={$hrows[$h][hr].calitemId}&editmode=details"{if $feature_tabs ne "y"}#details{/if} title="{tr}details{/tr}"><img src="img/icons/zoom.gif" border="0" width="16" height="16" alt="{tr}zoom{/tr}" /></a> {/if}{if $hrows[$h][hr].modifiable eq "y"}<a href="tiki-calendar.php?calitemId={$hrows[$h][hr].calitemId}&editmode=1{if $feature_tabs ne 'y'}#add{/if}" title="{tr}edit{/tr}"><img src="img/icons/edit.gif" border="0" width="20" height="16" alt="{tr}edit{/tr}" /></a><a href="tiki-calendar.php?calitemId={$hrows[$h][hr].calitemId}&delete=1" title="{tr}remove{/tr}" /><img src="img/icons2/delete.gif" border="0" width="16" height="16" alt="{tr}remove{/tr}" /></a>{/if}</span>{/if} </div> {/section} </td></tr> @@ -286,6 +286,13 @@ <h3>{tr}Preview{/tr}</h3> <div class="wikitext">{$parsedDescription}</div> {/if} + +{* + ############################################################ + ----- FORM BEGIN + ############################################################ +*} + <form enctype="multipart/form-data" method="post" action="tiki-calendar.php" id="editcalitem" name="formAddItem" style="display:block;"> <input type="hidden" name="editmode" value="in"> {if $tiki_p_change_events and $calitemId} @@ -489,6 +496,13 @@ </td></tr> </table> </form> + +{* + ############################################################ + ----- FORM END + ############################################################ +*} + {/if}{/if} {* modifTab *} {if $calitemId} <a name="details" /> Index: tiki-show_page.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-show_page.tpl,v retrieving revision 1.74.2.25 retrieving revision 1.74.2.26 diff -u -d -r1.74.2.25 -r1.74.2.26 --- tiki-show_page.tpl 16 Dec 2005 19:05:50 -0000 1.74.2.25 +++ tiki-show_page.tpl 18 Jan 2006 19:43:59 -0000 1.74.2.26 @@ -28,7 +28,13 @@ {if $cached_page eq 'y'} <a title="{tr}refresh{/tr}" href="tiki-index.php?page={$page|escape:"url"}&refresh=1"><img src="img/icons/ico_redo.gif" border="0" height="16" width="16" alt="{tr}refresh{/tr}" /></a> {/if} + + {debug} + + {if $feature_wiki_print eq 'y'} <a title="{tr}print{/tr}" href="tiki-print.php?page={$page|escape:"url"}"><img src="img/icons/ico_print.gif" border="0" width="16" height="16" alt="{tr}print{/tr}" /></a> + {/if} + {if $feature_wiki_pdf eq 'y'} <a title="{tr}create pdf{/tr}" href="tiki-config_pdf.php?{if $home_info && $home_info.page_ref_id}page_ref_id={$home_info.page_ref_id}{else}page={$page|escape:"url"}{/if}"><img src="img/icons/ico_pdf.gif" border="0" width="16" height="16" alt="{tr}pdf{/tr}"></a> {/if} |