Changeset 463 for branches/htmlform/templates

Timestamp:

08/05/10 17:34:29 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Validation nitpick fix in assign.tmpl - also fixes missing field
name on alloctype list. <headdesk>
Convert new assignment result page to template.
Add missing error handling, missing IP pool selection on confirm.tmpl
Create footer template object earlier to allow pushing bits into
it during processing
Prepare to move initial output further down execution to prepare for
proper error handling in subs
Fix probable bug introduced with r456 where the "Routing" type isn't
available when it should be. Maybe. Probably.
Error messages for sub insertAssign() and confirmAssign could arguably
be further moved into the templates, but the complexity of the template
would go *way* up with little or no benefit.
See #3.

Location:

branches/htmlform/templates

Files:

• assign.tmpl (modified) (1 diff)
• confirm.tmpl (modified) (4 diffs)
• insert.tmpl (added)

branches/htmlform/templates/assign.tmpl

@@ -37 +37 @@
 <TMPL_VAR NAME=fbdisptype><input type="hidden" name="alloctype" value="<TMPL_VAR NAME=type>">
 <TMPL_ELSE>
-<select>
+<select name="alloctype">
 <TMPL_LOOP name=typelist>
         <option value="<TMPL_VAR NAME=tval>"<TMPL_VAR NAME=sel>><TMPL_VAR NAME=type></option></TMPL_LOOP>

branches/htmlform/templates/confirm.tmpl

@@ +1 @@
+<TMPL_IF err>
+<div class="err">
+<p><TMPL_VAR NAME=err></p>
+<input type="button" value="Back" onclick="history.go(-1)">
+</div>
+<TMPL_ELSE>
 <div class="heading">Please confirm</div>
 <div class="indent">
+
+<form method="POST" action="main.cgi" class="regular">
+<fieldset><legend></legend>
 <table class="regular" cellspacing="1" cellpadding="1">
 
@@ -10 +19 @@
 <tr class="row1">
 <td>Block allocation is taken from:</td>
+<TMPL_IF staticip>
+<td>
+<select name="alloc_from">
+<TMPL_LOOP name=poollist>       <option value="<TMPL_VAR NAME=poolblock>"><TMPL_VAR NAME=poolblock> [<TMPL_VAR NAME=poolfree>] free IP(s) in <TMPL_VAR NAME=poolcit></option>
+</TMPL_LOOP></select>
+</td>
+<TMPL_ELSE>
 <td><TMPL_VAR NAME=alloc_from></td>
+</TMPL_IF>
 </tr>
 
@@ -58 +75 @@
 <tr class="<TMPL_IF privdata>row0<TMPL_ELSE>row1</TMPL_IF>">
 <td class="center" colspan="2">
-<form method="POST" action="main.cgi" class="regular">
-<fieldset><legend></legend>
+<TMPL_UNLESS poollist><input type="hidden" name="alloc_from" value="<TMPL_VAR NAME=alloc_from>"></TMPL_UNLESS>
 <input type="hidden" name="fullcidr" value="<TMPL_VAR NAME=cidr>">
 <input type="hidden" name="city" value="<TMPL_VAR NAME=city>">
@@ -76 +92 @@
 <input type="hidden" name="action" value="<TMPL_VAR NAME=action>">
 <input type="button" value="Back" onclick="history.go(-1)"><input type="submit" value="Confirm">
+</td></tr>
+</table>
 </fieldset>
 </form>
-</td></tr>
-</table>
 </div>
+</TMPL_IF>