Changeset 40f3d09

Timestamp:

12/23/08 19:54:45 (4 years ago)

Author:

olivier <>

Branches:

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

Children:

c2803e5

Parents:

baad12d

git-author:

olivier <> (12/23/08 19:54:45)

git-committer:

olivier <> (12/23/08 19:54:45)

Message:

works alright in IE7

Location:

telemeta

Files:

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

telemeta/htdocs/css/player.css

@@ -18 +18 @@
 
 
-#player_maximized button, #player_minimized button {
+#player_maximized .toggle, #player_minimized .toggle {
+    display: block;
+    overflow: hidden;
     position: absolute;
     right: 12px;
-    top: 2px;
-    font-size: 10px;
-    padding: 2px;
-    margin: 2px 1px 1px 1px;
-    background: transparent;
-    color: transparent;
-    width: 20px;
-    height: 10px;
-    border: solid 1px white;
-    border-top: solid 2px white;
+    top: 4px;
+    width: 18px;
+    padding: 10px 0 0 0;
+    height: 0px !important; 
+    height /**/:10px; /* for IE5/Win only */
+    background-image: url('../images/maximize.gif');
+    text-decoration: none;
+    border: 0;
 }
 #player_maximized {

telemeta/htdocs/js/player.js

@@ -9 +9 @@
     var view = $('#player');
     $('#player_maximized, #player_minimized').css('display', 'none');
-    var button;
     var ctr;
     if (view.parents('#player_maximized').length) {
@@ -18 +17 @@
     ctr.css({opacity: 0, display: 'block'});
     player.resize();
-    ctr.animate({opacity: 1}, 200, null);
+    ctr.animate({opacity: 1}, 100, null);
 }
 
@@ -53 +52 @@
         });
 
-        $('#player_maximized button, #player_minimized button').click(function() {
+        $('#player_maximized .toggle, #player_minimized .toggle').click(function() {
             togglePlayerMaximization();
             this.blur();

telemeta/templates/mediaitem_detail.html

@@ -36 +36 @@
 {% if item.file %}
 <div id="player_maximized" class="ts-skin-lab">
-    <button>Minimize</button>
+    <a href="#" class="toggle">Minimize</a>
 </div>
 <div id="rightcol">
     <div id="player_minimized" class="ts-skin-lab">
-    <button>Maximize</button>
+    <a href="#" class="toggle">Maximize</a>
     <div id="player" class="ts-player">
         <div class="ts-viewer">