summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnAlbin2009-08-12 06:49:47 (GMT)
committer JohnAlbin2009-08-12 06:49:47 (GMT)
commit007fb748e14cb77f5d81ae54b7009638e9677569 (patch)
tree3d98400f776390983caeb66efbc79b42d371d3fb
parentbc8cb54537aa69ad66c8d5296fefd8c5c457b227 (diff)
#546828: Move tpl.php files to a templates folder in the root zen directory
-rw-r--r--CHANGELOG.txt1
-rw-r--r--README-FIRST.txt50
-rw-r--r--STARTERKIT/README.txt (renamed from README.txt)33
-rw-r--r--STARTERKIT/css/README.txt24
-rw-r--r--STARTERKIT/templates/README.txt82
-rw-r--r--logo.png (renamed from zen/logo.png)bin941 -> 941 bytes
-rw-r--r--template.php (renamed from zen/template.php)8
-rw-r--r--templates/block.tpl.php (renamed from zen/block.tpl.php)0
-rw-r--r--templates/comment-wrapper.tpl.php (renamed from zen/comment-wrapper.tpl.php)0
-rw-r--r--templates/comment.tpl.php (renamed from zen/comment.tpl.php)0
-rw-r--r--templates/maintenance-page.tpl.php (renamed from zen/maintenance-page.tpl.php)0
-rw-r--r--templates/node.tpl.php (renamed from zen/node.tpl.php)0
-rw-r--r--templates/page.tpl.php (renamed from zen/page.tpl.php)0
-rw-r--r--theme-settings.php (renamed from zen/theme-settings.php)6
-rw-r--r--zen-internals/TODO.txt7
-rwxr-xr-xzen-internals/css/generate.sh (renamed from zen/css/generate.sh)0
-rw-r--r--zen-internals/css/ie.css (renamed from zen/css/ie.css)0
-rw-r--r--zen-internals/css/ie5.css (renamed from zen/css/ie5.css)0
-rw-r--r--zen-internals/css/ie6.css (renamed from zen/css/ie6.css)0
-rw-r--r--zen-internals/css/print.css (renamed from zen/css/print.css)0
-rw-r--r--zen-internals/css/theme-settings-rtl.css (renamed from zen/css/theme-settings-rtl.css)0
-rw-r--r--zen-internals/css/theme-settings.css (renamed from zen/css/theme-settings.css)0
-rw-r--r--zen-internals/css/zen-fixed.css (renamed from zen/css/zen-fixed.css)0
-rw-r--r--zen-internals/css/zen-liquid.css (renamed from zen/css/zen-liquid.css)0
-rw-r--r--zen-internals/images/messages-error-ie6.png (renamed from zen/images/messages-error-ie6.png)bin719 -> 719 bytes
-rw-r--r--zen-internals/images/messages-error.png (renamed from zen/images/messages-error.png)bin727 -> 727 bytes
-rw-r--r--zen-internals/images/messages-status-ie6.png (renamed from zen/images/messages-status-ie6.png)bin610 -> 610 bytes
-rw-r--r--zen-internals/images/messages-status.png (renamed from zen/images/messages-status.png)bin560 -> 560 bytes
-rw-r--r--zen-internals/images/messages-warning-ie6.png (renamed from zen/images/messages-warning-ie6.png)bin693 -> 693 bytes
-rw-r--r--zen-internals/images/messages-warning.png (renamed from zen/images/messages-warning.png)bin664 -> 664 bytes
-rw-r--r--zen-internals/images/tab-bar.png (renamed from zen/images/tab-bar.png)bin160 -> 160 bytes
-rw-r--r--zen-internals/images/tab-left-ie6.png (renamed from zen/images/tab-left-ie6.png)bin331 -> 331 bytes
-rw-r--r--zen-internals/images/tab-left.png (renamed from zen/images/tab-left.png)bin303 -> 303 bytes
-rw-r--r--zen-internals/images/tab-right-ie6.png (renamed from zen/images/tab-right-ie6.png)bin473 -> 473 bytes
-rw-r--r--zen-internals/images/tab-right.png (renamed from zen/images/tab-right.png)bin685 -> 685 bytes
-rw-r--r--zen-internals/images/tab-secondary-bg.png (renamed from zen/images/tab-secondary-bg.png)bin166 -> 166 bytes
-rw-r--r--zen-internals/images/tab-secondary.png (renamed from zen/images/tab-secondary.png)bin195 -> 195 bytes
-rw-r--r--zen-internals/js/theme-settings.js (renamed from zen/js/theme-settings.js)0
-rw-r--r--zen-internals/screenshot.png (renamed from zen/screenshot.png)bin3807 -> 3807 bytes
-rw-r--r--zen-internals/template.block-editing.inc (renamed from zen/template.block-editing.inc)0
-rw-r--r--zen-internals/template.comment.inc (renamed from zen/template.comment.inc)0
-rw-r--r--zen-internals/template.conditional-styles.inc (renamed from zen/template.conditional-styles.inc)0
-rw-r--r--zen-internals/template.theme-registry.inc (renamed from zen/template.theme-registry.inc)2
-rw-r--r--zen-internals/template.zen.inc (renamed from zen/template.zen.inc)15
-rw-r--r--zen.info (renamed from zen/zen.info)2
45 files changed, 181 insertions, 49 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e848a8d..60a2cd6 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 0000000..e075ccc
--- /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
index 5172552..c32b80e 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 0000000..f6e68a6
--- /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 0000000..c27f080
--- /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
index f796fc9..f796fc9 100644
--- a/zen/logo.png
+++ b/logo.png
Binary files differ
diff --git a/zen/template.php b/template.php
index f6db101..f80a8d2 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
index a84d5fe..a84d5fe 100644
--- a/zen/block.tpl.php
+++ b/templates/block.tpl.php
diff --git a/zen/comment-wrapper.tpl.php b/templates/comment-wrapper.tpl.php
index d7a803f..d7a803f 100644
--- a/zen/comment-wrapper.tpl.php
+++ b/templates/comment-wrapper.tpl.php
diff --git a/zen/comment.tpl.php b/templates/comment.tpl.php
index 8cd66cf..8cd66cf 100644
--- a/zen/comment.tpl.php
+++ b/templates/comment.tpl.php
diff --git a/zen/maintenance-page.tpl.php b/templates/maintenance-page.tpl.php
index 86c8541..86c8541 100644
--- a/zen/maintenance-page.tpl.php
+++ b/templates/maintenance-page.tpl.php
diff --git a/zen/node.tpl.php b/templates/node.tpl.php
index 13f982f..13f982f 100644
--- a/zen/node.tpl.php
+++ b/templates/node.tpl.php
diff --git a/zen/page.tpl.php b/templates/page.tpl.php
index 66de36c..66de36c 100644
--- a/zen/page.tpl.php
+++ b/templates/page.tpl.php
diff --git a/zen/theme-settings.php b/theme-settings.php
index 7f40ff7..c40fa9f 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 0000000..df31c98
--- /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
index 7a6c1a3..7a6c1a3 100755
--- a/zen/css/generate.sh
+++ b/zen-internals/css/generate.sh
diff --git a/zen/css/ie.css b/zen-internals/css/ie.css
index 7936322..7936322 100644
--- a/zen/css/ie.css
+++ b/zen-internals/css/ie.css
diff --git a/zen/css/ie5.css b/zen-internals/css/ie5.css
index 50ad62c..50ad62c 100644
--- a/zen/css/ie5.css
+++ b/zen-internals/css/ie5.css
diff --git a/zen/css/ie6.css b/zen-internals/css/ie6.css
index 88f758a..88f758a 100644
--- a/zen/css/ie6.css
+++ b/zen-internals/css/ie6.css
diff --git a/zen/css/print.css b/zen-internals/css/print.css
index c10c225..c10c225 100644
--- a/zen/css/print.css
+++ b/zen-internals/css/print.css
diff --git a/zen/css/theme-settings-rtl.css b/zen-internals/css/theme-settings-rtl.css
index 885f8a5..885f8a5 100644
--- a/zen/css/theme-settings-rtl.css
+++ b/zen-internals/css/theme-settings-rtl.css
diff --git a/zen/css/theme-settings.css b/zen-internals/css/theme-settings.css
index fc7eeba..fc7eeba 100644
--- a/zen/css/theme-settings.css
+++ b/zen-internals/css/theme-settings.css
diff --git a/zen/css/zen-fixed.css b/zen-internals/css/zen-fixed.css
index 991d5dc..991d5dc 100644
--- a/zen/css/zen-fixed.css
+++ b/zen-internals/css/zen-fixed.css
diff --git a/zen/css/zen-liquid.css b/zen-internals/css/zen-liquid.css
index d8af76f..d8af76f 100644
--- a/zen/css/zen-liquid.css
+++ b/zen-internals/css/zen-liquid.css
diff --git a/zen/images/messages-error-ie6.png b/zen-internals/images/messages-error-ie6.png
index 054b9f2..054b9f2 100644
--- a/zen/images/messages-error-ie6.png
+++ b/zen-internals/images/messages-error-ie6.png
Binary files differ
diff --git a/zen/images/messages-error.png b/zen-internals/images/messages-error.png
index 012813b..012813b 100644
--- a/zen/images/messages-error.png
+++ b/zen-internals/images/messages-error.png
Binary files differ
diff --git a/zen/images/messages-status-ie6.png b/zen-internals/images/messages-status-ie6.png
index f9eb63f..f9eb63f 100644
--- a/zen/images/messages-status-ie6.png
+++ b/zen-internals/images/messages-status-ie6.png
Binary files differ
diff --git a/zen/images/messages-status.png b/zen-internals/images/messages-status.png
index 9f07a42..9f07a42 100644
--- a/zen/images/messages-status.png
+++ b/zen-internals/images/messages-status.png
Binary files differ
diff --git a/zen/images/messages-warning-ie6.png b/zen-internals/images/messages-warning-ie6.png
index 551a9db..551a9db 100644
--- a/zen/images/messages-warning-ie6.png
+++ b/zen-internals/images/messages-warning-ie6.png
Binary files differ
diff --git a/zen/images/messages-warning.png b/zen-internals/images/messages-warning.png
index e727711..e727711 100644
--- a/zen/images/messages-warning.png
+++ b/zen-internals/images/messages-warning.png
Binary files differ
diff --git a/zen/images/tab-bar.png b/zen-internals/images/tab-bar.png
index 0b380be..0b380be 100644
--- a/zen/images/tab-bar.png
+++ b/zen-internals/images/tab-bar.png
Binary files differ
diff --git a/zen/images/tab-left-ie6.png b/zen-internals/images/tab-left-ie6.png
index 5c512ae..5c512ae 100644
--- a/zen/images/tab-left-ie6.png
+++ b/zen-internals/images/tab-left-ie6.png
Binary files differ
diff --git a/zen/images/tab-left.png b/zen-internals/images/tab-left.png
index dd925f7..dd925f7 100644
--- a/zen/images/tab-left.png
+++ b/zen-internals/images/tab-left.png
Binary files differ
diff --git a/zen/images/tab-right-ie6.png b/zen-internals/images/tab-right-ie6.png
index 1c00281..1c00281 100644
--- a/zen/images/tab-right-ie6.png
+++ b/zen-internals/images/tab-right-ie6.png
Binary files differ
diff --git a/zen/images/tab-right.png b/zen-internals/images/tab-right.png
index 9ed9cb2..9ed9cb2 100644
--- a/zen/images/tab-right.png
+++ b/zen-internals/images/tab-right.png
Binary files differ
diff --git a/zen/images/tab-secondary-bg.png b/zen-internals/images/tab-secondary-bg.png
index a5a617e..a5a617e 100644
--- a/zen/images/tab-secondary-bg.png
+++ b/zen-internals/images/tab-secondary-bg.png
Binary files differ
diff --git a/zen/images/tab-secondary.png b/zen-internals/images/tab-secondary.png
index bf4e8d2..bf4e8d2 100644
--- a/zen/images/tab-secondary.png
+++ b/zen-internals/images/tab-secondary.png
Binary files differ
diff --git a/zen/js/theme-settings.js b/zen-internals/js/theme-settings.js
index 04ce8b6..04ce8b6 100644
--- a/zen/js/theme-settings.js
+++ b/zen-internals/js/theme-settings.js
diff --git a/zen/screenshot.png b/zen-internals/screenshot.png
index 3821461..3821461 100644
--- a/zen/screenshot.png
+++ b/zen-internals/screenshot.png
Binary files differ
diff --git a/zen/template.block-editing.inc b/zen-internals/template.block-editing.inc
index ac27aeb..ac27aeb 100644
--- a/zen/template.block-editing.inc
+++ b/zen-internals/template.block-editing.inc
diff --git a/zen/template.comment.inc b/zen-internals/template.comment.inc
index 5fb6d72..5fb6d72 100644
--- a/zen/template.comment.inc
+++ b/zen-internals/template.comment.inc
diff --git a/zen/template.conditional-styles.inc b/zen-internals/template.conditional-styles.inc
index 72e1ea9..72e1ea9 100644
--- a/zen/template.conditional-styles.inc
+++ b/zen-internals/template.conditional-styles.inc
diff --git a/zen/template.theme-registry.inc b/zen-internals/template.theme-registry.inc
index 4523ffd..7338efd 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
index 0ad954c..a921aaa 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
-<!--[if IE]><link type="text/css" rel="stylesheet" media="all" href="$base_path/css/ie.css$query_string" /><![endif]-->
-<!--[if lte IE 6]><link type="text/css" rel="stylesheet" media="all" href="$base_path/css/ie6.css$query_string" /><![endif]-->
-<!--[if lte IE 5]><link type="text/css" rel="stylesheet" media="all" href="$base_path/css/ie5.css$query_string" /><![endif]-->
+<!--[if IE]><link type="text/css" rel="stylesheet" media="all" href="$base_path/ie.css$query_string" /><![endif]-->
+<!--[if lte IE 6]><link type="text/css" rel="stylesheet" media="all" href="$base_path/ie6.css$query_string" /><![endif]-->
+<!--[if lte IE 5]><link type="text/css" rel="stylesheet" media="all" href="$base_path/ie5.css$query_string" /><![endif]-->
+
IE_STYLES;
}
diff --git a/zen/zen.info b/zen.info
index a1fae4d..84143f4 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 <a href="http://drupal.org/node/226507">online docs</a> 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