EPG: handle SI:content description

10 files changed, 180 insertions, 16 deletions

diff --git a/skins/deltab/display.tmpl b/skins/deltab/display.tmpl
index 6366e20..9ca79c2 100644
--- a/skins/deltab/display.tmpl
+++ b/skins/deltab/display.tmpl
@@ -21,6 +21,9 @@
   bild = data.last.13;
   pdc = data.last.14;
   channelid = data.last.15;
+  level = data.last.16;
+  content = data.last.17.split(" ");
+  rating = data.last.18;
 %?>
 <?% ######################################################################## %?>
 <div id="body">
@@ -65,6 +68,27 @@ END %?>
     <?% END %?>
 <?% description %?>
         </p>
+    <?% IF content.size %?>
+                    <p class="description">
+                      <?% gettext("Content") %?>:
+<?% FOREACH c=content %?>
+  <?% ct = getModule('EPG').content(c) %?>
+  <?% IF ct && loop.count != 1 %?>,<?% END %?>
+  <a href="?cmd=search&amp;__contentid=<?% c %?>">
+    <?% ct %?>
+  </a>
+<?% END %?>
+                    </p>
+    <?% END %?>
+    <?% IF level && allow('topten') %?>
+                    <p class="description">
+                    <a target="_blank" href="?cmd=topten">
+                    <div class="levelbar">
+                      <div style="width:<?% level*20 %?>%"></div>
+                    </div>
+                    </a>
+                    </p>
+    <?% END %?>
 		<?% END %?>
 </div>
 
diff --git a/skins/deltab/images/star_gray.png b/skins/deltab/images/star_gray.png
new file mode 120000
index 0000000..94e8640
--- /dev/null
+++ b/skins/deltab/images/star_gray.png
@@ -0,0 +1 @@
+../../stone/images/star_gray.png
\ No newline at end of file
diff --git a/skins/deltab/images/star_rated.png b/skins/deltab/images/star_rated.png
new file mode 120000
index 0000000..90218c9
--- /dev/null
+++ b/skins/deltab/images/star_rated.png
@@ -0,0 +1 @@
+../../stone/images/star_rated.png
\ No newline at end of file
diff --git a/skins/deltab/search.tmpl b/skins/deltab/search.tmpl
index bd28ef6..89ff729 100644
--- a/skins/deltab/search.tmpl
+++ b/skins/deltab/search.tmpl
@@ -137,6 +137,29 @@
                 <?% END %?>
             </select>
             <br /><br />
+            <?% gettext('Content',30) %?><br />
+            <select name='__contentid'>
+                <option value="0"><?% gettext('All contents') %?></option>
+                <?% h = 1;WHILE h < 16 %?>
+                    <?% c = h | format "%x" %?>
+                    <?% ct = getModule('EPG').content(c) %?>
+                    <?% IF ct %?>
+                      <optgroup label="<?% ct %?>">
+                      <option value="<?% c %?>"<?% ' selected="selected"' IF cgi.param('__contentid') == c %?>><?% gettext('All')%?> - <?% ct %?></option>
+                      <?% l = 0;WHILE l < 16 %?>
+                      <?% c = ((16 * h) + l) | format "%x" %?>
+                      <?% ct = getModule('EPG').content(c) %?>
+                        <?% IF ct %?>
+                          <option value="<?% c %?>"<?% ' selected="selected"' IF cgi.param('__contentid') == c %?>><?% ct %?></option>
+                        <?% END %?>
+                      <?% l = l + 1 %?>
+                      <?% END %?>
+                      </optgroup>
+                    <?% END %?>
+                  <?% h = h + 1 %?>
+                <?% END %?>
+            </select>
+            <br /><br />
             <input type='submit' value='<?% gettext('Search') %?>' />
     </p>
         </form>
diff --git a/skins/deltab/style.css b/skins/deltab/style.css
index bdff13e..1744ab0 100644
--- a/skins/deltab/style.css
+++ b/skins/deltab/style.css
@@ -430,3 +430,13 @@ border-style:solid;
 border-width:1px;
 padding:0;
 }
+
+.levelbar {
+  width: 80px;
+  background: url(images/star_gray.png) 0 0 repeat-x;
+}
+
+.levelbar div {
+  height: 16px;
+  background: url(images/star_rated.png) 0 0 repeat-x;
+}
diff --git a/skins/stone/display.tmpl b/skins/stone/display.tmpl
index fe255db..5a12e72 100644
--- a/skins/stone/display.tmpl
+++ b/skins/stone/display.tmpl
@@ -35,6 +35,8 @@
   pdc = data.last.14;
   channelid = data.last.15;
   level = data.last.16;
+  content = data.last.17.split(" ");
+  rating = data.last.18;
 %?>
 <?% ######################################################################## %?>
 <?% BLOCK dur %?>
@@ -154,6 +156,18 @@ END %?>
 <?% description %?>
                     </p>
     <?% END %?>
