diff options
| -rw-r--r-- | css/styles.css | 31 | ||||
| -rw-r--r-- | pages/edit_timer.ecpp | 41 | ||||
| -rw-r--r-- | pages/searchtimers.ecpp | 6 |
3 files changed, 55 insertions, 23 deletions
diff --git a/css/styles.css b/css/styles.css index 75caa77..11603be 100644 --- a/css/styles.css +++ b/css/styles.css @@ -23,6 +23,7 @@ input { } select { + border: 1px solid #6D96A9; font-size: 11px; font-family: Verdana, Arial, Helvetica, sans-serif; } @@ -398,6 +399,19 @@ div.__progress div.__elapsed { } /* ############# + # Tables in General + ############# +*/ + + +td.border { + padding: 0; + margin: 0; + width: 1px; +} + + +/* ############# # Timers ############# */ @@ -414,12 +428,6 @@ table.timers tr td { border-bottom: 1px solid #C0C1DA; } -table.timers tr td.border { - padding: 0; - margin: 0; - width: 1px; -} - table.timers tr.active { background: #DEE6EE; } @@ -600,28 +608,29 @@ table.error tr td.title { table.edit { margin-top: 10px; - border: 1px solid #6D96A9; } table.edit tr td.head { - background: #6D96A9; + background: white; color: white; font-weight: bold; margin: 0; - padding: 3px; + padding: 0; + border:none; } table.edit tr td { vertical-align: top; - padding: 3px 7px 3px 3px; + padding: 6px 7px 6px 3px; vertical-align: middle; + background: url(bg_line.png) bottom repeat-x; + border-bottom: 1px solid #C0C1DA; } table.edit tr td.label { font-weight: bold; } - table.edit tr.active { background: #DEE6EE; } diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp index 90e19e1..2d907f9 100644 --- a/pages/edit_timer.ecpp +++ b/pages/edit_timer.ecpp @@ -122,32 +122,42 @@ cTimer* timer; <input type="hidden" name="timerid" value="<$ timerid $>"/> <input type="hidden" name="aux" value="<$ aux $>"/> <table class="edit" cellpadding="0" cellspacing="0"> - <tr class="active"> + <tr> + <td class="head" colspan="4"><div class="boxheader"><div><div><$ timer ? tr("Edit timer") : tr("New timer") $></div></div></div></td> + </tr> + <tr> + <td class="border" style="border-left: 1px solid black"></td> <td class="label"><$ tr("Active") $>:</td> <td> <input name="active" value="1" <{ reply.out() << ( active ? "checked=\"checked\"" : "" ); }> type="radio"><$ tr("Yes") $> <input name="active" value="0" <{ reply.out() << ( !active ? "checked=\"checked\"" : "" ); }> type="radio"><$ tr("No") $> </td> + <td class="border" style="border-right: 1px solid black"></td> </tr> <tr> + <td class="border" style="border-left: 1px solid black"></td> <td class="label"><$ tr("Channel") $>:</td> - <td> -<& channels_widget name=("channel") channelid=(true) selected=(channel) &> - </td> + <td><& channels_widget name=("channel") channelid=(true) selected=(channel) &></td> + <td class="border" style="border-right: 1px solid black"></td> </tr> - <tr class="active"> + <tr> + <td class="border" style="border-left: 1px solid black"></td> <td class="label"><$ tr("Title" ) $>:</td> <td><input type="text" name="title" value="<$ title $>" size="80" /></td> + <td class="border" style="border-right: 1px solid black"></td> </tr> <tr> + <td class="border" style="border-left: 1px solid black"></td> <td class="label"><$ tr("Day") $>:</td> <td><input type="text" name="day" value="<$ day $>" size="2" maxlength="2" /></td> + <td class="border" style="border-right: 1px solid black"></td> </tr> - <tr class="active"> + <tr> + <td class="border" style="border-left: 1px solid black"></td> <td class="label"><$ tr("Weekday") $>:</td> <td> <input type="checkbox" name="wday_mon" value="1" <{ reply.out() << ( wday_mon ? "checked=\"checked\"" : "" ); }>/> <$ tr("Monday") $> @@ -157,36 +167,49 @@ cTimer* timer; <input type="checkbox" name="wday_fri" value="1" <{ reply.out() << ( wday_fri ? "checked=\"checked\"" : "" ); }>/> <$ tr("Friday") $> <input type="checkbox" name="wday_sat" value="1" <{ reply.out() << ( wday_sat ? "checked=\"checked\"" : "" ); }>/> <$ tr("Saturday") $> <input type="checkbox" name="wday_sun" value="1" <{ reply.out() << ( wday_sun ? "checked=\"checked\"" : "" ); }>/> <$ tr("Sunday") $> + <td class="border" style="border-right: 1px solid black"></td> </td> </tr> <tr> + <td class="border" style="border-left: 1px solid black"></td> <td class="label"><$ tr("Start") $>:</td> <td><input type="text" size="2" maxlength="2" name="start_h" value="<$ start_h $>" /> : <input type="text" size="2" maxlength="2" name="start_m" value="<$ start_m $>" /></td> + <td class="border" style="border-right: 1px solid black"></td> </tr> - <tr class="active"> + <tr> + <td class="border" style="border-left: 1px solid black"></td> <td class="label"><$ tr("Stop") $>:</td> <td><input type="text" size="2" maxlength="2" name="end_h" value="<$ end_h $>" /> : <input type="text" size="2" maxlength="2" name="end_m" value="<$ end_m $>" /></td> + <td class="border" style="border-right: 1px solid black"></td> </tr> <tr> + <td class="border" style="border-left: 1px solid black"></td> <td class="label"><$ tr("Use VPS") $>:</td> <td><input type="checkbox" name="vps" value="1" <{ reply.out() << ( vps ? "checked=\"checked\"" : "" ); }>/></td> + <td class="border" style="border-right: 1px solid black"></td> </tr> - <tr class="active"> + <tr> + <td class="border" style="border-left: 1px solid black"></td> <td class="label"><$ tr("Priority") $>:</td> <td><input type="text" size="2" maxlength="2" name="priority" value="<$ priority $>" /></td> + <td class="border" style="border-right: 1px solid black"></td> </tr> <tr> + <td class="border" style="border-left: 1px solid black"></td> <td class="label"><$ tr("Lifetime") $>:</td> <td><input type="text" size="2" maxlength="2" name="lifetime" value="<$ lifetime $>" /></td> + <td class="border" style="border-right: 1px solid black"></td> </tr> - <tr class="active"> + <tr style="border-bottom: 1px solid black"> + <td class="border" style="border-left: 1px solid black"></td> <td class="buttonpanel" colspan="2"><button name="submit" type="submit"><$ tr("Save") $></button></td> + <td class="border" style="border-right: 1px solid black"></td> </tr> </table> </form> diff --git a/pages/searchtimers.ecpp b/pages/searchtimers.ecpp index 3013de9..1b4ec5f 100644 --- a/pages/searchtimers.ecpp +++ b/pages/searchtimers.ecpp @@ -29,7 +29,7 @@ using namespace vdrlive; % } else { <table class="timers" cellspacing="0" cellpadding="0"> <tr class="head"> - <td style="background: url(bg_box_l.png); width: 3px;"/></td> + <td class="border" style="background: url(bg_box_l.png); width: 3px;"/></td> <td><$ tr("") $></td> <td><$ tr("Expression") $></td> <td><$ tr("Channel") $></td> @@ -38,13 +38,13 @@ using namespace vdrlive; <td> </td> <td> </td> <td><button type="button" class="smallbutton" onclick="location.href='edit_searchtimer.html';"><$ tr("New") $></button></td> - <td style="background: url(bg_box_r.png); width: 3px;" /></td> + <td class="border" style="background: url(bg_box_r.png); width: 3px;" /></td> </tr> <{ for (SearchTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) { }> <tr> - <td class="border" style="border-left: 1px solid black"></td> + <td class="border" style="border-left: 1px solid black; width: 3px"></td> <td><$ timer->Search() $></td> <td><$ timer->ChannelText() $></td> <td><? timer->UseTime() ? timer->StartTimeFormatted() ?></td> |