Browse files

Add some more scheduler related simplifications.

This is the mythweb part of SHA1:9497ba1b .
  • Loading branch information...
1 parent 184be13 commit 030ba699cab91c5e3289f3d60061568636bbdb11 David Engel committed Dec 30, 2012
View
3 modules/_shared/lang/db_strings.php
@@ -1,4 +1,4 @@
-<?php
+/<?php
/*
* This file is not actually run by mythweb but contains strings that
* exist only in the database, so that build_translation.pl does not
@@ -17,3 +17,4 @@
t('This series');
t('This time');
t('This day and time');
+t('This channel');
View
1 modules/tv/classes/Program.php
@@ -494,7 +494,6 @@ public function details_list() {
switch ($this->rectype) {
case rectype_once: $str .= t('rectype-long: once'); break;
case rectype_daily: $str .= t('rectype-long: daily'); break;
- case rectype_channel: $str .= t('rectype-long: channel', $_SESSION["prefer_channum"] ? $this->channel->channum : $this->channel->callsign); break;
case rectype_always: $str .= t('rectype-long: always'); break;
case rectype_weekly: $str .= t('rectype-long: weekly'); break;
case rectype_findone: $str .= t('rectype-long: findone'); break;
View
3 modules/tv/classes/Recording.php
@@ -52,7 +52,6 @@ class Recording {
var $record_daily = false;
var $record_weekly = false;
var $record_once = false;
- var $record_channel = false;
var $record_always = false;
var $css_class; // css class, based on category and/or category_type
@@ -104,7 +103,6 @@ function Recording($recording_data) {
switch ($this->type) {
case 1: $this->record_once = true; break;
case 2: $this->record_daily = true; break;
- case 3: $this->record_channel = true; break;
case 4: $this->record_always = true; break;
case 5: $this->record_weekly = true; break;
case 6: $this->record_findone = true; break;
@@ -115,7 +113,6 @@ function Recording($recording_data) {
|| $this->record_weekly
|| $this->record_once
|| $this->record_findone
- || $this->record_channel
|| $this->record_always ) ? true : false;
// Turn type int a word
$this->texttype = $GLOBALS['RecTypes'][$this->type];
View
4 modules/tv/classes/Schedule.php
@@ -437,10 +437,6 @@ public function details_list() {
switch ($this->type) {
case rectype_once: $str .= t('rectype-long: once'); break;
case rectype_daily: $str .= t('rectype-long: daily'); break;
- case rectype_channel:
- $channel =& Channel::find($this->chanid);
- $str .= t('rectype-long: channel', $_SESSION["prefer_channum"] ? $channel->channum : $channel->callsign);
- break;
case rectype_always: $str .= t('rectype-long: always'); break;
case rectype_weekly: $str .= t('rectype-long: weekly'); break;
case rectype_findone: $str .= t('rectype-long: findone'); break;
View
1 modules/tv/detail.php
@@ -172,7 +172,6 @@
switch ($_POST['record']) {
case rectype_once: $type = rectype_once; break;
case rectype_daily: $type = rectype_daily; break;
- case rectype_channel: $type = rectype_channel; break;
case rectype_always: $type = rectype_always; break;
case rectype_weekly: $type = rectype_weekly; break;
case rectype_findone: $type = rectype_findone; break;
View
2 modules/tv/includes/recording_schedules.php
@@ -15,7 +15,6 @@
// Constants for the recording types
define('rectype_once', 1);
define('rectype_daily', 2);
- define('rectype_channel', 3);
define('rectype_always', 4);
define('rectype_weekly', 5);
define('rectype_findone', 6);
@@ -42,7 +41,6 @@
$RecTypes = array(
rectype_once => t('rectype: once'),
rectype_daily => t('rectype: daily'),
- rectype_channel => t('rectype: channel'),
rectype_always => t('rectype: always'),
rectype_weekly => t('rectype: weekly'),
rectype_findone => t('rectype: findone'),
View
3 modules/tv/tmpl/default/detail.php
@@ -582,9 +582,6 @@ function updateHomePage(item) {
<li><input type="radio" class="radio" name="record" value="<?php echo rectype_findone ?>" id="record_findone"<?php
echo $schedule->type == rectype_findone ? ' CHECKED' : '' ?> />
<label for="record_findone"><?php echo t('rectype-long: findone') ?></label></li>
- <li><input type="radio" class="radio" name="record" value="<?php echo rectype_channel ?>" id="record_channel"<?php
- echo $schedule->type == rectype_channel ? ' CHECKED' : '' ?> />
- <label for="record_channel"><?php echo t('rectype-long: channel', $channel->callsign) ?></label></li>
<li><input type="radio" class="radio" name="record" value="<?php echo rectype_always ?>" id="record_always"<?php
echo $schedule->type == rectype_always ? ' CHECKED' : '' ?> />
<label for="record_always"><?php echo t('rectype-long: always') ?></label></li>
View
3 modules/tv/tmpl/lite/detail.php
@@ -304,9 +304,6 @@
<li><input type="radio" class="radio" name="record" value="<?php echo rectype_findone ?>" id="record_findone"<?php
echo $schedule->type == rectype_findone ? ' CHECKED' : '' ?> />
<label for="record_findone"><?php echo t('rectype-long: findone') ?></label></li>
- <li><input type="radio" class="radio" name="record" value="<?php echo rectype_channel ?>" id="record_channel"<?php
- echo $schedule->type == rectype_channel ? ' CHECKED' : '' ?> />
- <label for="record_channel"><?php echo t('rectype-long: channel', $channel->callsign) ?></label></li>
<li><input type="radio" class="radio" name="record" value="<?php echo rectype_always ?>" id="record_always"<?php
echo $schedule->type == rectype_always ? ' CHECKED' : '' ?> />
<label for="record_always"><?php echo t('rectype-long: always') ?></label></li>
View
2 modules/tv/tmpl/wap/detail.php
@@ -75,8 +75,6 @@
<a>Record this showing</a><br />
<input type="radio" class="radio" name="record" value="<?php echo rectype_findone ?>" id="record_findone"<?php echo $schedule->type == rectype_findone ? ' CHECKED' : '' ?>></input>
<a>Find one episode</a><br />
- <input type="radio" class="radio" name="record" value="<?php echo rectype_channel ?>" id="record_channel"<?php echo $schedule->type == rectype_channel ? ' CHECKED' : '' ?>></input>
- <a>Always record on this channel</a><br />
<input type="radio" class="radio" name="record" value="<?php echo rectype_always ?>" id="record_always"<?php echo $schedule->type == rectype_always ? ' CHECKED' : '' ?>></input>
<a>Always record on any channel</a><br />
<br />
View
1 skins/clean_blue/programming.css
@@ -80,7 +80,6 @@
.record_weekly { border: 1px solid #00F000 !important; }
.record_timeslot { border: 1px solid #00F000 !important; }
.record_once { border: 1px solid #00F000 !important; }
-.record_channel { border: 1px solid #00F000 !important; }
.record_always { border: 1px solid #00F000 !important; }
.record_conflicting { border: 1px solid #FF0000 !important; }
.record_duplicate { border: 2px dashed #90B0A0 !important; }
View
1 skins/default/programming.css
@@ -68,7 +68,6 @@
.record_weekly { border: 1px solid #00F000 !important; }
.record_timeslot { border: 1px solid #00F000 !important; }
.record_once { border: 1px solid #00F000 !important; }
-.record_channel { border: 1px solid #00F000 !important; }
.record_always { border: 1px solid #00F000 !important; }
.record_conflicting { border: 1px solid #FF0000 !important; }
.record_duplicate { border: 2px dashed #90B0A0 !important; }
View
1 skins/elkin/programming.css
@@ -72,7 +72,6 @@
.record_weekly { border: 1px solid #00F000 !important; }
.record_timeslot { border: 1px solid #00F000 !important; }
.record_once { border: 1px solid #00F000 !important; }
-.record_channel { border: 1px solid #00F000 !important; }
.record_always { border: 1px solid #00F000 !important; }
.record_conflicting { border: 1px solid #FF0000 !important; }
.record_duplicate { border: 2px dashed #90B0A0 !important; }
View
1 skins/grey/programming.css
@@ -14,7 +14,6 @@
.record_weekly { border: 1px solid #00F000; }
.record_timeslot { border: 1px solid #00F000; }
.record_once { border: 1px solid #00F000; }
-.record_channel { border: 1px solid #00F000; }
.record_always { border: 1px solid #00F000; }
.record_conflicting { border: 1px solid #FF0000; }
.record_duplicate { border: 2px dashed #90B0A0; }
View
1 skins/haze_dark/programming.css
@@ -16,7 +16,6 @@
.record_weekly { border: 1px solid #00F000; }
.record_timeslot { border: 1px solid #00F000; }
.record_once { border: 1px solid #00F000; }
-.record_channel { border: 1px solid #00F000; }
.record_always { border: 1px solid #00F000; }
.will_record { border: 1px solid #00F000; }
.record_conflicting { border: 1px solid #FF0000; }
View
1 skins/haze_light/programming.css
@@ -16,7 +16,6 @@
.record_weekly { border: 2px solid #00E400; }
.record_timeslot { border: 2px solid #00E400; }
.record_once { border: 2px solid #00E400; }
-.record_channel { border: 2px solid #00E400; }
.record_always { border: 2px solid #00E400; }
.will_record { border: 2px solid #00E400; }
.record_conflicting { border: 2px solid #FF0000; }
View
1 skins/wap/handheld.css
@@ -133,7 +133,6 @@ TextArea {
.record_weekly { border: 1px solid #00D000; }
.record_timeslot { border: 1px solid #00D000; }
.record_once { border: 1px solid #00D000; }
-.record_channel { border: 1px solid #00D000; }
.record_always { border: 1px solid #00D000; }
.will_record { border: 1px solid #00D000; }
.record_conflicting { border: 1px solid #FF0000; }
View
1 skins/wap/style.css
@@ -133,7 +133,6 @@ TextArea {
.record_weekly { border: 1px solid #00D000; }
.record_timeslot { border: 1px solid #00D000; }
.record_once { border: 1px solid #00D000; }
-.record_channel { border: 1px solid #00D000; }
.record_always { border: 1px solid #00D000; }
.will_record { border: 1px solid #00D000; }
.record_conflicting { border: 1px solid #FF0000; }

0 comments on commit 030ba69

Please sign in to comment.