[Openutils-svn] SF.net SVN: openutils:[4603] tags/openutils-mgnlmedia-5.0.1-relative

[<fg...@us...>]

Revision: 4603
          http://openutils.svn.sourceforge.net/openutils/?rev=4603&view=rev
Author:   fgiust
Date:     2014-10-23 14:25:22 +0000 (Thu, 23 Oct 2014)
Log Message:
-----------
patch - support percentage in width/height attributes

Modified Paths:
--------------
    tags/openutils-mgnlmedia-5.0.1-relative/pom.xml
    tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/media.tag
    tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/player-genericswfobject.tag
    tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/player-jwplayer5.tag
    tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/player.tag
    tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/swfobject.tag
    tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml

Modified: tags/openutils-mgnlmedia-5.0.1-relative/pom.xml
===================================================================
--- tags/openutils-mgnlmedia-5.0.1-relative/pom.xml	2014-10-22 13:56:45 UTC (rev 4602)
+++ tags/openutils-mgnlmedia-5.0.1-relative/pom.xml	2014-10-23 14:25:22 UTC (rev 4603)
@@ -10,7 +10,7 @@
   <artifactId>openutils-mgnlmedia</artifactId>
   <name>SimpleMedia Module for Magnolia CMS</name>
   <description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
-  <version>5.0.1</version>
+  <version>5.0.1-relative</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -24,9 +24,9 @@
     <url>http://jira.openmindlab.com/browse/MEDIA</url>
   </issueManagement>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-5.0.1</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-5.0.1</developerConnection>
-    <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-5.0.1</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-5.0.1-relative</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-5.0.1-relative</developerConnection>
+    <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-5.0.1-relative</url>
   </scm>
   <build>
     <resources>

Modified: tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/media.tag	2014-10-22 13:56:45 UTC (rev 4602)
+++ tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/media.tag	2014-10-23 14:25:22 UTC (rev 4603)
@@ -8,8 +8,8 @@
   <jsp:directive.attribute name="node" required="false" rtexprvalue="true" type="info.magnolia.cms.core.Content" description="the content object to use; if not specified, object 'content' will be used"/>
   <jsp:directive.attribute name="property" required="false" rtexprvalue="true" type="java.lang.String" description="the name of the nodeData storing the media uuid; if not specified, 'media' will be used"/>
   <jsp:directive.attribute name="player" required="false" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)"/>
-  <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"/>
+  <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Object" description="image or player width"/>
+  <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Object" description="image or player height"/>
   <jsp:directive.attribute name="useEm" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if true, and ignoreDimensions is not true it will apply style attribute on img tags with sidth and height in 'em'. the em values will be computed using as width in pixel * emRatio (see next attribute)"/>
   <jsp:directive.attribute name="emRatio" required="false" rtexprvalue="true" type="java.lang.Float" description="float value to convert dimensions from px to em "/>
   <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"/>
@@ -81,7 +81,7 @@
         </c:when>
         <c:when test="${media.type eq 'image' or media.type eq 'wallpaper' or videoImagePreview}">
           <c:choose>
-            <c:when test="${width eq 0 and height eq 0}">
+            <c:when test="${width eq '0' and height eq '0'}">
               <c:set var="url" value="${media:url(mediaNode)}" />
               <c:set var="size" value="${media:size(mediaNode, 'original')}" />
             </c:when>
@@ -101,11 +101,11 @@
                   <c:set var="controlChar" value="p" />
                 </c:when>
               </c:choose>
-              <c:if test="${width eq 0}">
+              <c:if test="${width eq '0'}">
                 <c:set var="controlChar" value="l" />
                 <c:set var="width" value="${bigValue}" />
               </c:if>
-              <c:if test="${height eq 0}">
+              <c:if test="${height eq '0'}">
                 <c:set var="controlChar" value="l" />
                 <c:set var="height" value="${bigValue}" />
               </c:if>

Modified: tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/player-genericswfobject.tag
===================================================================
--- tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/player-genericswfobject.tag	2014-10-22 13:56:45 UTC (rev 4602)
+++ tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/player-genericswfobject.tag	2014-10-23 14:25:22 UTC (rev 4603)
@@ -10,9 +10,9 @@
     description="media uuid or media content node " />
   <jsp:directive.attribute name="playerPath" required="true" rtexprvalue="true" type="java.lang.String"
     description="the swf file of the player (examples: /.resources/media/players/someplayer/player.swf)" />
-  <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer"
+  <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Object"
     description="image or player width" />
-  <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer"
+  <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Object"
     description="image or player height" />
   <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 " />

Modified: tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/player-jwplayer5.tag
===================================================================
--- tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/player-jwplayer5.tag	2014-10-22 13:56:45 UTC (rev 4602)
+++ tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/player-jwplayer5.tag	2014-10-23 14:25:22 UTC (rev 4603)
@@ -9,9 +9,9 @@
     description="Preview image url" />
   <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"
+  <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Object"
     description="image or player width" />
-  <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer"
+  <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Object"
     description="image or player height" />
   <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 " />
@@ -45,8 +45,8 @@
 controlbar: "${controlbar}",
 repeat: "${loop? 'always': 'none'}",
 icons: "${noPlayIcon? 'false': 'true'}",
-width: ${width},
-height: ${height},
+width: "${width}",
+height: "${height}",
 ]]>
     <c:if test="${not empty skin}">skin:"${skin}",</c:if>
     <c:if test="${thumbnail and !empty preview}"> image:"${preview}",</c:if>

