Index: /branches/release-30/lib/MT/CMS/Template.pm
===================================================================
--- /branches/release-30/lib/MT/CMS/Template.pm (revision 1395)
+++ /branches/release-30/lib/MT/CMS/Template.pm (revision 1397)
@@ -514,4 +514,6 @@
     $params->{template_type_label} = $template_type_label;
 
+    $params->{screen_class} = "list-template";
+
     $app->load_list_actions( 'template', $params );
     $params->{page_actions} = $app->page_actions('list_templates');
Index: /branches/release-30/lib/MT/App/CMS.pm
===================================================================
--- /branches/release-30/lib/MT/App/CMS.pm (revision 1396)
+++ /branches/release-30/lib/MT/App/CMS.pm (revision 1397)
@@ -1031,5 +1031,5 @@
         template => {
             templates => {
-                label   => "Templates",
+                label   => "Main Templates",
                 order   => 100,
                 handler => sub {
@@ -1042,19 +1042,19 @@
                 },
             },
-            archive_templates => {
-                label   => "Archive Templates",
-                order   => 200,
-                handler => sub {
-                    my ( $terms, $args ) = @_;
-                    $terms->{type} =
-                      [ 'individual', 'page', 'archive', 'category' ];
-                },
-                condition => sub {
-                    $app->param('blog_id');
-                },
-            },
+            # archive_templates => {
+            #     label   => "Archive Templates",
+            #     order   => 200,
+            #     handler => sub {
+            #         my ( $terms, $args ) = @_;
+            #         $terms->{type} =
+            #           [ 'individual', 'page', 'archive', 'category' ];
+            #     },
+            #     condition => sub {
+            #         $app->param('blog_id');
+            #     },
+            # },
             module_templates => {
-                label   => "Template Modules",
-                order   => 300,
+                label   => "Modules",
+                order   => 400,
                 handler => sub {
                     my ($terms) = @_;
@@ -1064,5 +1064,5 @@
             email_templates => {
                 label   => "E-mail Templates",
-                order   =>  400,
+                order   =>  300,
                 handler => sub {
                     my ($terms) = @_;
@@ -1083,5 +1083,5 @@
             system_templates => {
                 label   => "System Templates",
-                order   => 500,
+                order   => 200,
                 handler => sub {
                     my ($terms) = @_;
Index: /branches/release-30/mt-static/css/structure.css
===================================================================
--- /branches/release-30/mt-static/css/structure.css (revision 1350)
+++ /branches/release-30/mt-static/css/structure.css (revision 1397)
@@ -2515,4 +2515,21 @@
 
 
+/* list template */
+
+td.template-mapping {
+    padding-left: 30px;
+}
+
+td.output-file {
+    width: 50%;
+}
+
+td.output-file ul {
+    margin: 0;
+}
+td.output-file ul {
+    whitespace: nowrap;
+}
+
 /* table links */
 
Index: /branches/release-30/tmpl/cms/include/template_table.tmpl
===================================================================
--- /branches/release-30/tmpl/cms/include/template_table.tmpl (revision 1103)
+++ /branches/release-30/tmpl/cms/include/template_table.tmpl (revision 1397)
@@ -14,5 +14,7 @@
                 <th class="cb"><input type="checkbox" name="id-head" value="all" class="select" /></th>
                 <th class="template-name"><__trans phrase="Template Name"></th>
+<mt:if name="template_type" like="/(index|archive)/">
                 <th class="output-file"><__trans phrase="Output File"></th>
+</mt:if>
         <mt:unless name="filter">
                 <th class="template-type"><__trans phrase="Type"></th>
@@ -21,8 +23,12 @@
                 <th class="blog"><__trans phrase="Blog"></th>
         </mt:unless>
+<mt:unless name="screen_id" eq="search-replace">
                 <th class="linked-template si"><!-- <span><__trans phrase="Linked"></span> --><img src="<mt:var name="static_uri">images/status_icons/linked.gif" alt="<__trans phrase="Linked Template">" title="<__trans phrase="Linked Template">" width="17" height="9" /></th>
+</mt:unless>
+<mt:if name="template_type" like="/(index|archive)/">
                 <th class="dynamic-template si"><!-- <span><__trans phrase="Dynamic"></span> --><img src="<mt:var name="static_uri">images/status_icons/dynamic.gif" alt="<__trans phrase="Dynamic Template">" title="<__trans phrase="Dynamic Template">" width="11" height="9" /></th>
                 <th class="rebuild-template si"><!-- <span><__trans phrase="Published w/Indexes"></span> --><img src="<mt:var name="static_uri">images/status_icons/rebuild.gif" alt="<__trans phrase="Published Template w/Indexes">" title="<__trans phrase="Published Template w/Indexes">" width="9" height="9" /></th>
                 <th class="view-template si"><span><__trans phrase="View"></span></th>
+</mt:if>
             </tr>
         </thead>
@@ -32,5 +38,7 @@
                 <td class="cb"><input type="checkbox" name="id" class="select" value="<mt:var name="id">" /></td>
                 <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>
+</mt:if>
         <mt:unless name="filter">
                 <td class="template-type"><$mt:var name="type"$></td>
@@ -39,9 +47,35 @@
                 <td class="blog"><a href="<$mt:var name="script_url"$>?__mode=list&amp;_type=template&amp;blog_id=<$mt:var name="blog_id"$>"><$mt:var name="weblog_name" escape="html"$></a></td>
         </mt:unless>
+<mt:unless name="screen_id" eq="search-replace">
                 <td class="linked-template si status-<mt:if name="linked_file">linked<mt:else>unlinked</mt:if>"><!-- <span><__trans phrase="Linked"></span> --><img src="<mt:var name="static_uri">images/spacer.gif" alt="<mt:if name="linked_file"><__trans phrase="Yes"><mt:else><__trans phrase="No"></mt:if>" width="9" height="9" <mt:if name="linked_file">title="<mt:var name="linked_file" escape="html">"</mt:if> /></td>
+</mt:unless>
+<mt:if name="template_type" like="/(index|archive)/">
                 <td class="dynamic-template si status-<mt:if name="build_dynamic">dynamic<mt:else>static</mt:if>"><img src="<mt:var name="static_uri">images/spacer.gif" alt="<mt:if name="build_dynamic"><__trans phrase="Yes"><mt:else><__trans phrase="No"></mt:if>" width="9" height="9" /></td>
                 <td class="rebuild-template si status-<mt:if name="rebuild_me">rebuild<mt:else>norebuild</mt:if>"><img src="<mt:var name="static_uri">images/spacer.gif" alt="<mt:if name="rebuild_me"><__trans phrase="Yes"><mt:else><__trans phrase="No"></mt:if>" width="9" height="9" /></td>
                 <td class="view-template si status-view"><mt:if name="published_url"><a href="<mt:var name="published_url">" target="<__trans phrase="_external_link_target">" title="<__trans phrase="View Published Template">"><img src="<mt:var name="static_uri">images/spacer.gif" alt="<__trans phrase="View Published Template">" width="13" height="9" /></a><mt:else><__trans phrase="-"></mt:if></td>
+</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>