Commit 81861a8e authored by Dries's avatar Dries

- Removing some DOS-style line endings. Thanks TDobes.

parent a4f9fe89
......@@ -78,7 +78,7 @@ function init_theme() {
call_user_func($theme_engine .'_init', $themes[$theme]);
}
}
return $theme;
}
......@@ -192,7 +192,7 @@ function path_to_theme() {
/**
* Retrieve an associative array containing the settings for a theme.
*
* The final settings are arrived at by merging the default settings,
* The final settings are arrived at by merging the default settings,
* the site-wide settings, and the settings defined for the specific theme.
* If no $key was specified, only the site-wide theme defaults are retrieved.
*
......@@ -272,7 +272,7 @@ function drupal_get_theme_setting($setting_name, $refresh = FALSE) {
if ($settings['toggle_logo']) {
if ($settings['default_logo']) {
$settings['logo'] = dirname($theme_object->filename) .'/logo.png';
$settings['logo'] = dirname($theme_object->filename) .'/logo.png';
}
elseif ($settings['logo_path']) {
$settings['logo'] = $settings['logo_path'];
......@@ -421,7 +421,7 @@ function theme_links($links, $delimiter = ' | ') {
* @param $title
* The title text is displayed when the image is hovered in some popular browsers.
* @param $attr
* Attributes placed in the img tag.
* Attributes placed in the img tag.
* @param $getsize
* If set to true, the image's dimension are fetched and added as width/height attributes.
* @return
......@@ -657,7 +657,7 @@ function theme_mark() {
/**
* Import a stylesheet using @import.
*
*
* @param $stylesheet
* The filename to point the link at.
*
......
This diff is collapsed.
<!-- BEGIN: header --><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title>{head_title}</title>
{head}
</head>
<body{onload_attributes}>
<table border="0" cellpadding="0" cellspacing="0" id="header">
<tr>
<td id="logo">
<!-- BEGIN: logo -->
<a href="./" title="Home"><img src="{logo}" alt="Home" border="0" /></a>
<!-- END: logo -->
<!-- BEGIN: site_name -->
<h1 class='site-name'><a href="./" title="Home">{site_name}</a></h1>
<!-- END: site_name -->
<!-- BEGIN: site_slogan -->
<div class='site-slogan'>{site_slogan}</div>
<!-- END: site_slogan -->
</td>
<td id="menu">
<div id="secondary">{secondary_links}</div>
<div id="primary">{primary_links}</div>
<!-- BEGIN: search_box -->
<form action="{search_url}" method="post">
<div id="search">
<input class="form-text" type="text" size="15" value="" name="keys" alt="{search_description}" />
<input class="form-submit" type="submit" value="{search_button_text}" />
</div>
</form>
<!-- END: search_box -->
</td>
</tr>
</table>
<table border="0" cellpadding="0" cellspacing="0" id="content">
<tr>
<!-- BEGIN: blocks -->
<td id="sidebar-left">
{blocks}
</td>
<!-- END: blocks -->
<td valign="top">
<!-- BEGIN: mission -->
<div id="mission">{mission}</div>
<!-- END: mission -->
<div id="main">
<!-- BEGIN: title -->
{breadcrumb}
<h1 class="title">{title}</h1>
<!-- BEGIN: tabs -->
<div class="tabs">{tabs}</div>
<!-- END: tabs -->
<!-- END: title -->
<!-- BEGIN: help -->
<div id="help">{help}</div>
<!-- END: help -->
<!-- BEGIN: message -->
{message}
<!-- END: message -->
<!-- END: header -->
<!-- BEGIN: node -->
<div class="node {sticky}">
<!-- BEGIN: picture -->
{picture}
<!-- END: picture -->
<!-- BEGIN: title -->
<h2 class="title"><a href="{link}">{title}</a></h2>
<!-- END: title -->
<span class="submitted">{submitted}</span>
<!-- BEGIN: taxonomy -->
<span class="taxonomy">{taxonomy}</span>
<!-- END: taxonomy -->
<div class="content">{content}</div>
<!-- BEGIN: links -->
<div class="links">&raquo; {links}</div>
<!-- END: links -->
</div>
<!-- END: node -->
<!-- BEGIN: comment -->
<div class="comment">
<!-- BEGIN: picture -->
{picture}
<!-- END: picture -->
<h3 class="title">{title}</h3><!-- BEGIN: new --><span class="new">{new}</span><!-- END: new -->
<div class="submitted">{submitted}</div>
<div class="content">{content}</div>
<!-- BEGIN: links -->
<div class="links">&raquo; {links}</div>
<!-- END: links -->
</div>
<!-- END: comment -->
<!-- BEGIN: box -->
<div class="box">
<h2 class="title">{title}</h2>
<div class="content">{content}</div>
</div>
<!-- END: box -->
<!-- BEGIN: block -->
<div class="block block-{module}" id="block-{module}-{delta}">
<h2 class="title">{title}</h2>
<div class="content">{content}</div>
</div>
<!-- END: block -->
<!-- BEGIN: footer -->
</div><!-- main -->
</td>
<!-- BEGIN: blocks -->
<td id="sidebar-right">
{blocks}
</td>
<!-- END: blocks -->
</tr>
</table>
<!-- BEGIN: message -->
<div id="footer">
{footer_message}
</div>
<!-- END: message -->
{footer}
</body>
</html>
<!-- END: footer -->
<!-- BEGIN: header --><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title>{head_title}</title>
{head}
</head>
<body{onload_attributes}>
<table border="0" cellpadding="0" cellspacing="0" id="header">
<tr>
<td id="logo">
<!-- BEGIN: logo -->
<a href="./" title="Home"><img src="{logo}" alt="Home" border="0" /></a>
<!-- END: logo -->
<!-- BEGIN: site_name -->
<h1 class='site-name'><a href="./" title="Home">{site_name}</a></h1>
<!-- END: site_name -->
<!-- BEGIN: site_slogan -->
<div class='site-slogan'>{site_slogan}</div>
<!-- END: site_slogan -->
</td>
<td id="menu">
<div id="secondary">{secondary_links}</div>
<div id="primary">{primary_links}</div>
<!-- BEGIN: search_box -->
<form action="{search_url}" method="post">
<div id="search">
<input class="form-text" type="text" size="15" value="" name="keys" alt="{search_description}" />
<input class="form-submit" type="submit" value="{search_button_text}" />
</div>
</form>
<!-- END: search_box -->
</td>
</tr>
</table>
<table border="0" cellpadding="0" cellspacing="0" id="content">
<tr>
<!-- BEGIN: blocks -->
<td id="sidebar-left">
{blocks}
</td>
<!-- END: blocks -->
<td valign="top">
<!-- BEGIN: mission -->
<div id="mission">{mission}</div>
<!-- END: mission -->
<div id="main">
<!-- BEGIN: title -->
{breadcrumb}
<h1 class="title">{title}</h1>
<!-- BEGIN: tabs -->
<div class="tabs">{tabs}</div>
<!-- END: tabs -->
<!-- END: title -->
<!-- BEGIN: help -->
<div id="help">{help}</div>
<!-- END: help -->
<!-- BEGIN: message -->
{message}
<!-- END: message -->
<!-- END: header -->
<!-- BEGIN: node -->
<div class="node {sticky}">
<!-- BEGIN: picture -->
{picture}
<!-- END: picture -->
<!-- BEGIN: title -->
<h2 class="title"><a href="{link}">{title}</a></h2>
<!-- END: title -->
<span class="submitted">{submitted}</span>
<!-- BEGIN: taxonomy -->
<span class="taxonomy">{taxonomy}</span>
<!-- END: taxonomy -->
<div class="content">{content}</div>
<!-- BEGIN: links -->
<div class="links">&raquo; {links}</div>
<!-- END: links -->
</div>
<!-- END: node -->
<!-- BEGIN: comment -->
<div class="comment">
<!-- BEGIN: picture -->
{picture}
<!-- END: picture -->
<h3 class="title">{title}</h3><!-- BEGIN: new --><span class="new">{new}</span><!-- END: new -->
<div class="submitted">{submitted}</div>
<div class="content">{content}</div>
<!-- BEGIN: links -->
<div class="links">&raquo; {links}</div>
<!-- END: links -->
</div>
<!-- END: comment -->
<!-- BEGIN: box -->
<div class="box">
<h2 class="title">{title}</h2>
<div class="content">{content}</div>
</div>
<!-- END: box -->
<!-- BEGIN: block -->
<div class="block block-{module}" id="block-{module}-{delta}">
<h2 class="title">{title}</h2>
<div class="content">{content}</div>
</div>
<!-- END: block -->
<!-- BEGIN: footer -->
</div><!-- main -->
</td>
<!-- BEGIN: blocks -->
<td id="sidebar-right">
{blocks}
</td>
<!-- END: blocks -->
</tr>
</table>
<!-- BEGIN: message -->
<div id="footer">
{footer_message}
</div>
<!-- END: message -->
{footer}
</body>
</html>
<!-- END: footer -->
<?php
// $Id$
function chameleon_features() {
return array(
'logo',
'toggle_name',
'toggle_search',
'toggle_slogan',
'toggle_primary_links',
'toggle_secondary_links');
}
function chameleon_page($content, $title = NULL, $breadcrumb = NULL) {
if (isset($title)) {
drupal_set_title($title);
}
if (isset($breadcrumb)) {
drupal_set_breadcrumb($breadcrumb);
}
$output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
$output .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">\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 .= drupal_get_html_head();
$output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"themes/chameleon/common.css\" />\n";
$output .= "</head>";
$output .= "<body". theme_onload_attribute() .">\n";
$output .= " <div id=\"header\">";
if ($logo = drupal_get_theme_setting('logo')) {
$output .= " <a href=\"./\" title=\"Home\"><img src=\"$logo\" alt=\"Home\" /></a>";
}
if (drupal_get_theme_setting('toggle_name')) {
$output .= " <h1 class=\"site-name title\">". l(variable_get('site_name', 'drupal'), ""). "</h1>";
}
if (drupal_get_theme_setting('toggle_slogan')) {
$output .= " <div class=\"site-slogan\">". variable_get('site_slogan', '') ."</div>";
}
$output .= "</div>\n";
$primary_links = drupal_get_theme_setting('primary_links');
$secondary_links = drupal_get_theme_setting('secondary_links');
if ($primary_links || $secondary_links) {
$output .= ' <div class="navlinks">';
if ($primary_links) {
$output .= '<div class="primary">'. $primary_links .'</div>';
}
if ($secondary_links) {
$output .= '<div class="secondary">'. $secondary_links .'</div>';
}
$output .= " </div>\n";
}
$output .= " <table>\n";
$output .= " <tr>\n";
if ($blocks = theme_blocks("left")) {
$output .= " <td id=\"sidebar-left\">$blocks</td>\n";
}
$output .= " <td id=\"main\">\n";
if ($title = drupal_get_title()) {
$output .= theme("breadcrumb", drupal_get_breadcrumb());
$output .= "<h2>$title</h2>";
}
if ($tabs = theme('menu_local_tasks')) {
$output .= $tabs;
}
if ($help = menu_get_active_help()) {
$output .= "<div id=\"help\">$help</div><hr />";
}
$output .= theme_status_messages();
$output .= "\n<!-- begin content -->\n";
$output .= $content;
$output .= "\n<!-- end content -->\n";
if ($footer = variable_get('site_footer', '')) {
$output .= " <div id=\"footer\">$footer</div>\n";
}
$output .= " </td>\n";
if ($blocks = theme_blocks("right")) {
$output .= " <td id=\"sidebar-right\">$blocks</td>\n";
}
$output .= " </tr>\n";
$output .= " </table>\n";
$output .= theme_closure();
$output .= " </body>\n";
$output .= "</html>\n";
return $output;
}
function chameleon_node($node, $main = 0, $page = 0) {
$output = "<div class=\"node\">\n";
if (!$page) {
$output .= " <h2 class=\"title\">". ($main ? l($node->title, "node/$node->nid") : $node->title) ."</h2>\n";
}
$output .= " <div class=\"content\">\n";
if ($main && $node->teaser) {
$output .= $node->teaser;
}
else {
$output .= $node->body;
}
$output .= " </div>\n";
$submitted = drupal_get_theme_setting("toggle_node_info_$node->type") ? array(t("By %author at %date", array('%author' => format_name($node), '%date' => format_date($node->created, 'small')))) : array();
if (module_exist('taxonomy')) {
$terms = taxonomy_link("taxonomy terms", $node);
}
if ($links = link_node($node, $main)) {
$output .= " <div class=\"links\">". theme('links', array_merge($submitted, $terms, $links)) ."</div>\n";
}
$output .= "</div>\n";
return $output;
}
function chameleon_comment($comment, $link = "") {
$submitted = array(t('By %author at %date', array('%author' => format_name($comment), '%date' => format_date($comment->timestamp. 'small'))));
$links = array($link);
$output = "<div class=\"comment\">\n";
$output .= " <h3 class=\"title\">". l($comment->subject, $_GET['q'], NULL, NULL, "comment-$comment->cid") ."</h3>\n";
$output .= " <div class=\"content\">". $comment->comment ."</div>\n";
$output .= " <div class=\"links\">". theme('links', array_merge($submitted, $links)) ."</div>\n";
$output .= "</div>\n";
return $output;
}
?>
<?php
// $Id$
function chameleon_features() {
return array(
'logo',
'toggle_name',
'toggle_search',
'toggle_slogan',
'toggle_primary_links',
'toggle_secondary_links');
}
function chameleon_page($content, $title = NULL, $breadcrumb = NULL) {
if (isset($title)) {
drupal_set_title($title);
}
if (isset($breadcrumb)) {
drupal_set_breadcrumb($breadcrumb);
}
$output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
$output .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">\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 .= drupal_get_html_head();
$output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"themes/chameleon/common.css\" />\n";
$output .= "</head>";
$output .= "<body". theme_onload_attribute() .">\n";
$output .= " <div id=\"header\">";
if ($logo = drupal_get_theme_setting('logo')) {
$output .= " <a href=\"./\" title=\"Home\"><img src=\"$logo\" alt=\"Home\" /></a>";
}
if (drupal_get_theme_setting('toggle_name')) {
$output .= " <h1 class=\"site-name title\">". l(variable_get('site_name', 'drupal'), ""). "</h1>";
}
if (drupal_get_theme_setting('toggle_slogan')) {
$output .= " <div class=\"site-slogan\">". variable_get('site_slogan', '') ."</div>";
}
$output .= "</div>\n";
$primary_links = drupal_get_theme_setting('primary_links');
$secondary_links = drupal_get_theme_setting('secondary_links');
if ($primary_links || $secondary_links) {
$output .= ' <div class="navlinks">';
if ($primary_links) {
$output .= '<div class="primary">'. $primary_links .'</div>';
}
if ($secondary_links) {
$output .= '<div class="secondary">'. $secondary_links .'</div>';
}
$output .= " </div>\n";
}
$output .= " <table>\n";
$output .= " <tr>\n";
if ($blocks = theme_blocks("left")) {
$output .= " <td id=\"sidebar-left\">$blocks</td>\n";
}
$output .= " <td id=\"main\">\n";
if ($title = drupal_get_title()) {
$output .= theme("breadcrumb", drupal_get_breadcrumb());
$output .= "<h2>$title</h2>";
}
if ($tabs = theme('menu_local_tasks')) {
$output .= $tabs;
}
if ($help = menu_get_active_help()) {
$output .= "<div id=\"help\">$help</div><hr />";
}
$output .= theme_status_messages();
$output .= "\n<!-- begin content -->\n";
$output .= $content;
$output .= "\n<!-- end content -->\n";
if ($footer = variable_get('site_footer', '')) {
$output .= " <div id=\"footer\">$footer</div>\n";
}
$output .= " </td>\n";
if ($blocks = theme_blocks("right")) {
$output .= " <td id=\"sidebar-right\">$blocks</td>\n";
}
$output .= " </tr>\n";
$output .= " </table>\n";
$output .= theme_closure();
$output .= " </body>\n";
$output .= "</html>\n";
return $output;
}
function chameleon_node($node, $main = 0, $page = 0) {
$output = "<div class=\"node\">\n";
if (!$page) {
$output .= " <h2 class=\"title\">". ($main ? l($node->title, "node/$node->nid") : $node->title) ."</h2>\n";
}
$output .= " <div class=\"content\">\n";
if ($main && $node->teaser) {
$output .= $node->teaser;
}
else {
$output .= $node->body;
}
$output .= " </div>\n";
$submitted = drupal_get_theme_setting("toggle_node_info_$node->type") ? array(t("By %author at %date", array('%author' => format_name($node), '%date' => format_date($node->created, 'small')))) : array();
if (module_exist('taxonomy')) {
$terms = taxonomy_link("taxonomy terms", $node);
}
if ($links = link_node($node, $main)) {
$output .= " <div class=\"links\">". theme('links', array_merge($submitted, $terms, $links)) ."</div>\n";
}
$output .= "</div>\n";
return $output;
}
function chameleon_comment($comment, $link = "") {
$submitted = array(t('By %author at %date', array('%author' => format_name($comment), '%date' => format_date($comment->timestamp. 'small'))));
$links = array($link);
$output = "<div class=\"comment\">\n";
$output .= " <h3 class=\"title\">". l($comment->subject, $_GET['q'], NULL, NULL, "comment-$comment->cid") ."</h3>\n";
$output .= " <div class=\"content\">". $comment->comment ."</div>\n";
$output .= " <div class=\"links\">". theme('links', array_merge($submitted, $links)) ."</div>\n";
$output .= "</div>\n";
return $output;
}
?>
/* $Id$ */
/*
** HTML elements
*/
a, a:link, a:active {
font-weight: bold;
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
body {
margin: 0;
padding: 3em;
font-size: .9em;
line-height: 1.3em;
}
blockquote {
font-style: italic;
}
table {
margin: 0;
padding: .5em;
border-collapse: collapse;
}
code, pre {
font-size: 1em;
}
pre {
font-size: 0.8em;
padding: 1em;
background: #eee;
}
li {
padding-bottom: .3em;
}
h1, h2, h3, h4, h5, h6 {
margin-bottom: .25em;
}
h1 {
font-size: 1.3em;
}
h2 {
font-size: 1.2em;
}
h3 {
font-size: 1.1em;
}
h4, h5, h6 {
font-size: 1em;
}
p {
margin: 0 0 .5em 0;
}
br {
line-height: 0.6em;
}
/*
** Page layout blocks / IDs
*/
#header {
margin-bottom: 2em;
}
#help {
font-size: 0.8em;
}
#sidebar-left, #sidebar-right {
vertical-align: top;
padding: 10px;
}
#main {
padding-left: 1em;
padding-right: 1em;
vertical-align: top;
}
#footer {
font-size: 0.8em;
padding-top: 2em;
text-align: center;
}
/*
** Common declarations for child classes of node, comment, block, box etc
*/
.title {
margin: 0 0 .25em 0;
}
.content {
margin: 0 0 .5em 0;
}
.links {
font-size: 0.8em;
line-height: 1.25em;
}
.block {
width: 180px;
}
.messages {
padding: 0.3em;
margin: 0.5em 0em 0.5em 0em;
}
.status {
border: 1px solid #3a3;
color: #3a3;
}
.error, form-item input.error {
border: 1px solid red;
color: red;
}
/*
** Common navigation links added on the admin/themes/settings page
*/
.navlinks {
padding: 0em 0.5em 1.5em 0em;
}
.primary a {
font-size: 1.0em;