Ticket #964: livetv-mythweb.patch

File livetv-mythweb.patch, 3.7 KB (added by mythtv@…, 14 years ago)

mythweb patch

  • mythweb/languages/English.php

     
    279279    'SI Units?'                       => '',
    280280    'Scheduled Popup'                 => '',
    281281    'Show descriptions on new line'   => '',
     282    'Show LiveTV recordings under All recordings category' => '',
    282283    'Status Bar'                      => '',
    283284    'Weather Icons'                   => '',
    284285    'format help'                     => '',
  • mythweb/modules/settings/session.php

     
    3333        if ($_POST['weathericonset'])       $_SESSION['weathericonset']       = $_POST['weathericonset'];
    3434    // Recorded Programs
    3535        $_SESSION['recorded_descunder'] = $_POST['recorded_descunder'] ? true : false;
     36        $_SESSION['recorded_hidelivetv'] = $_POST['recorded_hidelivetv'] ? true : false;
    3637    // Guide Settings
    3738        $_SESSION['guide_favonly'] = $_POST['guide_favonly'] ? true : false;
    3839    // Change language?  Make sure we load the new translation file, too.
  • mythweb/themes/default/settings/session.php

     
    4242    <td class="command_border_b" align="right"><?php echo t('Show descriptions on new line') ?>:</td>
    4343    <td class="command_border_b"><input class="radio" type="checkbox" title="Nice for very long descriptions on the recorded screen." name="recorded_descunder"<?php if ($_SESSION['recorded_descunder']) echo ' CHECKED' ?>></td>
    4444</tr><tr>
     45    <td class="command_border_b" align="right"><?php echo t('Show LiveTV recordings under All recordings category') ?>:</td>
     46    <td class="command_border_b"><input class="radio" type="checkbox" title="Show LiveTV recordings" name="recorded_hidelivetv"<?php if ($_SESSION['recorded_hidelivetv']) echo ' CHECKED' ?>></td>
     47</tr><tr>
    4548    <td colspan="2"><?php echo t('Guide Settings') ?>:</td>
    4649</tr><tr>
    4750    <td class="command_border_b" align="right"><?php echo t('Only display favourite channels') ?>:</td>
  • mythweb/themes/default/tv/recorded.php

     
    162162        ?>
    163163    </select></td>
    164164<?php
    165 if (count($Groups) > 1) { ?>
     165if ((count($Groups) > 1) || $_SESSION['recorded_hidelivetv']) { ?>
    166166    <td><?php echo t('Show group') ?>:</td>
    167167    <td><select name="recgroup" onchange="get_element('program_titles').submit()">
    168168        <option value=""><?php echo t('All recordings') ?></option><?php
     
    220220    $prev_group = '';
    221221    $cur_group  = '';
    222222
    223     foreach ($All_Shows as $show) {
    224 
    225     // Print a dividing row if grouping changes
    226         switch ($group_field) {
     223    foreach ($All_Shows as $show)
     224    {
     225                if (($_GET['recgroup'] == "") && ($_GET['title'] == "") && ($_SESSION['recorded_hidelivetv']) && ($show->recgroup == "LiveTV"))
     226                {
     227                        continue;
     228                }
     229        // Print a dividing row if grouping changes
     230        switch ($group_field)
     231        {
    227232            case 'airdate':
    228233                $cur_group = strftime($_SESSION['date_listing_jump'], $show->starttime);
    229234                break;
     
    317327        $row_section[$row] = $section;
    318328    // Increment row last
    319329        $row++;
     330        }
    320331    }
     332
    321333?>
    322334
    323335</table>