summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--omega/css/README.txt55
-rw-r--r--omega/css/reset.css42
-rw-r--r--omega/inc/theme.inc42
-rw-r--r--omega/preprocess/preprocess-maintenance-page.inc12
-rw-r--r--omega/process/process-maintenance-page.inc3
-rw-r--r--omega/templates/maintenance-page.tpl.php95
-rw-r--r--omega/templates/page.tpl.php35
-rw-r--r--omega/theme-settings.php8
-rwxr-xr-xstarterkit/omega_starterkit.info10
-rw-r--r--starterkit/templates/page.tpl.php33
10 files changed, 191 insertions, 144 deletions
diff --git a/omega/css/README.txt b/omega/css/README.txt
index dea07d7..37dd1c3 100644
--- a/omega/css/README.txt
+++ b/omega/css/README.txt
@@ -1,8 +1,55 @@
-$Id
+$Id: README.txt,v 1.1.2.2 2011/01/10 22:48:33 himerus Exp $
##########################################################
##### Omega Theme
##########################################################
-Project Page: http://drupal.org/project/omega
-Demo Page: http://omega.himerus.com
-Maintainer(s): Jake Strawn
+Project Page: http://drupal.org/project/omega
+Issue Queue: http://drupal.org/project/issues/omega
+Usage Stats: http://drupal.org/project/usage/omega
+Demo Page: http://omega.himerus.com
+Maintainer(s): Jake Strawn
+ http://himerus.com
+ http://twitter.com/himerus
##########################################################
+
+Omega Theme Information
+=======================
+The Omega Theme is a powerful and free Drupal theme based on the 960gs.
+It harneses the power and features of many popular themes to provide an
+excellent base theme, and sub-theming system to help you quickly prototype
+and theme your site...
+
+Organizing CSS files in your theme
+==================================
+This css folder is provided for easy organization of your CSS files in your
+subtheme. Many times for organization, it's best to use many CSS files to
+keep them easier to understand and find things rather than using a single
+style.css file that can quickly become thousands of lines long.
+
+Including new CSS files
+=======================
+To include a new CSS file in your theme, you will need to edit the .info
+file that defines your theme.
+
+In that .info file you will see the following section:
+
+; ------- Declare default stylesheets
+
+;stylesheets[all][] = css/your_css_file.css
+
+By default, there are several CSS files included from the Omega base theme
+but to add more of your own, you would use this pattern. (Notice the semi-
+colon at the beginning of the stylesheet line) Remove the semi-colon in
+order to have Drupal read this line. You will also want to change the
+your_css_file portion of the file name to whatever you are trying to include.
+Beyond that, make sure your new CSS file is in place in the css folder of
+your sub-theme, and after saving your .info file, visit /admin/build/themes
+in order for Drupal to pick up the appropriate changes.
+
+Additional 960gs/Omega Resources
+================================
+ * Please see the README.txt file in the root of the starterkit directory
+ for more information regarding the Omega base theme & subtheming
+
+Contributors
+============
+- himerus (Jake Strawn) \ No newline at end of file
diff --git a/omega/css/reset.css b/omega/css/reset.css
index 6ce262e..a85a83e 100644
--- a/omega/css/reset.css
+++ b/omega/css/reset.css
@@ -1,4 +1,4 @@
-/* $Id: reset.css,v 1.1.2.1 2010/10/26 18:38:55 himerus Exp $ */
+/* $Id: reset.css,v 1.1.2.3 2011/01/11 02:47:46 himerus Exp $ */
/**
* Eric Meyer's Reset CSS
@@ -10,32 +10,40 @@
* - "outline" attributes have been commented out for accessibility reasons
*/
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
+html, body, div {
+ margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent;
+}
+h1, h2, h3, h4, h5, h6 {
+ margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent;
+}
+a, p, ul, ol, li, span {
+ margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent;
+}
+table, tbody, tfoot, thead, tr, th, td {
+ margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent;
+}
+
+applet, object, iframe, blockquote, pre, abbr, acronym, address, big, cite, code,
del, dfn, em, font, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
- margin: 0;
- padding: 0;
- border: 0;
- outline: 0;
- font-size: 100%;
- vertical-align: baseline;
- background: transparent;
+b, u, i, center, dl, dt, dd,
+caption, fieldset, form, label, legend,
+ {
+ margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent;
}
+
body {
line-height: 1;
}
+
ol, ul {
list-style: none;
}
+
blockquote, q {
quotes: none;
}
+
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
@@ -51,6 +59,7 @@ q:before, q:after {
ins {
text-decoration: none;
}
+
del {
text-decoration: line-through;
}
@@ -59,5 +68,4 @@ del {
table {
border-collapse: collapse;
border-spacing: 0;
-}
-
+} \ No newline at end of file
diff --git a/omega/inc/theme.inc b/omega/inc/theme.inc
index 48f2706..2446f2b 100644
--- a/omega/inc/theme.inc
+++ b/omega/inc/theme.inc
@@ -1,5 +1,5 @@
<?php
-// $Id: theme.inc,v 1.1.2.5 2010/12/28 18:14:32 himerus Exp $
+// $Id: theme.inc,v 1.1.2.6 2011/01/10 22:27:35 himerus Exp $
/**
* Returns HTML for a query pager.
@@ -226,9 +226,14 @@ function omega_item_list($vars) {
* links to remove theme completely when not present to avoid the
* &nbsp; messing up the spacing/theming in the list.
*/
-function omega_views_mini_pager($tags = array(), $limit = 10, $element = 0, $parameters = array(), $quantity = 9) {
+function omega_views_mini_pager($vars) {
global $pager_page_array, $pager_total;
+ $tags = $vars['tags'];
+ $element = $vars['element'];
+ $parameters = $vars['parameters'];
+ $quantity = $vars['quantity'];
+
// Calculate various markers within this pager piece:
// Middle is used to "center" pages around the current page.
$pager_middle = ceil($quantity / 2);
@@ -242,40 +247,42 @@ function omega_views_mini_pager($tags = array(), $limit = 10, $element = 0, $par
$li_previous = theme('pager_previous',
array(
'text' => (isset($tags[1]) ? $tags[1] : t('‹‹')),
- 'limit' => $limit,
'element' => $element,
'interval' => 1,
'parameters' => $parameters,
)
);
+ if (empty($li_previous)) {
+ $li_previous = "";
+ }
$li_next = theme('pager_next',
array(
'text' => (isset($tags[3]) ? $tags[3] : t('››')),
- 'limit' => $limit,
'element' => $element,
'interval' => 1,
'parameters' => $parameters,
)
);
-
+ if (empty($li_next)) {
+ $li_next = "";
+ }
+
if ($pager_total[$element] > 1) {
- if (!empty($li_previous)) {
- $items[] = array(
- 'class' => array('pager-previous'),
- 'data' => $li_previous,
- );
- }
+ $items[] = array(
+ 'class' => array('pager-previous'),
+ 'data' => $li_previous,
+ );
+
$items[] = array(
'class' => array('pager-current'),
'data' => t('@current of @max', array('@current' => $pager_current, '@max' => $pager_max)),
);
- if (!empty($li_next)) {
- $items[] = array(
- 'class' => array('pager-next'),
- 'data' => $li_next,
- );
- }
+
+ $items[] = array(
+ 'class' => array('pager-next'),
+ 'data' => $li_next,
+ );
return theme('item_list',
array(
'items' => $items,
@@ -287,6 +294,7 @@ function omega_views_mini_pager($tags = array(), $limit = 10, $element = 0, $par
}
}
+
function omega_links($variables) {
$links = $variables['links'];
$attributes = $variables['attributes'];
diff --git a/omega/preprocess/preprocess-maintenance-page.inc b/omega/preprocess/preprocess-maintenance-page.inc
index 283d042..95cf260 100644
--- a/omega/preprocess/preprocess-maintenance-page.inc
+++ b/omega/preprocess/preprocess-maintenance-page.inc
@@ -1,18 +1,8 @@
<?php
-// $Id: preprocess-maintenance-page.inc,v 1.1.2.1 2010/10/26 18:38:55 himerus Exp $
+// $Id: preprocess-maintenance-page.inc,v 1.1.2.2 2011/01/10 22:48:33 himerus Exp $
/**
* @file
* Contents of omega_preprocess_maintenance_page().
* @todo This needs work.
*/
-
-$vars['body_attributes'] = array();
-
-$vars['body_attributes']['id'] = 'maintenance-page';
-
-$classes[] = $vars['body_classes'];
-
-$vars['body_attributes']['class'] = implode(' ', $classes);
-
-$vars['attributes'] = drupal_attributes($vars['body_attributes']);
diff --git a/omega/process/process-maintenance-page.inc b/omega/process/process-maintenance-page.inc
new file mode 100644
index 0000000..0fd9762
--- /dev/null
+++ b/omega/process/process-maintenance-page.inc
@@ -0,0 +1,3 @@
+<?php
+
+require(drupal_get_path('theme', 'omega') . '/process/process-page.inc'); \ No newline at end of file
diff --git a/omega/templates/maintenance-page.tpl.php b/omega/templates/maintenance-page.tpl.php
index 80ca854..59ae8b8 100644
--- a/omega/templates/maintenance-page.tpl.php
+++ b/omega/templates/maintenance-page.tpl.php
@@ -1,12 +1,12 @@
<?php
-// $Id: maintenance-page.tpl.php,v 1.1.2.1 2010/10/29 01:49:59 himerus Exp $
+// $Id: maintenance-page.tpl.php,v 1.1.2.2 2011/01/10 22:48:33 himerus Exp $
/**
* @file
* Default theme implementation to display a single Drupal page while offline.
*
- * All the available variables are mirrored in page.tpl.php. Some may be left
- * blank but they are provided for consistency.
+ * All the available variables are mirrored in html.tpl.php and page.tpl.php.
+ * Some may be blank but they are provided for consistency.
*
* @see template_preprocess()
* @see template_preprocess_maintenance_page()
@@ -23,72 +23,35 @@
<?php print $scripts; ?>
</head>
<body class="<?php print $classes; ?>">
- <div id="page">
- <div id="header">
- <div id="logo-title">
-
- <?php if (!empty($logo)): ?>
- <a href="<?php print $base_path; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
- <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
- </a>
- <?php endif; ?>
-
- <div id="name-and-slogan">
- <?php if (!empty($site_name)): ?>
- <h1 id="site-name">
- <a href="<?php print $base_path ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
- </h1>
- <?php endif; ?>
-
- <?php if (!empty($site_slogan)): ?>
- <div id="site-slogan"><?php print $site_slogan; ?></div>
- <?php endif; ?>
- </div> <!-- /name-and-slogan -->
- </div> <!-- /logo-title -->
-
- <?php if (!empty($header)): ?>
- <div id="header-region">
- <?php print $header; ?>
+ <div id="page" class="clearfix">
+ <?php if (isset($zones_above)): ?>
+ <div id="zones-above" class="clearfix"><?php print $zones_above; ?></div>
+ <?php endif; ?>
+ <div id="zones-content" class="clearfix">
+ <?php if (isset($action_links)): ?>
+ <div id="actions-container" class="container-<?php print $default_container_width; ?> clearfix">
+ <div class="grid-<?php print $default_container_width; ?>">
+ <ul class="action-links">
+ <?php print render($action_links); ?>
+ </ul>
+ </div>
</div>
<?php endif; ?>
-
- </div> <!-- /header -->
-
- <div id="container" class="clearfix">
-
- <?php if (!empty($sidebar_first)): ?>
- <div id="sidebar-first" class="column sidebar">
- <?php print $sidebar_first; ?>
- </div> <!-- /sidebar-first -->
- <?php endif; ?>
-
- <div id="main" class="column"><div id="main-squeeze">
-
- <div id="content">
- <?php if (!empty($title)): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
- <?php if (!empty($messages)): print $messages; endif; ?>
- <div id="content-content" class="clearfix">
- <?php print $content; ?>
- </div> <!-- /content-content -->
- </div> <!-- /content -->
-
- </div></div> <!-- /main-squeeze /main -->
-
- <?php if (!empty($sidebar_second)): ?>
- <div id="sidebar-second" class="column sidebar">
- <?php print $sidebar_second; ?>
- </div> <!-- /sidebar-second -->
+ <?php if (isset($messages)): ?>
+ <div id="message-container" class="container-<?php print $default_container_width; ?> clearfix">
+ <div class="grid-<?php print $default_container_width; ?>">
+ <?php print $messages; ?>
+ </div>
+ </div><!-- /.container-xx -->
<?php endif; ?>
-
- </div> <!-- /container -->
-
- <div id="footer-wrapper">
- <div id="footer">
- <?php if (!empty($footer)): print $footer; endif; ?>
- </div> <!-- /footer -->
- </div> <!-- /footer-wrapper -->
-
- </div> <!-- /page -->
+
+ <?php print $content_zone; ?>
+ </div>
+
+ <?php if (isset($zones_below)): ?>
+ <div id="zones-below" class="clearfix"><?php print $zones_below; ?></div>
+ <?php endif; ?>
+ </div><!-- /#page -->
</body>
</html>
diff --git a/omega/templates/page.tpl.php b/omega/templates/page.tpl.php
index 7dc856e..550d504 100644
--- a/omega/templates/page.tpl.php
+++ b/omega/templates/page.tpl.php
@@ -1,26 +1,35 @@
<?php
-// $Id: page.tpl.php,v 1.1.2.5 2010/12/07 01:11:46 himerus Exp $
+// $Id: page.tpl.php,v 1.1.2.7 2011/01/10 22:48:33 himerus Exp $
/**
- * @file
+ * @file
* Theme implementation to display a single Drupal page.
*/
- //krumo('called page.tpl.php (omega)');
+
?>
<div id="page" class="clearfix">
<?php if (isset($zones_above)): ?>
<div id="zones-above" class="clearfix"><?php print $zones_above; ?></div>
<?php endif; ?>
-
- <?php if (isset($messages)): ?>
- <div id="message-container" class="container-<?php print $default_container_width; ?> clearfix">
- <div class="grid-<?php print $default_container_width; ?>">
- <?php print $messages; ?>
- </div>
- </div><!-- /.container-xx -->
- <?php endif; ?>
-
- <div id="zones-content" class="clearfix"><?php print $content_zone; ?></div>
+ <div id="zones-content" class="clearfix">
+ <?php if (isset($action_links)): ?>
+ <div id="actions-container" class="container-<?php print $default_container_width; ?> clearfix">
+ <div class="grid-<?php print $default_container_width; ?>">
+ <ul class="action-links">
+ <?php print render($action_links); ?>
+ </ul>
+ </div>
+ </div>
+ <?php endif; ?>
+ <?php if (isset($messages)): ?>
+ <div id="message-container" class="container-<?php print $default_container_width; ?> clearfix">
+ <div class="grid-<?php print $default_container_width; ?>">
+ <?php print $messages; ?>
+ </div>
+ </div><!-- /.container-xx -->
+ <?php endif; ?>
+ <?php print $content_zone; ?>
+ </div>
<?php if (isset($zones_below)): ?>
<div id="zones-below" class="clearfix"><?php print $zones_below; ?></div>
diff --git a/omega/theme-settings.php b/omega/theme-settings.php
index f71be51..c736c51 100644
--- a/omega/theme-settings.php
+++ b/omega/theme-settings.php
@@ -1,5 +1,5 @@
<?php
-// $Id: theme-settings.php,v 1.1.2.14 2010/12/28 18:14:32 himerus Exp $
+// $Id: theme-settings.php,v 1.1.2.15 2011/01/11 00:51:18 himerus Exp $
/**
* @file
@@ -58,13 +58,13 @@ function omega_form_system_theme_settings_alter(&$form, &$form_state) {
'#prefix' => t('General Omega Settings'),
);
// include Omega (grid) specific theme settings
- require_once(drupal_get_path('theme', 'omega') . '/inc/grid-theme-settings.inc');
+ require(drupal_get_path('theme', 'omega') . '/inc/grid-theme-settings.inc');
// include general theme settings
- require_once(drupal_get_path('theme', 'omega') . '/inc/default-theme-settings.inc');
+ require(drupal_get_path('theme', 'omega') . '/inc/default-theme-settings.inc');
// include administrative functions for theme settings
- require_once(drupal_get_path('theme', 'omega') . '/inc/admin-theme-settings.inc');
+ require(drupal_get_path('theme', 'omega') . '/inc/admin-theme-settings.inc');
$form['theme_settings']['#collapsible'] = TRUE;
$form['theme_settings']['#collapsed'] = TRUE;
diff --git a/starterkit/omega_starterkit.info b/starterkit/omega_starterkit.info
index 7da3dd4..79bdb01 100755
--- a/starterkit/omega_starterkit.info
+++ b/starterkit/omega_starterkit.info
@@ -1,4 +1,4 @@
-; $Id: omega_starterkit.info,v 1.3.2.4.2.15 2011/01/06 00:46:35 himerus Exp $
+; $Id: omega_starterkit.info,v 1.3.2.4.2.16 2011/01/10 22:48:33 himerus Exp $
;##########################################################################################
; _ _ _ _
@@ -19,6 +19,14 @@ base theme = omega
; Do NOT remove the following commented lines. They will be used for
; automated generation of the .info settings when rewritten.
+; ------- Declare default stylesheets
+
+;stylesheets[all][] = css/your_css_file.css
+
+; ------- Declare default JavaScript includes
+
+;scripts[] = js/your_js_file.js
+
; CONTENT REGIONS
; REQUIRED CORE REGIONS
diff --git a/starterkit/templates/page.tpl.php b/starterkit/templates/page.tpl.php
index 2e8e386..ec99e8d 100644
--- a/starterkit/templates/page.tpl.php
+++ b/starterkit/templates/page.tpl.php
@@ -1,27 +1,38 @@
<?php
-// $Id: page.tpl.php,v 1.1.2.8 2010/12/08 05:11:05 himerus Exp $
+// $Id: page.tpl.php,v 1.1.2.10 2011/01/10 22:48:33 himerus Exp $
/**
* @file
* Theme implementation to display a single Drupal page.
*/
+
?>
<div id="page" class="clearfix">
<?php if (isset($zones_above)): ?>
<div id="zones-above" class="clearfix"><?php print $zones_above; ?></div>
<?php endif; ?>
+ <div id="zones-content" class="clearfix">
+ <?php if (isset($action_links)): ?>
+ <div id="actions-container" class="container-<?php print $default_container_width; ?> clearfix">
+ <div class="grid-<?php print $default_container_width; ?>">
+ <ul class="action-links">
+ <?php print render($action_links); ?>
+ </ul>
+ </div>
+ </div>
+ <?php endif; ?>
+ <?php if (isset($messages)): ?>
+ <div id="message-container" class="container-<?php print $default_container_width; ?> clearfix">
+ <div class="grid-<?php print $default_container_width; ?>">
+ <?php print $messages; ?>
+ </div>
+ </div><!-- /.container-xx -->
+ <?php endif; ?>
- <?php if (isset($messages)): ?>
- <div id="message-container" class="container-<?php print $default_container_width; ?> clearfix">
- <div class="grid-<?php print $default_container_width; ?>">
- <?php print $messages; ?>
- </div>
- </div><!-- /.container-xx -->
- <?php endif; ?>
-
- <div id="zones-content" class="clearfix"><?php print $content_zone; ?></div>
+ <?php print $content_zone; ?>
+ </div>
<?php if (isset($zones_below)): ?>
<div id="zones-below" class="clearfix"><?php print $zones_below; ?></div>
<?php endif; ?>
-</div><!-- /#page -->
+</div><!-- /#page --> \ No newline at end of file