Skip to content
Snippets Groups Projects
Commit 41b69eb3 authored by Melissa Miller's avatar Melissa Miller
Browse files

daily build

parent da31deaf
No related branches found
No related tags found
No related merge requests found
Showing
with 1232 additions and 875 deletions
The following patches have been applied to this project:
- http://drupal.org/files/issues/uuid_features-2220837-path-and-pathauto-for-node-3.patch
This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
This file was automatically generated by Drush Make (http://drupal.org/project/drush).
The following patches have been applied to this project:
- http://drupal.org/files/views-exposed-sorts-2037469-1.patch
This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
This file was automatically generated by Drush Make (http://drupal.org/project/drush).
......@@ -2,4 +2,4 @@ The following patches have been applied to this project:
- http://www.drupal.org/files/issues/views_autocomplete_filters-cache-2374709-2.patch
- http://www.drupal.org/files/issues/views_autocomplete_filters-content-pane-2317351-4.patch
This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
This file was automatically generated by Drush Make (http://drupal.org/project/drush).
......@@ -4,3 +4,8 @@ package = Workbench
core = 7.x
configure = admin/config/workbench/settings
dependencies[] = views
; Information added by drush on 2013-03-26
version = "7.x-1.2"
project = "workbench"
datestamp = "1364314302"
\ No newline at end of file
The following patches have been applied to this project:
- http://drupal.org/files/issues/workbench_media-multiupload-2268005-2.patch
This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
This file was automatically generated by Drush Make (http://drupal.org/project/drush).
......@@ -4,3 +4,8 @@ package = Workbench
core = 7.x
dependencies[] = workbench
dependencies[] = media
; Information added by drush on 2012-09-05
version = "7.x-2.1"
project = "workbench_media"
datestamp = "1346862407"
\ No newline at end of file
......@@ -2,4 +2,4 @@ The following patches have been applied to this project:
- http://drupal.org/files/playnicewithpanels-1285090-22.patch
- http://drupal.org/files/issues/view_all_unpublished-1492118-64.patch
This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
This file was automatically generated by Drush Make (http://drupal.org/project/drush).
......@@ -3,3 +3,8 @@ description = Test module for Workbench Moderation.
package = Workbench
core = 7.x
hidden = TRUE
; Information added by drush on 2016-03-16
version = "7.x-1.4+9-dev"
project = "workbench_moderation"
datestamp = "1458161940"
\ No newline at end of file
......@@ -19,3 +19,8 @@ files[] = tests/workbench_moderation.files.test
; Dependencies that are only required for the testbot.
test_dependencies[] = drafty
; Information added by drush on 2016-03-16
version = "7.x-1.4+9-dev"
project = "workbench_moderation"
datestamp = "1458161940"
\ No newline at end of file
No preview for this file type
/**
* @file
* ocio-omega-sidebar-tiles panel layout
**/
/*
header and footer
*/
.ocio-omega-sidebar-tiles-header,
.ocio-omega-sidebar-tiles-footer {
min-height: 1px;
}
/* Tiles */
.ocio-omega-sidebar-tiles-container {
clear: both;
}
.ocio-omega-sidebar-tiles-tile-content-region4 {
min-height: 1px;
width: 22.75%;
float: left;
margin-right: 3%;
}
.ocio-omega-sidebar-tiles-tile4,
.ocio-omega-sidebar-tiles-tile8 {
margin-right: 0;
}
/*
other rows
*/
.ocio-omega-sidebar-tiles-column-left {
float: left;
min-height: 1px;
}
.ocio-omega-sidebar-tiles-column-right {
float: right;
min-height: 1px;
}
.ocio-omega-sidebar-tiles-column.span3 {
width: 22.75%;
}
.ocio-omega-sidebar-tiles-column.span6 {
width: 47%;
}
.ocio-omega-sidebar-tiles-column.span9 {
width: 74.25%;
}
/* iPad or less */
@media only screen and (max-width: 760px) {
.ocio-omega-sidebar-tiles-column.span3,
.ocio-omega-sidebar-tiles-column.span6,
.ocio-omega-sidebar-tiles-column.span9,
.ocio-omega-sidebar-tiles-tile-content-region4 {
width: 100%;
float: none;
margin-right: 0;
margin-bottom: 2em;
}
}
<?php
// Plugin definition
$plugin = array(
'title' => t('Sidebar + Tiles'),
'icon' => 'ocio-omega-sidebar-tiles.png',
'category' => t('WCM Layouts'),
'theme' => 'ocio_omega_sidebar_tiles',
'css' => 'ocio-omega-sidebar-tiles.css',
'regions' => array(
'header' => t('Header'),
'row_1_col_1' =>t('Row 1, Column 1'),
'row_1_col_2' =>t('Row 1, Column 2'),
'row_2_tile_1' =>t('Row 2, Tile 1'),
'row_2_tile_2' =>t('Row 2, Tile 2'),
'row_2_tile_3' =>t('Row 2, Tile 3'),
'row_2_tile_4' =>t('Row 2, Tile 4'),
'row_3_tile_1' =>t('Row 3, Tile 1'),
'row_3_tile_2' =>t('Row 3, Tile 2'),
'row_3_tile_3' =>t('Row 3, Tile 3'),
'row_3_tile_4' =>t('Row 3, Tile 4'),
'row_4_col_1' =>t('Row 4, Column 1'),
'row_4_col_2' =>t('Row 4, Column 2'),
'row_5_col_1' =>t('Row 5, Column 1'),
'row_5_col_2' =>t('Row 5, Column 2'),
'footer' => t('Footer'),
),
);
/**
* Implements hook_preprocess_ocio_omega_sidebar_tiles().
*/
function template_preprocess_ocio_omega_sidebar_tiles(&$vars) {
$rows = array(
'header' => array('header'),
'row_1' => array('row_1_col_1', 'row_1_col_2', 'row_2_tile_1', 'row_2_tile_2', 'row_2_tile_3', 'row_2_tile_4', 'row_3_tile_1', 'row_3_tile_2', 'row_3_tile_3', 'row_4_tile_4'),
'row_4' => array('row_4_col_1', 'row_4_col_2'),
'row_5' => array('row_5_col_1', 'row_5_col_2'),
'footer' => array('footer'),
);
$vars['panels_row'] = ocio_omega_settings_panel_rows($rows, $vars);
$vars['panels_row_classes'] = ocio_omega_settings_panel_row_classes();
}
<?php
/**
* @file
* Template for custom ocio-omega-sidebar-tiles Panopoly layout.
*
* Variables:
* - $css_id: An optional CSS id to use for the layout.
* - $content: An array of content, each item in the array is keyed to one
* panel of the layout. This layout supports the following sections:
*/
?>
<div class="panel-display ocio-omega-sidebar-tiles clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
<!-- header row -->
<div class="row-header panels-row <?php print $panels_row['header']; ?>">
<div class="ocio-omega-sidebar-tiles-container ocio-omega-sidebar-tiles-header clearfix panel-panel row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-sidebar-tiles-container-inner ocio-omega-sidebar-tiles-header-inner panel-panel-inner span12">
<?php print $content['header']; ?>
</div>
</div>
</div>
<!-- Row 1 -->
<div class="row-1 panels-row <?php print $panels_row['row_1']; ?>">
<div class="ocio-omega-sidebar-tiles-container ocio-omega-sidebar-tiles-column-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-sidebar-tiles-column-content-region ocio-omega-sidebar-tiles-column-left ocio-omega-sidebar-tiles-column panel-panel span3">
<div class="ocio-omega-sidebar-tiles-column-content-region-inner ocio-omega-sidebar-tiles-column-left-inner ocio-omega-sidebar-tiles-column-inner panel-panel-inner">
<?php print $content['row_1_col_1']; ?>
</div>
</div>
<div class="ocio-omega-sidebar-tiles-column-content-region ocio-omega-sidebar-tiles-column-right ocio-omega-sidebar-tiles-column panel-panel span9">
<div class="ocio-omega-sidebar-tiles-column-content-region-inner ocio-omega-sidebar-tiles-column-right-inner ocio-omega-sidebar-tiles-column-inner panel-panel-inner">
<?php print $content['row_1_col_2']; ?>
</div>
</div>
<!-- row 2 tiles -->
<div class="ocio-omega-sidebar-tiles-container ocio-omega-sidebar-tiles-tile-content clearfix row-fluid">
<div class="ocio-omega-sidebar-tiles-tile-content-region4 ocio-omega-sidebar-tiles-tile1 panel-panel tile-panel clearfix span3">
<div class="ocio-omega-sidebar-tiles-tile-content-region4-inner ocio-omega-sidebar-tiles-tile1-inner panel-panel-inner">
<?php print $content['row_2_tile_1']; ?>
</div>
</div>
<div class="ocio-omega-sidebar-tiles-tile-content-region4 ocio-omega-sidebar-tiles-tile2 panel-panel tile-panel clearfix span3">
<div class="ocio-omega-sidebar-tiles-tile-content-region4-inner ocio-omega-sidebar-tiles-tile2-inner panel-panel-inner">
<?php print $content['row_2_tile_2']; ?>
</div>
</div>
<div class="ocio-omega-sidebar-tiles-tile-content-region4 ocio-omega-sidebar-tiles-tile3 panel-panel tile-panel clearfix span3">
<div class="ocio-omega-sidebar-tiles-tile-content-region4-inner ocio-omega-sidebar-tiles-tile3-inner panel-panel-inner">
<?php print $content['row_2_tile_3']; ?>
</div>
</div>
<div class="ocio-omega-sidebar-tiles-tile-content-region4 ocio-omega-sidebar-tiles-tile4 panel-panel tile-panel clearfix span3">
<div class="ocio-omega-sidebar-tiles-tile-content-region4-inner ocio-omega-sidebar-tiles-tile4-inner panel-panel-inner">
<?php print $content['row_2_tile_4']; ?>
</div>
</div>
</div>
<!-- row 3 tiles -->
<div class="ocio-omega-sidebar-tiles-container ocio-omega-sidebar-tiles-tile-content clearfix row-fluid">
<div class="ocio-omega-sidebar-tiles-tile-content-region4 ocio-omega-sidebar-tiles-tile1 panel-panel tile-panel clearfix span3">
<div class="ocio-omega-sidebar-tiles-tile-content-region4-inner ocio-omega-sidebar-tiles-tile1-inner panel-panel-inner">
<?php print $content['row_3_tile_1']; ?>
</div>
</div>
<div class="ocio-omega-sidebar-tiles-tile-content-region4 ocio-omega-sidebar-tiles-tile2 panel-panel tile-panel clearfix span3">
<div class="ocio-omega-sidebar-tiles-tile-content-region4-inner ocio-omega-sidebar-tiles-tile2-inner panel-panel-inner">
<?php print $content['row_3_tile_2']; ?>
</div>
</div>
<div class="ocio-omega-sidebar-tiles-tile-content-region4 ocio-omega-sidebar-tiles-tile3 panel-panel tile-panel clearfix span3">
<div class="ocio-omega-sidebar-tiles-tile-content-region4-inner ocio-omega-sidebar-tiles-tile3-inner panel-panel-inner">
<?php print $content['row_3_tile_3']; ?>
</div>
</div>
<div class="ocio-omega-sidebar-tiles-tile-content-region4 ocio-omega-sidebar-tiles-tile4 panel-panel tile-panel clearfix span3">
<div class="ocio-omega-sidebar-tiles-tile-content-region4-inner ocio-omega-sidebar-tiles-tile4-inner panel-panel-inner">
<?php print $content['row_3_tile_4']; ?>
</div>
</div>
</div>
</div>
</div>
<!-- Row 4 -->
<div class="row-1 panels-row <?php print $panels_row['row_4']; ?>">
<div class="ocio-omega-sidebar-tiles-container ocio-omega-sidebar-tiles-column-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-sidebar-tiles-column-content-region ocio-omega-sidebar-tiles-column-left ocio-omega-sidebar-tiles-column panel-panel span3">
<div class="ocio-omega-sidebar-tiles-column-content-region-inner ocio-omega-sidebar-tiles-column-left-inner ocio-omega-sidebar-tiles-column-inner panel-panel-inner">
<?php print $content['row_4_col_1']; ?>
</div>
</div>
<div class="ocio-omega-sidebar-tiles-column-content-region ocio-omega-sidebar-tiles-column-right ocio-omega-sidebar-tiles-column panel-panel span9">
<div class="ocio-omega-sidebar-tiles-column-content-region-inner ocio-omega-sidebar-tiles-column-right-inner ocio-omega-sidebar-tiles-column-inner panel-panel-inner">
<?php print $content['row_4_col_2']; ?>
</div>
</div>
</div>
</div>
<!-- Row 5 -->
<div class="row-2 panels-row <?php print $panels_row['row_5']; ?>">
<div class="ocio-omega-sidebar-tiles-container ocio-omega-sidebar-tiles-column-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-sidebar-tiles-column-content-region ocio-omega-sidebar-tiles-column-left ocio-omega-sidebar-tiles-column panel-panel span9">
<div class="ocio-omega-sidebar-tiles-column-content-region-inner ocio-omega-sidebar-tiles-column-left-inner ocio-omega-sidebar-tiles-column-inner panel-panel-inner">
<?php print $content['row_5_col_1']; ?>
</div>
</div>
<div class="ocio-omega-sidebar-tiles-column-content-region ocio-omega-sidebar-tiles-column-right ocio-omega-sidebar-tiles-column panel-panel span3">
<div class="ocio-omega-sidebar-tiles-column-content-region-inner ocio-omega-sidebar-tiles-column-right-inner ocio-omega-sidebar-tiles-column-inner panel-panel-inner">
<?php print $content['row_5_col_2']; ?>
</div>
</div>
</div>
</div>
<!-- footer row -->
<div class="row-footer panels-row <?php print $panels_row['footer']; ?>">
<div class="ocio-omega-sidebar-tiles-container ocio-omega-sidebar-tiles-footer clearfix panel-panel row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-sidebar-tiles-container-inner ocio-omega-sidebar-tiles-footer-inner panel-panel-inner span12">
<?php print $content['footer']; ?>
</div>
</div>
</div>
</div><!-- /.ocio-omega-sidebar-tiles -->
......@@ -23,13 +23,13 @@ other rows
min-height: 1px;
}
.ocio-omega-sidebars-column.span3 {
width: 24%;
width: 22.75%;
}
.ocio-omega-sidebars-column.span6 {
width: 48.5%;
width: 47%;
}
.ocio-omega-sidebars-column.span9 {
width: 73%;
width: 74.25%;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment