Changeset 4917

Timestamp:

10/29/09 05:31:36 (4 weeks ago)

Author:

asawada

Message:

Added warning message after failed applying theme. bugzid:102865.

Location:

branches/greyhound

Files:

• lib/MT/CMS/Theme.pm (modified) (2 diffs)
• lib/MT/Theme.pm (modified) (2 diffs)
• tmpl/cms/list_theme.tmpl (modified) (1 diff)

branches/greyhound/lib/MT/CMS/Theme.pm

@@ -53 +53 @@
     $param{theme_uninstalled} = $q->param('theme_uninstalled');
     $param{uninstalled_theme_name} = $q->param('uninstalled_theme_name');
+    $param{warning_on_apply} = $q->param('warning_on_apply');
     $app->load_tmpl( 'list_theme.tmpl', \%param );
 }
@@ -158 +159 @@
                 applied => 1,
                 blog_id => $blog->id,
+                warning_on_apply => $theme->{warning_on_apply},
             },
         )

branches/greyhound/lib/MT/Theme.pm

@@ -270 +270 @@
     MT->run_callbacks('pre_apply_theme', $theme, $blog);
     my $importer_filter = $opts{importer_filter};
+    $theme->{warning_on_apply} = 0;
 
     ## run all element handlers.
@@ -287 +288 @@
             }
             else {
+                $theme->{warning_on_apply} = 1;
                 require MT::Log;
                 my $log = MT::Log->new;

branches/greyhound/tmpl/cms/list_theme.tmpl

@@ -20 +20 @@
             rebuild="all">
             <__trans phrase="Theme [_1] has been applied." params="<mt:var name="current_theme_name">" escape="html">
+        </mtapp:statusmsg>
+    </mt:if>
+    <mt:if name="warning_on_apply">
+        <mtapp:statusmsg
+            id="theme_warning"
+            class="alert">
+            <__trans phrase="Some error occured while applying theme."> <a href="<mt:var name="script_url">?__mode=view_log&blog_id=<mt:var name="blog_id">"><__trans phrase="see more detail."></a>
         </mtapp:statusmsg>
     </mt:if>