[MMBASE SCM] r36464 - in openimages/trunk/src/main/webapp: . style/js

[andre]

Author: andre
Date: 2009-06-29 15:21:05 +0200 (Mon, 29 Jun 2009)
New Revision: 36464

Modified:
   openimages/trunk/src/main/webapp/login.jspx
   openimages/trunk/src/main/webapp/style/js/mmajaxeditor.js
   openimages/trunk/src/main/webapp/style/js/player.js
   openimages/trunk/src/main/webapp/user.jspx
Log:
translations of mediafragments

Modified: openimages/trunk/src/main/webapp/login.jspx
===================================================================
--- openimages/trunk/src/main/webapp/login.jspx 2009-06-29 13:17:08 UTC (rev 
36463)
+++ openimages/trunk/src/main/webapp/login.jspx 2009-06-29 13:21:05 UTC (rev 
36464)
@@ -62,7 +62,6 @@
               <input name="submit" type="submit" value="${login}" 
class="submit" />
               <a class="TODO" href="#">forgot your password?</a>
             </p>
-
           </fieldset>
         </form>
       </c:if>

Modified: openimages/trunk/src/main/webapp/style/js/mmajaxeditor.js
===================================================================
--- openimages/trunk/src/main/webapp/style/js/mmajaxeditor.js   2009-06-29 
13:17:08 UTC (rev 36463)
+++ openimages/trunk/src/main/webapp/style/js/mmajaxeditor.js   2009-06-29 
13:21:05 UTC (rev 36464)
@@ -143,6 +143,7 @@
 
 function prepMMAjaxeditor() {
     $("a.mmajaxeditor").click(function(ev) {
+        //console.log("aha mmjx");
         ev.preventDefault();
         var anchor = ev.target;
                new MMAjaxeditor(anchor);

Modified: openimages/trunk/src/main/webapp/style/js/player.js
===================================================================
--- openimages/trunk/src/main/webapp/style/js/player.js 2009-06-29 13:17:08 UTC 
(rev 36463)
+++ openimages/trunk/src/main/webapp/style/js/player.js 2009-06-29 13:21:05 UTC 
(rev 36464)
@@ -299,16 +299,18 @@
         //console.log("No source elements found");
 
         // last fall back, the 'src' attribute itself.
-
-        var url = $(video).attr('src');
-        if (this_url != undefined &&
-            (this_url.lastIndexOf('.mp4') > -1 || 
this_url.lastIndexOf('.h264') > -1
-             )) {
-            //probably = "video/mp4";
-            probably = url;
+        if ($('<video />').length) {
+            var url = $('<video />').attr('src');
+            if (url != undefined &&
+                (url.lastIndexOf('.mp4') > -1 || url.lastIndexOf('.h264') > -1
+                 )) {
+                //probably = "video/mp4";
+                probably = url;
+            }
         }
 
     }
+    
     return probably;
 }
 

Modified: openimages/trunk/src/main/webapp/user.jspx
===================================================================
--- openimages/trunk/src/main/webapp/user.jspx  2009-06-29 13:17:08 UTC (rev 
36463)
+++ openimages/trunk/src/main/webapp/user.jspx  2009-06-29 13:21:05 UTC (rev 
36464)
@@ -18,6 +18,7 @@
       <mm:component name="oip" block="user-mediaupload" render="head"/>
       <c:if test="${block eq 'user-media'}">
         <mm:component name="oip" block="user-mediapreview" render="head"/>
+        <mm:component name="oip" block="user-mediatranslations" render="head" 
/>
       </c:if>
     </jsp:attribute>
 
@@ -37,6 +38,9 @@
           <div class="related-grey">
             <mm:component name="oip" block="user-mediapreview" />
           </div>
+          <div class="related-grey-border">
+            <mm:component name="oip" block="user-mediatranslations" />
+          </div>
         </c:if>
 
         <c:if test="${block eq 'user'}">

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs