Changeset 817

Timestamp:

07/09/08 20:20:27 (17 months ago)

Author:

breese

Message:

bringing the version of StyleCatcher? in the mtplugins repos up to date with what (will) ships with Movable Type 4.2

Location:

trunk/StyleCatcher

Files:

• mt-static/plugins/StyleCatcher/templates.css (modified) (10 diffs)
• plugins/StyleCatcher/lib/StyleCatcher/CMS.pm (added)
• plugins/StyleCatcher/lib/StyleCatcher/L10N.pm (modified) (1 diff)
• plugins/StyleCatcher/lib/StyleCatcher/L10N/de.pm (added)
• plugins/StyleCatcher/lib/StyleCatcher/L10N/en_us.pm (modified) (1 diff)
• plugins/StyleCatcher/lib/StyleCatcher/L10N/es.pm (added)
• plugins/StyleCatcher/lib/StyleCatcher/L10N/fr.pm (added)
• plugins/StyleCatcher/lib/StyleCatcher/L10N/ja.pm (modified) (2 diffs)
• plugins/StyleCatcher/lib/StyleCatcher/L10N/nl.pm (added)
• plugins/StyleCatcher/stylecatcher.pl (modified) (2 diffs)
• plugins/StyleCatcher/tmpl/view.tmpl (modified) (1 diff)

trunk/StyleCatcher/mt-static/plugins/StyleCatcher/templates.css

@@ -1 +1 @@
 td, input
 {
-        font-family: verdana, "lucida grande", geneva, arial, helvetica, sans-serif;
-        font-size: 11px;
-        font-weight: normal;
+    font-family: verdana, "lucida grande", geneva, arial, helvetica, sans-serif;
+    font-size: 11px;
+    font-weight: normal;
 }
 hr
 {
-        display: block;
-        line-height: 0;
-        height: 1px;
-        margin: 4px 0;
-        border: 0;
-        border-bottom: 1px #ccc solid;
-        padding: 0;
+    display: block;
+    line-height: 0;
+    height: 1px;
+    margin: 4px 0;
+    border: 0;
+    border-bottom: 1px #ccc solid;
+    padding: 0;
 }
 
 img
 {
-        border: 0;
+    border: 0;
 }
 
 .anchored
 {
-        position: relative;
-        top: 0;
-        left: 0;
-        width: 100%;
+    position: relative;
+    top: 0;
+    left: 0;
+    width: 100%;
 }
 
 .left
 {
-        float: left;
+    float: left;
 }
 
 .right
 {
-        float: right;
+    float: right;
 }
 
@@ -49 +49 @@
 .clr
 {
-        width: 0;
-        height: 0;
-        line-height: 0;
-        clear: both;
+    width: 0;
+    height: 0;
+    line-height: 0;
+    clear: both;
 }
 
@@ -84 +84 @@
 
 .inputs p {
-   line-height: 2.1em;
+   line-height: 2.1;
 }
 
@@ -115 +115 @@
 .tc-mixer-entry
 {
-        display: block;
-        float: left;
-        margin: 0;
-        border: 0;
-        padding: 8px;
-        height: 120px;
-        overflow: clip;
-        cursor: pointer;
-        -moz-border-radius: 8px;
+    display: block;
+    float: left;
+    margin: 0;
+    border: 0;
+    padding: 8px;
+    height: 120px;
+    overflow: clip;
+    cursor: pointer;
+    -moz-border-radius: 8px;
 }
 
 .tc-mixer-entry img
 {
-        width: 120px;
-        height: 90px;
-        border: 1px #999 solid;
-        margin: 0 0 2px 0;
+    width: 120px;
+    height: 90px;
+    border: 1px #999 solid;
+    margin: 0 0 2px 0;
 }
 
@@ -150 +150 @@
 #categories hr
 {
-        margin: 4px;
-        position: relative;
-        clear: both;
+    margin: 4px;
+    position: relative;
+    clear: both;
 }
 
 .hr
 {
-        display: block;
-        position: relative;
-        height: 0;
-        margin: 4px;
-        border-bottom: 1px solid #ccc;
-        padding: 0;
-        line-height: 0;
+    display: block;
+    position: relative;
+    height: 0;
+    margin: 4px;
+    border-bottom: 1px solid #ccc;
+    padding: 0;
+    line-height: 0;
 }
 
 .category
 {
-        display: block;
-        position: relative;
-        clear: both;
-        margin: 0;
-        border: 0;
-        padding: 4px;
-        cursor: pointer;
-        -moz-border-radius: 8px;
+    display: block;
+    position: relative;
+    clear: both;
+    margin: 0;
+    border: 0;
+    padding: 4px;
+    cursor: pointer;
+    -moz-border-radius: 8px;
 }
 
@@ -184 +184 @@
 .display-mini
 {
-        display: block;
-        position: relative;
-        left: 22px;
-        width: 104px;
-        margin: 0;
-        border: 0;
-        padding: 0;
-        line-height: 0;
+    display: block;
+    position: relative;
+    left: 22px;
+    width: 400px;
+    margin: 0;
+    border: 0;
+    padding: 0;
+    line-height: 0;
 }
 
 html>body .display-mini
 {
-        float: none;
-        clear: none;
+    float: none;
+    clear: none;
 }
 
 .display-mini .tc-mixer-entry
 {
-        display: inline;
-        float: none;
-        margin: 0 3px 0 0;
-        border: 0;
-        padding: 0;
-        height: auto;
-        overflow: clip;
-        cursor: pointer;
-        -moz-border-radius: 0;
+    display: inline;
+    float: none;
+    margin: 0 3px 0 0;
+    border: 0;
+    padding: 0;
+    height: auto;
+    overflow: clip;
+    cursor: pointer;
+    -moz-border-radius: 0;
 }
 
 .display-mini .tc-mixer-selected
 {
-        background: transparent;
+    background: transparent;
 }
 
 .display-mini img
 {
-        width: auto;
-        height: 12px;
-        margin: 0;
-        border: 0;
-        padding: 0;
+    width: auto;
+    height: 12px;
+    margin: 0;
+    border: 0;
+    padding: 0;
 }
 
 .display-mini .title .content
 {
-        display: none;
+    display: none;
 }
 
@@ -239 +239 @@
 h2
 {
-        font-size: 1em;
-        font-weight: bold;
-        margin: 0 0 4px 0;
-        padding: 0;
-        border: 0;
+    font-size: 1em;
+    font-weight: bold;
+    margin: 0 0 4px 0;
+    padding: 0;
+    border: 0;
 }
 
@@ -249 +249 @@
 #hide-details
 {
-        position: absolute;
-        right: 0;
-        top: 0;
-        font-size: 11px;
+    position: absolute;
+    right: 0;
+    top: 0;
+    font-size: 11px;
 }
 
@@ -268 +268 @@
 #wrapper
 {
-        width: 720px;
-        margin: 8px 0px;
+    width: 920px;
+    margin: 8px 0px;
 }
 
 #template-picker
 {
-        position: relative;
-        top: 8px;
-        left: 0;
-        width: 720px;
-        height: 450px;
+    position: relative;
+    top: 8px;
+    left: 0;
+    width: 720px;
+    height: 450px;
 }
 
 #categories-wrapper
 {
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 160px;
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 150px;
 }
 
 #templates-wrapper
 {
-        position: absolute;
-        left: 172px;
-        top: 0;
-}
-
-.templates-wrapper-wide { width: 575px; }
-.templates-wrapper-narrow { width: 180px; }
+    position: absolute;
+    left: 161px;
+    top: 0;
+    width: 440px;
+    height: 450px;
+}
 
 #details-wrapper
 {
-        position: absolute;
-        left: 364px;
-        top: 0;
-        width: 356px;
+    position: absolute;
+    left: 600px;
+    top: 0;
+    width: 300px;
 }
 
 .scrollbox
 {
-        display: block;
-        position: relative;
-        top: 0;
-        left: 0;
-        width: auto;
-        height: 410px;
-        overflow: auto;
-        margin: 0;
-        border: 1px #999 solid;
-        padding: 4px;
+    display: block;
+    position: relative;
+    top: 0;
+    left: 0;
+    width: auto;
+    height: 410px;
+    overflow: auto;
+    margin: 0;
+    border: 1px #999 solid;
+    padding: 4px;
 }
 
 #display-details
 {
-        position: relative;
-        left: 0;
-        top: 0;
-        height: 354px;
-        width: auto;
-        overflow: clip;
-        border: 1px #999 solid;
-        background-color: #eee;
-        padding: 32px 24px;
+    position: relative;
+    left: 0;
+    top: 0;
+    height: 398px;
+    width: auto;
+    overflow: clip;
+    border: 1px #999 solid;
+    background-color: #eee;
+    padding: 10px 10px;
+}
+
+#select-design-controls {
+    position: absolute;
+    width: 280px;
+    top: auto;
+    bottom: 10px;
+    margin-right: 10px;
+}
+
+.actions-bar .button-actions {
+    float: right;
 }
 
 #display-details .tc-mixer-entry
 {
-        display: block;
-        float: none;
-        margin: 0;
-        border: 0;
-        padding: 0;
-        height: auto;
-        overflow: display;
+    display: block;
+    float: none;
+    margin: 0;
+    border: 0;
+    padding: 0;
+    height: auto;
+    overflow: display;
 }
 
 #display-details .tc-mixer-selected
 {
-        background: transparent;
+    background: transparent;
 }
 
