[linterna-magica-commit] [334] The HD links list is moved back to the controls bar.

[Ivaylo Valkov]

Revision: 334
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=334
Author:   valkov
Date:     2012-11-30 06:28:40 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
The HD links list is moved back to the controls bar. Tasks #12203.

Fixed displacement of borders for several elements to match the
logo/about edges. 

Ticket Links:
------------
    http://savannah.gnu.org/task/?12203

Modified Paths:
--------------
    trunk/data/style/template.css
    trunk/src/lm_create_video_object.js
    trunk/src/lm_interface_player_web_buttons.js

Modified: trunk/data/style/template.css
===================================================================
--- trunk/data/style/template.css       2012-11-29 07:28:10 UTC (rev 333)
+++ trunk/data/style/template.css       2012-11-30 06:28:40 UTC (rev 334)
@@ -96,7 +96,7 @@
     background: url('button-about.png') 0 0 no-repeat !important;
     cursor: help !important;
     z-index: 9999 !important;
-    right: -2px !important;
+    right: -1px !important;
 }
 
 .linterna-magica-logo-wrapper,
@@ -413,8 +413,8 @@
     height: auto !important;
     /* ^^^Fix height and width in dailymotion: The site sets them to */
     /* 100% but the list shows partly under the header */
-    bottom: 26px !important;
-    left: 12px !important;
+    bottom: -2px !important;
+    left: 28px !important;
     overflow-y: auto !important;
     /* Hide scrollbars for HD links in YouTube */
     overflow-x: hidden !important;
@@ -464,7 +464,7 @@
 /* <div>hd links list</div> */
 /*</div> */
 .linterna-magica-switch-hd {
-    background: url('button-higher-quality-90deg.png ') 0 0 no-repeat 
!important;
+    background: url('button-higher-quality.png ') 0 0 no-repeat !important;
     height: 24px !important;
     width: 24px !important;
     position: relative !important;
@@ -480,23 +480,13 @@
 }
 
 .linterna-magica-hd-wrapper {
-    bottom: 78px !important;
     display: block !important;
     float: right !important;
     position: relative !important;
-    right: -15px !important;
     width: 24px !important;
-    border: 1px solid #36393E !important;
 }
 
-.linterna-magica-hd-wrapper:hover {
-    right: -25px !important;
-}
 
-.linterna-magica-hd-wrapper:hover > .linterna-magica-hd-links-list {
-    left: 2px !important;
-}
-
 /* Fix displacement in reuters.com. The function delete_object_if_id*/
 /* removes the overlaping flash objects */
 #videoPlayer, div.sectionContent, section,
@@ -733,9 +723,16 @@
 .linterna-magica-update-info-box,
 .linterna-magica-about-box,
 .linterna-magica-video-object-wrapper {
-    border: 1px solid #36393E !important;
+    border-top: 1px solid #36393E !important;
+    border-right: 1px solid #36393E !important;
 }
 
+.linterna-magica-controls-time-slider,
+.linterna-magica-controls {
+    border-right: 1px solid #36393E !important;
+}
+
+
 .linterna-magica {
     border-bottom: 1px solid #36393E !important;
 }

Modified: trunk/src/lm_create_video_object.js
===================================================================
--- trunk/src/lm_create_video_object.js 2012-11-29 07:28:10 UTC (rev 333)
+++ trunk/src/lm_create_video_object.js 2012-11-30 06:28:40 UTC (rev 334)
@@ -262,12 +262,6 @@
     var controls = this.create_controls(object_data);
     container.appendChild(controls);
 
-    if (object_data.hd_links)
-    {
-       var hd_links = this.create_hd_links_button(object_data);
-       container.appendChild(hd_links);
-    }
-
     var site_player =  this.get_flash_video_object(id);
 
     if (!site_player)

Modified: trunk/src/lm_interface_player_web_buttons.js
===================================================================
--- trunk/src/lm_interface_player_web_buttons.js        2012-11-29 07:28:10 UTC 
(rev 333)
+++ trunk/src/lm_interface_player_web_buttons.js        2012-11-30 06:28:40 UTC 
(rev 334)
@@ -242,6 +242,31 @@
 
        controls.appendChild(time_text);
 
+    }
+
+    // Create HD links
+    if (object_data.hd_links)
+    {
+       var p = 
+           this.compute_preferred_hd_link(object_data.hd_links);
+       
+       // No link is calculated. Set to lowest.
+       if (p == null || isNaN(p))
+       {
+           p = object_data.hd_links[object_data.hd_links.length-1];
+       }
+       
+       object_data.preferred_link = p;
+
+       // Set the link for the player and download link.
+       object_data.link = object_data.hd_links[p].url;
+
+       var hd_links = this.create_hd_links_button(object_data);
+       controls.appendChild(hd_links);
+    }
+
+
+    if (controls) {
        var fullscreen = this.create_fullscreen_button(object_data);
 
        var fullscreen_click_function = function(ev)
@@ -255,6 +280,7 @@
        controls.appendChild(fullscreen);
     }
 
+
     var dw_link = document.createElement("a");
 
     dw_link.textContent = this._("Download");
@@ -323,26 +349,7 @@
                                     false);
 
     controls.appendChild(update_notifier);
-   
-    // Create HD links
-    if (object_data.hd_links)
-    {
-       var p = 
-           this.compute_preferred_hd_link(object_data.hd_links);
 
-       // No link is calculated. Set to lowest.
-       if (p == null || isNaN(p))
-       {
-           p = object_data.hd_links[object_data.hd_links.length-1];
-       }
-       
-       object_data.preferred_link = p;
-
-       // Set the link for the player and download link.
-       object_data.link = object_data.hd_links[p].url;
-       dw_link.setAttribute("href", object_data.hd_links[p].url);
-    }
-
     // For RTL pages and LM translations we order the controls
     // from right to left.