fixed ifram sizes in embed string

diff --git a/telemeta/htdocs/css/player.css b/telemeta/htdocs/css/player.css
index 331376dfca13a91a12f00b2510572d59efc86488..1795bde4a64f317e4211de7d5b151a1950cb9e0b 100644 (file)
--- a/telemeta/htdocs/css/player.css
+++ b/telemeta/htdocs/css/player.css
@@ -95,21 +95,24 @@ ALONE ARE PARSED (eg ".ts-blabla, .ts-marker-canvas{...}" WILL NOT BE RECOGNIZED
 }
 
 #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;
+   
 }
 
 #player_maximized .embed_player_frame:hover, #player_minimized .embed_player_frame:hover {

diff --git a/telemeta/htdocs/js/playerLoader.js b/telemeta/htdocs/js/playerLoader.js
index 46cc4183bf4955df8a04706e0d0bc4e45c0abd70..2377153dfd876564da3eed64cad390fb31287f9a 100644 (file)
--- a/telemeta/htdocs/js/playerLoader.js
+++ b/telemeta/htdocs/js/playerLoader.js
@@ -494,7 +494,9 @@ function loadPlayer(analizerUrl, soundUrl, soundImgSize, itemId, visualizers, cu
                         var player_url = urlNormalized(); //defined in application.js
                         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>";
                         var ipt = $J('<input/>').attr('type','text');
@@ -504,7 +506,7 @@ function loadPlayer(analizerUrl, soundUrl, soundImgSize, itemId, visualizers, cu
                         });
                         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',
                             focusable: 'true',

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index d7af16c5403d47125c13a752416bba6cf684e373..331136edbdf611ec286d02a89e5d301caa97f424 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -93,14 +93,14 @@
     {% if item.file %}
     {% if public_access or user.is_staff or user.is_superuser %}
     <div id="player_maximized" class="ts-skin-lab">
-        <a href="#" class="embed_player_frame">&lt;/&gt;</a>
         <a href="#" class="toggle">Minimize</a>
+        <a href="#" class="embed_player_frame">&lt;/&gt;</a>
         <div class="wazing"></div>
     </div>
     <div id="rightcol">
         <div id="player_minimized" class="ts-skin-lab">
-            <a href="#" class="embed_player_frame">&lt;/&gt;</a>
             <a href="#" class="toggle">Maximize</a>
+            <a href="#" class="embed_player_frame">&lt;/&gt;</a>
             <div class="wazing"></div>
             <div id="player" class="ts-player">
             </div>
@@ -264,7 +264,7 @@
 </div> <!-- with-rightcol -->
 {% 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 %}
 {% endblock %}