openinfra/groups
Code Issues Proposed changes

Openstack theme update

Browse Source 
Home page, main content, groups page theme changes. Added support to
event sidebar design.

Change-Id: Ie32ba0d348d7b6fd316e4504d4e84094dc9fb02c
This commit is contained in:
Marton Kiss 2013-11-05 01:36:36 +08:00
parent 2224df45af
commit 5e107eb1cb
4 changed files with 429 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

257
themes/openstack/css/custom.css
View File

@ -5,7 +5,7 @@
*/
/** COLORS **/
/** BASIC STLYES **/
/* line 34, ../sass/custom.scss */
/* line 37, ../sass/custom.scss */
body {
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
font-size: 13px;
@ -13,7 +13,7 @@ body {
font-weight: normal;
}
/* line 39, ../sass/custom.scss */
/* line 42, ../sass/custom.scss */
a {
color: #bc1518;
text-decoration: none;
@ -34,82 +34,82 @@ a:hover {
a:active {
color: black;
}
/* line 42, ../sass/custom.scss */
/* line 45, ../sass/custom.scss */
a:hover {
text-decoration: underline;
}
/* line 47, ../sass/custom.scss */
/* line 50, ../sass/custom.scss */
p {
margin: 0 0 1.5em;
}
/* line 51, ../sass/custom.scss */
/* line 54, ../sass/custom.scss */
h1 {
font-size: 24px;
color: #264d69;
font-weight: normal;
}
/* line 55, ../sass/custom.scss */
/* line 58, ../sass/custom.scss */
h2 {
font-size: 18px;
color: #264d69;
font-weight: normal;
}
/* line 59, ../sass/custom.scss */
/* line 62, ../sass/custom.scss */
h3 {
font-size: 16px;
color: #bc1518;
font-weight: normal;
}
/* line 63, ../sass/custom.scss */
/* line 66, ../sass/custom.scss */
.block {
margin: 0px;
}
/* line 67, ../sass/custom.scss */
/* line 70, ../sass/custom.scss */
.blueline {
background: url('../images/header-line.gif?1383246258') repeat-x scroll 0 bottom rgba(0, 0, 0, 0);
}
/* line 71, ../sass/custom.scss */
/* line 74, ../sass/custom.scss */
#logo {
line-height: 24px;
verical-align: baseline;
}
/* line 74, ../sass/custom.scss */
/* line 77, ../sass/custom.scss */
#logo img {
padding-top: 8px;
}
/** PRIMARY MENU **/
/* line 81, ../sass/custom.scss */
/* line 84, ../sass/custom.scss */
#navigation {
height: auto;
line-height: 24px;
}
/* line 84, ../sass/custom.scss */
/* line 87, ../sass/custom.scss */
#navigation * {
padding: 0;
margin: 0;
}
/* line 88, ../sass/custom.scss */
/* line 91, ../sass/custom.scss */
#navigation nav {
margin-left: 30px;
}
/* line 91, ../sass/custom.scss */
/* line 94, ../sass/custom.scss */
#navigation .links li {
padding: 0;
}
/* line 94, ../sass/custom.scss */
/* line 97, ../sass/custom.scss */
#navigation li {
vertical-align: baseline;
margin-right: 20px;
}
/* line 97, ../sass/custom.scss */
/* line 100, ../sass/custom.scss */
#navigation li a {
display: block;
color: #353535;
@ -117,21 +117,21 @@ h3 {
font-size: 14px;
text-decoration: none;
}
/* line 106, ../sass/custom.scss */
/* line 109, ../sass/custom.scss */
#navigation li.active a {
border-bottom: 3px solid #CF2F19;
color: #CF2F19;
}
/** UTILITY LINKS **/
/* line 116, ../sass/custom.scss */
/* line 119, ../sass/custom.scss */
.block-commons-utility-links ul {
float: right;
padding: 0;
margin: 0;
display: inline-block;
}
/* line 121, ../sass/custom.scss */
/* line 124, ../sass/custom.scss */
.block-commons-utility-links ul li {
margin: 0;
padding: 0;
@ -139,28 +139,33 @@ h3 {
display: inline-block;
padding-left: 0.5em;
}
/* line 127, ../sass/custom.scss */
/* line 130, ../sass/custom.scss */
.block-commons-utility-links ul li a {
color: #1F7A95;
}
/** BLOCK SEARCH FORM **/
/* line 136, ../sass/custom.scss */
/* line 139, ../sass/custom.scss */
#header #block-search-form {
float: right;
}
/* line 138, ../sass/custom.scss */
/* line 141, ../sass/custom.scss */
#header #block-search-form .form-item {
margin: 0px;
margin-top: 0.5em;
}
/* line 145, ../sass/custom.scss */
#header #block-search-form .form-type-textfield {
border: 1px solid #c5e2ea;
display: inline-block;
}
/* line 141, ../sass/custom.scss */
/* line 148, ../sass/custom.scss */
#header #block-search-form .form-type-textfield input {
border: none;
outline: none;
font-size: 16px;
}
/* line 147, ../sass/custom.scss */
/* line 154, ../sass/custom.scss */
#header #block-search-form .form-submit {
background: #CF2F19;
color: #ffffff;
@ -169,7 +174,7 @@ h3 {
}
/** FOOTER **/
/* line 158, ../sass/custom.scss */
/* line 165, ../sass/custom.scss */
#footer hr {
height: 1px;
background: none repeat scroll 0 0 #DDDDDD;
@ -181,26 +186,26 @@ h3 {
margin: 0 0 1.45em;
width: 100%;
}
/* line 169, ../sass/custom.scss */
/* line 176, ../sass/custom.scss */
#footer .span-8, #footer .span-4 {
float: left;
margin-right: 10px;
}
/* line 173, ../sass/custom.scss */
/* line 180, ../sass/custom.scss */
#footer .span-8 {
width: 310px;
}
/* line 176, ../sass/custom.scss */
/* line 183, ../sass/custom.scss */
#footer .span-4 {
width: 150px;
}
/* line 179, ../sass/custom.scss */
/* line 186, ../sass/custom.scss */
#footer .span-4.last {
margin-right: 0px;
}
/** Groups Page **/
/* line 186, ../sass/custom.scss */
/* line 193, ../sass/custom.scss */
.view-groups-groups-directory {
margin-top: 1em;
margin-bottom: 2em;
@ -210,16 +215,200 @@ h3 {
-o-column-count: 6;
column-count: 6;
}
/* line 190, ../sass/custom.scss */
/* line 197, ../sass/custom.scss */
.view-groups-groups-directory h3 {
margin-top: 0px;
margin-bottom: 0.5em;
}
/* line 194, ../sass/custom.scss */
/* line 201, ../sass/custom.scss */
.view-groups-groups-directory .views-row-last {
padding-bottom: 1em;
}
/* line 197, ../sass/custom.scss */
/* line 204, ../sass/custom.scss */
.view-groups-groups-directory a {
color: #1F7A95;
}
/** Activity stream **/
/* line 211, ../sass/custom.scss */
.view-commons-activity-streams-activity {
background: #f2f6f7;
padding: 10px;
margin-bottom: 20px;
line-height: 1em;
/* activity stream row */
}
/* line 217, ../sass/custom.scss */
.view-commons-activity-streams-activity .views-row {
overflow: hidden;
padding-left: 58px;
padding-bottom: 0.5em;
min-height: 50px;
}
/* line 222, ../sass/custom.scss */
.view-commons-activity-streams-activity .views-row div.user-picture {
position: absolute;
float: left;
margin-left: -58px;
}
/* line 227, ../sass/custom.scss */
.view-commons-activity-streams-activity .views-row .user-picture img {
width: 40px;
}
/* line 230, ../sass/custom.scss */
.view-commons-activity-streams-activity .views-row .views-field-timestamp {
font-size: 0.85em;
margin-top: 0.5em;
}
/* line 234, ../sass/custom.scss */
.view-commons-activity-streams-activity .views-row a {
color: #1f7a95;
}
/** Breadcrumb **/
/* line 243, ../sass/custom.scss */
nav.breadcrumb {
display: none;
}
/** Panel templates **/
/* line 46, ../sass-extensions/zen-grids/stylesheets/zen/_grids.scss */
.two-brick.at-panel:before, .two-brick.at-panel:after {
content: "";
display: table;
}
/* line 50, ../sass-extensions/zen-grids/stylesheets/zen/_grids.scss */
.two-brick.at-panel:after {
clear: both;
}
/* line 254, ../sass/custom.scss */
.two-brick.at-panel .region-two-brick-left-above {
float: left;
width: 50%;
margin-left: 0%;
margin-right: -50%;
padding-left: 5px;
padding-right: 5px;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
word-wrap: break-word;
}
/* line 257, ../sass/custom.scss */
.two-brick.at-panel .region-two-brick-right-above {
float: left;
width: 50%;
margin-left: 50%;
margin-right: -100%;
padding-left: 5px;
padding-right: 5px;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
word-wrap: break-word;
}
/* line 46, ../sass-extensions/zen-grids/stylesheets/zen/_grids.scss */
.three-50-25-25:before, .three-50-25-25:after {
content: "";
display: table;
}
/* line 50, ../sass-extensions/zen-grids/stylesheets/zen/_grids.scss */
.three-50-25-25:after {
clear: both;
}
/* line 266, ../sass/custom.scss */
.three-50-25-25 .region-three-50-25-25-first {
float: left;
width: 50%;
margin-left: 0%;
margin-right: -50%;
padding-left: 5px;
padding-right: 5px;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
word-wrap: break-word;
}
/* line 269, ../sass/custom.scss */
.three-50-25-25 .region-three-50-25-25-second {
float: left;
width: 25%;
margin-left: 50%;
margin-right: -75%;
padding-left: 5px;
padding-right: 5px;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
word-wrap: break-word;
}
/* line 272, ../sass/custom.scss */
.three-50-25-25 .region-three-50-25-25-third {
float: left;
width: 25%;
margin-left: 75%;
margin-right: -100%;
padding-left: 5px;
padding-right: 5px;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
word-wrap: break-word;
}
/** Landing page upcoming events **/
/* line 279, ../sass/custom.scss */
.view-commons-events-upcoming {
background: #f2f6f7;
padding: 10px;
line-height: 1em;
}
/* line 284, ../sass/custom.scss */
.view-commons-events-upcoming .attachment-before,
.view-commons-events-upcoming .view-filters {
display: none;
}
/* line 288, ../sass/custom.scss */
.view-commons-events-upcoming .field-items, .view-commons-events-upcoming .field,
.view-commons-events-upcoming .field-item {
display: inline;
}
/* line 291, ../sass/custom.scss */
.view-commons-events-upcoming article {
padding-bottom: 1em;
}
/* line 294, ../sass/custom.scss */
.view-commons-events-upcoming header {
margin-bottom: 0.5em;
}
/* line 297, ../sass/custom.scss */
.view-commons-events-upcoming header a {
color: #1f7a95;
}
/* line 300, ../sass/custom.scss */
.view-commons-events-upcoming .field-item {
font-size: 0.85em;
}
/** Group page **/
/* line 312, ../sass/custom.scss */
.node-type-group .pane-commons-contributors-group-panel-pane-2,
.node-type-group article .links,
.node-type-group .rate-widget,
.node-type-group .field-type-geofield,
.node-type-group .field-name-field-group-location {
display: none;
}
/* line 315, ../sass/custom.scss */
.node-type-group #quicktabs-commons_bw {
background: #f2f6f7;
padding: 10px;
margin-top: 2em;
margin-bottom: 2em;
}

