FINAL suepr merge step : added all modules to this super repos

sites/all/themes/contrid/tao/templates/fieldset.tpl.php

@@ -0,0 +1,8 @@
+<fieldset <?php if (!empty($attributes)) print drupal_attributes($attributes) ?>>
+  <?php if (!empty($title)): ?>
+    <legend><span class='<?php print $hook ?>-title fieldset-legend'><?php print $title ?></span></legend>
+  <?php endif; ?>
+  <?php if (!empty($content)): ?>
+    <div class='<?php print $hook ?>-content fieldset-wrapper clearfix'><?php print $content ?></div>
+  <?php endif; ?>
+</fieldset>

sites/all/themes/contrid/tao/templates/node.tpl.php

@@ -0,0 +1,32 @@
+<?php if (!empty($pre_object)) print render($pre_object) ?>
+
+<div class='<?php print $classes ?> clearfix' <?php print ($attributes) ?>>
+  <?php if (!empty($title_prefix)) print render($title_prefix); ?>
+
+  <?php if (!$page && !empty($title)): ?>
+    <h2 <?php if (!empty($title_attributes)) print $title_attributes ?>>
+      <?php if (!empty($new)): ?><span class='new'><?php print $new ?></span><?php endif; ?>
+      <a href="<?php print $node_url ?>"><?php print $title ?></a>
+    </h2>
+  <?php endif; ?>
+
+  <?php if (!empty($title_suffix)) print render($title_suffix); ?>
+
+  <?php if (!empty($submitted)): ?>
+    <div class='<?php print $hook ?>-submitted clearfix'><?php print $submitted ?></div>
+  <?php endif; ?>
+
+  <?php if (!empty($content)): ?>
+    <div class='<?php print $hook ?>-content clearfix <?php if (!empty($is_prose)) print 'prose' ?>'>
+      <?php print render($content) ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if (!empty($links)): ?>
+    <div class='<?php print $hook ?>-links clearfix'>
+      <?php print render($links) ?>
+    </div>
+  <?php endif; ?>
+</div>
+
+<?php if (!empty($post_object)) print render($post_object) ?>

sites/all/themes/contrid/tao/templates/object.tpl.php

@@ -0,0 +1,28 @@
+<?php if (!empty($pre_object)) print render($pre_object) ?>
+
+<div class='<?php print $classes ?> clearfix' <?php print ($attributes) ?>>
+  <?php if (!empty($title_prefix)) print render($title_prefix); ?>
+
+  <?php if (!empty($title)): ?>
+    <h2 <?php if (!empty($title_attributes)) print $title_attributes ?>>
+      <?php if (!empty($new)): ?><span class='new'><?php print $new ?></span><?php endif; ?>
+      <?php print $title ?>
+    </h2>
+  <?php endif; ?>
+
+  <?php if (!empty($title_suffix)) print render($title_suffix); ?>
+
+  <?php if (!empty($submitted)): ?>
+    <div class='<?php print $hook ?>-submitted clearfix'><?php print $submitted ?></div>
+  <?php endif; ?>
+
+  <?php if (!empty($content)): ?>
+    <div <?php print $content_attributes; ?>><?php print render($content) ?></div>
+  <?php endif; ?>
+
+  <?php if (!empty($links)): ?>
+    <div class='<?php print $hook ?>-links clearfix'><?php print render($links) ?></div>
+  <?php endif; ?>
+</div>
+
+<?php if (!empty($post_object)) print render($post_object) ?>

sites/all/themes/contrid/tao/templates/page.tpl.php

@@ -0,0 +1,59 @@
+<?php if ($page['help'] || ($show_messages && $messages)): ?>
+  <div id='console'><div class='limiter clearfix'>
+    <?php print render($page['help']); ?>
+    <?php if ($show_messages && $messages): print $messages; endif; ?>
+  </div></div>
+<?php endif; ?>
+
+<?php if ($page['header']): ?>
+  <div id='header'><div class='limiter clearfix'>
+    <?php print render($page['header']); ?>
+  </div></div>
+<?php endif; ?>
+
+<div id='branding'><div class='limiter clearfix'>
+  <?php if ($site_name): ?><h1 class='site-name'><?php print $site_name ?></h1><?php endif; ?>
+</div></div>
+
+<div id='navigation'><div class='limiter clearfix'>
+  <?php if (isset($main_menu)) : ?>
+    <?php print theme('links', array('links' => $main_menu, 'attributes' => array('class' => 'links main-menu'))) ?>
+  <?php endif; ?>
+  <?php if (isset($secondary_menu)) : ?>
+    <?php print theme('links', array('links' => $secondary_menu, 'attributes' => array('class' => 'links secondary-menu'))) ?>
+  <?php endif; ?>
+</div></div>
+
+<?php if ($page['highlighted']): ?>
+  <div id='highlighted'><div class='limiter clearfix'>
+    <?php print render($page['highlighted']); ?>
+  </div></div>
+<?php endif; ?>
+
+<div id='page'><div class='limiter clearfix'>
+
+  <?php if ($page['sidebar_first']): ?>
+    <div id='left' class='clearfix'><?php print render($page['sidebar_first']) ?></div>
+  <?php endif; ?>
+
+  <div id='main-content' class='clearfix'>
+    <?php if ($breadcrumb) print $breadcrumb; ?>
+    <?php print render($title_prefix); ?>
+    <?php if ($title): ?><h1 class='page-title'><?php print $title ?></h1><?php endif; ?>
+    <?php print render($title_suffix); ?>
+    <?php if ($primary_local_tasks): ?><ul class='links clearfix'><?php print render($primary_local_tasks) ?></ul><?php endif; ?>
+    <?php if ($secondary_local_tasks): ?><ul class='links clearfix'><?php print render($secondary_local_tasks) ?></ul><?php endif; ?>
+    <?php if ($action_links): ?><ul class='links clearfix'><?php print render($action_links); ?></ul><?php endif; ?>
+    <div id='content' class='clearfix'><?php print render($page['content']) ?></div>
+  </div>
+
+  <?php if ($page['sidebar_second']): ?>
+    <div id='right' class='clearfix'><?php print render($page['sidebar_second']) ?></div>
+  <?php endif; ?>
+
+</div></div>
+
+<div id="footer"><div class='limiter clearfix'>
+  <?php print $feed_icons ?>
+  <?php print render($page['footer']) ?>
+</div></div>

sites/all/themes/contrid/tao/templates/views-view-grid.tpl.php

@@ -0,0 +1,29 @@
+<?php
+reset($rows);
+$gridsize = count($rows[0]);
+?>
+<?php if (!empty($title)) : ?>
+  <h3 class='grid-title'><?php print $title; ?></h3>
+<?php endif; ?>
+<table class="views-view-grid grid-<?php print $gridsize ?>">
+  <tbody>
+    <?php foreach ($rows as $row_number => $columns): ?>
+      <?php
+        $row_class = 'row-' . ($row_number + 1);
+        if ($row_number == 0 && count($rows) > 1) {
+          $row_class .= ' row-first';
+        }
+        elseif (count($rows) == ($row_number + 1)) {
+          $row_class .= ' row-last';
+        }
+      ?>
+      <tr class="<?php print $row_class; ?>">
+        <?php foreach ($columns as $column_number => $item): ?>
+          <td class="<?php print 'col-'. ($column_number + 1); ?>">
+            <div class='grid-item'><?php print $item; ?></div>
+          </td>
+        <?php endforeach; ?>
+      </tr>
+    <?php endforeach; ?>
+  </tbody>
+</table>