Changeset 545 for branches/stable/templates/location.tmpl

Timestamp:

12/10/13 17:47:44 (10 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge reverse DNS and location work; 2 of mumble

• from r263 through r416

Numerous conflicts due to hand-copy or partial merges

Location:

branches/stable

Files:

• . (modified) (1 prop)
• templates/location.tmpl (copied) (copied from trunk/templates/location.tmpl ) (2 diffs)

branches/stable/templates/location.tmpl

@@ -14 +14 @@
 <input type="hidden" name="page" value="location" />
 <input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
-<input type="hidden" name="parentid" value="<TMPL_VAR NAME=parentid>" />
-<input type="hidden" name="id" value="<TMPL_VAR NAME=id>" />
+<TMPL_IF id><input type="hidden" name="id" value="<TMPL_VAR NAME=id>" /></TMPL_IF>
 <input type="hidden" name="locact" value="<TMPL_VAR NAME=locact>" />
 
@@ -26 +25 @@
         <tr class="datalinelight">
                 <td>Location name/description</td>
-                <td><input type="text" name="locname" value="<TMPL_VAR ESCAPE=HTML NAME=locname>" size="30" /></td>
+                <td><input type="text" name="locname" value="<TMPL_VAR ESCAPE=HTML NAME=locname>" size="30" maxlength="40" /></td>
         </tr>
         <tr class="datalinelight">
                 <td>IP list</td>
                 <td><input type="text" name="iplist" value="<TMPL_VAR ESCAPE=HTML NAME=iplist>" size="30" /></td>
+        </tr>
+        <tr class="datalinelight">
+                <td>Comments</td>
+                <td><textarea name="comments" cols="50" rows="5"><TMPL_VAR ESCAPE=HTML NAME=comments></textarea></td>
         </tr>
         <tr class="datalinelight">