Author: sevein
Date: Fri Sep 30 12:25:23 2011
New Revision: 9883
Log:
Trillium, form fixes, restore quickLinks menu, js menu fix...
Added:
trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_quickLinks.php
Modified:
trunk/plugins/qtTrilliumPlugin/css/less/_misc.less
trunk/plugins/qtTrilliumPlugin/js/trillium.js
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php
trunk/plugins/qtTrilliumPlugin/templates/_header.php
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_misc.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_misc.less Fri Sep 30 12:23:39
2011 (r9882)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_misc.less Fri Sep 30 12:25:23
2011 (r9883)
@@ -221,96 +221,43 @@
form {
- .field {
-
- > h3 {
-
- width: 130px;
+ textarea,
+ select,
+ input[type="text"],
+ input[type="password"],
+ .yui-ac-input {
- }
-
- > div {
+ width: 100%;
- width: 410px;
- margin-left: 20px;
- padding-top: 8px;
-
- }
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
}
- .section {
-
- > h3 {
-
- font-size: 12px;
- line-height: @baseline;
+ select,
+ input[type="text"],
+ input[type="password"],
+ .yui-ac-input {
- }
+ height: 26px;
+ line-height: 26px;
}
- table {
+ textarea {
- caption {
-
- display: none;
- padding: 0px;
-
- }
-
- ul.inline {
-
- margin: 0;
-
- li {
-
- display: inline;
- margin: 0 10px 0 0;
- padding: 0;
-
- input {
-
- width: auto;
- margin-right: 5px;
-
- }
-
- }
-
- }
-
- input,
- select {
-
- width: 120px;
-
- }
-
- td {
-
- padding: 8px 2px 8px;
-
- > div {
-
- textarea,
- .grippie {
-
- width: 410px;
-
- }
-
- }
-
- }
+ resize: none;
}
- .yui-calcontainer {
+ .field {
- table {
+ h3 {
- width: auto;
+ font-size: inherit;
+ line-height: inherit;
+ margin-bottom: 4px;
}
@@ -319,57 +266,46 @@
.admin-info {
width: auto;
- #gradient > .vertical(#eee, #fff);
+ background-color: White;
.border-radius(4px);
border: 1px solid @grayLighter;
- .form-item {
-
- margin-bottom: 0;
-
- }
-
- td {
+ table {
border: 0;
- width: 50%;
- text-align: left;
-
- div {
- padding: 0;
+ tr {
- }
+ td {
- }
+ border: 0;
+ width: 50%;
+ text-align: left;
- }
+ div {
- .field {
+ padding: 0;
- .clearfix();
+ }
- > h3 {
+ }
- padding-top: 6px;
- font-size: 13px;
- line-height: 18px;
- float: left;
- width: 130px;
- text-align: right;
- color: #404040;
+ &:hover {
- }
+ background-color: inherit !important;
- > div {
+ }
- float: left;
+ }
}
}
- ul.multiInput {
+ ul.multiInput,
+ div.yui-ac > ul {
+
+ margin-top: @baseline / 2;
li {
@@ -377,28 +313,22 @@
}
- input {
-
- width: 384px !important;
-
- }
-
}
.form-item {
- position: relative;
.clearfix();
> label {
- position: relative;
+ float: none;
+ display: block;
+ width: auto;
+ text-align: left;
+ margin-bottom: 4px;
> .form-required {
- position: absolute;
- top: 4px;
- right: -8px;
color: @red;
font-weight: bold;
@@ -406,107 +336,9 @@
}
- > div {
-
- float: left;
- margin-left: 20px;
-
- > .default-translation {
-
- margin: 0 0 @baseline/2 0;
- padding: 4px 6px;
- line-height: 18px;
-
- }
-
- > button {
-
- height: 28px;
- line-height: 28px;
- vertical-align: middle;
- background-color: White;
- margin-left: 4px;
-
- }
-
- input {
-
- width: 410px;
-
- }
-
- select {
-
- width: 420px;
-
- }
-
- input.readOnly {
-
- background-image: url(../../../../images/lock.png);
- background-position: 99% 50%;
- background-repeat: no-repeat;
- padding-right: 20px;
- width: 394px;
-
- }
-
- textarea {
-
- resize: none;
-
- }
-
- textarea,
- .grippie {
-
- width: 410px;
-
- }
-
- .messages {
-
- position: absolute;
- bottom: -@baseline;
- left: 160px;
- width: 390px;
- padding: 0;
- margin: 0;
- border: 0;
- background-color: transparent;
-
- &.error li {
-
- color: @red;
-
- &:hover {
-
- list-style: none;
-
- }
-
- }
-
- .close {
-
- display: none;
-
- }
-
- ul {
-
- margin: 0;
- padding: 0;
-
- li {
-
- list-style-type: none;
-
- }
-
- }
+ table {
- }
+ margin-bottom: 0;
}
@@ -568,6 +400,23 @@
* Tables
*/
+table {
+
+ border: 1px solid #d6d6d6;
+ border-bottom: 0;
+
+ caption {
+
+ border: 1px solid #d6d6d6;
+ line-height: @baseline;
+ font-weight: bold;
+ #gradient > .vertical(#ddd, #eee);
+ padding-left: 2px;
+
+ }
+
+}
+
#content tbody tr:hover
{
background: #ffe;
@@ -579,7 +428,7 @@
.tabs {
- margin-top: -20px;
+ margin-top: -20px !important;
padding-right: 20px;
}
@@ -645,15 +494,13 @@
input.yui-ac-input {
- display: inline-block;
- width: 410px;
- padding: 4px;
- font-size: 13px;
- line-height: @baseline;
- height: @baseline;
- color: @gray;
- border: 1px solid #ccc;
- .border-radius(3px);
+ padding: 4px;
+ font-size: 13px;
+ line-height: @baseline + 8px;
+ height: @baseline + 8px;
+ color: @gray;
+ border: 1px solid #ccc;
+ .border-radius(3px);
}
@@ -662,14 +509,6 @@
background-image:
url(../../../sfDrupalPlugin/vendor/drupal/misc/throbber.gif);
background-repeat: no-repeat;
background-position: 99% 6px;
- width: 410px;
- margin-bottom: @baseline;
-
- }
-
- .yui-ac-container {
-
- width: 418px !important;
}
@@ -681,29 +520,6 @@
}
-.yui-ac {
-
- ul {
-
- list-style: none;
- margin: 0 0 @baseline 0;
-
- li {
-
- margin: 0 0 @baseline/2 0;
-
- .yui-ac-input {
-
- width: 390px;
-
- }
-
- }
-
- }
-
-}
-
/*
* Resizable textarea
*/
@@ -736,8 +552,8 @@
fieldset {
- margin: 1em 0;
- padding: 1em;
+ margin: 1em 0 1em 0;
+ padding: 1em 0;
border-top: 1px solid @grayLighter;
legend {
@@ -890,7 +706,6 @@
.sidebar {
border-color: #666;
- // .box-shadow();
h2, h3 {
@@ -1104,7 +919,7 @@
img {
- float: left;
+ float: right;
margin-right: 8px;
margin-left: 8px;
@@ -1122,6 +937,12 @@
}
+ input {
+
+ width: auto !important;
+
+ }
+
}
/*
@@ -1269,11 +1090,50 @@
}
/*
- * Error404
+ * Error404,
*/
-body.error404 {
+body.error404,
+body.secure {
+
+ #content > .section > .section {
+
+ width: 460px;
+ margin: 40px auto 0 auto;
+ padding-bottom: 20px;
+ border: 1px solid #ccc;
+ .box-shadow();
+ .border-radius();
+ position: relative;
+
+ h2.capitalize {
+
+ margin-bottom: 20px;
+ padding: 4px 20px 4px 50px;
+ border-bottom: 1px solid #ddd;
+ #gradient > .vertical(#fff, #f4f4f4);
+
+ }
+
+ img:first-child {
+
+ position: absolute;
+ top: 8px;
+ left: 8px;
+
+ }
+
+ }
+
+}
+
+body.secure #content > .section > .section h2 {
+ margin-bottom: 20px;
+ padding: 4px 20px 4px 50px;
+ border-bottom: 1px solid #ddd;
+ #gradient > .vertical(#fff, #f4f4f4);
+ line-height: 28px;
}
Modified: trunk/plugins/qtTrilliumPlugin/js/trillium.js
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/js/trillium.js Fri Sep 30 12:23:39
2011 (r9882)
+++ trunk/plugins/qtTrilliumPlugin/js/trillium.js Fri Sep 30 12:25:23
2011 (r9883)
@@ -3,12 +3,6 @@
$(document).ready(function()
{
- // Wrap fields
- $('.form-item').each(function()
- {
- $(this).children().not(':first').wrapAll('<div />');
- });
-
// Menu
$(document.body).bind('click', function (e)
{
@@ -24,7 +18,10 @@
{
$('li.menu').removeClass("open");
- $target.parent().addClass('open');
+ if (menuClicked)
+ {
+ $target.parent().addClass('open');
+ }
}
if (menuClicked)
Modified:
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php
==============================================================================
---
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php
Fri Sep 30 12:23:39 2011 (r9882)
+++
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php
Fri Sep 30 12:25:23 2011 (r9883)
@@ -1,6 +1,6 @@
<a class="menu" href="#"><?php echo __('Language') ?></a>
-<ul class="links">
+<ul>
<?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>
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
Fri Sep 30 12:25:23 2011 (r9883)
@@ -0,0 +1,13 @@
+<a class="menu" href="#"><?php echo __('Quick links') ?></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>
Modified: trunk/plugins/qtTrilliumPlugin/templates/_header.php
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/templates/_header.php Fri Sep 30
12:23:39 2011 (r9882)
+++ trunk/plugins/qtTrilliumPlugin/templates/_header.php Fri Sep 30
12:25:23 2011 (r9883)
@@ -24,7 +24,7 @@
<?php echo get_component('i18n', 'changeLanguageList') ?>
</li>
- <li class="menu">
+ <li class="menu" style="display: none;">
<a class="menu" href="#"><?php echo __('Help') ?></a>
<ul>
<li><?php echo link_to(__('About'), array('module' =>
'staticpage', 'slug' => 'about')) ?></li>
@@ -32,6 +32,10 @@
</ul>
</li>
+ <li class="menu">
+ <?php echo get_component('menu', 'quickLinks') ?>
+ </li>
+
<?php if ($sf_user->isAuthenticated()): ?>
<li class="menu user">
<a class="menu" href="#"><?php echo $sf_user->user->__toString()
?></a>
--
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.