@@ -364 +375 @@
 #display-details .tags .content { display: inline; height: auto; word-spacing: 0.5em; }*/
 
-#display-details  img { width: 99%; height: auto; margin: 0 0 4px 0; }
+#display-details  img {
+    width: 278px;
+    height: 209px;
+    margin: 0 0 4px 0;
+}

trunk/StyleCatcher/plugins/StyleCatcher/lib/StyleCatcher/L10N.pm

@@ -1 @@
-# Copyright 2001-2006 Six Apart. This code cannot be redistributed without
-# permission from www.sixapart.com.  For more information, consult your
-# Movable Type license.
+# Movable Type (r) Open Source (C) 2005-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
 #
-# $Id: L10N.pm 29367 2006-05-20 04:42:10Z bchoate $
+# $Id: L10N.pm 1174 2008-01-08 21:02:50Z bchoate $
 
 package StyleCatcher::L10N;

trunk/StyleCatcher/plugins/StyleCatcher/lib/StyleCatcher/L10N/en_us.pm

@@ +1 @@
+# Movable Type (r) Open Source (C) 2005-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
+#
+# $Id: en_us.pm 1174 2008-01-08 21:02:50Z bchoate $
+
 package StyleCatcher::L10N::en_us;
 

trunk/StyleCatcher/plugins/StyleCatcher/lib/StyleCatcher/L10N/ja.pm

@@ +1 @@
+# Movable Type (r) Open Source (C) 2005-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
+#
+# $Id: ja.pm 2003 2008-04-21 10:34:46Z fumiakiy $
+
 package StyleCatcher::L10N::ja;
 
