diff options
| -rw-r--r-- | css/styles.css | 96 | ||||
| -rw-r--r-- | i18n.cpp | 242 | ||||
| -rw-r--r-- | images/Makefile | 16 | ||||
| -rw-r--r-- | images/inactive.png | bin | 832 -> 805 bytes | |||
| -rw-r--r-- | images/remote_button_blue.png | bin | 620 -> 0 bytes | |||
| -rw-r--r-- | images/remote_button_green.png | bin | 620 -> 0 bytes | |||
| -rw-r--r-- | images/remote_button_grey.png | bin | 650 -> 0 bytes | |||
| -rw-r--r-- | images/remote_button_red.png | bin | 624 -> 0 bytes | |||
| -rw-r--r-- | images/remote_button_yellow.png | bin | 631 -> 0 bytes | |||
| -rw-r--r-- | images/remotecontrol.png | bin | 0 -> 91260 bytes | |||
| -rw-r--r-- | images/tv.png | bin | 0 -> 245132 bytes | |||
| -rw-r--r-- | pages/remote.ecpp | 129 | ||||
| -rw-r--r-- | pages/whats_on.ecpp | 6 |
13 files changed, 298 insertions, 191 deletions
diff --git a/css/styles.css b/css/styles.css index 5875838..8058185 100644 --- a/css/styles.css +++ b/css/styles.css @@ -555,100 +555,16 @@ div.recording_item { */ div.screenshot { + background-image: url(tv.png); + background-repeat: no-repeat; + height: 240px; + width: 320px; float: left; + padding: 20px 20px 98px 21px; margin-right: 20px; } -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 { - border: 1px solid #6D96A9; -} - -table.keypad td.button { - text-align: center; -} - -table.keypad tr td.button button { - padding: 0; -} - -table.colorbutton { - width: 100%; -} - -table.colorbutton td.colorbutton { - text-align: center; -} +*/ /* ############################## @@ -289,6 +289,28 @@ const tI18nPhrase Phrases[] = { "", // Dansk "", // Czech }, + { "Exit", // English + "Zurück", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, { "Back", // English "Zurück", // Deutsch "", // Slovenski @@ -1015,6 +1037,226 @@ const tI18nPhrase Phrases[] = { "", // Dansk "", // Czech }, + { "Power", // English + "Ausschalten", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, + { "Begin Recording", // English + "Sofortaufnahme", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, + { "Up", // English + "Hoch", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, + { "Down", // English + "Runter", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, + { "Left", // English + "Links", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, + { "Right", // English + "Rechts", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, + { "Red", // English + "Rot", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, + { "Green", // English + "Grün", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, + { "Yellow", // English + "Gelb", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, + { "Blue", // English + "Blau", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, /* { "", // English diff --git a/images/Makefile b/images/Makefile index 25ad105..d8ea5e1 100644 --- a/images/Makefile +++ b/images/Makefile @@ -15,15 +15,13 @@ VDRDIR ?= ../../../.. ### The object files (add further files here): OBJS = logo.o record.o active.o inactive.o button_blue.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 \ + 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 tv.o \ + remotecontrol.o ### Default rules: diff --git a/images/inactive.png b/images/inactive.png Binary files differindex 88a48fd..b14096d 100644 --- a/images/inactive.png +++ b/images/inactive.png diff --git a/images/remote_button_blue.png b/images/remote_button_blue.png Binary files differdeleted file mode 100644 index 72fd603..0000000 --- a/images/remote_button_blue.png +++ /dev/null diff --git a/images/remote_button_green.png b/images/remote_button_green.png Binary files differdeleted file mode 100644 index 232ea94..0000000 --- a/images/remote_button_green.png +++ /dev/null diff --git a/images/remote_button_grey.png b/images/remote_button_grey.png Binary files differdeleted file mode 100644 index 5175c2a..0000000 --- a/images/remote_button_grey.png +++ /dev/null diff --git a/images/remote_button_red.png b/images/remote_button_red.png Binary files differdeleted file mode 100644 index 511a230..0000000 --- a/images/remote_button_red.png +++ /dev/null diff --git a/images/remote_button_yellow.png b/images/remote_button_yellow.png Binary files differdeleted file mode 100644 index d4031c3..0000000 --- a/images/remote_button_yellow.png +++ /dev/null diff --git a/images/remotecontrol.png b/images/remotecontrol.png Binary files differnew file mode 100644 index 0000000..a39c554 --- /dev/null +++ b/images/remotecontrol.png diff --git a/images/tv.png b/images/tv.png Binary files differnew file mode 100644 index 0000000..942dc45 --- /dev/null +++ b/images/tv.png diff --git a/pages/remote.ecpp b/pages/remote.ecpp index 5c7a37d..112440a 100644 --- a/pages/remote.ecpp +++ b/pages/remote.ecpp @@ -12,6 +12,9 @@ using namespace vdrlive; <& pageelems.doc_type &> <html> <head> + <title>VDR-Live - <$ pageTitle $></title> + <link rel="stylesheet" type="text/css" href="/styles.css" /> + <& tooltip.javascript var=("domTT_styleClass") value=("domTTepg") &> <& pageelems.ajax_js &> <script type="text/javascript"><!-- var newImg = new Image(); @@ -61,102 +64,50 @@ using namespace vdrlive; } } //--></script> - <title>VDR-Live - <$ pageTitle $></title> - <link rel="stylesheet" type="text/css" href="/styles.css" /> </head> - <body onload="StreamInit(); FillIntervals()"> + <body onload="StreamInit(); FillIntervals(); LiveStatusAjaxRequest('infobox.html', 'infobox')"> <& pageelems.logo &> <& menu active="remote" &> <div class="inhalt"> <div class="screenshot"> <img src="screenshot.jpg" name="vdrlive" /><br /> - <$ tr("Interval:") $> <select name="interval" onchange="ChangeInterval()"></select> </div> - <table class="keypad" cellspacing="0" cellpadding="0"> - <tr> - <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 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 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 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 class="greybutton" type="button" onclick="KeyPress(<$ kMenu $>)"><$ tr("Menu") $></button></td> - <td class="button"> </button></td> - <td class="button"><button class="greybutton" type="button" onclick="KeyPress(<$ kBack $>)"><$ tr("Back") $></button></td> - </tr> - <tr> - <td class="button" colspan="3"> </td> - </tr> - - <tr> - <td colspan="4"> - <table class="colorbutton" cellspacing="0" cellpadding="0"> - <tr> - <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> - </tr> - <tr> - <td class="button" colspan="3"> </td> - </tr> - <tr> - <td class="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 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 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 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> + <img src="remotecontrol.png" width="162" height="363" border="0" usemap="#remote" /> + <map name="remote"> + <area href="#" shape="circle" coords="37,36,10" alt="Power" onclick="KeyPress(<$ kPower $>)" <& tooltip.hint text=(tr("Power")) &> nohref="nohref" /> + <area href="#" shape="rect" coords="27,60,59,75" alt="1" onclick="KeyPress(<$ k1 $>)" <& tooltip.hint text=("1") &> nohref="nohref" /> + <area href="#" shape="rect" coords="64,59,98,75" alt="2" onclick="KeyPress(<$ k2 $>)" <& tooltip.hint text=("2") &> nohref="nohref" /> + <area href="#" shape="rect" coords="103,59,137,75" alt="3" onclick="KeyPress(<$ k3 $>)" <& tooltip.hint text=("3") &> nohref="nohref" /> + <area href="#" shape="rect" coords="25,82,60,98" alt="4" onclick="KeyPress(<$ k4 $>)" <& tooltip.hint text=("4") &> nohref="nohref" /> + <area href="#" shape="rect" coords="65,82,98,99" alt="5" onclick="KeyPress(<$ k5 $>)" <& tooltip.hint text=("5") &> nohref="nohref" /> + <area href="#" shape="rect" coords="103,83,137,99" alt="6" onclick="KeyPress(<$ k6 $>)" <& tooltip.hint text=("6") &> nohref="nohref" /> + <area href="#" shape="rect" coords="26,106,60,121" alt="7" onclick="KeyPress(<$ k7 $>)" <& tooltip.hint text=("7") &> nohref="nohref" /> + <area href="#" shape="rect" coords="65,105,97,121" alt="8" onclick="KeyPress(<$ k8 $>)" <& tooltip.hint text=("8") &> nohref="nohref" /> + <area href="#" shape="rect" coords="104,106,137,122" alt="9" onclick="KeyPress(<$ k9 $>)" <& tooltip.hint text=("9") &> nohref="nohref" /> + <area href="#" shape="rect" coords="66,128,98,144" alt="0" onclick="KeyPress(<$ k0 $>)" <& tooltip.hint text=("0") &> nohref="nohref" /> + <area href="#" shape="circle" coords="37,157,13" alt="Vol+" onclick="KeyPress(<$ kVolUp $>)" <& tooltip.hint text=("Vol+") &> nohref="nohref" /> + <area href="#" shape="circle" coords="37,190,13" alt="Vol-" onclick="KeyPress(<$ kVolDn $>)" <& tooltip.hint text=("Vol-") &> nohref="nohref" /> + <area href="#" shape="circle" coords="125,157,13" alt="P+" onclick="KeyPress(<$ kChanUp $>)" <& tooltip.hint text=("P+") &> nohref="nohref" /> + <area href="#" shape="circle" coords="125,190,13" alt="P-" onclick="KeyPress(<$ kChanDn $>)" <& tooltip.hint text=("P-") &> nohref="nohref" /> + <area href="#" shape="circle" coords="81,174,8" alt="Mute" onclick="KeyPress(<$ kMute $>)" <& tooltip.hint text=(tr("Mute")) &> nohref="nohref" /> + <area href="#" shape="circle" coords="81,202,11" alt="Record" onclick="KeyPress(<$ kRecord $>)" <& tooltip.hint text=(tr("Begin Recording")) &> nohref="nohref" /> + <area href="#" shape="poly" coords="39,215,29,227,30,235,39,236,51,222,49,215,43,213" alt="Menu" onclick="KeyPress(<$ kMenu $>)" <& tooltip.hint text=(tr("Menu")) &> nohref="nohref" /> + <area href="#" shape="poly" coords="119,213,127,219,135,230,132,235,127,236,119,231,114,223,113,215" alt="Exit" onclick="KeyPress(<$ kBack $>)" <& tooltip.hint text=(tr("Exit")) &> nohref="nohref" /> + <area href="#" shape="poly" coords="58,230,70,223,82,223,91,223,105,231,96,240,87,237,78,236,69,240,66,241,58,232" alt="Up" onclick="KeyPress(<$ kUp $>)" <& tooltip.hint text=(tr("Up")) &> nohref="nohref" /> + <area href="#" shape="poly" coords="111,237,119,249,121,259,119,275,113,285,109,284,101,276,104,270,107,260,106,253,101,245" alt="Right" onclick="KeyPress(<$ kRight $>)" <& tooltip.hint text=(tr("Right")) &> nohref="nohref" /> + <area href="#" shape="poly" coords="66,281,75,285,86,285,95,281,106,291,100,295,87,300,73,300,58,291,57,289,58,289" alt="Down" onclick="KeyPress(<$ kDown $>)" <& tooltip.hint text=(tr("Down")) &> nohref="nohref" /> + <area href="#" shape="poly" coords="51,236,61,245,56,256,57,266,61,277,52,285,47,278,42,264,43,252,49,240" alt="Left" onclick="KeyPress(<$ kLeft $>)" <& tooltip.hint text=(tr("Left")) &> nohref="nohref" /> + <area href="#" shape="circle" coords="81,261,17" alt="Ok" onclick="KeyPress(<$ kOk $>)" <& tooltip.hint text=("Ok") &> nohref="nohref" /> + <area href="#" shape="rect" coords="25,309,52,324" alt="Red" onclick="KeyPress(<$ kRed $>)" <& tooltip.hint text=(tr("Red")) &> nohref="nohref" /> + <area href="#" shape="rect" coords="53,309,81,324" alt="Green" onclick="KeyPress(<$ kGreen $>)" <& tooltip.hint text=(tr("Green")) &> nohref="nohref" /> + <area href="#" shape="rect" coords="83,309,109,324" alt="Yellow" onclick="KeyPress(<$ kYellow $>)" <& tooltip.hint text=(tr("Yellow")) &> nohref="nohref" /> + <area href="#" shape="rect" coords="110,310,137,323" alt="Blue" onclick="KeyPress(<$ kBlue $>)" <& tooltip.hint text=(tr("Blue")) &> nohref="nohref" /> + </map> + </div> + <div> + <$ tr("Interval:") $> <select name="interval" onchange="ChangeInterval()"></select> + </div> </div> </body> </html> diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index 090273c..e24aca5 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -77,13 +77,13 @@ if (type == "now") { </div> <div> <div class="info"><$ (epgEvent->StartTime(tr("%I:%M %p"))) $> - <$ (epgEvent->EndTime(tr("%I:%M %p"))) $></div> +% if (epgEvent->Elapsed() >= 0) { + <div class="progress"><div><& pageelems.progressbar progress=(epgEvent->Elapsed()) &></div></div> +% } <div class="title"><$ (epgEvent->Title()) $></div> <div class="short"><$ (epgEvent->ShortDescr()) $></div> <div class="description"><$ (StringWordTruncate(epgEvent->LongDescr(), 150, truncated)) $></div> <div class="more"<& tooltip.hint text=(StringEscapeAndBreak(StringWordTruncate(epgEvent->LongDescr(), 300, truncated)) + string("<br />") + string(tr("Click to view details."))) &><& tooltip.display domId=(epgEvent->Id()) &>><$ (string(tr("more")) + string(" ...")) $></div> -% if (epgEvent->Elapsed() >= 0) { - <div class="progress"><div><& pageelems.progressbar progress=(epgEvent->Elapsed()) &></div></div> -% } </div> </div> </div> |
