From 8c42985fd234e2a993b3f01416941f4b371d1a92 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Mon, 24 Nov 2008 16:39:09 +0000
Subject: * Add Data::COW (Copy on write handling for user own config profile)
 * USER: Reimplement user own config profiles * MEDIALIB: Remove fix number of
 columns, use now floating layout * SVDRP: Add status message * xxvd: Change
 password failed, on none HTML-Consoles * AUTOTIMER: remove astatus (wrong
 callback) * XMLTV: fix import, add multi recorder capability * REPORT: clean
 up some routines * STATUS: remove usage of /bin/wc, use native perl code *
 CHANNELS: Fix hang at read channels, if recorder offline * TELNET: remove
 'quit' command do same like 'exit' * RECORDS: clone database handle for
 preview image generation * TIMERS: add more parameter check * xxvd: disable
 mysql_enable_utf8

---
 html/help.tmpl         |  4 ++--
 html/mldisplay.tmpl    | 16 ++++++----------
 html/mllistmedias.tmpl | 10 ++--------
 html/report.tmpl       |  9 ++++++++-
 4 files changed, 18 insertions(+), 21 deletions(-)

(limited to 'html')

diff --git a/html/help.tmpl b/html/help.tmpl
index d7a8c72..3889c07 100644
--- a/html/help.tmpl
+++ b/html/help.tmpl
@@ -111,8 +111,8 @@ logger.add(new WebFXTreeItem("<?% gettext("Syslog") %?>",    "?cmd=logger&data=s
 var admin = new WebFXTreeItem("<?% gettext("Administration") %?>",0,tree);
 <?% IF allow('vl') %?>admin.add(new WebFXTreeItem("<?% gettext("Video disk recorder",12) %?>",  "?cmd=vl"));<?% END %?>
 <?% IF allow('cl') %?>admin.add(new WebFXTreeItem("<?% gettext("Channels",12) %?>",  "?cmd=cl"));<?% END %?>
-<?% IF allow('ul') %?>admin.add(new WebFXTreeItem("<?% gettext("User") %?>","?cmd=ul"));
-<?% ELSIF allow('uprefs') %?>admin.add(new WebFXTreeItem("<?% gettext("Personality") %?>","?cmd=uprefs"));<?% END %?>
+<?% IF allow('ul') %?>admin.add(new WebFXTreeItem("<?% gettext("User") %?>","?cmd=ul"));<?% END %?>
+<?% IF allow('uprefs') %?>admin.add(new WebFXTreeItem("<?% gettext("Own settings") %?>","?cmd=uprefs"));<?% END %?>
 <?% IF allow('rel') %?>admin.add(new WebFXTreeItem("<?% gettext("Reload") %?>","?cmd=rel"));<?% END %?>
 <?% END %?>
 
diff --git a/html/mldisplay.tmpl b/html/mldisplay.tmpl
index 01a125e..c2680f7 100644
--- a/html/mldisplay.tmpl
+++ b/html/mldisplay.tmpl
@@ -207,21 +207,17 @@
 <tr>
     <td colspan="5">
         <b><?% gettext("Actors") %?>:</b><br>
-        <table width="100%">
+            <div>    
             <?% WHILE param.actors.size %?>
-            <tr>    
-                <?% FOREACH [ 1 .. param.actorcols ] %?>
                 <?% actor = param.actors.shift %?>
-                    <td width="<?% (100 - (100 mod param.actorcols)) / param.actorcols %?>%" valign="top">
+                    <div style="float:left;height:60px;width:160px;overflow:hidden">
                         <?% IF actor.0 %?>
-                        <img src='?cmd=mlcache&__source=<?% actor.1 %?>' alt="" border="0" width="44" height="60" />
-                        &nbsp;<a href="?cmd=mlsearch&__search&__selfields=actors&__searchitem=<?% actor.0 %?>"><?% actor.0 %?></a>
+                        <img style="float:left;margin-right:10px" src='?cmd=mlcache&__source=<?% actor.1 %?>' alt="" border="0" width="44" height="60" />
+                        <a href="?cmd=mlsearch&__search&__selfields=actors&__searchitem=<?% actor.0 %?>"><?% actor.0 %?></a>
                         <?% END %?>
-                    </td>
-                <?% END %?>
-            </tr>
+                    </div>
             <?% END %?>
-        </table>
+            </div>
     </td>
 </tr>
 <?% END %?>
diff --git a/html/mllistmedias.tmpl b/html/mllistmedias.tmpl
index e85f8be..123d2ff 100644
--- a/html/mllistmedias.tmpl
+++ b/html/mllistmedias.tmpl
@@ -1,12 +1,9 @@
 <?% IF data.size %?>
 <!-- TableTemplate -->
-<table width="100%">
 <?% WHILE data.size %?>
-<tr>    
-    <?% FOREACH [ 1 .. param.cols ] %?>
     <?% fields = data.shift %?>
-    <td width="<?% (100 - (100 mod param.cols)) / param.cols %?>%">
         <?% IF fields.0 %?>
+        <div style="float:left;height:150px;width:325px;overflow:hidden">
         <table width="100%">
             <tr>
                 <td>
@@ -46,10 +43,7 @@
                 </td>
             </tr>
         </table>
+        </div>
         <?% END %?>
-    </td>
     <?% END %?>
-</tr>
 <?% END %?>
-</table>
-<?% END %?>
\ No newline at end of file
diff --git a/html/report.tmpl b/html/report.tmpl
index 974148b..8b5c0b0 100644
--- a/html/report.tmpl
+++ b/html/report.tmpl
@@ -7,6 +7,10 @@
             link = '?cmd=rdisplay&data=';
         ELSIF name == 'AUTOTIMER';
             link = '?cmd=tedit&data=';
+        ELSIF name == 'SVDRP';
+            link = '?cmd=vdredit&data=';
+        ELSE;
+            link = '';
         END;
      %?>
 
@@ -32,7 +36,10 @@
                         <?% FOREACH field = zeile %?>
                             <?% c = c + 1 %?>
                             <?% NEXT IF fields.$c.match('^__') %?>
-                            <td><a href='<?% link %?><?% zeile.first %?>'><?% field %?></a></td>
+                            <td><?% IF link %?><a href="<?% link %?><?% zeile.first %?>"><?% END %?>
+                                <?% field %?>
+                                <?% IF link %?></a><?% END %?>
+                            </td>
                         <?% END %?>
                     </tr>
                     <?% END %?>
-- 
cgit v1.2.3