From 46e1f224d2168bb9b1fba76b33dd6718814892ae Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Mon, 24 Nov 2008 16:19:36 +0000
Subject: * Fix spelling * mllistmedias: remove hardcorded row handling

---
 skins/deltab/report.tmpl             |  9 ++++++++-
 skins/deltab/widgets/footer.tmpl     |  2 +-
 skins/deltab/widgets/littlemenu.tmpl |  2 +-
 skins/deltab/widgets/wait.tmpl       |  2 +-
 skins/stone/header.inc               |  2 +-
 skins/stone/report.tmpl              |  9 ++++++++-
 skins/stone/widgets/littlemenu.tmpl  |  2 +-
 skins/stone_flat/header.inc          |  2 +-
 skins/xstyle/mainmenu.inc            |  6 +++---
 skins/xstyle/mldisplay.tmpl          | 16 ++++++----------
 skins/xstyle/mllistmedias.tmpl       | 10 ++--------
 skins/xstyle/report.tmpl             |  9 ++++++++-
 12 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/skins/deltab/report.tmpl b/skins/deltab/report.tmpl
index 936ec42..b333bf3 100644
--- a/skins/deltab/report.tmpl
+++ b/skins/deltab/report.tmpl
@@ -9,6 +9,10 @@
             link = '?cmd=rdisplay&data=';
         ELSIF name == 'AUTOTIMER';
             link = '?cmd=tedit&data=';
+        ELSIF name == 'SVDRP';
+            link = '?cmd=vdredit&data=';
+        ELSE;
+            link = '';
         END;
      %?>
 
@@ -34,7 +38,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 %?>
diff --git a/skins/deltab/widgets/footer.tmpl b/skins/deltab/widgets/footer.tmpl
index a0f5dbe..6d98c4b 100644
--- a/skins/deltab/widgets/footer.tmpl
+++ b/skins/deltab/widgets/footer.tmpl
@@ -34,7 +34,7 @@
       <?% IF allow( 'rp' ) %?>       <a accesskey="b" href="?cmd=rp"><?% gettext("Report") %?></a> &middot;
       <?% ELSIF allow( 'lg' ) %?>    <a accesskey="b" href="?cmd=lg&data=main"><?% gettext("Log files") %?></a> &middot;<?% END %?>
       <?% IF allow( 'ce' ) %?>       <a accesskey="c" href="?cmd=ce"><?% gettext("Preferences") %?></a> &middot;
-      <?% ELSIF allow( 'uprefs' ) %?><a accesskey="u" href="?cmd=uprefs"><?% gettext("Personality") %?></a> &middot; 
+      <?% ELSIF allow( 'uprefs' ) %?><a accesskey="u" href="?cmd=uprefs"><?% gettext("Own settings") %?></a> &middot; 
       <?% END %?>
       <?% IF allow( 'logout' ) %?>   <a accesskey="q" href="?cmd=logout"><?% gettext("Logout") %?></a> &middot; <?% END %?>
       <?% IF allow( 'help' ) %?>     <a accesskey="h" href="?cmd=help">?</a> &middot; <?% END %?>
diff --git a/skins/deltab/widgets/littlemenu.tmpl b/skins/deltab/widgets/littlemenu.tmpl
index e335dfa..d6045ff 100644
--- a/skins/deltab/widgets/littlemenu.tmpl
+++ b/skins/deltab/widgets/littlemenu.tmpl
@@ -24,7 +24,7 @@
   <p class="section"><?% gettext("User administration",20) %?></p>
   <p>
       <?% IF allow( 'ul' ) %?>    <a href="?cmd=ul"><?% gettext("User",20) %?></a><br /><?% END %?>
-      <?% IF allow( 'uprefs' ) %?><a href="?cmd=uprefs"><?% gettext("Personality",20) %?></a><br /><?% END %?>
+      <?% IF allow( 'uprefs' ) %?><a href="?cmd=uprefs"><?% gettext("Own settings",20) %?></a><br /><?% END %?>
   </p>
   <?% END %?>
 <?% IF data.title %?>
diff --git a/skins/deltab/widgets/wait.tmpl b/skins/deltab/widgets/wait.tmpl
index ece6a35..23479c9 100644
--- a/skins/deltab/widgets/wait.tmpl
+++ b/skins/deltab/widgets/wait.tmpl
@@ -64,7 +64,7 @@ END %?>
       <?% IF allow( 'r' ) %?>        <a accesskey="f" class="headerNav" href="?cmd=r"><?% gettext("Remote") %?></a> &middot; <?% END %?>
       <?% IF allow( 'sa' ) %?>       <a accesskey="s" class="headerNav" href="?cmd=sa"><?% gettext("Status") %?></a> &middot; <?% END %?>
       <?% IF allow( 'ce' ) %?>       <a accesskey="c" class="headerNav" href="?cmd=ce"><?% gettext("Preferences") %?></a> &middot;
-      <?% ELSIF allow( 'uprefs' ) %?><a accesskey="u" class="headerNav" href="?cmd=uprefs"><?% gettext("Personality") %?></a> &middot; 
+      <?% ELSIF allow( 'uprefs' ) %?><a accesskey="u" class="headerNav" href="?cmd=uprefs"><?% gettext("Own settings") %?></a> &middot; 
       <?% END %?>
       <?% IF allow( 'logout' ) %?>   <a accesskey="q" class="headerNav" href="?cmd=logout"><?% gettext("Logout") %?></a> &middot; <?% END %?>
       <?% IF allow( 'help' ) %?>     <a accesskey="h" class="headerNav" href="?cmd=help">?</a> &middot; <?% END %?>
diff --git a/skins/stone/header.inc b/skins/stone/header.inc
index 12456fc..65dbbd5 100644
--- a/skins/stone/header.inc
+++ b/skins/stone/header.inc
@@ -25,7 +25,7 @@
       <?% IF allow( 'rp' ) %?>       <a accesskey="b" href="?cmd=rp"><?% gettext("Report") %?></a> &middot;
       <?% ELSIF allow( 'lg' ) %?>    <a accesskey="b" href="?cmd=lg&data=main"><?% gettext("Log files") %?></a> &middot;<?% END %?>
       <?% IF allow( 'ce' ) %?>       <a accesskey="c" href="?cmd=ce"><?% gettext("Preferences") %?></a> &middot;
-      <?% ELSIF allow( 'uprefs' ) %?><a accesskey="u" href="javascript:popupcmd('uprefs',620,450,0)"><?% gettext("Personality") %?></a> &middot; 
+      <?% ELSIF allow( 'uprefs' ) %?><a accesskey="u" href="javascript:popupcmd('uprefs',620,450,0)"><?% gettext("Own settings") %?></a> &middot; 
       <?% END %?>
       <?% IF allow( 'logout' ) %?>   <a accesskey="q" href="javascript:popupcmd('logout',620,450,1)"><?% gettext("Logout") %?></a> &middot; <?% END %?>
       <?% IF allow( 'help' ) %?>     <a accesskey="h" href="?cmd=help">?</a> &middot; <?% END %?>
diff --git a/skins/stone/report.tmpl b/skins/stone/report.tmpl
index 291f693..362a4f4 100644
--- a/skins/stone/report.tmpl
+++ b/skins/stone/report.tmpl
@@ -10,6 +10,10 @@
             link = '?cmd=rdisplay&data=';
         ELSIF name == 'AUTOTIMER';
             link = '?cmd=tedit&data=';
+        ELSIF name == 'SVDRP';
+            link = '?cmd=vdredit&data=';
+        ELSE;
+            link = '';
         END;
      %?>
 
@@ -39,7 +43,10 @@
                         <?% FOREACH field = zeile %?>
                             <?% c = c + 1 %?>
                             <?% NEXT IF fields.$c.match('^__') %?>
-                            <td><a href="javascript:popupwindow('<?% link %?><?% zeile.first %?>',620,670,0)"><?% field %?></a></td>
+                            <td><?% IF link %?><a href="javascript:popupwindow('<?% link %?><?% zeile.first %?>',620,670,0)"><?% END %?>
+                                <?% field %?>
+                                <?% IF link %?></a><?% END %?>
+                            </td>
                         <?% END %?>
                     </tr>
                     <?% END %?>
diff --git a/skins/stone/widgets/littlemenu.tmpl b/skins/stone/widgets/littlemenu.tmpl
index 5f80b5c..dc72054 100644
--- a/skins/stone/widgets/littlemenu.tmpl
+++ b/skins/stone/widgets/littlemenu.tmpl
@@ -30,7 +30,7 @@
     <tr>
     <td class="sidetext">
       <?% IF allow( 'ul' ) %?>    <a href="?cmd=ul"><?% gettext("User",20) %?></a><br /><?% END %?>
-      <?% IF allow( 'uprefs' ) %?><a href="javascript:popupcmd('uprefs',620,450,0)"><?% gettext("Personality",20) %?></a><br /><?% END %?>
+      <?% IF allow( 'uprefs' ) %?><a href="javascript:popupcmd('uprefs',620,450,0)"><?% gettext("Own settings",20) %?></a><br /><?% END %?>
     </td>
     </tr>
     <tr>
diff --git a/skins/stone_flat/header.inc b/skins/stone_flat/header.inc
index 12456fc..65dbbd5 100644
--- a/skins/stone_flat/header.inc
+++ b/skins/stone_flat/header.inc
@@ -25,7 +25,7 @@
       <?% IF allow( 'rp' ) %?>       <a accesskey="b" href="?cmd=rp"><?% gettext("Report") %?></a> &middot;
       <?% ELSIF allow( 'lg' ) %?>    <a accesskey="b" href="?cmd=lg&data=main"><?% gettext("Log files") %?></a> &middot;<?% END %?>
       <?% IF allow( 'ce' ) %?>       <a accesskey="c" href="?cmd=ce"><?% gettext("Preferences") %?></a> &middot;
-      <?% ELSIF allow( 'uprefs' ) %?><a accesskey="u" href="javascript:popupcmd('uprefs',620,450,0)"><?% gettext("Personality") %?></a> &middot; 
+      <?% ELSIF allow( 'uprefs' ) %?><a accesskey="u" href="javascript:popupcmd('uprefs',620,450,0)"><?% gettext("Own settings") %?></a> &middot; 
       <?% END %?>
       <?% IF allow( 'logout' ) %?>   <a accesskey="q" href="javascript:popupcmd('logout',620,450,1)"><?% gettext("Logout") %?></a> &middot; <?% END %?>
       <?% IF allow( 'help' ) %?>     <a accesskey="h" href="?cmd=help">?</a> &middot; <?% END %?>
diff --git a/skins/xstyle/mainmenu.inc b/skins/xstyle/mainmenu.inc
index 2e17cf9..6b1ad95 100644
--- a/skins/xstyle/mainmenu.inc
+++ b/skins/xstyle/mainmenu.inc
@@ -7,7 +7,7 @@ webfxMenuUseHover = true;
 webfxMenuHideTime = 500;
 webfxMenuShowTime = 200;
 WebFXMenu.prototype.width = 175;
-<?% cuttext = 25 %?>
+<?% cuttext = 20 %?>
 
 var myBar = new WebFXMenuBar;
 
@@ -121,8 +121,8 @@ var myBar = new WebFXMenuBar;
     var admin = new WebFXMenu;
     <?% IF allow('vl') %?>admin.add(new WebFXMenuItem("<?% gettext("Video disk recorder",cuttext ) %?>","?cmd=vl"));<?% END %?>
     <?% IF allow('cl') %?>admin.add(new WebFXMenuItem("<?% gettext("Channels",cuttext ) %?>",  "?cmd=cl"));<?% END %?>
-    <?% IF allow('ul') %?>admin.add(new WebFXMenuItem("<?% gettext("User",cuttext ) %?>","?cmd=ul"));
-    <?% ELSIF allow('uprefs') %?>admin.add(new WebFXMenuItem("<?% gettext("Personality",cuttext ) %?>","?cmd=uprefs"));<?% END %?>
+    <?% IF allow('ul') %?>admin.add(new WebFXMenuItem("<?% gettext("User",cuttext ) %?>","?cmd=ul"));<?% END %?>
+    <?% IF allow('uprefs') %?>admin.add(new WebFXMenuItem("<?% gettext("Own settings",cuttext ) %?>","?cmd=uprefs"));<?% END %?>
     <?% IF allow('rel') %?>admin.add(new WebFXMenuItem("<?% gettext("Reload",cuttext ) %?>","?cmd=rel"));<?% END %?>
     <?% IF allow('logout') %?>admin.add(new WebFXMenuItem("<?% gettext("Logout",cuttext ) %?>","?cmd=logout"));<?% END %?>
 
diff --git a/skins/xstyle/mldisplay.tmpl b/skins/xstyle/mldisplay.tmpl
index 01a125e..c2680f7 100644
--- a/skins/xstyle/mldisplay.tmpl
+++ b/skins/xstyle/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/skins/xstyle/mllistmedias.tmpl b/skins/xstyle/mllistmedias.tmpl
index e85f8be..123d2ff 100644
--- a/skins/xstyle/mllistmedias.tmpl
+++ b/skins/xstyle/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/skins/xstyle/report.tmpl b/skins/xstyle/report.tmpl
index 974148b..8b5c0b0 100644
--- a/skins/xstyle/report.tmpl
+++ b/skins/xstyle/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