Changeset 545 for branches/stable/templates/bulkchange.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/bulkchange.tmpl (modified) (1 diff)

branches/stable/templates/bulkchange.tmpl

@@ -10 +10 @@
 <tr class="datalinelight">
         <td><TMPL_VAR NAME=domain></td>
-<TMPL_IF domok> <td>OK</td>
-<TMPL_ELSE><TMPL_IF domwarn>    <td class="warn">Import OK but:<br />
-<TMPL_VAR NAME=domwarn></td>
-<TMPL_ELSE>     <td class="err">Failed: <TMPL_VAR NAME=domerr></td>
+<TMPL_IF domok> <td><TMPL_VAR NAME=domok></td>
+<TMPL_ELSE><TMPL_IF domwarn>    <td class="warn"><TMPL_VAR NAME=domwarn></td>
+<TMPL_ELSE>     <td class="err"><TMPL_VAR NAME=domerr></td>
 </TMPL_IF></TMPL_IF>
 </tr>
 </TMPL_LOOP>
 </table>
-<TMPL_VAR NAME=foobar>
 </td>
 </tr>