]> git.sesse.net Git - vlc/commitdiff
http inf: move old http interface components to subdir
authorFrancois Cartegnie <fcvlcdev@free.fr>
Tue, 13 Sep 2011 16:02:41 +0000 (18:02 +0200)
committerFrancois Cartegnie <fcvlcdev@free.fr>
Tue, 13 Sep 2011 21:25:38 +0000 (23:25 +0200)
We still have the old vlm.html interface, as only batch commands
are in the new lua http interface.
Moving apart its own files gives a clearer view of the two versions.

48 files changed:
share/Makefile.am
share/lua/http/dialogs/old/browse [moved from share/lua/http/dialogs/browse with 94% similarity]
share/lua/http/dialogs/old/footer [moved from share/lua/http/dialogs/footer with 100% similarity]
share/lua/http/dialogs/old/input [moved from share/lua/http/dialogs/input with 98% similarity]
share/lua/http/dialogs/old/main [moved from share/lua/http/dialogs/main with 76% similarity]
share/lua/http/dialogs/old/playlist [moved from share/lua/http/dialogs/playlist with 91% similarity]
share/lua/http/dialogs/old/sout [moved from share/lua/http/dialogs/sout with 99% similarity]
share/lua/http/dialogs/old/vlm [moved from share/lua/http/dialogs/vlm with 97% similarity]
share/lua/http/old/images/delete.png [moved from share/lua/http/images/delete.png with 100% similarity]
share/lua/http/old/images/delete_small.png [moved from share/lua/http/images/delete_small.png with 100% similarity]
share/lua/http/old/images/eject.png [moved from share/lua/http/images/eject.png with 100% similarity]
share/lua/http/old/images/empty.png [moved from share/lua/http/images/empty.png with 100% similarity]
share/lua/http/old/images/fullscreen.png [moved from share/lua/http/images/fullscreen.png with 100% similarity]
share/lua/http/old/images/help.png [moved from share/lua/http/images/help.png with 100% similarity]
share/lua/http/old/images/info.png [moved from share/lua/http/images/info.png with 100% similarity]
share/lua/http/old/images/loop.png [moved from share/lua/http/images/loop.png with 100% similarity]
share/lua/http/old/images/minus.png [moved from share/lua/http/images/minus.png with 100% similarity]
share/lua/http/old/images/next.png [moved from share/lua/http/images/next.png with 100% similarity]
share/lua/http/old/images/pause.png [moved from share/lua/http/images/pause.png with 100% similarity]
share/lua/http/old/images/play.png [moved from share/lua/http/images/play.png with 100% similarity]
share/lua/http/old/images/playlist.png [moved from share/lua/http/images/playlist.png with 100% similarity]
share/lua/http/old/images/playlist_small.png [moved from share/lua/http/images/playlist_small.png with 100% similarity]
share/lua/http/old/images/plus.png [moved from share/lua/http/images/plus.png with 100% similarity]
share/lua/http/old/images/prev.png [moved from share/lua/http/images/prev.png with 100% similarity]
share/lua/http/old/images/refresh.png [moved from share/lua/http/images/refresh.png with 100% similarity]
share/lua/http/old/images/repeat.png [moved from share/lua/http/images/repeat.png with 100% similarity]
share/lua/http/old/images/reset.png [moved from share/lua/http/images/reset.png with 100% similarity]
share/lua/http/old/images/sd.png [moved from share/lua/http/images/sd.png with 100% similarity]
share/lua/http/old/images/shuffle.png [moved from share/lua/http/images/shuffle.png with 100% similarity]
share/lua/http/old/images/slider_bar.png [moved from share/lua/http/images/slider_bar.png with 100% similarity]
share/lua/http/old/images/slider_left.png [moved from share/lua/http/images/slider_left.png with 100% similarity]
share/lua/http/old/images/slider_point.png [moved from share/lua/http/images/slider_point.png with 100% similarity]
share/lua/http/old/images/slider_right.png [moved from share/lua/http/images/slider_right.png with 100% similarity]
share/lua/http/old/images/slow.png [moved from share/lua/http/images/slow.png with 100% similarity]
share/lua/http/old/images/snapshot.png [moved from share/lua/http/images/snapshot.png with 100% similarity]
share/lua/http/old/images/sort.png [moved from share/lua/http/images/sort.png with 100% similarity]
share/lua/http/old/images/sout.png [moved from share/lua/http/images/sout.png with 100% similarity]
share/lua/http/old/images/speaker.png [moved from share/lua/http/images/speaker.png with 100% similarity]
share/lua/http/old/images/speaker_mute.png [moved from share/lua/http/images/speaker_mute.png with 100% similarity]
share/lua/http/old/images/stop.png [moved from share/lua/http/images/stop.png with 100% similarity]
share/lua/http/old/images/volume_down.png [moved from share/lua/http/images/volume_down.png with 100% similarity]
share/lua/http/old/images/volume_up.png [moved from share/lua/http/images/volume_up.png with 100% similarity]
share/lua/http/old/images/white.png [moved from share/lua/http/images/white.png with 100% similarity]
share/lua/http/old/images/white_cross_small.png [moved from share/lua/http/images/white_cross_small.png with 100% similarity]
share/lua/http/old/js/functions.js [moved from share/lua/http/js/functions.js with 98% similarity]
share/lua/http/old/js/vlm.js [moved from share/lua/http/js/vlm.js with 100% similarity]
share/lua/http/old/style.css [moved from share/lua/http/style.css with 96% similarity]
share/lua/http/vlm.html

index 413fb39395401047db0d21f1fb1e3a517fc533c4..d7b5dbdecc7ad0477cb7cb0391d304febbb43e99 100644 (file)
@@ -262,60 +262,60 @@ DIST_http_lua = \
        lua/http/dialogs/stream_window.html \
        lua/http/dialogs/offset_window.html \
        lua/http/dialogs/stream_config_window.html \
-       lua/http/dialogs/browse \
-       lua/http/dialogs/footer \
-       lua/http/dialogs/input \
-       lua/http/dialogs/main \
-       lua/http/dialogs/playlist \
-       lua/http/dialogs/sout \
-       lua/http/dialogs/vlm \
+       lua/http/dialogs/old/browse \
+       lua/http/dialogs/old/footer \
+       lua/http/dialogs/old/input \
+       lua/http/dialogs/old/main \
+       lua/http/dialogs/old/playlist \
+       lua/http/dialogs/old/sout \
+       lua/http/dialogs/old/vlm \
        lua/http/custom.lua \
        lua/http/vlm.html \
-       lua/http/images/loop.png \
+       lua/http/old/images/loop.png \
        lua/http/images/buttons.png \
        lua/http/images/speaker-32.png \
-       lua/http/images/fullscreen.png \
+       lua/http/old/images/fullscreen.png \
        lua/http/images/vlc-48.png \
-       lua/http/images/prev.png \
-       lua/http/images/play.png \
+       lua/http/old/images/prev.png \
+       lua/http/old/images/play.png \
        lua/http/images/Audio-48.png \
-       lua/http/images/empty.png \
-       lua/http/images/minus.png \
-       lua/http/images/slider_right.png \
-       lua/http/images/slider_point.png \
-       lua/http/images/pause.png \
-       lua/http/images/speaker_mute.png \
-       lua/http/images/delete_small.png \
-       lua/http/images/snapshot.png \
+       lua/http/old/images/empty.png \
+       lua/http/old/images/minus.png \
+       lua/http/old/images/slider_right.png \
+       lua/http/old/images/slider_point.png \
+       lua/http/old/images/pause.png \
+       lua/http/old/images/speaker_mute.png \
+       lua/http/old/images/delete_small.png \
+       lua/http/old/images/snapshot.png \
        lua/http/images/Folder-48.png \
-       lua/http/images/info.png \
-       lua/http/images/refresh.png \
-       lua/http/images/sout.png \
-       lua/http/images/sort.png \
-       lua/http/images/white_cross_small.png \
-       lua/http/images/shuffle.png \
+       lua/http/old/images/info.png \
+       lua/http/old/images/refresh.png \
+       lua/http/old/images/sout.png \
+       lua/http/old/images/sort.png \
+       lua/http/old/images/white_cross_small.png \
+       lua/http/old/images/shuffle.png \
        lua/http/images/Other-48.png \
-       lua/http/images/repeat.png \
-       lua/http/images/slow.png \
-       lua/http/images/slider_left.png \
-       lua/http/images/help.png \
-       lua/http/images/stop.png \
-       lua/http/images/sd.png \
-       lua/http/images/speaker.png \
-       lua/http/images/delete.png \
+       lua/http/old/images/repeat.png \
+       lua/http/old/images/slow.png \
+       lua/http/old/images/slider_left.png \
+       lua/http/old/images/help.png \
+       lua/http/old/images/stop.png \
+       lua/http/old/images/sd.png \
+       lua/http/old/images/speaker.png \
+       lua/http/old/images/delete.png \
        lua/http/images/Back-48.png \
        lua/http/images/Video-48.png \
-       lua/http/images/playlist_small.png \
-       lua/http/images/eject.png \
-       lua/http/images/playlist.png \
-       lua/http/images/volume_up.png \
-       lua/http/images/next.png \
-       lua/http/images/volume_down.png \
-       lua/http/images/slider_bar.png \
+       lua/http/old/images/playlist_small.png \
+       lua/http/old/images/eject.png \
+       lua/http/old/images/playlist.png \
+       lua/http/old/images/volume_up.png \
+       lua/http/old/images/next.png \
+       lua/http/old/images/volume_down.png \
+       lua/http/old/images/slider_bar.png \
        lua/http/images/vlc16x16.png \
-       lua/http/images/plus.png \
-       lua/http/images/white.png \
-       lua/http/images/reset.png \
+       lua/http/old/images/plus.png \
+       lua/http/old/images/white.png \
+       lua/http/old/images/reset.png \
        lua/http/mobile_equalizer.html \
        lua/http/vlm_export.html \
        lua/http/mobile_browse.html \
@@ -348,14 +348,14 @@ DIST_http_lua = \
        lua/http/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png \
        lua/http/css/main.css \
        lua/http/js/jquery-1.5.1.min.js \
-       lua/http/js/functions.js \
-       lua/http/js/vlm.js \
+       lua/http/old/js/functions.js \
+       lua/http/old/js/vlm.js \
        lua/http/js/ui.js \
        lua/http/js/common.js \
        lua/http/js/jquery.jstree.js \
        lua/http/js/controlers.js \
        lua/http/js/jquery-ui-1.8.13.custom.min.js \
-       lua/http/style.css
+       lua/http/old/style.css
 
 DIST_maemo = \
        maemo/vlc_intf.rc \
similarity index 94%
rename from share/lua/http/dialogs/browse
rename to share/lua/http/dialogs/old/browse
index 35377f73e8f7af955be96821cd839753ce890a39..f57168fd3f76ce0d26165eecb334d71da0b92f5d 100644 (file)
@@ -29,7 +29,7 @@ This dialog needs the following dialogs to be fully functional: <none>
 <div id="browse" class="popup" style="display: none;">
   <div class="title">
     Browse
-    <img class="close" src="images/white_cross_small.png" alt="Close" onclick="hide('browse');"/>
+    <img class="close" src="old/images/white_cross_small.png" alt="Close" onclick="hide('browse');"/>
   </div>
   <div id="browser">
     <a href="javascript:browse_dir(document.getElementById( 'browse_lastdir' ).value);">Click here to browse</a>
similarity index 98%
rename from share/lua/http/dialogs/input
rename to share/lua/http/dialogs/old/input
index fd58d707dc89968f6a9abfb068238c37a1513655..6f23672408b390417bed62eb5fbb3cdc7331a277 100644 (file)
@@ -29,7 +29,7 @@ This dialog needs the following dialogs to be fully functional: browse
 <div id="input" class="dialog" style="display: none">
   <div class="title">
     Input
-    <img class="close" src="images/white_cross_small.png" alt="Close" onclick="hide('input');"/>
+    <img class="close" src="old/images/white_cross_small.png" alt="Close" onclick="hide('input');"/>
   </div>
   <div class="controls">
     <label for="input_mrl">Input</label>
similarity index 76%
rename from share/lua/http/dialogs/main
rename to share/lua/http/dialogs/old/main
index 543de22c5bb64879f1cadd2bff580b2070083934..0820503dd12fbc7084c2966fe8d7aa94cc4b77c2 100644 (file)
@@ -31,103 +31,103 @@ sout and playlist .
   <div class="title">
     VLC media player
     <button id="btn_toggle_text" onclick="toggle_btn_text();" title="Help" >
-      <img src="images/help.png" alt="Help" />
+      <img src="old/images/help.png" alt="Help" />
       Help
     </button>
   </div>
   <div class="controls">
     <button id="btn_open" onclick="toggle_show('input');" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Open" >
-      <img src="images/eject.png" alt="Open" />
+      <img src="old/images/eject.png" alt="Open" />
       <span class="btn_text">Open</span>
     </button>
     &nbsp;
     <button id="btn_stop" onclick="pl_stop();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Stop" >
-      <img src="images/stop.png" alt="Stop" />
+      <img src="old/images/stop.png" alt="Stop" />
       <span class="btn_text">Stop</span>
     </button>
     <!--<button id="btn_play" onclick="alert('FIXME');" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Play" >
-      <img src="images/play.png" alt="Play" />
+      <img src="old/images/play.png" alt="Play" />
       <span class="btn_text">Play</span>
     </button>-->
     <button id="btn_pause" onclick="pl_pause();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Pause" >
-      <img src="images/pause.png" alt="Pause" id="btn_pause_img" />
+      <img src="old/images/pause.png" alt="Pause" id="btn_pause_img" />
       <span class="btn_text">Pause</span>
     </button>
     &nbsp;
     <button id="btn_previous" onclick="pl_previous();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Previous" >
-      <img src="images/prev.png" alt="Previous" />
+      <img src="old/images/prev.png" alt="Previous" />
       <span class="btn_text">Previous</span>
     </button>
     <button id="btn_next" onclick="pl_next();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Next" >
-      <img src="images/next.png" alt="Next" />
+      <img src="old/images/next.png" alt="Next" />
       <span class="btn_text">Next</span>
     </button>
     &nbsp;
     <button id="btn_sout" onclick="toggle_show('sout');" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Stream Output" >
-      <img src="images/sout.png" alt="Stream Output" />
+      <img src="old/images/sout.png" alt="Stream Output" />
       <span class="btn_text">Stream Output</span>
     </button>
     <button id="btn_playlist" onclick="toggle_show('playlist');" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Playlist" >
-      <img src="images/playlist.png" alt="Playlist" />
+      <img src="old/images/playlist.png" alt="Playlist" />
       <span class="btn_text">Playlist</span>
     </button>
     <button id="btn_info" onclick="toggle_show('info');" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Info" >
-      <img src="images/info.png" alt="Info" />
+      <img src="old/images/info.png" alt="Info" />
       <span class="btn_text">Info</span>
     </button>
     &nbsp;
     <button id="btn_fullscreen" onclick="fullscreen();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Fullscreen" >
-      <img src="images/fullscreen.png" alt="Fullscreen" />
+      <img src="old/images/fullscreen.png" alt="Fullscreen" />
       <span class="btn_text">Fullscreen</span>
     </button>
     &nbsp;
     <button id="btn_snapshot" onclick="snapshot();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Take video snapshot" >
-      <img src="images/snapshot.png" alt="Take video snapshot" />
+      <img src="old/images/snapshot.png" alt="Take video snapshot" />
       <span class="btn_text">Take video snapshot</span>
     </button>
     &nbsp;
     <button id="btn_volume_down" onclick="volume_down();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Decrease Volume" >
-      <img src="images/volume_down.png" alt="Decrease Volume" />
+      <img src="old/images/volume_down.png" alt="Decrease Volume" />
       <span class="btn_text">Decrease Volume</span>
     </button>
     <button id="btn_volume_up" onclick="volume_up();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Increase Volume" >
-      <img src="images/volume_up.png" alt="Increase Volume" />
+      <img src="old/images/volume_up.png" alt="Increase Volume" />
       <span class="btn_text">Increase Volume</span>
     </button>
     <button id="btn_volume_mute" onclick="volume_mute();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Mute Volume" >
-      <img src="images/speaker_mute.png" alt="Mute Volume" />
+      <img src="old/images/speaker_mute.png" alt="Mute Volume" />
       <span class="btn_text">Mute Volume</span>
     </button>
     <br />
     Audio Delay:
     <button id="btn_audiodelay_down" onclick="audiodelay_down();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Decrease Audio Delay by 50ms" >
-      <img src="images/minus.png" alt="Decrease Audio Delay" />
+      <img src="old/images/minus.png" alt="Decrease Audio Delay" />
       <span class="btn_text">Decrease Audio Delay</span>
     </button>
     <button id="btn_audiodelay_up" onclick="audiodelay_up();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Increase Audio Delay by 50ms" >
-      <img src="images/plus.png" alt="Increase Audio Delay" />
+      <img src="old/images/plus.png" alt="Increase Audio Delay" />
       <span class="btn_text">Increase Audio Delay</span>
     </button>
     <span id="a_del">(?)</span> ms
  <br />
     Playback Speed:
     <button id="btn_playrate_down" onclick="playrate_down();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Decrease playback rate by 0.05x" >
-      <img src="images/minus.png" alt="Decrease Playback Rate" />
+      <img src="old/images/minus.png" alt="Decrease Playback Rate" />
       <span class="btn_text">Decrease Playback Rate</span>
     </button>
     <button id="btn_playrate_up" onclick="playrate_up();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Increase playback rate by 0.05x" >
-      <img src="images/plus.png" alt="Increase Playback Rate" />
+      <img src="old/images/plus.png" alt="Increase Playback Rate" />
       <span class="btn_text">Increase Playback Rate</span>
     </button>
     <span id="p_rate">(?)</span>x
   <br/>
   Advance of subtitles over video:
     <button id="btn_subdel_down" onclick="subdel_down();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Decrease subtitle delay by 50ms" >
-      <img src="images/minus.png" alt="Decrease Subtitle delay" />
+      <img src="old/images/minus.png" alt="Decrease Subtitle delay" />
       <span class="btn_text">Decrease Subtitle delay</span>
     </button>
     <button id="btn_subdel_up" onclick="subdel_up();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Increase subtitle delay by 50ms" >
-      <img src="images/plus.png" alt="Increase Subtitle delay" />
+      <img src="old/images/plus.png" alt="Increase Subtitle delay" />
       <span class="btn_text">Increase Subtitle delay</span>
     </button>
     <span id="s_del">(?)</span>ms
@@ -141,7 +141,7 @@ sout and playlist .
     Volume : <span id="volume">(?)</span>
     <br/>
     <!-- progress bar -->
-    <img src="images/slider_left.png" alt="slider left" /><span id="progressbar" style="background-image: url( 'images/slider_bar.png' ); width: 408px; height:16px; position:absolute;" onclick="slider_seek( event, this );" onmousemove="slider_move( event, this );"><img src="images/slider_point.png" alt="slider point" style="position:relative; left:0px;" id="main_slider_point" onmousedown="slider_down( event, this );" onmouseup="slider_up( event, this.parentNode );" onmouseout="slider_up( event, this.parentNode );"/></span><img src="images/slider_right.png" alt="slider right" style="position:relative;left:408px;" />
+    <img src="old/images/slider_left.png" alt="slider left" /><span id="progressbar" style="background-image: url( 'old/images/slider_bar.png' ); width: 408px; height:16px; position:absolute;" onclick="slider_seek( event, this );" onmousemove="slider_move( event, this );"><img src="old/images/slider_point.png" alt="slider point" style="position:relative; left:0px;" id="main_slider_point" onmousedown="slider_down( event, this );" onmouseup="slider_up( event, this.parentNode );" onmouseout="slider_up( event, this.parentNode );"/></span><img src="old/images/slider_right.png" alt="slider right" style="position:relative;left:408px;" />
     <br/>
     <span id="nowplaying">(?)</span>
     <img id="albumart" alt="" src="/art" style="float: right" onclick="refresh_albumart(true);"/>
@@ -151,7 +151,7 @@ sout and playlist .
 <div id="info" class="dialog" style="display: none;" >
   <div class="title">
     Stream and media info
-    <img class="close" src="images/white_cross_small.png" alt="Close" onclick="hide('info');"/>
+    <img class="close" src="old/images/white_cross_small.png" alt="Close" onclick="hide('info');"/>
   </div>
   <div id="infotree">
   </div>
similarity index 91%
rename from share/lua/http/dialogs/playlist
rename to share/lua/http/dialogs/old/playlist
index e0fd333a5d7c48a0afe16270935d25ea050bc5ac..e49b45a0ea872b22ba9db2060452d3daf40622bb 100644 (file)
@@ -28,36 +28,36 @@ This dialog needs the following dialogs to be fully functional: <none>
 <div id="playlist" class="dialog" >
   <div class="title">
     Playlist
-    <img class="close" src="images/white_cross_small.png" alt="Close" onclick="hide('playlist');"/>
+    <img class="close" src="old/images/white_cross_small.png" alt="Close" onclick="hide('playlist');"/>
   </div>
   <div class="controls">
     <table>
       <tr>
         <td>
           <!--<button id="btn_delete" onmouseover="button_over(this);" onmouseout="button_out(this);">
-            <img src="images/delete.png" alt="Delete" />
+            <img src="old/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" />
+            <img src="old/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" />
+            <img src="old/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" />
+            <img src="old/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" />
+            <img src="old/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" />
+            <img src="old/images/sort.png" alt="Sort" />
             <span class="btn_text">Sort</span>
           </button>
           <div id="menu_sort" class="menu" >
@@ -76,7 +76,7 @@ This dialog needs the following dialogs to be fully functional: <none>
         </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" />
+            <img src="old/images/sd.png" alt="Services Discovery" />
             <span class="btn_text">Services Discovery</span>
           </button>
           <div id="menu_sd" class="menu" >
@@ -93,7 +93,7 @@ This dialog needs the following dialogs to be fully functional: <none>
           <span class="btn_text">Live search:</span>
           <input title="Live search" type="text" value="<?vlc if _G.search_key then print(search_key) else print('<search>') end ?>" id="search" onfocus="if( this.value == '<search>' ) this.value = ''" onblur="if( this.value == '' ) reset_search()" onchange="update_playlist_search(this.value)" onkeyup="update_playlist_search(this.value)" />
           <button id="btn_search_reset" onclick="reset_search()" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Reset search">
-            <img src="images/reset.png" alt="Reset" />
+            <img src="old/images/reset.png" alt="Reset" />
             <span class="btn_text">Reset</span>
           </button>
         </td>
similarity index 99%
rename from share/lua/http/dialogs/sout
rename to share/lua/http/dialogs/old/sout
index 08afdfad73d0873009e92ee3df65b500f2ce84df..2f3e5dc931cb9cd2a100fbfc94a76f7bf80e8e4d 100644 (file)
@@ -30,7 +30,7 @@ Note that the sout chain is used and sent to VLC by the input dialog
 <div id="sout" class="dialog" style="display: none">
   <div class="title">
     Stream Output
-    <img class="close" src="images/white_cross_small.png" alt="Close" onclick="hide('sout');"/>
+    <img class="close" src="old/images/white_cross_small.png" alt="Close" onclick="hide('sout');"/>
   </div>
   <div class="controls">
     <label for="sout_mrl">Destination</label>
similarity index 97%
rename from share/lua/http/dialogs/vlm
rename to share/lua/http/dialogs/old/vlm
index d2394dc32fc7235695160b009285d8c8ddf34271..a43c09caea09458211e97b6ea9dffcc41e286feb 100644 (file)
@@ -32,7 +32,7 @@ sout and vlmelements .
     VLC media player - VLM interface
     <!--
     <button id="btn_toggle_text" onclick="toggle_btn_text();">
-      <img src="images/help.png" alt="Help" />
+      <img src="/images/help.png" alt="Help" />
       Help
     </button>
     -->
@@ -157,7 +157,7 @@ sout and vlmelements .
   <div class="title">
     Broadcast Elements
     <button id="btn_refresh_broadcast" onclick="vlm_get_elements();" title="Refresh" >
-      <img src="images/refresh.png" alt="Refresh" />
+      <img src="/old/images/refresh.png" alt="Refresh" />
     </button>
   </div>
   <div id="vlm_broadcast_list" class="list"></div>
@@ -167,7 +167,7 @@ sout and vlmelements .
   <div class="title">
     Video on Demand Elements
     <button id="btn_refresh_vod" onclick="vlm_get_elements();" title="Refresh" >
-      <img src="images/refresh.png" alt="Refresh" />
+      <img src="/old/images/refresh.png" alt="Refresh" />
     </button>
   </div>
   <div id="vlm_vod_list" class="list"></div>
@@ -177,7 +177,7 @@ sout and vlmelements .
   <div class="title">
     Schedule Elements
     <button id="btn_refresh_schedule" onclick="vlm_get_elements();" title="Refresh" >
-      <img src="images/refresh.png" alt="Refresh" />
+      <img src="/old/images/refresh.png" alt="Refresh" />
     </button>
   </div>
   <div id="vlm_schedule_list" class="list"></div>
similarity index 98%
rename from share/lua/http/js/functions.js
rename to share/lua/http/old/js/functions.js
index cbd78b1cb87821ad5fd825419b8aca5cae71c36f..420a38b0589a1bf2596ebc3e3689bf4bad4efbd9 100644 (file)
@@ -188,13 +188,13 @@ function toggle_show_node( id )
     if( element.style.display == 'block' || element.style.display == '' )
     {
         element.style.display = 'none';
-        img.setAttribute( 'src', 'images/plus.png' );
+        img.setAttribute( 'src', '/old/images/plus.png' );
         img.setAttribute( 'alt', '[+]' );
     }
     else
     {
         element.style.display = 'block';
-        img.setAttribute( 'src', 'images/minus.png' );
+        img.setAttribute( 'src', '/old/images/minus.png' );
         img.setAttribute( 'alt', '[-]' );
     }
 }
@@ -533,13 +533,13 @@ function parse_status()
             var statustag = status.getElementsByTagName( 'state' );
             if( statustag.length > 0 ? statustag[0].firstChild.data == "playing" : 0 )
             {
-                document.getElementById( 'btn_pause_img' ).setAttribute( 'src', 'images/pause.png' );
+                document.getElementById( 'btn_pause_img' ).setAttribute( 'src', '/old/images/pause.png' );
                 document.getElementById( 'btn_pause_img' ).setAttribute( 'alt', 'Pause' );
                 document.getElementById( 'btn_pause' ).setAttribute( 'title', 'Pause' );
             }
             else
             {
-                document.getElementById( 'btn_pause_img' ).setAttribute( 'src', 'images/play.png' );
+                document.getElementById( 'btn_pause_img' ).setAttribute( 'src', '/old/images/play.png' );
                 document.getElementById( 'btn_pause_img' ).setAttribute( 'alt', 'Play' );
                 document.getElementById( 'btn_pause' ).setAttribute( 'title', 'Play' );
             }
@@ -623,7 +623,7 @@ function parse_playlist()
                     var nda = document.createElement( 'a' );
                     nda.setAttribute( 'href', 'javascript:toggle_show_node(\''+elt.getAttribute( 'id' )+'\');' );
                     var ndai = document.createElement( 'img' );
-                    ndai.setAttribute( 'src', 'images/minus.png' );
+                    ndai.setAttribute( 'src', '/old/images/minus.png' );
                     ndai.setAttribute( 'alt', '[-]' );
                     ndai.setAttribute( 'id', 'pl_img_'+elt.getAttribute( 'id' ) );
                     nda.appendChild( ndai );
@@ -636,7 +636,7 @@ function parse_playlist()
                         var del = document.createElement( "a" );
                         del.setAttribute( 'href', 'javascript:pl_delete('+elt.getAttribute( 'id' )+')' );
                             var delimg = document.createElement( "img" );
-                            delimg.setAttribute( 'src', 'images/delete_small.png' );
+                            delimg.setAttribute( 'src', '/old/images/delete_small.png' );
                             delimg.setAttribute( 'alt', '(delete)' );
                         del.appendChild( delimg );
                         pos.appendChild( del );
@@ -677,7 +677,7 @@ function parse_playlist()
                         var del = document.createElement( "a" );
                         del.setAttribute( 'href', 'javascript:pl_delete('+elt.getAttribute( 'id' )+')' );
                             var delimg = document.createElement( "img" );
-                            delimg.setAttribute( 'src', 'images/delete_small.png' );
+                            delimg.setAttribute( 'src', '/old/images/delete_small.png' );
                             delimg.setAttribute( 'alt', '(delete)' );
                         del.appendChild( delimg );
                         pos.appendChild( del );
@@ -1123,7 +1123,7 @@ function refresh_input_options_list()
         var od = document.createElement( 'a' );
         od.setAttribute( 'href', 'javascript:delete_input_option('+i+');' );
         var delimg = document.createElement( "img" );
-        delimg.setAttribute( 'src', 'images/delete_small.png' );
+        delimg.setAttribute( 'src', '/old/images/delete_small.png' );
         delimg.setAttribute( 'alt', '(delete)' );
         od.appendChild( delimg );
         o.appendChild( od );
similarity index 96%
rename from share/lua/http/style.css
rename to share/lua/http/old/style.css
index 1e43a8241cabc3848d3467b6d85e38b44888a510..c0615b2dcd31729d4529ffa782fade99afb77eb3 100644 (file)
@@ -77,7 +77,7 @@ div.helper hr {
 div.title {
        width: 100%/*576px*/; /* see overflow:hidden several lines 
                                 * before for explanation */
-       background: #000 url('images/vlc16x16.png') no-repeat top left;
+       background: #000 url('/images/vlc16x16.png') no-repeat top left;
        padding-left: 24px;
        color: #fff;
        font-weight: bold;
@@ -166,7 +166,7 @@ div#browser {
 div#mosaic_list {
        width: 50%;
        left: 25%;
-       background: url('images/white.png') repeat;
+       background: url('/old/images/white.png') repeat;
        display: none;
 }
 
@@ -231,7 +231,7 @@ div.menu {
        border: 1px solid #ccc;
        padding: 5px;
        margin-top: -5px;
-       background: url('images/white.png') repeat;
+       background: url('/old/images/white.png') repeat;
        z-index: 2;
        display: none;
 }
index af05ea387764f10689149efaebf25aa96bd11668..bd55ba8d47820fb354345fdbd4606ea55f5003fb 100644 (file)
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-
   <title>VLC media player - Web Interface - VLM</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <link href="style.css" rel="stylesheet" type="text/css" />
-  <script type="text/javascript" src="js/functions.js"></script>
-  <script type="text/javascript" src="js/vlm.js"></script>
+  <link href="old/style.css" rel="stylesheet" type="text/css" />
+  <script type="text/javascript" src="old/js/functions.js"></script>
+  <script type="text/javascript" src="old/js/vlm.js"></script>
 
 </head>
 
@@ -40,7 +39,7 @@
 <?vlc
 current_page = "vlm"
 
-dialogs("browse","input","sout","vlm","footer")
+dialogs("old/browse","old/input","old/sout","old/vlm","old/footer")
 ?>
 
 </body>