Changeset 594 for branches/stable/templates/admin

Timestamp:

05/15/13 16:17:00 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge SQL changes and other miscellaneous fixes from /trunk through r553.

Location:

branches/stable

Files:

• . (modified) (1 prop)
• templates/admin/alloc.tmpl (modified) (1 diff)
• templates/admin/main.tmpl (modified) (2 diffs)

branches/stable/templates/admin/alloc.tmpl

@@ -2 +2 @@
 <TMPL_VAR NAME=errmsg>
 <TMPL_ELSE>
+<TMPL_IF warnmsg><div class="warnmsg"><TMPL_VAR NAME=warnmsg></div></TMPL_IF>
 <form method="POST" action="admin.cgi">
 <fieldset><legend class="noshow">&nbsp;</legend>

branches/stable/templates/admin/main.tmpl

@@ -8 +8 @@
 Allocate block/IP: <input name="cidr"> as
 <select name="alloctype">
-<TMPL_LOOP NAME=typelist><option value="<TMPL_VAR NAME=type>"<TMPL_UNLESS selected> selected</TMPL_UNLESS>><TMPL_VAR NAME=dispname></option>
+<TMPL_LOOP NAME=typelist><option value="<TMPL_VAR NAME=type>"<TMPL_IF sel> selected</TMPL_IF>><TMPL_VAR NAME=listname></option>
 </TMPL_LOOP>
 </select>
@@ -29 +29 @@
 Bump "last updated" timestamp on this master:
 <select name="whichmaster">
-<TMPL_LOOP NAME=masterlist><option value="<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master> (<TMPL_VAR NAME=masterdate>)</option>
+<TMPL_LOOP NAME=masterlist><option value="<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master> (<TMPL_VAR NAME=mtime>)</option>
 </TMPL_LOOP>
 </select>