diff options
| -rw-r--r-- | css/styles.css | 1 | ||||
| -rw-r--r-- | images/Makefile | 4 | ||||
| -rw-r--r-- | images/button_new.png | bin | 0 -> 931 bytes | |||
| -rw-r--r-- | pages/edit_searchtimer.ecpp | 6 | ||||
| -rw-r--r-- | pages/edit_timer.ecpp | 6 | ||||
| -rw-r--r-- | pages/searchtimers.ecpp | 8 |
6 files changed, 8 insertions, 17 deletions
diff --git a/css/styles.css b/css/styles.css index 086ba02..f01bad1 100644 --- a/css/styles.css +++ b/css/styles.css @@ -291,7 +291,6 @@ button.red { padding-bottom: 3px; } - table td.buttonpanel { text-align: right; } diff --git a/images/Makefile b/images/Makefile index fb0f8f7..6abb407 100644 --- a/images/Makefile +++ b/images/Makefile @@ -21,8 +21,8 @@ OBJS = logo.o record.o active.o inactive.o button_blue.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 search.o record_timer.o button_red.o \ - button_green.o + remotecontrol.o search.o record_timer.o button_red.o \ + button_green.o button_new.o ### Default rules: diff --git a/images/button_new.png b/images/button_new.png Binary files differnew file mode 100644 index 0000000..88c27f5 --- /dev/null +++ b/images/button_new.png diff --git a/pages/edit_searchtimer.ecpp b/pages/edit_searchtimer.ecpp index 6476ee1..39f948f 100644 --- a/pages/edit_searchtimer.ecpp +++ b/pages/edit_searchtimer.ecpp @@ -418,7 +418,7 @@ Blacklists blacklists; <body onload="initform()"> <div class="left_area"> <& pageelems.logo &> - <& menu active=("searchtimers") component=("edit_searchtimer.header") &> + <& menu active=("searchtimers") &> </div> <div class="right_area"> <div class="inhalt"> @@ -786,7 +786,3 @@ Blacklists blacklists; </body> </html> <%include>page_exit.eh</%include> - -<%def header> -<span><$ (searchtimer ? tr("Edit search timer") : tr("New search timer")) $></span> -</%def> diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp index d094d21..9d6fd9f 100644 --- a/pages/edit_timer.ecpp +++ b/pages/edit_timer.ecpp @@ -114,7 +114,7 @@ cTimer* timer; <body> <div class="left_area"> <& pageelems.logo &> - <& menu active=("timers") component=("edit_timer.header") &> + <& menu active=("timers") &> </div> <div class="right_area"> <div class="inhalt"> @@ -221,7 +221,3 @@ cTimer* timer; </body> </html> <%include>page_exit.eh</%include> - -<%def header> -<span><$ (timer ? tr("Edit timer") : tr("New timer")) $></span> -</%def> diff --git a/pages/searchtimers.ecpp b/pages/searchtimers.ecpp index 2722627..3cdb903 100644 --- a/pages/searchtimers.ecpp +++ b/pages/searchtimers.ecpp @@ -41,7 +41,7 @@ using namespace std; % } else { <table class="timers" cellspacing="0" cellpadding="0"> <tr class="head"> - <td class="border" style="background: url(bg_box_l.png); width: 3px"/></td> + <td style="background: url(bg_box_l.png); width: 3px"/></td> <td><$ tr("Expression") $></td> <td><$ tr("Channel") $></td> <td><$ tr("Start") $> </td> @@ -49,8 +49,8 @@ using namespace std; <td> </td> <td> </td> <td> </td> - <td><button type="button" class="smallbutton" onclick="location.href='edit_searchtimer.html';"><$ tr("New") $></button></td> - <td class="border" style="background: url(bg_box_r.png); width: 3px;" /></td> + <td><a href="edit_searchtimer.html"><img src="/button_new.png" alt="" <& tooltip.hint text=(tr("New search timer")) &>/></a></td> + <td style="background: url(bg_box_r.png); width: 3px;" /></td> </tr> <{ for (SearchTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) { @@ -63,7 +63,7 @@ using namespace std; <td><? timer->UseTime() ? timer->StopTimeFormatted() ?></td> <td><a href="searchtimers.html?searchtimerid=<$ timer->Id() $>&action=toggle"><img src="/<$ timer->UseAsSearchTimer() ? "active" : "inactive" $>.png" alt="" <& tooltip.hint text=(tr("Toggle search timer actions (in)active")) &>/></a></td> <td><a href="searchresults.html?searchtimerid=<$ timer->Id() $>"><img src="/search.png" border="0" alt="" <& tooltip.hint text=(tr("Browse search timer results")) &> ></a></td> - <td><a href="edit_searchtimer.html?searchtimerid=<$ timer->Id() $>"><img src="/edit.png" alt="" <& tooltip.hint text=(tr("Edit search timer")) &>/></a></td> + <td><a href="edit_searchtimer.html?searchtimerid=<$ timer->Id() $>"><img src="/edit.png" alt="" <& tooltip.hint text=(tr("Edit search timer")) &>/></a></td> <td><a href="searchtimers.html?searchtimerid=<$ timer->Id() $>&action=delete"><img src="/del.png" alt="" <& tooltip.hint text=(tr("Delete search timer")) &>/></a></td> <td class="border" style="border-right: 1px solid black"></td> </tr> |
