[Openutils-svn] SF.net SVN: openutils:[1719] trunk/openutils-mgnlmedia/src/main

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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 &lt;ul>&lt;li>&lt;b>fit:&lt;/b>makes the new image to fit into required res&lt;/li>&lt;li>&lt;b>nocrop:&lt;/b>makes the new image to contain the required res&lt;/li>&lt;li>&lt;b>crop:&lt;/b>makes the new image to contain the required res and the crop the simmetric bands that outfit res&lt;/li>&lt;li>&lt;b>fitbands:&lt;/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 &lt;/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: &lt;ul>&lt;li>.resources/media/js/mootools-1.2-core.js&lt;/li>&lt;li>.resources/media/js/mootools-1.2-more.js&lt;/li>&lt;li>.resources/media/js/mootools-1.2-swfobject.js&lt;/li>&lt;/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[&amp;controlbar=]]>${controlbar} 
+          <![CDATA[&amp;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.


