Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1543] trunk/openutils-mgnlmedia/src/main
|
From: <fg...@us...> - 2009-12-27 16:29:46
|
Revision: 1543
http://openutils.svn.sourceforge.net/openutils/?rev=1543&view=rev
Author: fgiust
Date: 2009-12-27 16:29:38 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
MEDIA-40 branding
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/branding/openmind-logo.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.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/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2009-12-27 15:54:04 UTC (rev 1542)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2009-12-27 16:29:38 UTC (rev 1543)
@@ -52,6 +52,8 @@
private static MediaModule instance;
+ private String version;
+
/**
* Constructor
*/
@@ -77,6 +79,7 @@
log.info("Starting module media");
ctx.registerModuleObservingComponent("mediatypes", MediaConfigurationManager.getInstance());
ctx.registerModuleObservingComponent("processors", ImageProcessorsManager.getInstance());
+ version = ctx.getCurrentModuleDefinition().getVersion().toString();
}
/**
@@ -105,4 +108,13 @@
this.autoactivate = autoactivate;
}
+ /**
+ * Returns the version.
+ * @return the version
+ */
+ public String getVersion()
+ {
+ return version;
+ }
+
}
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 2009-12-27 15:54:04 UTC (rev 1542)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2009-12-27 16:29:38 UTC (rev 1543)
@@ -360,4 +360,18 @@
return super.getMsgs();
}
+ public String getMessage(String key, String arg)
+ {
+ return super.getMsgs().get(key, new String[]{arg });
+ }
+
+ /**
+ * Returns the installed media module version.
+ * @return version as string.
+ */
+ public String getModuleVersion()
+ {
+ return MediaModule.getInstance().getVersion();
+ }
+
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/branding/openmind-logo.png
===================================================================
(Binary files differ)
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css 2009-12-27 15:54:04 UTC (rev 1542)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css 2009-12-27 16:29:38 UTC (rev 1543)
@@ -24,17 +24,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
.mediaBranding {
- font-family: Verdana,sans-serif;
+ font-family: Verdana, sans-serif;
font-size: 11px;
- line-height: 22px;
+ line-height: 19px;
background: transparent url(../assets/branding/background.png) repeat-x scroll left top;
+ color: #333;
+ height: 22px;
+ text-align: center;
}
.mediaBranding img.logo {
- float: left;
- margin: 1px 8px 1px 34px;
+ display: inline;
+ margin: 2px 8px 0 10px;
+ vertical-align: bottom;
}
.mediaBranding a {
- color: #000000;
-}
+ color: #333;
+}
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2009-12-27 15:54:04 UTC (rev 1542)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2009-12-27 16:29:38 UTC (rev 1543)
@@ -100,4 +100,4 @@
dialog.filenopreview.extensions=Valid file extensions:
dialog.filenopreview.error.extension=File extension for field {0} not valid
-media.footer.text=SimpleMedia module version 4.0.2 by Openmind. <a href="#">Need support?</a> <a href="#">Want more?</a>
+media.footer.text=SimpleMedia module version {0} by Openmind. <a href="#" target="blank">Need support?</a> <a href="#" target="blank">Want more?</a>
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 2009-12-27 15:54:04 UTC (rev 1542)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2009-12-27 16:29:38 UTC (rev 1543)
@@ -101,4 +101,4 @@
dialog.filenopreview.extensions=Estensioni valide:
dialog.filenopreview.error.extension=Estensione del file per il campo {0} non valida
-media.footer.text=SimpleMedia module version 4.0.2 by Openmind. <a href="#">Need support?</a> <a href="#">Want more?</a>
+media.footer.text=SimpleMedia module versione {0} by Openmind. <a href="#" target="blank">Desideri supporto?</a> <a href="#" target="blank">Hai bisogno di altre funzionalit\xE0?</a>
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 2009-12-27 15:54:04 UTC (rev 1542)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2009-12-27 16:29:38 UTC (rev 1543)
@@ -120,7 +120,7 @@
},
{
region:'south',
- html:'<div class="mediaBranding"><a href="http://www.openmindonline.it"><img src="${this.request.contextPath}/.resources/media/assets/branding/openmind-logo.png" class="logo" /></a>${this.msgs.get('media.footer.text')}</div>',
+ html:'<div class="mediaBranding"><a href="http://www.openmindonline.it" target="_blank"><img src="${this.request.contextPath}/.resources/media/assets/branding/openmind-logo.png" class="logo" alt="openmind" /></a>${this.getMessage('media.footer.text', this.moduleVersion)}</div>',
height: 24
}
]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
