diff options
| author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2008-02-22 00:39:07 +0100 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2008-02-22 00:39:07 +0100 |
| commit | 1011d13c5da5887f39204fa28155b5c705277b1b (patch) | |
| tree | def7e760c7ade3a99d8fe27fe20e35a63e0529f0 /pages | |
| parent | 47365a8e84d30c44e12b5e5f6220c691a0bf074d (diff) | |
| parent | e02c07bd9ee8e7b610f8c4914979045f7b39dae9 (diff) | |
| download | vdr-plugin-live-1011d13c5da5887f39204fa28155b5c705277b1b.tar.gz vdr-plugin-live-1011d13c5da5887f39204fa28155b5c705277b1b.tar.bz2 | |
Merge commit 'origin/master'
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/timerconflicts.ecpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp index 07d6ac0..1aea9da 100644 --- a/pages/timerconflicts.ecpp +++ b/pages/timerconflicts.ecpp @@ -57,10 +57,10 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); </tr> <tr class="description"> <td class="leftcol"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td> - <td><div class="withmargin"><$ trVDR("Channel") $></div></td> - <td><div class="withmargin"><$ trVDR("Start") $></div></td> - <td><div class="withmargin"><$ trVDR("Stop") $></div></td> - <td><div class="withmargin"><$ trVDR("File") $></div></td> + <td><div class="withmargin"><$ tr("Channel") $></div></td> + <td><div class="withmargin"><$ tr("Start") $></div></td> + <td><div class="withmargin"><$ tr("Stop") $></div></td> + <td><div class="withmargin"><$ tr("File") $></div></td> <td class="action"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td> <td class="action"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td> <td class="action"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td> @@ -69,12 +69,12 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <%cpp> for (std::list<int>::const_iterator timerIndex = confltimer->concurrentTimerIndices.begin(); timerIndex != confltimer->concurrentTimerIndices.end(); ++timerIndex) { cTimer* timer = Timers.Get(*timerIndex-1); - if (!timer) continue; + if (!timer) continue; std::list< int >::const_iterator nexttimerIndex = timerIndex; ++nexttimerIndex; bool bottom = (nexttimerIndex == confltimer->concurrentTimerIndices.end()); - + std::string timerStateImg = "transparent.png"; std::string timerStateHint; if (timer->Index() == confltimer->timerIndex-1) { @@ -98,7 +98,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); title = epgEvent->Title(); } </%cpp> - <tr> + <tr> <td class="leftcol <? bottom ? "bottomrow" ?>"><img src="<$ LiveSetup().GetThemedLink("img", timerStateImg) $>" alt="" <%cpp> if (!timerStateHint.empty()) { </%cpp><& tooltip.hint text=(timerStateHint) &><%cpp> } </%cpp>></img></td> <td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><a href="schedule.html?channel=<$ timer->Channel()->Number()$>"><$ timer->Channel()->Name() $></a></div></td> <td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><$ FormatDateTime(tr("%I:%M %p"), timer->StartTime()) $></div></td> @@ -113,13 +113,13 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <td class="action <? bottom ? "bottomrow" ?>"><a href="edit_timer.html?timerid=<$ timers.GetTimerId(*timer) $>"><img src="<$ LiveSetup().GetThemedLink("img", "edit.png") $>" alt="" <& tooltip.hint text=(tr("Edit timer")) &>></img></a></td> <td class="action rightcol <? bottom ? "bottomrow" ?>"><a href="timers.html?timerid=<$ timers.GetTimerId(*timer) $>&action=delete"><img src="<$ LiveSetup().GetThemedLink("img", "del.png") $>" alt="" <& tooltip.hint text=(tr("Delete timer")) &>></img></a></td> </tr> -% } +% } </%cpp> <tr class="spacer"> <td colspan="9"/> </tr> <%cpp> - } + } } </%cpp> </table> |