Skip to content

Commit ed96f09

Browse files
author
Mark Kendall
committed
Merge branch 'master' of github.com:MythTV/mythtv
2 parents 53bc658 + 80f93a2 commit ed96f09

File tree

4 files changed

+199
-11
lines changed

4 files changed

+199
-11
lines changed

‎mythtv/html/css/site.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,3 +210,7 @@
210210
display: none;
211211
}
212212

213+
.expert {
214+
display: none;
215+
}
216+

‎mythtv/html/setup/channeleditor-channeldetail.html‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<div id='channelsettings'>
2+
<h3><a href="#">Basic Settings</a></h3>
3+
<div id='channeldetail-basicsettings'>
4+
<p>
5+
<table width="100%" cellpadding="0" cellspacing="10" border="0">
6+
<tr>
7+
<td>Channel Number:</td><td><input id='channelDetailSettingChanNum' /></td>
8+
</tr>
9+
<tr>
10+
<td>Channel Name:</td><td><input id='channelDetailSettingChannelName' /></td>
11+
</tr>
12+
<tr>
13+
<td>Callsign:</td><td><input id='channelDetailSettingCallSign' /></td>
14+
</tr>
15+
<tr>
16+
<td>XMLTV ID:</td><td><input id='channelDetailSettingXMLTVID' /></td>
17+
</tr>
18+
<tr>
19+
<td>Icon File:</td><td><input id='channelDetailSettingIconURL' /></td>
20+
</tr>
21+
<tr>
22+
<td width="100%"><input id='channelDetailSettingVisible' type='checkbox'/> Make this channel visible</td>
23+
</tr>
24+
<tr>
25+
<td width="100%"><input id='channelDetailSettingUseEIT' type='checkbox'/> Use Over-the-air guide data for this channel</td>
26+
</tr>
27+
</table>
28+
</p>
29+
</div>
30+
31+
<h3><a href="#">Advanced Settings</a></h3>
32+
<div id='channeldetail-advancedsettings'>
33+
<p>
34+
<b>Do not edit these settings! You will almost certainly break your channel!</b>
35+
<table width="100%" cellpadding="0" cellspacing="10" border="0">
36+
<tr>
37+
<td>Frequency ID:</td><td><input id='channelDetailSettingFrequencyId' /></td>
38+
</tr>
39+
<tr>
40+
<td>Multiplex ID:</td><td><input id='channelDetailSettingMplexId' /></td>
41+
</tr>
42+
<tr>
43+
<td>Service ID:</td><td><input id='channelDetailSettingServiceId' /></td>
44+
</tr>
45+
<tr>
46+
<td>Format:</td><td><input id='channelDetailSettingFormat' /></td>
47+
</tr>
48+
<tr>
49+
<td>Default Authority:</td><td><input id='channelDettailSettingDefaultAuthority' /></td>
50+
</tr>
51+
<tr>
52+
<td>ATSC Major Channel:</td><td><input id='channelDetailSettingATSCMajorChannel' /></td>
53+
</tr>
54+
<tr>
55+
<td>ATSC Minor Channel:</td><td><input id='channelDetailSettingATSCMinorChannel' /></td>
56+
</tr>
57+
</table>
58+
</p>
59+
</div>
60+
61+
<h3><a href="#">Expert Information</a></h3>
62+
<div id='channeldetail-expertsettings'>
63+
<p>
64+
<table width="100%" cellpadding="0" cellspacing="10" border="0">
65+
<tr>
66+
<td width="50%">Channel ID:</td><td><div style="text-align:right" id='channelDetailSettingChanId'></div></td>
67+
</tr>
68+
<tr>
69+
<td width="50%">Source ID:</td><td><div style="text-align:right" id='channelDetailSettingSourceId'></div></td>
70+
</tr>
71+
<tr>
72+
<td width="50%">Channel Modulation:</td><td><div style="text-align:right" id='channelDetailSettingModulation'></div></td>
73+
</tr>
74+
<tr>
75+
<td width="50%">Channel Frequency:</td><td><div style="text-align:right" id='channelDetailSettingFrequency'></div></td>
76+
</tr>
77+
<tr>
78+
<td width="50%">SI Standard:</td><td><div style="text-align:right" id='channelDetailSettingSIStandard'></div></td>
79+
</tr>
80+
</table>
81+
</p>
82+
</div>
83+
84+
</div>

