[Tikiwiki-cvs] tiki/templates/styles/moreneat tiki-show_page.tpl,1.1.2.5,1.1.2.6

[<te...@us...>]

Update of /cvsroot/tikiwiki/tiki/templates/styles/moreneat
In directory sc8-pr-cvs1:/tmp/cvs-serv14465

Modified Files:
      Tag: release_eta_carinea_rc1
	tiki-show_page.tpl 
Log Message:
RFE #760844: cleaned up print wiki page

Index: tiki-show_page.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/styles/moreneat/tiki-show_page.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- tiki-show_page.tpl	18 Jul 2003 18:55:05 -0000	1.1.2.5
+++ tiki-show_page.tpl	19 Jul 2003 19:34:59 -0000	1.1.2.6
@@ -13,45 +13,47 @@
 <small>(cached)</small>
 {/if}
 </td>
-<td style="text-align:right;">
-
 
+{if $print_page !== 'n'}
+	<td style="text-align:right;">
 
-{if !$lock and ($tiki_p_edit eq 'y' or $page eq 'SandBox') and $beingEdited ne 'y'}
-<a title="{tr}edit{/tr}" href="tiki-editpage.php?page={$page|escape:"url"}"><img border="0" src="img/icons/edit.gif" alt='{tr}edit{/tr}' /></a>
-{/if}
+	{if !$lock and ($tiki_p_edit eq 'y' or $page eq 'SandBox') and $beingEdited ne 'y'}
+	<a title="{tr}edit{/tr}" href="tiki-editpage.php?page={$page|escape:"url"}"><img border="0" src="img/icons/edit.gif" alt='{tr}edit{/tr}' /></a>
+	{/if}
 
 
-{if $feature_backlinks eq 'y'}
-<a title="{tr}backlinks{/tr}" href="tiki-backlinks.php?page={$page|escape:"url"}"><img border="0" src="img/icons/ico_link.gif" alt='{tr}backlinks{/tr}' /></a>
-{/if}
+	{if $feature_backlinks eq 'y'}
+	<a title="{tr}backlinks{/tr}" href="tiki-backlinks.php?page={$page|escape:"url"}"><img border="0" src="img/icons/ico_link.gif" alt='{tr}backlinks{/tr}' /></a>
+	{/if}
 
-{if $cached_page eq 'y'}
-<a title="{tr}refresh{/tr}" href="tiki-index.php?page={$page|escape:"url"}&amp;refresh=1"><img border="0" src="img/icons/ico_redo.gif" alt='{tr}refresh{/tr}' /></a>
-{/if}
+	{if $cached_page eq 'y'}
+	<a title="{tr}refresh{/tr}" href="tiki-index.php?page={$page|escape:"url"}&amp;refresh=1"><img border="0" src="img/icons/ico_redo.gif" alt='{tr}refresh{/tr}' /></a>
+	{/if}
 
-<a title="{tr}print{/tr}" href="tiki-print.php?page={$page|escape:"url"}"><img border="0" src="img/icons/ico_print.gif" alt='{tr}print{/tr}' /></a>
+	<a title="{tr}print{/tr}" href="tiki-print.php?page={$page|escape:"url"}"><img border="0" src="img/icons/ico_print.gif" alt='{tr}print{/tr}' /></a>
 
-{if $feature_wiki_pdf eq 'y'}
-<a title="{tr}create pdf{/tr}" href="tiki-config_pdf.php?page={$page|escape:"url"}"><img border="0" src="img/icons/ico_pdf.gif" alt='{tr}pdf{/tr}' /></a>
-{/if}
+	{if $feature_wiki_pdf eq 'y'}
+	<a title="{tr}create pdf{/tr}" href="tiki-config_pdf.php?page={$page|escape:"url"}"><img border="0" src="img/icons/ico_pdf.gif" alt='{tr}pdf{/tr}' /></a>
+	{/if}
 
-{if $user and $feature_notepad eq 'y' and $tiki_p_notepad eq 'y'}
-<a title="{tr}Save to notepad{/tr}" href="tiki-index.php?page={$page|escape:"url"}&amp;savenotepad=1"><img border="0" src="img/icons/ico_save.gif" alt="{tr}save{/tr}" /></a>
-{/if}
+	{if $user and $feature_notepad eq 'y' and $tiki_p_notepad eq 'y'}
+	<a title="{tr}Save to notepad{/tr}" href="tiki-index.php?page={$page|escape:"url"}&amp;savenotepad=1"><img border="0" src="img/icons/ico_save.gif" alt="{tr}save{/tr}" /></a>
+	{/if}
 
-{if $user and $feature_user_watches eq 'y'}
-  {if $user_watching_page eq 'n'}
-    <a href="tiki-index.php?page={$page|escape:"url"}&amp;watch_event=wiki_page_changed&amp;watch_object={$page|escape:"url"}&amp;watch_action=add"><img border='0' alt='{tr}monitor this page{/tr}' title='{tr}monitor this page{/tr}' src='img/icons/icon_watch.png' /></a>
-  {else}
-    <a href="tiki-index.php?page={$page|escape:"url"}&amp;watch_event=wiki_page_changed&amp;watch_object={$page|escape:"url"}&amp;watch_action=remove"><img border='0' alt='{tr}stop monitoring this page{/tr}' title='{tr}stop monitoring this page{/tr}' src='img/icons/icon_unwatch.png' /></a>
-  {/if}
+	{if $user and $feature_user_watches eq 'y'}
+	  {if $user_watching_page eq 'n'}
+	    <a href="tiki-index.php?page={$page|escape:"url"}&amp;watch_event=wiki_page_changed&amp;watch_object={$page|escape:"url"}&amp;watch_action=add"><img border='0' alt='{tr}monitor this page{/tr}' title='{tr}monitor this page{/tr}' src='img/icons/icon_watch.png' /></a>
+	  {else}
+	    <a href="tiki-index.php?page={$page|escape:"url"}&amp;watch_event=wiki_page_changed&amp;watch_object={$page|escape:"url"}&amp;watch_action=remove"><img border='0' alt='{tr}stop monitoring this page{/tr}' title='{tr}stop monitoring this page{/tr}' src='img/icons/icon_unwatch.png' /></a>
+	  {/if}
+	{/if}
+	</td>
 {/if}
 
-</td>
 </tr>
 </table>
 
+{if $show_page_bar !== 'n'}
 {if !$lock}
 	{if $tiki_p_edit eq 'y' or $page eq 'SandBox'}
 		{if $beingEdited eq 'y'}
@@ -121,7 +123,7 @@
 {if $feature_wiki_attachments eq 'y' and $show_page eq 'y'}
 <span class="tabbut"><a href="javascript:flip('attzone{if $atts_show eq 'y'}open{/if}');" class="tablink">{if $atts_count eq 0}{tr}attach file{/tr}{elseif $atts_count eq 1}1 {tr}attachment{/tr}{else}{$atts_count} {tr}attachments{/tr}{/if}</a></span>
 {/if}
-
+{/if}
 
 <div class="wikitext">{if $structure eq 'y'}
 <div class="tocnav">