+    <?% IF content.size %?>
+                    <p class="description">
+                      <?% gettext("Content") %?>:
+<?% FOREACH c=content %?>
+  <?% ct = getModule('EPG').content(c) %?>
+  <?% IF ct && loop.count != 1 %?>,<?% END %?>
+  <a target="_blank" href="?cmd=search&amp;__contentid=<?% c %?>">
+    <?% ct %?>
+  </a>
+<?% END %?>
+                    </p>
+    <?% END %?>
     <?% IF level && allow('topten') %?>
                     <p class="description">
                     <a target="_blank" href="?cmd=topten">
diff --git a/skins/stone/search.tmpl b/skins/stone/search.tmpl
index 1f02520..2892687 100644
--- a/skins/stone/search.tmpl
+++ b/skins/stone/search.tmpl
@@ -168,6 +168,30 @@
                 <?% END %?>
             </select>
             <br /><br />
+            <?% gettext('Content',30) %?><br />
+            <select name='__contentid'>
+                <option value="0"><?% gettext('All contents') %?></option>
+                <?% h = 1;WHILE h < 16 %?>
+                    <?% c = h | format "%x" %?>
+                    <?% ct = getModule('EPG').content(c) %?>
+                    <?% IF ct %?>
+                      <optgroup label="<?% ct %?>">
+                      <option value="<?% c %?>"<?% ' selected="selected"' IF cgi.param('__contentid') == c %?>><?% gettext('All')%?> - <?% ct %?></option>
+                      <?% l = 0;WHILE l < 16 %?>
+                      <?% c = ((16 * h) + l) | format "%x" %?>
+                      <?% ct = getModule('EPG').content(c) %?>
+                        <?% IF ct %?>
+                          <option value="<?% c %?>"<?% ' selected="selected"' IF cgi.param('__contentid') == c %?>><?% ct %?></option>
+                        <?% END %?>
+                      <?% l = l + 1 %?>
+                      <?% END %?>
+                      </optgroup>
+                    <?% END %?>
+                  <?% h = h + 1 %?>
+                <?% END %?>
+            </select>
+            <br /><br />
+
             <input type='submit' value='<?% gettext('Search') %?>' />
         </form>
     </td>
diff --git a/skins/stone_flat/search.tmpl b/skins/stone_flat/search.tmpl
index 2e40b61..b45565d 100644
--- a/skins/stone_flat/search.tmpl
+++ b/skins/stone_flat/search.tmpl
@@ -158,6 +158,29 @@
                 <?% END %?>
             </select>
             <br /><br />
+            <?% gettext('Content',30) %?><br />
+            <select name='__contentid'>
+                <option value="0"><?% gettext('All contents') %?></option>
+                <?% h = 1;WHILE h < 16 %?>
+                    <?% c = h | format "%x" %?>
+                    <?% ct = getModule('EPG').content(c) %?>
+                    <?% IF ct %?>
+                      <optgroup label="<?% ct %?>">
+                      <option value="<?% c %?>"<?% ' selected="selected"' IF cgi.param('__contentid') == c %?>><?% gettext('All')%?> - <?% ct %?></option>
+                      <?% l = 0;WHILE l < 16 %?>
+                      <?% c = ((16 * h) + l) | format "%x" %?>
+                      <?% ct = getModule('EPG').content(c) %?>
+                        <?% IF ct %?>
+                          <option value="<?% c %?>"<?% ' selected="selected"' IF cgi.param('__contentid') == c %?>><?% ct %?></option>
+                        <?% END %?>
+                      <?% l = l + 1 %?>
+                      <?% END %?>
+                      </optgroup>
+                    <?% END %?>
+                  <?% h = h + 1 %?>
+                <?% END %?>
+            </select>
+            <br /><br />
             <input type='submit' value='<?% gettext('Search') %?>' />
         </form>
     </td>
diff --git a/skins/xstyle/display.tmpl b/skins/xstyle/display.tmpl
index 148e801..d9937f4 100644
--- a/skins/xstyle/display.tmpl
+++ b/skins/xstyle/display.tmpl
@@ -26,14 +26,15 @@
 <!-- TableTemplate -->
 <table border="0" width="95%">
 <?% fields = data.shift %?>
+<?% values = data.shift %?>
     <?% c = -1 %?>
-    <?% IF data.first.13 %?>
-       <?% Image = data.first.13 %?>
+    <?% IF values.13 %?>
+       <?% Image = values.13 %?>
     <?% END %?>
     <?% FOREACH field = fields %?>
         <?% c = c + 1 %?>
-        <?%# NEXT UNLESS data.first.$c %?>
-        <?% NEXT IF field == gettext('Percent') && data.first.$c > 100 %?>
+        <?%# NEXT UNLESS values.$c %?>
+        <?% NEXT IF field == gettext('Percent') && values.$c > 100 %?>
         <?% NEXT IF field.match('^__') %?>
         <?% IF field == gettext('Percent') %?>
                 <tr height="45">
@@ -42,15 +43,15 @@
         <?% END %?>
             <td><?% field %?></td>
         <?% IF field == gettext('Channel') %?>
-            <td><a href="?cmd=program&amp;data=<?% data.first.$c %?>"><?% data.first.$c %?></a></td>
+            <td><a href="?cmd=program&amp;data=<?% values.$c %?>"><?% values.$c %?></a></td>
         <?% ELSIF field == gettext('Service') %?>
             <td>