‎mythtv/html/setup/channeleditor.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<table id="channels"></table>
55
<div id='pager'>
66
</div>
7-
<div id='source' style="text-align:left">
7+
<div id='source' style="float: left; text-align:left;">
88
<div id='sourceSelect'></div>
99
</div>
10-
<div id='navigation' style="text-align:right">
10+
<div id='navigation' style="float: right; text-align:right;">
1111
<input type='button' onClick='javascript:editSelectedChannel()' value='Edit Channel' />
1212
<input type='button' onClick='javascript:promptToDeleteChannel()' value='Delete Channel' />
1313
</div>

‎mythtv/html/setup/js/channeleditor.js‎

Lines changed: 109 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function initChannelEditor() {
1919
{name:'IconURL', editable: true, width:0, align:"right", sortable:false, hidden:true, jsonmap: 'IconURL'},
2020
{name:'MplexId', editable: true, width:0, align:"right", sortable:false, hidden:true, jsonmap: 'MplexId'},
2121
{name:'TransportId', editable: true, width:0, align:"right", sortable:false, hidden:true, jsonmap: 'TransportId'},
22-
{name:'ServiceId', editable: true, width:0, align:"right", sortable:false, hidden:true, jsonmap: 'ServiceID'},
22+
{name:'ServiceId', editable: true, width:0, align:"right", sortable:false, hidden:true, jsonmap: 'ServiceId'},
2323
{name:'NetworkId', editable: true, width:0, align:"right", sortable:false, hidden:true, jsonmap: 'NetworkId'},
2424
{name:'ATSCMajorChan', editable: true, width:0, align:"right", sortable:false, hidden:true, jsonmap: 'ATSCMajorChan'},
2525
{name:'ATSCMinorChan', editable: true, width:0, align:"right", sortable:false, hidden:true, jsonmap: 'ATSCMinorChan'},
@@ -88,19 +88,119 @@ function initSourceList() {
8888
}
8989

9090
function editSelectedChannel() {
91-
var rowNum = $('#channels').getGridParam('selrow');
92-
if (rowNum != null) {
93-
$("#channels").jqGrid('editGridRow',rowNum,
94-
{ modal: true,
95-
width: 400,
96-
height: 300
97-
});
91+
loadEditWindow("/setup/channeleditor-channeldetail.html");
92+
var row = $('#channels').getGridParam('selrow');
93+
var rowdata = $("#channels").jqGrid('getRowData', row);
94+
95+
/* Basic */
96+
97+
$("#channelDetailSettingChanNum").val(rowdata.ChanNum);
98+
$("#channelDetailSettingChannelName").val(rowdata.ChannelName);
99+
$("#channelDetailSettingCallSign").val(rowdata.CallSign);
100+
$("#channelDetailSettingXMLTVID").val(rowdata.XMLTVID);
101+
$("#channelDetailSettingIconURL").val(rowdata.IconURL);
102+
if (rowdata.Visible == "Yes") {
103+
$("#channelDetailSettingVisible").attr('checked', true);
98104
}
105+
if (rowdata.UseEIT == "Yes")
106+
$("#channelDetailSettingUseEIT").attr('checked', true);
107+
108+
/* Advanced */
109+
110+
$("#channelDetailSettingFrequencyId").val(rowdata.FrequencyId);
111+
$("#channelDetailSettingMplexId").val(rowdata.MplexId);
112+
$("#channelDetailSettingServiceId").val(rowdata.ServiceId);
113+
$("#channelDetailSettingFormat").val(rowdata.Format);
114+
$("#channelDetailSettingDefaultAuthority").val(rowdata.DefaultAuth);
115+
$("#channelDetailSettingATSCMajorChannel").val(rowdata.ATSCMajorChan);
116+
$("#channelDetailSettingATSCMinorChannel").val(rowdata.ATSCMinorChan);
117+
118+
/* Expert */
119+
120+
$("#channelDetailSettingChanId").html(rowdata.ChanId);
121+
$("#channelDetailSettingSourceId").html(rowdata.SourceId);
122+
$("#channelDetailSettingModulation").html(rowdata.Modulation)
123+
$("#channelDetailSettingFrequency").html(rowdata.Frequency)
124+
$("#channelDetailSettingSIStandard").html(rowdata.SIStandard )
125+
126+
$("#edit").dialog({
127+
modal: true,
128+
width: 800,
129+
height: 620,
130+
'title': 'Edit Channel',
131+
closeOnEscape: false,
132+
buttons: {
133+
'Save': function() { saveChannelEdits(); },
134+
'Cancel': function() { $(this).dialog('close'); }
135+
}});
136+
137+
$("#channelsettings").accordion();
138+
139+
$("#edit").dialog("open");
140+
}
141+
142+
function saveChannelEdits() {
143+
var mplexid = $("#channelDetailSettingMplexId").val();
144+
var sourceid = $("#channelDetailSettingSourceId").html();
145+
var chanid = $("#channelDetailSettingChanId").html()
146+
147+
var callsign = $("#channelDetailSettingCallSign").val();
148+
var channelname = $("#channelDetailSettingChannelName").val();
149+
var channum = $("#channelDetailSettingChanNum").val();
150+
var serviceid = $("#channelDetailSettingServiceId").val();
151+
var atscmajorchannel = $("#channelDetailSettingATSCMajorChannel").val();
152+
var atscminorchannel = $("#channelDetailSettingATSCMinorChannel").val();
153+
154+
var useeit = false;
155+
156+
if ($("#channelDetailSettingUseEIT").attr("checked")) {
157+
useeit = true;
158+
}
159+
160+
var visible = false;
161+
162+
if ($("#channelDetailSettingVisible").attr("checked")) {
163+
visible = true;
164+
}
165+
166+
var frequencyid = $("#channelDetailSettingFrequencyId").val();
167+
var icon = $("#channelDetailSettingIconURL").val();
168+
var format = $("#channelDetailSettingFormat").val();
169+
var xmltvid = $("#channelDetailSettingXMLTVID").val();
170+
var defaultauth = $("#channelDetailSettingDefaultAuthority").val();
171+
172+
if ($("#channels").jqGrid('setRowData', chanid,
173+
{ MplexID: mplexid, SourceID: sourceid, ChanID: chanid,
174+
CallSign: callsign, ChannelName: channelname, ChanNum: channum,
175+
ServiceID: serviceid, ATSCMajorChan: atscmajorchannel,
176+
ATSCMinorChan: atscminorchannel, UseEIT: useeit, Visible: visible,
177+
FrequencyID: frequencyid, IconURL: icon, Format: format, XMLTVID: xmltvid,
178+
DefaultAuth: defaultauth }))
179+
{
180+
$.post("/Channel/UpdateDBChannel",
181+
{ MplexID: mplexid, SourceID: sourceid, ChannelID: chanid,
182+
CallSign: callsign, ChannelName: channelname, ChannelNumber: channum,
183+
ServiceID: serviceid, ATSCMajorChannel: atscmajorchannel,
184+
ATSCMinorChannel: atscminorchannel, UseEIT: useeit, visible: visible,
185+
FrequencyID: frequencyid, Icon: icon, Format: format, XMLTVID: xmltvid,
186+
DefaultAuthority: defaultauth},
187+
function(data) {
188+
if (data.bool == "true") {
189+
setStatusMessage("Channel updated successfully!");
190+
$("#edit").dialog('close');
191+
$('#channels').trigger('reloadGrid');
192+
}
193+
else
194+
setErrorMessage("Channel update failed!");
195+
}, "json");
196+
197+
setStatusMessage("Updating channel...");
198+
}
99199
}
100200

101201
function promptToDeleteChannel() {
102202
var message = "Are you sure you want to delete these channels? This cannot be undone.";
103-
var rowNum = $('#channels').getGridParam('selarrrow');
203+
var rowNum = $('#channels').getGridParam('selrow');
104204
if (rowNum != null) {
105205
if (rowNum.length == 1) {
106206
message = "Are you sure you want to delete this channel? This cannot be undone.";

0 commit comments

Comments
 (0)