From 4022b5c2be0cc79b6a1bcc4d3b324f8abb08595f Mon Sep 17 00:00:00 2001 From: matt Date: Sun, 7 Aug 2005 10:11:30 +0000 Subject: [PATCH] Making the presentation page a little more intuitive git-svn-id: http://svn.automattic.com/wordpress/trunk@2757 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/themes.php | 61 ++++++++++++++--------- wp-admin/wp-admin.css | 28 +++++++++++ wp-content/themes/classic/screenshot.png | Bin 0 -> 8412 bytes wp-content/themes/default/screenshot.png | Bin 0 -> 10608 bytes wp-includes/functions.php | 13 +++-- wp-includes/version.php | 2 +- 6 files changed, 75 insertions(+), 29 deletions(-) create mode 100644 wp-content/themes/classic/screenshot.png create mode 100644 wp-content/themes/default/screenshot.png diff --git a/wp-admin/themes.php b/wp-admin/themes.php index 350bd327e..05446275e 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -39,48 +39,62 @@ $current_template_dir = $themes[$current_theme]['Template Dir']; $current_stylesheet_dir = $themes[$current_theme]['Stylesheet Dir']; $current_template = $themes[$current_theme]['Template']; $current_stylesheet = $themes[$current_theme]['Stylesheet']; +$current_screenshot = $themes[$current_theme]['Screenshot']; ?>

+ +Current theme preview +

-

%1$s. The template files are located in %2$s. The stylesheet files are located in %3$s. %4$s uses templates from %5$s. Changes made to the templates will affect both themes.'), $current_theme, $current_template_dir, $current_stylesheet_dir, $current_theme, $current_parent_theme); ?>

+

%2$s. The stylesheet files are located in %3$s. %4$s uses templates from %5$s. Changes made to the templates will affect both themes.'), $current_theme, $current_template_dir, $current_stylesheet_dir, $current_theme, $current_parent_theme); ?>

-

%1$s. The template files are located in %2$s. The stylesheet files are located in %3$s.'), $current_theme, $current_template_dir, $current_stylesheet_dir); ?>

+

%2$s.'), $current_theme, $current_template_dir, $current_stylesheet_dir); ?>

- - - - - - - + + +' . __('Active Theme') . ''; $current = true; } else { - $action = "" . __('Select') . ''; + $action = "" . __('Select') . ''; $current = false; } @@ -93,16 +107,17 @@ $current_stylesheet = $themes[$current_theme]['Stylesheet']; if ( $current ) echo ""; else - echo ""; + echo ""; echo " "; +*/ } + ?> -
$title $version$title $version$author $description $action
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 10fe7e99c..dad4f9ae7 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -160,6 +160,26 @@ textarea, input, select { margin: 10px 20px 10px 20px; } +.available-theme { + width: 250px; + margin-right: 2.5em; + float: left; + text-align: center; +} + +.available-theme span { + width: 250px; + height: 187px; + display: block; + margin: auto; + background: #f1f1f1; + border: 1px solid #ccc; +} + +.available-theme img { + width: 100%; +} + .checkbox { background: #fff; border: none; @@ -267,6 +287,7 @@ textarea, input, select { .wrap h2 { margin: .8em 0 .5em; + clear: both; } #adminmenu { @@ -341,6 +362,13 @@ textarea, input, select { width: 97%; } +#currenttheme img { + float: left; + border: 1px solid #666; + margin-right: 1em; + margin-bottom: 1.5em; +} + #deletepost:hover { background: #ce0000; color: #fff; diff --git a/wp-content/themes/classic/screenshot.png b/wp-content/themes/classic/screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..6692130614b96db2b3b1509c6e6d3f7a547904a2 GIT binary patch literal 8412 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ƨIeT2_Ive>JL6%bpAOo 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 KMNUMnLSTX#8&YHd literal 0 HcmV?d00001 diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 8328fcfc8..69096ad14 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -1511,9 +1511,6 @@ function get_theme_data($theme_file) { $name = $theme_name[1]; $name = trim($name); $theme = $name; - if ('' != $theme_uri[1] && '' != $name) { - $theme = '' . $theme . ''; - } if ('' == $author_uri[1]) { $author = $author_name[1]; @@ -1569,7 +1566,7 @@ function get_themes() { foreach($theme_files as $theme_file) { $theme_data = get_theme_data("$theme_root/$theme_file"); - + $name = $theme_data['Name']; $title = $theme_data['Title']; $description = wptexturize($theme_data['Description']); @@ -1578,6 +1575,12 @@ function get_themes() { $template = $theme_data['Template']; $stylesheet = dirname($theme_file); + $screenshot = glob("$theme_root/$stylesheet/screenshot.png"); + if ( !empty( $screenshot ) ) + $screenshot = basename( $screenshot[0] ); + else + $screenshot = false; + if (empty($name)) { $name = dirname($theme_file); $title = $name; @@ -1640,7 +1643,7 @@ function get_themes() { } } - $themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template, 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files, 'Template Dir' => $template_dir, 'Stylesheet Dir' => $stylesheet_dir, 'Status' => $theme_data['Status']); + $themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template, 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files, 'Template Dir' => $template_dir, 'Stylesheet Dir' => $stylesheet_dir, 'Status' => $theme_data['Status'], 'Screenshot' => $screenshot); } // Resolve theme dependencies. diff --git a/wp-includes/version.php b/wp-includes/version.php index 45a913307..1c31ee7d3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -2,6 +2,6 @@ // This just holds the version number, in a separate file so we can bump it without cluttering the SVN -$wp_version = '1.6-ALPHA-2'; +$wp_version = '1.6-ALPHA-2-still-dont-use'; ?> \ No newline at end of file