Changeset 2812

Timestamp:

07/18/08 18:30:37 (1 month ago)

Author:

breese

Message:

fixed bug 80518 - finalized the upgrade widget copy

Files:

• branches/release-41/lib/MT/CMS/Dashboard.pm (modified) (1 diff)
• branches/release-41/mt-static/js/tc/mixer/display.js (modified) (3 diffs)
• branches/release-41/mt-static/plugins/StyleCatcher/templates.css (modified) (1 diff)
• branches/release-41/mt-static/themes/hills-dusk/screen.css (modified) (1 diff)
• branches/release-41/plugins/StyleCatcher/lib/StyleCatcher/CMS.pm (modified) (14 diffs)

branches/release-41/lib/MT/CMS/Dashboard.pm

@@ -79 +79 @@
-      {
-        feature_label => MT->translate('Better, Stronger, Faster'),
-15/known-issues
-A concerted effort has been made to make significant improvements to Movable Type\'s performance and reliability with added features like Server Side Includes and Template Module Caching.
+2/performance
+Movable Type has undergone a significant overhaul in all aspects of performance. Memory utilization has been reduced, publishing times have been increased significantly and search is now 100x faster!
-      },
-      {
-
-
-
+
+
+
+
+
+
+
+
-      },
-      {
-        feature_label => MT->translate('Threaded Comments'),
-15/threaded-comments
+2/threading
-        feature_description => MT->translate('Allow commenters on your blog to reply to each other increasing user engagement and creating more dynamic conversations.'),
-      };

branches/release-41/mt-static/js/tc/mixer/display.js

@@ -53 +53 @@
-        "description" : "Description:",
-        "author" : "Author:",
-
-
+
+
+
-};
-
@@ -227 +228 @@
-                        // get natural language label
-                        var epLabel = this.entryProperties[ ep ];
-
+
+
+
+
-                        
-                        // fix array values
-                        if( epValue.join )
-       
+    
-                        
-                        // only handle strings
-                        if( typeof( epValue ) != "string" )
-       
+    
-                        
-                        // property
@@ -242 +246 @@
-                        props.appendChild( prop );
-                        
-                        // label
-                        var label = this.document.createElement( "span" );
-                        label.className = "label";
-                        label.appendChild( this.document.createTextNode( epLabel ) );
-                        prop.appendChild( label );
-                        
-                        // content
-                        var content = this.document.createElement( "span" );
-                        content.className = "content";
-Label == "URL:"
+.match(/(_|^)url$/) 
-                           var link = this.document.createElement( "a" );
-                           link.href = epValue;
-
+
+
+
-                           content.appendChild( link );
-                        } else {
-
+
+
+
+
+
+
-                        }
-                        prop.appendChild( content );

branches/release-41/mt-static/plugins/StyleCatcher/templates.css

@@ -372 +372 @@
-#display-details .url .content { display: inline; height: auto; }
-
+#display-details .props_url { margin-bottom: 4px; }
+#display-details .props_url .content { display: block; height: auto; }
+#display-details .props_url .content a {
+    display: block;
+    background-image: url(https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif);
+    width: 74px;
+    height: 21px;
+}
+#display-details .props_url .content a * { display: none }
+
-/*#display-details .tags .label { display: inline; height: auto; }
-#display-details .tags .content { display: inline; height: auto; word-spacing: 0.5em; }*/

branches/release-41/mt-static/themes/hills-dusk/screen.css

@@ -5 +5 @@
-designer: Mena Trott  
-layouts: layout-wtt, layout-twt, layout-wt, layout-tw
+props_url: byrne@majordojo.com
-*/
-

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

