Author: david
Date: Thu Nov 18 12:38:47 2010
New Revision: 8854
Log:
Merge -r8837:8853 from trunk
Modified:
branches/ica-atom/ (props changed)
branches/ica-atom/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
(props changed)
branches/ica-atom/apps/qubit/modules/default/templates/_updateCheck.php
branches/ica-atom/favicon.ico (props changed)
branches/ica-atom/images/logo.png (props changed)
branches/ica-atom/js/updateCheck.js
branches/ica-atom/plugins/qbAclPlugin/lib/vendor/Zend/ (props changed)
branches/ica-atom/plugins/sfDrupalPlugin/vendor/drupal/ (props changed)
branches/ica-atom/test/selenium/ (props changed)
branches/ica-atom/vendor/symfony/ (props changed)
branches/ica-atom/vendor/symfony/lib/task/i18n/sfI18nExtractPluginTask.class.php
(props changed)
branches/ica-atom/vendor/yui/ (props changed)
Modified:
branches/ica-atom/apps/qubit/modules/default/templates/_updateCheck.php
==============================================================================
--- branches/ica-atom/apps/qubit/modules/default/templates/_updateCheck.php
Thu Nov 18 12:23:57 2010 (r8853)
+++ branches/ica-atom/apps/qubit/modules/default/templates/_updateCheck.php
Thu Nov 18 12:38:47 2010 (r8854)
@@ -1,7 +1,8 @@
+<?php $notificationMessage = __('A release %1% upgrade is available.') ?>
+
<?php if ($sf_request->getCookie('has_js')): ?>
<?php $data = json_encode($sf_data->getRaw('updateCheckData')) ?>
- <?php $notificationMessage = __('A release %1% upgrade is available.') ?>
<?php use_helper('Javascript') ?>
Modified: branches/ica-atom/js/updateCheck.js
==============================================================================
--- branches/ica-atom/js/updateCheck.js Thu Nov 18 12:23:57 2010 (r8853)
+++ branches/ica-atom/js/updateCheck.js Thu Nov 18 12:38:47 2010 (r8854)
@@ -9,7 +9,8 @@
{
var showNotification = function (version)
{
- if (1 > version_compare(Qubit.updateCheck.currentVersion,
version))
+ // 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');
}
--
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.
