Changeset 735 for trunk/templates

Timestamp:

05/27/15 17:56:44 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

A little more surrounding cleanup:

• Tweak merge confirmation template to show the scope or not on different criteria for clarity.
• Remove call to retrieve free blocks for listing on the confirmation page.

See #8

File:

• trunk/templates/confmerge.tmpl (modified) (2 diffs)

trunk/templates/confmerge.tmpl

@@ -44 +44 @@
 </tr>
 
-<TMPL_IF iscontainer>
+<TMPL_UNLESS ismaster>
+<TMPL_UNLESS isleaf>
 <tr>
 <td>Merge scope:</td>
 <td><TMPL_VAR NAME=vis_scope></td>
 </tr>
-</TMPL_IF>
+</TMPL_UNLESS>
+</TMPL_UNLESS>
 
 <TMPL_IF ispool>
@@ -55 +57 @@
 <td colspan="2" class="warning">
 Warning:  Any end-use suballocations within <TMPL_VAR NAME=newblock> will be converted<br>
-to clusters of "used" IPs on a best-effort basis in this merge.<br>
-Use the Back button and select a container type if you wish to keep these.
+to clusters of "used" IPs on a best-effort basis as per the merge scope above.<br>
+Use the Back button and select a container type if you wish to keep these as netblocks.
 </td>
 </tr>