? 444396.patch
? 444396.patch.new
Index: acquia_marina.info
===================================================================
RCS file: /cvs/drupal/contributions/themes/acquia_marina/acquia_marina.info,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 acquia_marina.info
--- acquia_marina.info 24 Oct 2008 08:17:02 -0000 1.1.2.2
+++ acquia_marina.info 13 May 2009 23:41:39 -0000
@@ -5,6 +5,9 @@ description = Turn off this feature on production websites.', array('!link' => url('admin/build/themes/settings/' . $GLOBALS['theme']))), 'warning');
@@ -14,7 +14,7 @@ if (is_null(theme_get_setting('user_notv
global $theme_key;
// Get node types
$node_types = node_get_types('names');
-
+
/**
* The default values for the theme variables. Make sure $defaults exactly
* matches the $defaults in the theme-settings.php file.
@@ -68,11 +68,11 @@ if (is_null(theme_get_setting('user_notv
'comment_enable_content_type' => 0,
'rebuild_registry' => 0,
);
-
+
// Make the default content-type settings the same as the default theme settings,
// so we can tell if content-type-specific settings have been altered.
$defaults = array_merge($defaults, theme_get_settings());
-
+
// Set the default values for content-type-specific settings
foreach ($node_types as $type => $name) {
$defaults["taxonomy_display_{$type}"] = $defaults['taxonomy_display_default'];
@@ -102,10 +102,10 @@ if (is_null(theme_get_setting('user_notv
$defaults["comment_node_prefix_{$type}"] = $defaults['comment_node_prefix_default'];
$defaults["comment_node_suffix_{$type}"] = $defaults['comment_node_suffix_default'];
}
-
+
// Get default theme settings.
$settings = theme_get_settings($theme_key);
-
+
// If content type-specifc settings are not enabled, reset the values
if (!$settings['readmore_enable_content_type']) {
foreach ($node_types as $type => $name) {
@@ -137,7 +137,7 @@ if (is_null(theme_get_setting('user_notv
$defaults["comment_node_suffix_{$type}"] = $defaults['comment_node_suffix_default'];
}
}
-
+
// Don't save the toggle_node_info_ variables
if (module_exists('node')) {
foreach (node_get_types() as $type => $name) {
@@ -203,7 +203,7 @@ function phptemplate_preprocess_page(&$v
// Add preface & postscript classes with number of active sub-regions
$region_list = array(
- 'prefaces' => array('preface_first', 'preface_middle', 'preface_last'),
+ 'prefaces' => array('preface_first', 'preface_middle', 'preface_last'),
'postscripts' => array('postscript_first', 'postscript_middle', 'postscript_last')
);
foreach ($region_list as $sub_region_key => $sub_region_list) {
@@ -215,21 +215,21 @@ function phptemplate_preprocess_page(&$v
}
$vars[$sub_region_key] = $sub_region_key .'-'. strval(count($active_regions));
}
-
+
// Generate menu tree from source of primary links
$vars['primary_links_tree'] = menu_tree(variable_get('menu_primary_links_source', 'primary-links'));
// TNT THEME SETTINGS SECTION
// Display mission statement on all pages
if (theme_get_setting('mission_statement_pages') == 'all') {
- $vars['mission'] = theme_get_setting('mission', false);
+ $vars['mission'] = theme_get_setting('mission', false);
}
-
+
// Hide breadcrumb on all pages
if (theme_get_setting('breadcrumb_display') == 0) {
- $vars['breadcrumb'] = '';
+ $vars['breadcrumb'] = '';
}
-
+
// Set site title, slogan, mission, page title & separator (unless using Page Title module)
if (!module_exists('page_title')) {
$title = t(variable_get('site_name', ''));
@@ -278,17 +278,17 @@ function phptemplate_preprocess_page(&$v
}
$vars['head_title'] = strip_tags($vars['head_title']); // Remove any potential html tags
}
-
+
// Set meta keywords and description (unless using Meta tags module)
if (!module_exists('nodewords')) {
if (theme_get_setting('meta_keywords') !== '') {
$keywords = '';
$vars['head'] .= $keywords ."\n";
- }
+ }
if (theme_get_setting('meta_description') !== '') {
$keywords = '';
$vars['head'] .= $keywords ."\n";
- }
+ }
}
if (drupal_is_front_page()) {
@@ -314,12 +314,12 @@ function phptemplate_preprocess_node(&$v
$node_classes[] = 'node-type-'. $vars['node']->type; // Node is type-x, e.g., node-type-page
$node_classes = array_filter($node_classes); // Remove empty elements
$vars['node_classes'] = implode(' ', $node_classes); // Implode class list with spaces
-
+
// Add node_bottom region content
$vars['node_bottom'] = theme('blocks', 'node_bottom');
// Node Theme Settings
-
+
// Date & author
if (!module_exists('submitted_by')) {
$date = t('Posted ') . format_date($vars['node']->created, 'medium'); // Format date as small, medium, or large
@@ -371,7 +371,7 @@ function phptemplate_preprocess_node(&$v
else {
$vars['terms'] = '';
}
-
+
// Node Links
if (isset($vars['node']->links['node_read_more'])) {
$node_content_type = (theme_get_setting('readmore_enable_content_type') == 1) ? $vars['node']->type : 'default';
@@ -467,7 +467,7 @@ function phptemplate_preprocess_node(&$v
'html' => TRUE,
);
}
- $vars['links'] = theme('links', $vars['node']->links, array('class' => 'links inline'));
+ $vars['links'] = theme('links', $vars['node']->links, array('class' => 'links inline'));
}
@@ -506,7 +506,7 @@ function phptemplate_preprocess_comment_
/**
- * Adds a class for the style of view
+ * Adds a class for the style of view
* (e.g., node, teaser, list, table, etc.)
* (Requires views-view.tpl.php file in theme directory)
*/
@@ -522,7 +522,7 @@ function phptemplate_preprocess_search_r
static $search_zebra = 'even';
$search_zebra = ($search_zebra == 'even') ? 'odd' : 'even';
$variables['search_zebra'] = $search_zebra;
-
+
$result = $variables['result'];
$variables['url'] = check_url($result['link']);
$variables['title'] = check_plain($result['title']);
@@ -532,7 +532,7 @@ function phptemplate_preprocess_search_r
if (isset($result['snippet']) && theme_get_setting('search_snippet')) {
$variables['snippet'] = $result['snippet'];
}
-
+
$info = array();
if (!empty($result['type']) && theme_get_setting('search_info_type')) {
$info['type'] = check_plain($result['type']);
@@ -605,7 +605,7 @@ function phptemplate_username($object) {
/**
- * Set default form file input size
+ * Set default form file input size
*/
function phptemplate_file($element) {
$element['#size'] = 40;
@@ -649,4 +649,256 @@ function phptemplate_file($element) {
*/
function _themesettings_link($prefix, $suffix, $text, $path, $options) {
return $prefix . (($text) ? l($text, $path, $options) : '') . $suffix;
-}
\ No newline at end of file
+}
+
+/**
+ * Implements hook_color()
+ * Color replacement methods: 'shift' (base, link, text), 'tag' (navbar, navbarlink)
+ * custom tag replacement
+ * Image generation: Yes (header)
+ */
+function acquia_marina_color() {
+ /**
+ * $color = array() (Required)
+ * For essential scheme information.
+ */
+ $color = array(
+ /**
+ * 'replacement methods'
+ * Declare replacement replacement methods in the 'replacement methods' array,
+ * in the order you want them to work.
+ * They are comprised different algorithms to change your colors.
+ * replacement methods like 'shift' can accept different options and behave differently.
+ * To change the order of the replacement methods color replacement, put them in order.
+ */
+ 'replacement methods' => array(
+ /**
+ * 'tag' method
+ * Replaces custom tags in stylesheet based on fieldname.
+ */
+ 'tag' => TRUE,
+ ),
+
+ 'fields' => array('Color 1', 'Color 2', 'Color 3',
+ 'Color 1 (opposing)', 'Link'),
+
+ 'premade schemes' => array(
+ 'Acquia Marina' => array(
+ 'Color 1' => '#a4d520',
+ 'Color 2' => '#23729d',
+ 'Color 3' => '#f4f7e7',
+ 'Color (opposing)' => '#A4D520',
+ 'Link' => '#27638C',
+
+ ),
+ 'Purple Royale' => array(
+ 'Color 1' => '#a4d520',
+ 'Color 2' => '#9d238d',
+ 'Color 3' => '#f7e7f3',
+ 'Color 1 (opposing)' => '#d52097',
+ 'Link' => '#87278c',
+ ),
+
+ 'Florida Gators' => array(
+ 'Color 1' => '#ef721f',
+ 'Color 2' => '#1d0ac2',
+ 'Color 3' => '#f49e67',
+ 'Color 1 (opposing)' => '#ffffff',
+ 'Link' => '#1d0ac2',
+ ),
+
+ ),
+
+ /**
+ * 'reference scheme' (Required)
+ * A scheme name from one in your 'premade schemes' list.
+ * On schemes which use the 'base', 'link' or 'text' flag, always mention this.
+ * Other schemes will be shifted against the fields of the reference one.
+ */
+ 'reference scheme' => 'Acquia Marina',
+
+ /**
+ * 'default scheme' (Required)
+ * A scheme name from one in your 'premade schemes' list.
+ */
+ 'default scheme' => 'Acquia Marina',
+
+ /**
+ * 'stylesheets' (Required)
+ * CSS file relative to the root of your theme.
+ * Can mention an array of stylesheets.
+ */
+ 'stylesheets' => array(
+ 'style.css',
+ ),
+
+ /**
+ * 'blend target' (Required)
+ * I almost to completely remove this, we'll see...
+ */
+ 'blend target' => '#666666',
+ );
+
+
+ $color['images']['page background'] = array(
+ /**
+ * 'file' (Required)
+ * Path to your source image in terms of theme's root.
+ */
+ 'file' => 'images/color/blank-content-gradient.png',
+
+ 'fill' => array(
+ array('type' => 'solid',
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 5,
+ 'height' => 55,
+ 'colors' => array('Color 3'),
+ ),
+ ),
+
+ 'slices' => array(
+ 'images/content-gradient.png' => array(
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 5,
+ 'height' => 55
+ ),
+ )
+ );
+
+ $color['images']['submit button'] = array(
+ 'file' => 'images/color/blank-blue-button.png',
+
+ 'fill' => array(
+ array('type' => 'solid',
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 600,
+ 'height' => 40,
+ 'colors' => array('Color 1'),
+ ),
+ ),
+
+ 'slices' => array(
+ 'images/blue-button.png' => array(
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 600,
+ 'height' => 40
+ ),
+ )
+ );
+
+ $color['images']['tab left'] = array(
+ 'file' => 'images/color/blank-tab-left.png',
+
+ 'transparent color' => '#000000',
+
+ 'fill' => array(
+ array('type' => 'solid',
+ 'x' => 2,
+ 'y' => 29,
+ 'width' => 56,
+ 'height' => 1,
+ 'colors' => array('Color 1'),
+ ),
+ array('type' => 'solid',
+ 'x' => 1,
+ 'y' => 30,
+ 'width' => 57,
+ 'height' => 1,
+ 'colors' => array('Color 1'),
+ ),
+ array('type' => 'solid',
+ 'x' => 0,
+ 'y' => 31,
+ 'width' => 58,
+ 'height' => 27,
+ 'colors' => array('Color 1'),
+ ),
+ ),
+
+ 'slices' => array(
+ 'images/tab-left.png' => array(
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 18,
+ 'height' => 58
+ ),
+ )
+ );
+
+ $color['images']['tab right'] = array(
+ 'file' => 'images/color/blank-tab-right.png',
+
+ 'transparent color' => '#000000',
+
+ 'fill' => array(
+ array('type' => 'solid',
+ 'x' => 0,
+ 'y' => 29,
+ 'width' => 398,
+ 'height' => 1,
+ 'colors' => array('Color 1'),
+ ),
+ array('type' => 'solid',
+ 'x' => 0,
+ 'y' => 30,
+ 'width' => 399,
+ 'height' => 1,
+ 'colors' => array('Color 1'),
+ ),
+ array('type' => 'solid',
+ 'x' => 0,
+ 'y' => 31,
+ 'width' => 400,
+ 'height' => 27,
+ 'colors' => array('Color 1'),
+ ),
+ ),
+
+ 'slices' => array(
+ 'images/tab-right.png' => array(
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 400,
+ 'height' => 58
+ ),
+
+
+ )
+ );
+
+ $color['images']['header image'] = array(
+ 'file' => 'images/color/blank-preface-wrapper-bg.png',
+
+ 'fill' => array(
+ array('type' => 'solid',
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 2,
+ 'height' => 5,
+ 'colors' => array('Color 1'),
+ ),
+ array('type' => 'solid',
+ 'x' => 0,
+ 'y' => 6,
+ 'width' => 2,
+ 'height' => 178,
+ 'colors' => array('Color 2'),
+ ),
+ ),
+
+ 'slices' => array(
+ 'images/preface-wrapper-bg.png' => array(
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 2,
+ 'height' => 183
+ ),
+ )
+ );
+
+ return $color;
+}