add icons for adding/editing a timer based on now/next epg of the ser…

…vicelist

.project

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>enigma2-plugins-js-rewrite</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>enigma2-plugins</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

.pydevproject

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
-</pydev_project>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+</pydev_project>

webinterface/src/web-data/core.js

@@ -1584,6 +1584,33 @@ var E2WebCore = Class.create({
 				event.stop();
 			}.bind(this)
 		);
+		content.on(
+			'click',
+			'.sListAddTimer',
+			function(event, element){
+				core.timers.addByEventId(element, 0);
+				event.stop();
+			}
+		);
+		content.on(
+			'click',
+			'.sListZapTimer',
+			function(event, element){
+				core.timers.addByEventId(element, 1);
+				event.stop();
+			}
+		);
+		content.on(
+			'click',
+			'.sListEditTimer',
+			function(event, element){
+				var hash = ["#!/timer", "edit"].join("/");
+				hashListener.setHash(hash);
+				core.timers.editFromEvent(element);
+				event.stop();
+			}
+		);
+
 		//Timerlist
 		content.on(
 			'click',

webinterface/src/web-data/tpl/default/tplServiceList.htm

@@ -16,7 +16,7 @@
 														</td>
 														<td style="width: 470px;">
 															<div class="sListSName">
-																
+
 																<a href="#" id="${item.now.servicereference}" class="sListSLink" title="Zap to ${item.now.servicename}">${item.now.servicename}</a>
 															</div>
 														</td>
@@ -46,7 +46,19 @@
 																		{/if}
 																	</tr>
 																	<tr class="sListExtEpgLong" style="display:none">
-																		<td colspan="4" class="epgLong">${item.now.extdescription}</td>
+																		<td colspan="4" class="epgListItem epgLong"
+																			data-servicereference="${item.now.servicereference}"
+																			data-servicename="${item.now.servicename}"
+																			data-eventid="${item.now.eventid}"
+																			data-start="${item.now.start}"
+																			data-end=${item.now.end}
+																			data-title="${item.now.title}"
+																			data-description="${item.now.description}">${item.now.extdescription}<br>
+																			<div style="text-align:right;">
+																				<a href="#" class="sListAddTimer"><img src="/web-data/img/clock.png" title="Add Timer" onClick="return false;" border="0"></a>&nbsp;&nbsp;
+																				<a href="#" class="sListZapTimer"><img src="/web-data/img/clock_play.png" title="Add zap Timer" onClick="return false;" border="0"></a>&nbsp;&nbsp;
+																				<a href="#" class="sListEditTimer"><img src="/web-data/img/clock_edit.png" title="Edit and add timer" onClick="return false;" border="0"></a>&nbsp;&nbsp;
+																			</div>
 																	</tr>
 																</table>
 															</a>
@@ -68,7 +80,19 @@
 																		{/if}
 																	</tr>
 																	<tr class="sListExtEpgLong" style="display:none">
-																		<td colspan="4" class="epgLong">${item.next.extdescription}</td>
+																		<td colspan="4" class="epgListItem epgLong"
+																			data-servicereference="${item.next.servicereference}"
+																			data-servicename="${item.next.servicename}"
+																			data-eventid="${item.next.eventid}"
+																			data-start="${item.next.start}"
+																			data-end=${item.next.end}
+																			data-title="${item.next.title}"
+																			data-description="${item.next.description}">${item.next.extdescription}<br>
+																			<div style="text-align:right;">
+																				<a href="#" class="sListAddTimer"><img src="/web-data/img/clock.png" title="Add Timer" onClick="return false;" border="0"></a>&nbsp;&nbsp;
+																				<a href="#" class="sListZapTimer"><img src="/web-data/img/clock_play.png" title="Add zap Timer" onClick="return false;" border="0"></a>&nbsp;&nbsp;
+																				<a href="#" class="sListEditTimer"><img src="/web-data/img/clock_edit.png" title="Edit and add timer" onClick="return false;" border="0"></a>&nbsp;&nbsp;
+																			</div>
 																	</tr>
 																</table>
 															</a>

webinterface/src/web-data/tpl/default/tplServiceListEPGItem.htm

@@ -1,5 +1,5 @@
 
-<!-- tplServiceListEPGItem -->	
+<!-- tplServiceListEPGItem -->
 															{if item.title != ''}
 															<a href="#" class="sListExtEpg" title="Click to show/hide extended Description">
 																<table cellspacing="0">
@@ -15,6 +15,21 @@
 																	<tr class="sListExtEpgLong" style="display:none">
 																		<td colspan="4" class="epgLong">${item.extdescription}</td>
 																	</tr>
+																	<tr class="sListExtEpgLong" style="display:none">
+																		<td colspan="4" class="epgListItem epgLong"
+																			data-servicereference="${item.servicereference}"
+																			data-servicename="${item.servicename}"
+																			data-eventid="${item.eventid}"
+																			data-start="${item.start}"
+																			data-end=${item.end}
+																			data-title="${item.title}"
+																			data-description="${item.description}">${item.extdescription}<br>
+																			<div style="text-align:right;">
+																				<a href="#" class="sListAddTimer"><img src="/web-data/img/clock.png" title="Add Timer" onClick="return false;" border="0"></a>&nbsp;&nbsp;
+																				<a href="#" class="sListZapTimer"><img src="/web-data/img/clock_play.png" title="Add zap Timer" onClick="return false;" border="0"></a>&nbsp;&nbsp;
+																				<a href="#" class="sListEditTimer"><img src="/web-data/img/clock_edit.png" title="Edit and add timer" onClick="return false;" border="0"></a>&nbsp;&nbsp;
+																			</div>
+																	</tr>
 																</table>
 															</a>
 															{/if}