diff options
| -rw-r--r-- | css/styles.css | 101 | ||||
| -rw-r--r-- | images/Makefile | 16 | ||||
| -rw-r--r-- | images/remote_button_blue.png | bin | 0 -> 620 bytes | |||
| -rw-r--r-- | images/remote_button_green.png | bin | 0 -> 620 bytes | |||
| -rw-r--r-- | images/remote_button_grey.png | bin | 0 -> 650 bytes | |||
| -rw-r--r-- | images/remote_button_red.png | bin | 0 -> 624 bytes | |||
| -rw-r--r-- | images/remote_button_yellow.png | bin | 0 -> 631 bytes | |||
| -rw-r--r-- | pages/remote.ecpp | 63 | ||||
| -rw-r--r-- | pages/searchtimers.ecpp | 25 |
9 files changed, 145 insertions, 60 deletions
diff --git a/css/styles.css b/css/styles.css index 3cbee62..5875838 100644 --- a/css/styles.css +++ b/css/styles.css @@ -554,33 +554,100 @@ div.recording_item { ############################## */ -table.keypad { - margin-top: 10px; - border: 1px solid #6D96A9; +div.screenshot { + float: left; + margin-right: 20px; } -table.keypad tr td.button button { - width: 4em; +button.redbutton { + width: 36px; + height: 17px; + background-color: inherit; + background-image: url(remote_button_red.png); + background-repeat: no-repeat; + color: #FFFFFF; + font-size: 11px; + border: 0px; + vertical-align: middle; + text-align: center; + cursor: pointer; +} + +button.greenbutton { + width: 36px; + height: 17px; + background-color: inherit; + background-image: url(remote_button_green.png); + background-repeat: no-repeat; + color: #FFFFFF; + font-size: 11px; + border: 0px; + vertical-align: middle; + text-align: center; + cursor: pointer; +} + +button.yellowbutton { + width: 36px; + height: 17px; + background-color: inherit; + background-image: url(remote_button_yellow.png); + background-repeat: no-repeat; + color: #FFFFFF; + font-size: 11px; + border: 0px; + vertical-align: middle; + text-align: center; + cursor: pointer; +} + +button.bluebutton { + width: 36px; + height: 17px; + background-color: inherit; + background-image: url(remote_button_blue.png); + background-repeat: no-repeat; + color: #FFFFFF; + font-size: 11px; + border: 0px; + vertical-align: middle; + text-align: center; + cursor: pointer; +} + + +button.greybutton { + width: 51px; + height: 17px; + background-color: inherit; + background-image: url(remote_button_grey.png); + background-repeat: no-repeat; + color: #FFFFFF; + font-size: 11px; + border: 0px; + vertical-align: middle; + text-align: center; + cursor: pointer; } -table.keypad tr td.redbutton button { - width: 3em; - background-color: #FF0000; +table.keypad { + border: 1px solid #6D96A9; +} + +table.keypad td.button { + text-align: center; } -table.keypad tr td.greenbutton button { - width: 3em; - background-color: #00FF00; +table.keypad tr td.button button { + padding: 0; } -table.keypad tr td.yellowbutton button { - width: 3em; - background-color: #FFFF00; +table.colorbutton { + width: 100%; } -table.keypad tr td.bluebutton button { - width: 3em; - background-color: #0000FF; +table.colorbutton td.colorbutton { + text-align: center; } /* diff --git a/images/Makefile b/images/Makefile index 8dbe8ce..25ad105 100644 --- a/images/Makefile +++ b/images/Makefile @@ -15,13 +15,15 @@ VDRDIR ?= ../../../.. ### The object files (add further files here): OBJS = logo.o record.o active.o inactive.o button_blue.o \ - file.o folder_closed.o folder_open.o plus.o minus.o \ - transparent.o edit.o del.o play.o close.o \ - bg_header_h.o bg_header_l.o bg_header_r.o \ - bg_box_h.o bg_box_l.o bg_box_r.o \ - movie.o menu_line_bg.o bg_line.o bg_tools.o \ - zap.o favicon.o bg_line_top.o reload.o stop.o \ - one_uparrow.o one_downarrow.o + remote_button_yellow.o remote_button_green.o \ + remote_button_red.o remote_button_grey.o \ + remote_button_blue.o file.o folder_closed.o \ + folder_open.o plus.o minus.o transparent.o \ + edit.o del.o play.o close.o bg_header_h.o \ + bg_header_l.o bg_header_r.o bg_box_h.o bg_box_l.o \ + bg_box_r.o movie.o menu_line_bg.o bg_line.o \ + bg_tools.o zap.o favicon.o bg_line_top.o reload.o \ + stop.o one_uparrow.o one_downarrow.o \ ### Default rules: diff --git a/images/remote_button_blue.png b/images/remote_button_blue.png Binary files differnew file mode 100644 index 0000000..72fd603 --- /dev/null +++ b/images/remote_button_blue.png diff --git a/images/remote_button_green.png b/images/remote_button_green.png Binary files differnew file mode 100644 index 0000000..232ea94 --- /dev/null +++ b/images/remote_button_green.png diff --git a/images/remote_button_grey.png b/images/remote_button_grey.png Binary files differnew file mode 100644 index 0000000..5175c2a --- /dev/null +++ b/images/remote_button_grey.png diff --git a/images/remote_button_red.png b/images/remote_button_red.png Binary files differnew file mode 100644 index 0000000..511a230 --- /dev/null +++ b/images/remote_button_red.png diff --git a/images/remote_button_yellow.png b/images/remote_button_yellow.png Binary files differnew file mode 100644 index 0000000..d4031c3 --- /dev/null +++ b/images/remote_button_yellow.png diff --git a/pages/remote.ecpp b/pages/remote.ecpp index 16033ff..5c7a37d 100644 --- a/pages/remote.ecpp +++ b/pages/remote.ecpp @@ -74,41 +74,52 @@ using namespace vdrlive; </div> <table class="keypad" cellspacing="0" cellpadding="0"> <tr> - <td class="button"><button type="button" onclick="KeyPress(<$ k1 $>)">1</button></td> - <td class="button"><button type="button" onclick="KeyPress(<$ k2 $>)">2</button></td> - <td class="button"><button type="button" onclick="KeyPress(<$ k3 $>)">3</button></td> + <td class="button"> </td> + <td class="button"> </td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ kPower $>)">Power</button></td> + <tr> + <tr> + <td class="button" colspan="3"> </td> + </tr> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ k1 $>)">1</button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ k2 $>)">2</button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ k3 $>)">3</button></td> </tr> <tr> - <td class="button"><button type="button" onclick="KeyPress(<$ k4 $>)">4</button></td> - <td class="button"><button type="button" onclick="KeyPress(<$ k5 $>)">5</button></td> - <td class="button"><button type="button" onclick="KeyPress(<$ k6 $>)">6</button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ k4 $>)">4</button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ k5 $>)">5</button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ k6 $>)">6</button></td> </tr> <tr> - <td class="button"><button type="button" onclick="KeyPress(<$ k7 $>)">7</button></td> - <td class="button"><button type="button" onclick="KeyPress(<$ k8 $>)">8</button></td> - <td class="button"><button type="button" onclick="KeyPress(<$ k9 $>)">9</button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ k7 $>)">7</button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ k8 $>)">8</button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ k9 $>)">9</button></td> </tr> <tr> <td class="button"> </td> - <td class="button"><button type="button" onclick="KeyPress(<$ k0 $>)">0</button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ k0 $>)">0</button></td> <td class="button"> </td> </tr> <tr> <td class="button" colspan="3"> </td> </tr> <tr> - <td class="button"><button type="button" onclick="KeyPress(<$ kMenu $>)"><$ tr("Menu") $></button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ kMenu $>)"><$ tr("Menu") $></button></td> <td class="button"> </button></td> - <td class="button"><button type="button" onclick="KeyPress(<$ kBack $>)"><$ tr("Back") $></button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ kBack $>)"><$ tr("Back") $></button></td> </tr> <tr> - <td colspan="3"> - <table cellspacing="0" cellpadding="0"> + <td class="button" colspan="3"> </td> + </tr> + + <tr> + <td colspan="4"> + <table class="colorbutton" cellspacing="0" cellpadding="0"> <tr> - <td class="redbutton"><button type="button" onclick="KeyPress(<$ kRed $>)"> </button></td> - <td class="greenbutton"><button type="button" onclick="KeyPress(<$ kGreen $>)"> </button></td> - <td class="yellowbutton"><button type="button" onclick="KeyPress(<$ kYellow $>)"> </button></td> - <td class="bluebutton"><button type="button" onclick="KeyPress(<$ kBlue $>)"> </button></td> + <td class="colorbutton redbutton"><button class="redbutton" type="button" onclick="KeyPress(<$ kRed $>)"> </button></td> + <td class="colorbutton greenbutton"><button class="greenbutton" type="button" onclick="KeyPress(<$ kGreen $>)"> </button></td> + <td class="colorbutton yellowbutton"><button class="yellowbutton" type="button" onclick="KeyPress(<$ kYellow $>)"> </button></td> + <td class="colorbutton bluebutton"><button class="bluebutton" type="button" onclick="KeyPress(<$ kBlue $>)"> </button></td> <tr> </table> </td> @@ -118,32 +129,32 @@ using namespace vdrlive; </tr> <tr> <td class="button"> </td> - <td class="button"><button type="button" onclick="KeyPress(<$ kUp $>)">^</button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ kUp $>)">^</button></td> <td class="button"> </td> </tr> <tr> <td class="button" colspan="3"> </td> </tr> <tr> - <td class="button"><button type="button" onclick="KeyPress(<$ kLeft $>)"><</button></td> - <td class="button"><button type="button" onclick="KeyPress(<$ kOk $>)"><$ tr("Ok") $></button></td> - <td class="button"><button type="button" onclick="KeyPress(<$ kRight $>)">></button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ kLeft $>)"><</button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ kOk $>)"><$ tr("Ok") $></button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ kRight $>)">></button></td> </tr> <tr> <td class="button" colspan="3"> </td> </tr> <tr> <td class="button"> </td> - <td class="button"><button type="button" onclick="KeyPress(<$ kDown $>)">v</button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ kDown $>)">v</button></td> <td class="button"> </td> </tr> <tr> <td class="button" colspan="3"> </td> </tr> <tr> - <td class="button"><button type="button" onclick="KeyPress(<$ kVolDn $>)"><$ tr("Vol-") $></button></td> - <td class="button"><button type="button" onclick="KeyPress(<$ kMute $>)"><$ tr("Mute") $></button></td> - <td class="button"><button type="button" onclick="KeyPress(<$ kVolUp $>)"><$ tr("Vol+") $></button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ kVolDn $>)"><$ tr("Vol-") $></button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ kMute $>)"><$ tr("Mute") $></button></td> + <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ kVolUp $>)"><$ tr("Vol+") $></button></td> </tr> </table> </div> diff --git a/pages/searchtimers.ecpp b/pages/searchtimers.ecpp index 1915cd2..fa40f14 100644 --- a/pages/searchtimers.ecpp +++ b/pages/searchtimers.ecpp @@ -28,21 +28,24 @@ using namespace vdrlive; Keiner Suchtimer definiert % } else { <table class="timers" cellspacing="0" cellpadding="0"> - <tr> - <td class="head"> </td> - <td class="head"><$ tr("Active") $></td> - <td class="head"><$ tr("Expression") $></td> - <td class="head"><$ tr("Channel") $></td> - <td class="head"><$ tr("Start") $></td> - <td class="head"><$ tr("Stop") $></td> - <td class="head"> </td> - <td class="head"> </td> + <tr class="head"> + <td style="background: url(bg_box_l.png); width: 3px;"/></td> + <td> </td> + <td><$ tr("Active") $></td> + <td><$ tr("Expression") $></td> + <td><$ tr("Channel") $></td> + <td><$ tr("Start") $></td> + <td><$ tr("Stop") $></td> + <td> </td> + <td> </td> + <td style="background: url(bg_box_r.png); width: 3px;" /></td> </tr> <{ bool active = false; for (SearchTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) { }> <tr class="<$ active ? "active" : "" $>"> + <td class="border" style="border-left: 1px solid black"></td> <td><button type="button" class="smallbutton" onclick="location.href='edit_searchtimer.html?timerid=<$ timer->Id() $>';"><$ tr("Edit") $></button></td> <td><img src="/<$ timer->UseAsSearchTimer() ? "active" : "inactive" $>.png" alt="Aktiv?" /></td> <td><$ timer->Search() $></td> @@ -51,14 +54,16 @@ using namespace vdrlive; <td><? timer->UseTime() ? timer->StopTime() ?></td> <td> </td> <td> </td> + <td class="border" style="border-right: 1px solid black"></td> </tr> <{ active = !active; } } }> + <tr><td colspan="10" style="border-top: 1px solid black"> </td></tr> </table> </div> </body> </html> -<%include>page_exit.eh</%include> +<%include>page_exit.eh</%include>
\ No newline at end of file |
