Author: sevein
Date: Tue Sep 20 16:30:26 2011
New Revision: 9770
Log:
Trillium, more progress
Modified:
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
trunk/plugins/qtTrilliumPlugin/config/view.yml
trunk/plugins/qtTrilliumPlugin/css/less/_header.less
trunk/plugins/qtTrilliumPlugin/css/less/_misc.less
trunk/plugins/qtTrilliumPlugin/js/trillium.js
Modified:
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
==============================================================================
---
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
Tue Sep 20 16:03:18 2011 (r9769)
+++
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
Tue Sep 20 16:30:26 2011 (r9770)
@@ -20,7 +20,7 @@
class qtTrilliumPluginConfiguration extends sfPluginConfiguration
{
public static
- $summary = 'New theme plugin made from scratch. Tested in Internet
Explorer 9, Safari 5, Chrome 10 and Firefox 4.',
+ $summary = 'New theme plugin made from scratch. JavaScript is necessary.
Tested in Internet Explorer 9, Safari 5, Chrome 10 and Firefox 4.',
$version = '1.0.0';
public function contextLoadFactories(sfEvent $event)
Modified: trunk/plugins/qtTrilliumPlugin/config/view.yml
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/config/view.yml Tue Sep 20 16:03:18
2011 (r9769)
+++ trunk/plugins/qtTrilliumPlugin/config/view.yml Tue Sep 20 16:30:26
2011 (r9770)
@@ -7,7 +7,7 @@
-/plugins/sfDrupalPlugin/vendor/drupal/modules/system/system-menus:
-/plugins/sfDrupalPlugin/vendor/drupal/themes/garland/style:
-/plugins/sfDrupalPlugin/vendor/drupal/themes/garland/print:
- -/vendor/yui/button/assets/skins/sam/button:
+ /vendor/yui/button/assets/skins/sam/button:
-/vendor/yui/menu/assets/skins/sam/menu:
form:
graphic:
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_header.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_header.less Tue Sep 20
16:03:18 2011 (r9769)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_header.less Tue Sep 20
16:30:26 2011 (r9770)
@@ -150,11 +150,11 @@
input[type=submit] {
margin: 0px 0 0 10px;
- padding: 0 40px;
+ padding: 0 20px;
display: block;
float: left;
- border: 1px solid #3079ed;
- #gradient > .horizontal(#4d90fe, #4787ed);
+ border: 1px solid #333;
+ #gradient > .horizontal(#333, #444);
background-image:
url(../../../sfCaribouPlugin/images/search.png);
background-repeat: no-repeat;
background-position: 50% 50%;
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_misc.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_misc.less Tue Sep 20 16:03:18
2011 (r9769)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_misc.less Tue Sep 20 16:30:26
2011 (r9770)
@@ -104,12 +104,18 @@
margin-bottom: @baseline;
- h2 {
+ > a {
- border-bottom: 1px solid @grayLighter;
- color: @red;
- font-size: 14px; // small
- line-height: @baseline;
+ h2 {
+
+ border-bottom: 1px solid @grayLighter;
+ color: #0069d6;
+ font-weight: bold;
+ font-size: 16px; // small
+ line-height: @baseline;
+ padding-left: 4px;
+
+ }
}
@@ -154,7 +160,7 @@
.messages {
- .gradientBar(#fceec1, #eedc94);
+ .gradientBar(#eee, #fff);
margin-bottom: @baseline;
padding: 7px 14px;
color: @grayDark;
@@ -213,8 +219,39 @@
form {
+ .field {
+
+ > h3 {
+
+ width: 130px;
+
+ }
+
+ > div {
+
+ width: 410px;
+ margin-left: 20px;
+ padding-top: 8px;
+
+ }
+
+ }
+
+ .section {
+
+ > h3 {
+
+ font-size: 12px;
+ line-height: @baseline;
+
+ }
+
+ }
+
table {
+ width: 640px;
+
caption {
display: none;
@@ -225,7 +262,7 @@
input,
select {
- width: auto !important;
+ width: 120px !important;
}
@@ -233,9 +270,18 @@
padding: 8px 2px 8px;
- }
+ > div {
+
+ textarea,
+ .grippie {
- width: 540px;
+ width: 410px;
+
+ }
+
+ }
+
+ }
}
@@ -251,8 +297,10 @@
.admin-info {
- border-top: 1px solid #999;
- background-color: Blue;
+ width: auto;
+ #gradient > .vertical(#eee, #fff);
+ .border-radius(4px);
+ border: 1px solid @grayLighter;
.form-item {
@@ -260,12 +308,19 @@
}
- }
+ td {
- .form-required {
+ border: 0;
+ width: 50%;
+ text-align: left;
- color: @red;
- font-weight: bold;
+ div {
+
+ padding: 0;
+
+ }
+
+ }
}
@@ -293,6 +348,22 @@
}
+ ul.multiInput {
+
+ li {
+
+ margin-bottom: @baseline / 2;
+
+ }
+
+ input {
+
+ width: 384px !important;
+
+ }
+
+ }
+
.form-item {
position: relative;
@@ -300,13 +371,24 @@
> label {
+ position: relative;
+
+ > .form-required {
+
+ position: absolute;
+ top: 4px;
+ right: -12px;
+ color: @red;
+ font-weight: bold;
+
+ }
+
}
> div {
float: left;
margin-left: 20px;
- width: 390px;
> .default-translation {
@@ -326,10 +408,15 @@
}
- input,
+ input {
+
+ width: 410px;
+
+ }
+
select {
- width: 370px;
+ width: 420px;
}
@@ -408,6 +495,92 @@
}
/*
+ * YUI dialog forms
+ */
+
+.yui-dialog {
+
+ .form-item {
+
+ margin-bottom: 6px !important;
+
+ > label {
+
+ display: block;
+ width: auto;
+ clear: both;
+
+ input[type=checkbox] {
+
+ margin-right: 4px;
+
+ }
+
+ }
+
+ > div {
+
+ display: block;
+ clear: both;
+ margin-left: 0;
+ width: auto;
+
+ input,
+ textarea {
+
+ width: 380px;
+
+ }
+
+ select {
+
+ width: 390px;
+
+ }
+
+ }
+
+ &.form-item-date,
+ &.form-item-telephone,
+ &.form-item-fax,
+ &.form-item-postalCode,
+ &.form-item-city,
+ &.form-item-latitude,
+ &.form-item-longitude {
+
+ input {
+
+ width: 180px;
+
+ }
+
+ }
+
+ &.form-item-startDate,
+ &.form-item-endDate {
+
+ float: left;
+
+ input {
+
+ width: 90px;
+
+ }
+
+ }
+
+ /*
+ #resourceRelation .form-item-type,
+ #updateEvent .form-item-type {
+ float: left;
+ width: 50%;
+ */
+
+ }
+
+}
+
+/*
* Tabs
*/
@@ -477,9 +650,17 @@
html.js {
- div.form-item > input.yui-ac-input {
+ input.yui-ac-input {
- width: 390px;
+ display: inline-block;
+ width: 410px;
+ padding: 4px;
+ font-size: 13px;
+ line-height: @baseline;
+ height: @baseline;
+ color: @gray;
+ border: 1px solid #ccc;
+ .border-radius(3px);
}
@@ -487,15 +668,15 @@
background-image:
url(../../../sfDrupalPlugin/vendor/drupal/misc/throbber.gif);
background-repeat: no-repeat;
- background-position: 100% 2px;
- width: 390px;
+ background-position: 99% 6px;
+ width: 410px;
margin-bottom: @baseline;
}
input.throbbing {
- background-position: 100% -18px;
+ background-position: 99% -14px;
}
@@ -587,11 +768,6 @@
}
- span.form-required {
-
- display: inline;
-
- }
legend,
legend a span.element-invisible {
@@ -930,10 +1106,10 @@
> .section {
- width: 430px;
+ width: 460px;
position: relative;
left: 50%;
- margin-left: -220px;
+ margin-left: -250px;
margin-top: 20px;
border: 1px solid #ccc;
@@ -1012,6 +1188,16 @@
}
/*
+ * Tooltips
+ */
+
+div.description {
+
+ line-height: @baseline;
+
+}
+
+/*
* Error404
*/
Modified: trunk/plugins/qtTrilliumPlugin/js/trillium.js
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/js/trillium.js Tue Sep 20 16:03:18
2011 (r9769)
+++ trunk/plugins/qtTrilliumPlugin/js/trillium.js Tue Sep 20 16:30:26
2011 (r9770)
@@ -18,13 +18,6 @@
'margin-left': '20px' });
}
- // Add asterisk (validation mark) to legend tex
- // if the fieldset contents required fields
- $('body.edit fieldset')
- .has('span.form-required')
- .find('legend')
- .append('<span class="form-required">*</span>');
-
// Menu
$(document.body).bind('click', function (e)
{
--
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.
