Author: sevein
Date: Wed Aug 24 15:12:22 2011
New Revision: 9587

Log:
Personalization of menu nodes in Trillium theme, icons, etc

Added:
   trunk/plugins/qtTrilliumPlugin/images/help.png   (contents, props changed)
   trunk/plugins/qtTrilliumPlugin/images/user.png   (contents, props changed)
   trunk/plugins/qtTrilliumPlugin/images/world.png   (contents, props changed)
   trunk/plugins/qtTrilliumPlugin/modules/search/
   trunk/plugins/qtTrilliumPlugin/modules/search/templates/
   trunk/plugins/qtTrilliumPlugin/modules/search/templates/_box.php
   trunk/plugins/qtTrilliumPlugin/templates/_header.php
Modified:
   trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
   trunk/plugins/qtTrilliumPlugin/css/header.css
   trunk/plugins/qtTrilliumPlugin/css/main.css
   trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php

Modified: 
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
==============================================================================
--- 
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php   
    Wed Aug 24 15:12:09 2011        (r9586)
+++ 
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php   
    Wed Aug 24 15:12:22 2011        (r9587)
@@ -27,7 +27,7 @@
   {
     $context = $event->getSubject();
 
-    // $context->response->addStylesheet('/plugins/sfClassicPlugin/css/main', 
'last', array('media' => 'all'));
+    $context->response->addStylesheet('/plugins/sfClassicPlugin/css/main', 
'last', array('media' => 'all'));
     // $context->response->addStylesheet('/plugins/sfCaribouPlugin/css/style', 
'last', array('media' => 'all'));
     // $context->response->addStylesheet('/plugins/sfCaribouPlugin/css/print', 
'last', array('media' => 'print'));
     // 
$context->response->addStylesheet('/plugins/sfCaribouPlugin/css/print-ie', 
'last', array('condition' => 'IE', 'media' => 'print'));

Modified: trunk/plugins/qtTrilliumPlugin/css/header.css
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/header.css       Wed Aug 24 15:12:09 
2011        (r9586)
+++ trunk/plugins/qtTrilliumPlugin/css/header.css       Wed Aug 24 15:12:22 
2011        (r9587)
@@ -1,7 +1,3 @@
-#page-wrapper {
-  margin-top: 90px;
-}
-
 #header {
   height: 40px;
   position: fixed;
@@ -170,6 +166,8 @@
   font-size: 0;
 }
 
+/* Menu */
+
 #header ul {
   display: block;
   float: left;
@@ -312,3 +310,20 @@
   color: #808080;
   border-top: 1px solid rgba(0, 0, 0, 0.2);
 }
+
+/* Menu personalization */
+
+#header li.help > a {
+  padding-left: 22px;
+  background: transparent url(../images/help.png) no-repeat 8px 50%;
+}
+
+#header li.language > a {
+  padding-left: 22px;
+  background: transparent url(../images/world.png) no-repeat 8px 50%;
+}
+
+#header li.user > a {
+  padding-left: 28px;
+  background: transparent url(../images/user.png) no-repeat 8px 50%;
+}

Modified: trunk/plugins/qtTrilliumPlugin/css/main.css
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/main.css Wed Aug 24 15:12:09 2011        
(r9586)
+++ trunk/plugins/qtTrilliumPlugin/css/main.css Wed Aug 24 15:12:22 2011        
(r9587)
@@ -1 +1,3 @@
-
+#page-wrapper {
+  margin-top: 0;
+}

Added: trunk/plugins/qtTrilliumPlugin/images/help.png
==============================================================================
Binary file. No diff available.

Added: trunk/plugins/qtTrilliumPlugin/images/user.png
==============================================================================
Binary file. No diff available.

Added: trunk/plugins/qtTrilliumPlugin/images/world.png
==============================================================================
Binary file. No diff available.

Modified: 
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php
==============================================================================
--- 
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php   
    Wed Aug 24 15:12:09 2011        (r9586)
+++ 
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php   
    Wed Aug 24 15:12:22 2011        (r9587)
@@ -1,4 +1,4 @@
-<a class="menu" href="#"><?php echo __('L') ?></a>
+<a class="menu" href="#">&nbsp;</a>
 
 <ul class="links">
   <?php foreach (sfConfig::getAll() as $name => $value): ?>

