From: <die...@us...> - 2010-09-08 13:01:53
|
Revision: 3002 http://openutils.svn.sourceforge.net/openutils/?rev=3002&view=rev Author: diego_schivo Date: 2010-09-08 13:01:42 +0000 (Wed, 08 Sep 2010) Log Message: ----------- MEDIA-173 Give a feedback to the user after a zip import Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2010-09-07 17:40:30 UTC (rev 3001) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2010-09-08 13:01:42 UTC (rev 3002) @@ -23,6 +23,7 @@ import info.magnolia.cms.core.Content; import info.magnolia.cms.core.HierarchyManager; import info.magnolia.cms.i18n.Messages; +import info.magnolia.cms.util.AlertUtil; import info.magnolia.context.MgnlContext; import java.io.File; @@ -138,15 +139,17 @@ } importer.importFromZip(zip, parentPath); zip.close(); + AlertUtil.setMessage(getMsgs().get("media.loadzip.success")); } catch (IOException e) { log.error(e.getMessage(), e); + AlertUtil.setMessage(getMessage("media.loadzip.failure", e.getMessage())); } catch (ZipImporterException e) { - // TODO Maybe we should show something... log.error(e.getMessage(), e); + AlertUtil.setMessage(getMessage("media.loadzip.failure", e.getMessage())); } finally { @@ -320,7 +323,7 @@ { this.zipFile = file; } - + /** * {@inheritDoc} */ Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-09-07 17:40:30 UTC (rev 3001) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-09-08 13:01:42 UTC (rev 3002) @@ -44,6 +44,8 @@ tree.media.folders=Media folders tree media.loadzip=Load zip archive +media.loadzip.success=Zip archive successfully loaded +media.loadzip.failure=Failed to load zip archive: {0} media.select=Select media... media.remove=Remove media Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-09-07 17:40:30 UTC (rev 3001) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-09-08 13:01:42 UTC (rev 3002) @@ -44,6 +44,8 @@ tree.media.folders=Alberatura media media.loadzip=Carica archivio zip +media.loadzip.success=Archivio zip caricato con successo +media.loadzip.failure=Impossibile caricare l'archivio zip: {0} media.select=Seleziona media... media.remove=Rimuovi media Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-07 17:40:30 UTC (rev 3001) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-08 13:01:42 UTC (rev 3002) @@ -137,6 +137,9 @@ { reloadFolder(openPath); } + [#if message?exists] + Ext.Msg.alert('', '${message?js_string}'); + [/#if] }, 100); }); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |