Commit b13a4cb2 authored by Dries's avatar Dries
Browse files

- Changed the directory structure of theme chameleon.  Each template is now
  in a subdirectory.  This makes it easier to clone/fork an existing theme.
parent 8bab140a
...@@ -22,12 +22,13 @@ function chameleon_settings() { ...@@ -22,12 +22,13 @@ function chameleon_settings() {
$fd = opendir('themes/chameleon'); $fd = opendir('themes/chameleon');
while ($file = readdir($fd)) { while ($file = readdir($fd)) {
if (strstr($file, 'css') && $file != 'default.css') { if (is_dir("themes/chameleon/$file") && !in_array($file, array('.', '..', 'CVS'))) {
$files["themes/chameleon/$file"] = "themes/chameleon/$file"; $files["themes/chameleon/$file/chameleon.css"] = "themes/chameleon/$file/chameleon.css";
} }
} }
closedir($fd);
$output = form_select(t('CSS stylesheet'), 'chameleon_stylesheet', variable_get('chameleon_stylesheet', 'themes/chameleon/default.css'), $files, t('Selecting a different stylesheet will change the look and feel of your site.')); $output = form_select(t('CSS stylesheet'), 'chameleon_stylesheet', variable_get('chameleon_stylesheet', 'themes/chameleon/pure/chameleon.css'), $files, t('Selecting a different stylesheet will change the look and feel of your site.'));
return $output; return $output;
} }
...@@ -45,8 +46,8 @@ function chameleon_page($content, $title = NULL, $breadcrumb = NULL) { ...@@ -45,8 +46,8 @@ function chameleon_page($content, $title = NULL, $breadcrumb = NULL) {
$output .= "<head>\n"; $output .= "<head>\n";
$output .= " <title>". ($title ? $title ." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")) ."</title>\n"; $output .= " <title>". ($title ? $title ." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")) ."</title>\n";
$output .= drupal_get_html_head(); $output .= drupal_get_html_head();
$output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"themes/chameleon/default.css\" />\n"; $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"themes/chameleon/common.css\" />\n";
$output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"". variable_get("chameleon_stylesheet", "themes/chameleon/pure.css") ."\" />\n"; $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"". variable_get("chameleon_stylesheet", "themes/chameleon/pure/chameleon.css") ."\" />\n";
$output .= "</head>"; $output .= "</head>";
$output .= "<body ". theme_onload_attribute() .">\n"; $output .= "<body ". theme_onload_attribute() .">\n";
$output .= " <div id=\"header\">"; $output .= " <div id=\"header\">";
......
...@@ -78,7 +78,7 @@ table { ...@@ -78,7 +78,7 @@ table {
padding: 0.5em; padding: 0.5em;
} }
.item-list ul li { .item-list ul li {
list-style-image: url(images/marvin-bullet.png); list-style-image: url(marvin/bullet.png);
} }
.path, .path a, .path a:visited { .path, .path a, .path a:visited {
color: #888; color: #888;
......
...@@ -10,7 +10,7 @@ a:visited { ...@@ -10,7 +10,7 @@ a:visited {
} }
body { body {
padding: 5em 0 0 3em; padding: 5em 0 0 3em;
background-image: url(images/pure-background.gif); background-image: url(pure/background.gif);
background-repeat: repeat-x; background-repeat: repeat-x;
font-family: tahoma, verdana, arial, helvetica; font-family: tahoma, verdana, arial, helvetica;
border-top: 10px solid gray; border-top: 10px solid gray;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment