Slightly better IE and Firefox compatible version of the sort and services discovery...

diff --git a/share/http/dialogs/playlist b/share/http/dialogs/playlist
index bf8045954c8eb5d8546b41a128dbfbb19cb0d6b5..d714e5f1686f3b810665b834d8da70a829b8afbb 100644 (file)
--- a/share/http/dialogs/playlist
+++ b/share/http/dialogs/playlist
@@ -31,50 +31,60 @@ This dialog needs the following dialogs to be fully functional: <none>
     <img class="close" src="images/white_cross_small.png" alt="Close" onclick="hide('playlist');"/>
   </div>
   <div class="controls">
-    <!--<button id="btn_delete" onmouseover="button_over(this);" onmouseout="button_out(this);">
-      <img src="images/delete.png" alt="Delete" />
-      <span class="btn_text">Delete</span>
-    </button>-->
-    <button id="btn_empty" onclick="pl_empty();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Empty" >
-      <img src="images/empty.png" alt="Empty" />
-      <span class="btn_text">Empty</span>
-    </button>
-    <button id="btn_shuffle" onclick="pl_shuffle();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Shuffle" >
-      <img src="images/shuffle.png" alt="Shuffle" />
-      <span class="btn_text">Shuffle</span>
-    </button>
-    <button id="btn_loop" onclick="pl_loop();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Loop" >
-      <img src="images/loop.png" alt="Loop" />
-      <span class="btn_text">Loop</span>
-    </button>
-    <button id="btn_repeat" onclick="pl_repeat();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Repeat" >
-      <img src="images/repeat.png" alt="Repeat" />
-      <span class="btn_text">Repeat</span>
-    </button>
-    <div id="btn_sort" class="menubtn" style="margin-left: 5px" onmouseover="show_menu('menu_sort');" onmouseout="hide_menu('menu_sort');" title="Sort" >
-      <img src="images/sort.png" alt="Sort" />
-      <span class="btn_text">Sort</span>
-      <div id="menu_sort" class="menu" >
-        <button onclick="pl_sort(1,0);hide_menu('menu_sort');" onmouseover="button_over(this);" onmouseout="button_out_menu(this);" title="Sort by Name ascending" >Name</button><br/>
-        <button onclick="pl_sort(1,1);hide_menu('menu_sort');" onmouseover="button_over(this);" onmouseout="button_out_menu(this);" title="Sort by Name descending" >Name reverse</button><br/>
-        <button onclick="pl_sort(3,0);hide_menu('menu_sort');" onmouseover="button_over(this);" onmouseout="button_out_menu(this);" title="Sort by Author ascending" >Author</button><br/>
-        <button onclick="pl_sort(3,1);hide_menu('menu_sort');" onmouseover="button_over(this);" onmouseout="button_out_menu(this);" title="Sort by Author ascending" >Author reverse</button><br/>
-        <button onclick="pl_sort(5,0);hide_menu('menu_sort');" onmouseover="button_over(this);" onmouseout="button_out_menu(this);" title="Randomize" >Random</button><br/>
-        <button onclick="pl_sort(7,0);hide_menu('menu_sort');" onmouseover="button_over(this);" onmouseout="button_out_menu(this);" title="Sort by Track number" >Track number</button><br/>
-        <button onclick="pl_sort(0,0);hide_menu('menu_sort');" onmouseover="button_over(this);" onmouseout="button_out_menu(this);" title="Sort by Id ascending" >Id</button><br/>
-        <button onclick="pl_sort(0,1);hide_menu('menu_sort');" onmouseover="button_over(this);" onmouseout="button_out_menu(this);" title="Sort by Id descending" >Id reverse</button><br/>
-      </div>
-    </div>
-    <div id="btn_sd" class="menubtn" style="margin-left: 30px" onmouseover="show_menu('menu_sd');" onmouseout="hide_menu('menu_sd');" title="Services Discovery" >
-      <img src="images/sd.png" alt="Services Discovery" />
-      <span class="btn_text">Services Discovery</span>
-      <div id="menu_sd" class="menu" >
-        <vlc id="rpn" param1="services_discovery" />
-        <vlc id="foreach" param1="sd" param2="object" />
-        <button onclick="pl_sd('<vlc id="value" param1="sd" />');hide_menu('menu_sd');" onmouseover="button_over(this);" onmouseout="button_out_menu(this);" title="Toggle <vlc id="value" param1="sd.name" />" ><vlc id="value" param1="sd.name" /></button><br/>
-        <vlc id="end" />
-      </div>
-    </div>
+    <table>
+      <tr>
+        <td>
+          <!--<button id="btn_delete" onmouseover="button_over(this);" onmouseout="button_out(this);">
+            <img src="images/delete.png" alt="Delete" />
+            <span class="btn_text">Delete</span>
+          </button>-->
+          <button id="btn_empty" onclick="pl_empty();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Empty" >
+            <img src="images/empty.png" alt="Empty" />
+            <span class="btn_text">Empty</span>
+          </button>
+          <button id="btn_shuffle" onclick="pl_shuffle();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Shuffle" >
+            <img src="images/shuffle.png" alt="Shuffle" />
+            <span class="btn_text">Shuffle</span>
+          </button>
+          <button id="btn_loop" onclick="pl_loop();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Loop" >
+            <img src="images/loop.png" alt="Loop" />
+            <span class="btn_text">Loop</span>
+          </button>
+          <button id="btn_repeat" onclick="pl_repeat();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Repeat" >
+            <img src="images/repeat.png" alt="Repeat" />
+            <span class="btn_text">Repeat</span>
+          </button>
+        </td>
+        <td onmouseout="hide_menu('menu_sort');" onmouseover="show_menu('menu_sort');" >
+          <button id="btn_sort" title="Sort" >
+            <img src="images/sort.png" alt="Sort" />
+            <span class="btn_text">Sort</span>
+          </button>
+          <div id="menu_sort" class="menu" >
+            <button class="menuout" onclick="pl_sort(1,0);hide_menu('menu_sort');" onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" title="Sort by Name ascending" >Name</button><br/>
+            <button class="menuout" onclick="pl_sort(1,1);hide_menu('menu_sort');" onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" title="Sort by Name descending" >Name reverse</button><br/>
+            <button class="menuout" onclick="pl_sort(3,0);hide_menu('menu_sort');" onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" title="Sort by Author ascending" >Author</button><br/>
+            <button class="menuout" onclick="pl_sort(3,1);hide_menu('menu_sort');" onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" title="Sort by Author ascending" >Author reverse</button><br/>
+            <button class="menuout" onclick="pl_sort(5,0);hide_menu('menu_sort');" onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" title="Randomize" >Random</button><br/>
+            <button class="menuout" onclick="pl_sort(7,0);hide_menu('menu_sort');" onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" title="Sort by Track number" >Track number</button><br/>
+            <button class="menuout" onclick="pl_sort(0,0);hide_menu('menu_sort');" onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" title="Sort by Id ascending" >Id</button><br/>
+            <button class="menuout" onclick="pl_sort(0,1);hide_menu('menu_sort');" onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" title="Sort by Id descending" >Id reverse</button><br/>
+          </div>
+        </td>
+        <td onmouseover="show_menu('menu_sd');" onmouseout="hide_menu('menu_sd');">
+          <button id="btn_sd" title="Services Discovery" >
+            <img src="images/sd.png" alt="Services Discovery" />
+            <span class="btn_text">Services Discovery</span>
+          </button>
+          <div id="menu_sd" class="menu" >
+            <vlc id="rpn" param1="services_discovery" />
+            <vlc id="foreach" param1="sd" param2="object" />
+            <button onclick="pl_sd('<vlc id="value" param1="sd" />');hide_menu('menu_sd');" onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" class="menuout" title="Toggle <vlc id="value" param1="sd.name" />" ><vlc id="value" param1="sd.name" /></button><br/>
+            <vlc id="end" />
+          </div>
+        </td>
+      </tr>
+    </table>
   </div>
   <div id="playtree">
     (?)

