- Patch #911054 by Rob Loach, cosmicdreams, aspilicious, Jacine: remove Garland from core.
Dries Buytaert
parent
4b522e22ad
commit
23c5741b61
|
|
@ -6,6 +6,7 @@ Drupal 8.0, xxxx-xx-xx (development version)
|
|||
modules with similar functionality are available:
|
||||
* Blog
|
||||
* Profile
|
||||
- Removed the Garland theme from core.
|
||||
- Universally Unique IDentifier (UUID):
|
||||
* Support for generating and validating UUIDs.
|
||||
|
||||
|
|
|
|||
|
|
@ -280,9 +280,6 @@ Bartik theme
|
|||
- Jen Simmons 'jensimmons' <http://drupal.org/user/140882>
|
||||
- Jeff Burns 'Jeff Burnz' <http://drupal.org/user/61393>
|
||||
|
||||
Garland theme
|
||||
- John Albin Wilkins 'JohnAlbin' <http://drupal.org/user/32095>
|
||||
|
||||
Seven theme
|
||||
- Jeff Burns 'Jeff Burnz' <http://drupal.org/user/61393>
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class ColorTestCase extends DrupalWebTestCase {
|
|||
public static function getInfo() {
|
||||
return array(
|
||||
'name' => 'Color functionality',
|
||||
'description' => 'Modify the Bartik and Garland theme colors and make sure the changes are reflected on the frontend',
|
||||
'description' => 'Modify the Bartik theme colors and make sure the changes are reflected on the frontend.',
|
||||
'group' => 'Color',
|
||||
);
|
||||
}
|
||||
|
|
@ -27,18 +27,13 @@ class ColorTestCase extends DrupalWebTestCase {
|
|||
// Create users.
|
||||
$this->big_user = $this->drupalCreateUser(array('administer themes'));
|
||||
|
||||
// This tests the color module in both Bartik and Garland.
|
||||
// This tests the color module in Bartik.
|
||||
$this->themes = array(
|
||||
'bartik' => array(
|
||||
'palette_input' => 'palette[bg]',
|
||||
'scheme' => 'slate',
|
||||
'scheme_color' => '#3b3b3b',
|
||||
),
|
||||
'garland' => array(
|
||||
'palette_input' => 'palette[link]',
|
||||
'scheme' => 'greenbeam',
|
||||
'scheme_color' => '#0c7a00',
|
||||
),
|
||||
);
|
||||
theme_enable(array_keys($this->themes));
|
||||
|
||||
|
|
|
|||
|
|
@ -569,8 +569,8 @@ class CommentInterfaceTest extends CommentHelperCase {
|
|||
*/
|
||||
function testCommentLinks() {
|
||||
// Bartik theme alters comment links, so use a different theme.
|
||||
theme_enable(array('garland'));
|
||||
variable_set('theme_default', 'garland');
|
||||
theme_enable(array('stark'));
|
||||
variable_set('theme_default', 'stark');
|
||||
|
||||
// Remove additional user permissions from $this->web_user added by setUp(),
|
||||
// since this test is limited to anonymous and authenticated roles only.
|
||||
|
|
|
|||
|
|
@ -1629,6 +1629,18 @@ function system_update_8000() {
|
|||
update_module_enable(array('entity'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Move from the Garland theme.
|
||||
*/
|
||||
function system_update_8001() {
|
||||
$themes = array('theme_default', 'maintenance_theme', 'admin_theme');
|
||||
foreach ($themes as $theme) {
|
||||
if (variable_get($theme) == 'garland') {
|
||||
variable_set($theme, 'bartik');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @} End of "defgroup updates-7.x-to-8.x"
|
||||
* The next series of updates should start at 9000.
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@ ini_set('session.cookie_lifetime', 2000000);
|
|||
* Remove the leading hash signs to enable.
|
||||
*/
|
||||
# $conf['site_name'] = 'My Drupal site';
|
||||
# $conf['theme_default'] = 'garland';
|
||||
# $conf['theme_default'] = 'stark';
|
||||
# $conf['anonymous'] = 'Visitor';
|
||||
|
||||
/**
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB |
|
|
@ -1,220 +0,0 @@
|
|||
<?php
|
||||
|
||||
$info = array(
|
||||
|
||||
// Available colors and color labels used in theme.
|
||||
'fields' => array(
|
||||
'base' => t('Base color'),
|
||||
'link' => t('Link color'),
|
||||
'top' => t('Header top'),
|
||||
'bottom' => t('Header bottom'),
|
||||
'text' => t('Text color'),
|
||||
),
|
||||
// Pre-defined color schemes.
|
||||
'schemes' => array(
|
||||
'default' => array(
|
||||
'title' => t('Blue Lagoon (Default)'),
|
||||
'colors' => array(
|
||||
'base' => '#0072b9',
|
||||
'link' => '#027ac6',
|
||||
'top' => '#2385c2',
|
||||
'bottom' => '#5ab5ee',
|
||||
'text' => '#494949',
|
||||
),
|
||||
),
|
||||
'ash' => array(
|
||||
'title' => t('Ash'),
|
||||
'colors' => array(
|
||||
'base' => '#464849',
|
||||
'link' => '#2f416f',
|
||||
'top' => '#2a2b2d',
|
||||
'bottom' => '#5d6779',
|
||||
),
|
||||
),
|
||||
'aquamarine' => array(
|
||||
'title' => t('Aquamarine'),
|
||||
'colors' => array(
|
||||
'base' => '#55c0e2',
|
||||
'link' => '#000000',
|
||||
'text' => '#696969',
|
||||
'top' => '#085360',
|
||||
'bottom' => '#007e94',
|
||||
),
|
||||
),
|
||||
'chocolate' => array(
|
||||
'title' => t('Belgian Chocolate'),
|
||||
'colors' => array(
|
||||
'base' => '#d5b048',
|
||||
'link' => '#6c420e',
|
||||
'top' => '#331900',
|
||||
'bottom' => '#971702',
|
||||
),
|
||||
),
|
||||
'bluemarine' => array(
|
||||
'title' => t('Bluemarine'),
|
||||
'colors' => array(
|
||||
'base' => '#3f3f3f',
|
||||
'link' => '#336699',
|
||||
'text' => '#000000',
|
||||
'top' => '#6598cb',
|
||||
'bottom' => '#6598cb',
|
||||
),
|
||||
),
|
||||
'citrus' => array(
|
||||
'title' => t('Citrus Blast'),
|
||||
'colors' => array(
|
||||
'base' => '#d0cb9a',
|
||||
'link' => '#917803',
|
||||
'top' => '#efde01',
|
||||
'bottom' => '#e6fb2d',
|
||||
),
|
||||
),
|
||||
'cold' => array(
|
||||
'title' => t('Cold Day'),
|
||||
'colors' => array(
|
||||
'base' => '#0f005c',
|
||||
'link' => '#434f8c',
|
||||
'text' => '#000000',
|
||||
'top' => '#4d91ff',
|
||||
'bottom' => '#1a1575',
|
||||
),
|
||||
),
|
||||
'greenbeam' => array(
|
||||
'title' => t('Greenbeam'),
|
||||
'colors' => array(
|
||||
'base' => '#c9c497',
|
||||
'link' => '#0c7a00',
|
||||
'top' => '#03961e',
|
||||
'bottom' => '#7be000',
|
||||
),
|
||||
),
|
||||
'mediterrano' => array(
|
||||
'title' => t('Mediterrano'),
|
||||
'colors' => array(
|
||||
'base' => '#ffe23d',
|
||||
'link' => '#a9290a',
|
||||
'top' => '#fc6d1d',
|
||||
'bottom' => '#a30f42',
|
||||
),
|
||||
),
|
||||
'mercury' => array(
|
||||
'title' => t('Mercury'),
|
||||
'colors' => array(
|
||||
'base' => '#788597',
|
||||
'link' => '#3f728d',
|
||||
'top' => '#a9adbc',
|
||||
'bottom' => '#d4d4d4',
|
||||
'text' => '#707070',
|
||||
),
|
||||
),
|
||||
'nocturnal' => array(
|
||||
'title' => t('Nocturnal'),
|
||||
'colors' => array(
|
||||
'base' => '#5b5fa9',
|
||||
'link' => '#5b5faa',
|
||||
'top' => '#0a2352',
|
||||
'bottom' => '#9fa8d5',
|
||||
),
|
||||
),
|
||||
'olivia' => array(
|
||||
'title' => t('Olivia'),
|
||||
'colors' => array(
|
||||
'base' => '#7db323',
|
||||
'link' => '#6a9915',
|
||||
'top' => '#b5d52a',
|
||||
'bottom' => '#7db323',
|
||||
'text' => '#191a19',
|
||||
),
|
||||
),
|
||||
'pink_plastic' => array(
|
||||
'title' => t('Pink Plastic'),
|
||||
'colors' => array(
|
||||
'base' => '#12020b',
|
||||
'link' => '#1b1a13',
|
||||
'top' => '#f391c6',
|
||||
'bottom' => '#f41063',
|
||||
'text' => '#898080',
|
||||
),
|
||||
),
|
||||
'shiny_tomato' => array(
|
||||
'title' => t('Shiny Tomato'),
|
||||
'colors' => array(
|
||||
'base' => '#b7a0ba',
|
||||
'link' => '#c70000',
|
||||
'top' => '#a1443a',
|
||||
'bottom' => '#f21107',
|
||||
'text' => '#515d52',
|
||||
),
|
||||
),
|
||||
'teal_top' => array(
|
||||
'title' => t('Teal Top'),
|
||||
'colors' => array(
|
||||
'base' => '#18583d',
|
||||
'link' => '#1b5f42',
|
||||
'top' => '#34775a',
|
||||
'bottom' => '#52bf90',
|
||||
'text' => '#2d2d2d',
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// Images to copy over.
|
||||
'copy' => array(
|
||||
'images/menu-collapsed.gif',
|
||||
'images/menu-collapsed-rtl.gif',
|
||||
'images/menu-expanded.gif',
|
||||
'images/menu-leaf.gif',
|
||||
),
|
||||
|
||||
// CSS files (excluding @import) to rewrite with new color scheme.
|
||||
'css' => array(
|
||||
'style.css',
|
||||
),
|
||||
|
||||
// Gradient definitions.
|
||||
'gradients' => array(
|
||||
array(
|
||||
// (x, y, width, height).
|
||||
'dimension' => array(0, 38, 760, 121),
|
||||
// Direction of gradient ('vertical' or 'horizontal').
|
||||
'direction' => 'vertical',
|
||||
// Keys of colors to use for the gradient.
|
||||
'colors' => array('top', 'bottom'),
|
||||
),
|
||||
),
|
||||
|
||||
// Color areas to fill (x, y, width, height).
|
||||
'fill' => array(
|
||||
'base' => array(0, 0, 760, 568),
|
||||
'link' => array(107, 533, 41, 23),
|
||||
),
|
||||
|
||||
// Coordinates of all the theme slices (x, y, width, height)
|
||||
// with their filename as used in the stylesheet.
|
||||
'slices' => array(
|
||||
'images/body.png' => array(0, 37, 1, 280),
|
||||
'images/bg-bar.png' => array(202, 530, 76, 14),
|
||||
'images/bg-bar-white.png' => array(202, 506, 76, 14),
|
||||
'images/bg-tab.png' => array(107, 533, 41, 23),
|
||||
'images/bg-navigation.png' => array(0, 0, 7, 37),
|
||||
'images/bg-content-left.png' => array(40, 117, 50, 352),
|
||||
'images/bg-content-right.png' => array(510, 117, 50, 352),
|
||||
'images/bg-content.png' => array(299, 117, 7, 200),
|
||||
'images/bg-navigation-item.png' => array(32, 37, 17, 12),
|
||||
'images/bg-navigation-item-hover.png' => array(54, 37, 17, 12),
|
||||
'images/gradient-inner.png' => array(646, 307, 112, 42),
|
||||
|
||||
'logo.png' => array(622, 51, 64, 73),
|
||||
'screenshot.png' => array(0, 37, 400, 240),
|
||||
),
|
||||
|
||||
// Reference color used for blending. Matches the base.png's colors.
|
||||
'blend_target' => '#ffffff',
|
||||
|
||||
// Preview files.
|
||||
'preview_image' => 'color/preview.png',
|
||||
'preview_css' => 'color/preview.css',
|
||||
|
||||
// Base file for image generation.
|
||||
'base_image' => 'color/base.png',
|
||||
);
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
|
||||
/* Positioning */
|
||||
#preview {
|
||||
overflow: hidden;
|
||||
max-width: 100%;
|
||||
}
|
||||
#preview,
|
||||
#preview #img {
|
||||
width: 600px;
|
||||
height: 371px;
|
||||
}
|
||||
#preview #gradient-0 {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
top: 19px;
|
||||
height: 120px;
|
||||
z-index: 2;
|
||||
}
|
||||
#preview #text {
|
||||
position: absolute;
|
||||
left: 80px;
|
||||
width: 436px;
|
||||
top: 160px;
|
||||
height: 120px;
|
||||
z-index: 4;
|
||||
}
|
||||
#preview #img {
|
||||
position: relative;
|
||||
z-index: 3;
|
||||
background-image: url(preview.png);
|
||||
}
|
||||
#preview #gradient-0 .gradient-line {
|
||||
height: 10px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* Basic styles to match */
|
||||
#preview {
|
||||
font: 12px/170% Verdana;
|
||||
}
|
||||
#preview h2 {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-weight: normal;
|
||||
font-family: Helvetica, Arial, sans-serif;
|
||||
font-size: 160%;
|
||||
line-height: 130%;
|
||||
}
|
||||
#preview p {
|
||||
margin: .5em 0;
|
||||
}
|
||||
#preview a:link,
|
||||
#preview a:visited {
|
||||
text-decoration: none;
|
||||
font-weight: normal;
|
||||
}
|
||||
#preview a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 9.7 KiB |
|
|
@ -1,31 +0,0 @@
|
|||
<?php
|
||||
?>
|
||||
<div class="<?php print $classes . ' ' . $zebra; ?>"<?php print $attributes; ?>>
|
||||
|
||||
<div class="clearfix">
|
||||
|
||||
<span class="submitted"><?php print $submitted ?></span>
|
||||
|
||||
<?php if ($new): ?>
|
||||
<span class="new"><?php print drupal_ucfirst($new) ?></span>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php print $picture ?>
|
||||
|
||||
<?php print render($title_prefix); ?>
|
||||
<h3<?php print $title_attributes; ?>><?php print $title ?></h3>
|
||||
<?php print render($title_suffix); ?>
|
||||
|
||||
<div class="content"<?php print $content_attributes; ?>>
|
||||
<?php hide($content['links']); print render($content); ?>
|
||||
<?php if ($signature): ?>
|
||||
<div class="clearfix">
|
||||
<div>—</div>
|
||||
<?php print $signature ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php print render($content['links']) ?>
|
||||
</div>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
name = Garland
|
||||
description = A multi-column theme which can be configured to modify colors and switch between fixed and fluid width layouts.
|
||||
package = Core
|
||||
version = VERSION
|
||||
core = 8.x
|
||||
stylesheets[all][] = style.css
|
||||
stylesheets[print][] = print.css
|
||||
settings[garland_width] = fluid
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 103 B |
Binary file not shown.
|
Before Width: | Height: | Size: 125 B |
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 485 B |
Binary file not shown.
|
Before Width: | Height: | Size: 441 B |
Binary file not shown.
|
Before Width: | Height: | Size: 499 B |
Binary file not shown.
|
Before Width: | Height: | Size: 104 B |
Binary file not shown.
|
Before Width: | Height: | Size: 115 B |
Binary file not shown.
|
Before Width: | Height: | Size: 680 B |
Binary file not shown.
|
Before Width: | Height: | Size: 188 B |
Binary file not shown.
|
Before Width: | Height: | Size: 176 B |
Binary file not shown.
|
Before Width: | Height: | Size: 176 B |
Binary file not shown.
|
Before Width: | Height: | Size: 183 B |
Binary file not shown.
|
Before Width: | Height: | Size: 174 B |
Binary file not shown.
|
Before Width: | Height: | Size: 128 B |
Binary file not shown.
|
Before Width: | Height: | Size: 5.0 KiB |
|
|
@ -1,87 +0,0 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Override of the default maintenance page.
|
||||
*
|
||||
* This is an override of the default maintenance page. Used for Garland and
|
||||
* Minnelli, this file should not be moved or modified since the installation
|
||||
* and update pages depend on this file.
|
||||
*
|
||||
* This mirrors closely page.tpl.php for Garland in order to share the same
|
||||
* styles.
|
||||
*/
|
||||
?><!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" xml:lang="<?php print $language->language ?>" lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
|
||||
<head>
|
||||
<title><?php print $head_title ?></title>
|
||||
<?php print $head ?>
|
||||
<?php print $styles ?>
|
||||
<?php print $scripts ?>
|
||||
</head>
|
||||
<body class="<?php print $classes ?>">
|
||||
|
||||
<!-- Layout -->
|
||||
<div id="header-region" class="clearfix"><?php print $header; ?></div>
|
||||
|
||||
<div id="wrapper">
|
||||
<div id="container" class="clearfix">
|
||||
|
||||
<div id="header">
|
||||
<div id="logo-floater">
|
||||
<?php
|
||||
// Prepare header
|
||||
$site_fields = array();
|
||||
if ($site_name) {
|
||||
$site_fields[] = $site_name;
|
||||
}
|
||||
if ($site_slogan) {
|
||||
$site_fields[] = $site_slogan;
|
||||
}
|
||||
$site_title = implode(' ', $site_fields);
|
||||
if ($site_fields) {
|
||||
$site_fields[0] = '<span>' . $site_fields[0] . '</span>';
|
||||
}
|
||||
$site_html = implode(' ', $site_fields);
|
||||
|
||||
if ($logo || $site_title) {
|
||||
print '<h1 id="branding"><a href="' . $base_path . '" title="' . $site_title . '">';
|
||||
if ($logo) {
|
||||
print '<img src="' . $logo . '" alt="' . $site_title . '" id="logo" />';
|
||||
}
|
||||
print $site_html . '</a></h1>';
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
|
||||
</div> <!-- /header -->
|
||||
|
||||
<?php if ($sidebar_first): ?>
|
||||
<div id="sidebar-first" class="sidebar">
|
||||
<?php print $sidebar_first ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
|
||||
<?php if ($title): ?><h2><?php print $title ?></h2><?php endif; ?>
|
||||
<?php print $messages; ?>
|
||||
<?php print $help; ?>
|
||||
<div class="clearfix">
|
||||
<?php print $content ?>
|
||||
</div>
|
||||
<div id="footer"><?php print $footer ?></div>
|
||||
</div></div></div></div> <!-- /.left-corner, /.right-corner, /#squeeze, /#center -->
|
||||
|
||||
<?php if ($sidebar_second): ?>
|
||||
<div id="sidebar-second" class="sidebar">
|
||||
<?php print $sidebar_second ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
</div> <!-- /container -->
|
||||
</div>
|
||||
<!-- /layout -->
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
<?php
|
||||
?>
|
||||
<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
|
||||
|
||||
<?php print $user_picture; ?>
|
||||
|
||||
<?php print render($title_prefix); ?>
|
||||
<?php if (!$page): ?>
|
||||
<h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
|
||||
<?php endif; ?>
|
||||
<?php print render($title_suffix); ?>
|
||||
|
||||
<?php if ($display_submitted): ?>
|
||||
<span class="submitted"><?php print $submitted ?></span>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="content clearfix"<?php print $content_attributes; ?>>
|
||||
<?php
|
||||
// We hide the comments and links now so that we can render them later.
|
||||
hide($content['comments']);
|
||||
hide($content['links']);
|
||||
print render($content);
|
||||
?>
|
||||
</div>
|
||||
|
||||
<div class="clearfix">
|
||||
<?php if (!empty($content['links'])): ?>
|
||||
<div class="links"><?php print render($content['links']); ?></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php print render($content['comments']); ?>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
<?php
|
||||
?>
|
||||
<?php print render($page['header']); ?>
|
||||
|
||||
<div id="wrapper">
|
||||
<div id="container" class="clearfix">
|
||||
|
||||
<div id="header">
|
||||
<div id="logo-floater">
|
||||
<?php if ($logo || $site_title): ?>
|
||||
<?php if ($title): ?>
|
||||
<div id="branding"><strong><a href="<?php print $front_page ?>">
|
||||
<?php if ($logo): ?>
|
||||
<img src="<?php print $logo ?>" alt="<?php print $site_name_and_slogan ?>" title="<?php print $site_name_and_slogan ?>" id="logo" />
|
||||
<?php endif; ?>
|
||||
<?php print $site_html ?>
|
||||
</a></strong></div>
|
||||
<?php else: /* Use h1 when the content title is empty */ ?>
|
||||
<h1 id="branding"><a href="<?php print $front_page ?>">
|
||||
<?php if ($logo): ?>
|
||||
<img src="<?php print $logo ?>" alt="<?php print $site_name_and_slogan ?>" title="<?php print $site_name_and_slogan ?>" id="logo" />
|
||||
<?php endif; ?>
|
||||
<?php print $site_html ?>
|
||||
</a></h1>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
||||
<?php if ($primary_nav): print $primary_nav; endif; ?>
|
||||
<?php if ($secondary_nav): print $secondary_nav; endif; ?>
|
||||
</div> <!-- /#header -->
|
||||
|
||||
<?php if ($page['sidebar_first']): ?>
|
||||
<div id="sidebar-first" class="sidebar">
|
||||
<?php print render($page['sidebar_first']); ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
|
||||
<?php print $breadcrumb; ?>
|
||||
<?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?>
|
||||
<a id="main-content"></a>
|
||||
<?php if ($tabs): ?><div id="tabs-wrapper" class="clearfix"><?php endif; ?>
|
||||
<?php print render($title_prefix); ?>
|
||||
<?php if ($title): ?>
|
||||
<h1<?php print $tabs ? ' class="with-tabs"' : '' ?>><?php print $title ?></h1>
|
||||
<?php endif; ?>
|
||||
<?php print render($title_suffix); ?>
|
||||
<?php if ($tabs): ?><?php print render($tabs); ?></div><?php endif; ?>
|
||||
<?php print render($tabs2); ?>
|
||||
<?php print $messages; ?>
|
||||
<?php print render($page['help']); ?>
|
||||
<?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
|
||||
<div class="clearfix">
|
||||
<?php print render($page['content']); ?>
|
||||
</div>
|
||||
<?php print $feed_icons ?>
|
||||
<?php print render($page['footer']); ?>
|
||||
</div></div></div></div> <!-- /.left-corner, /.right-corner, /#squeeze, /#center -->
|
||||
|
||||
<?php if ($page['sidebar_second']): ?>
|
||||
<div id="sidebar-second" class="sidebar">
|
||||
<?php print render($page['sidebar_second']); ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
</div> <!-- /#container -->
|
||||
</div> <!-- /#wrapper -->
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
|
||||
body,
|
||||
input,
|
||||
textarea,
|
||||
select {
|
||||
color: #000;
|
||||
background: none;
|
||||
font-family: Verdana, sans-serif;
|
||||
font-size: 11pt;
|
||||
}
|
||||
|
||||
ul.main-menu,
|
||||
ul.secondary-menu,
|
||||
#header-region,
|
||||
.sidebar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
body.two-sidebars,
|
||||
body.sidebar-first,
|
||||
body.sidebar-second,
|
||||
body {
|
||||
width: 640px;
|
||||
}
|
||||
|
||||
body.sidebar-first #center,
|
||||
body.sidebar-second #center,
|
||||
body.two-sidebars #center,
|
||||
body.sidebar-first #squeeze,
|
||||
body.sidebar-second #squeeze,
|
||||
body.two-sidebars #squeeze {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
#wrapper,
|
||||
#wrapper #container .breadcrumb,
|
||||
#wrapper #container #center,
|
||||
#wrapper #container #center .right-corner,
|
||||
#wrapper #container #center .right-corner .left-corner,
|
||||
#wrapper #container #footer,
|
||||
#wrapper #container #center #squeeze {
|
||||
position: static;
|
||||
left: 0;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
width: auto;
|
||||
float: none;
|
||||
clear: both;
|
||||
background: none;
|
||||
}
|
||||
|
||||
#wrapper #container #header {
|
||||
height: 130px;
|
||||
}
|
||||
|
||||
#wrapper #container #header h1,
|
||||
#wrapper #container #header h1 a:link,
|
||||
#wrapper #container #header h1 a:visited {
|
||||
text-shadow: none;
|
||||
color: #000;
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
|
|
@ -1,344 +0,0 @@
|
|||
|
||||
html {
|
||||
direction: rtl;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generic elements
|
||||
*/
|
||||
body {
|
||||
direction: rtl;
|
||||
}
|
||||
|
||||
ul,
|
||||
.block ul,
|
||||
ol {
|
||||
padding: 0 1.5em 0 0;
|
||||
}
|
||||
|
||||
ul.menu,
|
||||
.item-list ul {
|
||||
margin: 0.35em -0.5em 0 0;
|
||||
}
|
||||
|
||||
ol li,
|
||||
ul li,
|
||||
ul.menu li,
|
||||
.item-list ul li,
|
||||
li.leaf {
|
||||
margin: 0.15em .5em 0.15em 0;
|
||||
}
|
||||
|
||||
ul li.collapsed {
|
||||
list-style-image: url(images/menu-collapsed-rtl.gif);
|
||||
}
|
||||
|
||||
ul.inline li {
|
||||
padding: 0 0 0 1em;
|
||||
}
|
||||
|
||||
ol.task-list {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
ol.task-list li {
|
||||
padding: 0.5em 2em 0.5em 1em;
|
||||
}
|
||||
|
||||
ol.task-list li.active {
|
||||
background: transparent url(images/task-list.png) no-repeat 97px 50%;
|
||||
}
|
||||
|
||||
ol.task-list li.done {
|
||||
background: transparent url(../../misc/watchdog-ok.png) no-repeat 100% 50%;
|
||||
}
|
||||
|
||||
ol.task-list li.active {
|
||||
margin-right: 0;
|
||||
margin-left: 1em;
|
||||
}
|
||||
|
||||
dl {
|
||||
margin: 0.5em 1.5em 1em 0;
|
||||
}
|
||||
|
||||
dl dt {
|
||||
}
|
||||
|
||||
dl dd {
|
||||
margin: 0 1.5em .5em 0;
|
||||
}
|
||||
|
||||
.messages li {
|
||||
padding: 0 1.3 0 0;
|
||||
}
|
||||
|
||||
.form-button,
|
||||
.form-submit {
|
||||
margin: 0 0 0 0.5em;
|
||||
}
|
||||
|
||||
.region-header h2 {
|
||||
margin: 0 0 0 1em;
|
||||
}
|
||||
|
||||
#wrapper {
|
||||
background: #edf5fa url("images/body.png") repeat-x 50% 0;
|
||||
}
|
||||
|
||||
#branding img {
|
||||
padding-right: 0;
|
||||
padding-left: 20px;
|
||||
float: right;
|
||||
}
|
||||
|
||||
#wrapper #container #center {
|
||||
float: right;
|
||||
}
|
||||
|
||||
body.sidebar-first #center {
|
||||
margin-left: 0;
|
||||
margin-right: -210px;
|
||||
}
|
||||
body.sidebar-second #center {
|
||||
margin-left: -210px;
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
/* And add blanks left and right for the sidebars to fill */
|
||||
body.sidebar-first #squeeze {
|
||||
margin-left: 0;
|
||||
margin-right: 210px;
|
||||
}
|
||||
body.sidebar-second #squeeze {
|
||||
margin-left: 210px;
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
#wrapper #container .sidebar {
|
||||
float: right;
|
||||
}
|
||||
|
||||
#sidebar-first .block {
|
||||
padding: 0 0 0 15px;
|
||||
}
|
||||
|
||||
#sidebar-second .block {
|
||||
padding: 0 15px 0 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#sidebar-first .block-region {
|
||||
margin: 0 0 0 15px;
|
||||
}
|
||||
|
||||
#sidebar-second .block-region {
|
||||
margin: 0 15px 0px 0;
|
||||
}
|
||||
|
||||
/* Now we add the backgrounds for the main content shading */
|
||||
#wrapper #container #center #squeeze {
|
||||
background: #fff url("images/bg-content.png") repeat-x 50% 0;
|
||||
}
|
||||
|
||||
#wrapper #container .breadcrumb {
|
||||
position: absolute;
|
||||
top: 15px;
|
||||
left: 0;
|
||||
right: 35px;
|
||||
z-index: 3;
|
||||
}
|
||||
|
||||
/**
|
||||
* Primary navigation
|
||||
*/
|
||||
ul.main-menu {
|
||||
float: left;
|
||||
width:70%;
|
||||
}
|
||||
|
||||
ul.main-menu li {
|
||||
float: right;
|
||||
}
|
||||
|
||||
/**
|
||||
* Secondary navigation
|
||||
*/
|
||||
ul.secondary-menu {
|
||||
float: left;
|
||||
clear: left;
|
||||
margin-left: 16em;
|
||||
}
|
||||
|
||||
ul.secondary-menu li {
|
||||
float: right;
|
||||
}
|
||||
|
||||
ul.primary {
|
||||
float: right;
|
||||
}
|
||||
ul.secondary {
|
||||
clear: both;
|
||||
text-align: right;
|
||||
}
|
||||
h1.with-tabs {
|
||||
float: right;
|
||||
margin: 0 0 0 2em;
|
||||
}
|
||||
|
||||
ul.primary li a,
|
||||
ul.primary li.active a,
|
||||
ul.primary li a:hover,
|
||||
ul.primary li a:visited,
|
||||
ul.secondary li a,
|
||||
ul.secondary li.active a,
|
||||
ul.secondary li a:hover,
|
||||
ul.secondary li a:visited {
|
||||
margin: 0 1px 0 0;
|
||||
|
||||
}
|
||||
ul.primary li a:after {
|
||||
/* Fix Firefox 2 RTL bug. */
|
||||
content: " ";
|
||||
}
|
||||
|
||||
ul.links li, ul.inline li {
|
||||
padding-left: 1em;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
.node .links,
|
||||
.comment .links {
|
||||
text-align: right;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
.user-picture,
|
||||
.comment .submitted {
|
||||
padding-left: 0;
|
||||
float: left;
|
||||
clear: left;
|
||||
padding-right: 1em;
|
||||
}
|
||||
|
||||
.new {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.indented {
|
||||
margin-left: 0;
|
||||
margin-right: 25px;
|
||||
}
|
||||
|
||||
html.js fieldset.collapsible .fieldset-legend {
|
||||
padding-left: 0;
|
||||
padding-right: 2em;
|
||||
background: url("images/menu-expanded.gif") no-repeat 100% 50%;
|
||||
}
|
||||
|
||||
html.js fieldset.collapsed .fieldset-legend {
|
||||
background: url("images/menu-collapsed-rtl.gif") no-repeat 100% 50%;
|
||||
}
|
||||
|
||||
/**
|
||||
* Vertical tabs.
|
||||
*/
|
||||
div.vertical-tabs {
|
||||
margin-left: 5%;
|
||||
margin-right: 15em;
|
||||
}
|
||||
|
||||
/**
|
||||
* Syndication Block
|
||||
*/
|
||||
#block-node-syndicate h2 {
|
||||
float: right;
|
||||
padding-right: 0;
|
||||
padding-left: 20px;
|
||||
}
|
||||
|
||||
#block-node-syndicate img {
|
||||
float: left;
|
||||
}
|
||||
|
||||
#block-node-syndicate .content {
|
||||
clear: left;
|
||||
}
|
||||
|
||||
/**
|
||||
* Login Block
|
||||
*/
|
||||
#user-login-form ul {
|
||||
text-align: right;
|
||||
}
|
||||
#user-login-form .openid-links {
|
||||
padding-left: 0;
|
||||
padding-right: 0.5em;
|
||||
}
|
||||
#user-login-form .openid-links li.user-link {
|
||||
padding-left: 0;
|
||||
padding-right: 1em;
|
||||
}
|
||||
|
||||
div.admin .left {
|
||||
float: right;
|
||||
}
|
||||
|
||||
div.admin .right {
|
||||
float: left;
|
||||
}
|
||||
|
||||
/* Fix Opera, IE6 and IE7 header width */
|
||||
#wrapper #container #header {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#wrapper #container #header #logo-floater {
|
||||
width: 100%;
|
||||
left: 0;
|
||||
top:0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fixes for IE7 - Does not break other browsers
|
||||
*/
|
||||
|
||||
/* Position:relative on these breaks IE7. */
|
||||
ul.primary li a,
|
||||
ul.primary li.active a,
|
||||
ul.primary li a:hover,
|
||||
ul.primary li a:visited,
|
||||
ul.secondary li a,
|
||||
ul.secondary li.active a,
|
||||
ul.secondary li a:hover,
|
||||
ul.secondary li a:visited {
|
||||
position: static;
|
||||
}
|
||||
|
||||
/* Fix right and left cloumns position breaking on window resize */
|
||||
#container {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
#center {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
#sidebar-second {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Apply hasLayout to elements in IE7, using standard property "min-height"
|
||||
* (see http://www.satzansatz.de/cssd/onhavinglayout.html)
|
||||
*/
|
||||
|
||||
/* Fix background bleed in center column. */
|
||||
#squeeze,
|
||||
#squeeze .right-corner {
|
||||
min-height: 1%;
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,158 +0,0 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Return a themed breadcrumb trail.
|
||||
*
|
||||
* @param $breadcrumb
|
||||
* An array containing the breadcrumb links.
|
||||
* @return a string containing the breadcrumb output.
|
||||
*/
|
||||
function garland_breadcrumb($variables) {
|
||||
$breadcrumb = $variables['breadcrumb'];
|
||||
|
||||
if (!empty($breadcrumb)) {
|
||||
// Provide a navigational heading to give context for breadcrumb links to
|
||||
// screen-reader users. Make the heading invisible with .element-invisible.
|
||||
$output = '<h2 class="element-invisible">' . t('You are here') . '</h2>';
|
||||
|
||||
$output .= '<div class="breadcrumb">' . implode(' › ', $breadcrumb) . '</div>';
|
||||
return $output;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Override or insert variables into the maintenance page template.
|
||||
*/
|
||||
function garland_preprocess_maintenance_page(&$vars) {
|
||||
// While markup for normal pages is split into page.tpl.php and html.tpl.php,
|
||||
// the markup for the maintenance page is all in the single
|
||||
// maintenance-page.tpl.php template. So, to have what's done in
|
||||
// garland_preprocess_html() also happen on the maintenance page, it has to be
|
||||
// called here.
|
||||
garland_preprocess_html($vars);
|
||||
}
|
||||
|
||||
/**
|
||||
* Override or insert variables into the html template.
|
||||
*/
|
||||
function garland_preprocess_html(&$vars) {
|
||||
// Toggle fixed or fluid width.
|
||||
if (theme_get_setting('garland_width') == 'fluid') {
|
||||
$vars['classes_array'][] = 'fluid-width';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Override or insert variables into the html template.
|
||||
*/
|
||||
function garland_process_html(&$vars) {
|
||||
// Hook into color.module
|
||||
if (module_exists('color')) {
|
||||
_color_html_alter($vars);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Override or insert variables into the page template.
|
||||
*/
|
||||
function garland_preprocess_page(&$vars) {
|
||||
// Move secondary tabs into a separate variable.
|
||||
$vars['tabs2'] = array(
|
||||
'#theme' => 'menu_local_tasks',
|
||||
'#secondary' => $vars['tabs']['#secondary'],
|
||||
);
|
||||
unset($vars['tabs']['#secondary']);
|
||||
|
||||
if (isset($vars['main_menu'])) {
|
||||
$vars['primary_nav'] = theme('links__system_main_menu', array(
|
||||
'links' => $vars['main_menu'],
|
||||
'attributes' => array(
|
||||
'class' => array('links', 'inline', 'main-menu'),
|
||||
),
|
||||
'heading' => array(
|
||||
'text' => t('Main menu'),
|
||||
'level' => 'h2',
|
||||
'class' => array('element-invisible'),
|
||||
)
|
||||
));
|
||||
}
|
||||
else {
|
||||
$vars['primary_nav'] = FALSE;
|
||||
}
|
||||
if (isset($vars['secondary_menu'])) {
|
||||
$vars['secondary_nav'] = theme('links__system_secondary_menu', array(
|
||||
'links' => $vars['secondary_menu'],
|
||||
'attributes' => array(
|
||||
'class' => array('links', 'inline', 'secondary-menu'),
|
||||
),
|
||||
'heading' => array(
|
||||
'text' => t('Secondary menu'),
|
||||
'level' => 'h2',
|
||||
'class' => array('element-invisible'),
|
||||
)
|
||||
));
|
||||
}
|
||||
else {
|
||||
$vars['secondary_nav'] = FALSE;
|
||||
}
|
||||
|
||||
// Prepare header.
|
||||
$site_fields = array();
|
||||
if (!empty($vars['site_name'])) {
|
||||
$site_fields[] = $vars['site_name'];
|
||||
}
|
||||
if (!empty($vars['site_slogan'])) {
|
||||
$site_fields[] = $vars['site_slogan'];
|
||||
}
|
||||
$vars['site_title'] = implode(' ', $site_fields);
|
||||
if (!empty($site_fields)) {
|
||||
$site_fields[0] = '<span>' . $site_fields[0] . '</span>';
|
||||
}
|
||||
$vars['site_html'] = implode(' ', $site_fields);
|
||||
|
||||
// Set a variable for the site name title and logo alt attributes text.
|
||||
$slogan_text = $vars['site_slogan'];
|
||||
$site_name_text = $vars['site_name'];
|
||||
$vars['site_name_and_slogan'] = $site_name_text . ' ' . $slogan_text;
|
||||
}
|
||||
|
||||
/**
|
||||
* Override or insert variables into the node template.
|
||||
*/
|
||||
function garland_preprocess_node(&$vars) {
|
||||
$vars['submitted'] = $vars['date'] . ' — ' . $vars['name'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Override or insert variables into the comment template.
|
||||
*/
|
||||
function garland_preprocess_comment(&$vars) {
|
||||
$vars['submitted'] = $vars['created'] . ' — ' . $vars['author'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Override or insert variables into the block template.
|
||||
*/
|
||||
function garland_preprocess_block(&$vars) {
|
||||
$vars['title_attributes_array']['class'][] = 'title';
|
||||
$vars['classes_array'][] = 'clearfix';
|
||||
}
|
||||
|
||||
/**
|
||||
* Override or insert variables into the page template.
|
||||
*/
|
||||
function garland_process_page(&$vars) {
|
||||
// Hook into color.module
|
||||
if (module_exists('color')) {
|
||||
_color_page_alter($vars);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Override or insert variables into the region template.
|
||||
*/
|
||||
function garland_preprocess_region(&$vars) {
|
||||
if ($vars['region'] == 'header') {
|
||||
$vars['classes_array'][] = 'clearfix';
|
||||
}
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Theme setting callbacks for the garland theme.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Implements hook_form_FORM_ID_alter().
|
||||
*
|
||||
* @param $form
|
||||
* The form.
|
||||
* @param $form_state
|
||||
* The form state.
|
||||
*/
|
||||
function garland_form_system_theme_settings_alter(&$form, &$form_state) {
|
||||
|
||||
$form['garland_width'] = array(
|
||||
'#type' => 'radios',
|
||||
'#title' => t('Content width'),
|
||||
'#options' => array(
|
||||
'fluid' => t('Fluid width'),
|
||||
'fixed' => t('Fixed width'),
|
||||
),
|
||||
'#default_value' => theme_get_setting('garland_width'),
|
||||
'#description' => t('Specify whether the content will wrap to a fixed width or will fluidly expand to the width of the browser window.'),
|
||||
// Place this above the color scheme options.
|
||||
'#weight' => -2,
|
||||
);
|
||||
}
|
||||
Loading…
Reference in New Issue