@@ -9 +9 @@
-use strict;
-use File::Basename qw(basename);
+use MT::Util qw( caturl );
-
-our $DEFAULT_STYLE_LIBRARY;
@@ -155 +156 @@
-    $app->validate_magic or return $app->json_error($app->translate("Invalid request"));
-    return $app->json_error($app->translate("Invalid request"))
-      
+       
-
-    my $static_path = $app->static_file_path;
@@ -162 +163 @@
-    }
-
-
-
+
-    my $webthemeroot = $app->static_path . 'support/themes/';
-    my $mtthemeroot  = $app->static_path . 'themes/';
@@ -174 +174 @@
-    # yonder...
-    my $filemgr = file_mgr()
-
+
+
-
-    if ( $url !~ m/^(\Q$webthemeroot\E|\Q$mtthemeroot\E)/ ) {
-        my $new_url = '';
-
-        for (0..(scalar(@url)-2)) {
-            $new_url .= $url[$_] . '/';
-        }
+        print STDERR "Processing for application: $url\n";
-        my ( $basename, $extension ) = split( /\./, $url[-1] );
-        if ($basename eq 'screen') {
@@ -206 +207 @@
-        $content =~ s!/\*.*?\*/!!gs;    # strip all comments first
-        my @images = $content =~
-
+|css
-        $filemgr->mkpath( File::Spec->catdir( $themeroot, $basename ) )
-          or return $app->json_error(
@@ -233 +234 @@
-        }
-
-
+ 
-        for my $image_url (@images) {
-            my $image_request =
@@ -253 +254 @@
-        $url = "$webthemeroot$basename/$basename.css";
-    }
+    print STDERR "url: $url\n";
-    
-    my $blog = MT->model('blog')->load($blog_id)    
@@ -267 +269 @@
-    my $footer = '/* end StyleCatcher imports */';
-    my $styles = $header . "\n";
-File::Spec->catfile
+caturl
-    $styles .= "\@import url($url);\n";
-    $styles .= $footer;
-    print STDERR "styles=$styles\n";
-
-    if ($template_text =~ s/\Q$header\E.*\Q$footer\E/$styles/s) {
@@ -426 +427 @@
-    my $data    = {};
-
-
+  
-    # Pick up the file (html with <link>s or a css file with metadata)
-    my $user_agent = $app->new_ua;
@@ -593 +594 @@
-        return unless $stylesheet;
-
-
+        
-        $theme = $url;
-        # discard any generic 'screen.css' filename
@@ -602 +603 @@
-            $new_url .= $url[$_] . '/';
-        }
+        # note: this stripped off the css file and left a path only
-    }
-    else {
@@ -651 +653 @@
-    # Trim me white space, yarr
-    for (@comments) {
-
-        # TBD: strip any "risky" content; we don't want any
-        # XSS in this content.
@@ -663 +664 @@
-    }
-
+#    for my $line (@comments) {
+#        # TBD: strip any "risky" content; we don't want any
+#        # XSS in this content.
+#        # Strip any null bytes
+#        $line =~ tr/\x00//d;
+#        $line =~ s/^\s+|\s+$//g;
+#       if ($line =~ m{ \A (\w+) : \s* (.*) \z }xmsg) {
+#           my ( $key, $value ) = ($1, $2);
+#           print STDERR "$key => $value\n";# if (lc $key eq 'theme name' || lc $key eq 'name');
+#           next if !$value;
+#           $metadata{ lc $key } = $value;
+#       }
+#    }
+
-    my $thumbnail_link;
-    $thumbnail_link = $new_url . 'thumbnail.gif';
@@ -669 +684 @@
-
-    require MT::Util;
+    my $name = delete $metadata{'name'} || delete $metadata{'theme name'};
+    print STDERR "name = $name\n";
-    my $data = {
-
-
-
+
+
+
+
-        url         => $url,
-        imageSmall  => $thumbnail_link,
-        imageBig    => $thumbnail_large_link,
-$metadata{designer} || $metadata{author
-$metadata{designer_url} || $metadata{author_url
-        author_affiliation => $metadata{author_affiliation
-        layouts            => $metadata{layouts
-metadata{name}
+delete $metadata{'designer'} || delete $metadata{'author'
+delete $metadata{'designer_url'} || delete $metadata{'author_url'} || delete $metadata{'author uri'
+#        author_affiliation => $metadata{'author_affiliation'
+#        layouts            => $metadata{'layouts'
+name
-        tags               => $tags,
-        blogs              => [],
-    };
+    for my $field (qw( author_affiliation layouts description )) {
+        $data->{$field} = delete $metadata{$field} || '';
+    }
+    # Toss in all the other metadata too.
+    @$data{keys %metadata} = values %metadata;
+    require Data::Dumper;
+    MT->log('YAY THEME DATA: ' . Data::Dumper::Dumper($data));
-    $data;
-}