=== modified file 'sites/all/themes/bluecheese/css/styles.css'
--- sites/all/themes/bluecheese/css/styles.css 2012-07-24 00:40:52 +0000
+++ sites/all/themes/bluecheese/css/styles.css 2012-07-31 22:41:08 +0000
@@ -57,10 +57,10 @@
/**
* Colors
- *
+ *
* http://infrastructure.drupal.org/drupal.org-style-guide/colour.html
* moving to http://drupal.org/node/1051644
- *
+ *
* -------------------------------------
* Primary colors
* -------------------------------------
@@ -69,33 +69,33 @@
* Dark Blue 40% #9CC9E5
* Dark Blue 30% #B4D7EB
* Dark Blue 20% #CDE4F2 rgb(205,228,242)
- *
+ *
* Light Blue #53B0EB rgb(83,176,235)
- *
+ *
* Lime Green #96BC44 rgb(150,188,68)
- *
+ *
* -------------------------------------
* Secondary colors
* -------------------------------------
* Navy Blue #064771 rgb(6,71,113)
* Light Navy Blue #0D7DC1 rgb(13,125,193)
* Light Navy Blue 50% #9ECBE6 rgb(158,203,230)
- *
+ *
* Pale Yellow #F6F6F2 rgb(246,246,242)
* Light Yellow #E6FCB6 rgb(230,252,182)
- *
+ *
* Gray #9D9D93 rgb(157,157,147)
* Black #000 rgb(0,0,0)
- *
+ *
* -------------------------------------
* Not officially listed, but found prototypes
* -------------------------------------
* Yellow/Green (border, th bg) #EAEAE1
* Yellow/Green (background) #F9FFEC
- *
+ *
* Light Red (border) #EBCCCC
* Light Red (background) #F6E8E8
- *
+ *
* -------------------------------------
* Typography
* -------------------------------------
@@ -104,21 +104,21 @@
* Gray headers h2-h4 #555
* Gray headers h5-6 #222
* Blue links #0678BE
- *
+ *
* -------------------------------------
* Colors not specified in style guide
* -------------------------------------
* Gray #666
* Gray #nav-content border #E1E1DB
- *
+ *
* Blue #nav-header BG #044771
- *
+ *
* -------------------------------------
* Help, status, and messages
* -------------------------------------
* Help:
* Blue: Dark Blue 20%
- *
+ *
* Asterisk:
* Orange: rgb(227,144,27) NOT PART OF PALETTE
*/
@@ -1652,6 +1652,27 @@
/* 18px */
}
+
+/**
+* Project Issue Nodes
+*/
+.node-type-project-issue #main {
+ min-height: 300px;
+}
+.node-type-project-issue #aside-region {
+ background: #efefef;
+}
+.node-type-project-issue #aside-region .field {
+ padding: 10px;
+ margin: 0;
+ padding: 10px;
+ border-bottom: 1px dotted #ccc;
+}
+.node-type-project-issue #aside-region .field-label,
+.node-type-project-issue #aside-region .field-items {
+ display: inline-block;
+}
+
/**
* Project node styles
*/
@@ -3842,33 +3863,33 @@
* Dark Blue 40% #9CC9E5
* Dark Blue 30% #B4D7EB
* Dark Blue 20% #CDE4F2 rgb(205,228,242)
- *
+ *
* Light Blue #53B0EB rgb(83,176,235)
- *
+ *
* Lime Green #96BC44 rgb(150,188,68)
- *
+ *
* -------------------------------------
* Secondary colors
* -------------------------------------
* Navy Blue #064771 rgb(6,71,113)
* Light Navy Blue #0D7DC1 rgb(13,125,193)
* Light Navy Blue 50% #9ECBE6 rgb(158,203,230)
- *
+ *
* Pale Yellow #F6F6F2 rgb(246,246,242)
* Light Yellow #E6FCB6 rgb(230,252,182)
- *
+ *
* Gray #9D9D93 rgb(157,157,147)
* Black #000 rgb(0,0,0)
- *
+ *
* -------------------------------------
* Not officially listed, but found prototypes
* -------------------------------------
* Yellow/Green (border, th bg) #EAEAE1
* Yellow/Green (background) #F9FFEC
- *
+ *
* Light Red (border) #EBCCCC
* Light Red (background) #F6E8E8
- *
+ *
* -------------------------------------
* Typography
* -------------------------------------
=== modified file 'sites/all/themes/bluecheese/sass/partials/design/_comment.scss'
--- sites/all/themes/bluecheese/sass/partials/design/_comment.scss 2012-07-14 23:38:17 +0000
+++ sites/all/themes/bluecheese/sass/partials/design/_comment.scss 2012-07-31 22:25:19 +0000
@@ -6,6 +6,7 @@
word-spacing: 0.2em;
color: #888;
margin-bottom: 0;
+
}
.comment h3.comment-title a {
@@ -17,7 +18,7 @@
}
.comment .submitted time {
- font-style: italic;
+ font-style: italic;
}
.comment .new {
@@ -39,16 +40,59 @@
margin-left: 40px;
}
+.node-type-project-issue {
+ .comment .item-list {
+ background:nth($greys,2);
+ padding:0 10px 10px;
+ }
+
+ .comment .submitted {
+ padding: 5px;
+ }
+
+ .comment .submitted time {
+ font-style: italic;
+ float:right;
+ }
+
+ .comment .submitted .author {
+ display:inline-block;
+ width:20%;
+ font-weight: bold;
+ font-size:110%;
+ }
+
+}
+
.node-type-project-issue #content h3.comment-title {
float: left;
font-size: 1.1538em;
- margin-left: -40px;
-}
+}
+.node-type-project-issue .comments {
+ background:nth($greys,4);
+ padding:10px;
+ @include border-radius(2px);
+}
.node-type-project-issue #content .comment .submitted {
padding-top: 1.4em;
}
+.node-type-project-issue .comment {
+ .num {
+ color:$grey;
+ }
+
+ h3.comment-title,
+ .content {
+ margin-left:15%;
+ width:70%;
+ }
+ .links {
+ margin-right:15%;
+ }
+}
+
.node-type-project-issue #content .comment .submitted a {
font-size: 1.2307em;
}
=== modified file 'sites/all/themes/bluecheese/sass/partials/design/_design.scss'
--- sites/all/themes/bluecheese/sass/partials/design/_design.scss 2012-07-24 00:40:52 +0000
+++ sites/all/themes/bluecheese/sass/partials/design/_design.scss 2012-07-31 22:25:19 +0000
@@ -17,6 +17,7 @@
@import 'dashboard';
@import 'framework';
@import 'issue-queue';
+@import 'issue-info';
@import 'project-node';
@import 'definition-list';
@import 'front';
=== modified file 'sites/all/themes/bluecheese/sass/partials/global/_variables.scss'
--- sites/all/themes/bluecheese/sass/partials/global/_variables.scss 2012-07-24 00:40:52 +0000
+++ sites/all/themes/bluecheese/sass/partials/global/_variables.scss 2012-07-31 22:25:19 +0000
@@ -32,14 +32,14 @@
////////////////////////
$yellow-green: #eaeae1 #f9ffec;
$light-red: #ebcccc #f6e8e8;
-$greys: #555 #ddd #d8d8d2;
+$greys: #555 #ddd #d8d8d2 #efefef;
/**
* Colors
- *
+ *
* http://infrastructure.drupal.org/drupal.org-style-guide/colour.html
* moving to http://drupal.org/node/1051644
- *
+ *
* -------------------------------------
* Primary colors
* -------------------------------------
@@ -48,33 +48,33 @@
* Dark Blue 40% #9CC9E5
* Dark Blue 30% #B4D7EB
* Dark Blue 20% #CDE4F2 rgb(205,228,242)
- *
+ *
* Light Blue #53B0EB rgb(83,176,235)
- *
+ *
* Lime Green #96BC44 rgb(150,188,68)
- *
+ *
* -------------------------------------
* Secondary colors
* -------------------------------------
* Navy Blue #064771 rgb(6,71,113)
* Light Navy Blue #0D7DC1 rgb(13,125,193)
* Light Navy Blue 50% #9ECBE6 rgb(158,203,230)
- *
+ *
* Pale Yellow #F6F6F2 rgb(246,246,242)
* Light Yellow #E6FCB6 rgb(230,252,182)
- *
+ *
* Gray #9D9D93 rgb(157,157,147)
* Black #000 rgb(0,0,0)
- *
+ *
* -------------------------------------
* Not officially listed, but found prototypes
* -------------------------------------
* Yellow/Green (border, th bg) #EAEAE1
* Yellow/Green (background) #F9FFEC
- *
+ *
* Light Red (border) #EBCCCC
* Light Red (background) #F6E8E8
- *
+ *
* -------------------------------------
* Typography
* -------------------------------------
@@ -83,21 +83,21 @@
* Gray headers h2-h4 #555
* Gray headers h5-6 #222
* Blue links #0678BE
- *
+ *
* -------------------------------------
* Colors not specified in style guide
* -------------------------------------
* Gray #666
* Gray #nav-content border #E1E1DB
- *
+ *
* Blue #nav-header BG #044771
- *
+ *
* -------------------------------------
* Help, status, and messages
* -------------------------------------
* Help:
* Blue: Dark Blue 20%
- *
+ *
* Asterisk:
* Orange: rgb(227,144,27) NOT PART OF PALETTE
*/
=== modified file 'sites/all/themes/bluecheese/template.php'
--- sites/all/themes/bluecheese/template.php 2012-07-24 00:40:52 +0000
+++ sites/all/themes/bluecheese/template.php 2012-07-31 22:34:54 +0000
@@ -9,6 +9,11 @@
// Add variable for site status message.
$variables['drupalorg_site_status'] = filter_xss_admin(variable_get('drupalorg_site_status', FALSE));
+
+ // Allow overriding page.tpl.php by content type.
+ if (!empty($variables['node'])) {
+ $variables['theme_hook_suggestions'][] = 'page__node_' . $variables['node']->type;
+ }
}
/**
@@ -83,7 +88,7 @@
if (!empty($links_rendered)) {
$output .= ''. implode(' ⋅ ', $links_rendered) .'';
-
+
// If both links and terms will be built, add a separator between the two spans
if (!empty($terms_rendered)) {
$output .= ' ⋅ ';
@@ -152,7 +157,7 @@
* @return array An array of taxonomy term links ordered keyed by vocabulary
*/
function bluecheese_term_links_by_vocab($tags) {
-
+
if (count($tags) >= 1) {
$links = array();
foreach($tags as $term_id => $term) {
@@ -192,6 +197,7 @@
*/
function bluecheese_preprocess_comment(&$variables) {
+
// Add pubdate to submitted variable.
$variables['pubdate'] = '';
$variables['submitted'] = t('Posted by !username on !datetime', array('!username' => $variables['author'], '!datetime' => $variables['pubdate']));
@@ -199,6 +205,10 @@
// Add class to comment title
$variables['title_attributes_array']['class'][] = 'comment-title';
+ $thread = $variables['id'];
+
+ $variables['thread'] = '#' . $thread . ' ';
+
}
/**
@@ -272,7 +282,7 @@
$result = $variables['result'];
$variables['url'] = check_url($result['link']);
$variables['title'] = check_plain($result['title']);
-
+
static $already_output = 0;
if ($already_output < 2) {
$already_output++;
@@ -287,7 +297,7 @@
unset($result['user']);
unset($result['date']);
}
-
+
$matches = array();
if (isset($result['extra']) && is_array($result['extra'])) {
foreach ($result['extra'] as $key => $extra_item ) {
@@ -307,7 +317,7 @@
}
}
}
-
+
$info = array();
if (isset($comments) && $result['node']->comment_count) {
$info['comments'] = l(format_plural($comments, '1 comment', '@count comments'), $variables['url'], array('fragment' => 'comments', 'attributes' => array('class' => 'comments')));
@@ -348,7 +358,7 @@
//function bluecheese_preprocess_search_results(&$variables) {
// global $pager_total_items;
// drupal_set_title(t('Found @count results containing the words: %words', array('@count' => $pager_total_items[0], '%words' => 'word')));
-//
+//
// $variables['search_results'] = '';
// foreach ($variables['results'] as $result) {
// $variables['search_results'] .= theme('search_result', $result, $variables['type']);
@@ -512,3 +522,69 @@
function bluecheese_css_alter(&$css) {
unset($css['modules/forum/forum.css']);
}
+
+/**
+ * Implements hook_page_alter().
+ */
+function bluecheese_page_alter(&$page){
+ //dpm($page);
+ if (arg(0)=="node" && is_numeric(arg(1))) {
+ $main = &$page['content']['system_main']['nodes'][arg(1)];
+ $node = $main['#node'];
+ if ($node->type == 'project_issue') {
+ //dpm(array_keys($main));
+ // Initialize issue-stats sidebar.
+ $page['sidebar_second']['issue-stats'] = array();
+ $page['sidebar_second']['issue-stats']['title'] = "Issue Information";
+
+ _bluecheese_move($main, $page['sidebar_second']['issue-stats'], 'field_issue_status');
+ _bluecheese_move($main, $page['sidebar_second']['issue-stats'], 'field_issue_priority');
+ _bluecheese_move($main, $page['sidebar_second']['issue-stats'], 'field_issue_category');
+ _bluecheese_move($main, $page['sidebar_second']['issue-stats'], 'field_issue_component');
+ _bluecheese_move($main, $page['sidebar_second']['issue-stats'], 'field_project');
+ _bluecheese_move($main, $page['sidebar_second']['issue-stats'], 'field_issue_files');
+ _bluecheese_move($main, $page['sidebar_second']['issue-stats'], 'taxonomy_vocabulary_9');
+
+ //dpm($page['sidebar_second']['issue-stats']);
+
+ // Move comments to the content_bottom region.
+ _bluecheese_move($main, $page['content_bottom'], 'comments');
+ }
+ }
+}
+
+/**
+ * Hack to move content between regions.
+ */
+function _bluecheese_move(&$src, &$tgt, $key) {
+ $tgt[$key] = $src[$key];
+ unset($src[$key]);
+}
+
+/**
+ * Implements hook_preprocess_field().
+ * Add classes to priority and status fields.
+ */
+function bluecheese_preprocess_field(&$vars) {
+
+ $name = $vars['element']['#field_name'];
+
+ if($name == 'field_issue_priority') {
+ _field_value_to_class($vars);
+ }
+
+ if($name == 'field_issue_status') {
+ _field_value_to_class($vars);
+ }
+}
+
+/**
+ * Preproces field function helper
+ * Add classes to issue based on value
+ */
+function _field_value_to_class(&$vars) {
+ //dsm($vars);
+ $class = $vars['items'][0]['#markup'];
+ $vars['classes_array'][]= drupal_html_class($class);
+}
+
=== modified file 'sites/all/themes/bluecheese/tpl/comment.tpl.php'
--- sites/all/themes/bluecheese/tpl/comment.tpl.php 2012-07-14 23:38:17 +0000
+++ sites/all/themes/bluecheese/tpl/comment.tpl.php 2012-07-31 22:25:19 +0000
@@ -1,18 +1,25 @@