Author: sevein
Date: Fri Sep 9 12:25:44 2011
New Revision: 9691
Log:
Browse menu to sidebar, and other small changes
Added:
trunk/plugins/qtTrilliumPlugin/modules/menu/actions/browseMenuComponent.class.php
trunk/plugins/qtTrilliumPlugin/templates/_sidebar.php
Deleted:
trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_browseMenu.php
Modified:
trunk/plugins/qtTrilliumPlugin/css/less/_header.less
trunk/plugins/qtTrilliumPlugin/css/less/_misc.less
trunk/plugins/qtTrilliumPlugin/css/main.less
trunk/plugins/qtTrilliumPlugin/templates/_header.php
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_header.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_header.less Thu Sep 8
14:05:30 2011 (r9690)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_header.less Fri Sep 9
12:25:44 2011 (r9691)
@@ -118,6 +118,9 @@
.box-shadow(@shadow);
.transition(none);
+ display: block;
+ float: left;
+
&:-moz-placeholder {
color: @grayLighter;
@@ -146,9 +149,6 @@
}
- display: block;
- float: left;
-
}
input[type=submit] {
@@ -178,6 +178,15 @@
}
+ .advanced-search {
+
+ float: right;
+ clear: left;
+ font-size: 11px;
+ line-height: @baseline;
+
+ }
+
}
}
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_misc.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_misc.less Thu Sep 8 14:05:30
2011 (r9690)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_misc.less Fri Sep 9 12:25:44
2011 (r9691)
@@ -611,3 +611,37 @@
}
}
+
+/*
+ * Sidebar
+ */
+
+.sidebar {
+
+ border-right: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
+ margin-left: -20px !important;
+ padding-left: 60px;
+ border-color: #999;
+ .border-radius(0 0 4px 0);
+ .box-shadow();
+
+ h2, h3 {
+
+ .element-visible();
+ background-color: #eee;
+ border-top: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
+ margin: 0 0 10px -20px;
+ padding: 0px 2px 0px 8px;
+ font-size: 18px;
+
+ }
+
+ ul {
+
+ margin-left: 8px;
+
+ }
+
+}
Modified: trunk/plugins/qtTrilliumPlugin/css/main.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/main.less Thu Sep 8 14:05:30
2011 (r9690)
+++ trunk/plugins/qtTrilliumPlugin/css/main.less Fri Sep 9 12:25:44
2011 (r9691)
@@ -5,19 +5,28 @@
*
*/
-// Twitter Bootstrap
+/*
+ * Twitter bootstrap
+ */
@import "less/reset";
-@import "less/preboot"; // Twitter Bootstrap
-@import "less/scaffolding"; // Twitter Bootstrap
-@import "less/type"; // Twitter Bootstrap
-@import "less/forms"; // Twitter Bootstrap
-@import "less/tables"; // Twitter Bootstrap
-@import "less/patterns"; // Twitter Bootstrap
+@import "less/preboot";
+@import "less/scaffolding";
+@import "less/type";
+@import "less/forms";
+@import "less/tables";
+@import "less/patterns";
+/*
+ * qtTrilliumPlugin
+ */
@import "less/_scaffolding";
@import "less/_header";
@import "less/_misc";
+/*
+ *
+ */
+
.nowrap {
white-space: nowrap;
}
@@ -62,3 +71,15 @@
position: absolute;
}
+
+/**
+ * Reset element-invisible class
+ */
+
+.element-visible {
+
+ height: auto;
+ overflow: visible;
+ position: static;
+
+}
Added:
trunk/plugins/qtTrilliumPlugin/modules/menu/actions/browseMenuComponent.class.php
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
trunk/plugins/qtTrilliumPlugin/modules/menu/actions/browseMenuComponent.class.php
Fri Sep 9 12:25:44 2011 (r9691)
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of Qubit Toolkit.
+ *
+ * Qubit Toolkit is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qubit Toolkit is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class MenuBrowseMenuComponent extends sfComponent
+{
+ public function execute($request)
+ {
+ // Get menu objects
+ $this->browseMenu = QubitMenu::getById(QubitMenu::BROWSE_ID);
+
+ $currentModule = sfContext::getInstance()->getModuleName();
+ $currentAction = sfContext::getInstance()->getActionName();
+
+ if (!in_array($currentModule, array('staticpage')) &&
!in_array($currentAction, array('browse', 'list')))
+ {
+ return sfView::NONE;
+ }
+
+ if (!$this->browseMenu instanceof QubitMenu)
+ {
+ return sfView::NONE;
+ }
+ }
+}
Modified: trunk/plugins/qtTrilliumPlugin/templates/_header.php
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/templates/_header.php Thu Sep 8
14:05:30 2011 (r9690)
+++ trunk/plugins/qtTrilliumPlugin/templates/_header.php Fri Sep 9
12:25:44 2011 (r9691)
@@ -30,12 +30,6 @@
</ul>
<?php endif; ?>
- <ul id="browse-menu">
- <li class="menu">
- <?php echo get_component('menu', 'browseMenu',
array('sf_cache_key' => 'settings')) ?>
- </li>
- </ul>
-
<?php echo get_component_slot('header') ?>
<ul id="options-menu">
Added: trunk/plugins/qtTrilliumPlugin/templates/_sidebar.php
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/plugins/qtTrilliumPlugin/templates/_sidebar.php Fri Sep 9
12:25:44 2011 (r9691)
@@ -0,0 +1,9 @@
+<div class="column sidebar" id="sidebar-first">
+ <div class="section">
+
+ <?php echo get_component('menu', 'browseMenu') ?>
+
+ <?php echo get_component_slot('sidebar') ?>
+
+ </div> <!-- /.section -->
+</div> <!-- /.column.sidebar#sidebar-first -->
--
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.
