Index: mythweb/themes/wap/program_detail.php
===================================================================
--- mythweb/themes/wap/program_detail.php (revision 7504)
+++ mythweb/themes/wap/program_detail.php (working copy)
@@ -68,7 +68,7 @@
type == rectype_once ? ' CHECKED' : ''?>>
- Record showing
+ Record this showing
type == rectype_daily ? ' CHECKED' : ''?>>
Record every day at this time
@@ -82,12 +82,12 @@
$schedule->type == rectype_finddaily ? ' CHECKED' : ''?>>
Find one episode every day
type == rectype_finddaily ? ' CHECKED' : ''?>>
+ $schedule->type == rectype_findweekly ? ' CHECKED' : ''?>>
Find one episode every week
type == rectype_channel ? ' CHECKED' : ''?>>
Always record on this channel
- type == rectype_always ? ' CHECKED' : ''?>>
Always record on any channel
Index: mythweb/themes/wap/scheduled_recordings.php
===================================================================
--- mythweb/themes/wap/scheduled_recordings.php (revision 7504)
+++ mythweb/themes/wap/scheduled_recordings.php (working copy)
@@ -28,22 +28,34 @@
// Reset the command variable
$command = '';
// Which class does this show fall into?
- if ($show->duplicate == 1) {
+ if ($show->recstatus == 'PreviousRecording' || $show->recstatus == 'CurrentRecording') {
$class = 'duplicate';
$command = 'Rerecord ';
}
- elseif ($show->conflicting == 1) {
+ elseif ($show->recstatus == 'Conflict' || $show->recstatus == 'Overlap') {
$class = 'conflict';
- $command = 'Record ';
+ $command = 'Record ';
}
- elseif ($show->recording == 0) {
+ elseif ($show->recstatus == 'WillRecord') {
+ $class = 'scheduled';
+ $command = 'Don\'t Record ';
+ }
+ elseif ($show->recstatus == 'ForceRecord') {
+ $class = 'scheduled';
+ $command = 'Remove Record ';
+ }
+ elseif ($show->recstatus == 'ManualOverride' || $show->recstatus == 'Cancelled') {
$class = 'deactivated';
- $command = 'Activate ';
+ $command = 'Remove Block ';
}
+ elseif ($show->recstatus == 'LaterShowing' || $show->recstatus == 'EarlierShowing' ) {
+ $class = 'deactivated';
+ $command = 'Activate ';
+ }
else {
$class = 'scheduled';
#$command = 'Don\'t Record';
- $command = '';
+ $command = 'Unknown '.$show->recstatus;
}
// Print the content
Index: mythweb/themes/wap/program_listing.php
===================================================================
--- mythweb/themes/wap/program_listing.php (revision 7504)
+++ mythweb/themes/wap/program_listing.php (working copy)
@@ -26,12 +26,15 @@
Currently Browsing =date('D m/d/y', $start_time)?>
=date('g:i A', $start_time)?>
Jump to
-
- for ($h=0;$h<24;$h++) {
- echo "$h:00 ";
+
+ $day=getdate($start_time);
+ $start=$start_time - $day['hours'] * 60 * 60 - $day['minutes'] * 60;
+ for ($t=0;$t<48;$t++) {
+ //echo " $start_time )
+ echo ' SELECTED';
+ echo '>'.date('g:i A',$start+$t*30*60).' ';
}
?>
@@ -104,11 +107,13 @@
function print_channel($channel, $start_time, $end_time) {
?>
- =prefer_channum ? $channel->channum : $channel->callsign?>
- =prefer_channum ? $channel->callsign : $channel->channum?>
+ =prefer_channum ? $channel->channum : $chann->callsign?>
+ =prefer_channum ? $channel->callsign : $channel->channum?>
+ =$channel->programs[0]->title?>
}
+
}
?>
Index: mythweb/themes/wap/recorded_programs.php
===================================================================
--- mythweb/themes/wap/recorded_programs.php (revision 7504)
+++ mythweb/themes/wap/recorded_programs.php (working copy)
@@ -50,10 +50,11 @@
echo nice_length($show->length)." ".nice_filesize($show->filesize)." ";
if ($show->endtime > time()) { ?>
- currently recording
-
- Delete
-currently recording -
+
+ Delete
+ Rerecord
+";
$row++;
@@ -69,4 +70,4 @@
}
-?>
\ No newline at end of file
+?>
Index: mythweb/themes/wap/theme.php
===================================================================
--- mythweb/themes/wap/theme.php (revision 7504)
+++ mythweb/themes/wap/theme.php (working copy)
@@ -40,6 +40,7 @@
Listings
Scheduled
Recorded
+ Backend Status
headers[] = ' ';
+ // Print the main page header
+ parent::print_header($title);
+ // Print the page contents
+ echo "\n"
+ .$content
+ ."\n
";
+ // Print the main page footer
+ parent::print_footer();
+ }
+
+}
+
+?>
Index: mythweb/program_listing.php
===================================================================
--- mythweb/program_listing.php (revision 7504)
+++ mythweb/program_listing.php (working copy)
@@ -17,6 +17,8 @@
// Were we passed a timestamp? This is going to be the most common occurrence
if ($_GET['time'])
$list_starttime = (int)$_GET['time'];
+ elseif(isset($_GET['daytime']))
+ $list_starttime = unixtime(sprintf('%08d%04d00', $_GET['date'], $_GET['daytime']));
// Did we get passed a date (and probably an hour, too)?
elseif(isset($_GET['date']))
$list_starttime = unixtime(sprintf('%08d%02d0000', $_GET['date'], $_GET['hour']));