121
themes/openstack/sass/custom.scss
View File

@ -8,6 +8,7 @@
@import "compass/layout.scss";
@import "compass/typography";
@import "compass/utilities";
@import "init";
/** COLORS **/
@ -18,6 +19,8 @@ $blue1: #E3EDED;
$blue2: #c4e0e9;
$blue3: #254C7C;
$blue4: #264D69;
$blue5: #1D395E;
$blue6: #1F7A95;
$red: #BC1518;
@ -135,6 +138,10 @@ h3{
#header #block-search-form {
float: right;
.form-item {
margin: 0px;
margin-top: 0.5em;
}
.form-type-textfield {
border: 1px solid #c5e2ea;
display: inline-block;
@ -198,3 +205,117 @@ h3{
color: #1F7A95;
}
}
/** Activity stream **/
.view-commons-activity-streams-activity {
background: $blue0;
padding: 10px;
margin-bottom: 20px;
line-height: 1em;
/* activity stream row */
.views-row {
@include clearfix();
padding-left: 58px;
padding-bottom: 0.5em;
min-height: 50px;
div.user-picture {
position: absolute;
float: left;
margin-left: -58px;
}
.user-picture img {
width: 40px;
}
.views-field-timestamp {
font-size: 0.85em;
margin-top: 0.5em;
}
a {
color: $blue6;
}
}
}
/** Breadcrumb **/
nav.breadcrumb {
display: none;
}
/** Panel templates **/
.two-brick.at-panel {
$zen-column-count: 6;
$zen-gutter-width: 10px;
@include zen-grid-container;
//background: #00ff00;
.region-two-brick-left-above {
@include zen-grid-item(3, 1);
}
.region-two-brick-right-above {
@include zen-grid-item(3, 4);
}
}
.three-50-25-25 {
$zen-column-count: 12;
$zen-gutter-width: 10px;
@include zen-grid-container;
.region-three-50-25-25-first {
@include zen-grid-item(6, 1);
}
.region-three-50-25-25-second {
@include zen-grid-item(3, 7);
}
.region-three-50-25-25-third {
@include zen-grid-item(3, 10);
}
}
/** Landing page upcoming events **/
.view-commons-events-upcoming {
background: $blue0;
padding: 10px;
line-height: 1em;
.attachment-before,
.view-filters {
display: none;
}
.field-items, .field,
.field-item {
display: inline;
}
article {
padding-bottom: 1em;
}
header {
margin-bottom: 0.5em;
}
header a {
color: $blue6;
}
.field-item {
font-size: 0.85em;
}
}
/** Group page **/
.node-type-group {
.pane-commons-contributors-group-panel-pane-2,
article .links,
.rate-widget,
.field-type-geofield,
.field-name-field-group-location {
display: none;
}
#quicktabs-commons_bw {
background: $blue0;
padding: 10px;
margin-top: 2em;
margin-bottom: 2em;
}
}

