Author: sevein
Date: Wed Aug 24 13:56:25 2011
New Revision: 9582
Log:
New header based in Twitter(bootstrap)
Added:
trunk/plugins/qtTrilliumPlugin/css/header.css
trunk/plugins/qtTrilliumPlugin/modules/
trunk/plugins/qtTrilliumPlugin/modules/i18n/
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php
trunk/plugins/qtTrilliumPlugin/modules/menu/
trunk/plugins/qtTrilliumPlugin/modules/menu/templates/
trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_browseMenu.php
trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php
trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_quickLinks.php
trunk/plugins/qtTrilliumPlugin/templates/layout.php
Deleted:
trunk/plugins/qtTrilliumPlugin/templates/_header.php
Modified:
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
trunk/plugins/qtTrilliumPlugin/css/main.css
Modified:
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
==============================================================================
---
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
Wed Aug 24 13:53:05 2011 (r9581)
+++
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
Wed Aug 24 13:56:25 2011 (r9582)
@@ -32,10 +32,8 @@
// $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'));
//
$context->response->addJavaScript('/plugins/sfCaribouPlugin/js/navigation',
'last');
-
- // $context->response->addStylesheet('/plugins/qtTrilliumPlugin/css/GGS',
'last', array('media' => 'all'));
- // $context->response->addStylesheet('/plugins/sfClassicPlugin/css/main',
'last', array('media' => 'all'));
$context->response->addStylesheet('/plugins/qtTrilliumPlugin/css/main',
'last', array('media' => 'all'));
+ $context->response->addStylesheet('/plugins/qtTrilliumPlugin/css/header',
'last', array('media' => 'all'));
}
public function initialize()
Added: trunk/plugins/qtTrilliumPlugin/css/header.css
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/plugins/qtTrilliumPlugin/css/header.css Wed Aug 24 13:56:25
2011 (r9582)
@@ -0,0 +1,314 @@
+#page-wrapper {
+ margin-top: 90px;
+}
+
+#header {
+ height: 40px;
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ z-index: 10000;
+ overflow: visible;
+}
+
+#header > .section {
+ background: #222;
+ background-color: #222222;
+ background-repeat: repeat-x;
+ background-image: -khtml-gradient(linear, left top, left bottom,
from(#333333), to(#222222));
+ background-image: -moz-linear-gradient(#333333, #222222);
+ background-image: -ms-linear-gradient(#333333, #222222);
+ background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #333333), color-stop(100%, #222222));
+ background-image: -webkit-linear-gradient(#333333, #222222);
+ background-image: -o-linear-gradient(#333333, #222222);
+ background-image: linear-gradient(#333333, #222222);
+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0,
0, 0.1);
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0,
0.1);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+}
+
+#header > .section > .container {
+ width: 940px;
+ margin: 0 auto;
+ zoom: 1;
+}
+
+/* Links */
+
+#header a {
+ color: #bfbfbf;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+#header a:hover,
+#header ul li.active a {
+ background-color: #333;
+ background-color: rgba(255, 255, 255, 0.05);
+ color: #ffffff;
+ text-decoration: none;
+}
+
+/* Logo */
+
+#logo {
+ position: relative;
+ float: left;
+}
+
+#logo > img {
+ height: 40px;
+}
+
+/* Name and slogan */
+
+#name-and-slogan {
+ position: relative;
+}
+
+#name-and-slogan > #site-name {
+}
+
+#name-and-slogan > #site-name > a {
+ float: left;
+ display: block;
+ padding: 8px 20px 12px;
+ margin-left: -10px;
+ color: #ffffff;
+ font-size: 20px;
+ font-weight: 200;
+ line-height: 1;
+}
+
+#name-and-slogan > #site-slogan {
+ display: none;
+}
+
+/* Search */
+
+#header .search {
+
+}
+
+#header .search > .content {
+
+}
+
+#header .search > .content > form {
+ float: left;
+ margin: 5px 0 0 0;
+ position: relative;
+ filter: alpha(opacity=100);
+ -khtml-opacity: 1;
+ -moz-opacity: 1;
+ opacity: 1;
+}
+
+#header .search > .content > form > input[name=query] {
+ background-color: #444;
+ background-color: rgba(255, 255, 255, 0.3);
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: normal;
+ font-weight: 13px;
+ line-height: 1;
+ width: 220px;
+ padding: 4px 26px 4px 9px;
+ color: #fff;
+ color: rgba(255, 255, 255, 0.75);
+ border: 1px solid #111;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255,
255, 255, 0.25);
+ -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255,
255, 255, 0.25);
+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255,
255, 0.25);
+ -webkit-transition: none;
+ -moz-transition: none;
+ transition: none;
+}
+
+#header .search > .content > form > input:-moz-placeholder {
+ color: #e6e6e6;
+}
+
+#header .search > .content > form > input::-webkit-input-placeholder {
+ color: #e6e6e6;
+}
+
+#header .search > .content > form > input[name=query]:hover {
+ background-color: #bfbfbf;
+ background-color: rgba(255, 255, 255, 0.5);
+ color: #fff;
+}
+
+#header .search > .content > form > input[name=query]:focus,
+#header .search > .content > form > input[name=query].focused {
+ outline: none;
+ background-color: #fff;
+ color: #404040;
+ text-shadow: 0 1px 0 #fff;
+ border: 0;
+ padding: 5px 26px 5px 10px;
+ -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+ -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+ box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+}
+
+#header .search > .content > form > input[type=submit] {
+ border: 0;
+ margin: 0;
+ position: absolute;
+ cursor: pointer;
+ display: block;
+ top: 7px;
+ right: 8px;
+ background-image:
url(http://a1.twimg.com/a/1314204713/phoenix/img/sprite-icons.png);
+ background-position: -224px -96px;
+ background-color: transparent;
+ width: 14px;
+ height: 14px;
+ font-size: 0;
+}
+
+#header ul {
+ display: block;
+ float: left;
+ margin: 0 10px 0 0;
+ position: relative;
+}
+#header ul.secondary-nav {
+ float: right;
+ margin-left: 10px;
+ margin-right: 0;
+}
+#header ul li {
+ display: block;
+ float: left;
+ font-size: 13px;
+}
+#header ul li a {
+ display: block;
+ float: none;
+ padding: 10px 10px 11px;
+ line-height: 19px;
+ text-decoration: none;
+}
+#header ul li a:hover {
+ color: #fff;
+ text-decoration: none;
+}
+#header ul li.active a {
+ background-color: #222;
+ background-color: rgba(0, 0, 0, 0.5);
+}
+#header ul.primary-nav li ul {
+ left: 0;
+}
+#header ul.secondary-nav li ul {
+ right: 0;
+}
+#header ul li.menu {
+ position: relative;
+}
+#header ul li.menu a.menu:after {
+ width: 0px;
+ height: 0px;
+ display: inline-block;
+ content: "↓";
+ text-indent: -99999px;
+ vertical-align: top;
+ margin-top: 8px;
+ margin-left: 4px;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #fff;
+ filter: alpha(opacity=50);
+ -khtml-opacity: 0.5;
+ -moz-opacity: 0.5;
+ opacity: 0.5;
+}
+#header ul li.menu.open a.menu, #header ul li.menu.open a:hover {
+ background-color: #444;
+ background-color: rgba(255, 255, 255, 0.1);
+ *background-color: #444;
+ /* IE6-7 */
+
+ color: #fff;
+}
+#header ul li.menu.open ul {
+ display: block;
+}
+#header ul li.menu.open ul li a {
+ background-color: transparent;
+ font-weight: normal;
+}
+#header ul li.menu.open ul li a:hover {
+ background-color: rgba(255, 255, 255, 0.1);
+ *background-color: #444;
+ /* IE6-7 */
+
+ color: #fff;
+}
+#header ul li.menu.open ul li.active a {
+ background-color: rgba(255, 255, 255, 0.1);
+ font-weight: bold;
+}
+#header ul li ul {
+ background-color: #333;
+ float: left;
+ display: none;
+ position: absolute;
+ top: 40px;
+ min-width: 160px;
+ max-width: 220px;
+ _width: 160px;
+ margin-left: 0;
+ margin-right: 0;
+ padding: 0;
+ text-align: left;
+ border: 0;
+ zoom: 1;
+ -webkit-border-radius: 0 0 5px 5px;
+ -moz-border-radius: 0 0 5px 5px;
+ border-radius: 0 0 5px 5px;
+ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+ -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+ box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+}
+#header ul li ul li {
+ float: none;
+ clear: both;
+ display: block;
+ background: none;
+ font-size: 12px;
+}
+#header ul li ul li a {
+ display: block;
+ padding: 6px 15px;
+ clear: both;
+ font-weight: normal;
+ line-height: 19px;
+ color: #bbb;
+}
+#header ul li ul li a:hover {
+ background-color: #333;
+ background-color: rgba(255, 255, 255, 0.25);
+ color: #fff;
+}
+#header ul li ul li.divider {
+ height: 1px;
+ overflow: hidden;
+ background: #222;
+ background: rgba(0, 0, 0, 0.2);
+ border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+ margin: 5px 0;
+}
+#header ul li ul li span {
+ clear: both;
+ display: block;
+ background: rgba(0, 0, 0, 0.2);
+ padding: 6px 15px;
+ cursor: default;
+ color: #808080;
+ border-top: 1px solid rgba(0, 0, 0, 0.2);
+}
Modified: trunk/plugins/qtTrilliumPlugin/css/main.css
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/main.css Wed Aug 24 13:53:05 2011
(r9581)
+++ trunk/plugins/qtTrilliumPlugin/css/main.css Wed Aug 24 13:56:25 2011
(r9582)
@@ -1,66 +1 @@
-body {
-}
-#page-wrapper {
-}
-
-#page {
-}
-
-#header {
- background-color: #eee;
- border-top: 1px solid #d2d2d2;
- border-bottom: 1px solid #d2d2d2;
- height: 92px;
- display: block;
-}
-
-#header > .section {
- display: table-row;
-}
-
-#userMenu {
-
-}
-
-#languageMenu {
-
-}
-
-#logo {
- display: table-cell;
-}
-
-#logo > img {
-}
-
-#name-and-slogan {
- display: table-cell;
-}
-
-#site-name {
-}
-
-#site-slogan {
-}
-
-.section.search {
-}
-
-.section.browse {
-}
-
-.section.browse li > a,
-#navigation li > a,
-.section.browse li > a,
-#navigation li > a {
- display: inline;
-}
-
-#main-wrapper {
- margin: 0 auto;
- width: 960px;
-}
-
-#footer {
-}
Added:
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php
Wed Aug 24 13:56:25 2011 (r9582)
@@ -0,0 +1,9 @@
+<a class="menu" href="#"><?php echo __('L') ?></a>
+
+<ul class="links">
+ <?php foreach (sfConfig::getAll() as $name => $value): ?>
+ <?php if ('app_i18n_languages' == substr($name, 0, 18)): ?>
+ <li<?php if ($sf_user->getCulture() == $value): ?> class="active"<?php
endif; ?>><?php echo link_to(format_language($value, $value),
array('sf_culture' => $value) + $sf_request->getParameterHolder()->getAll())
?></li>
+ <?php endif; ?>
+ <?php endforeach; ?>
+</ul>
Added: trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_browseMenu.php
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_browseMenu.php
Wed Aug 24 13:56:25 2011 (r9582)
@@ -0,0 +1,3 @@
+<a class="menu" href="#"><?php echo
$browseMenu->getLabel(array('cultureFallback' => true)) ?></a>
+
+<?php echo QubitMenu::displayHierarchyAsList($browseMenu, 0) ?>
Added: trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php Wed Aug
24 13:56:25 2011 (r9582)
@@ -0,0 +1,3 @@
+<a class="menu" href="#"><?php echo __('Main menu') ?></a>
+
+<?php echo QubitMenu::displayHierarchyAsList($mainMenu, 0,
array('overrideVisibility' => array('admin' =>
$sf_user->hasCredential('administrator')))) ?>
Added: trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_quickLinks.php
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_quickLinks.php
Wed Aug 24 13:56:25 2011 (r9582)
@@ -0,0 +1,13 @@
+<a class="menu" href="#"><?php echo __('Q') ?></a>
+
+<ul>
+ <?php foreach ($quickLinksMenu->getChildren() as $child): ?>
+ <?php if (($sf_user->isAuthenticated()
+ && 'login' != $child->getName())
+ || (!$sf_user->isAuthenticated()
+ && 'logout' != $child->getName()
+ && 'myProfile' != $child->getName())): ?>
+ <li<?php if ($child->isSelected()): ?> class="active"<?php endif;
?>><?php echo link_to($child->getLabel(array('cultureFallback' => true)),
$child->getPath(array('getUrl' => true, 'resolveAlias' => true))) ?></li>
+ <?php endif; ?>
+ <?php endforeach; ?>
+</ul>
Added: trunk/plugins/qtTrilliumPlugin/templates/layout.php
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/plugins/qtTrilliumPlugin/templates/layout.php Wed Aug 24 13:56:25
2011 (r9582)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="<?php echo
$sf_user->getCulture() ?>"<?php if ('rtl' ==
sfCultureInfo::getInstance($sf_user->getCulture())->direction): ?>
dir="rtl"<?php endif; ?>>
+ <head>
+ <?php include_http_metas() ?>
+ <?php include_metas() ?>
+ <?php include_title() ?>
+ <link rel="shortcut icon" href="/favicon.ico"/>
+ <?php include_stylesheets() ?>
+ <?php include_javascripts() ?>
+ </head>
+ <body class="yui-skin-sam <?php echo $sf_context->getModuleName() ?> <?php
echo $sf_context->getActionName() ?>">
+
+ <div id="page-wrapper">
+ <div id="page">
+
+ <?php echo get_partial('header') ?>
+
+ <div id="main-wrapper">
+ <div class="clearfix" id="main">
+
+ <div class="column" id="content">
+ <div class="section">
+ <?php echo $sf_content ?>
+ </div> <!-- /.section -->
+ </div> <!-- /.column#content -->
+
+ <?php echo get_partial('sidebar') ?>
+
+ </div> <!-- /#main -->
+ </div> <!-- /#main-wrapper -->
+
+ <?php echo get_partial('footer') ?>
+
+ </div> <!-- /#page -->
+ </div> <!-- /#page-wrapper -->
+
+ </body>
+</html>
--
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.