Modified: tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/player.tag	2014-10-22 13:56:45 UTC (rev 4602)
+++ tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/player.tag	2014-10-23 14:25:22 UTC (rev 4603)
@@ -11,9 +11,9 @@
     description="media uuid or media content node " />
   <jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String"
     description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)" />
-  <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer"
+  <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Object"
     description="image or player width" />
-  <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer"
+  <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Object"
     description="image or player height" />
   <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 " />
@@ -43,20 +43,20 @@
     <c:if test="${(pageContext.request.scheme eq 'http' and pageContext.request.serverPort != 80)}">:${pageContext.request.serverPort}</c:if>
     <jsp:text>${pageContext.request.contextPath}</jsp:text>
   </c:set>
-  <c:if test="${empty width or width eq 0 }">
+  <c:if test="${empty width or width eq '0' }">
     <c:set var="width" value="${media:width(mediaNode)}" />
   </c:if>
-  <c:if test="${empty height or height eq 0}">
+  <c:if test="${empty height or height eq '0'}">
     <c:set var="height" value="${media:height(mediaNode)}" />
     <c:if test="${(controlbar eq 'bottom' or controlbar eq 'top') and height gt 20}">
       <!-- the control bar adds 20px -->
       <c:set var="height" value="${height + 20}" />
     </c:if>
   </c:if>
-  <c:if test="${empty width or width eq 0 }">
+  <c:if test="${empty width or width eq '0' }">
     <c:set var="width" value="320" />
   </c:if>
-  <c:if test="${empty height or height eq 0}">
+  <c:if test="${empty height or height eq '0'}">
     <c:set var="height" value="${media.type eq 'audio' ? 20 : 240}" />
   </c:if>
   <c:set var="previewwidth" value="${width}" />

Modified: tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/swfobject.tag
===================================================================
--- tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/swfobject.tag	2014-10-22 13:56:45 UTC (rev 4602)
+++ tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/META-INF/tags/media/swfobject.tag	2014-10-23 14:25:22 UTC (rev 4603)
@@ -4,8 +4,8 @@
   xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:directive.tag pageEncoding="UTF-8" description="Renders the flash-content and the javascript for replacing it" />
   <jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)" />
-  <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="flash content width" />
-  <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="flash content height" />
+  <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Object" description="flash content width" />
+  <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Object" description="flash content height" />
   <jsp:directive.attribute name="image" required="false" rtexprvalue="true" description="replacement image" />
   <jsp:directive.attribute name="title" required="false" rtexprvalue="true" description="title/alt" />
   <jsp:directive.tag dynamic-attributes="attrs" />

Modified: tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml
===================================================================
--- tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml	2014-10-22 13:56:45 UTC (rev 4602)
+++ tags/openutils-mgnlmedia-5.0.1-relative/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml	2014-10-23 14:25:22 UTC (rev 4603)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sv:node sv:name="sample-simplemedia" 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:value>mgnl:page</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
     <sv:value>mix:lockable</sv:value>
@@ -41,31 +41,6 @@
       <sv:value>media:pages/sampleSimpleMedia</sv:value>
     </sv:property>
   </sv:node>
-  <sv:node sv:name="text_files">
-    <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:multiple="true">
-      <sv:value>mix:lockable</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:uuid" sv:type="String">
-      <sv:value>338b6542-c356-4680-a859-f389c4ba01d2</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:creationdate" sv:type="Date">
-        <sv:value>2009-01-16T09:56:40.411+01:00</sv:value>
-      </sv:property>
-    </sv:node>
-  </sv:node>
   <sv:node sv:name="main">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
       <sv:value>mgnl:area</sv:value>
@@ -386,7 +361,7 @@
   </sv:node>
   <sv:node sv:name="videoplayer">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -452,7 +427,7 @@
       </sv:node>
       <sv:node sv:name="00">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -489,7 +464,7 @@
       </sv:node>
       <sv:node sv:name="0">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -528,7 +503,7 @@
   </sv:node>
   <sv:node sv:name="swf">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content</sv:value>
+      <sv:value>mgnl:page</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
       <sv:value>mix:lockable</sv:value>
@@ -559,7 +534,7 @@
         <sv:value>2011-07-01T17:59:08.549+02:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2012-04-10T10:25:48.212+02:00</sv:value>
+        <sv:value>2013-12-08T20:24:13.740+01:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:template" sv:type="String">
         <sv:value>media:pages/sampleSimpleMedia</sv:value>
@@ -592,12 +567,12 @@
           <sv:value>2011-07-01T17:59:47.625+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2011-11-20T21:20:30.927+01:00</sv:value>
+          <sv:value>2013-12-08T20:24:13.740+01:00</sv:value>
         </sv:property>
       </sv:node>
       <sv:node sv:name="00">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
           <sv:value>mix:lockable</sv:value>
@@ -609,7 +584,7 @@
           <sv:value>admin</sv:value>
         </sv:property>
         <sv:property sv:name="media" sv:type="String">
-          <sv:value>41f81027-183f-4860-9d88-fcc3a6c5ce05</sv:value>
+          <sv:value>d7bfa8ee-7f0c-4400-8e38-8ab1a9de6e5a</sv:value>
         </sv:property>
         <sv:node sv:name="MetaData">
           <sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -625,7 +600,7 @@
             <sv:value>2011-07-01T18:00:01.154+02:00</sv:value>
           </sv:property>
           <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-            <sv:value>2011-11-20T21:20:30.927+01:00</sv:value>
+            <sv:value>2013-12-08T20:24:13.740+01:00</sv:value>
           </sv:property>
           <sv:property sv:name="mgnl:template" sv:type="String">
             <sv:value>media:components/samples-mediatag</sv:value>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.