Merge previous changeset and ensure everything seems to work.
<html>
<TMPL_INCLUDE NAME="headers.tmpl">
<body>
<h1><TMPL_VAR remote_user>'s Edit Bookmark</h1>
<form action="" method="post" name="add">
<input type="hidden" name="action" value="add"/>
<fieldset class="bookmark">
<input type="hidden" name="id" value="<TMPL_VAR bkid>"/>
<label>Nom: <input type="text" name="name"
value="<TMPL_VAR ctitle>"/></label><br/>
<label>URL: <input type="text" name="url"
value="<TMPL_VAR curl>"/></label><br/>
<label for="desc">Description: </label><br/>
<textarea name="desc" rows="5" cols="40"><TMPL_VAR desc></textarea>
</fieldset>
<fieldset class="keywords">
<legend>Keywords:</legend>
<label>Selected:
<select multiple name="kw" size="<TMPL_VAR kw_size>">
<TMPL_LOOP Keywords>
<option value="<TMPL_VAR id>"
<TMPL_IF selected>selected</TMPL_IF> />
<TMPL_VAR keyword></option>
</TMPL_LOOP>
</select>
<label>New keywords: <input type="text" name="newkw"> (comma
separated list)</label><br/>
<button type="reset">Reset</button>
</fieldset>
<button type="submit" name="step" value="update">Submit</button>
<button type="submit" name="step" value="delete">Delete</button>
<button type="submit" name="step" value="cancel">Cancel</button>
</form>
</body>
</html>
<!--
vi: syntax=html
-->