Commit 23c5741b authored by Dries's avatar Dries

- Patch #911054 by Rob Loach, cosmicdreams, aspilicious, Jacine: remove Garland from core.

parent 4b522e22
......@@ -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 @@
* Remove the leading hash signs to enable.
*/
# $conf['site_name'] = 'My Drupal site';
# $conf['theme_default'] = 'garland';
# $conf['theme_default'] = 'stark';
# $conf['anonymous'] = 'Visitor';
/**
......
This diff is collapsed.
<?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',
);
/* 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;
}
<?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>
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
<?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>
<?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>
<?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 -->
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;
}
This diff is collapsed.
html {
direction: rtl;
}
/**
* Generic elements
*/
body {
direction: rtl;
}
ul,
.block ul,
ol {