Author: sevein
Date: Wed Mar 28 16:28:07 2012
New Revision: 11301
Log:
Fix multiple issues in Dominion header, cleanups
Modified:
trunk/plugins/qtDominionPlugin/css/less/_header-ac.less
trunk/plugins/qtDominionPlugin/js/dominion.js
trunk/plugins/qtDominionPlugin/modules/search/templates/_box.php
trunk/plugins/qtDominionPlugin/templates/_header.php
Modified: trunk/plugins/qtDominionPlugin/css/less/_header-ac.less
==============================================================================
--- trunk/plugins/qtDominionPlugin/css/less/_header-ac.less Wed Mar 28
14:36:13 2012 (r11300)
+++ trunk/plugins/qtDominionPlugin/css/less/_header-ac.less Wed Mar 28
16:28:07 2012 (r11301)
@@ -1,9 +1,3 @@
-#council {
- img {
- margin-left:0px;
- }
-}
-
#header {
position: fixed;
@@ -16,202 +10,91 @@
@shadow: 0 3px 3px rgba(0,0,0,.25);
.box-shadow(@shadow);
-
-
.container {
- margin: 0 auto 0 auto;
-
- > #first-level {
- height: 30px;
-
- #update-check { .hide; }
-
- }
-
- > #second-level {
- height: 70px;
-
- #logo-and-name {
- .clearfix;
- h1 {
- a {
- font-size:16px;
-
- img {
- float:left;
- margin-right:5px;
- margin-top:-10px;
- }
- }
- }
- }
-
- .search {
- overflow: hidden;
- margin-top:10px;
- form {
+ margin-left: auto;
+ margin-right: auto;
- input[name="query"] {
-
- background-color: @white;
- font-size:19px;
- width: 98%;
- padding: 6px 9px 2px 9px;
- color: @grayLight;
- border:none;
- outline: 0;
- border-bottom: 2px solid @grayLight;
- .box-shadow(none);
- display: block;
- .border-radius(0);
-
- &:-moz-placeholder {
+ }
+}
- color: @grayLighter;
+#header-nav {
- }
+ .pull-right;
- &::-webkit-input-placeholder {
+ > li > a {
- color: @grayLighter;
+ .border-radius(0);
+ margin-top: 0px;
+ margin-bottom: 0px;
- }
+ // FIXME
+ font-family: @smallFontFamily;
+ font-size: 16px;
+ font-variant: small-caps;
+ text-transform: lowercase;
+ font-weight: bold;
+ color: @grayLight;
- &:hover {
+ &:hover {
- border-bottom: 2px solid @grayDark;
+ color: @orange;
+ background-color: @grayDark;
- }
+ }
- &:focus,
- &.focused {
+ }
- outline: none;
- border-bottom: 2px solid @grayDark;
- color:@grayDark;
+}
- }
+#header-council {
- }
+ .pull-right;
- input[type=submit] {
- .hide;
- }
+}
- }
+#logo-and-name h1 {
+ margin-left: 20px;
+ margin-top: -10px;
- }
+}
+#header-search {
+ overflow: hidden;
+ margin-top: 10px;
- }
- }
+ form input[name="query"] {
- /*
- * Header menu
- */
+ color: @grayLight;
+ font-size: 19px;
+ padding: 6px 8px 2px 8px;
+ border: none;
+ border-bottom: 2px solid @grayLight;
- .nav {
+ .box-shadow(none);
display: block;
- float:right;
- margin-left:0;
+ .border-radius(0);
- li.navitem {
- display: block;
- float: left;
- font-size: 15px;
- font-variant: small-caps;
- text-transform: lowercase;
- font-family: @smallFontFamily;
- font-weight: bold;
+ &:hover {
- a {
- display: block;
- padding: 5px 10px 6px;
- line-height: 19px;
- text-decoration: none;
- color: @grayLight;
- font-size: 16px;
-
- &:hover {
- text-decoration: none;
- color:@orange;
- background-color: @grayDark;
- }
- }
- }
- .dropdown-menu {
- background-color: @grayDark;
+ border-bottom: 2px solid @grayDark;
- .active a {
- background-color: @grayDark;
- }
}
- }
-}
-
-
-@media (max-width: 768px) {
- #council { .hide; }
- #header {
- position: static;
- height: 110px;
- #first-level {
- height:auto;
+ &:focus,
+ &.focused {
- #adminmenu {
- .hide;
- }
+ border-bottom: 2px solid @grayDark;
+ color: @grayDark;
- #options-menu {
- margin:0;
- .hide;
- }
}
- #second-level {
-
- #logo-and-name {
- width: 100%;
- float: none;
- margin:0 0 5px 0;
- display: block;
-
- h1 a {
- display: block;
-
- img {
- float:none !important;
- }
- }
- }
-
- .search {
- width: 100%;
- float: none;
- margin:10px 0 0 0;
- display: block;
-
- form {
- width: 100%;
-
- input[name="query"] {
- width: 100%;
- border:2px solid @grayLight !important;
- }
- }
-
- }
-
- }
}
-}
-
+}
#search-suggestions {
@@ -287,46 +170,53 @@
font-size: 15px;
a {
+
padding-right:15px;
+
}
}
}
-#searchrealm {
- position: fixed;
- top: 86px;
- padding:5px;
- margin-left: 0;
- z-index: @zindexPopover;
- .hide;
- .box-shadow(0 1px 3px rgba(0,0,0,.25));
- #gradient > .vertical-three-colors(@white, @white, 70%, lighten(@grayLight,
10%));
+@media (max-width: 767px) {
- div {
- border-bottom: 1px solid @grayLight;
- padding: 5px 0;
+ #header {
- institution-realm, archivescanada-realm {
+ margin-left: -20px;
+ margin-right: -20px;
- }
+ position: static;
+
+ .container > .row:first-child {
+
+ .hide;
- archivescanada-realm {
- background: url(../../images/ArchivesCanadaLogo-small.png) repeat-x top
left;
}
- &:last-child { // Advanced Search
- border-bottom:none;
- text-transform: lowercase;
- font-variant: small-caps;
- margin:0 20px;
- font-size:15px;
+ }
+
+ #logo-and-name h1 {
+
+ margin: 10px 0 0 0;
+ text-align: center;
+
+ }
+
+ #header-search {
+
+ margin: 20px 10px 0 10px;
+
+ input[name="query"] {
+
+ border: 2px solid @grayLight !important;
+
+ .box-sizing(border-box);
+ width: 100%;
+ height: 30px;
- a {
- padding-right:15px;
- }
}
+
}
-}
+}
Modified: trunk/plugins/qtDominionPlugin/js/dominion.js
==============================================================================
--- trunk/plugins/qtDominionPlugin/js/dominion.js Wed Mar 28 14:36:13
2012 (r11300)
+++ trunk/plugins/qtDominionPlugin/js/dominion.js Wed Mar 28 16:28:07
2012 (r11301)
@@ -203,7 +203,7 @@
$(function ()
{
- $('body').on('focus', '#main-search input[name="query"]', function(e)
+ $('body').on('focus', '#header-search input[name="query"]', function(e)
{
var $this = $(this);
Modified: trunk/plugins/qtDominionPlugin/modules/search/templates/_box.php
==============================================================================
--- trunk/plugins/qtDominionPlugin/modules/search/templates/_box.php Wed Mar
28 14:36:13 2012 (r11300)
+++ trunk/plugins/qtDominionPlugin/modules/search/templates/_box.php Wed Mar
28 16:28:07 2012 (r11301)
@@ -1,13 +1,5 @@
-<div id="main-search" class="search span6">
+<form action="<?php echo url_for(array('module' => 'search')) ?>"
data-autocomplete="<?php echo url_for(array('module' => 'search', 'action' =>
'autocomplete')) ?>">
- <h2 class="element-invisible"><?php echo __('Search') ?></h2>
+ <input name="query"<?php if (isset($sf_request->query)) echo '
class="focused"' ?> value="<?php echo esc_entities($sf_request->query) ?>"
placeholder="<?php echo __('Search') ?>"/>
- <form action="<?php echo url_for(array('module' => 'search')) ?>"
data-autocomplete="<?php echo url_for(array('module' => 'search', 'action' =>
'autocomplete')) ?>">
-
- <input name="query"<?php if (isset($sf_request->query)) echo '
class="focused"' ?> value="<?php echo esc_entities($sf_request->query) ?>" />
-
- <input class="form-submit" type="submit" value="<?php echo __('Search')
?>"/>
-
- </form>
-
-</div>
+</form>
Modified: trunk/plugins/qtDominionPlugin/templates/_header.php
==============================================================================
--- trunk/plugins/qtDominionPlugin/templates/_header.php Wed Mar 28
14:36:13 2012 (r11300)
+++ trunk/plugins/qtDominionPlugin/templates/_header.php Wed Mar 28
16:28:07 2012 (r11301)
@@ -2,79 +2,41 @@
<div class="container">
- <div id="first-level" class="row">
+ <div class="row">
- <div class="span2 pull-right">
- <a href="http://www.archivescanada.ca"; id="council"><?php echo
image_tag('/plugins/qtDominionPlugin/images/council.png', array('width' =>
'156', 'height' => '42')) ?></a>
- </div>
+ <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>
- <div class="span6 pull-right">
+ <ul id="header-nav" class="nav nav-pills">
- <div id="update-check">
- <?php echo get_component('default', 'updateCheck') ?>
- </div>
-
- <ul id="options-menu" class="nav">
-
- <?php echo get_component_slot('header') ?>
-
- <?php if ($sf_user->isAuthenticated()): ?>
- <?php echo get_component('menu', 'mainMenu', array('sf_cache_key'
=> $sf_user->getCulture().$sf_user->getUserID())) ?>
- <?php endif; ?>
-
- <li class="dropdown navitem">
- <?php echo get_component('i18n', 'changeLanguageList') ?>
- </li>
-
- <li class="dropdown navitem">
- <?php echo get_component('menu', 'quickLinks') ?>
- </li>
-
- <?php if ($sf_user->isAuthenticated()): ?>
- <li class="dropdown navitem">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#"><?php
echo $sf_user->user->__toString() ?> <b class="caret"></b></a>
-
- <ul class="dropdown-menu">
- <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 class="navitem"><?php echo link_to(__('Log in'),
array('module' => 'user', 'action' => 'login')) ?></li>
- <?php endif; ?>
+ <li><a href="#"><?php echo __('Home') ?></a></li>
+ <li><a href="#"><?php echo __('Sitemap') ?></a></li>
+ <li><a href="#"><?php echo __('Contact us') ?></a></li>
+ <li><a href="#"><?php echo __('Français') ?></a></li>
</ul>
</div>
- </div> <!-- /#first-level -->
+ </div>
- <div id="second-level" class="row">
+ <div class="row">
<div id="logo-and-name" class="span6">
<h1><?php echo
link_to(image_tag('/plugins/qtDominionPlugin/images/logo'), '@homepage',
array('rel' => 'home', 'title' => __('Home'))) ?></h1>
- <?php /*
+ </div>
- <h1>
- <?php if (sfConfig::get('app_toggleLogo')): ?>
- <?php echo link_to(image_tag('logo'), '@homepage', array('rel' =>
'home', 'title' => __('Home'))) ?>
- <?php endif; ?>
-
- <?php if (sfConfig::get('app_toggleTitle')): ?>
- <?php echo link_to(sfConfig::get('app_siteTitle'), '@homepage',
array('rel' => 'home', 'title' => __('Home'))) ?>
- <?php endif; ?>
- </h1>
+ <div id="header-search" class="span6">
- */ ?>
+ <?php echo get_component('search', 'box') ?>
</div>
- <?php echo get_component('search', 'box') ?>
-
- </div> <!-- /#second-level -->
+ </div>
- </div> <!-- /#container -->
+ </div>
-</div> <!-- /#header -->
+</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.