@@ -8 +14 @@
 
 %Lexicon = (
-    'Applying...' => '適甚䞭...',
-    'Apply Selected Design' => 'デザむンを適甚',
-    'Before using StyleCatcher, you must specify the Theme Root URL and Path for the installation in the system-level plugin settings for StyleCatcher.' => 'StyleCatcherを利甚するには、システムメニュヌのStyleCatcherプラグむンの蚭定で、ルヌトURLずルヌトパスを指定するå¿
+
+## plugins/StyleCatcher/tmpl/view.tmpl
+        'Select a Style' => 'スタむルを遞択',
+        '3-Columns, Wide, Thin, Thin' => '3カラム、倧・小・小',
+        '3-Columns, Thin, Wide, Thin' => '3カラム、小・倧・小',
+        '2-Columns, Thin, Wide' => '2カラム、小・倧',
+        '2-Columns, Wide, Thin' => '2カラム、倧・小',
+        '2-Columns, Wide, Medium' => '2カラム、倧・䞭',
+        '2-Columns, Medium, Wide' => '2カラム、䞭・倧', # Translate - New
+        'None available' => '芋぀かりたせん',
+        'Applying...' => '適甚䞭...',
+        'Apply Design' => 'デザむンを適甚',
+        'Error applying theme: ' => 'テヌマを適甚䞭に゚ラヌが発生したした。',
+        'The selected theme has been applied, but as you have changed the layout, you will need to republish your blog to apply the new layout.' => 'テヌマを適甚したした。レむアりトも倉曎されたので、再構築するå¿
 芁がありたす。',
-    'Choose this Design' => 'このデザむンを遞択',
-    'click here.' => 'ここをクリックしおください。',
-    'Configure plugin' => 'プラグむンの構成',
-    "Could not create [_1] folder - Check that your 'themes' folder is webserver-writable." => '[_1] ディレクトリを䜜成できたせんでした。Webサヌバヌからテヌマのディレクトリに曞き蟌みができるかどうか確認しおください。',
-    'Current Theme' => '珟圚のテヌマ',
-    'Current theme for your weblog' => 'ブログの珟圚のテヌマ',
-    'Current Themes' => '珟圚のテヌマ',
-    'Current themes for your weblogs' => 'ブログの珟圚のテヌマ',
-    'Error loading themes! -- [_1]' => 'テヌマをロヌドできたせんでした: [_1]',
-    'Find Style' => 'スタむル怜玢',
-    'Find Styles' => 'スタむル怜玢',
-    'Hide Details' => 'è©³çŽ°ã‚’éš ã™',
-    "Install <a href='http://greasemonkey.mozdev.org/'>GreaseMonkey</a>" => "<a href='http://greasemonkey.mozdev.org/'>GreaseMonkey</a>で",
-    "StyleCatcher user script." => "StyleCatcherのナヌザヌスクリプトを利甚する",
-    "It will take a moment for themes to populate once you click 'Find Style'." => 'スタむル怜玢をクリックするず、テヌマを取り蟌みたす少し時間がかかりたす。',
-    'Loading...' => 'ロヌド䞭...',
-    'Locally saved themes' => 'ロヌカルに保存されたテヌマ',
-    'More Themes' => 'その他のテヌマ',
-    'Movable Type styles' => 'Movable Type スタむル',
-    'NOTE:' => '泚:',
-    ' page.' => 'ペヌゞ',
-    'Please click on a theme before attempting to apply a new design to your blog.' => 'ブログに適甚するテヌマをクリックしお遞択しおください。',
-    'Please select a weblog to apply this theme.' => 'テヌマを適甚するブログを遞択しおください。',
-    'Saved Themes' => '保存枈みテヌマ',
-    'Select a Design using StyleCatcher' => 'StyleCatcherでデザむンを遞ぶ',
-    'Select a Weblog...' => 'ブログを遞択',
-    'Show Details' => '詳现衚瀺',
-    'Single themes from the web' => 'その他のテヌマ',
-    "StyleCatcher lets you easily browse through styles and then apply them to your blog in just a few clicks. To find out more about Movable Type styles, or for new sources for styles, visit the <a href='http://www.sixapart.com/movabletype/styles'>Movable Type styles</a> page." => "StyleCatcherを䜿うず、ほんの数回クリックするだけでスタむルを探しおブログに適甚するこずができたす。Movable Typeのスタむルに぀いおの詳现やスタむルのé
+        'The selected theme has been applied!' => 'テヌマを適甚したした。',
+        'Error loading themes! -- [_1]' => 'テヌマの読み蟌みで゚ラヌが発生したした! -- [_1]',
+        'Stylesheet or Repository URL' => 'スタむルシヌトたたはリポゞトリのURL',
+        'Stylesheet or Repository URL:' => 'スタむルシヌトたたはリポゞトリのURL:',
+        'Download Styles' => 'スタむルをダりンロヌド',
+        'Current theme for your weblog' => '適甚されおいるテヌマ',
+        'Current Style' => '珟圚のスタむル',
+        'Locally saved themes' => '保存されおいるテヌマ',
+        'Saved Styles' => '保存されおいるスタむル',
+        'Default Styles' => '既定のスタむル',
+        'Single themes from the web' => 'その他のテヌマ',
+        'More Styles' => 'その他のスタむル',
+        'Selected Design' => '遞択されたデザむン',
+        'Layout' => 'レむアりト',
+
+## plugins/StyleCatcher/lib/StyleCatcher/CMS.pm
+        'Your mt-static directory could not be found. Please configure \'StaticFilePath\' to continue.' => 'mt-staticディレクトリが芋぀かりたせんでした。StaticFilePathを蚭定しおください。',
+        'Could not create [_1] folder - Check that your \'themes\' folder is webserver-writable.' => '[_1] フォルダが䜜成できたせん。\'themes\' フォルダが曞き蟌み可胜か確認しおください。',
+        'Error downloading image: [_1]' => '画像をダりンロヌドできたせんでした: [_1]',
+        'Successfully applied new theme selection.' => '新しいテヌマを適甚したした。',
+        'Invalid URL: [_1]' => 'URLが䞍正です: [_1]',
+
+## plugins/StyleCatcher/stylecatcher.pl
+        'StyleCatcher lets you easily browse through styles and then apply them to your blog in just a few clicks. To find out more about Movable Type styles, or for new sources for styles, visit the <a href=\'http://www.sixapart.com/movabletype/styles\'>Movable Type styles</a> page.' => 'StyleCatcherを䜿うず、ほんの数回クリックするだけでスタむルを探しおブログに適甚するこずができたす。Movable Typeのスタむルに぀いおの詳现やスタむルのé
 åžƒå
-ƒã«ã€ã„おは、<a href='http://www.sixapart.com/movabletype/styles'>Movable Type styles</a>のペヌゞ英語ぞアクセスしおください。",
-    'StyleCatcher must first be configured system-wide before it can be used.' => 'StyleCatcherを利甚するには、たずシステムレベルで蚭定を行うå¿
-芁がありたす。',
-    'Style Library URL:' => 'Style LibraryぞのURL:',
-    'Successfully applied new theme selection.' => '新しいテヌマを適甚したした。',
-    'Theme or Repository URL:' => 'テヌマ/リポゞトリぞのURL:',
-    'Theme Root Path:' => 'テヌマのルヌトパス:',
-    'Theme Root URL:' => 'テヌマのルヌトURL:',
-    'The paths defined here must physically exist and be writable by the webserver.' => 'このパスは物理的に存圚しか぀Webサヌバヌから曞き蟌み可胜でなければなりたせん。',
-    ' To change the location of your local theme repository, ' => ' ãƒ†ãƒŒãƒžãƒªãƒã‚žãƒˆãƒªã®å Žæ‰€ã‚’å€‰ãˆã‚‹ã«ã¯ ',
-    'Unable to create the theme root directory. Error: [_1]' => 'テヌマのルヌトディレクトリを䜜成できたせんでした: [_1]',
-    'Unable to write base-weblog.css to themeroot. File Manager gave the error: [_1]. Are you sure your theme root directory is web-server writable?' => 'base-weblog.cssをテヌマのルヌトに曞き蟌めたせんでした: [_1]。Webサヌバヌからテヌマのルヌトディレクトリに曞き蟌みができるかどうか確認しおください。',
-    q{You don't appear to have any weblogs with a 'styles-site.css' template that you have rights to edit. Please check your weblog(s) for this template.} => 'styles-site.cssテンプレヌトを利甚しおいるブログがありたせん。このテンプレヌトをブログで確認しおください。',
-    q{You must define a global theme repository where themes can be stored locally.  If a particular blog has not been configured for it's own theme paths, it will use these settings. If a blog has it's own theme paths, then the theme will be copied to that location when applied to that weblog.} => 'ãƒ†ãƒŒãƒžã‚’ä¿å­˜ã™ã‚‹ãŸã‚ã®ã‚°ãƒ­ãƒŒãƒãƒ«ãƒ†ãƒŒãƒžãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’æŒ‡å®šã—ãŠãã ã•ã„ã€‚ãƒ–ãƒ­ã‚°ã”ãšã®èš­å®šã§äžŠæ›žãã—ãªã„é™ã‚Šã€ã“ã“ã§ã®èš­å®šãŒåˆ©ç”šã•ã‚ŒãŸã™ã€‚ãƒ–ãƒ­ã‚°ã®èš­å®šã§äžŠæ›žãã—ãŸå Žåˆã€ãƒ†ãƒŒãƒžã¯ãƒ–ãƒ­ã‚°ã«é©ç”šã•ã‚ŒãŸãšãã«ãã®å Žæ‰€ãžã‚³ãƒ”ãƒŒã•ã‚ŒãŸã™ã€‚',
-    q{Your theme URL and path can be customized for this weblog.} => 'このブログ甚にテヌマのURLずパスをカスタマむズできたす。', 
-    "<p>You must define a global theme repository where themes can be stored locally.  If a particular blog has not been configured for it's own theme paths, it will use these settings directly. If a blog has it's own theme paths, then the theme will be copied to that location when applied to that weblog. The paths defined here must physically exist and be writable by the webserver.</p>" => '<p>ãƒ†ãƒŒãƒžã‚’ä¿å­˜ã™ã‚‹ãŸã‚ã®ã‚°ãƒ­ãƒŒãƒãƒ«ãƒ†ãƒŒãƒžãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’æŒ‡å®šã—ãŠãã ã•ã„ã€‚ãƒ–ãƒ­ã‚°ã”ãšã®èš­å®šã§äžŠæ›žãã—ãªã„é™ã‚Šã€ã“ã“ã§ã®èš­å®šãŒåˆ©ç”šã•ã‚ŒãŸã™ã€‚ãƒ–ãƒ­ã‚°ã®èš­å®šã§äžŠæ›žãã—ãŸå Žåˆã€ãƒ†ãƒŒãƒžã¯ãƒ–ãƒ­ã‚°ã«é©ç”šã•ã‚ŒãŸãšãã«ãã®å Žæ‰€ãžã‚³ãƒ”ãƒŒã•ã‚ŒãŸã™ã€‚ã“ã®ãƒ‘ã‚¹ã¯ç‰©ç†çš„ã«å­˜åœšã—ã‹ã€Webサヌバヌから曞き蟌み可胜でなければなりたせん。</p>',
-    '<p style="color: #f00;"><strong>NOTE:</strong> StyleCatcher must first be configured from the system-level plugins listing before it can be used on any blog.</p>' => '<p style="color: #f00;"><strong>泚意</strong>StyleCatcherを利甚するには、たずシステムレベルで蚭定を行うå¿
-芁がありたす。',
-    "<p>If you wish to store your themes locally for this blog, you can configure your theme URL and path below.  Although downloaded themes will still be stored in the system-level directory, they will be copied to this directory when they are applied. The paths defined here must physically exist and be writable by the webserver.</p>" => '<p>ãƒ†ãƒŒãƒžã®ãƒ•ã‚¡ã‚€ãƒ«ã‚’ãƒ–ãƒ­ã‚°ã”ãšã«ä¿å­˜ã—ãŸã„å Žåˆã¯ã€ãƒ†ãƒŒãƒžã®URLずパスを以䞋に蚭定しおください。ダりンロヌドされたテヌマはシステムレベルで蚭定したディレクリに保存されたすが、ブログに適甚すればここで指定したディレクトリにもコピヌされたす。このパスは物理的に存圚しか぀Webサヌバヌから曞き蟌み可胜でなければなりたせん。</p>',
-
-
+ƒã«ã€ã„おは、<a href=\'http://www.sixapart.com/movabletype/styles\'>Movable Type styles</a>のペヌゞ英語ぞアクセスしおください。',
+        'MT 4 Style Library' => 'MT 4 スタむルラむブラリ',
+        'A collection of styles compatible with Movable Type 4 default templates.' => 'Movable Type 4のデフォルトテンプレヌトず互換性のあるスタむルです。',
+        'MT 3 Style Library' => 'MT 3 スタむルラむブラリ',
+        'A collection of styles compatible with Movable Type 3.3+ default templates.' => 'Movable Type 3.3xのデフォルトテンプレヌトず互換性のあるスタむルです。',
+        'Styles' => 'スタむル',
 );
 

trunk/StyleCatcher/plugins/StyleCatcher/stylecatcher.pl

@@ -1 @@
-# Copyright 2005-2006 Six Apart. This code cannot be redistributed without
-# permission from www.sixapart.com.
+# Movable Type (r) Open Source (C) 2005-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
 #
-# $Id: stylecatcher.pl 32007 2006-06-22 01:11:47Z jallen $
+# $Id: stylecatcher.pl 1568 2008-03-25 00:48:27Z bsmith $
 
 package MT::Plugin::StyleCatcher;
@@ -8 +9 @@
 use strict;
 use base 'MT::Plugin';
-use vars qw($VERSION);
-$VERSION = '1.1-dev';
+our $VERSION = '2.0';
 
 my $plugin;
 $plugin = MT::Plugin::StyleCatcher->new({
+    id => 'StyleCatcher',
     name => "StyleCatcher",
     version => $VERSION,
     doc_link => "http://www.sixapart.com/movabletype/styles/",
-    description => "<MT_TRANS phrase=\"StyleCatcher lets you easily browse through styles and then apply them to your blog in just a few clicks. To find out more about Movable Type styles, or for new sources for styles, visit the <a href='http://www.sixapart.com/movabletype/styles'>Movable Type styles</a> page.\">",
-    config_link => "stylecatcher.cgi",
-    author_name => "Nick O'Neil, Brad Choate",
-    author_link => "http://www.authenticgeek.net/",
+    description => q(<MT_TRANS phrase="StyleCatcher lets you easily browse through styles and then apply them to your blog in just a few clicks. To find out more about Movable Type styles, or for new sources for styles, visit the <a href='http://www.sixapart.com/movabletype/styles'>Movable Type styles</a> page.">),
+    author_name => "Six Apart, Ltd.",
+    author_link => "http://www.sixapart.com/",
     l10n_class => 'StyleCatcher::L10N',
-    config_template => \&configuration_template,
-    settings => new MT::PluginSettings([
-        ['webthemeroot'],
-        ['themeroot'],
-        ['stylelibrary'],
-    ]),
+    registry => {
+        stylecatcher_libraries => {
+            'sixapart_mt4' => {
+                url => 'http://www.sixapart.com/movabletype/styles/mt4/library',
+                label => 'MT 4 Style Library',
+                description_label => "A collection of styles compatible with Movable Type 4 default templates.",
+                order => 1,
+            },
+            # 'sixapart_mt3' => {
+            #     url => 'http://www.sixapart.com/movabletype/styles/mt3/library',
+            #     label => 'MT 3 Style Library',
+            #     description_label => "A collection of styles compatible with Movable Type 3.3+ default templates.",
+            #     order => 1000,
+            # },
+        },
+        applications => {
+            cms => {
+                methods => {
+                    stylecatcher_theme => '$StyleCatcher::StyleCatcher::CMS::view',
+                    stylecatcher_js => '$StyleCatcher::StyleCatcher::CMS::js',
+                    stylecatcher_apply => '$StyleCatcher::StyleCatcher::CMS::apply',
+                },
+                menus => {
+                    'design:theme' => {
+                        label => 'Styles',
+                        order => 300,
+                        mode => 'stylecatcher_theme',
+                        view => "blog",
+                        permission => 'edit_templates',
+                    },
+                },
+            },
+        },
+    },
 });
 MT->add_plugin($plugin);
-MT->add_plugin_action('list_template', 'stylecatcher.cgi', 'Select a Design using StyleCatcher');
-MT->add_plugin_action('blog','stylecatcher.cgi?', "Select a Design using StyleCatcher");
 
 sub instance { $plugin }
 
-sub configuration_template {
-    my $plugin = shift;
-    my ($param, $scope) = @_;
-
-    my $intro;
-    if ($scope eq 'system') {
-        if (!$param->{webthemeroot}) {
-            $param->{webthemeroot} = MT->instance->static_path;
-            $param->{webthemeroot} =~ s!/$!!;
-            $param->{webthemeroot} .= '/themes/';
-        }
-        $param->{themeroot} ||= File::Spec->catdir(MT->instance->mt_dir, 'mt-static', 'themes');
-        $param->{stylelibrary} ||= $StyleCatcher::DEFAULT_STYLE_LIBRARY;
-        $intro = q{<MT_TRANS phrase="<p>You must define a global theme repository where themes can be stored locally.  If a particular blog has not been configured for it's own theme paths, it will use these settings directly. If a blog has it's own theme paths, then the theme will be copied to that location when applied to that weblog. The paths defined here must physically exist and be writable by the webserver.</p>">};
-    } else {
-
-        my $system_plugin_config = $plugin->get_config_hash();
-        unless ($system_plugin_config && $system_plugin_config->{webthemeroot} && $system_plugin_config->{themeroot}) {
-            return q{<MT_TRANS phrase="<p style="color: #f00;"><strong>NOTE:</strong> StyleCatcher must first be configured from the system-level plugins listing before it can be used on any blog.</p>">};    
-          }
-            
-        if (my $blog = MT->instance->blog) {
-            if (!$param->{webthemeroot}) {
-                my $url = $blog->site_url;
-                $url =~ s!/$!!;
-                $url .= '/themes/';
-                $param->{webthemeroot} = $url;
-            }
-            if (!$param->{themeroot}) {
-                my $path = $blog->site_path;
-                $path = File::Spec->catdir($path, 'themes');
-                $param->{themeroot} = $path;
-            }
-        }
-        $intro = q{<MT_TRANS phrase="<p>If you wish to store your themes locally for this blog, you can configure your theme URL and path below.  Although downloaded themes will still be stored in the system-level directory, they will be copied to this directory when they are applied. The paths defined here must physically exist and be writable by the webserver.</p>">};
-
-    }
-
-    return qq{
-$intro
-
-<div class="setting">
-<div class="label"><label for="stycat_webthemeroot"><MT_TRANS phrase="Theme Root URL:"></label></div>
-<div class="field">
-<input type="text" name="webthemeroot" id="stycat_webthemeroot" value="<TMPL_VAR NAME=WEBTHEMEROOT ESCAPE=HTML>" style="width: 95%" />
-</div>
-</div>
-
-<div class="setting">
-<div class="label"><label for="stycat_themeroot"><MT_TRANS phrase="Theme Root Path:"></label></div>
-<div class="field">
-<input type="text" name="themeroot" id="stycat_themeroot" value="<TMPL_VAR NAME=THEMEROOT ESCAPE=HTML>" style="width: 95%" />
-</div>
-</div>
-
-<div class="setting">
-<div class="label"><label for="stycat_stylelibrary"><MT_TRANS phrase="Style Library URL:"></label></div>
-<div class="field">
-<input type="text" name="stylelibrary" id="stycat_stylelibrary" value="<TMPL_VAR NAME=STYLELIBRARY ESCAPE=HTML>" style="width: 95%" />
-</div>
-</div>
-    };
-}
-
-sub save_config {
-    my $plugin = shift;
-    my ($param, $scope) = @_;
-    my $themeroot = $param->{themeroot};
-    return 1 unless $themeroot;
-
-    my $app = MT->instance;
-
-    require MT::FileMgr;
-    my $filemgr = MT::FileMgr->new('Local')
-        or return $app->error(MT::FileMgr->errstr);
-
-    my $base_weblog_path = File::Spec->catfile($plugin->{full_path},
-                                               "base-weblog.css");
-    my $base_weblog = $filemgr->get_data($base_weblog_path);
-    $filemgr->mkpath($param->{themeroot})
-        or die $plugin->translate("Unable to create the theme root directory. Error: [_1]", $filemgr->errstr);
-
-    defined($filemgr->put_data($base_weblog,
-        File::Spec->catfile($param->{themeroot}, "base-weblog.css")))
-        or die $plugin->translate("Unable to write base-weblog.css to themeroot. File Manager gave the error: [_1]. Are you sure your theme root directory is web-server writable?", $filemgr->errstr);
-
-    return $plugin->SUPER::save_config(@_);
-}
-
 1;

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

@@ -1 @@
-<TMPL_INCLUDE NAME="header.tmpl">
+<mt:setvarblock name="page_title"><__trans phrase="Select a Style"></mt:setvarblock>
+<mt:setvarblock name="html_head" append="1">
+<!-- stylecatcher -->
+<link rel="stylesheet" type="text/css" title="Default Layout" href="<mt:var name="plugin_static_uri">templates.css" />
+
+<script type="text/javascript" src="<mt:var name="static_uri">js/tc/mixer.js"></script>
+<script type="text/javascript" src="<mt:var name="static_uri">js/tc/mixer/tagmatch.js"></script>
+<script type="text/javascript" src="<mt:var name="static_uri">js/tc/mixer/display.js"></script>
+<script type="text/javascript" src="<mt:var name="static_uri">js/tc/client.js"></script>
 
 <!-- javascripts for this page -->
 
-        <script type="text/javascript">
-            var repoImg = "<TMPL_VAR NAME=PLUGIN_STATIC_URI>images/mixed-media.gif";
-            var selected;
-            var selected_blog_id;
-            var mixer;          
-            var matchCategory = /^category-/;
-            var categories = [];
-            var firstCategoryId;
-            var repo_urls = {};
-            var repos = [];
-
-            TC.attachLoadEvent( init );
-
-            function init() {
-                initMixer();
-                showDetails( false );
-
-<TMPL_IF NAME=THEMES_JSON>
-                var data = <TMPL_VAR NAME=THEMES_JSON>;
-                if (data.categories) {
-                    for (var i = 0; i < data.categories.length; i++)
-                        enableCategory(data.categories[i]);
-                }
-</TMPL_IF>
-
-                initCategories();
-                chooseCategory( firstCategoryId );
-
-                if (data.themes)
-                    loadThemes(data.themes, 'local');
-
-                <TMPL_IF NAME=AUTO_FETCH>
-                getStyles();
-                </TMPL_IF>
-            }
-
-            function enableCategory(cat) {
-                mixer.addTagIndexDisplay('display-'+cat, 1000, 'collection:'+cat);
-                var el = document.getElementById('category-' + cat);
-                if (el)
-                    el.style.display = 'block';
-            }
-
-            function initMixer()
-            {
-                mixer = new TC.Mixer();
-                // initialize mixer object
-                mixer.addSelectedDisplay( "display-details" );
-            }
-
-            function initCategories()
-            {
-                var element = document.getElementById( "categories" );
-                if( !element )
-                    return;
-                
-                categories.length = 0;
-                var elements = element.childNodes;
-                for( var i = 0; i < elements.length; i++ )
-                {
-                    element = elements[ i ];
-                    var categoryId = element.id;
-                    if( !categoryId )
-                        continue;
-                    
-                    if( !firstCategoryId ) {
-                        if (element.style.display != 'none') {
-                            firstCategoryId = categoryId;
+<script type="text/javascript">
+/* <![CDATA[ */
+    var repoImg = "<mt:var name="plugin_static_uri">images/mixed-media.gif";
+    var selected;
+    var blog_id = '<mt:var name="blog_id" escape="js">';
+    var dynamic_blog = <mt:if name="dynamic_blog">true<mt:else>false</mt:if>;
+    var mixer;          
+    var matchCategory = /^category-/;
+    var categories = [];
+    var firstCategoryId;
+    var repo_urls = {};
+    var repos = [];
+    var libraries = <mt:var name="style_library" to_json="1">;
+    var current_theme = '<mt:var name="current_theme">';
+    var current_layout = '<mt:var name="current_layout">';
+    var layout_names = {
+        "layout-wtt": "<__trans phrase="3-Columns, Wide, Thin, Thin" escape="js">",
+        "layout-twt": "<__trans phrase="3-Columns, Thin, Wide, Thin" escape="js">",
+        "layout-tw": "<__trans phrase="2-Columns, Thin, Wide" escape="js">",
+        "layout-wt": "<__trans phrase="2-Columns, Wide, Thin" escape="js">",
+        "layout-wm": "<__trans phrase="2-Columns, Wide, Medium" escape="js">",
+        "layout-mw": "<__trans phrase="2-Columns, Medium, Wide" escape="js">"
+    };
+
+    TC.attachLoadEvent( init );
+
+    function init() {
+        initMixer();
+
+<mt:if name="themes_json">
+        var data = <mt:var name="themes_json">;
+        if (data.categories) {
+            for (var i = 0; i < data.categories.length; i++)
+                enableCategory(data.categories[i]);
+        }
+</mt:if>
+
+        initCategories();
+        chooseCategory( firstCategoryId );
+
+        if (data.themes) {
+            loadThemes(data.themes);
+            if (current_theme) {
+                mixer.name = current_theme;
+                selectDesign();
+            } else {
+                showDetails();
+            }
+        }
+
+        <mt:if name="auto_fetch">
+        getStyles();
+        </mt:if>
+    }
+
+    function enableCategory(cat) {
+        mixer.addTagIndexDisplay('display-'+cat, 1000, 'collection:'+cat);
+        var el = getByID('category-' + cat);
+        if (el)
+            el.style.display = 'block';
+    }
+
+    function initMixer() {
+        mixer = new TC.Mixer();
+        // initialize mixer object
+        mixer.addSelectedDisplay( "display-details-content" );
+        mixer.onselect = selectDesign;
+    }
+
+    function initCategories() {
+        var element = getByID( "categories" );
+        if( !element )
+            return;
+        
+        categories.length = 0;
+        var elements = element.childNodes;
+        for( var i = 0; i < elements.length; i++ )
+        {
+            element = elements[ i ];
+            var categoryId = element.id;
+            if( !categoryId )
+                continue;
+            
+            if( !firstCategoryId ) {
+                if (element.style.display != 'none') {
+                    firstCategoryId = categoryId;
+                }
+            }
+            
+            var displayId = categoryId.replace( matchCategory, "display-" );
+            var display = getByID( displayId );
+
+            element.onclick = chooseCategoryClosure( categoryId );
+            TC.removeClassName( element, "category-selected" );
+
+            categories[ categoryId ] = {
+                "element" : element,
+                "display" : display
+            };
+        }
+    }
+
+    function chooseCategoryClosure( categoryId ) {
+        var func = function() { return chooseCategory( categoryId ); };
+        return func;
+    }
+
+    function chooseCategory( categoryId ) {
+        var titleElement = getByID( "selected-category-title" );
+
+        for( var id in categories ) {
+            var element = categories[ id ].element;
+            if (!element) continue;
+            var display = categories[ id ].display;
+
+            if( id == categoryId ) {
+                var repo_match = element.id.match(/^category-repo-(.+)$/);
+                if (repo_match) {
+                    var repo_id = repo_match[1];
+                    var repo;
+                    for (var i = 0; i < libraries.length; i++) {
+                        if (libraries[i].key == repo_id) {
+                            repo = libraries[i];
+                            break;
                         }
                     }
-                    
-                    var displayId = categoryId.replace( matchCategory, "display-" );
-                    var display = document.getElementById( displayId );
-                    
-                    element.onclick = chooseCategoryClosure( categoryId );
-                    TC.removeClassName( element, "category-selected" );
-                    
-                    categories[ categoryId ] =
-                    {
-                        "element" : element,
-                        "display" : display
-                    };
-                }
-            }
-
-            function chooseCategoryClosure( categoryId )
-            {
-                var func = function() { return chooseCategory( categoryId ); };
-                return func;
-            }
-
-            function chooseCategory( categoryId )
-            {
-                var titleElement = document.getElementById( "selected-category-title" );
+                    if (repo.url && !repo.loaded) {
+                        getStyles(repo_id, repo.url);
+                    }
+                }
+                TC.addClassName( element, "category-selected" );
+                display.style.display = "block";
                 
-                for( var id in categories )
-                {
-                    var element = categories[ id ].element;
-                    var display = categories[ id ].display;
-
-                    if( id == categoryId )
-                    {
-                        TC.addClassName( element, "category-selected" );
-                        display.style.display = "block";
-                        
-                        if( titleElement )
-                            titleElement.innerHTML = trans(element.firstChild.nextSibling.innerHTML);
-                        if (element.title.match(/^https?:/)) {
-                            var url_element = getByID("repo-url");
-                            url_element.value = element.title;
+                if( titleElement )
+                    titleElement.innerHTML = trans(element.firstChild.nextSibling.innerHTML);
+            }
+            else {
+                TC.removeClassName( element, "category-selected" );
+                if (display) display.style.display = "none";
+            }
+        }
+
+        // select first theme in category
+        mixer.name = '';
+        var select_design = getByID("select-design-controls");
+        TC.addClassName(select_design, "hidden");
+        mixer.display();
+        mixer.remix();
+    }
+
+    function showDetails() {
+        mixer.remix();
+    }
+
+    function selectDesign() {
+        var apply_button = getByID("apply-button");
+        var layout_select = getByID("layout-list");
+
+        var layouts;
+        if (mixer.name && mixer.entries[mixer.name])
+            layouts = mixer.entries[mixer.name].layouts;
+        var layout_list;
+        if (layouts) layout_list = layouts.split(/\s*,\s*/);
+        if (layouts && layout_list && layout_list.length) {
+            layout_select.options.length = 0;
+            var selected_layout = 0;
+            for (var i = 0; i < layout_list.length; i++) {
+                var opt = new Option(layout_names[layout_list[i]] ? layout_names[layout_list[i]] : layout_list[i], layout_list[i]);
+                layout_select.options[layout_select.options.length] = opt;
+                if (layout_list[i] == current_layout) {
+                    selected_layout = i;
+                }
+            }
+            layout_select.selectedIndex = selected_layout;
+            layout_select.disabled = false;
+        } else {
+            layout_select.options.length = 0;
+            layout_select.options[0] = new Option("<__trans phrase="None available" escape="js">", "");
+            layout_select.disabled = true;
+        }
+        showDetails();
+        var select_design = getByID("select-design-controls");
+        TC.removeClassName(select_design, "hidden");
+        updateApplyButton();
+    }
+
+    function updateApplyButton() {
+        var apply_button = getByID("apply-button");
+        var layout_select = getByID("layout-list");
+        var new_layout;
+        if (layout_select && layout_select.selectedIndex != -1) {
+            new_layout = layout_select.options[layout_select.selectedIndex].value;
+        }
+        var current_entry = mixer.entries[mixer.name];
+        if ((mixer.name == current_theme) && ((!new_layout || !current_layout) || ((new_layout && current_layout) && (new_layout == current_layout)))) {
+            // same theme, same layout. don't allow apply design to be enabled
+            apply_button.disabled = true;
+            TC.addClassName(apply_button, "disabled-button");
+        } else {
+            apply_button.disabled = false;
+            TC.removeClassName(apply_button, "disabled-button");
+        }
+    }
+
+    function applyDesign() {
+        // disable apply button; change text to "Applying..."
+        var btn = getByID("apply-button");
+        var layout = getByID("layout-list");
+        if (layout && layout.selectedIndex != -1) {
+            layout = layout.options[layout.selectedIndex].value;
+        }
+
+        selected = mixer.name;
+        var url = mixer.entries[mixer.name].url;
+
+        TC.addClassName(btn, "disabled-button");
+        btn.disabled = true;
+        btn.value = "<__trans phrase="Applying..." escape="js">";
+
+        var args = {
+            '__mode': 'stylecatcher_apply',
+            'url': url,
+            'magic_token': '<mt:var name="magic_token">',
+            'blog_id': blog_id,
+            'name': mixer.name
+        };
+        if (layout)
+            args['layout'] = layout;
+        var client = TC.Client.call({
+            'load': designApplied,
+            'uri': '<mt:var name="script_url">',
+            'method': 'POST',
+            'arguments': args
+        });
+    }
+
+    function designApplied(client, result) {
+        var btn = getByID("apply-button");
+        btn.value = "<__trans phrase="Apply Design" escape="js">";
+
+        var res;
+        try {
+            res = eval('(' + result + ')');
+        } catch (e) {
+        }
+        if (res && res.error) {
+            showMsg("<__trans phrase="Error applying theme: " escape="js">" + res.error, "theme-applied", "error");
+            TC.removeClassName(btn, "disabled-button");
+            btn.disabled = false;
+            return;
+        }
+
+        var layout = getByID("layout-list");
+        var new_layout;
+        if (layout && layout.selectedIndex != -1) {
+            new_layout = layout.options[layout.selectedIndex].value;
+        }
+        var entry = mixer.entries[selected];
+        if (entry) {
+            // make this the new 'current' theme
+            var found = false;
+            for (var i = 0; i < entry.tags.length; i++) {
+                if (entry.tags[i] == 'collection:current')
+                    found = true;
+            }
+            if (!found)
+                entry.tags[entry.tags.length] = 'collection:current';
+            /* we need to add the blog id of the blog that was
+               applied to for this entry */
+
+            found = false;
+            if (entry.blogs && entry.blogs.length) {
+                for (var i = 0; i < entry.blogs.length; i++) {
+                    if (entry.blogs[i] == blog_id)
+                        found = true;
+                }
+            }
+            if (!found)
+                entry.blogs[entry.blogs.length] = blog_id;
+
+            /* loop through all the 'current' themes and strip
+               this blog id from any that don't match the
+               selected theme */
+            for (var i in mixer.entries) {
+                if (i == selected)
+                    continue;
+                for (var j = 0; j < mixer.entries[i].blogs.length; j++) {
+                    if (mixer.entries[i].blogs[j] == blog_id) {
+                        mixer.entries[i].blogs.splice(j,1);
+                        break;
+                    }
+                }
+                if (mixer.entries[i].blogs.length == 0) {
+                    // no longer 'current'
+                    for (var j = 0; j < mixer.entries[i].tags.length; j++) {
+                        if (mixer.entries[i].tags[j] == 'collection:current') {
+                            mixer.entries[i].tags.splice(j,1);
+                            break;
                         }
                     }
-                    else
-                    {
-                        TC.removeClassName( element, "category-selected" );
-                        display.style.display = "none";
-                    }
-                }
-                
-                mixer.display();
-            }
-
-            function showDetails( show )
-            {
-                var showElement = document.getElementById( "show-details" );
-                var hideElement = document.getElementById( "hide-details" );
-                var detailsElement = document.getElementById( "details-wrapper" );
-                var templatesElement = document.getElementById( "templates-wrapper" );
-                
-                if( show )
-                {
-                    showElement.style.display = "none";
-                    hideElement.style.display = "block";
-                    detailsElement.style.display = "block";
-                    TC.removeClassName( templatesElement, "templates-wrapper-wide" );
-                    TC.addClassName( templatesElement, "templates-wrapper-narrow" );
-                }
-                else
-                {
-                    showElement.style.display = "block";
-                    hideElement.style.display = "none";
-                    detailsElement.style.display = "none";
-                    TC.addClassName( templatesElement, "templates-wrapper-wide" );
-                    TC.removeClassName( templatesElement, "templates-wrapper-narrow" );
-                }
-                
-                return false;
-            }
-
-            function applyDesign() {
-                // disable apply button; change text to "Applying..."
-<TMPL_IF NAME=SINGLE_BLOG>
-                var blog_id = '<TMPL_VAR NAME=SINGLE_BLOG>';
-<TMPL_ELSE>
-                var sel = getByID("select-blog");
-                var blog_id = sel.options[sel.selectedIndex].value;
-                if (!blog_id) {
-                    alert("<MT_TRANS phrase="Please select a weblog to apply this theme.">");
-                    return;
-                }
-</TMPL_IF>
-                var btn = getByID("apply-button");
-                if (!btn) return;
-
-                selected = mixer.name;
-                if (!selected) {
-                    alert("<MT_TRANS phrase="Please click on a theme before attempting to apply a new design to your blog.">");
-                    return;
-                }
-                var url = mixer.entries[mixer.name].url;
-
-                btn.disabled = true;
-                btn.value = "<MT_TRANS phrase="Applying...">";
-                selected_blog_id = blog_id;
-                var client = TC.Client.call({
-                    'load': designApplied,
-                    'uri': '<TMPL_VAR NAME=SCRIPT_URL>',
-                    'method': 'POST',
-                    'arguments': {
-                        '__mode': 'apply',
-                        'url': url,
-                        'magic_token': '<TMPL_VAR NAME=MAGIC_TOKEN>',
-                        'blog_id': blog_id
-                    }
-                });
-            }
-
-            function designApplied(client, result) {
-                var btn = getByID("apply-button");
-                var entry = mixer.entries[selected];
-                if (entry) {
-                    // make this the new 'current' theme
-                    var found = false;
-                    for (var i = 0; i < entry.tags.length; i++) {
-                        if (entry.tags[i] == 'collection:current')
-                            found = true;
-                    }
-                    if (!found)
-                        entry.tags[entry.tags.length] = 'collection:current';
-                    /* we need to add the blog id of the blog that was
-                       applied to for this entry */
-
-                    found = false;
-                    if (entry.blogs && entry.blogs.length) {
-                        for (var i = 0; i < entry.blogs.length; i++) {
-                            if (entry.blogs[i] == selected_blog_id)
-                                found = true;
+                }
+            }
+            mixer.createTagIndexes();
+        }
+
+        chooseCategory('category-current');
+        current_theme = selected;
+        mixer.name = selected;
+        var layout_changed = (current_layout && new_layout) && (current_layout != new_layout);
+        current_layout = new_layout;
+        selectDesign();
+
+        if (layout_changed && (!dynamic_blog)) {
+            showMsg("<__trans phrase="The selected theme has been applied, but as you have changed the layout, you will need to republish your blog to apply the new layout." escape="js">", 'theme-applied', "info", "all", blog_id);
+        } else {
+            showMsg("<__trans phrase="The selected theme has been applied!" escape="js">", 'theme-applied', "info");
+        }
+    }
+
+    function stylesLoaded(client, styles, repo_id) {
+        var btn = getByID("find-button");
+        TC.addClassName(TC.elementOrId("loading-styles"), "hidden");
+        TC.removeClassName(btn, "hidden");
+
+        var repo_num;
+        var cat;
+
+        var data;
+        try {
+            data = eval('('+styles+')');
+        } catch (e) {
+            showMsg("<__trans phrase="Error loading themes! -- [_1]" params="ERROR" escape="js">".replace(/ERROR/, styles), "error", "error");
+            return;
+        }
+        if (data.error) {
+            showMsg("<__trans phrase="Error loading themes! -- [_1]" params="ERROR" escape="js">".replace(/ERROR/, data.error), "error", "error");
+            return;
+        }
+        log(data.result);
+        if (!repo_id) {
+            if (data.result.repo) {
+                url = data.result.repo['url'];
+                if (repo_urls[url] != undefined) {
+                    repo_num = repo_urls[url];
+                    cat = 'repo_' + repo_num;
+                } else {
+                    repo_num = repos.length;
+                    repo_urls[url] = repo_num;
+
+                    // new repo -- create new
+                    // category for it
+                    cat = 'repo_' + repo_num;
+                    createCategory(cat, data.result.repo['display_name'], url);
+                }
+                repos[repo_num] = url;
+            }
+            if (data.result.auto) {
+                cat = 'more';
+                enableCategory(cat);
+            }
+            chooseCategory('category-' + cat);
+        } else {
+            var repo;
+            for (var i = 0; i < libraries.length; i++) {
+                if (libraries[i].key == repo_id) {
+                    repo = libraries[i];
+                    break;
+                }
+            }
+            if (repo) {
+                repo.loaded = true;
+                cat = 'repo-' + repo_id;
+                enableCategory(cat);
+                chooseCategory('category-' + cat);
+            }
+        }
+        if (data.result.themes)
+            loadThemes(data.result.themes, cat);
+    }
+
+    function createCategory(cat_name, cat_title, url) {
+        // things to create...
+        //   #1: new scrollbox under id 'categories'
+        /*
+                <div class="category" id="category-repo" title="Remote Styles" style="display: none">
+                    <img src="<mt:var name="plugin_static_uri">images/mixed-media.gif" alt="" /><span id="repo-name">Remote Styles</span>
+                </div>
+        */
+        var cats = getByID("categories");
+
+        element = document.createElement( "div" );
+        element.title = url;
+        element.className = "category";
+        element.id = "category-" + cat_name;
+
+        var img = document.createElement( "img" );
+        img.src = repoImg;
+        img.alt = "";
+        element.appendChild( img );
+
+        var spn = document.createElement( "span" );
+        spn.appendChild( document.createTextNode( cat_title ) );
+        element.appendChild( spn );
+
+        cats.appendChild( element );
+
+        //   #2: new div under id templates-wrapper
+        /*
+            <div class="scrollbox" id="display-repo" style="display: none;"></div>
+        */
+
+        var wrapper = getByID("templates-wrapper");
+
+        var div = document.createElement( "div" );
+        div.className = "scrollbox";
+        div.id = "display-" + cat_name;
+        wrapper.appendChild(div);
+        element.onclick = chooseCategoryClosure( element.id );
+
+        categories[ element.id ] =
+        {
+            "element" : element,
+            "display" : div
+        };
+
+        enableCategory(cat_name);
+    }
+
+    function loadThemes(themes, pfx) {
+        var names = {};
+        for (var i = 0; i < themes.length; i++) {
+            var prefix = themes[i]['prefix'];
+            if (!prefix) prefix = pfx;
+            var name = prefix + ':' + themes[i]['name'];
+            if (names[themes[i]['name']]) {
+                names[themes[i]['name']]++;
+                name += "_" + names[themes[i]['name']];
+            } else {
+                names[name] = 1;
+            }
+            themes[i]['name'] = name;
+            themes[i].tags[themes[i].tags.length] = "collection:"+prefix;
+            if (mixer.entries[name]) {
+                // merge in tags
+                var existing_tags = mixer.entries[name].tags;
+                if (existing_tags && existing_tags.length) {
+                    var new_tag_names = {};
+                    for (var j in themes[i].tags)
+                        new_tag_names[j] = true;
+                    for (var j = 0; j < existing_tags.length; j++) {
+                        if (!new_tag_names[existing_tags[j]]) {
+                            themes[i].tags[themes[i].tags.length] = existing_tags[j];
                         }
                     }
-                    if (!found)
-                        entry.blogs[entry.blogs.length] = selected_blog_id;
-
-                    /* loop through all the 'current' themes and strip
-                       this blog id from any that don't match the
-                       selected theme */
-                    for (var i in mixer.entries) {
-                        if (i == selected)
-                            continue;
-                        for (var j = 0; j < mixer.entries[i].blogs.length; j++) {
-                            if (mixer.entries[i].blogs[j] == selected_blog_id) {
-                                mixer.entries[i].blogs.splice(j,1);
-                                break;
-                            }
-                        }
-                        if (mixer.entries[i].blogs.length == 0) {
-                            // no longer 'current'
-                            for (var j = 0; j < mixer.entries[i].tags.length; j++) {
-                                if (mixer.entries[i].tags[j] == 'collection:current') {
-                                    mixer.entries[i].tags.splice(j,1);
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    mixer.createTagIndexes();
-                    mixer.remix();
-                }
-                chooseCategory('category-current');
-                if (!btn) return;
-                btn.value = "<MT_TRANS phrase="Choose this Design">";
-                btn.disabled = false;
-                alert(result);
-            }
-
-            function stylesLoaded(client, styles) {
-                var btn = getByID("find-button");
-                if (!btn) return;
-                var repo_num;
-                var cat;
-
-                var data;
-                try {
-                    data = eval('('+styles+')');
-                } catch (e) {
-                    alert(trans("Error loading themes! -- [_1]", styles));
-                    btn.value = "<MT_TRANS phrase="Find Style">";
-                    btn.disabled = false;
-                    return;
-                }
-                if (data.repo) {
-                    url = data.repo['url'];
-                    if (repo_urls[url] != undefined) {
-                        repo_num = repo_urls[url];
-                        cat = 'repo_' + repo_num;
-                    } else {
-                        repo_num = repos.length;
-                        repo_urls[url] = repo_num;
-
-                        // new repo -- create new
-                        // category for it
-                        cat = 'repo_' + repo_num;
-                        createCategory(cat, data.repo['display_name'], url);
-                    }
-                    repos[repo_num] = url;
-                }
-                if (data.auto) {
-                    cat = 'more';
-                    enableCategory(cat);
-                }
-                chooseCategory('category-' + cat);
-                if (data.themes)
-                    loadThemes(data.themes, cat);
-
-                btn.value = "<MT_TRANS phrase="Find Style">";
-                btn.disabled = false;
-            }
-
-            function createCategory(cat_name, cat_title, url) {
-                // things to create...
-                //   #1: new scrollbox under id 'categories'
-                /*
-                        <div class="category" id="category-repo" title="Remote Themes" style="display: none">
-                            <img src="<TMPL_VAR NAME=PLUGIN_STATIC_URI>images/mixed-media.gif" alt="" /><span id="repo-name">Remote Themes</span>
-                        </div>
-                */
-                var cats = getByID("categories");
-
-                element = document.createElement( "div" );
-                element.title = url;
-                element.className = "category";
-                element.id = "category-" + cat_name;
-
-                var img = document.createElement( "img" );
-                img.src = repoImg;
-                img.alt = "";
-                element.appendChild( img );
-
-                var spn = document.createElement( "span" );
-                spn.appendChild( document.createTextNode( cat_title ) );
-                element.appendChild( spn );
-
-                cats.appendChild( element );
-
-                //   #2: new div under id templates-wrapper
-                /*
-                    <div class="scrollbox" id="display-repo" style="display: none;"></div>
-                */
-
-                var wrapper = getByID("templates-wrapper");
-
-                var div = document.createElement( "div" );
-                div.className = "scrollbox";
-                div.id = "display-" + cat_name;
-                wrapper.appendChild(div);
-                element.onclick = chooseCategoryClosure( element.id );
-
-                categories[ element.id ] =
-                {
-                    "element" : element,
-                    "display" : div
-                };
-
-                enableCategory(cat_name);
-            }
-
-            function loadThemes(themes, prefix) {
-                var names = {};
-                for (var i = 0; i < themes.length; i++) {
-                    var name = prefix + '-' + themes[i]['name'];
-                    if (names[themes[i]['name']]) {
-                        names[themes[i]['name']]++;
-                        name += "_" + names[themes[i]['name']];
-                    } else {
-                        names[name] = 1;
-                    }
-                    themes[i]['name'] = name;
-                    themes[i].tags[themes[i].tags.length] = "collection:"+prefix;
-                    if (mixer.entries[name]) {
-                        // merge in tags
-                        var existing_tags = mixer.entries[name].tags;
-                        if (existing_tags && existing_tags.length) {
-                            var new_tag_names = {};
-                            for (var j in themes[i].tags)
-                                new_tag_names[j] = true;
-                            for (var j = 0; j < existing_tags.length; j++) {
-                                if (!new_tag_names[existing_tags[j]]) {
-                                    themes[i].tags[themes[i].tags.length] = existing_tags[j];
-                                }
-                            }
-                        }
-                    } else {
-                        mixer.addEntries(themes[i]);
-                    }
-                }
-                mixer.display();
-            }
-            function getStyles() {
-                var btn = getByID("find-button");
-                if (!btn) return;
-                btn.disabled = true;
-                btn.value = "<MT_TRANS phrase="Loading...">";
-
-                var el = getByID('repo-url');
-                if (!el) return;
-                var url = el.value;
-                var client = TC.Client.call({
-                    'load': stylesLoaded,
-                    'uri': '<TMPL_VAR NAME=SCRIPT_URL>',
-                    'method': 'POST',
-                    'arguments': {
-                        '__mode': 'js',
-                        'url': url
-                    }
-                });
-            }
-        </script>
-
-<!-- end script section -->
-
-        <div id="wrapper">
-
-<TMPL_IF NAME=BLOG_LOOP>
-
-         <p><MT_TRANS phrase="StyleCatcher lets you easily browse through styles and then apply them to your blog in just a few clicks. To find out more about Movable Type styles, or for new sources for styles, visit the <a href='http://www.sixapart.com/movabletype/styles'>Movable Type styles</a> page.">
-         <TMPL_IF NAME=CONFIG_LINK><MT_TRANS phrase=" To change the location of your local theme repository, <a href='<TMPL_VAR NAME=CONFIG_LINK>'> click here."></a></TMPL_IF></p>
-
-           <script type="text/javascript">
-           if(navigator.userAgent.indexOf("Firefox")!=-1){
-           var versionindex=navigator.userAgent.indexOf("Firefox")+8
-              document.writeln("<p><MT_TRANS phrase="Install <a href='http://greasemonkey.mozdev.org/'>GreaseMonkey</a>"> <a href='<TMPL_VAR NAME=SCRIPT_URL>?__mode=gm<TMPL_IF NAME=BLOG_ID>&amp;blog_id=<TMPL_VAR NAME=BLOG_ID></TMPL_IF>;file=stylecatcher.user.js'><MT_TRANS phrase="StyleCatcher user script."></a></p>");
-           }
-           </script>
-
-           <form method="get" action="<TMPL_VAR NAME=SCRIPT_URL>">
-              <strong><MT_TRANS phrase="Theme or Repository URL:"></strong>
-              <input class="repo-url" style="width:350px;" name="url" id="repo-url" value="<TMPL_VAR NAME=LAST_THEME_URL>" />
-              <input type="button" id="find-button" value="<MT_TRANS phrase="Find Styles">" onclick="getStyles()" />
-           </form>
-            <p><strong><MT_TRANS phrase="NOTE:"></strong> <MT_TRANS phrase="It will take a moment for themes to populate once you click 'Find Style'."></p> 
-            <p id="status-message" class="message" style="display: none"></p>
-            
-            <div id="template-picker">
-                <div id="categories-wrapper">
-                    <h2><MT_TRANS phrase="Categories"></h2>
-                    <div class="scrollbox" id="categories">
-<TMPL_IF NAME=SINGLE_BLOG>
-                        <div class="category" id="category-current" title="<MT_TRANS phrase="Current theme for your weblog">" style="display: none"><img src="<TMPL_VAR NAME=PLUGIN_STATIC_URI>images/top-rated.gif" alt="Your Current Theme" /><span><MT_TRANS phrase="Current Theme"></span>
-<TMPL_ELSE>
-                        <div class="category" id="category-current" title="<MT_TRANS phrase="Current themes for your weblogs">" style="display: none"><img src="<TMPL_VAR NAME=PLUGIN_STATIC_URI>images/top-rated.gif" alt="Your Current Themes" /><span><MT_TRANS phrase="Current Themes"></span>
-</TMPL_IF>
-                        </div>
-                        <div class="category" id="category-my-designs" title="<MT_TRANS phrase="Locally saved themes">" style="display: none"><img src="<TMPL_VAR NAME=PLUGIN_STATIC_URI>images/my-designs.gif" alt="my-designs" /><span><MT_TRANS phrase="Saved Themes"></span>
-                        </div>
-                        <div class="category" id="category-more" title="<MT_TRANS phrase="Single themes from the web">" style="display: none"><img src="<TMPL_VAR NAME=PLUGIN_STATIC_URI>images/featured.gif" alt="my-designs" /><span><MT_TRANS phrase="More Themes"></span>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="templates-wrapper">
-                    <h2 id="selected-category-title"><MT_TRANS phrase="Templates"></h2>
-                    <div class="scrollbox" id="display-current" style="display: none;"></div>
-                    <div class="scrollbox" id="display-my-designs" style="display: none;"></div>
-                    <div class="scrollbox" id="display-more" style="display: none;"></div>
-                </div>
-
-                <div id="details-wrapper" style="display: none">
-                    <h2><MT_TRANS phrase="Details"></h2>
-                    <div id="display-details">
-                        <div class="tc-mixer-entry"></div>
-                    </div>
-                </div>
-
-                <a id="show-details" href="javascript:void(0);" onclick="return showDetails( true );" style="display: none"><MT_TRANS phrase="Show Details"></a>
-                <a id="hide-details" href="javascript:void(0);" onclick="return showDetails( false );" style="display: none"><MT_TRANS phrase="Hide Details"></a>
+                }
+            } else {
+                mixer.addEntries(themes[i]);
+            }
+        }
+        mixer.display();
+    }
+
+    function downloadStyles() {
+        var url;
+        if (url = prompt("<__trans phrase="Stylesheet or Repository URL" escape="js">")) {
+            getStyles(null, url);
+        }
+    }
+
+    function getStyles(repo_id, url) {
+        var btn = getByID("find-button");
+        TC.addClassName(btn, "hidden");
+        TC.removeClassName(TC.elementOrId("loading-styles"), "hidden");
+
+        var client = TC.Client.call({
+            'load': function(c,s) { stylesLoaded(c,s,repo_id) },
+            'uri': '<mt:var name="script_url">',
+            'method': 'POST',
+            'arguments': {
+                '__mode': 'stylecatcher_js',
+                'url': url
+            }
+        });
+    }
+/* ]]> */
+</script>
+<!-- end stylecatcher script section -->
+</mt:setvarblock>
+<mt:include name="include/header.tmpl">
+
+<div id="msg-block">
+</div>
+
+<div id="wrapper">
+
+<!--
+<form method="get" action="<mt:var name="script_url">">
+    <strong><__trans phrase="Stylesheet or Repository URL:"></strong>
+    <input class="repo-url" style="width:350px;" name="url" id="repo-url" value="<mt:var name="last_theme_url">" />
+    <input type="button" id="find-button" value="<__trans phrase="Download Styles">" onclick="getStyles()" />
+    <span class="hidden" id="loading-styles">
+        <img src="<mt:var name="static_uri">images/indicator.white.gif" height="16" width="16" alt="" />
+        <__trans phrase="Loading...">
+    </span>
+</form>
+-->
+
+<p id="status-message" class="message" style="display: none"></p>
+
+<div id="template-picker">
+    <div id="categories-wrapper">
+
+        <h2>
+            <span style="float:right">
+                <a href="javascript:void(0)" id="find-button" onclick="return downloadStyles()" class="icon-right icon-create" title="Download new styles">&nbsp;</a>
+
+            <span class="hidden" id="loading-styles">
+                <img src="<mt:var name="static_uri">images/indicator.white.gif" height="16" width="16" alt="" />
+            </span>
+
+            </span>
+
+            <__trans phrase="Categories">
+        </h2>
+
+        <div class="scrollbox" id="categories">
+            <div class="category" id="category-current" title="<__trans phrase="Current theme for your weblog">" style="display: none"><img src="<mt:var name="plugin_static_uri">images/top-rated.gif" alt="Your Current Style" /><span><__trans phrase="Current Style"></span>
             </div>
-            
-            <br class="clr" />
-
-            <div id="select-design-controls">
-<TMPL_UNLESS NAME=SINGLE_BLOG>
-            <select name="blog_id" id="select-blog">
-            <option value=""><MT_TRANS phrase="Select a Weblog..."></option>
-            <TMPL_LOOP NAME=BLOG_LOOP>
-            <option value="<TMPL_VAR NAME=BLOG_ID>"><TMPL_VAR NAME=BLOG_NAME></option>
-            </TMPL_LOOP>
-            </select>
-</TMPL_UNLESS>
-
-            <input type="button" name="choose" id="apply-button" onclick="applyDesign()" value="<MT_TRANS phrase="Apply Selected Design">" />
+            <div class="category" id="category-my-designs" title="<__trans phrase="Locally saved themes">" style="display: none"><img src="<mt:var name="plugin_static_uri">images/my-designs.gif" alt="my-designs" /><span><__trans phrase="Saved Styles"></span>
             </div>
-            <br class="clr" />
+            <div class="category" id="category-mt-designs" title="<__trans phrase="Default Styles">" style="display: none"><img src="<mt:var name="plugin_static_uri">images/gear.gif" alt="mt-designs" /><span><__trans phrase="Default Styles"></span>
+            </div>
+            <div class="category" id="category-more" title="<__trans phrase="Single themes from the web">" style="display: none"><img src="<mt:var name="plugin_static_uri">images/featured.gif" alt="my-designs" /><span><__trans phrase="More Styles"></span>
+            </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>
+            </mt:loop>
         </div>
-
-<TMPL_ELSE>
-
-<p class="message">
-<MT_TRANS phrase="You don't appear to have any weblogs with a 'styles-site.css' template that you have rights to edit. Please check your weblog(s) for this template.">
-</p>
-
-</TMPL_IF>
-
-<TMPL_INCLUDE NAME="footer.tmpl">
+    </div>
+
+    <div id="templates-wrapper">
+        <h2 id="selected-category-title"><__trans phrase="Templates"></h2>
+        <div class="scrollbox" id="display-current" style="display: none;"></div>
+        <div class="scrollbox" id="display-my-designs" style="display: none;"></div>
+        <div class="scrollbox" id="display-mt-designs" style="display: none;"></div>
+        <div class="scrollbox" id="display-more" style="display: none;"></div>
+        <mt:loop name="style_library">
+        <div class="scrollbox" id="display-repo-<mt:var name="key">" style="display: none;"></div>
+        </mt:loop>
+    </div>
+
+    <div id="details-wrapper">
+        <h2><__trans phrase="Selected Design"></h2>
+        <div id="display-details">
+        <div id="select-design-controls" class="actions-bar">
+            <form method="get" action="">
+                <p>
+                    <label for="layout-list"><__trans phrase="Layout">:</label>
+                    <select id="layout-list" onchange="updateApplyButton()">
+                    </select>
+                </p>
+
+                <span class="button-actions actions">
+                <button
+                    type="button"
+                    accesskey="s"
+                    id="apply-button"
+                    title="<__trans phrase="Apply Design"> (s)"
+                    onclick="applyDesign()"
+                    class="primary-button"><__trans phrase="Apply Design"></button>
+                </span>
+            </form>
+        </div>
+
+        <div id="display-details-content"></div>
+
+
+    </div>
+
+</div>
+
+<br class="clr" />
+
+</div>
+
+<mt:include name="include/footer.tmpl">