Skip to content
Snippets Groups Projects
Commit 577ebf6c authored by Chris Gross's avatar Chris Gross
Browse files

daily build

parent 0f0dc072
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1150 additions and 853 deletions
profiles/wcm_base/CHANGELOG.txt
+ 6
− 0
View file @ 577ebf6c
WCM Base 7.x-1.x, 2016-03-08
----------------------------
- OCIO Omega Base: Added 'ocio-omega-sidebars' Panels layout.
- OCIO Admin Menu: Allow menu links to local file paths.
- OCIO WYSIWYG: Patched Linkit to work on menu items.
WCM Base 7.x-1.x, 2016-03-07
----------------------------
- WCM Base: Added Linkchecker module.
......
profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.make
+ 3
− 0
View file @ 577ebf6c
......@@ -17,6 +17,9 @@ projects[fitvids][subdir] = contrib
projects[linkit][version] = 3.5
projects[linkit][subdir] = contrib
projects[ctools][patch][2651404] = http://drupal.org/files/issues/linkit-add-to-any-element-2651404-3.patch
projects[ctools][patch][2652300] = http://drupal.org/files/issues/linkit-private_files_direct_link-2652300-2.patch
projects[ctools][patch][2514928] = http://drupal.org/files/issues/linkit-menu-links-2514928-2.patch
projects[pasteformat][version] = 1.5
projects[pasteformat][subdir] = contrib
......
profiles/wcm_base/modules/custom/wcm_admin_menu/wcm_admin_menu.info
+ 3
− 2
View file @ 577ebf6c
name = "WCM Admin Menu"
description = "WCM Admin Menu Feature"
name = WCM Admin Menu
description = WCM Admin Menu Feature
core = 7.x
package = WCM Features
version = 7.x-1.0
......@@ -44,3 +44,4 @@ features[variable][] = linkchecker_impersonate_user
features[variable][] = linkchecker_scan_blocks
features[variable][] = linkchecker_scan_comments
features[variable][] = linkchecker_scan_nodetypes
features[variable][] = linkit_menu
profiles/wcm_base/modules/custom/wcm_admin_menu/wcm_admin_menu.module
+ 31
− 0
View file @ 577ebf6c
......@@ -227,3 +227,34 @@ function _wcm_admin_menu_linkchecker_report_page() {
}
return $build;
}
/**
* Implements hook_form_FORM_ID_alter.
*
* Adds additional validation to menu item edit form.
*/
function wcm_admin_menu_form_menu_edit_item_alter(&$form, &$form_state) {
if (!empty($form['link_path']['#default_value'])) {
global $base_url;
global $base_path;
$path = str_replace($base_url . $base_path, '', $form['link_path']['#default_value']);
if (file_exists($path)) {
$form['link_path']['#default_value'] = $path;
}
array_unshift($form['#validate'], 'wcm_admin_menu_menu_item_validate');
}
}
/**
* Checks if path to file on menu item is valid.
*/
function wcm_admin_menu_menu_item_validate($form, &$form_state) {
$path = $form_state['values']['link_path'];
if (file_exists($path)) {
$form_state['values']['link_path'] = url($path, array('absolute' => TRUE));
}
}
profiles/wcm_base/modules/custom/wcm_admin_menu/wcm_admin_menu.strongarm.inc
+ 11
− 0
View file @ 577ebf6c
......@@ -192,5 +192,16 @@ example.org';
);
$export['linkchecker_scan_nodetypes'] = $strongarm;
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'linkit_menu';
$strongarm->value = array(
'enable' => 1,
'profile' => 'ocio_field_linkit',
'button_text' => 'Search',
);
$export['linkit_menu'] = $strongarm;
return $export;
}
profiles/wcm_base/themes/ocio_omega_base/panels/assets/panels-layout-template.ai
+ 897
− 851
View file @ 577ebf6c
No preview for this file type
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-sidebars/ocio-omega-sidebars.css 0 → 100644
+ 46
− 0
View file @ 577ebf6c
/**
* @file
* ocio-omega-sidebars panel layout
**/
/*
header and footer
*/
.ocio-omega-sidebars-header,
.ocio-omega-sidebars-footer {
min-height: 1px;
}
/*
other rows
*/
.ocio-omega-sidebars-column-left {
float: left;
min-height: 1px;
}
.ocio-omega-sidebars-column-right {
float: right;
min-height: 1px;
}
.ocio-omega-sidebars-column.span3 {
width: 24%;
}
.ocio-omega-sidebars-column.span6 {
width: 48.5%;
}
.ocio-omega-sidebars-column.span9 {
width: 73%;
}
/* iPad or less */
@media only screen and (max-width: 760px) {
.ocio-omega-sidebars-column.span3,
.ocio-omega-sidebars-column.span6,
.ocio-omega-sidebars-column.span9 {
width: 100%;
float: none;
margin-right: 0;
margin-bottom: 2em;
}
}
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-sidebars/ocio-omega-sidebars.inc 0 → 100644
+ 41
− 0
View file @ 577ebf6c
<?php
// Plugin definition
$plugin = array(
'title' => t('Sidebars'),
'icon' => 'ocio-omega-sidebars.png',
'category' => t('WCM Layouts'),
'theme' => 'ocio_omega_sidebars',
'css' => 'ocio-omega-sidebars.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_col_1' =>t('Row 2, Column 1'),
'row_2_col_2' =>t('Row 2, Column 2'),
'row_3_col_1' =>t('Row 3, Column 1'),
'row_3_col_2' =>t('Row 3, Column 2'),
'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_sidebars().
*/
function template_preprocess_ocio_omega_sidebars(&$vars) {
$rows = array(
'header' => array('header'),
'row_1' => array('row_1_col_1', 'row_1_col_2'),
'row_2' => array('row_2_col_1', 'row_2_col_2'),
'row_3' => array('row_3_col_1', 'row_3_col_2'),
'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();
}
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-sidebars/ocio-omega-sidebars.tpl.php 0 → 100644
+ 112
− 0
View file @ 577ebf6c
<?php
/**
* @file
* Template for custom ocio-omega-sidebars 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-sidebars 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-sidebars-container ocio-omega-sidebars-header clearfix panel-panel row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-sidebars-container-inner ocio-omega-sidebars-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-sidebars-container ocio-omega-sidebars-column-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-sidebars-column-content-region ocio-omega-sidebars-column-left ocio-omega-sidebars-column panel-panel span3">
<div class="ocio-omega-sidebars-column-content-region-inner ocio-omega-sidebars-column-left-inner ocio-omega-sidebars-column-inner panel-panel-inner">
<?php print $content['row_1_col_1']; ?>
</div>
</div>
<div class="ocio-omega-sidebars-column-content-region ocio-omega-sidebars-column-right ocio-omega-sidebars-column panel-panel span9">
<div class="ocio-omega-sidebars-column-content-region-inner ocio-omega-sidebars-column-right-inner ocio-omega-sidebars-column-inner panel-panel-inner">
<?php print $content['row_1_col_2']; ?>
</div>
</div>
</div>
</div>
<!-- Row 2 -->
<div class="row-2 panels-row <?php print $panels_row['row_2']; ?>">
<div class="ocio-omega-sidebars-container ocio-omega-sidebars-column-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-sidebars-column-content-region ocio-omega-sidebars-column-left ocio-omega-sidebars-column panel-panel span9">
<div class="ocio-omega-sidebars-column-content-region-inner ocio-omega-sidebars-column-left-inner ocio-omega-sidebars-column-inner panel-panel-inner">
<?php print $content['row_2_col_1']; ?>
</div>
</div>
<div class="ocio-omega-sidebars-column-content-region ocio-omega-sidebars-column-right ocio-omega-sidebars-column panel-panel span3">
<div class="ocio-omega-sidebars-column-content-region-inner ocio-omega-sidebars-column-right-inner ocio-omega-sidebars-column-inner panel-panel-inner">
<?php print $content['row_2_col_2']; ?>
</div>
</div>
</div>
</div>
<!-- Row 3 -->
<div class="row-2 panels-row <?php print $panels_row['row_3']; ?>">
<div class="ocio-omega-sidebars-container ocio-omega-sidebars-column-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-sidebars-column-content-region ocio-omega-sidebars-column-left ocio-omega-sidebars-column panel-panel span6">
<div class="ocio-omega-sidebars-column-content-region-inner ocio-omega-sidebars-column-left-inner ocio-omega-sidebars-column-inner panel-panel-inner">
<?php print $content['row_3_col_1']; ?>
</div>
</div>
<div class="ocio-omega-sidebars-column-content-region ocio-omega-sidebars-column-right ocio-omega-sidebars-column panel-panel span6">
<div class="ocio-omega-sidebars-column-content-region-inner ocio-omega-sidebars-column-right-inner ocio-omega-sidebars-column-inner panel-panel-inner">
<?php print $content['row_3_col_2']; ?>
</div>
</div>
</div>
</div>
<!-- Row 4 -->
<div class="row-1 panels-row <?php print $panels_row['row_4']; ?>">
<div class="ocio-omega-sidebars-container ocio-omega-sidebars-column-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-sidebars-column-content-region ocio-omega-sidebars-column-left ocio-omega-sidebars-column panel-panel span3">
<div class="ocio-omega-sidebars-column-content-region-inner ocio-omega-sidebars-column-left-inner ocio-omega-sidebars-column-inner panel-panel-inner">
<?php print $content['row_4_col_1']; ?>
</div>
</div>
<div class="ocio-omega-sidebars-column-content-region ocio-omega-sidebars-column-right ocio-omega-sidebars-column panel-panel span9">
<div class="ocio-omega-sidebars-column-content-region-inner ocio-omega-sidebars-column-right-inner ocio-omega-sidebars-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-sidebars-container ocio-omega-sidebars-column-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-sidebars-column-content-region ocio-omega-sidebars-column-left ocio-omega-sidebars-column panel-panel span9">
<div class="ocio-omega-sidebars-column-content-region-inner ocio-omega-sidebars-column-left-inner ocio-omega-sidebars-column-inner panel-panel-inner">
<?php print $content['row_5_col_1']; ?>
</div>
</div>
<div class="ocio-omega-sidebars-column-content-region ocio-omega-sidebars-column-right ocio-omega-sidebars-column panel-panel span3">
<div class="ocio-omega-sidebars-column-content-region-inner ocio-omega-sidebars-column-right-inner ocio-omega-sidebars-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-sidebars-container ocio-omega-sidebars-footer clearfix panel-panel row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-sidebars-container-inner ocio-omega-sidebars-footer-inner panel-panel-inner span12">
<?php print $content['footer']; ?>
</div>
</div>
</div>
</div><!-- /.ocio-omega-sidebars -->
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment