Commits

Guido Draheim  committed f87b69b

Backed out of changeset 66:386165f2c393

  • Participants
  • Parent commits 386165f

Comments (0)

Files changed (15)

File src/dvbcronrecording/templates/channels_list.html

 		<h1>${title}</h1>
 		<xi:include href="channels_nav.html" />
 		<xi:include href="channelsconf_nav.html" />
-		<div>
-			<!--  -->
-			&nbsp; &nbsp; &nbsp; &nbsp;
-			<form method="post" action="${href.recording('channels/text')}"
-				class="actionform">
-				<select name="adapter">
-					<option py:for="adaptername in sorted(adapterlist)"
-						value="${adaptername}"
-						selected="${adaptername == adapter or None}">
-						${adaptername}</option>
-				</select>
-				<input type="submit" value="${_('channels.conf text')}"
-					class="actionbutton"></input>
-			</form>
-		</div>
-
-
+                <div>
+                        <!--  -->
+                        &nbsp; &nbsp; &nbsp; &nbsp;
+                        <form method="post" action="${href.recording('channels/text')}"
+                                class="actionform">
+                                <select name="adapter">
+                                        <option py:for="adaptername in sorted(adapterlist)" 
+                                           value="${adaptername}"
+                                           selected="${adaptername == adapter or None}">
+                                                ${adaptername}</option>
+                                </select>
+                                <input type="submit" value="${_('channels.conf text')}"
+                                        class="actionbutton"></input>
+                        </form>
+                </div>
+		
+		
 		<div>${message}</div>
 		<br />
 
 							<td class="adapter"><select name="adapter">
 									<option py:for="item_adapter in sorted(adapterlist)"
 										value="${item_adapter}"
-										selected="${item_adapter == item.adapter or None}">${item_adapter}</option>
+										selected="${item_adapter == item.adapter or None}"
+										>${item_adapter}</option>
 							</select></td>
 							<td class="title"><input type="text" name="title"
 								value="${item.title}"></input>
 						<td class="adapter"><select name="adapter">
 								<option py:for="item_adapter in sorted(adapterlist)"
 									value="${item_adapter}"
-									selected="${item_adapter == item.adapter or None}">${item_adapter}</option>
+                                                                        selected="${item_adapter == item.adapter or None}"
+									>${item_adapter}</option>
 						</select></td>
 						<td class="title"><input type="text" name="title"
 							value="${item.title}"></input>

File src/dvbcronrecording/templates/channels_nav.html

