weekly build 3

profiles/wcm_base/CHANGELOG.txt

+WCM Base 7.x-1.x, 2017-05-16
+----------------------------
+- OCIO SimpleSAMLphp Auth: Restoring require login feature redirect.
+- WCM Omega: Add panels layout 3d. 
+
 WCM Base 7.x-1.x, 2017-05-15-2
 ----------------------------
 - OCIO News and OCIO Taxonomy: fix features conflict of Taxonomy page layout. Layout will reside in Taxonomy feature. 

profiles/wcm_base/modules/custom/ocio_simplesamlphp_auth/ocio_simplesamlphp_auth.module

@@ -629,6 +629,11 @@ function ocio_simplesamlphp_auth_init() {
     if (strlen($returnTo)) {
       $redirect['query']['ReturnTo'] = $base_url . $returnTo;
     }
+
+    drupal_goto(ltrim($redirect['path'], ''), array(
+      'query' => isset($redirect['query']) ? $redirect['query'] : array(),
+      'fragment' => isset($redirect['fragment']) ? $redirect['fragment'] : '',
+    ));
   }
 }
 

profiles/wcm_base/themes/wcm_omega/panels/layouts/wcm-omega-3d/wcm-omega-3d.inc

+<?php
+// Plugin definition
+$plugin = array(
+  'title' => t('Layout 3d'),
+  'icon' => 'wcm-omega-3d.png',
+  'category' => t('WCM Omega Layouts'),
+  'theme' => 'wcm_omega_3d',
+  'css' => '../wcm-omega-layouts.css',
+  'regions' => array(
+    'header' => t('Header'),
+    'tiles_header' => t('Tiles Header'),
+    'tile1' => t('Tile 1'),
+    'tile2' => t('Tile 2'),
+    'tile3' => t('Tile 3'),
+    'tile4' => t('Tile 4'),
+    'tile5' => t('Tile 5'),
+    'tile6' => t('Tile 6'),
+    'row_1_col_1' =>t('Row 1, Column 1'),
+    'row_1_col_2' =>t('Row 1, Column 2'),
+    'row_2_col_1' =>t('Row 1, Column 1'),
+    'row_2_col_2' =>t('Row 1, Column 2'),
+    'footer' => t('Footer'),
+  ),
+);
+
+/**
+ * Implements hook_preprocess_wcm_omega_3d().
+ */
+function template_preprocess_wcm_omega_3d(&$vars) {
+  $rows = array(
+    'header' => array('header'),
+    'tiles_group' =>array('tiles_header','tile1', 'tile2', 'tile3', 'tile4', 'tile5', 'tile6'),
+    'columns_group' =>array('columns_header','row_1_col_1','row_1_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/wcm_omega/panels/layouts/wcm-omega-3d/wcm-omega-3d.tpl.php

+<?php
+/**
+ * @file
+ * Template for custom wcm-omega-3d 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 wcm-omega-3d clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+  
+    <!-- header-->
+  <div class="row-header panels-row <?php print $panels_row['header']; ?>">
+    <div class="clearfix row-fluid panel-panel span12 <?php print $panels_row_classes; ?>">
+      <div class="panel-panel-inner">
+        <?php print $content['header']; ?>
+      </div>
+    </div>
+  </div>
+
+
+  <!-- tiles_group -->
+  <div class="row-tiles-group panels-row row-tiles <?php print $panels_row['tiles_group']; ?>">
+    
+    <!-- tiles_header -->
+    <div class="clearfix row-fluid panel-panel span12 <?php print $panels_row_classes; ?>">
+      <div class="panel-panel-inner">
+        <?php print $content['tiles_header']; ?>
+      </div>
+    </div>
+
+    <!-- first row of tiles -->
+    <div class="clearfix row-fluid panels-row tiles-row <?php print $panels_row_classes; ?>">
+      
+      <div class="panel-panel tile-panel span4 first-tile">
+        <div class="panel-panel-inner">
+          <?php print $content['tile1']; ?>
+        </div>
+      </div>
+      
+      <div class="panel-panel tile-panel span4">
+        <div class="panel-panel-inner">
+          <?php print $content['tile2']; ?>
+        </div>
+      </div>
+      
+      <div class="panel-panel tile-panel span4 last-tile">
+        <div class="panel-panel-inner">
+          <?php print $content['tile3']; ?>
+        </div>
+      </div>
+      
+    </div><!-- /first row of tiles -->
+    
+    <!-- second row of tiles -->
+    <div class="clearfix row-fluid panels-row tiles-row <?php print $panels_row_classes; ?>">
+      
+      <div class="panel-panel tile-panel span4 first-tile">
+        <div class="panel-panel-inner">
+          <?php print $content['tile4']; ?>
+        </div>
+      </div>
+      
+      <div class="panel-panel tile-panel span4">
+        <div class="panel-panel-inner">
+          <?php print $content['tile5']; ?>
+        </div>
+      </div>
+      
+      <div class="panel-panel tile-panel span4 last-tile">
+        <div class="panel-panel-inner">
+          <?php print $content['tile6']; ?>
+        </div>
+      </div>
+      
+    </div><!-- /second row of tiles -->
+
+  </div> <!-- /tiles_group -->
+  
+  
+  <!-- columns_group -->
+  <div class="row-columns-group panels-row <?php print $panels_row['columns_group']; ?>">
+    
+    <!-- first row of columns -->
+    <div class="clearfix row-fluid panels-row columns-row <?php print $panels_row_classes; ?>">
+      
+      <div class="panel-panel column-panel span6 column-left">
+        <div class="panel-panel-inner">
+          <?php print $content['row_1_col_1']; ?>
+        </div>
+      </div>
+      
+      <div class="panel-panel column-panel span6 column-right">
+        <div class="panel-panel-inner">
+          <?php print $content['row_1_col_2']; ?>
+        </div>
+      </div>
+    
+    </div><!-- /first row of columns -->
+    
+    <!-- second row of columns -->
+    <div class="clearfix row-fluid panels-row columns-row <?php print $panels_row_classes; ?>">
+      
+      <div class="panel-panel column-panel span6 column-left">
+        <div class="panel-panel-inner">
+          <?php print $content['row_2_col_1']; ?>
+        </div>
+      </div>
+      
+      <div class="panel-panel column-panel span6 column-right">
+        <div class="panel-panel-inner">
+          <?php print $content['row_2_col_2']; ?>
+        </div>
+      </div>
+    
+    </div><!-- /second row of columns -->
+    
+  </div> <!-- /columns_group -->
+  
+
+  <!-- footer -->
+  <div class="row-footer panels-row <?php print $panels_row['footer']; ?>">
+    
+    <div class="clearfix row-fluid panel-panel span12 <?php print $panels_row_classes; ?>">
+      <div class="panel-panel-inner">
+        <?php print $content['footer']; ?>
+      </div>
+    </div>
+    
+  </div>
+  
+</div><!-- /.wcm-omega-3d -->
+
+
+
+
+