31
themes/openstack/template.php
View File

@ -21,6 +21,8 @@ function openstack_page_alter(&$page) {
}
}
/**
* Override or insert variables into the maintenance page template.
*
@ -79,8 +81,7 @@ function STARTERKIT_preprocess_page(&$variables, $hook) {
* @param $hook
* The name of the template being rendered ("node" in this case.)
*/
/* -- Delete this line if you want to use this function
function STARTERKIT_preprocess_node(&$variables, $hook) {
function openstack_preprocess_node(&$variables, $hook) {
$variables['sample_variable'] = t('Lorem ipsum.');
// Optionally, run node-type-specific preprocess functions, like
@ -90,7 +91,31 @@ function STARTERKIT_preprocess_node(&$variables, $hook) {
$function($variables, $hook);
}
}
// */
function openstack_preprocess_node_event(&$variables, $hook) {
if ($variables['teaser']) {
$variables['theme_hook_suggestions'][] = 'node__' . $variables['node']->type . '__teaser';
$variables['display_submitted'] = False;
$variables['user_picture'] = '';
$variables['content']['links'] = '';
// unset($variables['submitted']);
// $variables['submitted'] = 'XXX';
}
// echo "<pre>";print_r($variables['display_submitted']);
// die('-y-');
}
function openstack_preprocess_views_view(&$variables) {
$view = $variables['view'];
if ($view->name == 'commons_events_upcoming') {
$view->display_handler->set_option('filters', array());
$view->display[$view->current_display]->handler->options["title"] = t('Upcoming events');
// $filters = $view->display_handler->get_option('filters');
// echo "<pre>";print_r($filters);
// die('-x-');
}
}
/**
* Override or insert variables into the comment templates.

57
themes/openstack/templates/node/node--event--teaser.tpl.php Normal file
View File

@ -0,0 +1,57 @@
<?php
/**
* Hiding Content and Printing it Separately
*
* Use the hide() function to hide fields and other content, you can render it
* later using the render() function. Install the Devel module and use
* <?php print dsm($content); ?> to find variable names to hide() or render().
*/
hide($content['comments']);
hide($content['links']);
hide($content['report_link']);
hide($content['field_date']);
hide($content['field_address']);
//hide($content['submitted']);
//$display_submitted = FALSE;
// $keys = array_keys($content);
//echo "<pre>";print_r($content['field_date']);
//die('xxx');
?>
<article id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
<?php print render($title_prefix); ?>
<?php if ($title && !$page): ?>
<header>
<?php if ($title): ?>
<a href="<?php print $node_url; ?>" rel="bookmark"><?php print $title; ?></a>
<?php endif; ?>
</header>
<?php endif; ?>
<?php print $display_submitted; ?>
<?php if($display_submitted): ?>
<footer<?php print $footer_attributes; ?>>
<p class="author-datetime"><?php print $submitted; ?></p>
</footer>
<?php endif; ?>
<div<?php print $content_attributes; ?>>
<?php print $user_picture; ?>
<?php print render($content['field_date']); ?> - <?php print render($content['field_address']); ?>
<?php print render($content); ?>
</div>
<?php if ($links = render($content['links'])): ?>
<nav<?php print $links_attributes; ?>><?php print $links; ?></nav>
<?php endif; ?>
<?php print render($content['report_link']); ?>
</article>
<?php if (isset($content['comments']['comments'])): ?>
<div class="commons-pod commons-pod-comments">
<?php print render($content['comments']); ?>
<?php print render($title_suffix); ?>
</div>
<?php endif; ?>