[Tikiwiki-cvs] tiki/templates/styles/tiki tiki-editpage.tpl,1.21,1.21.2.1

[<dam...@us...>]

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

Modified Files:
      Tag: BRANCH-1-9
	tiki-editpage.tpl 
Log Message:
merge from BRANCH-1-8 to BRANCH-1-9

Index: tiki-editpage.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/styles/tiki/tiki-editpage.tpl,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -d -r1.21 -r1.21.2.1
--- tiki-editpage.tpl	13 Jun 2004 00:45:30 -0000	1.21
+++ tiki-editpage.tpl	30 Jun 2004 23:49:21 -0000	1.21.2.1
@@ -217,7 +217,7 @@
 {if $tiki_p_minor eq 'y'}
 <input type="checkbox" name="isminor" value="on" />{tr}Minor{/tr}
 {/if}
-<input type="submit" class="wikiaction" name="save" value="{tr}save{/tr}" /> <a class="link" href="tiki-index.php?page={$page|escape:"url"}">{tr}cancel edit{/tr}</a></td>
+<input type="submit" class="wikiaction" name="save" value="{tr}save{/tr}" /> <input type="submit" class="wikiaction" name="cancel_edit" value="{tr}cancel edit{/tr}" /></td>
 </tr>
 </table>
 </form>