|
';
- $output .= theme_get_setting('toggle_name') ? variable_get("site_name", "drupal") : '';
+
+ if ($logo = theme_get_setting('logo')) {
+ // If it's a png, then add height and width so the IE png hack will work.
+ $image = getimagesize(substr($logo, strlen(base_path())));
+ $image = $image[2] == 3 ? ' '. $image[3] : '';
+ $output .= '
+
+ |
- |||
|
+ $output .= '
+
'. $primary_links .'
+
+
+ ';
+ }
+
+ $output .= '
|
|||
| @@ -73,7 +131,7 @@ function interlaced_page($content) { | |||
| \n"; $output .= $blocks; @@ -84,8 +142,8 @@ function interlaced_page($content) { $output .= " | \n";
if ($title) {
- $output .= theme("breadcrumb", drupal_get_breadcrumb());
- $output .= "$title"; + $output .= ''; + $output .= "$title ";
}
if ($tabs = theme('menu_local_tasks')) {
@@ -102,7 +160,7 @@ function interlaced_page($content) {
$output .= " | \n";
- $blocks = theme("blocks", "right");
+ $blocks = theme('blocks', 'right');
if ($blocks) {
$output .= " \n"; $output .= " | \n"; @@ -121,7 +179,7 @@ function interlaced_page($content) { |
| ' . variable_get(site_footer, "") . ' | +' . variable_get(site_footer, '') . ' |
". theme("links", $node->links) ."
\n";
+ $output .= "". theme('links', $node->links) ."
\n";
}
-
+
return $output;
}
@@ -185,11 +243,11 @@ function interlaced_comment($comment, $l
$output .= $comment->comment;
}
- $output .= "";
+ $output .= '';
- $output .= " ". theme('links', $links) ."
\n";
+ $output .= ' '. theme('links', $links) ."
\n";
$output .= "\n\n"; - + return $output; } @@ -218,7 +276,18 @@ function interlaced_links($links, $delim if (!is_array($links)) { return ''; } - return implode(" ", $links); + + foreach ($links as $key => $link) { + + if ($link['href']) { + $links[$key] = l($link['title'], $link['href'], $link['attributes'], $link['query'], $link['fragment']); + } + else if ($link['title']) { + //Some links are actually not links--output directly. + $links[$key] = check_plain($link['title']); + } + } + return implode(' ', $links); } function interlaced_help() { Index: styles1.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/interlaced/styles1.css,v retrieving revision 1.5 diff -u -F^f -r1.5 styles1.css --- styles1.css 2 Mar 2004 02:59:49 -0000 1.5 +++ styles1.css 7 Oct 2006 05:58:03 -0000 @@ -8,18 +8,11 @@ text-decoration: none; - } - - - - - body { - font-family: Verdana, Arial, Helvetica, sans-serif; color: #555555; @@ -36,42 +29,85 @@ margin-top: 0px; +} + +/* Header styles */ + +.header { + + height:80px; + } +.headerlogo { + + float: left; + + padding-top: 5px; + + padding-right: 15px; + +} + + +.headersearch { + + float: right; + + padding-top: 30px; + + padding-right: 15px; + +} -/* Header styles */ .headersitename { font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 26px; + font-size: 28px; font-weight: bold; color: #BED7FC; - height:65px; - vertical-align: middle; + vertical-align: top; + align: left; +} -} +.headerslogan { + font-family: Verdana, Arial, Helvetica, sans-serif; + + font-size: 12px; + + font-weight: bold; + + color: #BED7FC; + + padding-left: 140px; + +} .headerlinks { + white-space: nowrap; + font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold; + padding-top: 16px; + } @@ -79,7 +115,20 @@ padding: 10px; +} + +.breadcrumb { + +} + + +.breadcrumb a { + +} + + +.page-title { } @@ -97,14 +146,12 @@ padding-bottom: 10px; - - } .nodetitle a { - color: #999999; + color: #999999; font-weight: normal; @@ -113,7 +160,7 @@ .nodetitle a:hover { - text-decoration: underline; + text-decoration: underline; } @@ -126,11 +173,9 @@ font-size: 90%; - } - .nodebody { font-family: Verdana, Arial, Helvetica, sans-serif; @@ -145,7 +190,6 @@ padding-left: 20px; - } @@ -165,7 +209,6 @@ padding-bottom: 30px; - } @@ -184,9 +227,6 @@ font-weight: bold; - - - } @@ -200,8 +240,6 @@ - - /* Misc other styles */ @@ -213,6 +251,7 @@ .leftcolumn { width: 150px; + padding-right:7px; } @@ -221,6 +260,7 @@ .rightcolumn { width: 150px; + padding-left:7px; } @@ -232,7 +272,8 @@ background-repeat: repeat-x; - width: 100%; + width: 100%; + } @@ -244,31 +285,36 @@ width: 24px; - white-space: nowrap; + white-space: nowrap; + } -.delimiter { - background-image: url(images/delimiter.gif); - background-repeat: no-repeat; - width: 5px; - margin-right: 5px; - margin-left: 5px; - background-position: center; - - -} .delimiter { - vertical-align: bottom; + background-image: url(images/delimiter.gif); + + background-repeat: no-repeat; + + width: 5px; + + margin-right: 5px; + + margin-left: 5px; + background-position: center; + vertical-align: bottom; } .block-list { + padding-left: 1.0em; + margin-left: 0em; + list-style-image: url("misc/menu-collapsed.gif"); + } Index: styles2.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/interlaced/styles2.css,v retrieving revision 1.5 diff -u -F^f -r1.5 styles2.css --- styles2.css 2 Mar 2004 02:59:49 -0000 1.5 +++ styles2.css 7 Oct 2006 05:58:03 -0000 @@ -1,45 +1,108 @@ /* Standard styles */ -a { - color: #AA0000; - font-weight: bold; - text-decoration: none; -} - - - -body { - - font-family: Georgia, Times New Roman, Times; - line-height: normal; - background-image: url(images/back2.gif); - background-repeat: repeat-x; - margin-left: 25px; - margin-top: 0px; - -} - - -/* Header styles */ - -.headersitename { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 26px; - font-weight: bold; - color: #FFAAAA; - height:65px; - vertical-align: middle; -} +a { + + color: #AA0000; + + font-weight: bold; + + text-decoration: none; + +} + + +body { + + font-family: Georgia, Times New Roman, Times; + + line-height: normal; + + background-image: url(images/back2.gif); + + background-repeat: repeat-x; + + margin-left: 25px; + + margin-top: 0px; + +} + + +/* Header styles */ + +.header { + + height:80px; + +} + + +.headerlogo { + + float: left; + + padding-top: 5px; + + padding-right: 15px; + +} + + +.headersearch { + + float: right; + + padding-top: 30px; + + padding-right: 15px; + +} + + +.headersitename { + + font-family: Verdana, Arial, Helvetica, sans-serif; + + font-size: 28px; + + font-weight: bold; + + color: #FFAAAA; + + vertical-align: middle; + + align: left; + +} + + +.headerslogan { + + font-family: Verdana, Arial, Helvetica, sans-serif; + + font-size: 12px; + + font-weight: bold; + + color: #FFAAAA; + + padding-left: 140px; + +} .headerlinks { + white-space: nowrap; + font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold; + padding-top: 16px; + } @@ -47,7 +110,20 @@ padding: 10px; +} + +.breadcrumb { + +} + + +.breadcrumb a { + +} + + +.page-title { } @@ -57,15 +133,14 @@ .nodetitle { - font-family: Georgia, Times New Roman, Times; + font-family: Georgia, Times New Roman, Times; + font-size: 22px; color: #888888; padding-bottom: 3px; - - } @@ -80,7 +155,7 @@ .nodetitle a:hover { - text-decoration: underline; + text-decoration: underline; } @@ -93,14 +168,13 @@ font-size: 80%; - } - .nodebody { - font-family: Georgia, Times New Roman, Times; + font-family: Georgia, Times New Roman, Times; + color: #333333; line-height: 150%; @@ -109,7 +183,6 @@ font-weight: normal; - } @@ -146,9 +219,6 @@ font-weight: bold; - - - } @@ -162,8 +232,6 @@ - - /* Misc other styles */ @@ -175,6 +243,7 @@ .leftcolumn { width: 150px; + padding-right: 10px; } @@ -183,6 +252,7 @@ .rightcolumn { width: 150px; + padding-left: 10px; } @@ -194,7 +264,8 @@ background-repeat: repeat-x; - width: 100%; + width: 100%; + } @@ -206,25 +277,36 @@ width: 24px; - white-space: nowrap; - padding-left: 5px; - padding-right: 5px; + white-space: nowrap; + + padding-left: 5px; + + padding-right: 5px; } -.delimiter { - background-image: url(images/delimiter.gif); - background-repeat: no-repeat; - width: 5px; - margin-right: 5px; - margin-left: 5px; - background-position: center; - - +.delimiter { + + background-image: url(images/delimiter.gif); + + background-repeat: no-repeat; + + width: 5px; + + margin-right: 5px; + + margin-left: 5px; + + background-position: center; + } .block-list { + padding-left: 1.0em; + margin-left: 0em; + list-style-image: url("misc/menu-collapsed.gif"); + } Index: styles3.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/interlaced/styles3.css,v retrieving revision 1.5 diff -u -F^f -r1.5 styles3.css --- styles3.css 2 Mar 2004 02:59:49 -0000 1.5 +++ styles3.css 7 Oct 2006 05:58:03 -0000 @@ -1,7 +1,5 @@ /* Standard styles */ - - a { color: #FF9900; @@ -10,20 +8,11 @@ text-decoration: none; - - } - - - - - body { - - font-family: Verdana, Arial, Helvetica, sans-serif; color: #555555; @@ -40,64 +29,83 @@ margin-top: 0px; - - } +/* Header styles */ +.header { -/* Header styles */ + height:80px; +} -.headersitename { +.headerlogo { - font-family: Arial, Helvetica, sans-serif; + float: left; - font-size: 30px; + padding-top: 5px; - font-weight: normal; + padding-right: 15px; - color: #FFFFCC; +} - text-transform: uppercase; - letter-spacing: 11px; +.headersearch { - padding: 25px 0px 30px 65px; + float: right; - white-space: nowrap; + padding-top: 30px; - background-image: url(images/orange.gif); + padding-right: 15px; - background-repeat: no-repeat; +} - background-position: 10px; +.headersitename { + font-family: Arial, Helvetica, sans-serif; + font-size: 30px; + font-weight: normal; + color: #FFFFCC; + text-transform: uppercase; + letter-spacing: 11px; + padding-top: 20px; + padding-left: 100px; + white-space: nowrap; + background-image: url(images/orange.gif); + background-repeat: no-repeat; + background-position: 10px 10px; +} +.headerslogan{ + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; -} + font-weight: bold; + color: #FFFFCC; + padding-left: 140px; +} .headerlinks { @@ -114,35 +122,36 @@ padding-left: 15px; - padding-right: 10px; - + padding-right: 10px; + padding-top: 15px; } - - - - .headerspace { padding: 10px; +} +.breadcrumb { +} +.breadcrumb a { } +.page-title { +} -/* Node styles */ - +/* Node styles */ .nodetitle { @@ -156,38 +165,23 @@ padding-left: 15px; - - - - - - - - - - } - .nodetitle a { color: #000000; - - } - .nodetitle a:hover { - text-decoration: underline; + text-decoration: underline; } - .nodedate { color: #CCCCCC; @@ -196,14 +190,9 @@ font-size: 80%; - - } - - - .nodebody { font-family: Arial, Helvetica, sans-serif; @@ -218,20 +207,6 @@ padding-left: 15px; - - - - - - - - - - - - - - } @@ -252,18 +227,12 @@ padding-left: 15px; - - } - - /* Box styles */ - - .boxtitle { font-family: Arial, Helvetica, sans-serif; @@ -280,16 +249,9 @@ letter-spacing: 2px; - - - - - - } - .boxbody { font-family: Arial, Helvetica, sans-serif; @@ -300,15 +262,8 @@ - - - - - - /* Misc other styles */ - .centercolumn { } @@ -317,7 +272,9 @@ .leftcolumn { width: 150px; + padding-left: 10px; + padding-right: 20px; } @@ -326,7 +283,9 @@ .rightcolumn { width: 150px; + padding-left: 20px; + padding-right: 10px; } @@ -338,12 +297,11 @@ background-repeat: repeat-x; - width: 100%; + width: 100%; } - .linev { background-image: url(images/dotline2v.gif); @@ -352,12 +310,11 @@ width: 24px; - white-space: nowrap; + white-space: nowrap; } - .delimiter { background-image: url(images/delimiter2.gif); @@ -372,16 +329,16 @@ background-position: center; - - - - } .block-list { + padding-left: 1.0em; + margin-left: 0em; + list-style-image: url("misc/menu-collapsed.gif"); + } Index: styles4.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/interlaced/styles4.css,v retrieving revision 1.4 diff -u -F^f -r1.4 styles4.css --- styles4.css 2 Mar 2004 02:59:49 -0000 1.4 +++ styles4.css 7 Oct 2006 05:58:03 -0000 @@ -1,7 +1,5 @@ /* Standard styles */ - - a { color: #FF0000; @@ -10,16 +8,9 @@ text-decoration: none; - - } - - - - - body { font-family: Verdana, Arial, Helvetica, sans-serif; @@ -48,19 +39,40 @@ font-size: 14px; +} + + +/* Header styles */ +.header { + height: 170px; } +.headerlogo { + float: left; + padding-top: 5px; -/* Header styles */ + padding-right: 15px; + +} +.headersearch { + + float: right; + + padding-top: 30px; + + padding-right: 15px; + +} + .headersitename { @@ -80,52 +92,35 @@ background-position: 0px 0px; - height: 170px; - width: 100%; - padding-top: 115px; + padding-top: 100px; padding-right: 0px; - padding-left: 40px; + padding-left: 140px; padding-bottom: 0px; +} +.headerslogan{ + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; + font-weight: bold; + color: #FFFFFF; + padding-left: 140px; - - - - - - - - - - - - - - - - - - - - + padding-top: 3px; } - - - .headerlinks { font-family: Verdana, Arial, Helvetica, sans-serif; @@ -140,33 +135,35 @@ padding-right: 20px; - line-height: 140%; - + padding-top: 10px; + line-height: 140%; } - - - .headerspace { padding: 20px; width: 100%; +} +.breadcrumb { +} - - +.breadcrumb a { } +.page-title { + +} @@ -184,16 +181,6 @@ font-weight: bold; - - - - - - - - - - } @@ -202,30 +189,22 @@ color: #000000; - - - } .nodetitle a:hover { - text-decoration: underline; - + text-decoration: underline; } - .nodedate { } - - - .nodebody { font-family: Verdana, Arial, Helvetica, sans-serif; @@ -238,21 +217,6 @@ font-weight: normal; - - - - - - - - - - - - - - - } @@ -272,17 +236,12 @@ padding-bottom: 50px; - } - - /* Box styles */ - - .boxtitle { font-family: Arial, Helvetica, sans-serif; @@ -299,16 +258,9 @@ letter-spacing: 2px; - - - - - - } - .boxbody { font-family: Arial, Helvetica, sans-serif; @@ -319,12 +271,6 @@ - - - - - - /* Misc other styles */ @@ -336,7 +282,9 @@ .leftcolumn { width: 150px; + padding-left: 40px; + padding-right: 20px; } @@ -345,7 +293,9 @@ .rightcolumn { width: 150px; + padding-left: 20px; + padding-right: 40px; } @@ -357,7 +307,7 @@ background-repeat: repeat-x; - width: 100%; + width: 100%; } @@ -371,12 +321,11 @@ width: 34px; - white-space: nowrap; + white-space: nowrap; } - .delimiter { background-image: url(images/delimiter3.gif); @@ -391,16 +340,15 @@ background-position: center; - - - - } - .block-list { + padding-left: 1.0em; + margin-left: 0em; + list-style-image: url("misc/menu-collapsed.gif"); + }