diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e848a8dc6b678ebf7fbd05d3aeb5947fa9d72073..60a2cd6f8545b3dda233b87dd7eda63b57e7e82a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,6 +2,7 @@ Zen 6.x-2.x-dev, xxxx-xx-xx (development release) ------------------------ +- #546828: Move tpl.php files to a templates folder in the root zen directory - #546792: Remove box.tpl.php - #513926: Sub-themes cannot reorder the stylesheets of the base theme - #456136: Move zen stylesheets into STARTERKIT/css diff --git a/README-FIRST.txt b/README-FIRST.txt new file mode 100644 index 0000000000000000000000000000000000000000..e075ccc18535c0ab8bc9f4c4506fe3a9428afb1a --- /dev/null +++ b/README-FIRST.txt @@ -0,0 +1,50 @@ +// $Id$ + +WHERE TO START +-------------- + +Yay! You opened the correct file first. The first thing that people notice when +they download the Zen theme is that there are A LOT of files -- way more than +other themes. + + + + + +Full documentation on the Zen theme can be found in Drupal's Handbook: + http://drupal.org/node/193318 + +Excellent documentation on Drupal theming can be found in the Theme Guide: + http://drupal.org/theme-guide + + +INSTALLATION +------------ + + 1. Download Zen from http://drupal.org/project/zen + + 2. Unpack the downloaded file, take the entire zen folder (which includes the + README.txt file, a STARTERKIT folder, etc.) and place it in your Drupal + installation under one of the following locations: + sites/all/themes + making it available to the default Drupal site and to all Drupal sites + in a multi-site configuration + sites/default/themes + making it available to only the default Drupal site + sites/example.com/themes + making it available to only the example.com site if there is a + sites/example.com/settings.php configuration file + + For more information about acceptable theme installation directories, read + the sites/default/default.settings.php file in your Drupal installation. + + 3. Log in as an administrator on your Drupal site and go to Administer > Site + building > Themes (admin/build/themes). You will see the Zen theme there + with links on how to create your own sub-theme. You can optionally make Zen + the default theme. + + +BUILD YOUR OWN SUB-THEME +------------------------ + +See the STARTERKIT/README.txt file. diff --git a/README.txt b/STARTERKIT/README.txt similarity index 79% rename from README.txt rename to STARTERKIT/README.txt index 517255240e18fe34ae8ab2f8c60966c8ac1aa92c..c32b80e274439513d7bce9f44494474186077c77 100644 --- a/README.txt +++ b/STARTERKIT/README.txt @@ -1,38 +1,5 @@ // $Id$ -Full documentation on the Zen theme can be found in Drupal's Handbook: - http://drupal.org/node/193318 - -Excellent documentation on Drupal theming can be found in the Theme Guide: - http://drupal.org/theme-guide - - -INSTALLATION ------------- - - 1. Download Zen from http://drupal.org/project/zen - - 2. Unpack the downloaded file, take the entire zen folder (which includes the - README.txt file, a STARTERKIT folder, etc.) and place it in your Drupal - installation under one of the following locations: - sites/all/themes - making it available to the default Drupal site and to all Drupal sites - in a multi-site configuration - sites/default/themes - making it available to only the default Drupal site - sites/example.com/themes - making it available to only the example.com site if there is a - sites/example.com/settings.php configuration file - - For more information about acceptable theme installation directories, read - the sites/default/default.settings.php file in your Drupal installation. - - 3. Log in as an administrator on your Drupal site and go to Administer > Site - building > Themes (admin/build/themes). You will see the Zen theme there - with links on how to create your own sub-theme. You can optionally make Zen - the default theme. - - BUILD YOUR OWN SUB-THEME ------------------------ diff --git a/STARTERKIT/css/README.txt b/STARTERKIT/css/README.txt new file mode 100644 index 0000000000000000000000000000000000000000..f6e68a6390338961d81b5e011f7773b9a4f0a826 --- /dev/null +++ b/STARTERKIT/css/README.txt @@ -0,0 +1,24 @@ +// $Id$ + +ZEN'S STYLESHEETS +----------------- + +In these stylesheets, we have included all of the classes and IDs from this +theme's tpl.php files. We have also included many of the useful Drupal core +styles to make it easier for theme developers to see them. + +Many of these styles are over-riding Drupal's core stylesheets, so if you remove +a declaration from them, the styles may still not be what you want since +Drupal's core stylesheets are still styling the element. See the +drupal6-reference.css file for a list of all Drupal 6.x core styles. + +In addition to the style declarations in these stylesheets, other Drupal styles +that you might want to override or augment are those for: + + Book Navigation See line 74 of drupal6-reference.css file + Forum See line 197 of drupal6-reference.css file + Menus See line 667 of drupal6-reference.css file + News Aggregator See line 20 of drupal6-reference.css file + Polls See line 287 of drupal6-reference.css file + Search See line 320 of drupal6-reference.css file + User Profiles See line 945 of drupal6-reference.css file diff --git a/STARTERKIT/templates/README.txt b/STARTERKIT/templates/README.txt new file mode 100644 index 0000000000000000000000000000000000000000..c27f080c8c890387154796a93840c5d5f33a81ac --- /dev/null +++ b/STARTERKIT/templates/README.txt @@ -0,0 +1,82 @@ +// $Id$ + +TEMPLATES +--------- + +Drupal 6 contains the following template files which you can override and modify +by copying them to your sub-theme. The Zen theme overrides a handful of Drupal's +templates. In order to override those templates, you should copy them from the +zen/templates folder to your sub-theme's templates folder. + +As always, when adding a new template file to your sub-theme, you will need to rebuild the "theme registry" in order for Drupal to see it. For more info, see: + http://drupal.org/node/173880#theme-registry + +Located in zen/templates: + page.tpl.php + maintenance-page.tpl.php + node.tpl.php + block.tpl.php + comment-wrapper.tpl.php + comment.tpl.php + +Located in modules/aggregator: + aggregator-feed-source.tpl.php + aggregator-item.tpl.php + aggregator-summary-item.tpl.php + aggregator-summary-items.tpl.php + aggregator-wrapper.tpl.php + +Located in modules/block: + block-admin-display-form.tpl.php + +Located in modules/book: + book-all-books-block.tpl.php + book-export-html.tpl.php + book-navigation.tpl.php + book-node-export-html.tpl.php + +Located in modules/comment: + comment-folded.tpl.php + comment-wrapper.tpl.php (overridden by Zen) + comment.tpl.php (overridden by Zen) + +Located in modules/forum: + forum-icon.tpl.php + forum-list.tpl.php + forum-submitted.tpl.php + forum-topic-list.tpl.php + forum-topic-navigation.tpl.php + forums.tpl.php + +Located in modules/node: + node.tpl.php (overridden by Zen) + +Located in modules/poll: + poll-bar-block.tpl.php + poll-bar.tpl.php + poll-results-block.tpl.php + poll-results.tpl.php + poll-vote.tpl.php + +Located in modules/profile: + profile-block.tpl.php + profile-listing.tpl.php + profile-wrapper.tpl.php + +Located in modules/search: + search-block-form.tpl.php + search-result.tpl.php + search-results.tpl.php + search-theme-form.tpl.php + +Located in modules/system: + block.tpl.php (overridden by Zen) + box.tpl.php (overridden by Zen) + maintenance-page.tpl.php (overridden by Zen) + page.tpl.php (overridden by Zen) + +Located in modules/user: + user-picture.tpl.php + user-profile-category.tpl.php + user-profile-item.tpl.php + user-profile.tpl.php diff --git a/zen/logo.png b/logo.png similarity index 100% rename from zen/logo.png rename to logo.png diff --git a/zen/template.php b/template.php similarity index 95% rename from zen/template.php rename to template.php index f6db101737ec608d152e6e250d18c1b09c89ed21..f80a8d2f4204e99dfacf090ec55cee819b6aa6fe 100644 --- a/zen/template.php +++ b/template.php @@ -26,7 +26,7 @@ function zen_theme(&$existing, $type, $theme, $path) { if (!db_is_active()) { return array(); } - include_once './' . drupal_get_path('theme', 'zen') . '/template.theme-registry.inc'; + include_once './' . drupal_get_path('theme', 'zen') . '/zen-internals/template.theme-registry.inc'; return _zen_theme($existing, $type, $theme, $path); } @@ -112,7 +112,7 @@ function zen_menu_local_tasks() { function zen_preprocess_page(&$vars, $hook) { // If the user is silly and enables Zen as the theme, add some styles. if ($GLOBALS['theme'] == 'zen') { - include_once './' . drupal_get_path('theme', 'zen') . '/template.zen.inc'; + include_once './' . drupal_get_path('theme', 'zen') . '/zen-internals/template.zen.inc'; _zen_preprocess_page($vars, $hook); } // Add conditional stylesheets. @@ -202,7 +202,7 @@ function zen_preprocess_node(&$vars, $hook) { * The name of the template being rendered ("comment" in this case.) */ function zen_preprocess_comment(&$vars, $hook) { - include_once './' . drupal_get_path('theme', 'zen') . '/template.comment.inc'; + include_once './' . drupal_get_path('theme', 'zen') . '/zen-internals/template.comment.inc'; _zen_preprocess_comment($vars, $hook); } @@ -228,7 +228,7 @@ function zen_preprocess_block(&$vars, $hook) { $vars['edit_links_array'] = array(); $vars['edit_links'] = ''; if (theme_get_setting('zen_block_editing') && user_access('administer blocks')) { - include_once './' . drupal_get_path('theme', 'zen') . '/template.block-editing.inc'; + include_once './' . drupal_get_path('theme', 'zen') . '/zen-internals/template.block-editing.inc'; zen_preprocess_block_editing($vars, $hook); $classes[] = 'with-block-editing'; } diff --git a/zen/block.tpl.php b/templates/block.tpl.php similarity index 100% rename from zen/block.tpl.php rename to templates/block.tpl.php diff --git a/zen/comment-wrapper.tpl.php b/templates/comment-wrapper.tpl.php similarity index 100% rename from zen/comment-wrapper.tpl.php rename to templates/comment-wrapper.tpl.php diff --git a/zen/comment.tpl.php b/templates/comment.tpl.php similarity index 100% rename from zen/comment.tpl.php rename to templates/comment.tpl.php diff --git a/zen/maintenance-page.tpl.php b/templates/maintenance-page.tpl.php similarity index 100% rename from zen/maintenance-page.tpl.php rename to templates/maintenance-page.tpl.php diff --git a/zen/node.tpl.php b/templates/node.tpl.php similarity index 100% rename from zen/node.tpl.php rename to templates/node.tpl.php diff --git a/zen/page.tpl.php b/templates/page.tpl.php similarity index 100% rename from zen/page.tpl.php rename to templates/page.tpl.php diff --git a/zen/theme-settings.php b/theme-settings.php similarity index 94% rename from zen/theme-settings.php rename to theme-settings.php index 7f40ff7bd5907cf8067b200abca73f2c8d00d7e0..c40fa9f85eb8c15ec29fe694dcfa50aa322fbf22 100644 --- a/zen/theme-settings.php +++ b/theme-settings.php @@ -2,7 +2,7 @@ // $Id$ // Include the definition of zen_theme_get_default_settings(). -include_once './' . drupal_get_path('theme', 'zen') . '/template.theme-registry.inc'; +include_once './' . drupal_get_path('theme', 'zen') . '/zen-internals/template.theme-registry.inc'; /** @@ -18,10 +18,10 @@ include_once './' . drupal_get_path('theme', 'zen') . '/template.theme-registry. function zen_settings($saved_settings, $subtheme_defaults = array()) { // Add the form's CSS - drupal_add_css(drupal_get_path('theme', 'zen') . '/css/theme-settings.css', 'theme'); + drupal_add_css(drupal_get_path('theme', 'zen') . '/zen-internals/css/theme-settings.css', 'theme'); // Add javascript to show/hide optional settings - drupal_add_js(drupal_get_path('theme', 'zen') . '/js/theme-settings.js', 'theme'); + drupal_add_js(drupal_get_path('theme', 'zen') . '/zen-internals/js/theme-settings.js', 'theme'); // Get the default values from the .info file. $defaults = zen_theme_get_default_settings('zen'); diff --git a/zen-internals/TODO.txt b/zen-internals/TODO.txt new file mode 100644 index 0000000000000000000000000000000000000000..df31c981e26583ba13eb3e86ff00f7b237709b22 --- /dev/null +++ b/zen-internals/TODO.txt @@ -0,0 +1,7 @@ +Zen 6.x-2.0 @TODO + #: Add fix to auto-correct tabs broken by contrib modules + #: Display "edit menu" only when Menu block is displaying menu.module links + #308254: Make "skip to nav" styling more useful and less intrusive + #308376: Make "skip to nav" links configurable instead of hard-coded + * fix maintanence page + * confirm all the variables of every tpl are documented. diff --git a/zen/css/generate.sh b/zen-internals/css/generate.sh similarity index 100% rename from zen/css/generate.sh rename to zen-internals/css/generate.sh diff --git a/zen/css/ie.css b/zen-internals/css/ie.css similarity index 100% rename from zen/css/ie.css rename to zen-internals/css/ie.css diff --git a/zen/css/ie5.css b/zen-internals/css/ie5.css similarity index 100% rename from zen/css/ie5.css rename to zen-internals/css/ie5.css diff --git a/zen/css/ie6.css b/zen-internals/css/ie6.css similarity index 100% rename from zen/css/ie6.css rename to zen-internals/css/ie6.css diff --git a/zen/css/print.css b/zen-internals/css/print.css similarity index 100% rename from zen/css/print.css rename to zen-internals/css/print.css diff --git a/zen/css/theme-settings-rtl.css b/zen-internals/css/theme-settings-rtl.css similarity index 100% rename from zen/css/theme-settings-rtl.css rename to zen-internals/css/theme-settings-rtl.css diff --git a/zen/css/theme-settings.css b/zen-internals/css/theme-settings.css similarity index 100% rename from zen/css/theme-settings.css rename to zen-internals/css/theme-settings.css diff --git a/zen/css/zen-fixed.css b/zen-internals/css/zen-fixed.css similarity index 100% rename from zen/css/zen-fixed.css rename to zen-internals/css/zen-fixed.css diff --git a/zen/css/zen-liquid.css b/zen-internals/css/zen-liquid.css similarity index 100% rename from zen/css/zen-liquid.css rename to zen-internals/css/zen-liquid.css diff --git a/zen/images/messages-error-ie6.png b/zen-internals/images/messages-error-ie6.png similarity index 100% rename from zen/images/messages-error-ie6.png rename to zen-internals/images/messages-error-ie6.png diff --git a/zen/images/messages-error.png b/zen-internals/images/messages-error.png similarity index 100% rename from zen/images/messages-error.png rename to zen-internals/images/messages-error.png diff --git a/zen/images/messages-status-ie6.png b/zen-internals/images/messages-status-ie6.png similarity index 100% rename from zen/images/messages-status-ie6.png rename to zen-internals/images/messages-status-ie6.png diff --git a/zen/images/messages-status.png b/zen-internals/images/messages-status.png similarity index 100% rename from zen/images/messages-status.png rename to zen-internals/images/messages-status.png diff --git a/zen/images/messages-warning-ie6.png b/zen-internals/images/messages-warning-ie6.png similarity index 100% rename from zen/images/messages-warning-ie6.png rename to zen-internals/images/messages-warning-ie6.png diff --git a/zen/images/messages-warning.png b/zen-internals/images/messages-warning.png similarity index 100% rename from zen/images/messages-warning.png rename to zen-internals/images/messages-warning.png diff --git a/zen/images/tab-bar.png b/zen-internals/images/tab-bar.png similarity index 100% rename from zen/images/tab-bar.png rename to zen-internals/images/tab-bar.png diff --git a/zen/images/tab-left-ie6.png b/zen-internals/images/tab-left-ie6.png similarity index 100% rename from zen/images/tab-left-ie6.png rename to zen-internals/images/tab-left-ie6.png diff --git a/zen/images/tab-left.png b/zen-internals/images/tab-left.png similarity index 100% rename from zen/images/tab-left.png rename to zen-internals/images/tab-left.png diff --git a/zen/images/tab-right-ie6.png b/zen-internals/images/tab-right-ie6.png similarity index 100% rename from zen/images/tab-right-ie6.png rename to zen-internals/images/tab-right-ie6.png diff --git a/zen/images/tab-right.png b/zen-internals/images/tab-right.png similarity index 100% rename from zen/images/tab-right.png rename to zen-internals/images/tab-right.png diff --git a/zen/images/tab-secondary-bg.png b/zen-internals/images/tab-secondary-bg.png similarity index 100% rename from zen/images/tab-secondary-bg.png rename to zen-internals/images/tab-secondary-bg.png diff --git a/zen/images/tab-secondary.png b/zen-internals/images/tab-secondary.png similarity index 100% rename from zen/images/tab-secondary.png rename to zen-internals/images/tab-secondary.png diff --git a/zen/js/theme-settings.js b/zen-internals/js/theme-settings.js similarity index 100% rename from zen/js/theme-settings.js rename to zen-internals/js/theme-settings.js diff --git a/zen/screenshot.png b/zen-internals/screenshot.png similarity index 100% rename from zen/screenshot.png rename to zen-internals/screenshot.png diff --git a/zen/template.block-editing.inc b/zen-internals/template.block-editing.inc similarity index 100% rename from zen/template.block-editing.inc rename to zen-internals/template.block-editing.inc diff --git a/zen/template.comment.inc b/zen-internals/template.comment.inc similarity index 100% rename from zen/template.comment.inc rename to zen-internals/template.comment.inc diff --git a/zen/template.conditional-styles.inc b/zen-internals/template.conditional-styles.inc similarity index 100% rename from zen/template.conditional-styles.inc rename to zen-internals/template.conditional-styles.inc diff --git a/zen/template.theme-registry.inc b/zen-internals/template.theme-registry.inc similarity index 96% rename from zen/template.theme-registry.inc rename to zen-internals/template.theme-registry.inc index 4523ffdb83d0ab4915e9ae44769565d574dc7c0c..7338efdbc32d6972dce762b071f91a668477d11d 100644 --- a/zen/template.theme-registry.inc +++ b/zen-internals/template.theme-registry.inc @@ -14,7 +14,7 @@ function _zen_theme(&$existing, $type, $theme, $path) { // Compute the conditional stylesheets. if (!module_exists('conditional_styles')) { - include_once './' . drupal_get_path('theme', 'zen') . '/template.conditional-styles.inc'; + include_once './' . drupal_get_path('theme', 'zen') . '/zen-internals/template.conditional-styles.inc'; // _conditional_styles_theme() only needs to be run once. if ($theme == 'zen') { _conditional_styles_theme($existing, $type, $theme, $path); diff --git a/zen/template.zen.inc b/zen-internals/template.zen.inc similarity index 73% rename from zen/template.zen.inc rename to zen-internals/template.zen.inc index 0ad954c3d99a9db0e4986ca8203bc246fdfa7fd7..a921aaa0cb62e8b353566541702a5156a8a3db69 100644 --- a/zen/template.zen.inc +++ b/zen-internals/template.zen.inc @@ -16,17 +16,17 @@ * If the user is silly and enables Zen as the theme, manually add some stylesheets. */ function _zen_preprocess_page(&$vars, $hook) { - $directory = drupal_get_path('theme', 'zen'); + $directory = drupal_get_path('theme', 'zen') . '/zen-internals/css'; // Add default styles. if (theme_get_setting('zen_layout') == 'zen-columns-fixed') { - drupal_add_css($directory . '/css/zen-fixed.css', 'theme', 'all'); + drupal_add_css($directory . '/zen-fixed.css', 'theme', 'all'); } else { - drupal_add_css($directory . '/css/zen-liquid.css', 'theme', 'all'); + drupal_add_css($directory . '/zen-liquid.css', 'theme', 'all'); } // Add print styles. - drupal_add_css($directory . '/css/print.css', 'theme', 'print'); + drupal_add_css($directory . '/print.css', 'theme', 'print'); // Regenerate the stylesheets. $vars['css'] = drupal_add_css(); @@ -36,8 +36,9 @@ function _zen_preprocess_page(&$vars, $hook) { $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1); $base_path = base_path() . $directory; $vars['styles'] .= <<< IE_STYLES - - - + + + + IE_STYLES; } diff --git a/zen/zen.info b/zen.info similarity index 96% rename from zen/zen.info rename to zen.info index a1fae4d9fe2dbae3254a83c83cde8bbf9fc7f62c..84143f44e8d6d1bfcf201da9e1250c4020a5a079 100644 --- a/zen/zen.info +++ b/zen.info @@ -3,7 +3,7 @@ name = Zen description = Zen sub-themes are the ultimate starting themes for Drupal 6. Read the online docs or the included README.txt on how to create a sub-theme. -screenshot = screenshot.png +screenshot = zen-internals/screenshot.png core = 6.x engine = phptemplate