Author: sevein
Date: Mon Sep 12 15:11:17 2011
New Revision: 9698
Log:
Trillium, more progress: form tables, updatecheck
Modified:
trunk/apps/qubit/modules/default/templates/_updateCheck.php
trunk/apps/qubit/templates/layout.php
trunk/css/graphic.css
trunk/js/updateCheck.js
trunk/plugins/qtTrilliumPlugin/config/view.yml
trunk/plugins/qtTrilliumPlugin/css/less/_header.less
trunk/plugins/qtTrilliumPlugin/css/less/_misc.less
trunk/plugins/qtTrilliumPlugin/templates/_header.php
Modified: trunk/apps/qubit/modules/default/templates/_updateCheck.php
==============================================================================
--- trunk/apps/qubit/modules/default/templates/_updateCheck.php Mon Sep 12
14:57:34 2011 (r9697)
+++ trunk/apps/qubit/modules/default/templates/_updateCheck.php Mon Sep 12
15:11:17 2011 (r9698)
@@ -1,4 +1,4 @@
-<?php $notificationMessage = __('A release %1% upgrade is available.') ?>
+<?php $notificationMessage = __('A <a
href="http://www.qubit-toolkit.org/wiki/index.php?title=Release_%1%";
target="_blank">release %2%</a> upgrade is available.') ?>
<?php if ($sf_request->getCookie('has_js')): ?>
@@ -20,6 +20,6 @@
<?php else: ?>
- <div id="update-check"><span><?php echo __($notificationMessage, array('%1%'
=> $lastVersion)) ?></span></div>
+ <div id="update-check"><span><?php echo __($notificationMessage, array('%1%'
=> $lastVersion, '%2%' => $lastVersion)) ?></span></div>
<?php endif; ?>
Modified: trunk/apps/qubit/templates/layout.php
==============================================================================
--- trunk/apps/qubit/templates/layout.php Mon Sep 12 14:57:34 2011
(r9697)
+++ trunk/apps/qubit/templates/layout.php Mon Sep 12 15:11:17 2011
(r9698)
@@ -13,7 +13,9 @@
<div id="page-wrapper">
<div id="page">
- <?php echo get_component('default', 'updateCheck') ?>
+ <div id="update-check">
+ <?php echo get_component('default', 'updateCheck') ?>
+ </div>
<?php echo get_partial('header') ?>
Modified: trunk/css/graphic.css
==============================================================================
--- trunk/css/graphic.css Mon Sep 12 14:57:34 2011 (r9697)
+++ trunk/css/graphic.css Mon Sep 12 15:11:17 2011 (r9698)
@@ -174,6 +174,8 @@
#update-check
{
+ display: none;
+
background-color: #def;
padding: 4px 8px;
Modified: trunk/js/updateCheck.js
==============================================================================
--- trunk/js/updateCheck.js Mon Sep 12 14:57:34 2011 (r9697)
+++ trunk/js/updateCheck.js Mon Sep 12 15:11:17 2011 (r9698)
@@ -12,7 +12,7 @@
// Show notification only when server version is greater
if (-1 == version_compare(Qubit.updateCheck.currentVersion,
version))
{
- $('<div id="update-check"><span>' +
Qubit.updateCheck.notificationMessage.replace('%1%', version) +
'</span></div>').prependTo('#page');
+ $('<span>' +
Qubit.updateCheck.notificationMessage.replace(/\%\d+\%/g, version) +
'</span>').prependTo('#update-check').parent().show();
}
};
Modified: trunk/plugins/qtTrilliumPlugin/config/view.yml
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/config/view.yml Mon Sep 12 14:57:34
2011 (r9697)
+++ trunk/plugins/qtTrilliumPlugin/config/view.yml Mon Sep 12 15:11:17
2011 (r9698)
@@ -9,6 +9,6 @@
-/plugins/sfDrupalPlugin/vendor/drupal/themes/garland/print:
-/vendor/yui/button/assets/skins/sam/button:
-/vendor/yui/menu/assets/skins/sam/menu:
- -form:
- -graphic:
- -main:
+ form:
+ graphic:
+ main:
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_header.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_header.less Mon Sep 12
14:57:34 2011 (r9697)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_header.less Mon Sep 12
15:11:17 2011 (r9698)
@@ -31,41 +31,52 @@
.clearfix();
- > #logo-name-and-slogan {
-
- width: 280px;
- height: 72px;
- float: left;
- background-color: #eee;
- text-align: center;
+ #logo-and-name {
* {
- display: inline;
+ margin: 0;
+ padding: 0;
+ border: 0;
}
- > #logo {
+ h1 {
- clear: both;
+ line-height: 18px;
- img {
+ a {
- height: 50%;
+ color: Black;
}
}
- > #name-and-slogan {
+ img {
+
+ height: 50px;
+ -webkit-transition: -webkit-transform 0.5s;
+ -moz-transition: -moz-transform 0.5s;
- > #site-name {
+ &:hover {
+
+ -webkit-transform: rotate(-5deg) scale(1.5);
+ -moz-transform: rotate(-5deg) scale(1.5);
}
- > #site-slogan {
+ }
+
+ > table {
+
+ width: 280px;
+ height: 72px;
+ float: left;
+
+ td {
- display: none;
+ vertical-align: middle;
}
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_misc.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_misc.less Mon Sep 12 14:57:34
2011 (r9697)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_misc.less Mon Sep 12 15:11:17
2011 (r9698)
@@ -208,14 +208,45 @@
}
/*
- *
- *
+ * Forms
*/
form {
table {
+ caption {
+
+ display: none;
+ padding: 0px;
+
+ }
+
+ input,
+ select {
+
+ width: auto !important;
+
+ }
+
+ td {
+
+ padding: 8px 2px 8px;
+
+ }
+
+ width: 540px;
+
+ }
+
+ .yui-calcontainer {
+
+ table {
+
+ width: auto;
+
+ }
+
}
.admin-info {
@@ -271,6 +302,15 @@
}
+ button {
+
+ height: 28px;
+ line-height: 28px;
+ vertical-align: middle;
+ background-color: White;
+
+ }
+
input,
select {
@@ -538,12 +578,21 @@
}
+ legend {
+
+ background-image:
url(../../../sfDrupalPlugin/vendor/drupal/themes/garland/images/menu-collapsed.gif)
!important;
+
+ }
+
}
fieldset.collapsible {
legend {
+ padding-left: 28px;
+ background: transparent
url(../../../sfDrupalPlugin/vendor/drupal/themes/garland/images/menu-expanded.gif)
no-repeat 10px 50%;
+
a {
display: inline;
@@ -561,12 +610,6 @@
}
- .fieldset-wrapper {
-
- overflow: auto; /* Avoid jumping around due to margins collapsing into
collapsible fieldset border */
-
- }
-
}
}
@@ -662,7 +705,7 @@
margin: 0 0 10px 0;
padding: 0 0 0 8px;
font-size: 18px;
- line-height: 32px;
+ line-height: 24px;
}
@@ -674,3 +717,62 @@
}
+/*
+ * Update check
+ */
+
+#update-check {
+
+ float: right;
+ position: relative;
+ padding: 0;
+ margin: 0;
+ border: 0;
+ width: 40px;
+ height: 30px;
+ border-left: 1px solid #ddd;
+ background: transparent url('../../../../images/bell_error.png') no-repeat
center center;
+ cursor: pointer;
+ .border-radius(0px);
+
+ span {
+
+ position: absolute;
+ display: none;
+ border: 0;
+ padding: 0;
+ top: 0px;
+ right: 41px;
+ width: 280px;
+ height: 36px;
+ line-height: 36px;
+ background-image: none;
+ background-color: #666;
+ border-left: 1px solid #ddd;
+ text-align: center;
+ color: #eee;
+ font-size: 14px;
+ z-index: 20;
+ .border-radius(0 0 4px 4px);
+ .box-shadow(0 1px 3px rgba(0,0,0,.25));
+
+ > a {
+
+ color: #deac33;
+ text-decoration: underline;
+
+ }
+
+ }
+
+ &:hover {
+
+ > span {
+
+ display: block;
+
+ }
+
+ }
+
+}
Modified: trunk/plugins/qtTrilliumPlugin/templates/_header.php
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/templates/_header.php Mon Sep 12
14:57:34 2011 (r9697)
+++ trunk/plugins/qtTrilliumPlugin/templates/_header.php Mon Sep 12
15:11:17 2011 (r9698)
@@ -14,6 +14,10 @@
<?php echo get_component_slot('header') ?>
+ <div id="update-check">
+ <?php echo get_component('default', 'updateCheck') ?>
+ </div>
+
<ul id="options-menu">
<li class="menu">
@@ -49,30 +53,23 @@
<div id="second-level">
<div>
- <div id="logo-name-and-slogan">
-
- <?php if (sfConfig::get('app_toggleLogo')): ?>
- <?php echo link_to(image_tag('logo', array('alt' => __('Home'))),
'@homepage', array('id' => 'logo', 'rel' => 'home', 'title' => __('Home'))) ?>
- <?php endif; ?>
-
- <?php if (sfConfig::get('app_toggleTitle') ||
sfConfig::get('app_toggleDescription')): ?>
- <div id="name-and-slogan">
-
- <?php if (sfConfig::get('app_toggleTitle')): ?>
- <h1 id="site-name">
- <?php echo
link_to('<span>'.sfConfig::get('app_siteTitle').'</span>', '@homepage',
array('rel' => 'home', 'title' => __('Home'))) ?>
- </h1>
- <?php endif; ?>
-
- <?php if (sfConfig::get('app_toggleDescription')): ?>
- <div id="site-slogan">
- <?php echo sfConfig::get('app_siteDescription') ?>
- </div>
- <?php endif; ?>
-
- </div>
- <?php endif; ?>
-
+ <div id="logo-and-name">
+ <table>
+ <tr>
+ <td>
+ <?php if (sfConfig::get('app_toggleLogo')): ?>
+ <?php echo link_to(image_tag('logo', array('alt' =>
__('Home'))), '@homepage', array('id' => 'logo', 'rel' => 'home', 'title' =>
__('Home'))) ?>
+ <?php endif; ?>
+ </td>
+ <td>
+ <?php if (sfConfig::get('app_toggleTitle')): ?>
+ <h1>
+ <?php echo link_to(sfConfig::get('app_siteTitle'),
'@homepage', array('rel' => 'home', 'title' => __('Home'))) ?>
+ </h1>
+ <?php endif; ?>
+ </td>
+ </tr>
+ </table>
</div>
<?php echo get_component('search', 'box') ?>
@@ -80,8 +77,6 @@
</div>
</div> <!-- /#second-level -->
- <?php echo get_component('default', 'updateCheck') ?>
-
</div>
</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.