-                <?% INCLUDE 'bloecke/event_links.tmpl' data=data.first timerid=data.first.10 level=data.first.16 %?>
+                <?% INCLUDE 'bloecke/event_links.tmpl' data=values timerid=values.10 level=values.16 %?>
             </td>
         <?% ELSIF field == gettext('Percent') %?>
-            <?% NEXT IF data.first.$c > 100 %?>
+            <?% NEXT IF values.$c > 100 %?>
             <td valign='bottom'><nobr>
-                    <?% INCLUDE 'bloecke/percentbar.tmpl' barwidth=300 percent=(100-data.first.$c) color_switch=1 %?>
+                    <?% INCLUDE 'bloecke/percentbar.tmpl' barwidth=300 percent=(100-values.$c) color_switch=1 %?>
             </td>
 
         <?% ELSIF field == gettext('Description') %?>
@@ -62,25 +63,42 @@
                 <?% END %?>
                 </td></tr></table>
             <?% END %?>
-            <?% data.first.$c %?>
+            <?% values.$c %?>
             </td>
 
         <?% ELSIF field == gettext('Title') %?>
-            <td><?% data.first.$c %?></td>
+            <td><?% values.$c %?></td>
         <?% ELSIF field == gettext('Start') %?>
             <td>
-			          <?% date.format(data.first.$c,"%A, %x",locale) %?>&nbsp;
-                <?% date.format(data.first.$c,"%H:%M",locale) %?>
-                <?% IF data.first.14 && data.first.14 != data.first.$c %?>&nbsp;(<?% gettext("PDC") %?>&nbsp;<?% date.format(data.first.14,"%H:%M",locale) %?>) <?% END %?>
+			          <?% date.format(values.$c,"%A, %x",locale) %?>&nbsp;
+                <?% date.format(values.$c,"%H:%M",locale) %?>
+                <?% IF values.14 && values.14 != values.$c %?>&nbsp;(<?% gettext("PDC") %?>&nbsp;<?% date.format(values.14,"%H:%M",locale) %?>) <?% END %?>
             </td>
         <?% ELSIF field == gettext('Stop') %?>
             <td>
-			          <?% date.format(data.first.$c,"%A, %x",locale) %?>&nbsp;
-                <?% date.format(data.first.$c,"%H:%M",locale) %?>
+			          <?% date.format(values.$c,"%A, %x",locale) %?>&nbsp;
+                <?% date.format(values.$c,"%H:%M",locale) %?>
             </td>
         <?% ELSE %?>
-            <td><?% data.first.$c %?></td>
+            <td><?% values.$c %?></td>
         <?% END %?>
         </tr>
     <?% END %?>
+    <?% content = values.17.split(" "); %?>
+    <?% IF content.size %?>
+        <tr>
+          <td>
+          <?% gettext("Content") %?>
+          </td>
+          <td>
+<?% FOREACH c=content %?>
+  <?% ct = getModule('EPG').content(c) %?>
+  <?% IF ct && loop.count != 1 %?>,<?% END %?>
+  <a href="?cmd=search&amp;__contentid=<?% c %?>">
+    <?% ct %?>
+  </a>
+<?% END %?>
+          </td>
+          </tr>
+    <?% END %?>
 </table>
diff --git a/skins/xstyle/search.tmpl b/skins/xstyle/search.tmpl
index 9818492..086d841 100644
--- a/skins/xstyle/search.tmpl
+++ b/skins/xstyle/search.tmpl
@@ -72,6 +72,32 @@
     </td>
 </tr>
 <tr>
+    <td><?% gettext('Content') %?>:</td>
+    <td>
+            <select name='__contentid'>
+                <option value="0"><?% gettext('All contents') %?></option>
+                <?% h = 1;WHILE h < 16 %?>
+                    <?% c = h | format "%x" %?>
+                    <?% ct = getModule('EPG').content(c) %?>
+                    <?% IF ct %?>
+                      <optgroup label="<?% ct %?>">
+                      <option value="<?% c %?>"<?% ' selected="selected"' IF cgi.param('__contentid') == c %?>><?% gettext('All')%?> - <?% ct %?></option>
+                      <?% l = 0;WHILE l < 16 %?>
+                      <?% c = ((16 * h) + l) | format "%x" %?>
+                      <?% ct = getModule('EPG').content(c) %?>
+                        <?% IF ct %?>
+                          <option value="<?% c %?>"<?% ' selected="selected"' IF cgi.param('__contentid') == c %?>><?% ct %?></option>
+                        <?% END %?>
+                      <?% l = l + 1 %?>
+                      <?% END %?>
+                      </optgroup>
+                    <?% END %?>
+                  <?% h = h + 1 %?>
+                <?% END %?>
+            </select>
+    </td>
+</tr>
+<tr>
     <td colspan=2>
         <input type='submit' value='<?% gettext('Search') %?>'>&nbsp;
         <input type='reset' value='<?% gettext('Reset') %?>'>&nbsp;