Index: branches/release-30/tmpl/cms/include/template_table.tmpl
===================================================================
--- branches/release-30/tmpl/cms/include/template_table.tmpl (revision 1397)
+++ branches/release-30/tmpl/cms/include/template_table.tmpl (revision 1408)
@@ -39,5 +39,19 @@
                 <td class="template-name"><a href="<mt:var name="script_url">?__mode=view&amp;_type=template&amp;id=<mt:var name="id">&amp;blog_id=<mt:var name="blog_id">"><mt:var name="name" escape="html"></a></td>
 <mt:if name="template_type" like="/(index|archive)/">
-                <td class="output-file"><mt:if name="outfile"><mt:var name="outfile" escape="html"><mt:else><span><__trans phrase="-"></span></mt:if></td>
+                <td class="output-file">
+    <mt:if name="outfile">
+        <mt:var name="outfile" escape="html">
+    <mt:else name="template_type" eq="archive">
+                    <ul>
+        <mt:loop name="archive_types">
+            <mt:loop name="archive_tmpl_loop">
+                        <li><mt:if name="selected"><mt:var name="name" escape="html"></mt:if></li>
+            </mt:loop>
+        </mt:loop>
+                    </ul>
+    <mt:else>
+        <span><__trans phrase="-"></span>
+    </mt:if>
+                </td>
 </mt:if>
         <mt:unless name="filter">
@@ -56,26 +70,4 @@
 </mt:if>
             </tr>
-<mt:if name="template_type" eq="archive">
-            <tr class="<mt:if name="__odd__">odd<mt:else>even</mt:if> template-<$mt:var name="template_type"$> slave">
-                <td>&nbsp;</td>
-                <td class="template-mapping">
-                    <ul>
-                    <mt:loop name="archive_types">
-                        <li><mt:var name="archive_type" escape="html"></li>
-                    </mt:loop>
-                    </ul>
-                </td>
-                <td class="output-file" colspan="<mt:if name="screen_id" eq="search-replace">8<mt:else>5</mt:if>">
-                    <ul>
-    <mt:loop name="archive_types">
-        <mt:loop name="archive_tmpl_loop">
-                        <li><mt:if name="selected"><mt:var name="name" escape="html"></mt:if></li>
-        </mt:loop>
-    </mt:loop>
-                    </ul>
-                </td>
-            </tr>
-</mt:if>
-
     <mt:if __last__>
         </tbody>