Skip to content

Commit a5bc348

Browse files
skd5anersphery
authored andcommitted
Use CSS to handle channel icon sizing.
Signed-off-by: Michael T. Dean <mdean@mythtv.org>
1 parent 52bc9ad commit a5bc348

File tree

5 files changed

+51
-4
lines changed

5 files changed

+51
-4
lines changed

modules/tv/tmpl/default/recorded.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@
166166
<td class="x-originalairdate"><?php echo $show->airdate ?></td>
167167
<td class="x-airdate"><?php echo strftime($_SESSION['date_recorded'], $show->starttime) ?></td><?php
168168
if ($_SESSION["show_channel_icons"] == true && !empty($show->channel->icon)) {
169-
?><td><a href="<?php echo root_url ?>tv/channel/<?php echo $show->channel->chanid, '/', $list_starttime ?>"
169+
?><td class="x-chanicon" rowspan="2"><a href="<?php echo root_url ?>tv/channel/<?php echo $show->channel->chanid, '/', $list_starttime ?>"
170170
title="<?php echo t('Details for: $1', html_entities($show->channel->name)) ?>">
171-
<img class="channelicon" src="<?php echo $show->channel->icon ?>" width=70></a></td><?php
171+
<img class="channelicon" src="<?php echo $show->channel->icon ?>"></a></td><?php
172172
} else {?>
173-
<td class="x-channum"><?php echo $show->channel->channum, ' - ', $show->channel->name ?></td><?php
173+
<td class="x-channum" rowspan="2"><?php echo $show->channel->channum, ' - ', $show->channel->name ?></td><?php
174174
}
175175
if ($recgroup_cols)
176176
echo " <td class=\"-recgroup\">$show->recgroup</td>\n";
@@ -205,7 +205,7 @@
205205
<?php } ?>
206206
</td>
207207
</tr><tr id="statusrow_<?php echo $row ?>" class="recorded statusrow">
208-
<td colspan="7" valign="top"><?php echo $show->description ?></td>
208+
<td colspan="6" valign="top"><?php echo $show->description ?></td>
209209
<td colspan="<?php echo 2 + $recgroup_cols ?>" class="x-progflags"><?php
210210
// Auto expire is interactive
211211
echo '<a onclick="set_autoexpire(', $row, ')" class="_autoexpire">',

skins/clean_blue/tv_recorded.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,19 @@ td.list {
132132
-moz-box-shadow: 1px 1px 5px #999;
133133
-webkit-box-shadow: 1px 1px 5px #999;
134134
box-shadow: 1px 1px 5px #999;
135+
text-align: center;
136+
display: block;
137+
margin-left: auto;
138+
margin-right: auto;
139+
max-width: 70px;
140+
max-height: 70px;
141+
width: expression(this.width > 70 ? "70px" : true);
142+
height: expression(this.height > 70 ? "70px" : true);
143+
}
144+
145+
td.x-chanicon, td.x-channum
146+
{
147+
border-bottom: 1px solid #E4E4E4 !important;
135148
}
136149

137150
tr.statusrow td,

skins/default/tv_recorded.css

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,17 @@
111111
padding: .25em .5em;
112112
margin: 0 0 3px 0;
113113
}
114+
#recorded_list td img.channelicon
115+
{
116+
text-align: center;
117+
display: block;
118+
margin-left: auto;
119+
margin-right: auto;
120+
max-width: 70px;
121+
max-height: 70px;
122+
width: expression(this.width > 70 ? "70px" : true);
123+
height: expression(this.height > 70 ? "70px" : true);
124+
}
114125

115126
/* a class for the the cells containing recored programs in recorded_programs.php */
116127
.recorded { background-color: #506080; }

skins/elkin/tv_recorded.css

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,17 @@
133133
padding: .25em .5em;
134134
margin: 0 0 3px 0;
135135
}
136+
#recorded_list td img.channelicon
137+
{
138+
text-align: center;
139+
display: block;
140+
margin-left: auto;
141+
margin-right: auto;
142+
max-width: 70px;
143+
max-height: 70px;
144+
width: expression(this.width > 70 ? "70px" : true);
145+
height: expression(this.height > 70 ? "70px" : true);
146+
}
136147

137148
/* a class for the the cells containing recored programs in recorded_programs.php */
138149
.recorded { background-color: #DDDDDD; }

skins/grey/tv_recorded.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,18 @@
9494
border: 2px solid #000;
9595
background-color: #333;
9696
}
97+
#recorded_list td img.channelicon
98+
{
99+
text-align: center;
100+
display: block;
101+
margin-left: auto;
102+
margin-right: auto;
103+
max-width: 70px;
104+
max-height: 70px;
105+
width: expression(this.width > 70 ? "70px" : true);
106+
height: expression(this.height > 70 ? "70px" : true);
107+
}
108+
97109

98110
/* a class for the the cells containing recored programs in recorded_programs.php */
99111
.recorded { background-color: #444; }

0 commit comments

Comments
 (0)