Changeset 1120

Timestamp:

09/22/08 20:17:20 (14 months ago)

Author:

mpaschal

Message:

Merge actual remaining changes from 4.2 (by manually applying the diff)

Location:

trunk/StyleCatcher/plugins/StyleCatcher

Files:

• base-weblog.css (deleted)
• config.yaml (added)
• lib/StyleCatcher.pm (deleted)
• lib/StyleCatcher/CMS.pm (modified) (5 diffs)
• stylecatcher.cgi (deleted)
• stylecatcher.pl (deleted)
• tmpl/footer.tmpl (deleted)
• tmpl/gmscript.tmpl (deleted)
• tmpl/header.tmpl (deleted)
• tmpl/view.tmpl (modified) (2 diffs)

trunk/StyleCatcher/plugins/StyleCatcher/lib/StyleCatcher/CMS.pm

@@ -3 +3 @@
 # GNU General Public License, version 2.
 #
-# $Id: CMS.pm 2576 2008-06-14 00:35:33Z bchoate $
+# $Id: CMS.pm 2923 2008-08-14 18:45:46Z bchoate $
 
 package StyleCatcher::CMS;
@@ -135 +135 @@
     # The remixer only uses name, author, description at the moment.
     my $app = shift;
+    return $app->json_error( $app->errstr ) unless $app->validate_magic;
 
     my $data = fetch_themes($app->param('url'))
@@ -254 +255 @@
     }
     
-
-    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 +267 @@
 '/* 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(".MT::Util::caturl($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 +305 @@
     $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();

trunk/StyleCatcher/plugins/StyleCatcher/tmpl/view.tmpl

@@ -491 +491 @@
             'arguments': {
                 '__mode': 'stylecatcher_js',
+                'magic_token': '<mt:var name="magic_token">',
                 'url': url
             }
@@ -546 +547 @@
             </div>
             <mt:loop name="style_library">
-            <div class="category" id="category-repo-<mt:var name="key">" title="<mt:var name="description_label" escape="html">"><img src="<mt:var name="plugin_static_uri">images/featured.gif" alt="more-designs" /><span><mt:var name="label"></span>
+            <div class="category" id="category-repo-<mt:var name="key">" title="<mt:var name="description_label" escape="html">"><img src="<mt:var name="plugin_static_uri">images/featured.gif" alt="more-designs" /><span><mt:var name="label" escape="html"></span>
             </div>
             </mt:loop>