Author: vvalchev
Date: Thu Apr 26 12:15:55 2012
New Revision: 1330802
URL: http://svn.apache.org/viewvc?rev=1330802&view=rev
Log:
Fixed FELIX-3491 Better activity indication when pressing refresh/update bundle
buttons
https://issues.apache.org/jira/browse/FELIX-3491
Modified:
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_de.properties
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_ru.properties
felix/trunk/webconsole/src/main/resources/res/ui/bundles.js
felix/trunk/webconsole/src/main/resources/templates/bundles.html
Modified:
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties?rev=1330802&r1=1330801&r2=1330802&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
(original)
+++ felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
Thu Apr 26 12:15:55 2012
@@ -242,3 +242,6 @@ metadata.loglevel.description=Logging Le
metadata.locale.name=Locale
metadata.locale.description=If set, this locale forces the localization to use
this locale instead of the one requested by the web browser
+# https://issues.apache.org/jira/browse/FELIX-3491
+bundles.success.title=Success
+bundles.success.text=Operation completed succesfully.
Modified:
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_bg.properties?rev=1330802&r1=1330801&r2=1330802&view=diff
==============================================================================
---
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
[UTF-8] (original)
+++
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
[UTF-8] Thu Apr 26 12:15:55 2012
@@ -241,3 +241,6 @@ metadata.locale.description=Ако е з
В противен случай той се избира автоматично в зависимост от настройките на
Web Browser-a.
+# https://issues.apache.org/jira/browse/FELIX-3491
+bundles.success.title=Успех
+bundles.success.text=Операцията е изпълнена успешно
Modified:
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_de.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_de.properties?rev=1330802&r1=1330801&r2=1330802&view=diff
==============================================================================
---
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_de.properties
[UTF-8] (original)
+++
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_de.properties
[UTF-8] Thu Apr 26 12:15:55 2012
@@ -243,4 +243,8 @@ metadata.loglevel.description=Logging Le
metadata.locale.name=Locale
metadata.locale.description=Feste Einstellung der Lokalisierung der OSGi \
Management console. Falls diese Property nicht gesetzt ist, wird die \
- Lokalisierung anhand des Requests eingestellt.
\ No newline at end of file
+ Lokalisierung anhand des Requests eingestellt.
+
+# https://issues.apache.org/jira/browse/FELIX-3491
+bundles.success.title=Erfolg
+bundles.success.text=Der Vorgang wurde erfolgreich.
Modified:
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_ru.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_ru.properties?rev=1330802&r1=1330801&r2=1330802&view=diff
==============================================================================
---
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_ru.properties
(original)
+++
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle_ru.properties
Thu Apr 26 12:15:55 2012
@@ -208,3 +208,6 @@ metadata.loglevel.description=УÑÐ
metadata.locale.name=ÐокалÑ
metadata.locale.description=ÐденÑиÑикаÑÐ¾Ñ Ð»Ð¾ÐºÐ°Ð»Ð¸,
иÑполÑзÑемой ÐанелÑÑ ÑпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ð¼ÐµÑÑо
запÑаÑиваемой бÑаÑзеÑом.
+# https://issues.apache.org/jira/browse/FELIX-3491
+bundles.success.title=УÑпеÑ
+bundles.success.text=ÐпеÑаÑÐ¸Ñ Ð²Ñполнена ÑÑпеÑно.
Modified: felix/trunk/webconsole/src/main/resources/res/ui/bundles.js
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/res/ui/bundles.js?rev=1330802&r1=1330801&r2=1330802&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/res/ui/bundles.js (original)
+++ felix/trunk/webconsole/src/main/resources/res/ui/bundles.js Thu Apr 26
12:15:55 2012
@@ -20,6 +20,7 @@ var bundlesTable = false;
var bundlesBody = false;
var bundlesTemplate = false;
var bundleOpError = false;
+var bundleOpSuccess = false;
function renderData( eventData, filter ) {
lastBundleData = eventData;
@@ -116,6 +117,11 @@ function changeDataEntryState(/* long */
} else {
entrySetupState( b, _tr, id );
}
+ if ('refresh' == action || 'update' == action) {
+ bundleOpSuccess.dialog('open');
+ // TODO:
+
+ }
}, 'json');
return false;
}
@@ -218,6 +224,11 @@ $(document).ready(function(){
width : '80%'
});
bundleOpError.parent().addClass('ui-state-error');
+ bundleOpSuccess = $('#bundleOpSuccess').dialog({
+ autoOpen: false,
+ modal : true,
+ width : '80%'
+ });
// filter
$('.filterApply').click(function() {
Modified: felix/trunk/webconsole/src/main/resources/templates/bundles.html
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/bundles.html?rev=1330802&r1=1330801&r2=1330802&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/bundles.html [UTF-8]
(original)
+++ felix/trunk/webconsole/src/main/resources/templates/bundles.html [UTF-8]
Thu Apr 26 12:15:55 2012
@@ -142,3 +142,4 @@ var i18n = {
</div>
<div id="bundleOpError" class="ui-helper-hidden"
title="${bundles.error.title}"><pre> </pre></div>
+<div id="bundleOpSuccess" class="ui-helper-hidden"
title="${bundles.success.title}">${bundles.success.text}</div>