Author: sevein
Date: Tue Oct 12 08:40:16 2010
New Revision: 8064
Log:
Move updateCheck component to layout.php to avoid being overridden by plugins
like sfColumbiaPlugin.
Modified:
trunk/apps/qubit/templates/_header.php
trunk/apps/qubit/templates/layout.php
trunk/js/updateCheck.js
Modified: trunk/apps/qubit/templates/_header.php
==============================================================================
--- trunk/apps/qubit/templates/_header.php Tue Oct 12 08:22:13 2010
(r8063)
+++ trunk/apps/qubit/templates/_header.php Tue Oct 12 08:40:16 2010
(r8064)
@@ -3,8 +3,6 @@
<?php echo get_component('i18n', 'changeLanguageList') ?>
- <?php echo get_component('default', 'updateCheck') ?>
-
<?php echo get_component('menu', 'quickLinks') ?>
<?php if (sfConfig::get('app_toggleLogo')): ?>
Modified: trunk/apps/qubit/templates/layout.php
==============================================================================
--- trunk/apps/qubit/templates/layout.php Tue Oct 12 08:22:13 2010
(r8063)
+++ trunk/apps/qubit/templates/layout.php Tue Oct 12 08:40:16 2010
(r8064)
@@ -13,6 +13,8 @@
<div id="page-wrapper">
<div id="page">
+ <?php echo get_component('default', 'updateCheck') ?>
+
<?php echo get_partial('header') ?>
<?php if ($sf_user->isAuthenticated()): ?>
Modified: trunk/js/updateCheck.js
==============================================================================
--- trunk/js/updateCheck.js Tue Oct 12 08:22:13 2010 (r8063)
+++ trunk/js/updateCheck.js Tue Oct 12 08:40:16 2010 (r8064)
@@ -12,7 +12,7 @@
{
if (1 > version_compare(Qubit.updateCheck.currentVersion,
version))
{
- $('<div id="update-check"><span>' +
Qubit.updateCheck.notificationMessage.replace('%1%', version) +
'</span></div>').insertAfter('#languageMenu');
+ $('<div id="update-check"><span>' +
Qubit.updateCheck.notificationMessage.replace('%1%', version) +
'</span></div>').prependTo('#page');
}
};
--
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.
