Changeset 766 for trunk/templates

Timestamp:

08/24/15 18:10:42 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Fixes for "Allocation complete" screen:

• Refine and tune order and source of information for breadcrumbs correctness on guided allocation of a static IP
• Remove a little stale code lingering from "rdepth"
• Tweak template parameters and CSS/layout for error reporting

Location:

trunk/templates

Files:

• confirm.tmpl (modified) (3 diffs)
• insert.tmpl (modified) (2 diffs)

trunk/templates/confirm.tmpl

@@ -26 +26 @@
 <TMPL_IF staticip>
 <td>
-<select name="alloc_from">
-<TMPL_LOOP name=poollist>       <option value="<TMPL_VAR NAME=poolblock>,<TMPL_VAR NAME=poolrdepth>"><TMPL_VAR NAME=poolblock> [<TMPL_VAR NAME=poolfree>] free IP(s) in <TMPL_VAR NAME=poolcit></option>
+<select name="parent">
+<TMPL_LOOP name=poollist>       <option value="<TMPL_VAR NAME=poolid>"><TMPL_VAR NAME=poolblock> [<TMPL_VAR NAME=poolfree>] free IP(s) in <TMPL_VAR NAME=poolcit></option>
 </TMPL_LOOP></select>
 </td>
@@ -61 +61 @@
 </div>
 </TMPL_IF>
-
 </td>
 </tr>
@@ -120 +119 @@
 <tr>
 <td class="center" colspan="2">
-<TMPL_UNLESS poollist><input type="hidden" name="alloc_from" value="<TMPL_VAR NAME=alloc_from>"></TMPL_UNLESS>
+<TMPL_UNLESS poollist>
+<input type="hidden" name="alloc_from" value="<TMPL_VAR NAME=alloc_from>">
 <input type="hidden" name="parent" value="<TMPL_VAR NAME=parent>">
+</TMPL_UNLESS>
 <input type="hidden" name="fbid" value="<TMPL_VAR NAME=fbid>">
 <TMPL_IF resvblock><input type="hidden" name="reserve" value="<TMPL_VAR NAME=reserve>"></TMPL_IF>

trunk/templates/insert.tmpl

@@ -1 +1 @@
 <TMPL_IF err>
 <div class="err">
-<p><TMPL_VAR NAME=err></p>
+<div class="heading"><TMPL_VAR NAME=err></div>
+<p><TMPL_VAR NAME=errmsg></p>
 <input type="button" value="Back" onclick="history.go(-1)">
 </div>
@@ -12 +13 @@
 </TMPL_IF>
 </div>
-<div class="center">IPs in <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR 
-NAME=parent>"><TMPL_VAR NAME=pool></a></div>
+<div class="center">IPs in <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=parentid>"><TMPL_VAR NAME=parentblock></a></div>
 <TMPL_ELSE>
 <div class="center">