Menu
▾
▴
openutils-svn
|
From: <ku...@us...> - 2008-12-04 10:26:58
|
Revision: 939
http://openutils.svn.sourceforge.net/openutils/?rev=939&view=rev
Author: kurto80
Date: 2008-12-04 10:26:51 +0000 (Thu, 04 Dec 2008)
Log Message:
-----------
openutils-mgnlmedia code cleaning
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.mediaJCR.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileAudio.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileImage.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileVideo.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.mediaSelection.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaVideoDlg.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaYoutubeDlg.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.audio.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.image.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.video.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.youtube.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.mediaBrowser.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.mediaFolderSelection.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.mediaFolderView.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.media-jcr.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.media.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.server.URI2RepositoryMapping.mappings.media.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_en.properties
trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_it.properties
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lang/
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2008-12-04 10:26:51 UTC (rev 939)
@@ -0,0 +1,96 @@
+media.dialogs.tabTitle.title.label=Title
+
+media.dialogs.tabDescription.description.label=Description
+
+media.dialogs.tabAbstract.abstract.label=Abstract
+
+media.dialogs.tabTags.tags.label=Tags
+
+media.dialogs.tabImage.label=Image
+media.dialogs.tabImage.image.label=Image
+media.dialogs.tabImage.colors.label=Colors / BW
+media.dialogs.tabImage.colors.options.0.label=Colors
+media.dialogs.tabImage.colors.options.1.label=Black & White
+
+media.dialogs.tabAudio.label=Audio
+media.dialogs.tabAudio.audio.label=Audio
+
+media.dialogs.tabVideo.label=Video
+media.dialogs.tabVideo.video.label=Video
+media.dialogs.tabVideo.image.label=Image
+media.dialogs.tabVideo.colors.label=Colors / BW
+media.dialogs.tabVideo.colors.options.0.label=Colors
+media.dialogs.tabVideo.colors.options.1.label=Black & White
+
+media.dialogs.tabVideo.videoUrl.label=Youtube video url
+
+media.dialogs.tabWallpaper.label=Wallpaper
+media.dialogs.tabWallpaper.wallpaper-1280x800.label=1280x800 resolution
+media.dialogs.tabWallpaper.wallpaper-1024x768.label=1024x768 resolution
+media.dialogs.tabWallpaper.wallpaper-1080x1050.label=1680x1050 resolution
+media.dialogs.tabWallpaper.image.label=Preview
+
+media.dialogs.tabScreensaver.label=Screensaver
+media.dialogs.tabScreensaver.winScreensaver.label=Screensaver for Windows
+media.dialogs.tabScreensaver.macScreensaver.label=Screensaver for Mac
+media.dialogs.tabScreensaver.image.label=Preview
+
+media.dialogs.tabOther.label=Other
+media.dialogs.tabOther.other.label=Other
+
+media.dialogs.tabDocument.label=Document
+media.dialogs.tabDocument.document.label=Document
+media.dialogs.tabDocument.docType.label=Type
+media.dialogs.tabDocument.docType.options.0.label=Manual
+media.dialogs.tabDocument.docType.options.1.label=Brochure
+media.dialogs.tabDocument.classOrModel.label=Class or model
+media.dialogs.tabDocument.docYear.label=Year
+
+media.dialogs.tabTitle.label=Title
+media.dialogs.tabAbstract.label=Abstract
+media.dialogs.tabDescription.label=Description
+media.dialogs.tabTags.label=Tags
+media.dialogs.tabAttributes.label=Attributes
+media.dialogs.tabAttributes.copyright.label=Copyright
+media.dialogs.tabAttributes.source.label=Source
+media.dialogs.tabAttributes.creator.label=Created by
+media.dialogs.tabAttributes.creationDate.label=Created on
+media.dialogs.tabAttributes.modificationDate.label=Modified on
+
+tree.media.folders=Media folders tree
+media.loadzip=Load zip archive
+media.select=Select media...
+media.remove=Remove media
+
+media.types.image=Images
+media.types.audio=Mp3s
+media.types.youtube=YouTube
+media.types.video=Flvs
+media.types.wallpaper=Wallpapers
+media.types.screensaver=Screensavers
+media.types.other=Other
+media.types.document=Document
+
+media.types.image.load=Upload new image
+media.types.audio.load=Upload new mp3
+media.types.youtube.load=Link YouTube video
+media.types.video.load=Upload new flv
+media.types.wallpaper.load=Upload new wallpapers
+media.types.screensaver.load=Upload new screensavers
+media.types.other.load=Upload new other
+media.types.document.load=Upload new document
+
+media.edit=Edit
+media.delete=Delete
+media.copy=Copy
+media.move=Move
+media.activate=Activate
+media.deactivate=Deactivate
+media.pages=Pages
+media.nopages=Not used
+media.notpublished=Not activated
+media.select=Select
+
+media.menu.title=Media
+media.menu.browse=Browse
+media.menu.search=Search
\ No newline at end of file
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2008-12-04 10:26:51 UTC (rev 939)
@@ -0,0 +1,97 @@
+media.dialogs.tabTitle.title.label=Titolo
+
+media.dialogs.tabDescription.description.label=Descrizione
+
+media.dialogs.tabAbstract.abstract.label=Abstract
+
+media.dialogs.tabTags.tags.label=Tags
+
+media.dialogs.tabImage.label=Immagine
+media.dialogs.tabImage.image.label=Immagine
+media.dialogs.tabImage.colors.label=Colori / BN
+media.dialogs.tabImage.colors.options.0.label=Colori
+media.dialogs.tabImage.colors.options.1.label=Bianco e nero
+
+media.dialogs.tabAudio.label=Audio
+media.dialogs.tabAudio.audio.label=Audio
+
+media.dialogs.tabVideo.label=Video
+media.dialogs.tabVideo.video.label=Video
+media.dialogs.tabVideo.image.label=Immagine
+media.dialogs.tabVideo.colors.label=Colori / BN
+media.dialogs.tabVideo.colors.options.0.label=Colori
+media.dialogs.tabVideo.colors.options.1.label=Bianco e nero
+
+media.dialogs.tabVideo.videoUrl.label=Youtube video url
+
+media.dialogs.tabWallpaper.label=Wallpaper
+media.dialogs.tabWallpaper.wallpaper-1280x800.label=Risoluzione 1280x800
+media.dialogs.tabWallpaper.wallpaper-1024x768.label=Risoluzione 1024x768
+media.dialogs.tabWallpaper.wallpaper-1080x1050.label=Risoluzione 1680x1050
+media.dialogs.tabWallpaper.image.label=Preview
+
+media.dialogs.tabScreensaver.label=Screensaver
+media.dialogs.tabScreensaver.winScreensaver.label=Screensaver per Windows
+media.dialogs.tabScreensaver.macScreensaver.label=Screensaver per Mac
+media.dialogs.tabScreensaver.image.label=Preview
+
+media.dialogs.tabOther.label=Other
+media.dialogs.tabOther.other.label=Other
+
+media.dialogs.tabDocument.label=Documento
+media.dialogs.tabDocument.document.label=Documento
+media.dialogs.tabDocument.docType.label=Tipo
+media.dialogs.tabDocument.docType.options.0.label=Manuale
+media.dialogs.tabDocument.docType.options.1.label=Brochure
+media.dialogs.tabDocument.classOrModel.label=Classe o modello
+media.dialogs.tabDocument.docYear.label=Anno
+
+media.dialogs.tabTitle.label=Titolo
+media.dialogs.tabAbstract.label=Abstract
+media.dialogs.tabDescription.label=Descrizione
+media.dialogs.tabTags.label=Tags
+media.dialogs.tabAttributes.label=Attributi
+media.dialogs.tabAttributes.copyright.label=Copyright
+media.dialogs.tabAttributes.source.label=Sorgente
+media.dialogs.tabAttributes.creator.label=Creato da
+media.dialogs.tabAttributes.creationDate.label=Creato il
+media.dialogs.tabAttributes.modificationDate.label=Modificato il
+
+tree.media.folders=Alberatura media
+media.loadzip=Carica archivio zip
+media.select=Seleziona media...
+media.remove=Rimuovi media
+
+
+media.types.image=Immagini
+media.types.audio=Mp3
+media.types.youtube=YouTube
+media.types.video=Flv
+media.types.wallpaper=Wallpaper
+media.types.screensaver=Screensaver
+media.types.other=Altro
+media.types.document=Documento
+
+media.types.image.load=Carica immagine
+media.types.audio.load=Carica file mp3
+media.types.youtube.load=Collega video YouTube
+media.types.video.load=Carica video flv
+media.types.wallpaper.load=Carica wallpaper
+media.types.screensaver.load=Carica screensaver
+media.types.other.load=Carica altro
+media.types.document.load=Carica documento
+
+media.edit=Modifica
+media.delete=Elimina
+media.copy=Copia
+media.move=Sposta
+media.activate=Attiva
+media.deactivate=Deattiva
+media.pages=Pagine
+media.nopages=Non utilizzato
+media.notpublished=Non attivato
+media.select=Seleziona
+
+media.menu.title=Media
+media.menu.browse=Naviga
+media.menu.search=Cerca
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml 2008-12-03 16:44:10 UTC (rev 938)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml 2008-12-04 10:26:51 UTC (rev 939)
@@ -14,6 +14,9 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.commands.MediaActivationCommand</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml 2008-12-03 16:44:10 UTC (rev 938)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml 2008-12-04 10:26:51 UTC (rev 939)
@@ -14,6 +14,9 @@
<sv:property sv:name="icon" sv:type="String">
<sv:value>/.resources/media/icons/icon24.gif</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>media.menu.title</sv:value>
</sv:property>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.mediaJCR.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.mediaJCR.xml 2008-12-03 16:44:10 UTC (rev 938)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.mediaJCR.xml 2008-12-04 10:26:51 UTC (rev 939)
@@ -11,6 +11,9 @@
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:versionable</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>8dba574e-63dd-4de3-a610-ef1a2ebca264</sv:value>
</sv:property>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileAudio.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileAudio.xml 2008-12-03 16:44:10 UTC (rev 938)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileAudio.xml 2008-12-04 10:26:51 UTC (rev 939)
@@ -18,6 +18,9 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.DialogFileAudio</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileImage.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileImage.xml 2008-12-03 16:44:10 UTC (rev 938)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileImage.xml 2008-12-04 10:26:51 UTC (rev 939)
@@ -18,6 +18,9 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.DialogFileImage</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileVideo.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileVideo.xml 2008-12-03 16:44:10 UTC (rev 938)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileVideo.xml 2008-12-04 10:26:51 UTC (rev 939)
@@ -18,6 +18,9 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.DialogFileVideo</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.mediaSelection.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.mediaSelection.xml 2008-12-03 16:44:10 UTC (rev 938)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.mediaSelection.xml 2008-12-04 10:26:51 UTC (rev 939)
@@ -17,6 +17,9 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.DialogSelectMedia</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml 2008-12-03 16:44:10 UTC (rev 938)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml 2008-12-04 10:26:51 UTC (rev 939)
@@ -18,6 +18,9 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.LayerDialogMVC</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:property sv:name="height" sv:type="String">
<sv:value>450</sv:value>
</sv:property>
@@ -178,7 +181,7 @@
<sv:value>2008-08-13T15:37:07.580+02:00</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="title-en">
+ <sv:node sv:name="title">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
@@ -189,7 +192,7 @@
<sv:value>edit</sv:value>
</sv:property>
<sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTitle.title-en.label</sv:value>
+ <sv:value>media.dialogs.tabTitle.title.label</sv:value>
</sv:property>
<sv:property sv:name="type" sv:type="String">
<sv:value>String</sv:value>
@@ -221,221 +224,6 @@
</sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="title-en_us">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>317b1583-9299-4a2e-9534-a77ccc8464fc</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTitle.title-en_us.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T15:10:45.788Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-08-25T17:43:35.351+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="title-de">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>62759a96-6286-4129-a1db-7e4da5919f98</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTitle.title-de.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T15:10:45.789Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-08-13T15:36:31.090+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="title-fr">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>df05ef00-8613-4568-8554-0092d968aee4</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTitle.title-fr.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T15:10:45.789Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-08-13T15:36:41.690+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="title-it">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>b0670e2c-7996-446d-bb5b-4b326038fe98</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTitle.title-it.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T15:10:45.790Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-08-13T15:36:53.858+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="title-es">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>0b7faf78-1053-4c4f-8689-d3c5b49c4295</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTitle.title-es.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T15:10:45.790Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-09-08T11:04:33.743+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="tabDescription">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -476,7 +264,7 @@
<sv:value>2008-06-21T10:33:31.031Z</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="description-en">
+ <sv:node sv:name="description">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
@@ -487,7 +275,7 @@
<sv:value>edit</sv:value>
</sv:property>
<sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabDescription.description-en.label</sv:value>
+ <sv:value>media.dialogs.tabDescription.description.label</sv:value>
</sv:property>
<sv:property sv:name="type" sv:type="String">
<sv:value>String</sv:value>
@@ -519,221 +307,6 @@
</sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="description-en_us">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>3bee1b3f-3a09-4c5a-9d15-2b9152a495da</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabDescription.description-en_us.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T15:10:45.788Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-08-25T18:13:56.261+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="description-de">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>bf18ea59-2250-4814-941c-b9072dbec21d</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabDescription.description-de.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T16:35:26.532Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-06-21T10:48:16.360Z</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="description-fr">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>7b2820c1-e856-4135-870b-365893b94b5e</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabDescription.description-fr.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T16:35:26.533Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-06-21T10:48:36.286Z</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="description-it">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>64f454fe-55c3-4377-92fb-f913dd339a77</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabDescription.description-it.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T16:35:26.536Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-06-21T10:48:56.742Z</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="description-es">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>695465c6-304f-4055-a237-a7f85d33f431</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabDescription.description-es.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T16:35:26.536Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-09-08T11:04:21.602+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="tabTags">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -774,7 +347,7 @@
<sv:value>2008-06-21T10:52:35.199Z</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="tags-en">
+ <sv:node sv:name="tags">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
@@ -785,7 +358,7 @@
<sv:value>edit</sv:value>
</sv:property>
<sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTags.tags-en.label</sv:value>
+ <sv:value>media.dialogs.tabTags.tags.label</sv:value>
</sv:property>
<sv:property sv:name="type" sv:type="String">
<sv:value>String</sv:value>
@@ -817,221 +390,6 @@
</sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="tags-en_us">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>2c1a48bf-9945-4d00-b059-732cb3bf63dd</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTags.tags-en_us.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T15:10:45.791Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-08-25T18:15:47.620+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="tags-de">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>38c8750e-50dc-4123-a3bd-99c6bb04f139</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTags.tags-de.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T16:35:26.538Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-06-21T10:49:55.190Z</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="tags-fr">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>e1643b17-6317-4cf7-8663-d00c27b945e1</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTags.tags-fr.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T16:35:26.539Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-06-21T10:50:03.816Z</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="tags-it">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>7444c826-3d3c-432f-888f-5e9f8015f6d2</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTags.tags-it.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T16:35:26.539Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-06-21T10:50:13.630Z</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="tags-es">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>3e70c1ca-7237-46ca-aa3d-98998685a528</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTags.tags-es.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T16:35:26.539Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-09-08T11:04:12.076+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="tabAttributes">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml 2008-12-03 16:44:10 UTC (rev 938)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml 2008-12-04 10:26:51 UTC (rev 939)
@@ -18,6 +18,9 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.LayerDialogMVC</sv:value>
</sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
<sv:property sv:name="height" sv:type="String">
<sv:value>450</sv:value>
</sv:property>
@@ -341,7 +344,7 @@
<sv:value>2008-08-13T15:37:22.494+02:00</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="title-en">
+ <sv:node sv:name="title">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
@@ -352,7 +355,7 @@
<sv:value>edit</sv:value>
</sv:property>
<sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTitle.title-en.label</sv:value>
+ <sv:value>media.dialogs.tabTitle.title.label</sv:value>
</sv:property>
<sv:property sv:name="type" sv:type="String">
<sv:value>String</sv:value>
@@ -384,221 +387,6 @@
</sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="title-en_us">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>cf4cb5cc-ef66-435a-a6a1-3385a19e512d</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTitle.title-en_us.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T15:10:45.788Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-08-25T17:43:56.527+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="title-de">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>0efab464-6c61-4cc5-972c-645327335908</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTitle.title-de.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T15:10:45.789Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-08-13T15:36:31.090+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="title-fr">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>0e9a3fa8-297b-4436-b0d6-6daa0535d206</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTitle.title-fr.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T15:10:45.789Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-08-13T15:36:41.690+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="title-it">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>5df3135d-5109-4550-90af-dae28ca9cae3</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTitle.title-it.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T15:10:45.790Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-08-13T15:36:53.858+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="title-es">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>992b48a0-1f2e-428f-b3da-d0a61c28c5a4</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>media.dialogs.tabTitle.title-es.label</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>String</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:Data" sv:type="String">
- <sv:value>MetaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="String">
- <sv:value>2004-11-02T17:20:40.266+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-02T15:10:45.790Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2008-09-08T11:05:05.381+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="tabDescription">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -639,7 +427,7 @@
<sv:value>2008-06-21T10:33:31.031Z</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="description-en">
+ <sv:node sv:name="description">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
@@ -650,7 +438,7 @@
<sv:value>edit</sv:value>...
[truncated message content] |
|
From: <ku...@us...> - 2008-12-04 18:40:54
|
Revision: 945
http://openutils.svn.sourceforge.net/openutils/?rev=945&view=rev
Author: kurto80
Date: 2008-12-04 18:40:50 +0000 (Thu, 04 Dec 2008)
Log Message:
-----------
openutils-mgnlmedia code cleaning fix
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lang/
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml 2008-12-04 11:40:51 UTC (rev 944)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml 2008-12-04 18:40:50 UTC (rev 945)
@@ -93,6 +93,8 @@
</sv:property>
</sv:node>
</sv:node>
+
+ <!--
<sv:node sv:name="search">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
@@ -137,4 +139,5 @@
</sv:property>
</sv:node>
</sv:node>
+ -->
</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-08-14 11:01:33
|
Revision: 1268
http://openutils.svn.sourceforge.net/openutils/?rev=1268&view=rev
Author: fgiust
Date: 2009-08-14 11:01:19 +0000 (Fri, 14 Aug 2009)
Log Message:
-----------
MEDIA-3 cleanup bootstrap files
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.common.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaVideoDlg.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaYoutubeDlg.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2009-08-14 10:54:10 UTC (rev 1267)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2009-08-14 11:01:19 UTC (rev 1268)
@@ -40,8 +40,6 @@
{
List<Task> tasks = new ArrayList<Task>();
- // tasks.add(new RemoveResolutionsNodeTask());
- // tasks.add(new RenameThumbToImageTask());
return tasks;
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.common.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.common.xml 2009-08-14 10:54:10 UTC (rev 1267)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.common.xml 2009-08-14 11:01:19 UTC (rev 1268)
@@ -10,7 +10,7 @@
xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:contentNode</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>8ce70871-d358-4da1-823b-4d0302ce01de</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml 2009-08-14 10:54:10 UTC (rev 1267)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml 2009-08-14 11:01:19 UTC (rev 1268)
@@ -10,7 +10,7 @@
xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:contentNode</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>42221071-75be-49d6-9585-0e2a5f167cea</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml 2009-08-14 10:54:10 UTC (rev 1267)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml 2009-08-14 11:01:19 UTC (rev 1268)
@@ -10,7 +10,7 @@
xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:contentNode</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>432ef260-7220-4c71-ba84-fc682bc798ab</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaVideoDlg.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaVideoDlg.xml 2009-08-14 10:54:10 UTC (rev 1267)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaVideoDlg.xml 2009-08-14 11:01:19 UTC (rev 1268)
@@ -10,7 +10,7 @@
xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:contentNode</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>5093ad84-c652-4e56-8eba-da9348eb18fe</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaYoutubeDlg.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaYoutubeDlg.xml 2009-08-14 10:54:10 UTC (rev 1267)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaYoutubeDlg.xml 2009-08-14 11:01:19 UTC (rev 1268)
@@ -10,7 +10,7 @@
xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:contentNode</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>0d7a3a5e-bce1-42c8-af9f-5a44142fe19d</sv:value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-08-28 13:42:32
|
Revision: 1320
http://openutils.svn.sourceforge.net/openutils/?rev=1320&view=rev
Author: molaschi
Date: 2009-08-28 13:42:23 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
MEDIA-13 reduce tree from 320 to 240px and resize preview from 450x450 to 450x350
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
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/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-08-28 11:23:30 UTC (rev 1319)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-08-28 13:42:23 UTC (rev 1320)
@@ -545,7 +545,7 @@
}
if ("preview".equals(resolution))
{
- resolution = "<450x450";
+ resolution = "<450x350";
}
Content node;
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2009-08-28 11:23:30 UTC (rev 1319)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2009-08-28 13:42:23 UTC (rev 1320)
@@ -321,7 +321,7 @@
</function>
<function>
<name>preview</name>
- <description>Get the url to the preview (l450x450 resolution) for a given media node (image or flv/youtube preview)</description>
+ <description>Get the url to the preview (l450x350 resolution) for a given media node (image or flv/youtube preview)</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getPreview(info.magnolia.cms.core.Content)</function-signature>
<example>
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-08-28 11:23:30 UTC (rev 1319)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2009-08-28 13:42:23 UTC (rev 1320)
@@ -65,7 +65,7 @@
id:'west-panel',
title:'${this.msgs.get('tree.media.folders')}',
split:true,
- width: 320,
+ width: 240,
minSize: 175,
maxSize: 400,
collapsible: true,
@@ -76,7 +76,7 @@
frame: true,
animCollapse:false,
animFloat: false,
- stateful: false
+ stateful: true
},
{
region:'center',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-12-30 16:41:30
|
Revision: 1556
http://openutils.svn.sourceforge.net/openutils/?rev=1556&view=rev
Author: fgiust
Date: 2009-12-30 16:41:22 +0000 (Wed, 30 Dec 2009)
Log Message:
-----------
MEDIA-20 added samples, mostly done apart from discovered bugs
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.mediaJCR.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-mediatag.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.sampleSimpleMedia.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp
trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2009-12-27 17:30:35 UTC (rev 1555)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2009-12-30 16:41:22 UTC (rev 1556)
@@ -27,6 +27,7 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
+import info.magnolia.cms.core.SystemProperty;
import info.magnolia.cms.core.search.Query;
import info.magnolia.cms.core.search.QueryManager;
import info.magnolia.cms.core.search.QueryResult;
@@ -70,6 +71,11 @@
tasks.add(new NodeSortTask("config", "/modules/media/mediatypes", "order"));
+ if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
+ {
+ tasks.add(new SamplesExtractionTask());
+ }
+
tasks.add(new Task()
{
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java 2009-12-30 16:41:22 UTC (rev 1556)
@@ -0,0 +1,97 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+package net.sourceforge.openutils.mgnlmedia.media.setup;
+
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.Path;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractTask;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.module.files.FileExtractionLogger;
+import info.magnolia.module.files.FileExtractor;
+import info.magnolia.module.files.MD5CheckingFileExtractor;
+
+import java.io.IOException;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * Extract samples files to webapp root.
+ * @author fgiust
+ * @version $Id$
+ */
+public class SamplesExtractionTask extends AbstractTask
+{
+
+ public SamplesExtractionTask()
+ {
+ super("Samples extraction", "Extracts jsp files for samples.");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void execute(final InstallContext ctx) throws TaskExecutionException
+ {
+ final HierarchyManager hm = ctx.getConfigHierarchyManager();
+ final MD5CheckingFileExtractor extractor = new MD5CheckingFileExtractor(new FileExtractionLogger()
+ {
+
+ public void error(String message)
+ {
+ ctx.warn(message);
+ }
+ }, hm);
+ try
+ {
+ extractor.extractFiles(new FileExtractor.Transformer()
+ {
+
+ public String accept(String resourcePath)
+ {
+ final boolean thisIsAFileWeWant = resourcePath.startsWith("/mgnl-files/")
+ && StringUtils.contains(resourcePath, "/samples-media/");
+ if (!thisIsAFileWeWant)
+ {
+ return null;
+ }
+ final String relTargetPath = StringUtils.removeStart(resourcePath, "/mgnl-files/");
+ return Path.getAbsoluteFileSystemPath(relTargetPath);
+ }
+
+ });
+ }
+ catch (IOException e)
+ {
+ throw new TaskExecutionException("Could not extract files for module "
+ + ctx.getCurrentModuleDefinition()
+ + ": "
+ + e.getMessage(), e);
+ }
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SamplesExtractionTask.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.mediaJCR.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.mediaJCR.xml 2009-12-27 17:30:35 UTC (rev 1555)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.mediaJCR.xml 2009-12-30 16:41:22 UTC (rev 1556)
@@ -10,7 +10,7 @@
<sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
</sv:property>
<sv:property sv:name="icon" sv:type="String">
- <sv:value>/.resources/icons/16/dot.gif</sv:value>
+ <sv:value>/.resources/icons/16/gears.gif</sv:value>
</sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>Media JCR</sv:value>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml 2009-12-30 16:41:22 UTC (rev 1556)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-media" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>60c72833-f536-47e1-949e-9056d9df234b</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-12-30T16:10:29.543+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabMedia">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>82c63c59-9487-4dd9-8365-2f9f32bbf1f7</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Media</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-12-30T16:10:29.543+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="media">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>f18a9c1e-3318-469b-ba2a-32304dee949b</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>mediaSelection</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Media</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-12-30T16:10:29.544+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml 2009-12-30 16:41:22 UTC (rev 1556)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-mediatag" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>fc6446c7-1f4a-4256-9435-d0fb708abad8</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-12-30T16:10:39.729+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabMedia">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>466fa8fd-2ae1-403c-afc5-7f54edb6e9d9</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Media</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-12-30T16:10:39.730+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="media">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>5bdc5aea-5de8-4ef4-9a80-0aa7140241c0</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>mediaSelection</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Media</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-12-30T16:10:39.731+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="width">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>fbea3fdf-a16f-4771-895e-4fac6051fd42</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Width</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-12-30T16:10:39.731+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="height">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>4ccc4864-11c3-4597-a989-8ff9f6ac81d5</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Height</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-12-30T16:10:39.732+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media.xml 2009-12-30 16:41:22 UTC (rev 1556)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-media" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>18af4a49-5f3d-4d0b-948a-ce708de1aa95</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample media paragraph for image resizing</sv:value>
+ </sv:property>
+ <sv:property sv:name="templatePath" sv:type="String">
+ <sv:value>/templates/samples-media/paragraph-mediael.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Image resizing/crop sample</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>jsp</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-09-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-09-11T14:32:42.133+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-mediatag.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-mediatag.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-mediatag.xml 2009-12-30 16:41:22 UTC (rev 1556)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-mediatag" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>03d80290-ec3b-4272-bf85-eb2602edf5b4</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample media paragraph using media tag</sv:value>
+ </sv:property>
+ <sv:property sv:name="templatePath" sv:type="String">
+ <sv:value>/templates/samples-media/paragraph-mediatag.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Insert a media (image or video) - use the media tag</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>jsp</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-09-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-09-11T14:32:59.089+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-mediatag.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.sampleSimpleMedia.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.sampleSimpleMedia.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.sampleSimpleMedia.xml 2009-12-30 16:41:22 UTC (rev 1556)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="sampleSimpleMedia" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>256fa8b1-1aa3-4737-bff2-34cfcdf18712</sv:value>
+ </sv:property>
+ <sv:property sv:name="templatePath" sv:type="String">
+ <sv:value>/templates/samples-media/template.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>SimpleMedia sample template</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="visible" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-09-11T14:27:49.425+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.sampleSimpleMedia.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2009-12-30 16:41:22 UTC (rev 1556)
@@ -0,0 +1,544 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>099156be-71cb-4054-bff0-1d728e1bbe27</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-07-02T12:46:12.918Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2009-12-30T16:29:28.741+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-12-30T16:29:28.741+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="bliptv">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:media</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>ef030b33-c082-4304-abfd-65f498caedf8</sv:value>
+ </sv:property>
+ <sv:property sv:name="copyright" sv:type="String">
+ <sv:value>openmind</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>External video sample, loaded from blip.tv</sv:value>
+ </sv:property>
+ <sv:property sv:name="tags" sv:type="String">
+ <sv:value>simple media, youtube</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>a sample from blip.tv</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>youtube</sv:value>
+ </sv:property>
+ <sv:property sv:name="videoUrl" sv:type="String">
+ <sv:value>http://blip.tv/file/get/Openmindonline-SimpleMediaModuleForMagnoliaCMSLoadAZipArchive567.flv</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-09-09T12:31:44.752+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-12-30T17:16:25.634+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="image">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resource</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7d2f5396-9cc9-4285-abaa-66e7eff02d57</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>jpg</sv:value>
+ </sv:property>
+ <sv:property sv:name="fileName" sv:type="String">
+ <sv:value>loadzip</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>240</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:data" sv:type="Binary">
+ <sv:value>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</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModified" sv:type="Date">
+ <sv:value>2009-09-09T12:31:44.774+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mimeType" sv:type="String">
+ <sv:value>image/jpeg</sv:value>
+ </sv:property>
+ <sv:property sv:name="nodeDataTemplate" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ <sv:property sv:name="size" sv:type="String">
+ <sv:value>14369</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>320</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="resolutions">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resolutions</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>8c61461d-8426-4197-8d48-a3b4269771a5</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-09-09T12:31:45.223+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="thumbnail">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resource</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>af9355a9-5769-4b6e-bad2-389a3fb55257</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>jpg</sv:value>
+ </sv:property>
+ <sv:property sv:name="fileName" sv:type="String">
+ <sv:value>data</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>75</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:data" sv:type="Binary">
+ <sv:value>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</sv:value>
+ </sv:property>
+ <sv:property sv:na...
[truncated message content] |
|
From: <fg...@us...> - 2010-01-30 15:41:06
|
Revision: 1718
http://openutils.svn.sourceforge.net/openutils/?rev=1718&view=rev
Author: fgiust
Date: 2010-01-30 15:40:58 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
MEDIA-65 image info for broken images (along with a refactoring of the info line in order to make it handled by mediaTypeHandlers)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-01-30 13:42:47 UTC (rev 1717)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-01-30 15:40:58 UTC (rev 1718)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
@@ -33,7 +32,6 @@
import info.magnolia.cms.security.Permission;
import info.magnolia.cms.util.AlertUtil;
import info.magnolia.cms.util.ExclusiveWrite;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.commands.CommandsManager;
import info.magnolia.context.Context;
import info.magnolia.context.MgnlContext;
@@ -53,7 +51,6 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
-import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
import org.apache.commons.chain.Command;
import org.apache.commons.lang.StringUtils;
@@ -271,17 +268,8 @@
log.error("Exception caught", ex);
}
- if ("image".equals(type))
- {
- int[] size = MediaEl.getSize(media, "original");
- mb.setFormatInfo(mtc.getHandler().getExtension(media)
- + ' '
- + size[0]
- + 'x'
- + size[1]
- + ' '
- + mtc.getHandler().getSize(media));
- }
+ mb.setFormatInfo(mtc.getHandler().getMediaInfo(media));
+
medias.add(mb);
}
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2010-01-30 13:42:47 UTC (rev 1717)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2010-01-30 15:40:58 UTC (rev 1718)
@@ -95,13 +95,6 @@
String getExtension(Content media);
/**
- * return size
- * @param media media
- * @return size
- */
- String getSize(Content media);
-
- /**
* return filename
* @param media media
* @return filename
@@ -137,6 +130,13 @@
String getAbstract(Content media);
/**
+ * Returns the basic media info (file type, size for images, ...)
+ * @param media media
+ * @return a formatted string for media info
+ */
+ String getMediaInfo(Content media);
+
+ /**
* Called from dialog when saving a media
* @param media media saving
* @return true if continue saving
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-01-30 13:42:47 UTC (rev 1717)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-01-30 15:40:58 UTC (rev 1718)
@@ -42,6 +42,7 @@
import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -185,14 +186,6 @@
/**
* {@inheritDoc}
*/
- public String getSize(Content media)
- {
- return new FileProperties(media, ORGINAL_NODEDATA_NAME).getProperty(FileProperties.SIZE);
- }
-
- /**
- * {@inheritDoc}
- */
public String getFilename(Content media)
{
return getOriginalFileNodeData(media).getAttribute(FileProperties.PROPERTY_FILENAME);
@@ -309,4 +302,28 @@
return getPropertyLocalized(media, "abstract");
}
+ /**
+ * {@inheritDoc}
+ */
+ public String getMediaInfo(Content media)
+ {
+ FileProperties fp = new FileProperties(media, ORGINAL_NODEDATA_NAME);
+
+ String extension = fp.getProperty(FileProperties.PROPERTY_EXTENSION);
+ String size = StringUtils.EMPTY;
+
+ try
+ {
+ size = fp.getProperty(FileProperties.PROPERTY_SIZE);
+ }
+ catch (NumberFormatException nfe)
+ {
+ // just ignore, no file size info
+ }
+
+ int width = NumberUtils.toInt(fp.getProperty(FileProperties.PROPERTY_WIDTH));
+ int height = NumberUtils.toInt(fp.getProperty(FileProperties.PROPERTY_HEIGHT));
+
+ return extension + (width > 0 ? (" " + width + "x" + height) : "") + " " + size;
+ }
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2010-01-30 13:42:47 UTC (rev 1717)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2010-01-30 15:40:58 UTC (rev 1718)
@@ -19,11 +19,13 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
+import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.Content;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
/**
@@ -64,4 +66,35 @@
+ "/resolutions/preview/data."
+ ImageUtils.getExtension(media, "preview");
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getMediaInfo(Content media)
+ {
+ FileProperties fp = new FileProperties(media, ORGINAL_NODEDATA_NAME);
+
+ String extension = fp.getProperty(FileProperties.PROPERTY_EXTENSION);
+ String size = StringUtils.EMPTY;
+
+ try
+ {
+ size = fp.getProperty(FileProperties.PROPERTY_SIZE);
+ }
+ catch (NumberFormatException nfe)
+ {
+ // just ignore, no file size info
+ }
+
+ int width = NumberUtils.toInt(fp.getProperty(FileProperties.PROPERTY_WIDTH));
+ int height = NumberUtils.toInt(fp.getProperty(FileProperties.PROPERTY_HEIGHT));
+
+ if (width <= 0 || height <= 0)
+ {
+ return "broken file";
+ }
+
+ return extension + (width > 0 ? (" " + width + "x" + height) : "") + " " + size;
+ }
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-01-30 13:42:47 UTC (rev 1717)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-01-30 15:40:58 UTC (rev 1718)
@@ -82,14 +82,14 @@
float: left;
margin: 0px 0px 10px 10px;
width: 130px;
- height: 210px;
+ height: 235px;
font-size: 0.8em;
position: relative;
background-color: #f6f6f6;
}
.mediaList li.selectMedia {
- height: 235px;
+ height: 260px;
}
.mediaList li:hover {
@@ -169,6 +169,12 @@
padding: 5px 0 5px 0;
}
+.mediainfo {
+ border-bottom: dotted 1px #cfcfcf;
+ margin: 0px 3px 5px 3px;
+ padding: 5px 0 5px 0;
+}
+
.used span {
cursor: default;
}
@@ -205,7 +211,7 @@
.mediaStatus0,.mediaStatus1 {
opacity: 0.75;
- filter: alpha(opacity = 75);
+ filter: alpha(opacity = 75);
}
.multibox img {
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-01-30 13:42:47 UTC (rev 1717)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-01-30 15:40:58 UTC (rev 1718)
@@ -220,6 +220,9 @@
<span class="tips" rel="${pages}">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
</#if>
</div>
+ <#if media.formatInfo??>
+ <div class="mediainfo">${media.formatInfo}</div>
+ </#if>
<#if this.selectMedia>
<div class="selectMediaLine">
<#if media.metaData.activationStatus = 2 || this.develop >
@@ -236,9 +239,6 @@
<#else>${name}
</#if>
</span>
- <#if media.formatInfo??>
- <div>${media.formatInfo}</div>
- </#if>
</li>
</#list>
</ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-01-30 16:45:04
|
Revision: 1719
http://openutils.svn.sourceforge.net/openutils/?rev=1719&view=rev
Author: fgiust
Date: 2010-01-30 16:44:51 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
minor improvements to descriptions
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2010-01-30 15:40:58 UTC (rev 1718)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2010-01-30 16:44:51 UTC (rev 1719)
@@ -55,6 +55,7 @@
+ ImageUtils.getExtension(media, "thumbnail");
}
+ @Override
public String getPreviewImageNodeDataName()
{
return PREVIEW_NODEDATA_NAME;
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2010-01-30 15:40:58 UTC (rev 1718)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2010-01-30 16:44:51 UTC (rev 1719)
@@ -11,7 +11,7 @@
<name>media</name>
<path>/META-INF/tags/media/media.tag</path>
<display-name>Media Tag</display-name>
- <description>Media tag that renders according to media type</description>
+ <description>Displays a media</description>
<example>
<![CDATA[
<media:media id="myMedia" item="${content.image}" />
@@ -23,7 +23,7 @@
<path>/META-INF/tags/media/player.tag</path>
<display-name>Player Tag</display-name>
<description>
- Render the audio or video player
+ Renders the audio or video player
</description>
</tag-file>
<function>
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-01-30 15:40:58 UTC (rev 1718)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-01-30 16:44:51 UTC (rev 1719)
@@ -2,6 +2,7 @@
xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:su="http://openutils.sf.net/openutils-stringutils">
+ <jsp:directive.tag description="Displays a media" pageEncoding="UTF-8"/>
<jsp:directive.attribute name="id" required="false" rtexprvalue="true" description="html element id"/>
<jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node "/>
<jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player width"/>
@@ -11,7 +12,11 @@
<jsp:directive.attribute name="alt" required="false" rtexprvalue="true" description="alt / title on images. If not specified, the title of the media (if present) will be used"/>
<jsp:directive.attribute name="cssClass" required="false" rtexprvalue="true" description="cssClass to be applied on html element"/>
<jsp:directive.attribute name="style" required="false" rtexprvalue="true" description="style to be applied on html element "/>
- <jsp:directive.attribute name="resize" required="false" rtexprvalue="true" description="valid values are <ul><li><b>fit:</b>makes the new image to fit into required res</li><li><b>nocrop:</b>makes the new image to contain the required res</li><li><b>crop:</b>makes the new image to contain the required res and the crop the simmetric bands that outfit res</li><li><b>fitbands:</b>makes the new image to fit into required res and fills empty areas with background color you pass to in 'parameter' attribute as hex value of 'background' parameter </li>"/>"/>
+ <jsp:directive.attribute name="resize" required="false" rtexprvalue="true" description="[fit|nocrop|crop|fitbands]:
+fit: makes the new image to fit into required resolution.
+nocrop: makes the new image to contain the required resolution.
+crop: makes the new image to contain the required res and the crop the simmetric bands that outfit resolution.
+fitbands: makes the new image to fit into required res and fills empty areas with background color you pass to in 'parameter' attribute as hex value of 'background' parameter"/>"/>
<jsp:directive.attribute name="parameters" required="false" rtexprvalue="true" description="parameters to pass to image processor as couples key=value joined by commas "/>
<jsp:directive.attribute name="ignoreDim" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if true the img element will be rendered without width and height attributes "/>
<jsp:directive.attribute name="autoPlay" required="false" rtexprvalue="true" type="java.lang.Boolean" description="auto starts the player without waiting for user play command"/>
@@ -21,7 +26,7 @@
<jsp:directive.attribute name="thumbnail" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the preview of the player shows the thumbnail image"/>
<jsp:directive.attribute name="videoImagePreview" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true, the tag will not insert the player for videos but only a preview image. For videos or mp3s it needs the following scripts loaded in page: <ul><li>.resources/media/js/mootools-1.2-core.js</li><li>.resources/media/js/mootools-1.2-more.js</li><li>.resources/media/js/mootools-1.2-swfobject.js</li></ul>"/>
<jsp:directive.attribute name="controlbar" required="false" rtexprvalue="true" type="java.lang.String" description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default." />
- <jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the pluging share-1 is showen"/>
+ <jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the pluging share-1 is show"/>
<c:set value="${10000}" var="bigValue" />
<c:if test="${empty width }">
<c:set var="width" value="${0 }" />
@@ -41,7 +46,7 @@
</c:set>
<c:if test="${!empty(controlbar)}">
<c:set var="controlBar">
- <![CDATA[&controlbar=]]>${controlbar}
+ <![CDATA[&controlbar=]]>${controlbar}
</c:set>
</c:if>
<c:choose>
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2010-01-30 15:40:58 UTC (rev 1718)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2010-01-30 16:44:51 UTC (rev 1719)
@@ -2,6 +2,7 @@
xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:su="http://openutils.sf.net/openutils-stringutils">
+ <jsp:directive.tag description="Renders the audio or video player" pageEncoding="UTF-8"/>
<jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node "/>
<jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player width"/>
<jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player height"/>
@@ -13,17 +14,17 @@
<jsp:directive.attribute name="thumbnail" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the preview of the player shows the thumbnail image"/>
<jsp:directive.attribute name="controlBa" required="false" rtexprvalue="true" type="java.lang.String" description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default."/>
<jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the pluging share-1 is showen"/>
-
+
<c:set value="${media:node(item)}" var="mediaNode" />
<c:set var="sharinglink" value=""/>
<c:set var="sharingcode" value=""/>
<c:set var="baseUrl" scope="request">
<jsp:text>${pageContext.request.scheme}://${pageContext.request.serverName}</jsp:text>
<c:if test="${(pageContext.request.scheme eq 'http' and pageContext.request.serverPort != 80)}">:${pageContext.request.serverPort}</c:if>
- </c:set>
+ </c:set>
<c:if test="${share}">
<c:set var="sharinglink">document.URL</c:set>
- <c:set var="sharingcode"><embed src="${baseUrl}${pageContext.request.contextPath}/.resources/media/players/player.swf" flashvars="file=${pageContext.request.contextPath}${media:url(mediaNode)}" width="${width}" height="${height}" /></c:set>
+ <c:set var="sharingcode"><embed src="${baseUrl}${pageContext.request.contextPath}/.resources/media/players/player.swf" flashvars="file=${pageContext.request.contextPath}${media:url(mediaNode)}" width="${width}" height="${height}" /></c:set>
</c:if>
<c:set var="url" value="${media:url(mediaNode)}" />
<c:if test="${width eq 0 }">
@@ -75,7 +76,7 @@
swfobject.addParam('wmode','opaque');
swfobject.addParam('flashvars', '${flashvars}');
swfobject.addVariable('plugins', 'sharing-1');
- swfobject.addVariable('sharing.link', ${sharinglink});
+ swfobject.addVariable('sharing.link', ${sharinglink});
swfobject.addVariable('sharing.code', escape('${sharingcode}'));
var version = deconcept.SWFObjectUtil.getPlayerVersion();
if (version["major"] == 0 || version["major"] < 9) {
@@ -101,5 +102,5 @@
</script>
</c:if>
</c:if>
-
+
</jsp:root>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-03 11:06:06
|
Revision: 1789
http://openutils.svn.sourceforge.net/openutils/?rev=1789&view=rev
Author: diego_schivo
Date: 2010-02-03 11:05:58 +0000 (Wed, 03 Feb 2010)
Log Message:
-----------
MEDIA-59 add a media-module config parameter for the default player (the one to use when <media>'s "player" attribute is unspecified)
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/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
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 2010-02-03 10:33:14 UTC (rev 1788)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-02-03 11:05:58 UTC (rev 1789)
@@ -44,6 +44,8 @@
private boolean singleinstance;
+ private String player = "player.swf";
+
private static MediaModule instance;
private String version;
@@ -124,6 +126,16 @@
this.singleinstance = singleinstance;
}
+ public String getPlayer()
+ {
+ return player;
+ }
+
+ public void setPlayer(String player)
+ {
+ this.player = player;
+ }
+
/**
* Returns the version.
* @return the version
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2010-02-03 10:33:14 UTC (rev 1788)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2010-02-03 11:05:58 UTC (rev 1789)
@@ -71,6 +71,15 @@
}
/**
+ * Get the media module instance
+ * @return media module instance
+ */
+ public static MediaModule getModule()
+ {
+ return MediaModule.getInstance();
+ }
+
+ /**
* Get content node for media
* @param obj content node or node UUID
* @return content node
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2010-02-03 10:33:14 UTC (rev 1788)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2010-02-03 11:05:58 UTC (rev 1789)
@@ -38,6 +38,18 @@
</example>
</tag-file>
<function>
+ <name>module</name>
+ <description>Get the media module instance.</description>
+ <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
+ <function-signature>net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule getModule()</function-signature>
+ <display-name>Function module</display-name>
+ <example>
+ <![CDATA[
+ <c:set var="player" value="${media:module().player}" />
+ ]]>
+ </example>
+ </function>
+ <function>
<name>node</name>
<description>Load a node from the media repository, given the UUID of the media node.</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-02-03 10:33:14 UTC (rev 1788)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-02-03 11:05:58 UTC (rev 1789)
@@ -39,7 +39,7 @@
<c:set var="emRatio" value="${1.0 }" />
</c:if>
<c:if test="${empty player}">
- <c:set var="player" value="player.swf" />
+ <c:set var="player" value="${media:module().player}" />
</c:if>
<c:set value="${media:node(item)}" var="mediaNode" />
<c:choose>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-04 09:14:58
|
Revision: 1795
http://openutils.svn.sourceforge.net/openutils/?rev=1795&view=rev
Author: fgiust
Date: 2010-02-04 09:14:51 +0000 (Thu, 04 Feb 2010)
Log Message:
-----------
minor graphic changes
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediainfo.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/b.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/b.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bca.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bl.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bl.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bla.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/br.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/br.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bra.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/close.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/close.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/l.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/l.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/la.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/r.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/r.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/ra.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/ra.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/t.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/t.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tca.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tl.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tl.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tla.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tr.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tr.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tra.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn.css
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-02-03 14:15:10 UTC (rev 1794)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-02-04 09:14:51 UTC (rev 1795)
@@ -768,4 +768,9 @@
this.search = search;
}
+ public boolean isSingleInstance()
+ {
+ return MediaModule.getInstance().isSingleinstance();
+ }
+
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-02-03 14:15:10 UTC (rev 1794)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-02-04 09:14:51 UTC (rev 1795)
@@ -329,8 +329,14 @@
Map<String, String> info = new LinkedHashMap<String, String>();
info.put("extension", extension);
- info.put("width", String.valueOf(width));
- info.put("height", String.valueOf(height));
+ if (width > 0)
+ {
+ info.put("width", String.valueOf(width));
+ }
+ if (height > 0)
+ {
+ info.put("height", String.valueOf(height));
+ }
info.put("size", size);
return info;
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2010-02-03 14:15:10 UTC (rev 1794)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2010-02-04 09:14:51 UTC (rev 1795)
@@ -35,9 +35,7 @@
/**
- *
* @author dschivo
- *
*/
public abstract class BaseVideoTypeHandler extends MediaWithPreviewImageTypeHandler
{
@@ -79,7 +77,8 @@
Content flvMetaDataNode = originalAsNode != null ? originalAsNode : media;
NodeDataUtil.getOrCreateAndSet(flvMetaDataNode, FileProperties.PROPERTY_WIDTH, flvMetaData.getWidth());
- NodeDataUtil.getOrCreateAndSet(flvMetaDataNode, FileProperties.PROPERTY_HEIGHT, flvMetaData.getHeight());
+ NodeDataUtil
+ .getOrCreateAndSet(flvMetaDataNode, FileProperties.PROPERTY_HEIGHT, flvMetaData.getHeight());
NodeDataUtil.getOrCreateAndSet(flvMetaDataNode, DURATION_ATTRIBUTE, flvMetaData.getDuration());
flvMetaDataNode.save();
}
@@ -107,17 +106,23 @@
long duration = flvMetaDataNode.getNodeData(DURATION_ATTRIBUTE).getLong();
long size = flvMetaDataNode.getNodeData(FileProperties.PROPERTY_SIZE).getLong();
-// return ext
-// + (width > 0 ? (" " + width + "x" + height) : "")
-// + " length: "
-// + DurationFormatUtils.formatDuration(duration * 1000, "m:ss ")
-// + "size: "
-// + toSizeString(size);
+// return ext
+// + (width > 0 ? (" " + width + "x" + height) : "")
+// + " length: "
+// + DurationFormatUtils.formatDuration(duration * 1000, "m:ss ")
+// + "size: "
+// + toSizeString(size);
Map<String, String> info = new LinkedHashMap<String, String>();
info.put("extension", ext);
- info.put("width", String.valueOf(width));
- info.put("height", String.valueOf(height));
+ if (width > 0)
+ {
+ info.put("width", String.valueOf(width));
+ }
+ if (height > 0)
+ {
+ info.put("height", String.valueOf(height));
+ }
info.put("duration", DurationFormatUtils.formatDuration(duration * 1000, "m:ss "));
info.put("size", toSizeString(size));
return info;
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/b.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/b.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/b.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/b.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bca.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bca.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bl.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bl.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bl.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bla.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bla.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/br.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/br.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/br.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/br.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bra.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/bra.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/close.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/close.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/close.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/close.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/l.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/l.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/l.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/l.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/la.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/la.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/r.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/r.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/r.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/r.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/ra.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/ra.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/ra.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/ra.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/t.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/t.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/t.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/t.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tca.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tca.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tl.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tl.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tl.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tla.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tla.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tr.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tr.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tr.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tra.gif
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn/tra.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn.css (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn.css 2010-02-04 09:14:51 UTC (rev 1795)
@@ -0,0 +1,66 @@
+div.sexy-tooltip {
+ font-family:Verdana,Arial,Helvetica,sans-serif;
+ font-size:0.9em;
+ font-weight:normal;
+ color:#333333;
+}
+
+div.sexy-tooltip .tooltip-tl {
+ background: url(msn/tl.png) 0 bottom no-repeat;
+ position: relative; /* for close button */
+}
+
+div.sexy-tooltip .tooltip-tr {
+ padding: 0px 15px 0px 15px;
+ background: url(msn/tr.png) 100% bottom no-repeat;
+}
+
+div.sexy-tooltip .tooltip-t {
+ background: url(msn/t.png) 0 bottom repeat-x;
+ height:25px;
+}
+
+div.sexy-tooltip .tooltip-l {
+ background: url(msn/l.png) 0 0 repeat-y;
+}
+
+div.sexy-tooltip .tooltip-r {
+ padding: 0px 15px 0px 15px;
+ background: url(msn/r.png) 100% 0 repeat-y;
+}
+
+div.sexy-tooltip .tooltip-m {
+ background: #dae9f8;
+ overflow: hidden;
+ width:100%;
+}
+
+div.sexy-tooltip .tooltip-bl {
+ background: url(msn/bl.png) 0 0 no-repeat;
+}
+
+div.sexy-tooltip .tooltip-br {
+ padding: 0px 15px 0px 15px;
+ background: url(msn/br.png) 100% 0 no-repeat;
+}
+
+div.sexy-tooltip .tooltip-b {
+ background: url(msn/b.png) 0 0 repeat-x;
+ height:25px;
+}
+
+div.sexy-tooltip a.tooltip-close {
+ display:block;
+ overflow:hidden;
+ position: absolute;
+ top: 21px;
+ right: 10px;
+ width: 18px;
+ height: 18px;
+ background: url(msn/close.png) 0 0 no-repeat;
+ cursor: pointer;
+}
+
+div.sexy-tooltip a.tooltip-close span {
+ display:none;
+}
\ No newline at end of file
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/sexy-tooltips/msn.css
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediainfo.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediainfo.js 2010-02-03 14:15:10 UTC (rev 1794)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediainfo.js 2010-02-04 09:14:51 UTC (rev 1795)
@@ -10,18 +10,17 @@
$$(triggers).each(function(trigger){
var tooltip = trigger.tooltip(trigger.getElement('.details').get('html'), {
width: 170,
- style: 'coda',
- sticky: 1,
- mode: 'bl',
- fixedPosition: true,
- offset: {x: -60, y: 20}
+ style: 'alert',
+ sticky: false,
+ mode: 'auto',
+ fixedPosition: true
});
trigger.addEvents({
'mouseleave': this.hideStarter,
'mouseenter': this.hideStopper,
'tooltipshow': this.handleShow.bind(this, trigger),
'tooltiphide': this.handleHide.bind(this, trigger)
- });
+ });
tooltip.tooltip.addEvents({
'mouseenter': this.hideStopper,
'mouseleave': this.hideStarter
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-03 14:15:10 UTC (rev 1794)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-04 09:14:51 UTC (rev 1795)
@@ -4,7 +4,7 @@
<head>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/multibox.css" />
- <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/sexy-tooltips/coda.css" />
+ <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/sexy-tooltips/msn.css" />
<!--
[if IE]><style> .image span { display: inline-block; height: 100%; } </style><![endif]
-->
@@ -17,7 +17,11 @@
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/sexy-tooltips-1.1.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mediainfo.js"></script>
<script type="text/javascript">
- <#list this.types as type> <#if type.name == this.type> <#assign currentType = type> </#if> </#list>
+ [#list this.types as type]
+ [#if type.name == this.type]
+ [#assign currentType = type]
+ [/#if]
+ [/#list]
function openDialog(path) {
parent.openWindow(".magnolia/dialogs/${currentType.dialog}.html?mgnlPath=" + path
@@ -108,14 +112,14 @@
<input type="hidden" id="actionNode" name="node" />
<input type="hidden" id="actionDest" name="dest" />
<input type="hidden" name="type" value="${this.type}" />
- <#if this.request.parameterMap['selectMedia']?exists>
+ [#if this.request.parameterMap['selectMedia']?exists]
<input type="hidden" name="selectMedia" value="true" />
- </#if>
+ [/#if]
<input type="hidden" name="search" value="${this.search!''}" />
<input type="hidden" name="type" value="${this.type}" />
- <#if this.path?exists>
+ [#if this.path?exists]
<input type="hidden" name="path" value="${this.path}" />
- </#if>
+ [/#if]
</form>
<div id="navigation">
<div class="voice right" style="padding-right: 10px;">
@@ -138,57 +142,57 @@
White
</a>
</div>
- <#list this.types as type>
- <#if type.name == this.type>
- <#assign actual = "actual">
- <#else>
- <#assign actual = "">
- </#if>
+ [#list this.types as type]
+ [#if type.name == this.type]
+ [#assign actual = "actual"]
+ [#else]
+ [#assign actual = ""]
+ [/#if]
<div class="voice ${actual}">
- <#if this.request.parameterMap['selectMedia']?exists>
- <a href="?type=${type.name}&path=${this.path!""}&selectMedia=true&search=${this.search!""}">
+ [#if this.request.parameterMap['selectMedia']?exists]
+ <a href="?type=${type.name}&path=${this.path!''}&selectMedia=true&search=${this.search!""}">
<img src="${this.request.contextPath}${type.menuIcon}" border="0" align="absmiddle" />
- ${this.msgs.get('media.types.' + type.name)} <#if this.numberOfMedia?exists>(${this.numberOfMedia[type.name]!'0'})</#if>
+ ${this.msgs.get('media.types.' + type.name)} [#if this.numberOfMedia?exists](${this.numberOfMedia[type.name]!'0'})[/#if]
</a>
- <#else>
- <a href="?type=${type.name}&path=${this.path!""}&search=${this.search!""}">
+ [#else>
+ <a href="?type=${type.name}&path=${this.path!''}&search=${this.search!""}">
<img src="${this.request.contextPath}${type.menuIcon}" border="0" align="absmiddle" />
- ${this.msgs.get('media.types.' + type.name)} <#if this.numberOfMedia?exists>(${this.numberOfMedia[type.name]!'0'})</#if>
+ ${this.msgs.get('media.types.' + type.name)} [#if this.numberOfMedia?exists](${this.numberOfMedia[type.name]!'0'})[/#if]
</a>
- </#if>
+ [/#if]
</div>
<div class="separator">|</div>
- </#list>
+ [/#list]
</div>
<ul class="mediaList">
- <#assign index = 0>
- <#list this.medias as media>
- <#if media.filename?length gt 18>
- <#assign name = media.filename?substring(0,15)>
- <#assign name = name?right_pad(18, ".")>
- <#else>
- <#assign name = media.filename>
- </#if>
- <#assign index = index + 1 >
- <#assign mediaStatusClass = "">
- <#if this.selectMedia && !this.develop>
- <#assign mediaStatusClass = "mediaStatus${media.metaData.activationStatus}">
- </#if>
- <#assign selectMediaClass = "">
- <#if this.selectMedia>
- <#assign selectMediaClass = "selectMedia">
- </#if>
+ [#assign index = 0]
+ [#list this.medias as media]
+ [#if media.filename?length gt 18]
+ [#assign name = media.filename?substring(0,15)]
+ [#assign name = name?right_pad(18, ".")]
+ [#else]
+ [#assign name = media.filename]
+ [/#if]
+ [#assign index = index + 1 ]
+ [#assign mediaStatusClass = ""]
+ [#if this.selectMedia && !this.develop]
+ [#assign mediaStatusClass = "mediaStatus${media.metaData.activationStatus}"]
+ [/#if]
+ [#assign selectMediaClass = ""]
+ [#if this.selectMedia]
+ [#assign selectMediaClass = "selectMedia"]
+ [/#if]
<li class="media ${mediaStatusClass} ${selectMediaClass}" style="text-align:center">
<div class="mediaheader">
<span class="edit">${this.msgs.get('media.edit')}</span>
<div class="icons" style="display: none;">
- <#if this.type != 'youtube'>
+ [#if this.type != 'youtube']
<a href="?command=download&path=${media.handle}">
<img src="${this.request.contextPath}/.resources/media/icons/download.gif" border="0" align="middle" />
<span>${this.msgs.get('media.download')}</span>
</a>
- </#if>
- <#if media.writable>
+ [/#if]
+ [#if media.writable]
<a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="${this.msgs.get('media.edit')}">
<img src="${this.request.contextPath}/.resources/media/icons/edit.gif" border="0" align="middle" />
<span>${this.msgs.get('media.edit')}</span>
@@ -205,7 +209,7 @@
<img src="${this.request.contextPath}/.resources/icons/16/copy.gif" border="0" align="middle" />
<span>${this.msgs.get('media.copy')}</span>
</a>
- <#else>
+ [#else]
<a>
<img src="${this.request.contextPath}/.resources/media/icons/edit_inactive.gif" border="0" align="middle" />
</a>
@@ -218,87 +222,87 @@
<a>
<img src="${this.request.contextPath}/.resources/icons/16/copy_inactive.gif" border="0" align="middle" />
</a>
- </#if>
- <#if media.canPublish>
+ [/#if]
+ [#if media.canPublish]
<a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="${this.msgs.get('media.activate')}">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" align="middle" />
<span>${this.msgs.get('media.activate')}</span>
</a>
- <#else>
+ [#else]
<a title="${this.msgs.get('media.activate')}" class="disabled">
<img src="${this.request.contextPath}/.resources/media/icons/arrow_right_green_inactive.gif" border="0"
align="middle" />
<span>${this.msgs.get('media.activate')}</span>
</a>
- </#if>
- <#if media.canPublish && media.metaData.activationStatus = 2>
+ [/#if]
+ [#if media.canPublish && media.metaData.activationStatus = 2]
<a href="javascript:$empty()" onclick="performAction('deactivate', '${media.handle}','')" title="${this.msgs.get('media.deactivate')}">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red.gif" border="0" align="middle" />
<span>${this.msgs.get('media.deactivate')}</span>
</a>
- <#else>
+ [#else]
<a title="${this.msgs.get('media.deactivate')}" class="disabled">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red_inactive.gif" border="0"
align="middle" />
<span>${this.msgs.get('media.deactivate')}</span>
</a>
- </#if>
+ [/#if]
</div>
- <#if media.usedInWebPages?size = 0>
+ [#if media.usedInWebPages?size = 0]
<span>${this.msgs.get('media.nopages')}</span>
- <#else>
- <#assign pages = "">
- <#list media.usedInWebPages as page>
- <#assign pages = pages + "<a href='${this.request.contextPath}" + page +".html' target='_blank'>"+ page +"</a><br/>">
- </#list>
+ [#else]
+ [#assign pages = ""]
+ [#list media.usedInWebPages as page]
+ [#assign pages = pages + "<a href='${this.request.contextPath}" + page +".html' target='_blank'>"+ page +"</a><br/>"]
+ [/#list]
<span class="tips" rel="${pages}">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
- </#if>
+ [/#if]
</div>
<div class="imageBorder">
<div class="image">
<span></span>
- <#assign url = media.previewUrl>
- <#if !url?starts_with('http')>
- <#assign url = "${this.request.contextPath}${media.previewUrl}">
- </#if>
+ [#assign url = media.previewUrl]
+ [#if !url?starts_with('http')]
+ [#assign url = "${this.request.contextPath}${media.previewUrl}"]
+ [/#if]
<a id="mb${index}" class="multibox" href="${url}" title="${media.description!""}">
- <#assign thumbnailPath = media.thumbnailUrl>
- <#if thumbnailPath == ''>
- <#assign thumbnailPath = "/.resources/media/icons/brokenThumb.jpg">
- </#if>
+ [#assign thumbnailPath = media.thumbnailUrl]
+ [#if thumbnailPath == '']
+ [#assign thumbnailPath = "/.resources/media/icons/brokenThumb.jpg"]
+ [/#if]
<img src="${this.request.contextPath}${thumbnailPath}" border="0" alt="" />
</a>
</div>
</div>
- <#if media.mediaInfo??>
+ [#if media.mediaInfo??]
<div class="mediainfo">
${media.mediaInfo['extension']}
- <#if media.mediaInfo['width']?? && media.mediaInfo['height']??>
+ [#if media.mediaInfo['width']?? && media.mediaInfo['height']??]
${media.mediaInfo['width']}x${media.mediaInfo['height']}
- </#if>
+ [/#if]
<div class="details">
- <#list media.mediaInfo?keys as key>
- <#if key != 'extension' && key != 'width' && key != 'height'>
+ [#list media.mediaInfo?keys as key]
+ [#if key != 'extension' && key != 'width' && key != 'height']
${this.msgs.get("media.info.${key}")}: ${media.mediaInfo[key]}<br/>
- </#if>
- </#list>
+ [/#if]
+ [/#list]
</div>
</div>
- </#if>
- <#if this.selectMedia>
+ [/#if]
+ [#if this.selectMedia]
<div class="selectMediaLine">
- <#if media.metaData.activationStatus = 2 || this.develop >
+ [#if media.metaData.activationStatus = 2 || this.develop ]
<a href="javascript:$empty()" onclick="selectMedia('${media.uuid}', '${this.request.contextPath}${media.thumbnailUrl}', '${media.filename}')">
${this.msgs.get('media.select')}
</a>
- <#else>
+ [#else]
${this.msgs.get('media.notpublished')}
- </#if>
+ [/#if]
</div>
- </#if>
+ [/#if]
<span class="name status${media.metaData.activationStatus}" title="${media.filename}">${name}</span>
</li>
- </#list>
+ [/#list]
</ul>
</body>
</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-06 18:23:13
|
Revision: 1824
http://openutils.svn.sourceforge.net/openutils/?rev=1824&view=rev
Author: fgiust
Date: 2010-02-06 18:23:07 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
removing unused info when set in single instance mode
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/bg-selectors.png
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/toolbar-background-light.png
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-02-06 17:34:15 UTC (rev 1823)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-02-06 18:23:07 UTC (rev 1824)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
+import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.core.SystemProperty;
@@ -28,6 +29,7 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Task;
import info.magnolia.module.delta.TaskExecutionException;
+import it.openutils.mgnltasks.CreateMissingPropertyTask;
import it.openutils.mgnltasks.NodeSortTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
@@ -136,6 +138,14 @@
}
});
+ tasks.add(new CreateMissingPropertyTask(
+ "name",
+ "desc",
+ ContentRepository.CONFIG,
+ "/modules/media/config",
+ "singleinstance",
+ "false"));
+
return tasks;
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-06 17:34:15 UTC (rev 1823)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-06 18:23:07 UTC (rev 1824)
@@ -86,11 +86,16 @@
color: #000;
}
+div.mediatab {
+ padding-right: 10px;
+ margin-right: 0;
+}
+
.actual {
- font-weight: bold;
- /*text-decoration: underline;*/
- padding-right: 20px;
- background: url(../../controls/navigation/mgnlNavigationArrow.gif) no-repeat center right;
+ text-decoration: underline;
+ background-image: url("images/toolbar-background-light.png");
+ /* padding-right: 20px;
+ background: url(../../controls/navigation/mgnlNavigationArrow.gif) no-repeat center right;*/
}
.actual a,.actual a:hover,.actual a:visited {
@@ -113,9 +118,11 @@
font-size: 0.8em;
position: relative;
background-color: #f8f8f8;
- -moz-box-shadow: 3px 3px 3px #666;
- -webkit-box-shadow: 3px 3px 3px #666;
- box-shadow: 3px 3px 3px #666;
+ border: 1px solid #999;
+ /*
+ -moz-box-shadow: 2px 2px 2px #ccc;
+ -webkit-box-shadow: 2px 2px 2px #ccc;
+ box-shadow: 2px 2px 2px #ccc;*/
}
.mediaList li.selectMedia {
@@ -265,7 +272,7 @@
.mediaStatus0,.mediaStatus1 {
opacity: 0.75;
- filter: alpha(opacity = 75);
+ filter: alpha(opacity = 75);
}
.sexy-tooltip {
@@ -283,7 +290,7 @@
background-color: #ffffff;
border: 1px solid #cfcfcf;
opacity: 0.90;
- filter: alpha(opacity = 90);
+ filter: alpha(opacity = 90);
-moz-box-shadow: 3px 3px 3px #666;
-webkit-box-shadow: 3px 3px 3px #666;
box-shadow: 3px 3px 3px #666;
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/bg-selectors.png
===================================================================
(Binary files differ)
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/toolbar-background-light.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/toolbar-background-light.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-06 17:34:15 UTC (rev 1823)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-06 18:23:07 UTC (rev 1824)
@@ -139,20 +139,12 @@
[#else]
[#assign actual = ""]
[/#if]
- <div class="voice ${actual}">
- [#if this.request.parameterMap['selectMedia']?exists]
- <a href="?type=${type.name}&path=${this.path!''}&selectMedia=true&search=${this.search!""}">
+ <div class="voice mediatab ${actual}">
+ <a href="?type=${type.name}&path=${this.path!''}[#if this.request.parameterMap['selectMedia']?exists]&selectMedia=true[/#if]&search=${this.search!""}">
<img src="${this.request.contextPath}${type.menuIcon}" border="0" align="absmiddle" />
${this.msgs.get('media.types.' + type.name)} [#if this.numberOfMedia?exists](${this.numberOfMedia[type.name]!'0'})[/#if]
</a>
- [#else>
- <a href="?type=${type.name}&path=${this.path!''}&search=${this.search!""}">
- <img src="${this.request.contextPath}${type.menuIcon}" border="0" align="absmiddle" />
- ${this.msgs.get('media.types.' + type.name)} [#if this.numberOfMedia?exists](${this.numberOfMedia[type.name]!'0'})[/#if]
- </a>
- [/#if]
</div>
- <div class="separator">|</div>
[/#list]
</div>
<ul class="mediaList">
@@ -178,14 +170,6 @@
<span class="edit menuitem">${this.msgs.get('media.edit')}</span>
<div class="icons menu" style="display: none;">
<ul>
- [#if this.type != 'youtube']
- <li>
- <a href="?command=download&path=${media.handle}">
- <img src="${this.request.contextPath}/.resources/media/icons/download.gif" border="0" />
- <span>${this.msgs.get('media.download')}</span>
- </a>
- </li>
- [/#if]
[#if media.writable]
<li>
<a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="${this.msgs.get('media.edit')}">
@@ -233,35 +217,45 @@
</a>
</li>
[/#if]
- [#if media.canPublish]
+ [#if this.type != 'youtube']
<li>
- <a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="${this.msgs.get('media.activate')}">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" />
- <span>${this.msgs.get('media.activate')}</span>
+ <a href="?command=download&path=${media.handle}">
+ <img src="${this.request.contextPath}/.resources/media/icons/download.gif" border="0" />
+ <span>${this.msgs.get('media.download')}</span>
</a>
</li>
- [#else]
- <li>
- <a title="${this.msgs.get('media.activate')}" class="disabled">
- <img src="${this.request.contextPath}/.resources/media/icons/arrow_right_green_inactive.gif" border="0" />
- <span>${this.msgs.get('media.activate')}</span>
- </a>
- </li>
[/#if]
- [#if media.canPublish && media.metaData.activationStatus = 2]
- <li>
- <a href="javascript:$empty()" onclick="performAction('deactivate', '${media.handle}','')" title="${this.msgs.get('media.deactivate')}">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red.gif" border="0" />
- <span>${this.msgs.get('media.deactivate')}</span>
- </a>
- </li>
- [#else]
- <li>
- <a title="${this.msgs.get('media.deactivate')}" class="disabled">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red_inactive.gif" border="0" />
- <span>${this.msgs.get('media.deactivate')}</span>
- </a>
- </li>
+ [#if !this.singleInstance]
+ [#if media.canPublish]
+ <li>
+ <a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="${this.msgs.get('media.activate')}">
+ <img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" />
+ <span>${this.msgs.get('media.activate')}</span>
+ </a>
+ </li>
+ [#else]
+ <li>
+ <a title="${this.msgs.get('media.activate')}" class="disabled">
+ <img src="${this.request.contextPath}/.resources/media/icons/arrow_right_green_inactive.gif" border="0" />
+ <span>${this.msgs.get('media.activate')}</span>
+ </a>
+ </li>
+ [/#if]
+ [#if media.canPublish && media.metaData.activationStatus = 2]
+ <li>
+ <a href="javascript:$empty()" onclick="performAction('deactivate', '${media.handle}','')" title="${this.msgs.get('media.deactivate')}">
+ <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red.gif" border="0" />
+ <span>${this.msgs.get('media.deactivate')}</span>
+ </a>
+ </li>
+ [#else]
+ <li>
+ <a title="${this.msgs.get('media.deactivate')}" class="disabled">
+ <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red_inactive.gif" border="0" />
+ <span>${this.msgs.get('media.deactivate')}</span>
+ </a>
+ </li>
+ [/#if]
[/#if]
</ul>
</div>
@@ -325,7 +319,7 @@
[/#if]
</div>
[/#if]
- <span class="name status${media.metaData.activationStatus}" title="${media.filename}">${name}</span>
+ <span class="name [#if !this.singleInstance] status${media.metaData.activationStatus}[/#if]" title="${media.filename}">${name}</span>
</li>
[/#list]
</ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-06 20:52:05
|
Revision: 1826
http://openutils.svn.sourceforge.net/openutils/?rev=1826&view=rev
Author: fgiust
Date: 2010-02-06 20:51:58 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
MEDIA-76 Add a "document type handler" for pds in default configuration
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileDocument.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaDocumentDlg.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.document.xml
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileDocument.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileDocument.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileDocument.java 2010-02-06 20:51:58 UTC (rev 1826)
@@ -0,0 +1,41 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
+import info.magnolia.cms.gui.dialog.DialogFile;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class DialogFileDocument extends DialogFile
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void initImageExtensions()
+ {
+ this.getImageExtensions().add("pdf");
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileDocument.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2010-02-06 20:51:58 UTC (rev 1826)
@@ -0,0 +1,50 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sourceforge.openutils.mgnlmedia.media.types.impl;
+
+import info.magnolia.cms.core.Content;
+
+import java.util.Collections;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class DocumentTypeHandler extends BaseTypeHandler
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getThumbnailUrl(Content media)
+ {
+ return "/.resources/file-icons/pdf.png";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getUrl(Content media)
+ {
+ return getUrl(media, Collections.<String, String> emptyMap());
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaDocumentDlg.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaDocumentDlg.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaDocumentDlg.xml 2010-02-06 20:51:58 UTC (rev 1826)
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="mediaDocumentDlg" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>1bfdfac9-e8ad-4f23-ae19-bb541e095322</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.LayerDialogMVC</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>500</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>media.dialogs.mediaImageDlg.label</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>520</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>fgiustcms</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:23.417+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-08T14:48:46.351+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-01-25T11:22:54.547+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabImage">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>e44e8d79-9709-49fc-83ac-f61af6b3b664</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Documento</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>fgiustcms</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-21T09:54:59.540Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-01-25T11:23:06.057+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="original">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>0691b96d-06b3-4424-bb12-f8bedabd42f2</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>mediaFile</sv:value>
+ </sv:property>
+ <sv:property sv:name="extensions" sv:type="String">
+ <sv:value>pdf</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Documento</sv:value>
+ </sv:property>
+ <sv:property sv:name="required" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>Binary</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>fgiustcms</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-21T10:24:21.253Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-01-25T11:24:24.945+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="tabAttributes">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>83d4fdbe-55de-4c14-b5e9-abdb22719a63</sv:value>
+ </sv:property>
+ <sv:property sv:name="reference" sv:type="String">
+ <sv:value>/modules/media/dialogs/common/tabAttributes</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>fgiustcms</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-02T16:35:26.540Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-01-25T11:22:46.947+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="type">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>767f77f1-83fd-41ec-acd7-d550c969406d</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>hidden</sv:value>
+ </sv:property>
+ <sv:property sv:name="defaultValue" sv:type="String">
+ <sv:value>document</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>fgiustcms</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-06-21T10:51:52.322Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-21T10:51:56.016Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-01-25T12:05:00.528+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaDocumentDlg.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.document.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.document.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.document.xml 2010-02-06 20:51:58 UTC (rev 1826)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="document" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d9ab60e2-0903-4f9c-be46-c0b907c361fe</sv:value>
+ </sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>mediaDocumentDlg</sv:value>
+ </sv:property>
+ <sv:property sv:name="enabled" sv:type="Boolean">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="extensions" sv:type="String">
+ <sv:value>doc,pdf,docx,odt,xls,ppt</sv:value>
+ </sv:property>
+ <sv:property sv:name="handler" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.types.impl.DocumentTypeHandler</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>document</sv:value>
+ </sv:property>
+ <sv:property sv:name="menuIcon" sv:type="String">
+ <sv:value>/.resources/file-icons/pdf.png</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-06-17T16:49:16.314Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-21T08:55:30.375Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-01-09T12:48:31.017+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.document.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-07 18:57:32
|
Revision: 1851
http://openutils.svn.sourceforge.net/openutils/?rev=1851&view=rev
Author: fgiust
Date: 2010-02-07 18:57:21 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
MEDIA-80 metadata are saved as properties of the main node now - still needs to be cleaned up and reviewed
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
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/MediaFolderViewPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaMetadataFormatUtils.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-02-07 15:48:22 UTC (rev 1850)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-02-07 18:57:21 UTC (rev 1851)
@@ -55,6 +55,7 @@
import org.apache.commons.chain.Command;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.StopWatch;
import org.apache.jackrabbit.util.ISO9075;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -241,6 +242,9 @@
if (mediasOfType != null)
{
+
+ StopWatch watch = new StopWatch();
+ watch.start();
for (Content media : mediasOfType)
{
MediaBean mb = new MediaBean();
@@ -273,6 +277,8 @@
medias.add(mb);
}
+
+ log.warn("Took {} to display {} files", watch.toSplitString(), mediasOfType.size());
}
return super.show();
@@ -785,4 +791,9 @@
}
return "white";
}
+
+ public String getMessage(String key, String param)
+ {
+ return getMsgs().get(key, new String[]{param });
+ }
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2010-02-07 15:48:22 UTC (rev 1850)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2010-02-07 18:57:21 UTC (rev 1851)
@@ -24,8 +24,6 @@
import info.magnolia.cms.security.AccessDeniedException;
import java.io.File;
-import java.util.Arrays;
-import java.util.List;
import java.util.Map;
import javax.jcr.RepositoryException;
@@ -40,11 +38,20 @@
public interface MediaTypeHandler
{
- /**
- * languages
- */
- List<String> LANGUAGES = Arrays.asList("en", "en_us", "it", "fr", "de");
+ String METADATA_WIDTH = "media_width";
+ String METADATA_HEIGHT = "media_height";
+
+ String METADATA_BITDEPTH = "media_bitdepth";
+
+ String METADATA_DURATION = "media_duration";
+
+ String METADATA_FRAMERATE = "media_framerate";
+
+ String METADATA_EXTENSION = "media_extension";
+
+ String METADATA_SIZE = "media_size";
+
/**
* init handler
* @param typeDefinitionNode type definition node
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-02-07 15:48:22 UTC (rev 1850)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-02-07 18:57:21 UTC (rev 1851)
@@ -35,6 +35,7 @@
import java.util.Locale;
import java.util.Map;
+import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
@@ -43,7 +44,6 @@
import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -251,11 +251,11 @@
String languageCountry = language + "_" + locale.getCountry().toLowerCase();
try
{
- if (LANGUAGES.contains(languageCountry) && media.hasNodeData(property + "-" + languageCountry))
+ if (media.hasNodeData(property + "-" + languageCountry))
{
return NodeDataUtil.getString(media, property + "-" + languageCountry);
}
- else if (LANGUAGES.contains(language) && media.hasNodeData(property + "-" + language))
+ else if (media.hasNodeData(property + "-" + language))
{
return NodeDataUtil.getString(media, property + "-" + language);
}
@@ -308,36 +308,61 @@
*/
public Map<String, String> getMediaInfo(Content media)
{
- FileProperties fp = new FileProperties(media, ORGINAL_NODEDATA_NAME);
- String extension = fp.getProperty(FileProperties.PROPERTY_EXTENSION);
- String size = StringUtils.EMPTY;
+ Map<String, String> info = new LinkedHashMap<String, String>();
- try
+ NodeData originalFileNodeData = getOriginalFileNodeData(media);
+ if (originalFileNodeData.getType() == PropertyType.BINARY)
{
- size = fp.getProperty(FileProperties.PROPERTY_SIZE);
+
+ FileProperties fp = new FileProperties(media, ORGINAL_NODEDATA_NAME);
+
+ String extension = fp.getProperty(FileProperties.PROPERTY_EXTENSION);
+ info.put(METADATA_EXTENSION, extension);
+
+ String size = StringUtils.EMPTY;
+
+ try
+ {
+ size = fp.getProperty(FileProperties.PROPERTY_SIZE);
+ }
+ catch (NumberFormatException nfe)
+ {
+ // just ignore, no file size info
+ }
+ info.put(METADATA_SIZE, size);
+
}
- catch (NumberFormatException nfe)
- {
- // just ignore, no file size info
- }
- int width = NumberUtils.toInt(fp.getProperty(FileProperties.PROPERTY_WIDTH));
- int height = NumberUtils.toInt(fp.getProperty(FileProperties.PROPERTY_HEIGHT));
+ addToInfo(media, info, METADATA_WIDTH);
+ addToInfo(media, info, METADATA_HEIGHT);
+ addToInfo(media, info, METADATA_BITDEPTH);
- // return extension + (width > 0 ? (" " + width + "x" + height) : "") + " " + size;
+ return info;
+ }
- Map<String, String> info = new LinkedHashMap<String, String>();
- info.put("extension", extension);
- if (width > 0)
+ protected void addToInfo(Content media, Map<String, String> info, String key)
+ {
+ NodeData data = media.getNodeData(key);
+
+ String string = null;
+ if (data.getType() == PropertyType.LONG || data.getType() == PropertyType.DOUBLE)
{
- info.put("width", String.valueOf(width));
+ int numeric = (int) data.getLong();
+ if (numeric > 0)
+ {
+ string = String.valueOf(numeric);
+ }
}
- if (height > 0)
+ else
{
- info.put("height", String.valueOf(height));
+ string = data.getString();
}
- info.put("size", size);
- return info;
+
+ if (StringUtils.isNotEmpty(string))
+ {
+ info.put(key, string);
+ }
+
}
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2010-02-07 15:48:22 UTC (rev 1850)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2010-02-07 18:57:21 UTC (rev 1851)
@@ -19,17 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
-import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
-import java.util.LinkedHashMap;
import java.util.Map;
+import net.sourceforge.openutils.mgnlmedia.media.utils.MediaMetadataFormatUtils;
import net.sourceforge.openutils.mgnlmedia.media.utils.FLVMedataUtils.FLVMetaData;
-import org.apache.commons.lang.time.DurationFormatUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,8 +42,6 @@
*/
private Logger log = LoggerFactory.getLogger(BaseVideoTypeHandler.class);
- protected final String DURATION_ATTRIBUTE = "duration";
-
protected abstract FLVMetaData parseFLVMetaData(Content media) throws Exception;
@Override
@@ -71,16 +66,14 @@
if (flvMetaData != null)
{
- // duh, we should be able to set properties on binary nodedata but at the moment there is no
- // setAttribute(Long) in the interface!
- Content originalAsNode = ContentUtil.getContent(media, BaseTypeHandler.ORGINAL_NODEDATA_NAME);
- Content flvMetaDataNode = originalAsNode != null ? originalAsNode : media;
- NodeDataUtil.getOrCreateAndSet(flvMetaDataNode, FileProperties.PROPERTY_WIDTH, flvMetaData.getWidth());
- NodeDataUtil
- .getOrCreateAndSet(flvMetaDataNode, FileProperties.PROPERTY_HEIGHT, flvMetaData.getHeight());
- NodeDataUtil.getOrCreateAndSet(flvMetaDataNode, DURATION_ATTRIBUTE, flvMetaData.getDuration());
- flvMetaDataNode.save();
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_EXTENSION, "flv");
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_WIDTH, flvMetaData.getWidth());
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_HEIGHT, flvMetaData.getHeight());
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_DURATION, flvMetaData.getDuration());
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_FRAMERATE, flvMetaData.getFrameRate());
+
+ media.save();
}
}
catch (Exception e)
@@ -97,61 +90,15 @@
public Map<String, String> getMediaInfo(Content media)
{
- Content originalAsNode = ContentUtil.getContent(media, BaseTypeHandler.ORGINAL_NODEDATA_NAME);
- Content flvMetaDataNode = originalAsNode != null ? originalAsNode : media;
+ Map<String, String> info = super.getMediaInfo(media);
- String ext = flvMetaDataNode.getNodeData(FileProperties.PROPERTY_EXTENSION).getString();
- long width = flvMetaDataNode.getNodeData(FileProperties.PROPERTY_WIDTH).getLong();
- long height = flvMetaDataNode.getNodeData(FileProperties.PROPERTY_HEIGHT).getLong();
- long duration = flvMetaDataNode.getNodeData(DURATION_ATTRIBUTE).getLong();
- long size = flvMetaDataNode.getNodeData(FileProperties.PROPERTY_SIZE).getLong();
-
-// return ext
-// + (width > 0 ? (" " + width + "x" + height) : "")
-// + " length: "
-// + DurationFormatUtils.formatDuration(duration * 1000, "m:ss ")
-// + "size: "
-// + toSizeString(size);
-
- Map<String, String> info = new LinkedHashMap<String, String>();
- info.put("extension", ext);
- if (width > 0)
+ long duration = media.getNodeData(METADATA_DURATION).getLong();
+ if (duration > 0)
{
- info.put("width", String.valueOf(width));
+ info.put(METADATA_DURATION, MediaMetadataFormatUtils.formatDuration(duration));
}
- if (height > 0)
- {
- info.put("height", String.valueOf(height));
- }
- info.put("duration", DurationFormatUtils.formatDuration(duration * 1000, "m:ss "));
- info.put("size", toSizeString(size));
+
return info;
}
- /*
- * todo: move to an utility class
- */
- private String toSizeString(long size)
- {
- String unit = "bytes";
- String sizeStr;
- if (size >= 1000)
- {
- size = size / 1024;
- unit = "KB";
- if (size >= 1000)
- {
- size = size / 1024;
- unit = "MB";
- }
- sizeStr = Double.toString(size);
- sizeStr = sizeStr.substring(0, sizeStr.indexOf(".") + 2); //$NON-NLS-1$
- }
- else
- {
- sizeStr = Double.toString(size);
- sizeStr = sizeStr.substring(0, sizeStr.indexOf(".")); //$NON-NLS-1$
- }
- return sizeStr + " " + unit;
- }
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2010-02-07 15:48:22 UTC (rev 1850)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2010-02-07 18:57:21 UTC (rev 1851)
@@ -20,11 +20,9 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import java.io.InputStream;
-import java.util.Map;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
@@ -43,13 +41,12 @@
*/
public class ImageTypeHandler extends BaseTypeHandler
{
+
/**
* Logger.
*/
private Logger log = LoggerFactory.getLogger(ImageTypeHandler.class);
- protected final String BIT_DEPTH_ATTRIBUTE = "bitDepth";
-
/**
* {@inheritDoc}
*/
@@ -85,40 +82,34 @@
public boolean onPostSave(Content media)
{
InputStream stream = null;
- try {
- ImageInfo ii = new ImageInfo();
+ try
+ {
stream = getOriginalFileNodeData(media).getStream();
+ ImageInfo ii = new ImageInfo();
ii.setInput(stream);
- if (ii.check()) {
- Content originalAsNode = ContentUtil.getContent(media, BaseTypeHandler.ORGINAL_NODEDATA_NAME);
- NodeDataUtil.getOrCreateAndSet(originalAsNode, BIT_DEPTH_ATTRIBUTE, ii.getBitsPerPixel());
- originalAsNode.save();
+ if (ii.check())
+ {
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_BITDEPTH, ii.getBitsPerPixel());
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_WIDTH, ii.getWidth());
+ NodeDataUtil.getOrCreateAndSet(media, METADATA_HEIGHT, ii.getHeight());
+ media.save();
}
}
- catch (Throwable e) {
+ catch (Throwable e)
+ {
log.warn("Error determining bit depth "
- + getOriginalFileNodeData(media).getHandle()
- + " "
- + e.getClass().getName()
- + " "
- + e.getMessage(), e);
+ + getOriginalFileNodeData(media).getHandle()
+ + " "
+ + e.getClass().getName()
+ + " "
+ + e.getMessage(), e);
}
- finally {
+ finally
+ {
IOUtils.closeQuietly(stream);
}
return super.onPostSave(media);
}
- @Override
- public Map<String, String> getMediaInfo(Content media)
- {
- Map<String, String> info = super.getMediaInfo(media);
-
- Content originalAsNode = ContentUtil.getContent(media, BaseTypeHandler.ORGINAL_NODEDATA_NAME);
- long bitDepth = originalAsNode.getNodeData(BIT_DEPTH_ATTRIBUTE).getLong();
- info.put("bitDepth", String.valueOf(bitDepth));
-
- return info;
- }
}
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaMetadataFormatUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaMetadataFormatUtils.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaMetadataFormatUtils.java 2010-02-07 18:57:21 UTC (rev 1851)
@@ -0,0 +1,73 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sourceforge.openutils.mgnlmedia.media.utils;
+
+import org.apache.commons.lang.time.DurationFormatUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class MediaMetadataFormatUtils
+{
+
+ /**
+ * Format a size
+ * @param size
+ * @return
+ */
+ public static String formatSize(long size)
+ {
+ String unit = "bytes";
+ String sizeStr;
+ if (size >= 1000)
+ {
+ size = size / 1024;
+ unit = "KB";
+ if (size >= 1000)
+ {
+ size = size / 1024;
+ unit = "MB";
+ }
+ sizeStr = Double.toString(size);
+ sizeStr = sizeStr.substring(0, sizeStr.indexOf(".") + 2); //$NON-NLS-1$
+ }
+ else
+ {
+ sizeStr = Double.toString(size);
+ sizeStr = sizeStr.substring(0, sizeStr.indexOf(".")); //$NON-NLS-1$
+ }
+ return sizeStr + " " + unit;
+ }
+
+ public static String formatDuration(long duration)
+ {
+ if (duration > 0)
+ {
+ return DurationFormatUtils.formatDuration(duration * 1000, "m:ss ");
+ }
+ return null;
+ }
+
+ public static String formatBitDepth(int bitDepth)
+ {
+ return String.valueOf(bitDepth);
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaMetadataFormatUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
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 2010-02-07 15:48:22 UTC (rev 1850)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-07 18:57:21 UTC (rev 1851)
@@ -86,9 +86,13 @@
media.move.error.selectnode=Select a node
media.move.error.samenode=It is not allowed to move a node inside itself.
-media.info.size=Size
-media.info.bitDepth=Bit depth
-media.info.duration=Duration
+media.info.media_extension=Extension: {0}
+media.info.media_size=Size: {0}
+media.info.media_width=Width: {0}px
+media.info.media_height=Height: {0}px
+media.info.media_bitDepth=Bit depth: {0}
+media.info.media_duration=Duration: {0}
+media.info.media_framerate=Frame rate: {0}
media.bgselector.white=White
media.bgselector.transparent=Transparent
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-02-07 15:48:22 UTC (rev 1850)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-07 18:57:21 UTC (rev 1851)
@@ -87,10 +87,16 @@
media.move.error.selectnode=Seleziona un nodo
media.move.error.samenode=Non \u00E8 possibile spostare all'interno dello stesso nodo.
-media.info.size=Dimensione
-media.info.bitDepth=Profondit\u00E0 di colore
-media.info.duration=Durata
+media.info.media_extension=Extension: {0}
+media.info.media_size=Dimensione: {0}
+media.info.media_width=Larghezza: {0}px
+media.info.media_height=Altezza: {0}px
+media.info.media_bitDepth=Profondit\u00E0 di colore: {0}
+media.info.media_duration=Durata: {0}
+media.info.media_framerate=Frame rate: {0}
+
+
media.bgselector.white=Bianco
media.bgselector.transparent=Trasparente
media.bgselector.black=Nero
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-07 15:48:22 UTC (rev 1850)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-07 18:57:21 UTC (rev 1851)
@@ -292,17 +292,16 @@
<img src="${this.request.contextPath}${thumbnailPath}" border="0" alt="" />
</a>
<div class="details">
+ <h4>${media.description!""}</h4>
[#list media.mediaInfo?keys as key]
- [#if key != 'extension' && key != 'width' && key != 'height']
- ${this.msgs.get("media.info.${key}")}: ${media.mediaInfo[key]}<br/>
- [/#if]
+ ${this.getMessage("media.info.${key}", media.mediaInfo[key])}<br/>
[/#list]
</div>
</div>
</div>
[#if media.mediaInfo??]
<div class="mediainfo">
- ${media.mediaInfo['extension']}
+ ${media.mediaInfo['extension']!}
[#if media.mediaInfo['width']?? && media.mediaInfo['height']??]
${media.mediaInfo['width']}x${media.mediaInfo['height']}
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-10 23:12:10
|
Revision: 1891
http://openutils.svn.sourceforge.net/openutils/?rev=1891&view=rev
Author: fgiust
Date: 2010-02-10 23:12:02 +0000 (Wed, 10 Feb 2010)
Log Message:
-----------
MEDIA-87 preliminary DAM stk support - must be reviewed in order to add the configuration only if stk is installed
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
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
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SimpleMediaFreemarkerHelper.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2010-02-10 23:12:02 UTC (rev 1891)
@@ -0,0 +1,55 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sourceforge.openutils.mgnlmedia.dam;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.module.templatingkit.dam.AssetNotFoundException;
+import info.magnolia.module.templatingkit.dam.assets.InternalAsset;
+
+import javax.jcr.RepositoryException;
+
+
+/**
+ * Dam-support for the SimpleMedia module.
+ * @author Ernst Bunders
+ */
+public class SimpleMediaAsset extends InternalAsset
+{
+
+ public SimpleMediaAsset(SimpleMediaContentHandler handler, Content metaDataNode, NodeData binaryNodeData)
+ throws AssetNotFoundException,
+ RepositoryException
+ {
+ super(handler, metaDataNode, "", binaryNodeData);
+ }
+
+ @Override
+ public String getName()
+ {
+ return metaDataNode.getName();
+ }
+
+ @Override
+ public String getCaption()
+ {
+ return getMetaDataValue("title", super.getTitle());
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2010-02-10 23:12:02 UTC (rev 1891)
@@ -0,0 +1,63 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sourceforge.openutils.mgnlmedia.dam;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.module.templatingkit.dam.Asset;
+import info.magnolia.module.templatingkit.dam.AssetNotFoundException;
+import info.magnolia.module.templatingkit.dam.DAMException;
+import info.magnolia.module.templatingkit.dam.handlers.DMSDAMHandler;
+
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.RepositoryException;
+
+
+/**
+ * Dam-support for the SimpleMedia module.
+ * @author Ernst Bunders
+ */
+public class SimpleMediaContentHandler extends DMSDAMHandler
+{
+
+ @Override
+ public Asset getAssetByKey(String key) throws DAMException
+ {
+ final HierarchyManager hm = MgnlContext.getHierarchyManager("media");
+ try
+ {
+ try
+ {
+ Content node = hm.getContentByUUID(key);
+ final NodeData binaryNodeData = node.getNodeData("original");
+ return new SimpleMediaAsset(this, node, binaryNodeData);
+ }
+ catch (ItemNotFoundException e)
+ {
+ throw new AssetNotFoundException("No asset found for key [" + key + "]");
+ }
+ }
+ catch (RepositoryException e)
+ {
+ throw new DAMException("Can't create asset for key " + key, e);
+ }
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SimpleMediaFreemarkerHelper.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SimpleMediaFreemarkerHelper.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SimpleMediaFreemarkerHelper.java 2010-02-10 23:12:02 UTC (rev 1891)
@@ -0,0 +1,64 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sourceforge.openutils.mgnlmedia.freemarker;
+
+import freemarker.ext.beans.BeansWrapper;
+import freemarker.template.TemplateHashModel;
+import freemarker.template.TemplateModelException;
+import info.magnolia.cms.util.FactoryUtil;
+import info.magnolia.freemarker.FreemarkerHelper;
+
+import java.util.Locale;
+import java.util.Map;
+
+
+/**
+ * Extension to FreemarkerHelper that adds the simplemedia EL functions as static methods to the template context
+ * @author Ernst Bunders
+ */
+public class SimpleMediaFreemarkerHelper extends info.magnolia.freemarker.FreemarkerHelper
+{
+
+ private final static org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(SimpleMediaFreemarkerHelper.class);
+
+ public static FreemarkerHelper getInstance()
+ {
+ return (FreemarkerHelper) FactoryUtil.getSingleton(SimpleMediaFreemarkerHelper.class);
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ protected void addDefaultData(Map map, Locale locale, String s)
+ {
+ super.addDefaultData(map, locale, s);
+ BeansWrapper wrapper = BeansWrapper.getDefaultInstance();
+ TemplateHashModel staticModels = wrapper.getStaticModels();
+ try
+ {
+ TemplateHashModel simpleMediaFunctions = (TemplateHashModel) staticModels
+ .get("net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl");
+ map.put("MediaFunctions", simpleMediaFunctions);
+ log.info("SimpleMedia functions added to template rendering context");
+ }
+ catch (TemplateModelException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SimpleMediaFreemarkerHelper.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java 2010-02-10 23:12:02 UTC (rev 1891)
@@ -0,0 +1,100 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sourceforge.openutils.mgnlmedia.freemarker;
+
+import freemarker.template.TemplateException;
+import info.magnolia.cms.core.Content;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.module.templating.RenderException;
+import info.magnolia.module.templating.RenderableDefinition;
+import info.magnolia.module.templatingkit.renderers.STKParagraphRenderer;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.jsp.JspWriter;
+
+import org.apache.commons.lang.exception.ExceptionUtils;
+
+
+/**
+ * Paragraph renderer that wraps support functions
+ * @author Ernst Bunders
+ */
+public class SktSimpleMediaParagraphRenderer extends STKParagraphRenderer
+{
+
+ private static final org.slf4j.Logger log = org.slf4j.LoggerFactory
+ .getLogger(SktSimpleMediaParagraphRenderer.class);
+
+ @Override
+ protected void onRender(Content content, RenderableDefinition definition, Writer out, Map ctx, String templatePath)
+ throws RenderException
+ {
+ final Locale locale = MgnlContext.getAggregationState().getLocale();
+
+ boolean wrap = false;
+ try
+ {
+ if (out instanceof JspWriter)
+ {
+ // when FM wraps writer in a parent tag it gets confused and doesn't wrap the inner one again
+ wrap = true;
+ out = new PrintWriter(out);
+ }
+ log.debug("About to call FM renderer with {} wrapped writer: {}", wrap ? "" : "un", out);
+ SimpleMediaFreemarkerHelper.getInstance().render(
+ templatePath,
+ locale,
+ definition.getI18nBasename(),
+ ctx,
+ out);
+
+ }
+ catch (TemplateException e)
+ {
+ // TODO: handle exception
+ // exception is logged by freemarker and yellow message in the template inserted
+ }
+ catch (Exception e)
+ {
+ throw new RenderException("Can't render paragraph template "
+ + templatePath
+ + ": "
+ + ExceptionUtils.getRootCauseMessage(e), e);
+ }
+ finally
+ {
+ if (wrap)
+ {
+ try
+ {
+ out.flush();
+ }
+ catch (IOException e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+ }
+ }
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaParagraphRenderer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java 2010-02-10 23:12:02 UTC (rev 1891)
@@ -0,0 +1,72 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.sourceforge.openutils.mgnlmedia.freemarker;
+
+import static org.apache.commons.lang.exception.ExceptionUtils.getRootCause;
+import freemarker.template.TemplateException;
+import info.magnolia.cms.core.Content;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.module.templating.RenderException;
+import info.magnolia.module.templating.RenderableDefinition;
+import info.magnolia.module.templatingkit.renderers.STKTemplateRenderer;
+
+import java.io.Writer;
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.commons.lang.exception.ExceptionUtils;
+
+
+/**
+ * Template renderer that wraps support functions
+ * @author Ernst Bunders
+ */
+public class SktSimpleMediaTemplateRenderer extends STKTemplateRenderer
+{
+
+ private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(SktSimpleMediaTemplateRenderer.class);
+
+ @Override
+ protected void onRender(Content content, RenderableDefinition definition, Writer out, Map ctx, String templatePath)
+ throws RenderException
+ {
+ final Locale locale = MgnlContext.getAggregationState().getLocale();
+
+ try
+ {
+ SimpleMediaFreemarkerHelper.getInstance().render(
+ templatePath,
+ locale,
+ definition.getI18nBasename(),
+ ctx,
+ out);
+ }
+ catch (TemplateException e)
+ {
+ log.error("Template exception. root cause: " + getRootCause(e), e);
+ }
+ catch (Exception e)
+ {
+ throw new RenderException("Can't render template "
+ + templatePath
+ + ": "
+ + ExceptionUtils.getRootCauseMessage(e), e);
+ }
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/freemarker/SktSimpleMediaTemplateRenderer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2010-02-10 23:10:44 UTC (rev 1890)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2010-02-10 23:12:02 UTC (rev 1891)
@@ -20,6 +20,11 @@
<name>cache</name>
<version>4.0/*</version>
</dependency>
+ <dependency>
+ <name>standard-templating-kit</name>
+ <version>1.2/*</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<repositories>
<repository>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml 2010-02-10 23:12:02 UTC (rev 1891)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="media" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>6db0c3ed-cb44-4d68-8a4d-fa968dfbf240</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.dam.SimpleMediaContentHandler</sv:value>
+ </sv:property>
+ <sv:property sv:name="damSelectorOptionLabel" sv:type="String">
+ <sv:value>Media</sv:value>
+ </sv:property>
+ <sv:property sv:name="enabled" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-04-28T11:06:28.122+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-11-25T18:54:03.791+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="controls">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>6e1f7800-7722-4346-a3f7-70cdde0a5570</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-05-08T09:09:15.183+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-11-19T08:40:57.194+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="MediaUUID">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>6b4ca7b5-f5d2-4d6b-8cf3-d42b7271ffb4</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>mediaSelection</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>stk.dam.mediauuid.description</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>stk.dam.mediauuid.label</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>Binary</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2006-05-01T21:48:07.894+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-02-10T23:39:11.683+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.standard-templating-kit.config.site.damSupport.handlers.media.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
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 2010-02-10 23:10:44 UTC (rev 1890)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-10 23:12:02 UTC (rev 1891)
@@ -97,3 +97,7 @@
media.bgselector.white=White
media.bgselector.transparent=Transparent
media.bgselector.black=Black
+
+stk.dam.mediauuid.description=Select or create a new media
+stk.dam.mediauuid.label=Select 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-02-10 23:10:44 UTC (rev 1890)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-10 23:12:02 UTC (rev 1891)
@@ -100,3 +100,6 @@
media.bgselector.white=Bianco
media.bgselector.transparent=Trasparente
media.bgselector.black=Nero
+
+stk.dam.mediauuid.description=Seleziona o carica un nuovo media
+stk.dam.mediauuid.label=Seleziona media
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-13 19:12:11
|
Revision: 1914
http://openutils.svn.sourceforge.net/openutils/?rev=1914&view=rev
Author: fgiust
Date: 2010-02-13 19:12:05 +0000 (Sat, 13 Feb 2010)
Log Message:
-----------
MEDIA-94 New EL functions for getting the original width/height of media
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2010-02-13 18:35:26 UTC (rev 1913)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2010-02-13 19:12:05 UTC (rev 1914)
@@ -23,6 +23,7 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
+import info.magnolia.cms.util.DateUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
@@ -30,6 +31,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -37,11 +39,13 @@
import javax.jcr.ItemNotFoundException;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
+import javax.jcr.Value;
import javax.jcr.query.InvalidQueryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
@@ -430,16 +434,13 @@
* Get an array of String(s) containing a list of web pages where this media is used, an empty array otherwise
* @param media media to search in web pages
* @return an array of String(s) containing a list of web pages where this media is used, an empty array otherwise
- * @throws IllegalArgumentException if media is null
*/
public static String[] findMediaUsedInWebPages(Content media)
{
if (media == null)
{
- String msg = "media cannot be null";
- log.error(msg);
-
- throw new IllegalArgumentException(msg);
+ log.warn("findMediaUsedInWebPages called with a null media");
+ return new String[]{};
}
try
{
@@ -458,4 +459,91 @@
}
return EMPTY_STRING_ARRAY;
}
+
+ /**
+ * Returns a property (nodeData) of the media Content.
+ * @param media media Content
+ * @param property property name
+ * @return the value of the given nodedata or null if not found
+ */
+ public static Object property(Content media, String property)
+ {
+ try
+ {
+ if (media == null || !media.hasNodeData(property))
+ {
+ return null;
+ }
+ }
+ catch (RepositoryException e)
+ {
+ // return null;
+ }
+
+ return getValueAsObject(media.getNodeData(property).getValue());
+
+ }
+
+ /**
+ * Returns the width of the <strong>original</strong> media, if available.
+ * @param media media Content
+ * @return width of the original media, if available
+ */
+ public static Integer width(Content media)
+ {
+ Long longproperty = (Long) property(media, MediaTypeHandler.METADATA_WIDTH);
+ if (longproperty != null)
+ {
+ return longproperty.intValue();
+ }
+ return null;
+ }
+
+ /**
+ * Returns the height of the <strong>original</strong> media, if available.
+ * @param media media Content
+ * @return height of the original media, if available
+ */
+ public static Integer height(Content media)
+ {
+ Long longproperty = (Long) property(media, MediaTypeHandler.METADATA_HEIGHT);
+ if (longproperty != null)
+ {
+ return longproperty.intValue();
+ }
+ return null;
+ }
+
+ /**
+ * Private method, not an EL function
+ */
+ private static Object getValueAsObject(Value value)
+ {
+ try
+ {
+ switch (value.getType())
+ {
+ case (PropertyType.STRING) :
+ return value.getString();
+ case (PropertyType.DOUBLE) :
+ return value.getDouble();
+ case (PropertyType.LONG) :
+ return value.getLong();
+ case (PropertyType.BOOLEAN) :
+ return value.getBoolean();
+ case (PropertyType.DATE) :
+ return value.getDate();
+ case (PropertyType.BINARY) :
+ // don't return
+ default :
+ return null;
+ }
+ }
+ catch (Exception e)
+ {
+ log.debug("Exception caught: " + e.getMessage(), e);
+ }
+ return null;
+ }
+
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2010-02-13 18:35:26 UTC (rev 1913)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2010-02-13 19:12:05 UTC (rev 1914)
@@ -18,7 +18,7 @@
]]>
</example>
</tag-file>
- <tag-file>
+ <tag-file>
<name>player</name>
<path>/META-INF/tags/media/player.tag</path>
<display-name>Player Tag</display-name>
@@ -42,7 +42,7 @@
<description>Get the media module instance.</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule getModule()</function-signature>
- <display-name>Function module</display-name>
+ <display-name>module</display-name>
<example>
<![CDATA[
<c:set var="player" value="${media:module().player}" />
@@ -54,7 +54,7 @@
<description>Load a node from the media repository, given the UUID of the media node.</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>info.magnolia.cms.core.Content getNode(java.lang.Object)</function-signature>
- <display-name>Function node</display-name>
+ <display-name>node</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -66,7 +66,7 @@
<description>Get the description from a media, given the media node itself.</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getDescription(info.magnolia.cms.core.Content)</function-signature>
- <display-name>Function desc</display-name>
+ <display-name>desc</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -79,7 +79,7 @@
<description>Get the description from a media, given the media node itself and a locale. Try to get the value from nodedata "description-{locale}"; if not found get the value from "description-en"; if not found again, get the value from "description".</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getDescription(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
- <display-name>Function descLoc</display-name>
+ <display-name>descLoc</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -92,7 +92,7 @@
<description>Get the title from a media, given the media node itself.</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getTitle(info.magnolia.cms.core.Content)</function-signature>
- <display-name>Function title</display-name>
+ <display-name>title</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -105,7 +105,7 @@
<description>Get the title from a media, given the media node itself and a locale. Try to get the value from nodedata "title-{locale}"; if not found get the value from "title-en"; if not found again, get the value from "title".</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getTitle(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
- <display-name>Function titleLoc</display-name>
+ <display-name>titleLoc</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -118,7 +118,7 @@
<description>Get the tags from a media, given the media node itself.</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String[] getTags(info.magnolia.cms.core.Content)</function-signature>
- <display-name>Function tags</display-name>
+ <display-name>tags</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -133,7 +133,7 @@
<description>Get the tags from a media, given the media node itself and a locale. Try to get the value from nodedata "tags-{locale}"; if not found get the value from "tags-en"; if not found again, get the value from "tags".</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String[] getTags(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
- <display-name>Function tagsLoc</display-name>
+ <display-name>tagsLoc</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -148,7 +148,7 @@
<description>Get the url to the media, given the media node itself</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getUrl(info.magnolia.cms.core.Content)</function-signature>
- <display-name>Function url</display-name>
+ <display-name>url</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -161,7 +161,7 @@
<description>Get the url to the media, given the media node itself and an options map</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getUrl2(info.magnolia.cms.core.Content, java.util.Map)</function-signature>
- <display-name>Function url2</display-name>
+ <display-name>url2</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -200,7 +200,7 @@
</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getResolutionUrl(info.magnolia.cms.core.Content, java.lang.String)</function-signature>
- <display-name>Function urlres</display-name>
+ <display-name>urlres</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -213,7 +213,7 @@
<description>Get all the resolutions for a given media node.</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String[] listResolutions(info.magnolia.cms.core.Content)</function-signature>
- <display-name>Function resolutions</display-name>
+ <display-name>resolutions</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -228,7 +228,7 @@
<description>Get the url to the thumbnail (l100x100 resolution) for a given media node (image or flv/youtube preview)</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getThumbnail(info.magnolia.cms.core.Content)</function-signature>
- <display-name>Function thumbnail</display-name>
+ <display-name>thumbnail</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -238,10 +238,10 @@
</function>
<function>
<name>preview</name>
- <description>Get the url to the preview (l450x350 resolution) for a given media node (image or flv/youtube preview)</description>
+ <description>Get the url to the preview (l45x350 resolution) for a given media node (image or flv/youtube preview)</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getPreview(info.magnolia.cms.core.Content)</function-signature>
- <display-name>Function preview</display-name>
+ <display-name>preview</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -254,7 +254,7 @@
<description>Get the media type for a given media node</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getType(info.magnolia.cms.core.Content)</function-signature>
- <display-name>Function type</display-name>
+ <display-name>type</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -270,7 +270,7 @@
Parameters are the media node and a resolution. You can use 'original' as resolution to get the size of the original image</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>int[] getSize(info.magnolia.cms.core.Content, java.lang.String)</function-signature>
- <display-name>Function size</display-name>
+ <display-name>size</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -284,7 +284,7 @@
<description>Get list of path to content nodes of website repository in which the given media node is used</description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String[] findMediaUsedInWebPages(info.magnolia.cms.core.Content)</function-signature>
- <display-name>Function usedInWebPages</display-name>
+ <display-name>usedInWebPages</display-name>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
@@ -294,4 +294,25 @@
]]>
</example>
</function>
+ <function>
+ <name>width</name>
+ <description>Returns the width of the *original* media, if available</description>
+ <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
+ <function-signature>java.lang.Integer width(info.magnolia.cms.core.Content)</function-signature>
+ <display-name>width</display-name>
+ </function>
+ <function>
+ <name>height</name>
+ <description>Returns the height of the *original* media, if available</description>
+ <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
+ <function-signature>java.lang.Integer height(info.magnolia.cms.core.Content)</function-signature>
+ <display-name>height</display-name>
+ </function>
+ <function>
+ <name>property</name>
+ <description>Returns a property (nodeData) of the media, given the media Content and the property name</description>
+ <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
+ <function-signature>java.lang.Object property(info.magnolia.cms.core.Content, java.lang.String)</function-signature>
+ <display-name>property</display-name>
+ </function>
</taglib>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-13 20:45:29
|
Revision: 1917
http://openutils.svn.sourceforge.net/openutils/?rev=1917&view=rev
Author: fgiust
Date: 2010-02-13 20:45:12 +0000 (Sat, 13 Feb 2010)
Log Message:
-----------
cleanup images, everything converted to png
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.audio.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.document.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.image.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.video.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.html
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-arrow_right_inactive.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-browse.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-download.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-edit.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-edit_inactive.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-folder.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-link_go.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-search.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-zip.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico24-media-menu.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico24-search.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/thumb-audio.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/thumb-broken.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-audio.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-document.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-image.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-video.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-youtube.png
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/arrow_right_green_inactive.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/audioThumb.jpg
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/brokenThumb.jpg
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/download.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/edit.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/edit_inactive.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/film_inactive.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/folder16.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/image16_inactive.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/link_go.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/pdf.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/photo.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/screensaver.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/search16.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/search24.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/wallpaper.gif
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/youtube.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/zip.gif
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2010-02-13 20:45:12 UTC (rev 1917)
@@ -103,7 +103,7 @@
"/modules/media/mediatypes/youtube",
"menuIcon",
"/.resources/media/icons/film.gif",
- "/.resources/media/icons/youtube.png"));
+ "/.resources/media/icons/type-youtube.png"));
// sort mediatypes on the "order" property
tasks.add(new NodeSortTask("config", "/modules/media/mediatypes", "order"));
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2010-02-13 20:45:12 UTC (rev 1917)
@@ -58,7 +58,7 @@
ContextMenuItem menuNewPage = new ContextMenuItem("newFolder");
menuNewPage.setLabel(msgs.get("tree.config.menu.newFolder")); //$NON-NLS-1$
- menuNewPage.setIcon(request.getContextPath() + "/.resources/media/icons/folder16.gif"); //$NON-NLS-1$
+ menuNewPage.setIcon(request.getContextPath() + "/.resources/media/icons/ico16-folder.png"); //$NON-NLS-1$
menuNewPage.setOnclick(tree.getJavascriptTree()
+ ".createNode('" + MediaConfigurationManager.FOLDER.getSystemName() + "');"); //$NON-NLS-1$ //$NON-NLS-2$
menuNewPage.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotNodeData(" //$NON-NLS-1$
@@ -176,7 +176,7 @@
ContextMenuItem menuLoadZip = new ContextMenuItem("loadzip");
menuLoadZip.setLabel(msgs.get("media.loadzip")); //$NON-NLS-1$
- menuLoadZip.setIcon(request.getContextPath() + "/.resources/media/icons/zip.gif"); //$NON-NLS-1$
+ menuLoadZip.setIcon(request.getContextPath() + "/.resources/media/icons/ico16-zip.png"); //$NON-NLS-1$
menuLoadZip
.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot(" + tree.getJavascriptTree() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
menuLoadZip.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotNodeData(" //$NON-NLS-1$
@@ -248,7 +248,7 @@
{
final Messages msgs = getMessages();
- tree.addItemType(MediaConfigurationManager.FOLDER.getSystemName(), "/.resources/media/icons/folder16.gif");
+ tree.addItemType(MediaConfigurationManager.FOLDER.getSystemName(), "/.resources/media/icons/folder16.png");
TreeColumn column0 = TreeColumn.createLabelColumn(tree, msgs.get("tree.media.folders"), true);
column0.setWidth(3);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java 2010-02-13 20:45:12 UTC (rev 1917)
@@ -35,7 +35,7 @@
*/
public String getThumbnailUrl(Content media)
{
- return "/.resources/media/icons/audioThumb.jpg";
+ return "/.resources/media/icons/thumb-audio.png";
}
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2010-02-13 20:45:12 UTC (rev 1917)
@@ -35,7 +35,7 @@
*/
public String getThumbnailUrl(Content media)
{
- return "/.resources/file-icons/pdf.png";
+ return "/.resources/file-icons/type-document.png";
}
/**
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml 2010-02-13 20:45:12 UTC (rev 1917)
@@ -10,7 +10,7 @@
<sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
</sv:property>
<sv:property sv:name="icon" sv:type="String">
- <sv:value>/.resources/media/icons/icon24.gif</sv:value>
+ <sv:value>/.resources/media/icons/ico24-media-menu.png</sv:value>
</sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>media.menu.title</sv:value>
@@ -55,7 +55,7 @@
<sv:value>359b6b3f-42a9-41fb-b3bf-1eb93d44f0aa</sv:value>
</sv:property>
<sv:property sv:name="icon" sv:type="String">
- <sv:value>/.resources/media/icons/browse16.gif</sv:value>
+ <sv:value>/.resources/media/icons/ico16-browse.png</sv:value>
</sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>media.menu.browse</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.audio.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.audio.xml 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.audio.xml 2010-02-13 20:45:12 UTC (rev 1917)
@@ -28,7 +28,7 @@
<sv:value>audio</sv:value>
</sv:property>
<sv:property sv:name="menuIcon" sv:type="String">
- <sv:value>/.resources/media/icons/audio.gif</sv:value>
+ <sv:value>/.resources/media/icons/type-audio.png</sv:value>
</sv:property>
<sv:property sv:name="order" sv:type="Long">
<sv:value>40</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.document.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.document.xml 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.document.xml 2010-02-13 20:45:12 UTC (rev 1917)
@@ -25,7 +25,7 @@
<sv:value>document</sv:value>
</sv:property>
<sv:property sv:name="menuIcon" sv:type="String">
- <sv:value>/.resources/media/icons/pdf.png</sv:value>
+ <sv:value>/.resources/media/icons/type-document.png</sv:value>
</sv:property>
<sv:property sv:name="order" sv:type="Long">
<sv:value>50</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.image.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.image.xml 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.image.xml 2010-02-13 20:45:12 UTC (rev 1917)
@@ -28,7 +28,7 @@
<sv:value>immagine</sv:value>
</sv:property>
<sv:property sv:name="menuIcon" sv:type="String">
- <sv:value>/.resources/media/icons/image16.gif</sv:value>
+ <sv:value>/.resources/media/icons/type-image.png</sv:value>
</sv:property>
<sv:property sv:name="order" sv:type="Long">
<sv:value>10</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.video.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.video.xml 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.video.xml 2010-02-13 20:45:12 UTC (rev 1917)
@@ -28,7 +28,7 @@
<sv:value>video</sv:value>
</sv:property>
<sv:property sv:name="menuIcon" sv:type="String">
- <sv:value>/.resources/media/icons/film.gif</sv:value>
+ <sv:value>/.resources/media/icons/type-video.png</sv:value>
</sv:property>
<sv:property sv:name="order" sv:type="Long">
<sv:value>20</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.xml 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.xml 2010-02-13 20:45:12 UTC (rev 1917)
@@ -25,7 +25,7 @@
<sv:value>youtube</sv:value>
</sv:property>
<sv:property sv:name="menuIcon" sv:type="String">
- <sv:value>/.resources/media/icons/youtube.png</sv:value>
+ <sv:value>/.resources/media/icons/type-youtube.png</sv:value>
</sv:property>
<sv:property sv:name="order" sv:type="Long">
<sv:value>30</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-13 20:45:12 UTC (rev 1917)
@@ -263,7 +263,7 @@
line-height: 24px;
width: 100%;
padding: 0px 5px 0px 21px;
- background: #4c4c4c url(../icons/link_go.gif) no-repeat left 3px;
+ background: #4c4c4c url(../icons/ico16-link_go.png) no-repeat left 3px;
color: #fff;
text-decoration: none;
}
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/arrow_right_green_inactive.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/audioThumb.jpg
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/brokenThumb.jpg
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/download.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/edit.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/edit_inactive.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/film_inactive.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/folder16.gif
===================================================================
(Binary files differ)
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-arrow_right_inactive.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-arrow_right_inactive.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-browse.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-browse.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-download.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-download.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-edit.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-edit.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-edit_inactive.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-edit_inactive.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-folder.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-folder.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-link_go.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-link_go.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-search.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-search.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-zip.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico16-zip.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico24-media-menu.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico24-media-menu.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico24-search.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ico24-search.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/image16_inactive.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/link_go.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/pdf.png
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/photo.png
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/screensaver.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/search16.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/search24.gif
===================================================================
(Binary files differ)
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/thumb-audio.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/thumb-audio.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/thumb-broken.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/thumb-broken.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-audio.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-audio.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Copied: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-document.png (from rev 1905, trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/pdf.png)
===================================================================
(Binary files differ)
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-image.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-image.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-video.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-video.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Copied: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/type-youtube.png (from rev 1905, trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/youtube.png)
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/wallpaper.gif
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/youtube.png
===================================================================
(Binary files differ)
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/zip.gif
===================================================================
(Binary files differ)
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-13 20:45:12 UTC (rev 1917)
@@ -176,7 +176,7 @@
[#if media.writable]
<li>
<a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="${this.msgs.get('media.edit')}">
- <img src="${this.request.contextPath}/.resources/media/icons/edit.gif" border="0" />
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-edit.png" border="0" />
<span>${this.msgs.get('media.edit')}</span>
</a>
</li>
@@ -201,7 +201,7 @@
[#else]
<li>
<a>
- <img src="${this.request.contextPath}/.resources/media/icons/edit_inactive.gif" border="0" />
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-edit_inactive.png" border="0" />
</a>
</li>
<li>
@@ -223,7 +223,7 @@
[#if !media.external]
<li>
<a href="?command=download&path=${media.handle}">
- <img src="${this.request.contextPath}/.resources/media/icons/download.gif" border="0" />
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-download.png" border="0" />
<span>${this.msgs.get('media.download')}</span>
</a>
</li>
@@ -239,7 +239,7 @@
[#else]
<li>
<a title="${this.msgs.get('media.activate')}" class="disabled">
- <img src="${this.request.contextPath}/.resources/media/icons/arrow_right_green_inactive.gif" border="0" />
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-arrow_right_inactive.png" border="0" />
<span>${this.msgs.get('media.activate')}</span>
</a>
</li>
@@ -271,7 +271,7 @@
[#list media.usedInWebPages as page]
<li>
<a href="${this.request.contextPath}${page}.html" target="_blank">
- <img src="${this.request.contextPath}/.resources/media/icons/link_go.gif" border="0" />
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-link_go.png" border="0" />
<span>${page}</span>
</a>
</li>
@@ -290,7 +290,7 @@
<a id="mb${index}" class="multibox" href="${url}">
[#assign thumbnailPath = media.thumbnailUrl]
[#if thumbnailPath == '']
- [#assign thumbnailPath = "/.resources/media/icons/brokenThumb.jpg"]
+ [#assign thumbnailPath = "/.resources/media/icons/thumb-broken.png"]
[/#if]
<img src="${this.request.contextPath}${thumbnailPath}" border="0" alt="${media.description!""}" />
</a>
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.html 2010-02-13 19:40:17 UTC (rev 1916)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.html 2010-02-13 20:45:12 UTC (rev 1917)
@@ -159,7 +159,7 @@
<#else>
<#if this.writable>
<a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="modifica">
- <img src="${this.request.contextPath}/.resources/media/icons/edit.gif" border="0" align="middle" />
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-edit.png" border="0" align="middle" />
</a>
<a href="javascript:$empty()" onclick="deleteMedia('${media.handle}')" title="elimina">
<img src="${this.request.contextPath}/.resources/icons/16/delete2.gif" border="0" align="middle" />
@@ -172,7 +172,7 @@
</a>
<#else>
<a>
- <img src="${this.request.contextPath}/.resources/media/icons/edit_inactive.gif" border="0" align="middle" />
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-edit_inactive.png" border="0" align="middle" />
</a>
<a>
<img src="${this.request.contextPath}/.resources/icons/16/delete2_inactive.gif" border="0" align="middle" />
@@ -190,7 +190,7 @@
</a>
<#else>
<a title="pubblica">
- <img src="${this.request.contextPath}/.resources/media/icons/arrow_right_green_inactive.gif" border="0"
+ <img src="${this.request.contextPath}/.resources/media/icons/ico16-arrow_right_inactive.png" border="0"
align="middle" />
</a>
</#if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-13 21:00:06
|
Revision: 1918
http://openutils.svn.sourceforge.net/openutils/?rev=1918&view=rev
Author: fgiust
Date: 2010-02-13 20:59:55 +0000 (Sat, 13 Feb 2010)
Log Message:
-----------
a few better images
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/thumb-audio.png
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/thumb-document.png
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2010-02-13 20:45:12 UTC (rev 1917)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2010-02-13 20:59:55 UTC (rev 1918)
@@ -248,7 +248,7 @@
{
final Messages msgs = getMessages();
- tree.addItemType(MediaConfigurationManager.FOLDER.getSystemName(), "/.resources/media/icons/folder16.png");
+ tree.addItemType(MediaConfigurationManager.FOLDER.getSystemName(), "/.resources/media/icons/ico16-folder.png");
TreeColumn column0 = TreeColumn.createLabelColumn(tree, msgs.get("tree.media.folders"), true);
column0.setWidth(3);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2010-02-13 20:45:12 UTC (rev 1917)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2010-02-13 20:59:55 UTC (rev 1918)
@@ -35,7 +35,7 @@
*/
public String getThumbnailUrl(Content media)
{
- return "/.resources/file-icons/type-document.png";
+ return "/.resources/media/icons/thumb-document.png";
}
/**
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/thumb-audio.png
===================================================================
(Binary files differ)
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/thumb-document.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/thumb-document.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-14 19:35:56
|
Revision: 1927
http://openutils.svn.sourceforge.net/openutils/?rev=1927&view=rev
Author: fgiust
Date: 2010-02-14 19:35:48 +0000 (Sun, 14 Feb 2010)
Log Message:
-----------
MEDIA-98 Parsing of flv metadata for external videos only works for youtube
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
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
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/ExternalVideoSupport.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/YoutubeSupport.java
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/ExternalVideoSupport.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/ExternalVideoSupport.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/ExternalVideoSupport.java 2010-02-14 19:35:48 UTC (rev 1927)
@@ -0,0 +1,36 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.media.types.externals;
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public interface ExternalVideoSupport
+{
+
+ boolean canHandle(String url);
+
+ String getFlvUrl(String shareUrl);
+
+ String getPreviewUrl(String shareUrl);
+
+ String getMediaName(String shareUrl);
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/ExternalVideoSupport.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/YoutubeSupport.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/YoutubeSupport.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/YoutubeSupport.java 2010-02-14 19:35:48 UTC (rev 1927)
@@ -0,0 +1,119 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.media.types.externals;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class YoutubeSupport implements ExternalVideoSupport
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(YoutubeSupport.class);
+
+ public boolean canHandle(String url)
+ {
+ return StringUtils.startsWith(url, "http://www.youtube");
+ }
+
+ public String getFlvUrl(String shareUrl)
+ {
+ String flvUrl = null;
+ BufferedReader in = null;
+ try
+ {
+ String videoId = getVideoId(StringUtils.substringAfter(shareUrl, "?"));
+ String videoInfoUrl = "http://www.youtube.com/get_video_info?video_id=" + videoId;
+ URL url = new URL(videoInfoUrl);
+ HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();
+ if (httpConn.getResponseCode() == 200)
+ {
+ in = new BufferedReader(new InputStreamReader(httpConn.getInputStream()));
+ String line;
+ String search = "&token=";
+ while ((line = in.readLine()) != null)
+ {
+ int p = line.indexOf(search);
+ if (p != -1)
+ {
+ String token = StringUtils.substringBefore(line.substring(p + search.length()), "&");
+ flvUrl = "http://www.youtube.com/get_video?fmt=5&video_id=" + videoId + "&t=" + token;
+ break;
+ }
+ }
+ }
+ }
+ catch (MalformedURLException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ catch (IOException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ finally
+ {
+ IOUtils.closeQuietly(in);
+ }
+ return flvUrl;
+ }
+
+ public String getPreviewUrl(String shareUrl)
+ {
+ return "http://img.youtube.com/vi/" + getVideoId(shareUrl) + "/0.jpg";
+ }
+
+ private String getVideoId(String shareUrl)
+ {
+ for (String att : StringUtils.split(StringUtils.substringAfter(shareUrl, "?"), "&"))
+ {
+ if (att.startsWith("v="))
+ {
+ return StringUtils.substringAfter(att, "v=");
+ }
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getMediaName(String shareUrl)
+ {
+ return getVideoId(shareUrl);
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/YoutubeSupport.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2010-02-14 18:49:18 UTC (rev 1926)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2010-02-14 19:35:48 UTC (rev 1927)
@@ -98,6 +98,12 @@
info.put(METADATA_DURATION, MediaMetadataFormatUtils.formatDuration(duration));
}
+ long framerate = media.getNodeData(METADATA_FRAMERATE).getLong();
+ if (framerate > 0)
+ {
+ info.put(METADATA_FRAMERATE, Long.toString(framerate));
+ }
+
return info;
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java 2010-02-14 18:49:18 UTC (rev 1926)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java 2010-02-14 19:35:48 UTC (rev 1927)
@@ -22,12 +22,7 @@
import info.magnolia.cms.beans.runtime.MultipartForm;
import info.magnolia.cms.core.Content;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
import java.util.UUID;
@@ -36,10 +31,12 @@
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
+import net.sourceforge.openutils.mgnlmedia.media.types.externals.ExternalVideoSupport;
+import net.sourceforge.openutils.mgnlmedia.media.types.externals.YoutubeSupport;
import net.sourceforge.openutils.mgnlmedia.media.utils.FLVMedataUtils;
import net.sourceforge.openutils.mgnlmedia.media.utils.FLVMedataUtils.FLVMetaData;
-import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.ClassUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,6 +56,11 @@
private final Logger log = LoggerFactory.getLogger(ExternalVideoTypeHandler.class);
/**
+ * External video support, will be made configurable in future versions.
+ */
+ private ExternalVideoSupport[] videoSupportHandlers = new ExternalVideoSupport[]{new YoutubeSupport() };
+
+ /**
* {@inheritDoc}
*/
@Override
@@ -98,108 +100,75 @@
@Override
public String getNewNodeName(MultipartForm form, HttpServletRequest request)
{
- String videoUrl = request.getParameter("videoUrl");
- String id = UUID.randomUUID().toString();
- URL url;
+ String videoUrl = StringUtils.lowerCase(request.getParameter("videoUrl"));
+ String nodeName = null;
- // todo: this is specific for youtube, check vimeo or blip.tv
- try
+ for (ExternalVideoSupport external : videoSupportHandlers)
{
- url = new URL(videoUrl);
- String query = url.getQuery();
- if (query != null)
+ if (external.canHandle(videoUrl))
{
- String videoId = getVideoId(url.getQuery());
- if (videoId != null)
+ nodeName = external.getMediaName(videoUrl);
+ break;
+ }
+ }
+
+ if (StringUtils.isEmpty(nodeName))
+ {
+ if (StringUtils.contains(videoUrl, ".flv"))
+ {
+ nodeName = StringUtils.substringBefore(videoUrl, ".flv");
+ if (StringUtils.contains(nodeName, "/"))
{
- id = videoId;
+ nodeName = StringUtils.substringBeforeLast(nodeName, "/");
}
+ if (StringUtils.contains(nodeName, "="))
+ {
+ nodeName = StringUtils.substringBeforeLast(nodeName, "=");
+ }
}
else
{
- id = StringUtils.substringAfterLast(videoUrl, "/");
+ nodeName = StringUtils.substringBefore(StringUtils.substringAfterLast(videoUrl, "/"), "?");
+
}
}
- catch (MalformedURLException e)
+
+ if (StringUtils.isEmpty(nodeName))
{
- log.error("Error parsing external video url", e);
+ nodeName = UUID.randomUUID().toString();
}
- return id;
+ return nodeName;
}
- private String getVideoId(String queryString)
+ @Override
+ protected FLVMetaData parseFLVMetaData(Content media) throws Exception
{
- for (String att : StringUtils.split(queryString, "&"))
+ String downloadUrl = getUrl(media);
+ for (ExternalVideoSupport external : videoSupportHandlers)
{
- if (att.startsWith("v="))
+ if (external.canHandle(downloadUrl))
{
- return StringUtils.substringAfter(att, "v=");
+ downloadUrl = external.getFlvUrl(downloadUrl);
+ break;
}
}
- return null;
- }
- @Override
- protected FLVMetaData parseFLVMetaData(Content media) throws Exception
- {
- String downloadUrl = determineFLVurl(media);
- if (downloadUrl == null)
- {
- return null;
- }
- return FLVMedataUtils.parseFLVfromUrl(new URL(downloadUrl));
- }
-
- private String determineFLVurl(Content media)
- {
- // todo: this is specific for youtube, check vimeo or blip.tv
- return determineFLVurlForYoutube(media);
- }
-
- private String determineFLVurlForYoutube(Content media)
- {
- String flvUrl = null;
- BufferedReader in = null;
try
{
- String videoUrl = getUrl(media);
- String videoId = getVideoId(StringUtils.substringAfter(videoUrl, "?"));
- String videoInfoUrl = "http://www.youtube.com/get_video_info?video_id=" + videoId;
- URL url = new URL(videoInfoUrl);
- HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();
- if (httpConn.getResponseCode() == 200)
- {
- in = new BufferedReader(new InputStreamReader(httpConn.getInputStream()));
- String line;
- String search = "&token=";
- while ((line = in.readLine()) != null)
- {
- int p = line.indexOf(search);
- if (p != -1)
- {
- String token = StringUtils.substringBefore(line.substring(p + search.length()), "&");
- flvUrl = "http://www.youtube.com/get_video?fmt=5&video_id="
- + videoId
- + "&t="
- + token;
- break;
- }
- }
- }
+ URL url = new URL(downloadUrl);
+ return FLVMedataUtils.parseFLVfromUrl(url);
}
- catch (MalformedURLException e)
+ catch (Throwable e)
{
- log.error(e.getMessage(), e);
+ log.warn("Got a "
+ + ClassUtils.getShortClassName(e.getClass())
+ + " ("
+ + e.getMessage()
+ + ") while parsing URL "
+ + downloadUrl);
+ return null;
}
- catch (IOException e)
- {
- log.error(e.getMessage(), e);
- }
- finally
- {
- IOUtils.closeQuietly(in);
- }
- return flvUrl;
}
+
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2010-02-14 18:49:18 UTC (rev 1926)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2010-02-14 19:35:48 UTC (rev 1927)
@@ -17,19 +17,19 @@
<sv:value>true</sv:value>
</sv:property>
<sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>admin</sv:value>
+ <sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-07-02T12:46:12.918Z</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2009-12-30T16:29:28.741+01:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2009-12-30T16:29:28.741+01:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="bliptv">
@@ -48,6 +48,21 @@
<sv:property sv:name="description" sv:type="String">
<sv:value>External video sample, loaded from blip.tv</sv:value>
</sv:property>
+ <sv:property sv:name="media_duration" sv:type="Long">
+ <sv:value>71</sv:value>
+ </sv:property>
+ <sv:property sv:name="media_extension" sv:type="String">
+ <sv:value>flv</sv:value>
+ </sv:property>
+ <sv:property sv:name="media_framerate" sv:type="Double">
+ <sv:value>15.0</sv:value>
+ </sv:property>
+ <sv:property sv:name="media_height" sv:type="Long">
+ <sv:value>480</sv:value>
+ </sv:property>
+ <sv:property sv:name="media_width" sv:type="Double">
+ <sv:value>640.0</sv:value>
+ </sv:property>
<sv:property sv:name="tags" sv:type="String">
<sv:value>simple media, youtube</sv:value>
</sv:property>
@@ -64,18 +79,24 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2009-09-09T12:31:44.752+02:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-13T15:02:44.263+01:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value/>
- </sv:property>
</sv:node>
<sv:node sv:name="image">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -152,23 +173,20 @@
<sv:value>true</sv:value>
</sv:property>
<sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>admin</sv:value>
+ <sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-07-21T13:43:14.610+02:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-08-13T11:06:12.478+02:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-13T15:02:25.579+01:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value/>
- </sv:property>
</sv:node>
<sv:node sv:name="original">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -236,23 +254,20 @@
<sv:value>true</sv:value>
</sv:property>
<sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>admin</sv:value>
+ <sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-07-02T17:20:58.260Z</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-08-13T11:04:49.939+02:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-13T15:02:52.017+01:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value/>
- </sv:property>
</sv:node>
<sv:node sv:name="original">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -328,18 +343,24 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2009-12-30T17:19:47.747+01:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-13T15:02:35.034+01:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value/>
- </sv:property>
</sv:node>
<sv:node sv:name="original">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -429,18 +450,24 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-13T15:03:24.073+01:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-13T15:03:24.078+01:00</sv:value>
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value/>
- </sv:property>
</sv:node>
<sv:node sv:name="original">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
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 2010-02-14 18:49:18 UTC (rev 1926)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-14 19:35:48 UTC (rev 1927)
@@ -93,7 +93,7 @@
media.info.media_height=Height: {0}px
media.info.media_bitdepth=Bit depth: {0}
media.info.media_duration=Duration: {0}
-media.info.media_framerate=Frame rate: {0}
+media.info.media_framerate=Frame rate: {0} fps
media.bgselector.white=White
media.bgselector.transparent=Transparent
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-02-14 18:49:18 UTC (rev 1926)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-14 19:35:48 UTC (rev 1927)
@@ -95,7 +95,7 @@
media.info.media_height=Altezza: {0}px
media.info.media_bitdepth=Profondit\u00E0 di colore: {0}
media.info.media_duration=Durata: {0}
-media.info.media_framerate=Frame rate: {0}
+media.info.media_framerate=Frame rate: {0} fps
media.bgselector.white=Bianco
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-18 15:09:45
|
Revision: 1989
http://openutils.svn.sourceforge.net/openutils/?rev=1989&view=rev
Author: diego_schivo
Date: 2010-02-18 15:09:38 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
MEDIA-100 displaying saved width/height values in dialog
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2010-02-18 14:39:49 UTC (rev 1988)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2010-02-18 15:09:38 UTC (rev 1989)
@@ -78,6 +78,10 @@
private Map configuration;
+ private Long width;
+
+ private Long height;
+
/**
* {@inheritDoc}
*/
@@ -186,6 +190,11 @@
parameters.put("reqGet", new RequestGetAttribute());
parameters.put("reqSet", new RequestSetAttribute());
parameters.put("msgs", this.getMessages());
+ if ("true".equals(this.getConfigValue("resizing")))
+ {
+ parameters.put("width", this.getWidth());
+ parameters.put("height", this.getHeight());
+ }
this.drawHtmlPre(out);
try
@@ -296,6 +305,32 @@
}
}
+ public Long getWidth()
+ {
+ if (width == null)
+ {
+ if (getStorageNode() != null)
+ {
+ long w = NodeDataUtil.getLong(getStorageNode(), getName() + "_width", -1);
+ width = w >= 0 ? w : null;
+ }
+ }
+ return width;
+ }
+
+ public Long getHeight()
+ {
+ if (height == null)
+ {
+ if (getStorageNode() != null)
+ {
+ long h = NodeDataUtil.getLong(getStorageNode(), getName() + "_height", -1);
+ height = h >= 0 ? h : null;
+ }
+ }
+ return height;
+ }
+
/**
* Freemarker method for setting request attributes
* @author molaschi
Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-02-18 14:39:49 UTC (rev 1988)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-02-18 15:09:38 UTC (rev 1989)
@@ -67,13 +67,13 @@
<tr>
<td class="mgnlDialogBoxLabel">Width</td>
<td class="mgnlDialogBoxInput">
- <input type="text" style="width: 60px;" class="mgnlDialogControlEdit" value="" id="${name}_width" name="${name}_width">
+ <input type="text" id="${name}_width" name="${name}_width" value="${width!''}" class="mgnlDialogControlEdit" style="width: 60px;">
</td>
</tr>
<tr>
<td class="mgnlDialogBoxLabel">Height</td>
<td class="mgnlDialogBoxInput">
- <input type="text" style="width: 60px;" class="mgnlDialogControlEdit" value="" id="${name}_height" name="${name}_height">
+ <input type="text" id="${name}_height" name="${name}_height" value="${height!''}" class="mgnlDialogControlEdit" style="width: 60px;">
</td>
</tr>
</tbody>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-19 17:54:03
|
Revision: 2012
http://openutils.svn.sourceforge.net/openutils/?rev=2012&view=rev
Author: diego_schivo
Date: 2010-02-19 17:53:57 +0000 (Fri, 19 Feb 2010)
Log Message:
-----------
MEDIA-105 i18n
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
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/playlist/pages/PlaylistView.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java 2010-02-19 17:43:38 UTC (rev 2011)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java 2010-02-19 17:53:57 UTC (rev 2012)
@@ -44,7 +44,7 @@
+ ")");
ContextMenuItem menuNewPlaylist = new ContextMenuItem("newPlaylist"); //$NON-NLS-1$
- menuNewPlaylist.setLabel("New playlist");
+ menuNewPlaylist.setLabel(msgs.get("tree.playlists.new"));
menuNewPlaylist.setIcon(request.getContextPath() + "/.resources/media/icons/ico16-playlist.png"); //$NON-NLS-1$
menuNewPlaylist.setOnclick(tree.getJavascriptTree()
+ ".createNode('" + PlaylistConstants.PLAYLIST.getSystemName() + "');"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -167,7 +167,7 @@
PlaylistConstants.PLAYLIST.getSystemName(),
"/.resources/media/icons/ico16-playlist.png");
- TreeColumn column0 = TreeColumn.createLabelColumn(tree, "Playlists", true);
+ TreeColumn column0 = TreeColumn.createLabelColumn(tree, msgs.get("tree.playlists.column"), true);
column0.setWidth(3);
tree.addColumn(column0);
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-02-19 17:43:38 UTC (rev 2011)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-02-19 17:53:57 UTC (rev 2012)
@@ -32,7 +32,7 @@
var tbar = [
{
- text: 'Add entry',
+ text: playlist.msgs.addEntry,
icon: contextPath + '/.resources/media/icons/ico16-add.png',
iconCls: 'button-add',
handler: function(){
@@ -41,7 +41,7 @@
},
{
id: 'removeEntryBtn',
- text: 'Remove entry',
+ text: playlist.msgs.removeEntry,
icon: contextPath + '/.resources/media/icons/ico16-remove.png',
iconCls: 'button-remove',
disabled: true,
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 2010-02-19 17:43:38 UTC (rev 2011)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-02-19 17:53:57 UTC (rev 2012)
@@ -103,3 +103,7 @@
stk.dam.mediauuid.label=Select media
tree.playlists=Playlists tree
+tree.playlists.new=New playlist
+tree.playlists.column=Playlists
+playlist.entries.add=Add entry
+playlist.entries.remove=Remove entry
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-02-19 17:43:38 UTC (rev 2011)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-02-19 17:53:57 UTC (rev 2012)
@@ -106,3 +106,7 @@
stk.dam.mediauuid.label=Seleziona media
tree.playlists=Alberatura playlist
+tree.playlists.new=Nuova playlist
+tree.playlists.column=Playlists
+playlist.entries.add=Aggiungi elemento
+playlist.entries.remove=Rimuovi elemento
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2010-02-19 17:43:38 UTC (rev 2011)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2010-02-19 17:53:57 UTC (rev 2012)
@@ -29,7 +29,11 @@
'${entry.handle}'
][#if entry_has_next],[/#if]
[/#list]
- ]
+ ],
+ msgs: {
+ addEntry: '${this.msgs.get('playlist.entries.add')?js_string}',
+ removeEntry: '${this.msgs.get('playlist.entries.remove')?js_string}',
+ }
});
[/#if]
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-22 10:32:20
|
Revision: 2022
http://openutils.svn.sourceforge.net/openutils/?rev=2022&view=rev
Author: diego_schivo
Date: 2010-02-22 10:32:13 +0000 (Mon, 22 Feb 2010)
Log Message:
-----------
MEDIA-105 open the media selector directly.
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java 2010-02-20 20:48:00 UTC (rev 2021)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java 2010-02-22 10:32:13 UTC (rev 2022)
@@ -69,30 +69,6 @@
* {@inheritDoc}
*/
@Override
- public void renderHtml(String view) throws IOException
- {
- if (VIEW_CLOSE_WINDOW.equals(view))
- {
- PrintWriter out = this.getResponse().getWriter();
- out.write("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" ");
- out.write(" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n");
- out.println("<html>"); //$NON-NLS-1$
- out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs());
- out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$
- out.println("parent.openPlaylist('" + path + "');");
- out.println("parent.closeLayer();"); //$NON-NLS-1$
- out.println("</script></html>"); //$NON-NLS-1$
- }
- else
- {
- super.renderHtml(view);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
protected void configureSaveHandler(SaveHandler saveHandler)
{
super.configureSaveHandler(saveHandler);
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-02-20 20:48:00 UTC (rev 2021)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/playlist-view.js 2010-02-22 10:32:13 UTC (rev 2022)
@@ -36,7 +36,24 @@
icon: contextPath + '/.resources/media/icons/ico16-add.png',
iconCls: 'button-add',
handler: function(){
- parent.openWindow('.magnolia/dialogs/playlistentry.html?mgnlPath=' + playlist.handle + '&mgnlRepository=playlists');
+ //parent.openWindow('.magnolia/dialogs/playlistentry.html?mgnlPath=' + playlist.handle + '&mgnlRepository=playlists');
+ var mgnlWin = parent.parent;
+ mgnlWin.setNewMedia = function(nodeid, uuid, file, thumb){
+ Ext.Ajax.request({
+ form: 'addEntryForm',
+ params: {
+ mgnlPath: playlist.handle,
+ media: uuid
+ },
+ success: function(){
+ parent.openPlaylist(playlist.handle);
+ },
+ failure: function(){
+ // todo
+ }
+ });
+ };
+ mgnlWin.mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=media&selectMedia=true&mgnlCK=' + mgnlWin.mgnlGetCacheKiller(), 800, 500);
}
},
{
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2010-02-20 20:48:00 UTC (rev 2021)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2010-02-22 10:32:13 UTC (rev 2022)
@@ -41,5 +41,14 @@
</script>
</head>
<body>
+ <div style="display: none;">
+ <form id="addEntryForm" method="POST" action="${this.request.contextPath}/.magnolia/dialogs/playlistentry.html" enctype="multipart/form-data">
+ <input type="hidden" name="mgnlDialog" value="playlistentry" />
+ <input type="hidden" name="mgnlRepository" value="playlists" />
+ <input type="hidden" name="mgnlSaveInfo" value="media,String,0,0,0" />
+ <input type="hidden" name="media_saveHandler" value="net.sourceforge.openutils.mgnlmedia.media.save.MediaCustomSaveHandler" />
+ <input type="hidden" name="media_configNode" value="/modules/media/dialogs/playlistentry/tabGeneral/media" />
+ </form>
+ </div>
</body>
</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-23 17:37:08
|
Revision: 2044
http://openutils.svn.sourceforge.net/openutils/?rev=2044&view=rev
Author: fgiust
Date: 2010-02-23 17:36:59 +0000 (Tue, 23 Feb 2010)
Log Message:
-----------
MEDIA-116 use the media title for the tooltip
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2010-02-23 15:33:06 UTC (rev 2043)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2010-02-23 17:36:59 UTC (rev 2044)
@@ -39,6 +39,8 @@
private String filename;
+ private String title;
+
private String description;
private String thumbnailUrl;
@@ -286,4 +288,22 @@
{
this.external = external;
}
+
+ /**
+ * Returns the title.
+ * @return the title
+ */
+ public String getTitle()
+ {
+ return title;
+ }
+
+ /**
+ * Sets the title.
+ * @param title the title to set
+ */
+ public void setTitle(String title)
+ {
+ this.title = title;
+ }
}
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-02-23 15:33:06 UTC (rev 2043)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-02-23 17:36:59 UTC (rev 2044)
@@ -254,7 +254,7 @@
mb.setMetaData(media.getMetaData());
mb.setHandle(media.getHandle());
mb.setFilename(mtc.getHandler().getFilename(media));
- mb.setDescription(mtc.getHandler().getDescription(media));
+ mb.setTitle(mtc.getHandler().getTitle(media));
mb.setThumbnailUrl(mtc.getHandler().getThumbnailUrl(media));
mb.setPreviewUrl(mtc.getHandler().getPreviewUrl(media));
mb.setDescription(mtc.getHandler().getDescription(media));
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-23 15:33:06 UTC (rev 2043)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-23 17:36:59 UTC (rev 2044)
@@ -308,7 +308,7 @@
<img src="${this.request.contextPath}${thumbnailPath}" border="0" alt="${media.description!""}" />
</a>
<div class="details">
- <h4>${media.description!""}</h4>
+ <h4>${media.title!""}</h4>
[#list media.mediaInfo?keys as key]
${this.getMessage("media.info.${key}", media.mediaInfo[key])}<br/>
[/#list]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2010-03-18 10:01:45
|
Revision: 2149
http://openutils.svn.sourceforge.net/openutils/?rev=2149&view=rev
Author: cstrap
Date: 2010-03-18 10:01:38 +0000 (Thu, 18 Mar 2010)
Log Message:
-----------
MEDIA-121 Added displayUUID control in dialog
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.common.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.controls.displayUUID.xml
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java 2010-03-18 10:01:38 UTC (rev 2149)
@@ -0,0 +1,45 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
+import info.magnolia.cms.gui.dialog.DialogStatic;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author cstrappazzon
+ * @version $Id$
+ */
+public class DisplayUUID extends DialogStatic
+{
+
+ @Override
+ protected String readValue()
+ {
+ if (StringUtils.equals(this.getName(), "displayUUID"))
+ {
+ return this.getStorageNode().getUUID();
+ }
+
+ return "";
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.controls.displayUUID.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.controls.displayUUID.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.controls.displayUUID.xml 2010-03-18 10:01:38 UTC (rev 2149)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="displayUUID" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d2228600-7918-46b1-b460-fc462ee2a5c7</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.DisplayUUID</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-06-26T16:13:12.696Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-26T16:13:35.061Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-18T10:40:06.055+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.controls.displayUUID.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.common.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.common.xml 2010-03-12 13:29:44 UTC (rev 2148)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.dialogs.common.xml 2010-03-18 10:01:38 UTC (rev 2149)
@@ -421,5 +421,48 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="displayUUID">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>1519f4fa-43df-4736-afab-cbefa8828f8e</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>displayUUID</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>UUID</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-21T10:33:05.445Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-18T10:30:43.186+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-05-02 18:07:17
|
Revision: 2332
http://openutils.svn.sourceforge.net/openutils/?rev=2332&view=rev
Author: fgiust
Date: 2010-05-02 18:07:10 +0000 (Sun, 02 May 2010)
Log Message:
-----------
MEDIA-113 first step: don't try to print out the content of an existing binary nodedata
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2010-05-02 17:30:21 UTC (rev 2331)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2010-05-02 18:07:10 UTC (rev 2332)
@@ -32,6 +32,7 @@
import java.util.Map;
import javax.jcr.PathNotFoundException;
+import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -60,8 +61,6 @@
*/
private Logger log = LoggerFactory.getLogger(DialogSelectMedia.class);
- private Content media;
-
private Long width;
private Long height;
@@ -118,12 +117,39 @@
* {@inheritDoc}
*/
@Override
- protected void addToParameters(Map parameters)
+ protected void addToParameters(Map<String, Object> parameters)
{
+ Content media = null;
- parameters.put("thumbnailUrl", this.getThumbnailUrl());
+ NodeData nd = null;
+ if (getStorageNode() != null)
+ {
+ nd = getStorageNode().getNodeData(this.getName());
+ }
+
+ if (nd != null && nd.getType() == PropertyType.BINARY)
+ {
+ parameters.put("binaryfield", true);
+ }
+ else
+ {
+ if (this.getValue() != null && this.getValue().length() > 0)
+ {
+ try
+ {
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
+ media = hm.getContentByUUID(this.getValue());
+ }
+ catch (RepositoryException ex)
+ {
+ log.error("Error retriving media {}", value, ex);
+ }
+ }
+ }
+
+ parameters.put("thumbnailUrl", this.getThumbnailUrl(media));
parameters.put("msgs", this.getMessages());
- parameters.put("filename", this.getFilename());
+ parameters.put("filename", this.getFilename(media));
if ("true".equals(this.getConfigValue("resizing")))
{
@@ -154,32 +180,22 @@
*/
protected Content getMedia() throws RepositoryException
{
- if (this.media == null && this.getValue() != null && this.getValue().length() > 0)
+ if (this.getValue() != null && this.getValue().length() > 0)
{
HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
- this.media = hm.getContentByUUID(this.getValue());
+ return hm.getContentByUUID(this.getValue());
}
- return this.media;
+ return null;
}
/**
* get thumbnail url
+ * @param media
* @return thumbnail url
*/
- public String getThumbnailUrl()
+ public String getThumbnailUrl(Content media)
{
- Content media;
- try
- {
- media = getMedia();
- }
- catch (RepositoryException ex)
- {
- log.error("Error retriving media {}", value, ex);
- return null;
- }
-
if (media != null)
{
MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(
@@ -194,22 +210,12 @@
/**
* Filename
+ * @param media2
* @return filename
*/
- public String getFilename()
+ public String getFilename(Content media)
{
- Content media;
- try
- {
- media = getMedia();
- }
- catch (RepositoryException ex)
- {
- log.error("Error retriving media {}", value, ex);
- return null;
- }
-
if (media != null)
{
MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-05-02 17:30:21 UTC (rev 2331)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2010-05-02 18:07:10 UTC (rev 2332)
@@ -30,12 +30,7 @@
<jsp:directive.attribute name="videoImagePreview" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true, the tag will not insert the player for videos but only a preview image. For videos or mp3s it needs the following scripts loaded in page: <ul><li>.resources/media/js/mootools-1.2-core.js</li><li>.resources/media/js/mootools-1.2-more.js</li><li>.resources/media/js/mootools-1.2-swfobject.js</li></ul>"/>
<jsp:directive.attribute name="controlbar" required="false" rtexprvalue="true" type="java.lang.String" description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default." />
<jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the pluging share-1 is show"/>
-
-
-
-_${item.class.name}_
-
-
+
<c:if test="${empty item}">
<c:if test="${empty node}">
<c:set var="node" value="${content}" />
Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-05-02 17:30:21 UTC (rev 2331)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-05-02 18:07:10 UTC (rev 2332)
@@ -34,8 +34,16 @@
}
</script>
[/#if]
-<input type="hidden" id="${name}" name="${name}" value="${value}" />
-[#if value?exists && value?length > 0]
+
+
+[#if !binaryfield]
+ [#assign valuemediacontent = value!'null']
+[#else]
+ [#assign valuemediacontent = '']
+[/#if]
+
+<input type="hidden" id="${name}" name="${name}" value="${valuemediacontent}" />
+[#if !binaryfield && value?exists && value?length > 0]
[#assign dispRem = "block"]
[#assign dispSel = "none"]
[#else]
@@ -43,12 +51,21 @@
[#assign dispSel = "block"]
[/#if]
<div id="dispRem${name}" style="display:${dispRem}">
- <div><a href="#" onclick="selectMedia('${name}', '${value!'null'}', '${configuration['mediaType']!'null'}')" title="Seleziona media">
+
+
+
+ <div><a href="#" onclick="selectMedia('${name}', '${valuemediacontent}', '${configuration['mediaType']!'null'}')" title="Select media">
<img id="dispRem${name}Img" src="${thumbnailUrl!''}" border="0" />
</a>
</div>
- <div id="dispRem${name}Txt" ><a href="#" onclick="selectMedia('${name}', '${value!'null'}', '${configuration['mediaType']!'null'}')" title="Seleziona media">${filename!''}</a></div>
- <div>
+ <div id="dispRem${name}Txt" >
+ <a href="#" onclick="selectMedia('${name}', '${valuemediacontent}', '${configuration['mediaType']!'null'}')" title="Seleziona media">${filename!''}</a></div>
+ <div>
+
+
+
+
+
<span class="mgnlControlButton" onclick="mgnlShiftPushButtonClick(this);removeMedia('${name}');"
onmouseout="mgnlShiftPushButtonOut(this);" onmousedown="mgnlShiftPushButtonDown(this);" style="">
${msgs.get("media.remove")}
@@ -79,7 +96,7 @@
</div>
</div>
<div id="dispSel${name}" style="display:${dispSel}">
- <span class="mgnlControlButton" onclick="mgnlShiftPushButtonClick(this);selectMedia('${name}', '${value!'null'}', '${configuration['mediaType']!'null'}');"
+ <span class="mgnlControlButton" onclick="mgnlShiftPushButtonClick(this);selectMedia('${name}', '${valuemediacontent}', '${configuration['mediaType']!'null'}');"
onmouseout="mgnlShiftPushButtonOut(this);" onmousedown="mgnlShiftPushButtonDown(this);" style="">
${msgs.get("media.select")}
</span>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-05-03 10:06:42
|
Revision: 2342
http://openutils.svn.sourceforge.net/openutils/?rev=2342&view=rev
Author: fgiust
Date: 2010-05-03 10:06:36 +0000 (Mon, 03 May 2010)
Log Message:
-----------
MEDIA-113 (support old binary nodedatas) + layour of the mediaSelection dialog
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2010-05-03 10:06:03 UTC (rev 2341)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2010-05-03 10:06:36 UTC (rev 2342)
@@ -148,9 +148,9 @@
}
}
- parameters.put("thumbnailUrl", this.getThumbnailUrl(media));
+ parameters.put("thumbnailUrl", this.getThumbnailUrl(media, nd));
parameters.put("msgs", this.getMessages());
- parameters.put("filename", this.getFilename(media));
+ parameters.put("filename", this.getFilename(media, nd));
if ("true".equals(this.getConfigValue("resizing")))
{
@@ -192,21 +192,26 @@
/**
* get thumbnail url
* @param media
+ * @param nd
* @return thumbnail url
*/
- public String getThumbnailUrl(Content media)
+ public String getThumbnailUrl(Content media, NodeData nd)
{
+ if (nd != null && nd.getType() == PropertyType.BINARY)
+ {
+ return new FileProperties(getStorageNode(), this.getName()).getProperty(FileProperties.PATH);
+ }
+
if (media != null)
{
MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(
media);
return this.getRequest().getContextPath() + mtc.getHandler().getThumbnailUrl(media);
}
- else
- {
- return null;
- }
+
+ return null;
+
}
/**
@@ -224,7 +229,7 @@
if (nd != null && nd.getType() == PropertyType.BINARY)
{
- return nd.getAttribute(FileProperties.NAME);
+ return new FileProperties(getStorageNode(), this.getName()).getProperty(FileProperties.PATH);
}
return super.getValue();
@@ -232,22 +237,29 @@
/**
* Filename
+ * @param nd
* @param media2
* @return filename
*/
- public String getFilename(Content media)
+ public String getFilename(Content media, NodeData nd)
{
+ if (nd != null && nd.getType() == PropertyType.BINARY)
+ {
+ return new FileProperties(getStorageNode(), this.getName()).getProperty(FileProperties.NAME);
+ }
+
if (media != null)
{
MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(
media);
- return mtc.getHandler().getFilename(media);
+
+ String filename = mtc.getHandler().getFilename(media);
+ return StringUtils.contains(filename, "/") ? StringUtils.substringAfterLast(filename, "/") : filename;
}
- else
- {
- return null;
- }
+
+ return null;
+
}
public Long getWidth()
Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-05-03 10:06:03 UTC (rev 2341)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-05-03 10:06:36 UTC (rev 2342)
@@ -1,5 +1,6 @@
[#if !alreadyrendered]
<script type="text/javascript">
+ // <![CDATA[
function selectMedia(name, value, mediaType) {
var url = "${request.contextPath}/.magnolia/pages/mediaBrowser.html?nodeid=" + name + "&selectMedia=true&mgnlCK="+
mgnlGetCacheKiller();
@@ -19,7 +20,9 @@
function removeMedia(name) {
document.getElementById(name).value = "";
- document.getElementById("dispRem"+ name).style.display = "none";
+ document.getElementById("dispRem"+ name + "Img").style.display = "none";
+ document.getElementById("dispRemBtn"+ name).style.display = "none";
+ document.getElementById("dispRem"+ name + "Txt").innerHTML = "";
document.getElementById("dispSel"+ name).style.display = "block";
}
@@ -27,77 +30,89 @@
document.getElementById(name).value = uuid;
document.getElementById("dispRem"+ name).style.display = "block";
+ document.getElementById("dispRemBtn"+ name).style.display = "block";
document.getElementById("dispSel"+ name).style.display = "none";
document.getElementById("dispRem"+ name + "Img").src = thumbnailurl;
+ document.getElementById("dispRem"+ name + "Img").style.display = "inline";
document.getElementById("dispRem"+ name + "Txt").innerHTML = filename;
}
+ // ]]>
</script>
[/#if]
-[#if !binaryfield]
+[#if !binaryfield?exists]
[#assign valuemediacontent = value!'null']
[#else]
[#assign valuemediacontent = '']
[/#if]
<input type="hidden" id="${name}" name="${name}" value="${valuemediacontent}" />
-[#if !binaryfield && value?exists && value?length > 0]
+[#if value?exists && value?length > 0]
[#assign dispRem = "block"]
[#assign dispSel = "none"]
[#else]
[#assign dispRem = "none"]
[#assign dispSel = "block"]
[/#if]
-<div id="dispRem${name}" style="display:${dispRem}">
-
-
-
- <div><a href="#" onclick="selectMedia('${name}', '${valuemediacontent}', '${configuration['mediaType']!'null'}')" title="Select media">
- <img id="dispRem${name}Img" src="${thumbnailUrl!''}" border="0" />
- </a>
+[#if (configuration['resizing']!false)?string == 'true']
+ [#assign dispResize = "block"]
+[#else]
+ [#assign dispResize = "none"]
+[/#if]
+
+<div style="height: 120px;">
+
+ <div class="medialeft" style="width: 106px; float:left; height: 106px;">
+ <div id="dispRem${name}" style="display:${dispRem}">
+ <div class="imagebox"
+ style="width: 106px;height: 106px;border: 1px solid #999; background-image: url(${request.contextPath}/.resources/media/assets/squares.png); text-align: center; vertical-align: middle; ">
+ <a href="#" onclick="selectMedia('${name}', '${valuemediacontent}', '${configuration['mediaType']!'null'}')"
+ title="Select media">
+ <img id="dispRem${name}Img" src="${thumbnailUrl!''}" style="border: none; display:inline" alt=""/>
+ </a>
+ </div>
+ </div>
+ <div id="dispRem${name}Txt" style="text-align:center">${filename!''}</div>
</div>
- <div id="dispRem${name}Txt" >
- <a href="#" onclick="selectMedia('${name}', '${valuemediacontent}', '${configuration['mediaType']!'null'}')" title="Seleziona media">${filename!''}</a></div>
- <div>
-
+ <div class="mediaright" style="margin-left: 120px;height: 106px;">
-
-
-
- <span class="mgnlControlButton" onclick="mgnlShiftPushButtonClick(this);removeMedia('${name}');"
- onmouseout="mgnlShiftPushButtonOut(this);" onmousedown="mgnlShiftPushButtonDown(this);" style="">
- ${msgs.get("media.remove")}
- </span>
+
+
+ <div>
+ <div id="dispResize${name}" style="display:${dispResize}">
+ <table>
+ <tbody>
+ <tr>
+ <td class="mgnlDialogBoxLabel">Width</td>
+ <td class="mgnlDialogBoxInput">
+ <input type="text" id="${name}_width" name="${name}_width" value="${width!''}" class="mgnlDialogControlEdit"
+ style="width: 60px;" />
+ </td>
+ </tr>
+ <tr>
+ <td class="mgnlDialogBoxLabel">Height</td>
+ <td class="mgnlDialogBoxInput">
+ <input type="text" id="${name}_height" name="${name}_height" value="${height!''}" class="mgnlDialogControlEdit"
+ style="width: 60px;" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div id="dispRemBtn${name}">
+ <span class="mgnlControlButton" onclick="mgnlShiftPushButtonClick(this);removeMedia('${name}');" onmouseout="mgnlShiftPushButtonOut(this);"
+ onmousedown="mgnlShiftPushButtonDown(this);" style="">${msgs.get("media.remove")}</span>
+ </div>
+
+ <div id="dispSel${name}" style="display:${dispSel}">
+ <span class="mgnlControlButton"
+ onclick="mgnlShiftPushButtonClick(this);selectMedia('${name}', '${valuemediacontent}', '${configuration['mediaType']!'null'}');"
+ onmouseout="mgnlShiftPushButtonOut(this);" onmousedown="mgnlShiftPushButtonDown(this);" style="">
+ ${msgs.get("media.select")}</span>
+ </div>
</div>
- [#if (configuration['resizing']!false)?string == 'true']
- [#assign dispResize = "block"]
- [#else]
- [#assign dispResize = "none"]
- [/#if]
- <div id="dispResize${name}" style="display:${dispResize}">
- <table>
- <tbody>
- <tr>
- <td class="mgnlDialogBoxLabel">Width</td>
- <td class="mgnlDialogBoxInput">
- <input type="text" id="${name}_width" name="${name}_width" value="${width!''}" class="mgnlDialogControlEdit" style="width: 60px;" />
- </td>
- </tr>
- <tr>
- <td class="mgnlDialogBoxLabel">Height</td>
- <td class="mgnlDialogBoxInput">
- <input type="text" id="${name}_height" name="${name}_height" value="${height!''}" class="mgnlDialogControlEdit" style="width: 60px;" />
- </td>
- </tr>
- </tbody>
- </table>
</div>
+
</div>
-<div id="dispSel${name}" style="display:${dispSel}">
- <span class="mgnlControlButton" onclick="mgnlShiftPushButtonClick(this);selectMedia('${name}', '${valuemediacontent}', '${configuration['mediaType']!'null'}');"
- onmouseout="mgnlShiftPushButtonOut(this);" onmousedown="mgnlShiftPushButtonDown(this);" style="">
- ${msgs.get("media.select")}
- </span>
-</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-05-09 11:35:04
|
Revision: 2364
http://openutils.svn.sourceforge.net/openutils/?rev=2364&view=rev
Author: fgiust
Date: 2010-05-09 11:34:58 +0000 (Sun, 09 May 2010)
Log Message:
-----------
MEDIA-113 displays existing properties on the media control and gracefully handle removal of binary notedatas at save
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2010-05-09 11:14:22 UTC (rev 2363)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2010-05-09 11:34:58 UTC (rev 2364)
@@ -200,7 +200,12 @@
if (nd != null && nd.getType() == PropertyType.BINARY)
{
- return new FileProperties(getStorageNode(), this.getName()).getProperty(FileProperties.PATH);
+ String url = new FileProperties(getStorageNode(), this.getName()).getProperty(FileProperties.PATH);
+ if (StringUtils.isBlank(url))
+ {
+ return null;
+ }
+ return getRequest().getContextPath() + url;
}
if (media != null)
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-05-09 11:14:22 UTC (rev 2363)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-05-09 11:34:58 UTC (rev 2364)
@@ -105,9 +105,26 @@
{
String uuid = request.getParameter(name);
- NodeData nd = NodeDataUtil.getOrCreate(parentNode, name);
- nd.setValue(uuid);
+ NodeData nd;
+ if (!parentNode.hasNodeData(name))
+ {
+ nd = parentNode.createNodeData(name, uuid);
+ }
+ else
+ {
+ nd = parentNode.getNodeData(name);
+ if (nd.getType() == PropertyType.BINARY)
+ {
+ nd.delete();
+ nd = parentNode.createNodeData(name, uuid);
+ }
+ else
+ {
+ nd.setValue(uuid);
+ }
+ }
+
return true;
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-05-09 11:14:22 UTC (rev 2363)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2010-05-09 11:34:58 UTC (rev 2364)
@@ -33,9 +33,15 @@
document.getElementById("dispRemBtn"+ name).style.display = "block";
document.getElementById("dispSel"+ name).style.display = "none";
+ document.getElementById("dispRem"+ name + "Img").src = "";
document.getElementById("dispRem"+ name + "Img").src = thumbnailurl;
+
+ // reset with in case of old binary values
+ document.getElementById("dispRem"+ name + "Img").style.width = "auto";
+ document.getElementById("dispRem"+ name + "Img").style.height = "auto";
document.getElementById("dispRem"+ name + "Img").style.display = "inline";
document.getElementById("dispRem"+ name + "Txt").innerHTML = filename;
+
}
// ]]>
</script>
@@ -79,7 +85,9 @@
title="Select media" style="height: 106px; width: 106px; display: table-cell; vertical-align: middle; text-align: center; color:#396101; text-decoration:none">
<span style="vertical-align: middle;"></span>
- <img id="dispRem${name}Img" src="${thumbnailUrl!''}" style="text-align:center; border: none; vertical-align: middle; display:inline;" alt="" />
+ <img id="dispRem${name}Img" src="${thumbnailUrl!''}"
+ style="text-align:center; border: none; vertical-align: middle; display:inline; [#if binaryfield?exists] width: 106px; height: 106px[/#if]"
+ alt="" />
<span id="dispSel${name}" style="text-align:center; display:${dispSel}; vertical-align: middle; color:#396101; text-decoration:none; cursor: pointer;height: 20px; width:102px">${msgs.get("media.select")}</span>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X