Added: trunk/plugins/qtTrilliumPlugin/modules/search/templates/_box.php
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/plugins/qtTrilliumPlugin/modules/search/templates/_box.php    Wed Aug 
24 15:12:22 2011        (r9587)
@@ -0,0 +1,12 @@
+<div class="search section">
+
+  <h2 class="element-invisible"><?php echo __('Search') ?></h2>
+
+  <div class="content">
+    <form action="<?php echo url_for(array('module' => 'search')) ?>">
+      <input name="query" value="<?php echo esc_entities($sf_request->query) 
?>"/>
+      <input class="form-submit" type="submit" value="<?php echo __('Search') 
?>"/>
+    </form>
+  </div>
+
+</div>

Added: trunk/plugins/qtTrilliumPlugin/templates/_header.php
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/plugins/qtTrilliumPlugin/templates/_header.php        Wed Aug 24 
15:12:22 2011        (r9587)
@@ -0,0 +1,103 @@
+<script>
+(function ($)
+ {
+  $(document).ready(function()
+    {
+
+      // Dropdown example for topbar nav
+      // ===============================
+
+      $('body').bind('click', function (e)
+        {
+          $('a.menu').parent('li').removeClass("open");
+        });
+
+      $('a.menu').click(function (e)
+        {
+          var $li = $(this).parent("li").toggleClass('open');
+          return false;
+        });
+
+    });
+  })(jQuery);
+</script>
+
+<div id="header">
+  <div class="section clearfix">
+    <div class="container">
+
+      <?php if (sfConfig::get('app_toggleLogo')): ?>
+        <?php echo link_to(image_tag('logo', array('alt' => __('Home'))), 
'@homepage', array('id' => 'logo', 'rel' => 'home', 'title' => __('Home'))) ?>
+      <?php endif; ?>
+
+      <?php if (sfConfig::get('app_toggleTitle') || 
sfConfig::get('app_toggleDescription')): ?>
+        <div id="name-and-slogan">
+
+          <?php if (sfConfig::get('app_toggleTitle')): ?>
+            <h1 id="site-name">
+              <?php echo 
link_to('<span>'.sfConfig::get('app_siteTitle').'</span>', '@homepage', 
array('rel' => 'home', 'title' => __('Home'))) ?>
+            </h1>
+          <?php endif; ?>
+
+          <?php if (sfConfig::get('app_toggleDescription')): ?>
+            <div id="site-slogan">
+              <?php echo sfConfig::get('app_siteDescription') ?>
+            </div>
+          <?php endif; ?>
+
+        </div> <!-- /#name-and-slogan -->
+      <?php endif; ?>
+
+      <ul>
+
+        <li><?php echo link_to(__('Home'), array('module' => 'staticpage')) 
?></a></li>
+
+        <li class="menu">
+          <?php echo get_component('menu', 'browseMenu', array('sf_cache_key' 
=> 'settings')) ?>
+        </li>
+
+      </ul>
+
+      <?php echo get_component('search', 'box') ?>
+
+      <?php echo get_component_slot('header') ?>
+
+      <ul>
+
+        <li class="menu">
+          <?php if ($sf_user->isAuthenticated()): ?>
+            <?php echo get_component('menu', 'mainMenu', array('sf_cache_key' 
=> 'settings')) ?>
+          <?php endif; ?>
+        </li>
+
+        <li class="menu language">
+          <?php echo get_component('i18n', 'changeLanguageList') ?>
+        </li>
+
+        <li class="menu help">
+          <a class="menu" href="#">&nbsp;</a>
+          <ul>
+            <li><?php echo link_to(__('About'), array('module' => 
'staticpage', 'slug' => 'about')) ?></a></li>
+            <li><?php echo link_to(__('?'), array('module' => 'staticpage', 
'slug' => 'help')) ?></a></li>
+           </ul>
+        </li>
+
+        <?php if ($sf_user->isAuthenticated()): ?>
+          <li class="menu user">
+            <a class="menu" href="#"><?php echo $sf_user->user->__toString() 
?></a>
+              <ul>
+                <li><?php echo link_to(__('Profile'), array($sf_user->user, 
'module' => 'user')) ?></li>
+                <li><?php echo link_to(__('Log out'), array('module' => 
'user', 'action' => 'logout')) ?></li>
+              </ul>
+          </li>
+        <?php else: ?>
+          <li><?php echo link_to(__('Log in'), array('module' => 'user', 
'action' => 'login')) ?></li>
+        <?php endif; ?>
+
+      </ul>
+
+      <?php echo get_component('default', 'updateCheck') ?>
+
+    </div> <!-- /.container -->
+  </div> <!-- /.section -->
+</div> <!-- /#header -->

-- 
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