Changeset 59a51a3

Timestamp:

06/22/11 18:15:08 (2 years ago)

Author:

riccardo <riccardo@…>

Branches:

master, crem, crem2, dev, dev2, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

d4c2dd3, 2ef47b8

Parents:

65fa35a

git-author:

riccardo <riccardo@…> (06/22/11 18:15:08)

git-committer:

riccardo <riccardo@…> (06/22/11 18:15:08)

Message:

fixed ifram sizes in embed string

Location:

telemeta

Files:

• htdocs/css/player.css (modified) (1 diff)
• htdocs/js/playerLoader.js (modified) (2 diffs)
• templates/telemeta_default/mediaitem_detail.html (modified) (2 diffs)

telemeta/htdocs/css/player.css

@@ -96 +96 @@
 
 #player_maximized .embed_player_frame, #player_minimized .embed_player_frame {
-    float: left;
+    float: right;
     font-weight: bold;
     color: #6A0307;
     text-decoration: none;
     font-size: 50%;
-    -moz-border-radius: 1ex;
+    padding-left: 2ex;
+    padding-right: 2ex;
+    /*-moz-border-radius: 1ex;
     -webkit-border-radius: 1ex;
     border-radius: 1ex;
     border: 1px solid #ddd;
-    padding-left: 2ex;
-    padding-right: 2ex;
     background-color: #fff;
+    
+    */
+     position: relative;
+    top: -1px;
     line-height: 1.5em;
-    position: relative;
-    top: -2px;
+   
 }
 

telemeta/htdocs/js/playerLoader.js

@@ -495 +495 @@
                         var size= player.getImageSize();
                         player_url += "/player/"+size.width+"x"+size.height;
-                        var input_text = "<iframe width='"+size.width+"' height='"+size.height+
+                        var iframeSpanW = 15;
+                        var iframeSpanH = 85;
+                        var input_text = "<iframe width='"+(size.width+iframeSpanW)+"' height='"+(size.height+iframeSpanH)+
                             "' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src='"+
                             player_url+"'></iframe>";
@@ -505 +507 @@
                         var p = new PopupDiv({
                             invoker: $J(this),
-                            title: gettrans('Paste HTML to embed in website'),
+                            title: gettrans('Paste HTML to embed player in website'),
                             content: ipt,
                             defaultCloseOperation:'remove',

telemeta/templates/telemeta_default/mediaitem_detail.html

@@ -94 +94 @@
     {% if public_access or user.is_staff or user.is_superuser %}
     <div id="player_maximized" class="ts-skin-lab">
+        <a href="#" class="toggle">Minimize</a>
         <a href="#" class="embed_player_frame">&lt;/&gt;</a>
-        <a href="#" class="toggle">Minimize</a>
         <div class="wazing"></div>
     </div>
     <div id="rightcol">
         <div id="player_minimized" class="ts-skin-lab">
+            <a href="#" class="toggle">Maximize</a>
             <a href="#" class="embed_player_frame">&lt;/&gt;</a>
-            <a href="#" class="toggle">Maximize</a>
             <div class="wazing"></div>
             <div id="player" class="ts-player">
@@ -265 +265 @@
 {% if user.is_authenticated and perms.telemeta.delete_mediaitem %}
 <div style="float: right;">
- <a href="#" onclick="if(confirm(gettrans('delete the marker permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;"  class="component_icon button icon_delete">{% trans "Delete" %}</a>
+ <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;"  class="component_icon button icon_delete">{% trans "Delete" %}</a>
 </div>
 {% endif %}