* SHARE: rewrite - holding data now into database

2 files changed, 11 insertions, 15 deletions

diff --git a/skins/xstyle/bloecke/event_row.tmpl b/skins/xstyle/bloecke/event_row.tmpl
index 96edd9e..42b3cf0 100755
--- a/skins/xstyle/bloecke/event_row.tmpl
+++ b/skins/xstyle/bloecke/event_row.tmpl
@@ -7,7 +7,7 @@
     <?% ELSIF c == 2; # Text Field %?>
     <td>
         <?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field subtitle=fielddata.2 desc=fielddata.4 eventid=fielddata.0 linkid=fielddata.0 ttp_offset=0 %?>
-        <?% IF param.timers.${fielddata.0} %?>
+        <?% IF timerid %?>
         <b><?% field %?></b>
         <?% ELSE %?>
         <?% field %?>
@@ -23,20 +23,13 @@
     <?% ELSIF c == 3; # Subtitle Field %?>
 
     <?% ELSIF c == 4; # Channel field %?>
-    <?% chid_enc = reentities(field) %?>
-    <?% channel = param.channels.$chid_enc.POS %?>
-    <?% sender = param.channels.$chid_enc.Name %?>
     <td>
     <a href='?cmd=program&data=<?% channel %?>'><?% sender %?></a>
     </td>
     <?% ELSIF c == 5; # Desc Field %?>
 
-    <?% ELSIF c == 7; # Rank Field %?>
-    <td>
-    <?% field | format('%d') %?>
-    </td>
     <?% ELSE %?>
-        <?% IF param.timers.${fielddata.11} && param.timers.${fielddata.11}.activ %?>
+        <?% IF timerid && recording %?>
                 <td><b><?% field %?></b></td>
         <?% ELSE %?>
                 <td><?% field %?></td>
diff --git a/skins/xstyle/topten.tmpl b/skins/xstyle/topten.tmpl
index 548fef5..84ecde3 100755
--- a/skins/xstyle/topten.tmpl
+++ b/skins/xstyle/topten.tmpl
@@ -11,8 +11,6 @@
 <h1><?% gettext("Top Ten entrys") %?></h1>
 <h6><?% gettext("This Screen list the most programmed EPG Events from all XXV Users. Of course, we list only Events these are exists in your EPG Table!") %?></h6>
 <p/>
-<table>
-<tr>
 
 <div id="navcontainer">
 <ul id="navlist">
@@ -26,16 +24,21 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = [gettext('Service'),gettext('Title'),gettext('Channel'),gettext('Start'),gettext('Rank')] %?>
+        <?% FOREACH field = fields %?>
+            <?% NEXT IF field.match('^__') %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
         <?% FOREACH zeile = data %?>
-        <?% c=0;id=zeile.0;title=zeile.1;subtitle=zeile.2;description=zeile.3;channel_id=zeile.4;start=zeile.5;video=zeile.6;audio=zeile.7;rank=zeile.8;level=zeile.9;count=zeile.10 %?>
+        <?% c=0 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
+            channel=zeile.4;start=zeile.5;stop=zeile.6;day = zeile.7;description=zeile.8;
+            pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
+            video=zeile.13;audio=zeile.14;rank=zeile.15 div 1;level=zeile.16;quantity=zeile.17;
+            %?>
         <tr class="<?% myclass %?>"<?% IF (loop.count mod 2) == 0 %?> bgcolor='#F5F5F5'<?% END %?>>
-        <?% INCLUDE 'bloecke/event_row.tmpl' fielddata=[id,title,subtitle,channel_id,description,date.format(start, "%x %X", locale),rank] %?>
+        <?% INCLUDE 'bloecke/event_row.tmpl' fielddata=[id,title,subtitle,channel,description,start,stop,day,rank] %?>
         </tr>
-        <?% oldday = day %?>
         <?% END %?>
 <?% END %?>
 </table>