Changeset 2743

Timestamp:

07/09/08 22:25:40 (19 months ago)

Author:

breese

Message:

Added support for an additional registry parameter. This template_sets->base_css registry item points to a base CSS file that should imported via a CSS @import command any time a style for this template set is applied. This change is being made to support those styles that may *not* require a base.css file to be imported. The base_css registry item should be a path relative to the mt-static directory.

I also converted style catcher from using the legacy .pl plugin format to the more standard config.yaml format.

Location:

branches/release-41/plugins/StyleCatcher

Files:

• config.yaml (added)
• lib/StyleCatcher/CMS.pm (modified) (3 diffs)
• stylecatcher.pl (deleted)

branches/release-41/plugins/StyleCatcher/lib/StyleCatcher/CMS.pm

@@ -254 +254 @@
     }
     
-
-    my $url2 = $mtthemebase . "blog.css";
+    my $blog = MT->model('blog')->load($blog_id)    
+      or return $app->json_error( $app->translate('No such blog [_1]', $blog_id) );
+
+    my $r = MT->registry;
+    my $base_css = $r->{"template_sets"}{$blog->template_set}{"base_css"};
 
     # Replacing the theme import or adding a new one at the beginning
@@ -263 +266 @@
 '/* This is the StyleCatcher theme addition. Do not remove this block. */';
     my $footer = '/* end StyleCatcher imports */';
-    my $styles = $header . "\n" . <<"EOT" . $footer;
-\@import url($url2);
-\@import url($url);
-EOT
+    my $styles = $header . "\n";
+    $styles .= "\@import url(".File::Spec->catfile($app->static_path, $base_css).");\n" if $base_css;
+    $styles .= "\@import url($url);\n";
+    $styles .= $footer;
+    print STDERR "styles=$styles\n";
+
     if ($template_text =~ s/\Q$header\E.*\Q$footer\E/$styles/s) {
         $tmpl->text( $template_text );
@@ -299 +304 @@
     $tmpl->save or return $app->json_error( $tmpl->errstr );
 
-    my $blog = MT->model('blog')->load($blog_id)    
-      or return $app->json_error( $app->translate('No such blog [_1]', $blog_id) );
     $blog->page_layout($layout);
     $blog->touch();