From dd445b563a2283238202a805ff381750d86814c4 Mon Sep 17 00:00:00 2001 From: Marton Kiss Date: Mon, 12 Jan 2015 12:02:07 +0100 Subject: [PATCH] Display official user group logo User group status logo now appears next to group title on group listing page, and right sidebar on group page. Change-Id: I2fe7ca9f2e80dbab1657d4b6e7984b4444cb42b5 --- modules/groups/groups_pages/groups_pages.info | 2 +- .../groups_pages/groups_pages.panelizer.inc | 37 ++++++++++++++++-- .../custom-sass/partials/_group.scss | 35 ++++++++++++++++- .../images/group-logo-small.png | Bin 0 -> 1702 bytes .../openstack_bootstrap/images/group-logo.png | Bin 0 -> 4708 bytes themes/openstack_bootstrap/template.php | 16 ++++++++ .../templates/node.tpl.php | 3 ++ 7 files changed, 87 insertions(+), 6 deletions(-) create mode 100644 themes/openstack_bootstrap/images/group-logo-small.png create mode 100644 themes/openstack_bootstrap/images/group-logo.png diff --git a/modules/groups/groups_pages/groups_pages.info b/modules/groups/groups_pages/groups_pages.info index 0d907b3..9c27ac2 100644 --- a/modules/groups/groups_pages/groups_pages.info +++ b/modules/groups/groups_pages/groups_pages.info @@ -16,4 +16,4 @@ features[ctools][] = strongarm:strongarm:1 features[features_api][] = api:2 features[panelizer_defaults][] = node:group:default features[variable][] = panelizer_defaults_node_group -mtime = 1418722134 +mtime = 1420554875 diff --git a/modules/groups/groups_pages/groups_pages.panelizer.inc b/modules/groups/groups_pages/groups_pages.panelizer.inc index ab6a784..e1f0fd3 100644 --- a/modules/groups/groups_pages/groups_pages.panelizer.inc +++ b/modules/groups/groups_pages/groups_pages.panelizer.inc @@ -181,6 +181,35 @@ function groups_pages_panelizer_defaults() { $display->content['new-0702E7C9-CCB9-4EA3-B2C5-7D1ACDF55BD5'] = $pane; $display->panels['two_66_33_second'][0] = 'new-0702E7C9-CCB9-4EA3-B2C5-7D1ACDF55BD5'; $pane = new stdClass(); + $pane->pid = 'new-89D9A851-8F3A-45BA-AF74-7E55EBF9BB3C'; + $pane->panel = 'two_66_33_second'; + $pane->type = 'entity_field'; + $pane->subtype = 'node:field_group_status'; + $pane->shown = TRUE; + $pane->access = array(); + $pane->configuration = array( + 'label' => 'hidden', + 'formatter' => 'list_default', + 'delta_limit' => 0, + 'delta_offset' => '0', + 'delta_reversed' => FALSE, + 'formatter_settings' => array(), + 'context' => 'panelizer', + 'override_title' => 0, + 'override_title_text' => '', + ); + $pane->cache = array(); + $pane->style = array( + 'settings' => NULL, + ); + $pane->css = array(); + $pane->extras = array(); + $pane->position = 1; + $pane->locks = array(); + $pane->uuid = '89D9A851-8F3A-45BA-AF74-7E55EBF9BB3C'; + $display->content['new-89D9A851-8F3A-45BA-AF74-7E55EBF9BB3C'] = $pane; + $display->panels['two_66_33_second'][1] = 'new-89D9A851-8F3A-45BA-AF74-7E55EBF9BB3C'; + $pane = new stdClass(); $pane->pid = 'new-B17247AB-8C6E-4DB5-A8E0-78C8CF4462FA'; $pane->panel = 'two_66_33_second'; $pane->type = 'views_panes'; @@ -199,11 +228,11 @@ function groups_pages_panelizer_defaults() { ); $pane->css = array(); $pane->extras = array(); - $pane->position = 1; + $pane->position = 2; $pane->locks = array(); $pane->uuid = 'B17247AB-8C6E-4DB5-A8E0-78C8CF4462FA'; $display->content['new-B17247AB-8C6E-4DB5-A8E0-78C8CF4462FA'] = $pane; - $display->panels['two_66_33_second'][1] = 'new-B17247AB-8C6E-4DB5-A8E0-78C8CF4462FA'; + $display->panels['two_66_33_second'][2] = 'new-B17247AB-8C6E-4DB5-A8E0-78C8CF4462FA'; $pane = new stdClass(); $pane->pid = 'new-737D0A90-738F-4637-ABE7-39AF64CC3A1F'; $pane->panel = 'two_66_33_second'; @@ -222,11 +251,11 @@ function groups_pages_panelizer_defaults() { ); $pane->css = array(); $pane->extras = array(); - $pane->position = 2; + $pane->position = 3; $pane->locks = array(); $pane->uuid = '737D0A90-738F-4637-ABE7-39AF64CC3A1F'; $display->content['new-737D0A90-738F-4637-ABE7-39AF64CC3A1F'] = $pane; - $display->panels['two_66_33_second'][2] = 'new-737D0A90-738F-4637-ABE7-39AF64CC3A1F'; + $display->panels['two_66_33_second'][3] = 'new-737D0A90-738F-4637-ABE7-39AF64CC3A1F'; $display->hide_title = PANELS_TITLE_FIXED; $display->title_pane = '0'; $panelizer->display = $display; diff --git a/themes/openstack_bootstrap/custom-sass/partials/_group.scss b/themes/openstack_bootstrap/custom-sass/partials/_group.scss index f072146..ce31457 100644 --- a/themes/openstack_bootstrap/custom-sass/partials/_group.scss +++ b/themes/openstack_bootstrap/custom-sass/partials/_group.scss @@ -137,4 +137,37 @@ position: absolute; float: left; } -} \ No newline at end of file +} + +.group-status-logo { + background: url(../images/group-logo.png); + background-repeat: no-repeat; + width: 32px; + height: 32px; + display: block; + margin-left: -40px; + margin-top: 2px; + float: left; +} + +.node-group.group-status-unsupported .group-status-logo { + background-position: -32px 0px; +} + +.node-group.group-status-official .group-status-logo { + background-position: 0px 0px; +} + +.field-name-field-group-status { + margin-top: 0.5em; + color: #000; + font-size: 14px; + font-weight: 600; + .group-status-logo { + background: url(../images/group-logo-small.png); + width: 16px; + height: 16px; + margin-left: 0px; + margin-right: 4px; + } +} diff --git a/themes/openstack_bootstrap/images/group-logo-small.png b/themes/openstack_bootstrap/images/group-logo-small.png new file mode 100644 index 0000000000000000000000000000000000000000..c876572cc952770ad9ee0071459f18cd688d7cf7 GIT binary patch literal 1702 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19ED_$AYTTC zDm4a%h86~fUqGRT7Yq!g1`G_Z5*Qe)W-u^_7tGleXakhsEbxddW?RtPXT0Z zVp4u-iLH_n$Rap^xU(cP4PjGWG1OZ?59)(t^bPe4^xnDD=o zhJXCnF5Cto?yM`$ew3)2q4CJ3d`J?vY}2Au>YD%I5KJJDc;?@}}>< z|4!4Ds@^j5^iu)-h&;%C*n-^@I4W!S~HWrh+w3bVVslWuPd>{d|id%PfM<$==JGiT2p zd{w&pVZZ#I{+TVUHIoEQ`+h`m%+^0P$#b6t%j{!1^$izZ7i%xLEcj!8UH`@1t37nq zKbT(qeL|9%$iz(w&x=1d*PhP}^8N>utRC|3 zwr%+P`mzqqUQuY}1Iohz#zQ=kXaaL%)Wgw^0MCX+s z4}N^|^#%lF?hmCw*P`uh@Q` zqPvvpkC^bK=NHVZl?+aidg}7&&5B7K4gVDrbu4=hVBJb}s?Je~(P`w;u+BeyJy5Y7jYHr!p%UBG}CcnBUXv0+EsV5nx zW_DAO)#bCt6yA?1MMakyF70FdkWwxEc5QvZ&%LTTGO`L9!SPX!AF`MnH*>0swa@mN zXErfU`kNr9*RjpfAO1zJFplb%Ei##Jek8~~V2aoJMbnf2UYB4D>Re=M9XTv8%Y8q5@vmZL_#yoq!{Q;M? zT`bZbM$=vA#9LaQoaTAlPmOyvyDMAweWobWi7x$oi*Me)ZT#1P?~Ct+*zj4(%bAn{ cE_Hv>pR8LM`|kP)D^P{t>FVdQ&MBb@02wjB0RR91 literal 0 HcmV?d00001 diff --git a/themes/openstack_bootstrap/images/group-logo.png b/themes/openstack_bootstrap/images/group-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c0a6e08c2600745a2333ff2711485d84b7df6086 GIT binary patch literal 4708 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 == 'group') && ($variables['field_name_css'] == 'field-group-status')) { + $status = $node->field_group_status[LANGUAGE_NONE][0]['value'] == 1; + $variables['items'][0]['#markup'] = $status ? ''.t('Official user group') : ''; + } + } +} /** * Implements hook_page_alter(). @@ -189,6 +200,11 @@ function openstack_bootstrap_preprocess_node(&$variables, $hook) { unset($variables['content']['links']['flag']['#links']['flag-inappropriate_node']); } } + // Add group-status-[official|unsupported] class to css + if ($node->type == 'group') { + $status = $node->field_group_status[LANGUAGE_NONE][0]['value'] == 1; + $variables['classes_array'][] = $status ? 'group-status-official' : 'group-status-unsupported'; + } // Remove Log in or register from comments openstack_bootstrap_preprocess_comment($variables); } diff --git a/themes/openstack_bootstrap/templates/node.tpl.php b/themes/openstack_bootstrap/templates/node.tpl.php index 4a8dddb..9441c56 100644 --- a/themes/openstack_bootstrap/templates/node.tpl.php +++ b/themes/openstack_bootstrap/templates/node.tpl.php @@ -113,6 +113,9 @@ $footer_attributes = ''; ?>
> + + + >