-
-<ul class="dvbcronpages">
-	<li><a href="${href.recording('list')}">${_('recording list')}</a>
-	</li>
-	<li><a href="${href.recording('channels/list')}">${_('channel
-			list')}</a>
-	</li>
-	<li><a href="${href.recording('file/list')}">${_('show
-			recorded files')}</a>
-	</li>
-</ul>
+  <ul class="dvbcronpages">
+     <li><a href="${href.recording('list')}">${_('recording list')}</a></li>
+     <li><a href="${href.recording('channels/list')}">${_('channel list')}</a></li>
+     <li><a href="${href.recording('file/list')}">${_('show recorded files')}</a></li>
+  </ul>
+  

File src/dvbcronrecording/templates/channelsconf_editor.html

     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:py="http://genshi.edgewall.org/"
-	xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:include href="layout.html" />
-<xi:include href="macros.html" />
-<head>
-<title>${title}</title>
-</head>
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="layout.html" />
+  <xi:include href="macros.html" />
+<head><title>${title}</title></head>
 <body>
-	<div id="ctxtnav" class="nav"></div>
+<div id="ctxtnav" class="nav">
+</div>
 
-	<div id="content" class="makefile">
-		<h1>${title}</h1>
-		<xi:include href="channels_nav.html" />
-		<xi:include href="channelsconf_nav.html" />
-		<div class="actionlist">
-			<form method="get" action="${href.recording('channelsconf/list')}"
-				class="actionform">
-				<select name="adapter">
-					<option py:for="adapter1 in sorted(adapterlist)"
-						selected="${adapter1 == adapter or None}" value="${adapter1}">
-						${adapter1}</option>
-				</select>
-				<input type="submit" value="${_('channel.conf list')}"
-					class="actionbutton"></input>
-			</form>
-			<form method="get" action="${href.recording('channelsconf/edit')}"
-				class="actionform">
-				<select name="adapter">
-					<option py:for="adapter1 in sorted(adapterlist)"
-						selected="${adapter1 == adapter or None}" value="${adapter1}">
-						${adapter1}</option>
-				</select>
-				<input type="submit" value="${_('channels.conf edit')}"
-					class="actionbutton"></input>
-			</form>
-		</div>
+<div id="content" class="makefile">
+  <h1>
+    ${title}
+  </h1>
+  <xi:include href="channels_nav.html" />
+  <xi:include href="channelsconf_nav.html" />
+  <div class="actionlist">
+          <form method="get" action="${href.recording('channelsconf/list')}" class="actionform">
+            <select name="adapter">
+                <option py:for="adapter1 in sorted(adapterlist)" 
+                        selected="${adapter1 == adapter or None}" 
+                        value="${adapter1}">
+                        ${adapter1}
+                </option>
+            </select>
+            <input type="submit" value="${_('channel.conf list')}" class="actionbutton"></input>
+          </form>
+          <form method="get" action="${href.recording('channelsconf/edit')}" class="actionform">
+            <select name="adapter">
+                <option py:for="adapter1 in sorted(adapterlist)" 
+                        selected="${adapter1 == adapter or None}" 
+                        value="${adapter1}">
+                        ${adapter1}
+                </option>
+            </select>
+            <input type="submit" value="${_('channels.conf edit')}" class="actionbutton"></input>
+          </form>
+   </div>
+  
+  <div class="messages">
+      <div py:for="line in messages">${line}</div>  
+  </div><br />
+  
+  
+  <form method="post" action="${href.recording('channelsconf/save')}">
+  <input type="submit" value="SAVE"></input>
+  <label for="adapter">${_("adapter")}:</label>
+  <select name="adapter">
+      <option py:for="adapter1 in sorted(adapterlist)"
+            selected="${adapter1 == adapter or None}" 
+            value="${adapter1}">
+             ${adapter1}
+      </option>
+  </select>
 
-		<div class="messages">
-			<div py:for="line in messages">${line}</div>
-		</div>
-		<br />
 
+  <br />
+  <textarea cols="80" rows="40" name="text">${text}</textarea>
+  <br />
+  <input type="submit" value="SAVE"></input>
+  </form>
+</div>
+<hr />
+</body></html>
 
-		<form method="post" action="${href.recording('channelsconf/save')}">
-			<input type="submit" value="SAVE"></input>
-			<label for="adapter">${_("adapter")}:</label>
-			<select name="adapter">
-				<option py:for="adapter1 in sorted(adapterlist)"
-					selected="${adapter1 == adapter or None}" value="${adapter1}">
-					${adapter1}</option>
-			</select>
-
-
-			<br />
-			<textarea cols="80" rows="40" name="text">${text}</textarea>
-			<br />
-			<input type="submit" value="SAVE"></input>
-		</form>
-	</div>
-	<hr />
-</body>
-</html>
-

File src/dvbcronrecording/templates/channelsconf_list.html

     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:py="http://genshi.edgewall.org/"
-	xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:include href="layout.html" />
-<xi:include href="macros.html" />
-<head>
-<title>${title}</title>
-</head>
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="layout.html" />
+  <xi:include href="macros.html" />
+<head><title>${title}</title></head>
 <body>
-	<div id="ctxtnav" class="nav"></div>
+<div id="ctxtnav" class="nav">
+</div>
 
-	<div id="content" class="recordingchannelsconf">
-		<h1>${title}</h1>
-		<xi:include href="channels_nav.html" />
-		<xi:include href="channelsconf_nav.html" />
-		<div class="actionlist">
-			&nbsp; &nbsp; &nbsp; &nbsp;
-			<form method="post" action="${href.recording('channelsconf/list')}"
-				class="actionform">
-				<select name="adapter">
-					<option py:for="adapter1 in sorted(adapterlist)"
-						selected="${adapter1 == adapter or None}" value="${adapter1}">${adapter1}
-					</option>
-				</select>
-				<input type="submit" value="${_('channel subselection')}"
-					class="actionbutton"></input>
-				<label for="channeltype">${_('channel type')}: </label>
-				<select name="channeltype">
-					<option py:for="name in channeltypelist" value="${name}"
-						selected="${name == channeltype or None}">${_(name)}</option>
-				</select>
-			</form>
-			<br /> &nbsp; &nbsp; &nbsp; &nbsp;
-			<form method="post" action="${href.recording('channelsconf/edit')}"
-				class="actionform">
-				<select name="adapter">
-					<option py:for="adapter1 in sorted(adapterlist)"
-						selected="${adapter1 == adapter or None}" value="${adapter1}">
-						${adapter1}</option>
-				</select>
-				<input type="submit" value="${_('channels.conf editor')}"
-					class="actionbutton"></input>
-			</form>
-		</div>
-		<div>${message}</div>
-		<br />
+<div id="content" class="recordingchannelsconf">
+  <h1>
+    ${title}
+  </h1>
+  <xi:include href="channels_nav.html" />
+  <xi:include href="channelsconf_nav.html" />
+  <div class="actionlist">
+                  &nbsp; &nbsp; &nbsp; &nbsp;
+          <form method="post" action="${href.recording('channelsconf/list')}" class="actionform">
+            <select name="adapter">
+                <option py:for="adapter1 in sorted(adapterlist)" 
+                        selected="${adapter1 == adapter or None}" 
+                        value="${adapter1}"
+                        >${adapter1}
+                </option>
+            </select>
+            <input type="submit" value="${_('channel subselection')}" class="actionbutton"></input>
+            <label for="channeltype">${_('channel type')}:
+            </label><select name="channeltype">
+                <option py:for="name in channeltypelist" 
+                        value="${name}" 
+                        selected="${name == channeltype or None}"
+                        >${_(name)}</option>
+            </select>
+          </form>
+          <br /> &nbsp; &nbsp; &nbsp; &nbsp;
+          <form method="post" action="${href.recording('channelsconf/edit')}" class="actionform">
+            <select name="adapter">
+                <option py:for="adapter1 in sorted(adapterlist)"
+                        selected="${adapter1 == adapter or None}" 
+                        value="${adapter1}">
+                        ${adapter1}
+                </option>
+            </select>
+            <input type="submit" value="${_('channels.conf editor')}" class="actionbutton"></input>
+          </form>
+   </div>
+  <div>${message}</div><br />
 
-		<table cellpadding="0" cellspacing="0">
-			<tr>
-				<th class="id">#</th>
-				<th class="adapter">${_('adapter')}&nbsp;</th>
-				<th class="title">${_('title')}&nbsp;</th>
-				<th class="frequency">${_('frequency')}&nbsp;</th>
-				<th class="polarity">${_('polarity')}&nbsp;</th>
-				<th class="source">${_('source')}&nbsp;</th>
-				<th class="symbolrate">${_('symbolrate')}&nbsp;</th>
-				<th class="vpid">${_('vpid')}&nbsp;</th>
-				<th class="apid">${_('apid')}&nbsp;</th>
-				<th class="tpid">${_('tpid')}&nbsp;</th>
-				<th>${_('action buttons')}</th>
-				<th>-&nbsp;</th>
-			</tr>
+  <table cellpadding="0" cellspacing="0">
+        <tr>
+      <th class="id">#</th>
+      <th class="adapter">${_('adapter')}&nbsp;</th> 
+      <th class="title">${_('title')}&nbsp;</th>
+      <th class="frequency">${_('frequency')}&nbsp;</th>
+      <th class="polarity">${_('polarity')}&nbsp;</th>
+      <th class="source">${_('source')}&nbsp;</th>
+      <th class="symbolrate">${_('symbolrate')}&nbsp;</th>
+      <th class="vpid">${_('vpid')}&nbsp;</th>
+      <th class="apid">${_('apid')}&nbsp;</th>
+      <th class="tpid">${_('tpid')}&nbsp;</th>
+      <th>${_('action buttons')}</th>
+      <th>-&nbsp;</th>
+      </tr>
 
-			<!-- ______________________ NEW _______________________ -->
-			<py:if test="perm.has_permission('DVBREC_CHANNELSCONF_EDIT')">
-				<div py:for="item in new_datalist">
-					<form method="post"
-						action="${href.recording('channelsconf/newentry')}">
-						<tr>
-							<td class="id new">${_('NEW')}</td>
-							<td class="adapter"><select name="adapter">
-									<option py:for="adapter1 in sorted(adapterlist)"
-										selected="${adapter1 == adapter or None}" value="${adapter1}">
-										${adapter1}</option>
-							</select></td>
-							<td class="title"><input type="text" name="newtitle"
-								value="${item.title}"></input></td>
-							<td class="frequency"><input type="text" name="frequency"
-								value="${item.frequency}"></input>
-							</td>
-							<td class="polarity"><select name="polarity">
-									<option py:for="name in sorted(polaritylist)" value="${name}"
-										selected="${ (name == item.polarity) or None}">
-										${polaritylist[name]}</option>
-							</select>
-							</td>
-							<td class="source"><input type="text" name="source"
-								value="${item.source}"></input>
-							</td>
-							<td class="symbolrate"><input type="text" name="symbolrate"
-								value="${item.symbolrate}"></input>
-							</td>
-							<td class="vpid"><input type="text" name="vpid"
-								value="${item.vpid}"></input>
-							</td>
-							<td class="apid"><input type="text" name="apid"
-								value="${item.apid}"></input>
-							</td>
-							<td class="tpid"><input type="text" name="tpid"
-								value="${item.tpid}"></input>
-							</td>
-							<td class="action"><input type="submit"
-								value="${_('insert')}"></input>
-							</td>
-							<td></td>
-						</tr>
-					</form>
-				</div>
-			</py:if>
-			<!-- ______________________ /NEW _______________________ -->
+    <!-- ______________________ NEW _______________________ -->      
+    <py:if test="perm.has_permission('DVBREC_CHANNELSCONF_EDIT')">
+  <div py:for="item in new_datalist">
+    <form method="post" action="${href.recording('channelsconf/newentry')}">
+      <tr>
+      <td class="id new">${_('NEW')}</td>
+      <td class="adapter">
+           <select name="adapter">
+                <option py:for="adapter1 in sorted(adapterlist)" 
+                        selected="${adapter1 == adapter or None}" 
+                        value="${adapter1}">
+                        ${adapter1}
+                </option>
+            </select>
+       </td>      
+       <td class="title">
+          <input type="text" name="newtitle" value="${item.title}"></input>
+      </td>
+      <td class="frequency"><input type="text" name="frequency" value="${item.frequency}"></input></td>
+      <td class="polarity"><select name="polarity">
+        <option py:for="name in sorted(polaritylist)" 
+                value="${name}" selected="${ (name == item.polarity) or None}">
+                ${polaritylist[name]}
+        </option> 
+      </select></td>
+      <td class="source"><input type="text" name="source" value="${item.source}"></input></td>
+      <td class="symbolrate"><input type="text" name="symbolrate" value="${item.symbolrate}"></input></td>
+      <td class="vpid"><input type="text" name="vpid" value="${item.vpid}"></input></td>
+      <td class="apid"><input type="text" name="apid" value="${item.apid}"></input></td>
+      <td class="tpid"><input type="text" name="tpid" value="${item.tpid}"></input></td>
+      <td class="action"><input type="submit" value="${_('insert')}"></input></td>
+      <td></td>
+      </tr>
+     </form>    
+  </div>    
+    </py:if>
+    <!-- ______________________ /NEW _______________________ -->      
 
-			<div py:for="item in datalist">
-				<form method="post" action="${href.channels('update')}">
-					<tr class="status${item.status}">
-						<td class="id"><py:if
-								test="perm.has_permission('DVBREC_CHANNELSCONF_EDIT')">
-								<span
-									py:with="item_adapter = quote_plus(item and item.adapter or '0'); item_title = quote_plus(item and item.title or '')">
-									<a
-									href="${href.recording('channelsconf/delete')}?adapter=${item_adapter}&amp;title=${item_title}">
-										<span class="delete"> &#x2716; </span> </a> </span>
-							</py:if></td>
-						<td class="adapter"><select name="adapter">
-								<option py:for="adapter1 in sorted(adapterlist)"
-									selected="${adapter1 == item.adapter or None}"
-									value="${adapter1}">${adapter1}</option>
-						</select></td>
-						<td class="title"><input type="text" name="title"
-							value="${item.title}"></input></td>
-						<td class="frequency"><input type="text" name="frequency"
-							value="${item.frequency}"></input>
-						</td>
-						<td class="polarity"><select name="polarity">
-								<option py:for="name in sorted(polaritylist)" value="${name}"
-									selected="${ (name == item.polarity) or None}">
-									${polaritylist[name]}</option>
-						</select>
-						</td>
-						<td class="source"><input type="text" name="source"
-							value="${item.source}"></input>
-						</td>
-						<td class="symbolrate"><input type="text" name="symbolrate"
-							value="${item.symbolrate}"></input>
-						</td>
-						<td class="vpid"><input type="text" name="vpid"
-							value="${item.vpid}"></input>
-						</td>
-						<td class="apid"><input type="text" name="apid"
-							value="${item.apid}"></input>
-						</td>
-						<td class="tpid"><input type="text" name="tpid"
-							value="${item.tpid}"></input>
-						</td>
-						<td class="action"
-							py:with="item_adapter = quote_plus(item and item.adapter or '0') ;  item_title = quote_plus(item and item.title or '')">
-							<py:if test="perm.has_permission('DVBREC_CHANNELSCONF_EDIT')">
-								<input type="submit" value="${_('update')}" class="actionbutton"></input>
-							</py:if></td>
-						<td><py:if test="perm.has_permission('DVBREC_CHANNELS_EDIT')">
-								<span class="deletebutton"
-									py:with="item_adapter = quote_plus(item and item.adapter or '0'); item_title = quote_plus(item and item.title or '')">
-									<a
-									href="${href.recording('channelsconf/takeover')}?adapter=${item_adapter}&amp;title=${item_title}">${_("takeover")}</a>
-								</span>
-							</py:if></td>
-					</tr>
-				</form>
-			</div>
-		</table>
-		<xi:include href="paginator_datalist.html" />
-	</div>
-	<hr />
+  <div py:for="item in datalist">
+  <form method="post" action="${href.channels('update')}">
+    <tr class="status${item.status}">
+      <td class="id">
+        <py:if test="perm.has_permission('DVBREC_CHANNELSCONF_EDIT')">
+           <span  py:with="item_adapter = quote_plus(item and item.adapter or '0'); item_title = quote_plus(item and item.title or '')">
+              <a href="${href.recording('channelsconf/delete')}?adapter=${item_adapter}&amp;title=${item_title}">
+                <span class="delete">
+                   &#x2716;
+                </span>           
+              </a>
+           </span>
+        </py:if>              
+       </td>
+      <td class="adapter"><select name="adapter">
+                <option py:for="adapter1 in sorted(adapterlist)" 
+                        selected="${adapter1 == item.adapter or None}" 
+                        value="${adapter1}">
+                        ${adapter1}
+        </option></select>
+      </td>
+      <td class="title">
+            <input type="text" name="title" value="${item.title}"></input>
+      </td>
+      <td class="frequency"><input type="text" name="frequency" value="${item.frequency}"></input></td>
+      <td class="polarity"><select name="polarity">
+        <option py:for="name in sorted(polaritylist)" 
+                value="${name}" selected="${ (name == item.polarity) or None}">
+                ${polaritylist[name]}
+        </option> 
+      </select></td>
+      <td class="source"><input type="text" name="source" value="${item.source}"></input></td>
+      <td class="symbolrate"><input type="text" name="symbolrate" value="${item.symbolrate}"></input></td>
+      <td class="vpid"><input type="text" name="vpid" value="${item.vpid}"></input></td>
+      <td class="apid"><input type="text" name="apid" value="${item.apid}"></input></td>
+      <td class="tpid"><input type="text" name="tpid" value="${item.tpid}"></input></td>
+      <td class="action" py:with="item_adapter = quote_plus(item and item.adapter or '0') ;  item_title = quote_plus(item and item.title or '')">
+        <py:if test="perm.has_permission('DVBREC_CHANNELSCONF_EDIT')">
+          <input type="submit" value="${_('update')}" class="actionbutton"></input>
+        </py:if>
+      </td><td>
+        <py:if test="perm.has_permission('DVBREC_CHANNELS_EDIT')">
+          <span  class="deletebutton" py:with="item_adapter = quote_plus(item and item.adapter or '0'); item_title = quote_plus(item and item.title or '')">
+            <a href="${href.recording('channelsconf/takeover')}?adapter=${item_adapter}&amp;title=${item_title}">${_("takeover")}</a>
+          </span>
+        </py:if>
+      </td>
+    </tr>
+    </form>
+  </div>
+  </table>
+  <xi:include href="paginator_datalist.html" />
+</div>
+<hr />
 
-</body>
-</html>
+</body></html>
 

File src/dvbcronrecording/templates/channelsconf_nav.html

-
-<ul class="channelsconfpages">
-	<li><a href="${href.recording('channelsconf/list/video')}">${_('video
-			channels')}</a>
-	</li>
-	<li><a href="${href.recording('channelsconf/list/radio')}">${_('radio
-			channels')}</a>
-	</li>
-	<li><a href="${href.recording('channelsconf/list')}">${_('channel.conf
-			show')}</a>
-	</li>
-	<li>&nbsp;<a href="${href.recording('channeltuning/list')}">${_('tuning
-			list')}</a>
-	</li>
-</ul>
+  <ul class="channelsconfpages">
+        <li><a href="${href.recording('channelsconf/list/video')}">${_('video channels')}</a></li>
+        <li><a href="${href.recording('channelsconf/list/radio')}">${_('radio channels')}</a></li>
+        <li><a href="${href.recording('channelsconf/list')}">${_('channel.conf show')}</a></li>
+        <li>&nbsp;<a href="${href.recording('channeltuning/list')}">${_('tuning list')}</a></li>
+  </ul>
+  

File src/dvbcronrecording/templates/channelsconf_take.html

     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:py="http://genshi.edgewall.org/"
-	xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:include href="layout.html" />
-<xi:include href="macros.html" />
-<head>
-<title>${title}</title>
-</head>
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="layout.html" />
+  <xi:include href="macros.html" />
+<head><title>${title}</title></head>
 <body>
-	<?python import string ?>
-	<div id="ctxtnav" class="nav"></div>
+<?python import string ?>
+<div id="ctxtnav" class="nav">
+</div>
 
-	<div id="content" class="recordingchannelsconf">
-		<h1>${title}</h1>
-		<xi:include href="channels_nav.html" />
-		<xi:include href="channelsconf_nav.html" />
-		<div class="actionlist">
-			<form method="get" action="${href.recording('channelsconf/list')}"
-				class="actionform">
-				<select name="adapter">
-					<option py:for="adapter1 in sorted(adapterlist)"
-						selected="${adapter1 == adapter or None}" value="${adapter1}">
-						${adapter1}</option>
-				</select>
-				<input type="submit" value="${_('channel.conf list')}"
-					class="actionbutton"></input>
-			</form>
-			<form method="get" action="${href.recording('channelsconf/edit')}"
-				class="actionform">
-				<select name="adapter">
-					<option py:for="adapter1 in sorted(adapterlist)"
-						selected="${adapter1 == adapter or None}" value="${adapter1}">
-						${adapter1}</option>
-				</select>
-				<input type="submit" value="${_('channels.conf edit')}"
-					class="actionbutton"></input>
-			</form>
-		</div>
-		<div>${message}</div>
-		<br />
+<div id="content" class="recordingchannelsconf">
+  <h1>
+    ${title}
+  </h1>
+  <xi:include href="channels_nav.html" />
+  <xi:include href="channelsconf_nav.html" />
+  <div class="actionlist">
+          <form method="get" action="${href.recording('channelsconf/list')}" class="actionform">
+            <select name="adapter">
+                <option py:for="adapter1 in sorted(adapterlist)" 
+                        selected="${adapter1 == adapter or None}" 
+                        value="${adapter1}">
+                        ${adapter1}
+                </option>
+            </select>
+            <input type="submit" value="${_('channel.conf list')}" class="actionbutton"></input>
+          </form>
+          <form method="get" action="${href.recording('channelsconf/edit')}" class="actionform">
+            <select name="adapter">
+                <option py:for="adapter1 in sorted(adapterlist)" 
+                        selected="${adapter1 == adapter or None}" 
+                        value="${adapter1}">
+                        ${adapter1}
+                </option>
+            </select>
+            <input type="submit" value="${_('channels.conf edit')}" class="actionbutton"></input>
+          </form>
+   </div>
+  <div>${message}</div><br />
 
-		<table cellpadding="0" cellspacing="0">
-			<tr>
-				<th class="id">#</th>
-				<th class="adapter">${_('adapter')}&nbsp;</th>
-				<th class="title">${_('title')}&nbsp;</th>
-				<th class="frequency">${_('frequency')}&nbsp;</th>
-				<th class="polarity">${_('polarity')}&nbsp;</th>
-				<th class="source">${_('source')}&nbsp;</th>
-				<th class="symbolrate">${_('symbolrate')}&nbsp;</th>
-				<th class="vpid">${_('vpid')}&nbsp;</th>
-				<th class="apid">${_('apid')}&nbsp;</th>
-				<th class="tpid">${_('tpid')}&nbsp;</th>
-			</tr>
+  <table cellpadding="0" cellspacing="0">
+        <tr>
+      <th class="id">#</th>
+      <th class="adapter">${_('adapter')}&nbsp;</th>
+      <th class="title">${_('title')}&nbsp;</th>
+      <th class="frequency">${_('frequency')}&nbsp;</th>
+      <th class="polarity">${_('polarity')}&nbsp;</th>
+      <th class="source">${_('source')}&nbsp;</th>
+      <th class="symbolrate">${_('symbolrate')}&nbsp;</th>
+      <th class="vpid">${_('vpid')}&nbsp;</th>
+      <th class="apid">${_('apid')}&nbsp;</th>
+      <th class="tpid">${_('tpid')}&nbsp;</th>
+      </tr>
+      
+  <div py:for="item in datalist">
+  <form method="post" action="${href.recording('channels/append')}">
+    <tr class="status${item.status}">
+      <td class="id">${item.id}<input type="hidden" name="id" value="${item.id}"></input></td>
+      <td class="adapter"><select readonly="readonly" name="adapter">
+                <option py:for="adapter1 in sorted(adapterlist)" 
+                        selected="${adapter1 == item.adapter or None}" 
+                        value="${adapter1}">
+                        ${adapter1}
+                </option>
+            </select>
+      </td>      
+      <td class="title">
+        <input readonly="readonly" type="text" name="title" value="${item.title}"></input>
+      </td>
+      <td class="frequency"><input readonly="readonly" type="text" name="frequency" value="${item.frequency}"></input></td>
+      <td class="polarity"><select readonly="readonly" name="polarity">
+        <option py:for="name in sorted(polaritylist)" 
+                value="${name}" selected="${ (name == item.polarity) or None}">
+                ${polaritylist[name]}
+        </option> 
+      </select></td>
+      <td class="source"><input readonly="readonly" type="text" name="source" value="${item.source}"></input></td>
+      <td class="symbolrate"><input readonly="readonly" type="text" name="symbolrate" value="${item.symbolrate}"></input></td>
+      <td class="vpid"><input readonly="readonly" type="text" name="vpid" value="${item.vpid}"></input></td>
+      <td class="apid"><input readonly="readonly" type="text" name="apid" value="${item.apid}"></input></td>
+      <td class="tpid"><input readonly="readonly" type="text" name="tpid" value="${item.tpid}"></input></td>
+      </tr><tr>
+         <td colspan="2">
+         <label for="channelname">${_('channelname')}: </label>
+         </td>
+         <td colspan="5" class="name" py:with="channelname = string.lower(item.title)">
+             <input type="text" name="channelname" value="${channelname}"></input>
+         </td>
+      <td class="action" colspan="3">
+        <input type="submit" value="${_('takeover')}" class="actionbutton" />
+      </td>
+    </tr>
+    </form>
+  </div>
+  </table>
+  <xi:include href="paginator_datalist.html" />
+</div>
+<hr />
+</body></html>
 
-			<div py:for="item in datalist">
-				<form method="post" action="${href.recording('channels/append')}">
-					<tr class="status${item.status}">
-						<td class="id">${item.id}<input type="hidden" name="id"
-							value="${item.id}"></input>
-						</td>
-						<td class="adapter"><select readonly="readonly"
-							name="adapter">
-								<option py:for="adapter1 in sorted(adapterlist)"
-									selected="${adapter1 == item.adapter or None}"
-									value="${adapter1}">${adapter1}</option>
-						</select></td>
-						<td class="title"><input readonly="readonly" type="text"
-							name="title" value="${item.title}"></input></td>
-						<td class="frequency"><input readonly="readonly" type="text"
-							name="frequency" value="${item.frequency}"></input>
-						</td>
-						<td class="polarity"><select readonly="readonly"
-							name="polarity">
-								<option py:for="name in sorted(polaritylist)" value="${name}"
-									selected="${ (name == item.polarity) or None}">
-									${polaritylist[name]}</option>
-						</select>
-						</td>
-						<td class="source"><input readonly="readonly" type="text"
-							name="source" value="${item.source}"></input>
-						</td>
-						<td class="symbolrate"><input readonly="readonly" type="text"
-							name="symbolrate" value="${item.symbolrate}"></input>
-						</td>
-						<td class="vpid"><input readonly="readonly" type="text"
-							name="vpid" value="${item.vpid}"></input>
-						</td>
-						<td class="apid"><input readonly="readonly" type="text"
-							name="apid" value="${item.apid}"></input>
-						</td>
-						<td class="tpid"><input readonly="readonly" type="text"
-							name="tpid" value="${item.tpid}"></input>
-						</td>
-					</tr>
-					<tr>
-						<td colspan="2"><label for="channelname">${_('channelname')}:
-						</label></td>
-						<td colspan="5" class="name"
-							py:with="channelname = string.lower(item.title)"><input
-							type="text" name="channelname" value="${channelname}"></input></td>
-						<td class="action" colspan="3"><input type="submit"
-							value="${_('takeover')}" class="actionbutton" /></td>
-					</tr>
-				</form>
-			</div>
-		</table>
-		<xi:include href="paginator_datalist.html" />
-	</div>
-	<hr />
-</body>
-</html>
-

File src/dvbcronrecording/templates/paginator_datalist.html

-<div class="paginator" xmlns:py="http://genshi.edgewall.org/">
-	<py:choose>
-		<py:when test="datalist.has_more_pages">
-			<caption>${_('Pages:')}</caption>
-			<ul class="pages">
-				<li py:for="pagenum in xrange(datalist.num_pages)"><span
-					class="${pagenum == datalist.page and 'selected' or ''}"> <a
-						href="${href(req.path_info)}?_pagenum=${pagenum}&amp;_pagesize=${_pagesize}&amp;${_selection}">${pagenum+1}</a>
-				</span>
-				</li>
-			</ul>
-
-			<span>&nbsp;&nbsp;&nbsp;&nbsp; (${_('shown')} </span>
-			<ul class="pagesizes">
-				<li py:for="max_per_page in [10,25,200,1000, datalist.num_items]">
-					<span
-					class="${max_per_page == datalist.max_per_page and 'selected' or ''}"
-					py:if="datalist.num_items >= max_per_page"> <span
-						py:if="datalist.num_items == max_per_page">${_(' of ')}</span> <a
-						href="${href(req.path_info)}?_pagenum=${datalist.page * datalist.max_per_page / max_per_page}&amp;_pagesize=${max_per_page}&amp;${_selection}">${max_per_page}</a>
-				</span>
-				</li>
-			</ul>${_('entries')})
-                        </py:when>
-		<py:otherwise>
-                        (${ngettext("%(n)s entry", "%(n)s entries", datalist.num_items, n = datalist.num_items )})
-                </py:otherwise>
-	</py:choose>
+<div class="paginator"
+ xmlns:py="http://genshi.edgewall.org/">
+ <py:choose>
+<py:when test="datalist.has_more_pages">
+  <caption>${_('Pages:')}</caption>
+  <ul class="pages">
+    <li py:for="pagenum in xrange(datalist.num_pages)">
+    <span class="${pagenum == datalist.page and 'selected' or ''}">
+      <a href="${href(req.path_info)}?_pagenum=${pagenum}&amp;_pagesize=${_pagesize}&amp;${_selection}">${pagenum+1}</a>
+    </span>
+    </li>
+  </ul>
+  &nbsp;&nbsp;&nbsp;&nbsp;
+  (${_('shown')}
+   <ul class="pagesizes">
+    <li py:for="max_per_page in [10,25,200,1000, datalist.num_items]">
+    <span class="${max_per_page == datalist.max_per_page and 'selected' or ''}" py:if="datalist.num_items >= max_per_page">
+      <span py:if="datalist.num_items == max_per_page">${_(' of ')}</span>
+      <a href="${href(req.path_info)}?_pagenum=${datalist.page * datalist.max_per_page / max_per_page}&amp;_pagesize=${max_per_page}&amp;${_selection}">${max_per_page}</a>
+    </span>
+    </li>
+  </ul>${_('entries')})
+</py:when>
+<py:otherwise>
+   (${ngettext("%(n)s entry", "%(n)s entries", datalist.num_items, n = datalist.num_items )})
+</py:otherwise>
+</py:choose>
 </div>

File src/dvbcronrecording/templates/recording_nav.html

-
-<ul class="recordingpages actionlist">
-	<li class="activate">&nbsp;<a href="${href.recording('activate')}">${_('activate!')}</a>&nbsp;</li>
-	<li><a href="${href.recording('makefile')}">${_('makefile')}</a>
-	</li>
-	<li><a href="${href.recording('cronfile')}">${_('cronfile')}</a>
-	</li>
-	<li><a href="${href.recording('edit')}">${_('edit as text')}</a>
-	</li>
-	<li class="planning"><a href="${href.recording('plan')}">${_('recording
-			plan')}</a>
-	</li>
-</ul>
+  <ul class="recordingpages actionlist">
+       <li class="activate">&nbsp;<a href="${href.recording('activate')}">${_('activate!')}</a>&nbsp;</li>
+       <li><a href="${href.recording('makefile')}">${_('makefile')}</a></li>
+       <li><a href="${href.recording('cronfile')}">${_('cronfile')}</a></li>
+       <li><a href="${href.recording('edit')}">${_('edit as text')}</a></li>
+       <li class="planning"><a href="${href.recording('plan')}">${_('recording plan')}</a></li>
+   </ul>

File src/dvbcronrecording/templates/recordingcronfile.html

     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:py="http://genshi.edgewall.org/"
-	xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:include href="layout.html" />
-<xi:include href="macros.html" />
-<head>
-<title>${title}</title>
-</head>
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="layout.html" />
+  <xi:include href="macros.html" />
+<head><title>${title}</title></head>
 <body>
-	<div id="ctxtnav" class="nav"></div>
+<div id="ctxtnav" class="nav">
+</div>
 
-	<div id="content" class="makefile">
-		<h1>${title}</h1>
-		<xi:include href="channels_nav.html" />
-		<xi:include href="recording_nav.html" />
+<div id="content" class="makefile">
+  <h1>
+    ${title}
+  </h1>
+  <xi:include href="channels_nav.html" />
+  <xi:include href="recording_nav.html" />
+ 
+  
+  <div class="messages">
+      <div py:for="line in messages">${line}</div>  
+  </div><br />
+  
+  <pre>${crontab}</pre>
+  <pre><div py:for="line in cronlines">${line}</div></pre>
+</div>
+<hr />
+</body></html>
 
-
-		<div class="messages">
-			<div py:for="line in messages">${line}</div>
-		</div>
-		<br />
-
-		<pre>${crontab}</pre>
-		<pre>
-			<div py:for="line in cronlines">${line}</div>
-		</pre>
-	</div>
-	<hr />
-</body>
-</html>
-

File src/dvbcronrecording/templates/recordingeditor.html

     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:py="http://genshi.edgewall.org/"
-	xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:include href="layout.html" />
-<xi:include href="macros.html" />
-<head>
-<title>${title}</title>
-</head>
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="layout.html" />
+  <xi:include href="macros.html" />
+<head><title>${title}</title></head>
 <body>
-	<div id="ctxtnav" class="nav"></div>
+<div id="ctxtnav" class="nav">
+</div>
 
-	<div id="content" class="makefile">
-		<h1>${title}</h1>
-		<xi:include href="channels_nav.html" />
-		<xi:include href="recording_nav.html" />
+<div id="content" class="makefile">
+  <h1>
+    ${title}
+  </h1>
+  <xi:include href="channels_nav.html" />
+  <xi:include href="recording_nav.html" />
+  
+  <div class="messages">
+      <div py:for="line in messages">${line}</div>  
+  </div><br />
+  
+  
+  <form method="post" action="${href.recording('save')}">
+  <input type="submit" value="SAVE"></input>
+  <br />
+  <textarea cols="80" rows="40" name="text">${text}</textarea>
+  <br />
+  <input type="submit" value="SAVE"></input>
+  </form>
+</div>
+<hr />
+</body></html>
 
-		<div class="messages">
-			<div py:for="line in messages">${line}</div>
-		</div>
-		<br />
-
-
-		<form method="post" action="${href.recording('save')}">
-			<input type="submit" value="SAVE"></input>
-			<br />
-			<textarea cols="80" rows="40" name="text">${text}</textarea>
-			<br />
-			<input type="submit" value="SAVE"></input>
-		</form>
-	</div>
-	<hr />
-</body>
-</html>
-

File src/dvbcronrecording/templates/recordingfiles.html

     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:py="http://genshi.edgewall.org/"
-	xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:include href="layout.html" />
-<xi:include href="macros.html" />
-<head>
-<title>${title}</title>
-</head>
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="layout.html" />
+  <xi:include href="macros.html" />
+<head><title>${title}</title></head>
 <body>
-	<div id="ctxtnav" class="nav"></div>
+<div id="ctxtnav" class="nav">
+</div>
 
-	<div id="content" class="showfiles">
-		<h1>${title}</h1>
-		<xi:include href="channels_nav.html" />
-		<xi:include href="recording_nav.html" />
-		<div>${message}</div>
-		<br />
+<div id="content" class="showfiles">
+  <h1>
+    ${title}
+  </h1>
+  <xi:include href="channels_nav.html" />
+  <xi:include href="recording_nav.html" />
+  <div>${message}</div><br />
+  
+  <py:if test="videofile">
+    <div class="videoframe">
+     <object height="${videoheight}" width="${videowidth}" type="${videotype}" 
+               data="${href.recording('file/data/'+videofile)}">
+       <div class="alternative">
+         Download 
+         <a href="${href.recording('file/data/'+videofile)}">
+                ${href.recording('file/data/'+videofile)}
+         </a>
+       </div>
+     </object>
+     </div>
+  </py:if>
+  
+  <table>
+    <thead>
+    <tr>
+        <th> &#x271A; </th>
+        <th> ${_("time")} </th>
+        <th> ${_("size")} </th>
+        <th> ${_("name")} </th>
+        <th> ${_("play")} </th>
+    </tr>
+    </thead>
+    <tbody>
+        <tr py:for="item in datalist" class="recordingfile">
+           <td>
+              <a href="${href.recording('file/remove/'+item.file)}">
+                <span class="delete">
+                   &#x2716;
+                </span>           
+              </a>
+           </td>
+           <td class="pref">
+              <a href="${href.recording('file/data/'+item.file)}">
+                   ${item.pref}
+              </a>
+           </td>
+           <td class="size">
+                   (${item.size / 1024})
+           </td>
+           <td class="name">
+              <a href="${href.recording('file/data/'+item.file)}">
+                <span class="name">
+                   ${item.name}
+                </span>           
+              </a>
+           </td>
+           <td class="play">
+              <a href="${href.recording('file/play/'+item.file)}">
+                <span class="player">
+                   ${_("play")}
+                </span>           
+              </a>
+              <a href="${href.recording('file/mplay/'+item.file)}">
+                <span class="player">
+                   ${_("mplay")}
+                </span>           
+              </a>
+           </td>               
+        </tr>
+    </tbody>
+  </table>
+  <xi:include href="paginator_datalist.html" />
 
-		<py:if test="videofile">
-			<div class="videoframe">
-				<object height="${videoheight}" width="${videowidth}"
-					type="${videotype}"
-					data="${href.recording('file/data/'+videofile)}">
-					<div class="alternative">
-						Download <a href="${href.recording('file/data/'+videofile)}">
-							${href.recording('file/data/'+videofile)} </a>
-					</div>
-				</object>
-			</div>
-		</py:if>
+</div>
+<hr />
+</body></html>
 
-		<table>
-			<thead>
-				<tr>
-					<th>&#x271A;</th>
-					<th>${_("time")}</th>
-					<th>${_("size")}</th>
-					<th>${_("name")}</th>
-					<th>${_("play")}</th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr py:for="item in datalist" class="recordingfile">
-					<td><a href="${href.recording('file/remove/'+item.file)}">
-							<span class="delete"> &#x2716; </span> </a>
-					</td>
-					<td class="pref"><a
-						href="${href.recording('file/data/'+item.file)}"> ${item.pref}
-					</a>
-					</td>
-					<td class="size">(${item.size / 1024})</td>
-					<td class="name"><a
-						href="${href.recording('file/data/'+item.file)}"> <span
-							class="name"> ${item.name} </span> </a>
-					</td>
-					<td class="play"><a
-						href="${href.recording('file/play/'+item.file)}"> <span
-							class="player"> ${_("play")} </span> </a> <a
-						href="${href.recording('file/mplay/'+item.file)}"> <span
-							class="player"> ${_("mplay")} </span> </a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<xi:include href="paginator_datalist.html" />
-
-	</div>
-	<hr />
-</body>
-</html>
-

File src/dvbcronrecording/templates/recordinglist.html

     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:py="http://genshi.edgewall.org/"
-	xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:include href="layout.html" />
-<xi:include href="macros.html" />
-<head>
-<title>${title}</title>
-</head>
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="layout.html" />
+  <xi:include href="macros.html" />
+<head><title>${title}</title></head>
 <body>
-	<div id="ctxtnav" class="nav"></div>
+<div id="ctxtnav" class="nav">
+</div>
 
-	<div id="content" class="recordinglist">
-		<h1>${title}</h1>
-		<xi:include href="channels_nav.html" />
-		<xi:include href="recording_nav.html" />
-		<div id="message">${message}</div>
-		<br />
+<div id="content" class="recordinglist">
+  <h1>
+    ${title}
+  </h1>
+  <xi:include href="channels_nav.html" />
+  <xi:include href="recording_nav.html" />
+  <div id="message">${message}</div><br />
 
-		<table cellpadding="0" cellspacing="0">
-			<tr>
-				<th>&nbsp;</th>
-				<th class="id">#</th>
-				<th class="channel">${_('channel')}</th>
-				<th class="newtime">${_('starts')}</th>
-				<th class="endtime">${_('ends')}</th>
-				<th class="extratime">${_('extra')}</th>
-				<th class="weekday">${_('weekday')}</th>
-				<th class="onlydate">${_('onlydate')}</th>
-				<th class="status">${_('status')} / ${_('prio')}</th>
-				<!-- </tr><tr> 
+  <table cellpadding="0" cellspacing="0">
+        <tr>
+      <th>&nbsp;</th>
+      <th class="id">#</th>
+      <th class="channel">${_('channel')}</th>
+      <th class="newtime">${_('starts')}</th>
+      <th class="endtime">${_('ends')}</th>
+      <th class="extratime">${_('extra')}</th>
+      <th class="weekday">${_('weekday')}</th>
+      <th class="onlydate">${_('onlydate')}</th>
+      <th class="status">${_('status')} / ${_('prio')}</th>
+      <!-- </tr><tr> 
       <th class="title">title</th>
       <th class="action">action</th>
        -->
-			</tr>
-
-			<py:if test="perm.has_permission('DVBREC_LIST_APPEND')">
-				<div py:for="item in defaults">
-					<form method="post" action="${href.recording('newentry')}">
-						<tr>
-							<td class="id new" colspan="2">${_('NEW')}</td>
-							<td class="channel"><select name="channelname">
-									<option py:for="name in channelnamelist" value="${name}"
-										selected="${ (name == item.channelname) or None}">
-										${name}</option>
-							</select></td>
-							<!-- 
+      </tr>
+      
+    <py:if test="perm.has_permission('DVBREC_LIST_APPEND')">
+    <div py:for="item in defaults">
+    <form method="post" action="${href.recording('newentry')}">
+      <tr>
+      <td class="id new" colspan="2">${_('NEW')}</td>
+      <td class="channel"><select name="channelname">
+        <option py:for="name in channelnamelist" 
+                value="${name}" selected="${ (name == item.channelname) or None}">
+                ${name}
+        </option> 
+      </select></td>
+      <!-- 
       <td class="channel"><input type="text" name="channelname" value="${item.channelname}"></input></td>
        -->
-							<td class="newtime"><input type="text" name="newtime"
-								value="${item.newtime}"></input></td>
-							<td class="endtime"><input type="text" name="endtime"
-								value="${item.endtime}"></input></td>
-							<td class="extratime"><input type="text" name="extratime"
-								value="${item.extratime}"></input></td>
-							<td class="weekday"><select name="weekday">
-									<option py:for="name in sorted(weekdaynames)" value="${name}"
-										selected="${ (name == item.weekday) or None}">
-										${weekdaynames[name]}</option>
-							</select></td>
-							<td class="onlydate"><input type="text" name="onlydate"
-								value="${item.onlydate}"></input></td>
-							<td class="status"><select name="status">
-									<option py:for="name in sorted(statusnames)" value="${name}"
-										selected="${ (name == item.status) or None}">
-										${statusnames[name]}</option>
-							</select><select name="priority">
-									<option py:for="name in sorted(prioritynames)" value="${name}"
-										selected="${ (name == item.priority) or None}">
-										${prioritynames[name]}</option>
-							</select></td>
-						</tr>
-						<tr>
-							<td align="right" colspan="2">&nbsp;&#x21AA;&nbsp;</td>
-							<td colspan="6" class="title"><input type="text"
-								name="title" value="${item.title}"></input></td>
-							<td class="action"><input type="submit"
-								value="${_('insert')}"></input></td>
-						</tr>
-					</form>
-				</div>
-			</py:if>
-
-			<div py:for="item in recordings">
-				<form method="post" action="${href.recording('update')}">
-					<tr class="status${item.status}">
-						<!-- 
+      <td class="newtime"><input type="text" name="newtime" value="${item.newtime}"></input></td>
+      <td class="endtime"><input type="text" name="endtime" value="${item.endtime}"></input></td>
+      <td class="extratime"><input type="text" name="extratime" value="${item.extratime}"></input></td>
+      <td class="weekday"><select name="weekday">
+        <option py:for="name in sorted(weekdaynames)" 
+                value="${name}" selected="${ (name == item.weekday) or None}">
+                ${weekdaynames[name]}
+        </option> 
+      </select></td>
+      <td class="onlydate"><input type="text" name="onlydate" value="${item.onlydate}"></input></td>
+      <td class="status"><select name="status">
+        <option py:for="name in sorted(statusnames)" 
+                value="${name}" selected="${ (name == item.status) or None}">
+                ${statusnames[name]}
+        </option>
+      </select><select name="priority">
+        <option py:for="name in sorted(prioritynames)" 
+                value="${name}" selected="${ (name == item.priority) or None}">
+                ${prioritynames[name]}
+        </option>
+      </select></td>
+      </tr><tr>
+      <td align="right" colspan="2">&nbsp;&#x21AA;&nbsp;</td>
+      <td colspan="6" class="title"><input type="text" name="title" value="${item.title}"></input></td>
+      <td class="action"><input type="submit" value="${_('insert')}"></input></td>
+      </tr>
+     </form></div>    
+    </py:if>
+  
+  <div py:for="item in recordings">
+  <form method="post" action="${href.recording('update')}">
+    <tr class="status${item.status}">
+      <!-- 
       <td class="delaction">
         <py:if test="perm.has_permission('DVBREC_LIST_DELETE')">
           <a href="${href.recording('delete')}?id=${item.id}">
           </a>
         </py:if>              
        </td>
-      -->
-						<td class="id" colspan="2"><a title="${item.channelname}">${item.id}</a>
-							<input type="hidden" name="id" value="${item.id}"></input></td>
-						<td class="channel"><select name="channelname">
-								<option py:for="name in channelnamelist" value="${name}"
-									selected="${ (name == item.channelname) or None}">
-									${name}</option>
-						</select>
-						</td>
-						<!--
+      -->       
+      <td class="id" colspan="2">
+        <a title="${item.channelname}">${item.id}</a>
+        <input type="hidden" name="id" value="${item.id}"></input></td>
+      <td class="channel"><select name="channelname">
+        <option py:for="name in channelnamelist" 
+                value="${name}" selected="${ (name == item.channelname) or None}">
+                ${name}
+        </option> 
+      </select>
+      </td>
+      <!--
        <td class="channel"><input type="text" name="channelname" value="${item.channelname}"></input></td>
        -->
-						<td class="newtime"><input type="text" name="newtime"
-							value="${item.newtime}"></input></td>
-						<td class="endtime"><input type="text" name="endtime"
-							value="${item.endtime}"></input></td>
-						<td class="extratime"><input type="text" name="extratime"
-							value="${item.extratime}"></input></td>
-						<td class="weekday"><select name="weekday">
-								<option py:for="name in sorted(weekdaynames)" value="${name}"
-									selected="${ (name == item.weekday) or None}">
-									${weekdaynames[name]}</option>
-						</select></td>
-						<td class="onlydate"><input type="text" name="onlydate"
-							value="${item.onlydate}"></input></td>
-						<td class="status"><select name="status">
-								<option py:for="name in sorted(statusnames)" value="${name}"
-									selected="${ (name == item.status) or None}">
-									${statusnames[name]}</option>
-						</select><select name="priority">
-								<option py:for="name in sorted(prioritynames)" value="${name}"
-									selected="${ (name == item.priority) or None}">
-									${prioritynames[name]}</option>
-						</select> <py:if test="perm.has_permission('DVBREC_LIST_DELETE')">
-								<a href="${href.recording('delete')}?id=${item.id}"> <span
-									class="delete"> &#x2716; </span> <!--  <span class="actionbuttion">${_('delete')}</span>  -->
-								</a>
-							</py:if>
-						</td>
-					</tr>
-					<tr class="status${item.status}">
-						<td align="right" colspan="2">&nbsp;&#x21AA;&nbsp;</td>
-						<td colspan="6" class="title"><input type="text" name="title"
-							value="${item.title}"></input></td>
-						<td class="action"><input type="submit"
-							value="${_('update')}" class="actionbutton" />
-						</td>
-					</tr>
-				</form>
-			</div>
-		</table>
-	</div>
-	<script>function parentsUntil(node, selector) {
+      <td class="newtime"><input type="text" name="newtime" value="${item.newtime}"></input></td>
+      <td class="endtime"><input type="text" name="endtime" value="${item.endtime}"></input></td>
+      <td class="extratime"><input type="text" name="extratime" value="${item.extratime}"></input></td>
+      <td class="weekday"><select name="weekday">
+        <option py:for="name in sorted(weekdaynames)" 
+                value="${name}" selected="${ (name == item.weekday) or None}">
+                ${weekdaynames[name]}
+        </option> 
+      </select></td>
+      <td class="onlydate"><input type="text" name="onlydate" value="${item.onlydate}"></input></td>
+      <td class="status"><select name="status">
+        <option py:for="name in sorted(statusnames)" 
+                value="${name}" selected="${ (name == item.status) or None}">
+                ${statusnames[name]}
+        </option>
+      </select><select name="priority">
+        <option py:for="name in sorted(prioritynames)" 
+                value="${name}" selected="${ (name == item.priority) or None}">
+                ${prioritynames[name]}
+        </option>
+      </select>
+        <py:if test="perm.has_permission('DVBREC_LIST_DELETE')">
+          <a href="${href.recording('delete')}?id=${item.id}">
+                <span class="delete">
+                   &#x2716;
+                </span>           
+                <!--  <span class="actionbuttion">${_('delete')}</span>  -->
+          </a>
+        </py:if>              
+      </td>
+   </tr><tr class="status${item.status}">
+      <td align="right" colspan="2">&nbsp;&#x21AA;&nbsp;</td>
+      <td colspan="6" class="title"><input type="text" name="title" value="${item.title}"></input></td>
+      <td class="action">
+        <input type="submit" value="${_('update')}" class="actionbutton" />
+      </td>
+    </tr>
+    </form>
+  </div>
+  </table>
+</div>
+<script><!--
+function parentsUntil(node, selector) {
     var N = node;
     if (N && $(N).is(selector)) return N; else N = $(N).parent();
     if (N && $(N).is(selector)) return N; else N = $(N).parent();
     });
 });
 --></script>
-	<hr />
-</body>
-</html>
+<hr />
+</body></html>
 

File src/dvbcronrecording/templates/recordingmakefile.html

     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:py="http://genshi.edgewall.org/"
-	xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:include href="layout.html" />
-<xi:include href="macros.html" />
-<head>
-<title>${title}</title>
-</head>
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="layout.html" />
+  <xi:include href="macros.html" />
+<head><title>${title}</title></head>
 <body>
-	<div id="ctxtnav" class="nav"></div>
+<div id="ctxtnav" class="nav">
+</div>
 
-	<div id="content" class="makefile">
-		<h1>${title}</h1>
-		<xi:include href="channels_nav.html" />
-		<xi:include href="recording_nav.html" />
+<div id="content" class="makefile">
+  <h1>
+    ${title}
+  </h1>
+  <xi:include href="channels_nav.html" />
+  <xi:include href="recording_nav.html" />
+  
+  
+  <dl>
+        <div py:for="item in entries">
+               <dt class="name">${item.name}</dt>
+               <dd class="rule">${item.rule}</dd>
+        </div>
+  </dl>
+</div>
+</body></html>
 
-
-		<dl>
-			<div py:for="item in entries">
-				<dt class="name">${item.name}</dt>
-				<dd class="rule">${item.rule}</dd>
-			</div>
-		</dl>
-	</div>
-</body>
-</html>
-

File src/dvbcronrecording/templates/recordingplan.html

     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:py="http://genshi.edgewall.org/"
-	xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:include href="layout.html" />
-<xi:include href="macros.html" />
-<head>
-<title>${title}</title>
-</head>
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="layout.html" />
+  <xi:include href="macros.html" />
+<head><title>${title}</title></head>
 <body>
-	<div id="ctxtnav" class="nav"></div>
+<div id="ctxtnav" class="nav">
+</div>
 
-	<div id="content" class="recordingplan">
-		<h1>${title}</h1>
-		<xi:include href="channels_nav.html" />
-		<xi:include href="recording_nav.html" />
-		<div>${message}</div>
-		<br />
-
-		<table>
-			<thead>
-				<tr>
-					<th colspan="2">${_("weekday")}</th>
-					<th>${_("onlydate")}</th>
-					<th>${_("newtime")}</th>
-					<th>${_("endtime")}</th>
-					<th>+</th>
-					<th>${_("channelname")}</th>
-					<th>${_("title")}</th>
-					<th>${_("hint")}</th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr py:for="item in recordings" class="recordingfile">
-					<!-- 
+<div id="content" class="recordingplan">
+  <h1>
+    ${title}
+  </h1>
+  <xi:include href="channels_nav.html" />
+  <xi:include href="recording_nav.html" />
+  <div>${message}</div><br />
+  
+ <table>
+    <thead>
+    <tr>
+        <th colspan="2"> ${_("weekday")} </th>
+        <th> ${_("onlydate")} </th>
+        <th> ${_("newtime")} </th>
+        <th> ${_("endtime")} </th>
+        <th> + </th>
+        <th> ${_("channelname")} </th>
+        <th> ${_("title")} </th>
+        <th> ${_("hint")} </th>
+    </tr>
+    </thead>
+    <tbody>
+        <tr py:for="item in recordings" class="recordingfile">
+        <!-- 
         <td py:if="item is None" colspan="6" class="font-size: xx-small"><hr /></td>
          -->
-					<td class="weekday" py:if="item is not None"><span
-						py:if="item.weekday in weekdaynames">
-							${weekdaynames[item.weekday]} </span> <span
-						py:if="item.weekday not in weekdaynames"> (${item.weekday})
-					</span></td>
-					<td class="adapter" py:if="item is not None">(${item.adapter
-						or "-"})</td>
-					<td py:if="item is not None"
-						class="date ${(item.groupcount and item.groupcount % 2) and 'group1' or 'group2'}">
-						<span py:if="item.months"> <span py:if="item.onlyday">
-								${item.onlyday}. ${item.months[0]}. </span> <span
-							py:if="not item.onlyday"> <!-- 
+      <td class="weekday" py:if="item is not None" >
+        <span py:if="item.weekday in weekdaynames">
+                ${weekdaynames[item.weekday]}
+        </span>
+        <span py:if="item.weekday not in weekdaynames">
+                (${item.weekday})
+        </span>
+     </td>
+     <td class="adapter" py:if="item is not None">(${item.adapter or "-"})</td>
+           <td py:if="item is not None" class="date ${(item.groupcount and item.groupcount % 2) and 'group1' or 'group2'}">
+               <span py:if="item.months">
+                  <span py:if="item.onlyday">
+                        ${item.onlyday}.
+                        ${item.months[0]}.
+                  </span>                        
+                  <span py:if="not item.onlyday">
+                  <!-- 
                      <span py:for="month in item.months">
                         <span>${month},</span>
                      </span>
-                   --> <span py:for="month in item.cronmonths"> <span>${month[0]}-${month[1]},</span>
-							</span> </span> </span></td>
-					<td py:if="item is not None"
-						class="newtime ${(item.groupcount and item.groupcount % 2) and 'group1' or 'group2'}">
-						${"%02i:%02i" % (item.newtimeMMM / 60, item.newtimeMMM % 60)}</td>
-					<td py:if="item is not None"
-						class="endtime ${(item.groupcount and item.groupcount % 2) and 'group1' or 'group2'}">
-						${"%02i:%02i" % (item.endtimeMMM / 60, item.endtimeMMM % 60)}</td>
-					<td py:if="item is not None"
-						class="extratime ${(item.groupcount and item.groupcount % 2) and 'group1' or 'group2'}">
-						<span py:if="item.extratimeM"> ${"+%i" % (item.extratimeM)}
-					</span></td>
-					<td class="channelname" py:if="item is not None"><span
-						class="rank">(${item.rank})</span> ${item.channelname}</td>
-					<td class="title" py:if="item is not None"><span
-						class="recorded" py:if="item.endtimeMMM != item.newtimeMMM">
-							${item.title} </span> <span class="deleted"
-						py:if="item.endtimeMMM == item.newtimeMMM"> ${item.title} </span>
-					</td>
-					<td class="hint" py:if="item is not None">${item.message}</td>
-				</tr>
-			</tbody>
-		</table>
+                   -->                        
+                     <span py:for="month in item.cronmonths"
+                     ><span>${month[0]}-${month[1]},</span></span>
+                  </span>                        
+               </span>
+           </td>
+           <td py:if="item is not None" class="newtime ${(item.groupcount and item.groupcount % 2) and 'group1' or 'group2'}">
+                   ${"%02i:%02i" % (item.newtimeMMM / 60, item.newtimeMMM % 60)}
+           </td>
+           <td py:if="item is not None" class="endtime ${(item.groupcount and item.groupcount % 2) and 'group1' or 'group2'}">
+                   ${"%02i:%02i" % (item.endtimeMMM / 60, item.endtimeMMM % 60)}
+           </td>
+           <td py:if="item is not None" class="extratime ${(item.groupcount and item.groupcount % 2) and 'group1' or 'group2'}">
+              <span py:if="item.extratimeM">
+                   ${"+%i" % (item.extratimeM)}
+              </span>
+           </td>
+           <td class="channelname" py:if="item is not None" >
+                   <span class="rank">(${item.rank})</span>
+                   ${item.channelname}
+           </td>
+           <td class="title" py:if="item is not None" >
+                   <span class="recorded" py:if="item.endtimeMMM != item.newtimeMMM">
+                   ${item.title}
+                   </span>
+                   <span class="deleted" py:if="item.endtimeMMM == item.newtimeMMM">
+                   ${item.title}
+                   </span>
+           </td>
+           <td class="hint" py:if="item is not None" >
+                   ${item.message}
+           </td>
+        </tr>
+    </tbody>
+  </table>
 
-	</div>
-	<hr />
-</body>
-</html>
+</div>
+<hr />
+</body></html>
 

File src/dvbcronrecording/templates/tuninglist.html

     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:py="http://genshi.edgewall.org/"
-	xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:include href="layout.html" />
-<xi:include href="macros.html" />
-<head>
-<title>${title}</title>
-</head>
+      xmlns:py="http://genshi.edgewall.org/"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="layout.html" />
+  <xi:include href="macros.html" />
+<head><title>${title}</title></head>
 <body>
-	<div id="ctxtnav" class="nav"></div>
+<div id="ctxtnav" class="nav">
+</div>
 
-	<div id="content" class="tuninglist">
-		<h1>${title}</h1>
-		<xi:include href="channels_nav.html" />
-		<xi:include href="channelsconf_nav.html" />
-		<div>${message}</div>
-		<br />
+<div id="content" class="tuninglist">
+  <h1>
+    ${title}
+  </h1>
+  <xi:include href="channels_nav.html" />
+  <xi:include href="channelsconf_nav.html" />
+  <div>${message}</div><br />
 
-		<table cellpadding="0" cellspacing="0">
-			<tr>
-				<th>x</th>
-				<th class="id">#</th>
-				<th class="adapter">${_('adapter')}&nbsp;</th>
-				<th class="transponder">${_('transponder')}&nbsp;</th>
-				<th class="scansettings">${_('scansettings')}&nbsp;</th>
-				<th>${_('action buttons')}</th>
-			</tr>
+  <table cellpadding="0" cellspacing="0">
+        <tr>
+      <th>x</th>
+      <th class="id">#</th>
+      <th class="adapter">${_('adapter')}&nbsp;</th>
+      <th class="transponder">${_('transponder')}&nbsp;</th>
+      <th class="scansettings">${_('scansettings')}&nbsp;</th>
+      <th>${_('action buttons')}</th>
+      </tr>
+      
+    <py:if test="perm.has_permission('DVBREC_TUNING_EDIT')">
+  <div py:for="item in newtunings">
+    <form method="post" action="${href.recording('channeltuning/newentry')}">
+      <tr>
+      <td class="id new" colspan="2">${_('NEW')}</td>
+      <td class="adapter"><input type="text" name="adapter" value="${item.adapter}"></input></td>
+      
+      <td class="transponder"><input type="text" name="transponder" value="${item.transponder}"></input></td>
+      <td class="scansettings"><input type="text" name="scansettings" value="${item.scansettings}"></input></td>
+      <td class="action"><input type="submit" value="${_('insert')}"></input></td>
+      </tr><tr>
+      <td align="right" colspan="2">&nbsp;&#x21AA;&nbsp;</td>
+      <td><label for="scansourcefile">${_('from')}</label></td>
+      <td class="scansourcefile"><input type="text" name="scansourcefile" value="${item.scansourcefile}"></input></td>
+      <td class="satellite"> &nbsp; ${_('satellite')}:&nbsp;
+         <input type="text" name="satellite" value="${item.satellite}"></input>
+      </td>      
+      </tr><tr>
+      <td align="right" colspan="2">&nbsp;&#x21AA;&nbsp;</td>
+      <td><label for="channelsconf">${_('related')}</label></td>
+      <td class="channelsconf"><input type="text" name="channelsconf" value="${item.channelsconf}"></input></td>
+      <td class="extra"> &nbsp;  ${_('as the original channels.conf')}
+      </td>
+      </tr>
+     </form>         
+  </div>    
+    </py:if>
 
-			<py:if test="perm.has_permission('DVBREC_TUNING_EDIT')">
-				<div py:for="item in newtunings">
-					<form method="post"
-						action="${href.recording('channeltuning/newentry')}">
-						<tr>
-							<td class="id new" colspan="2">${_('NEW')}</td>
-							<td class="adapter"><input type="text" name="adapter"
-								value="${item.adapter}"></input>
-							</td>
-
-							<td class="transponder"><input type="text"
-								name="transponder" value="${item.transponder}"></input>
-							</td>
-							<td class="scansettings"><input type="text"
-								name="scansettings" value="${item.scansettings}"></input>
-							</td>
-							<td class="action"><input type="submit"
-								value="${_('insert')}"></input>
-							</td>
-						</tr>
-						<tr>
-							<td align="right" colspan="2">&nbsp;&#x21AA;&nbsp;</td>
-							<td><label for="scansourcefile">${_('from')}</label>
-							</td>
-							<td class="scansourcefile"><input type="text"
-								name="scansourcefile" value="${item.scansourcefile}"></input>
-							</td>
-							<td class="satellite">&nbsp; ${_('satellite')}:&nbsp; <input
-								type="text" name="satellite" value="${item.satellite}"></input>
-							</td>
-						</tr>
-						<tr>
-							<td align="right" colspan="2">&nbsp;&#x21AA;&nbsp;</td>
-							<td><label for="channelsconf">${_('related')}</label>
-							</td>
-							<td class="channelsconf"><input type="text"
-								name="channelsconf" value="${item.channelsconf}"></input>
-							</td>
-							<td class="extra">&nbsp; ${_('as the original
-								channels.conf')}</td>
-						</tr>
-					</form>
-				</div>
-			</py:if>
-
-			<div py:for="item in tunings">
-				<form method="post"
-					action="${href.recording('channeltuning/update')}">
-					<tr class="status${item.status}">
-						<td><py:if test="perm.has_permission('DVBREC_TUNING_EDIT')">
-								<span class="deletebutton"> <a
-									href="${href.recording('channeltuning/delete')}?id=${item.id}">
-										&#x2716; </a> </span>
-							</py:if></td>
-						<td class="id">${item.id}<input type="hidden" name="id"
-							value="${item.id}"></input></td>