Author: sevein
Date: Wed Apr  4 16:22:18 2012
New Revision: 11377

Log:
Overwrite main _header component from ArchivesCanada plugin (council link, 
etc...)

Added:
   branches/2.0/plugins/arArchivesCanadaPlugin/templates/
   branches/2.0/plugins/arArchivesCanadaPlugin/templates/_header.php
Modified:
   branches/2.0/apps/qubit/templates/_header.php

Modified: branches/2.0/apps/qubit/templates/_header.php
==============================================================================
--- branches/2.0/apps/qubit/templates/_header.php       Wed Apr  4 16:18:02 
2012        (r11376)
+++ branches/2.0/apps/qubit/templates/_header.php       Wed Apr  4 16:22:18 
2012        (r11377)
@@ -6,21 +6,8 @@
 
       <div class="span12">
 
-        <a id="header-council" href="http://www.archivescanada.ca";><?php echo 
image_tag('/plugins/qtDominionPlugin/images/council.png', array('width' => 
'156', 'height' => '42')) ?></a>
-
         <ul id="header-nav" class="nav nav-pills">
 
-          <li><?php echo link_to(__('Home'), '@homepage') ?></li>
-          <li><?php echo link_to(__('Sitemap'), array('module' => 
'staticpage', 'slug' => 'sitemap')) ?></li>
-          <li><?php echo link_to(__('Contact us'), array('module' => 
'staticpage', 'slug' => 'contact')) ?></li>
-
-          <?php foreach (array('en', 'fr') as $item): ?>
-            <?php if ($sf_user->getCulture() != $item): ?>
-              <li><?php echo link_to(format_language($item, $item), 
array('sf_culture' => $item) + $sf_request->getParameterHolder()->getAll()) 
?></li>
-              <?php break; ?>
-            <?php endif; ?>
-          <?php endforeach; ?>
-
           <?php // echo get_component('i18n', 'changeLanguageList') ?>
 
           <?php // echo get_component('menu', 'quickLinks') ?>
@@ -38,13 +25,6 @@
     <div class="row">
 
       <?php // Restore old snippet (settings: app_toggleLogo, app_toggleTitle, 
app_toggleDescription, app_sitleTitle, app_sitleDescription) ?>
-      <div id="logo-and-name" class="span6">
-        <h1><?php echo link_to(image_tag('logo'), '@homepage', array('rel' => 
'home', 'title' => __('Home'))) ?></h1>
-      </div>
-
-      <div id="header-search" class="span6">
-        <?php echo get_component('search', 'box') ?>
-      </div>
 
     </div>
 

Added: branches/2.0/plugins/arArchivesCanadaPlugin/templates/_header.php
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/2.0/plugins/arArchivesCanadaPlugin/templates/_header.php   Wed Apr 
 4 16:22:18 2012        (r11377)
@@ -0,0 +1,53 @@
+<div id="header">
+
+  <div class="container">
+
+    <div class="row">
+
+      <div class="span12">
+
+        <a id="header-council" href="http://www.archivescanada.ca";><?php echo 
image_tag('/plugins/qtDominionPlugin/images/council.png', array('width' => 
'156', 'height' => '42')) ?></a>
+
+        <ul id="header-nav" class="nav nav-pills">
+
+          <li><?php echo link_to(__('Home'), '@homepage') ?></li>
+          <li><?php echo link_to(__('Sitemap'), array('module' => 
'staticpage', 'slug' => 'sitemap')) ?></li>
+          <li><?php echo link_to(__('Contact us'), array('module' => 
'staticpage', 'slug' => 'contact')) ?></li>
+
+          <?php foreach (array('en', 'fr') as $item): ?>
+            <?php if ($sf_user->getCulture() != $item): ?>
+              <li><?php echo link_to(format_language($item, $item), 
array('sf_culture' => $item) + $sf_request->getParameterHolder()->getAll()) 
?></li>
+              <?php break; ?>
+            <?php endif; ?>
+          <?php endforeach; ?>
+
+          <?php // echo get_component('i18n', 'changeLanguageList') ?>
+
+          <?php // echo get_component('menu', 'quickLinks') ?>
+
+          <?php // echo get_component('menu', 'browseMenu', 
array('sf_cache_key' => $sf_user->getCulture().$sf_user->getUserID())) ?>
+
+          <?php // echo get_component_slot('header') ?>
+
+        </ul>
+
+      </div>
+
+    </div>
+
+    <div class="row">
+
+      <?php // Restore old snippet (settings: app_toggleLogo, app_toggleTitle, 
app_toggleDescription, app_sitleTitle, app_sitleDescription) ?>
+      <div id="logo-and-name" class="span6">
+        <h1><?php echo link_to(image_tag('logo'), '@homepage', array('rel' => 
'home', 'title' => __('Home'))) ?></h1>
+      </div>
+
+      <div id="header-search" class="span6">
+        <?php echo get_component('search', 'box') ?>
+      </div>
+
+    </div>
+
+  </div>
+
+</div>

-- 
You received this message because you are subscribed to the Google Groups 
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/qubit-commits?hl=en.

Reply via email to