[Tikiwiki-cvs] tiki/templates/styles/neat tiki-editpage.tpl,1.28,1.29 tiki-show_page.tpl,1.40,1.41

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki/templates/styles/neat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3460/templates/styles/neat

Modified Files:
	tiki-editpage.tpl tiki-show_page.tpl 
Log Message:
Instant-Auto-Merge from BRANCH-1-9 to HEAD

Index: tiki-editpage.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/styles/neat/tiki-editpage.tpl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- tiki-editpage.tpl	17 Feb 2006 15:10:47 -0000	1.28
+++ tiki-editpage.tpl	16 Mar 2006 13:43:13 -0000	1.29
@@ -179,15 +179,15 @@
 {/if}
 {if $tiki_p_admin_wiki eq 'y'}
 <tr><td class="formcolor">{tr}Import page{/tr}:</td><td class="formcolor">
-<input type="hidden" name="MAX_FILE_SIZE" value="1000000000">
-<input name="userfile1" type="file">
+<input type="hidden" name="MAX_FILE_SIZE" value="1000000000" />
+<input name="userfile1" type="file" />
 <a href="tiki-export_wiki_pages.php?page={$page|escape:"url"}&amp;all=1" class="link">{tr}export all versions{/tr}</a>
 </td></tr>
 {/if}
 {if $feature_wiki_pictures eq 'y' and $tiki_p_upload_picture eq 'y'}
 <tr><td class="formcolor">{tr}Upload picture{/tr}</td><td class="formcolor">
-<input type="hidden" name="MAX_FILE_SIZE" value="1000000000">
-<input name="picfile1" type="file">
+<input type="hidden" name="MAX_FILE_SIZE" value="1000000000" />
+<input name="picfile1" type="file" />
 </td></tr>
 {/if}
 {if $feature_wiki_icache eq 'y'}

Index: tiki-show_page.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/styles/neat/tiki-show_page.tpl,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- tiki-show_page.tpl	20 Jan 2006 09:54:57 -0000	1.40
+++ tiki-show_page.tpl	16 Mar 2006 13:43:13 -0000	1.41
@@ -47,7 +47,7 @@
 <td style="text-align:right;">
 {if $print_page ne 'y'}
 {if !$lock and ($tiki_p_edit eq 'y' or $page|lower eq 'sandbox') and $beingEdited ne 'y'}
-<a title="{tr}edit{/tr}" href="tiki-editpage.php?page={$page|escape:"url"}"><img src="img/icons/edit.gif" border="0" width="20" height="16"  alt='{tr}edit{/tr}'></a>
+<a title="{tr}edit{/tr}" href="tiki-editpage.php?page={$page|escape:"url"}"><img src="img/icons/edit.gif" border="0" width="20" height="16"  alt='{tr}edit{/tr}' /></a>
 {/if}
 
 
@@ -349,7 +349,7 @@
 <form enctype="multipart/form-data" action="tiki-index.php?page={$page}" method="post">
 <table class="normal">
 <tr>
- <td class="formcolor">{tr}Upload file{/tr}:<input type="hidden" name="MAX_FILE_SIZE" value="1000000000"><input  style="font-size:9px;" size="16" name="userfile1" type="file">
+ <td class="formcolor">{tr}Upload file{/tr}:<input type="hidden" name="MAX_FILE_SIZE" value="1000000000" /><input  style="font-size:9px;" size="16" name="userfile1" type="file" />
  {tr}comment{/tr}: <input  style="font-size:9px;"  type="text" name="attach_comment" maxlength="250" />
  <input style="font-size:9px;" type="submit" name="attach" value="{tr}attach{/tr}" />
  </td>