diff --git a/share/http/iehacks.css b/share/http/iehacks.css
index 2bf1018f6ad70ade9930b24d58233628b68ff65e..2d51ff1292363abbbab268ecf03ed689e6b86e26 100644 (file)
--- a/share/http/iehacks.css
+++ b/share/http/iehacks.css
@@ -26,6 +26,12 @@ div.menu {
        margin-top: 15px;
        background: #fff;
 }
+div.menu button {
+        background: #fff;
+}
+div.menu button.menuout {
+        border: 1px solid #fff;
+}
 
 div#mosaic_list {
        background: #fff;

diff --git a/share/http/style.css b/share/http/style.css
index 85b7242ed97ec28a36f608af17e13e5c856cd4e0..bd5c672109fb296325939a8c111644c981821043 100644 (file)
--- a/share/http/style.css
+++ b/share/http/style.css
@@ -224,9 +224,6 @@ div.controls button.off {
 
 div.menubtn {
        display: inline;
-       position: absolute;
-       margin-top: 2px;
-       font-size: 0.70em;
 }
 
 div.menu {
@@ -241,8 +238,13 @@ div.menu {
 
 div.menu button {
        background: transparent;
+}
+div.menu button.menuout {
        border: 1px solid transparent;
 }
+div.menu button.menuover {
+        border: 1px solid #000;
+}
 
 div.popup img.close {
        position: absolute;