Changeset 371

Timestamp:

04/07/08 15:50:39 (9 months ago)

Author:

tomoyo

Message:

テンプレートの選択をoptgroupでグルーピングするようにしてみた。

Location:

Movable Type/TemplatePreview

Files:

• lib/TemplatePreview/App.pm (modified) (3 diffs)
• tmpl/preview.tmpl (modified) (2 diffs)

Movable Type/TemplatePreview/lib/TemplatePreview/App.pm

@@ -163 +163 @@
     $linked_file_path =~ s!^.*[/\\]!!;
 
+    my %types = (
+        index           => 'インデックス',
+        category        => 'カテゴリーアーカイブ',
+        archive         => 'アーカイブ',
+        individual      => 'エントリーアーカイブ',
+        custom          => 'モジュール',
+        comments        => 'コメント',
+        comment_preview => 'コメントプレビュー',
+        comment_error   => 'コメントエラー',
+        popup_image     => 'ポップアップ画像',
+        widget          => 'ウィジェット',
+        page            => 'ウェブページ',
+    );
+
     return $app->build_page($app_tmpl, {
         tmpl_name         => $tmpl->name,
@@ -168 +182 @@
         tmpl_file_name    => $linked_file_path,
         require_category  => ($tmpl->type ne 'individual') && ($tmpl->type ne 'index'),
-        types        => [ map { { name => $_->[0], value => $_->[1], selected => $_->[1] eq $type } }
-                                (['カテゴリ','category'], ['カスタム','custom'], ['アーカイブ','archive']) ],
-        query_params => [ map { { name => $_, value => scalar $q->param($_) }; }
-                          grep { ($_ ne '__mode') && ($_ ne 'submit') } $q->param ],
-        blogs        => [ map { { name => $_->name, value => $_->id, selected => $_->id == $q->param('blog_id') } }
-                              MT::Blog->load({}, { sort => 'name', direction => 'desc' }) ],
-        templates    => [ map { { name => $_->name, value => $_->id, selected => $_->id == $q->param('template_id') } }
-                              MT::Template->load({ @blog_id }) ],
-        entries      => [ map { { name => $_->title, value => $_->id, selected => $_->id == $q->param('entry_id') } }
-                              MT::Entry->load({ @blog_id }) ],
-        categories   => [ map { { name => $_->label, value => $_->id, selected => $_->id == $q->param('category_id') } }
-                              MT::Category->load({ @blog_id }) ],
-        template_id  => $q->param('template_id'),
+        types             => [ map { { name => $_->[0], value => $_->[1], selected => $_->[1] eq $type } }
+                                     (['カテゴリ','category'], ['カスタム','custom'], ['アーカイブ','archive']) ],
+        query_params      => [ map { { name => $_, value => scalar $q->param($_) }; }
+                                   grep { ($_ ne '__mode') && ($_ ne 'submit') } $q->param ],
+        blogs             => [ map { { name => $_->name, value => $_->id, selected => $_->id == $q->param('blog_id') } }
+                                   MT::Blog->load({}, { sort => 'name', direction => 'desc' }) ],
+        templates         => [ map { { name => $_->name, value => $_->id, selected => $_->id == $q->param('template_id') } }
+                                   MT::Template->load({ @blog_id }) ],
+        templates_by_type => [
+                                map {
+                                    my $type = $_;
+                                    { type => $types{$type},
+                                      templates => [ map { { name => $_->name, value => $_->id, selected => $_->id == $q->param('template_id') } }
+                                           MT::Template->load({ @blog_id, type => $type }) ],
+                                    }
+                                } keys %types
+                             ],
+        entries           => [ map { { name => $_->title, value => $_->id, selected => $_->id == $q->param('entry_id') } }
+                                   MT::Entry->load({ @blog_id }) ],
+        categories        => [ map { { name => $_->label, value => $_->id, selected => $_->id == $q->param('category_id') } }
+                                   MT::Category->load({ @blog_id }) ],
+        template_id       => $q->param('template_id'),
     });
 }
@@ -188 +211 @@
 
     my $blog = MT::Blog->load({ id => $app->param('blog_id') });
-    return $app->show_error("MT::Blog Not found") unless $blog;
+    return $app->show_error("Blog Not found") unless $blog;
     my $tmpl = MT::Template->load({ id => $app->param('template_id') });
-    return $app->show_error("MT::Template Not found") unless $tmpl;
+    return $app->show_error("Template Not found") unless $tmpl;
 
     my $ctx = MT::Template::Context->new;

Movable Type/TemplatePreview/tmpl/preview.tmpl

@@ +1 @@
+<!--DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"-->
 <title>Template Preview</title>
 <style type="text/css">
@@ -54 +55 @@
 テンプレート: 
 <select name="template_id">
+<TMPL_LOOP NAME="TEMPLATES_BY_TYPE"><optgroup label="<TMPL_VAR NAME="TYPE" ESCAPE="HTML">"><TMPL_LOOP NAME="TEMPLATES"><option value="<TMPL_VAR NAME="VALUE">"<TMPL_IF NAME="SELECTED"> selected="selected"</TMPL_IF>><TMPL_VAR NAME="NAME" ESCAPE="HTML"></option></TMPL_LOOP></optgroup>
+</TMPL_LOOP></select>
+<!--
+テンプレート: 
+<select name="template_id">
 <TMPL_LOOP NAME="TEMPLATES"><option value="<TMPL_VAR NAME="VALUE">"<TMPL_IF NAME="SELECTED"> selected="selected"</TMPL_IF>><TMPL_VAR NAME="NAME" ESCAPE="HTML"></option>
 </TMPL_LOOP></select>
+-->
 <TMPL_IF NAME="REQUIRE_CATEGORY">
 |