summaryrefslogtreecommitdiff
path: root/template/default
diff options
context:
space:
mode:
authorAndreas Mair <amair.sob@googlemail.com>2006-04-28 12:16:04 +0200
committerAndreas Mair <amair.sob@googlemail.com>2006-04-28 12:16:04 +0200
commit74606cfffbf79083902d79a330c00d46c12482e6 (patch)
tree963e2caf2609726f66e679961d0354395d4ec782 /template/default
parent136ed36ec93e38a84f88dbcb40ee7e17cdffa003 (diff)
downloadvdradmin-am-74606cfffbf79083902d79a330c00d46c12482e6.tar.gz
vdradmin-am-74606cfffbf79083902d79a330c00d46c12482e6.tar.bz2
2006-04-28: 3.4.5rcv3.4.5rc
- Changed: request full "from" email address for sending emails instead of domain only (Requested by siryoda). - Changed: no red background for inactive timers in prog_timeline (Requested by Zimbo). - Changed: result of a search is ordered by the event's start time instead of channel id (Suggested by scorp). - Fixed: crashes when sending emails (Thanks to Ville Skyttä for hints and siryoda for testing). - Fixed: error page sets charset correct. - Added: russian translation (Thanks to Oleg Roitburd and Allrussian-forum translation team) - Fixed: lots of perl warnings. - Updated: localization, French is again up-to-date (Thanks to Trois Six).
Diffstat (limited to 'template/default')
-rw-r--r--template/default/about.html2
-rw-r--r--template/default/bilder/sauerei.gifbin4692 -> 4444 bytes
-rw-r--r--template/default/config.html2
l---------[-rw-r--r--]template/default/copper/sauerei.gifbin4692 -> 21 bytes
l---------[-rw-r--r--]template/default/default/sauerei.gifbin4444 -> 21 bytes
-rw-r--r--template/default/help_config.html4
-rw-r--r--template/default/prog_timeline.html4
7 files changed, 6 insertions, 6 deletions
diff --git a/template/default/about.html b/template/default/about.html
index 37254e8..ac6c551 100644
--- a/template/default/about.html
+++ b/template/default/about.html
@@ -74,7 +74,7 @@
<tr class="row_even">
<td class="col_left"></td>
<td class="col_label" width="100px"><h4><%! French: !%></h4></td>
- <td class="col_value"><%! At the moment unmaintained, former translations by: !%> Trois Six, map, lobotomise, bads</td>
+ <td class="col_value"><!-- <%! At the moment unmaintained, former translations by: !%> -->Trois Six, map, lobotomise, bads</td>
<td class="col_right"></td>
</tr>
<tr class="row_even">
diff --git a/template/default/bilder/sauerei.gif b/template/default/bilder/sauerei.gif
index 24962b8..f931774 100644
--- a/template/default/bilder/sauerei.gif
+++ b/template/default/bilder/sauerei.gif
Binary files differ
diff --git a/template/default/config.html b/template/default/config.html
index 0b8904d..f01dbed 100644
--- a/template/default/config.html
+++ b/template/default/config.html
@@ -312,7 +312,7 @@
<tr class="row_even">
<td class="col_left"></td>
<td class="col_label"><h5><%! Send email as: !%></h5></td>
- <td class="col_value">autotimer@<input type="text" name="MAIL_FROMDOMAIN" value="<tmpl_var MAIL_FROMDOMAIN>" size="20" maxlength="100" /></td>
+ <td class="col_value"><input type="text" name="MAIL_FROM" value="<tmpl_var MAIL_FROM>" size="20" maxlength="100" /></td>
<td class="col_right"></td>
</tr>
<tr class="row_odd">
diff --git a/template/default/copper/sauerei.gif b/template/default/copper/sauerei.gif
index 1f9cfff..4479922 100644..120000
--- a/template/default/copper/sauerei.gif
+++ b/template/default/copper/sauerei.gif
Binary files differ
diff --git a/template/default/default/sauerei.gif b/template/default/default/sauerei.gif
index f931774..4479922 100644..120000
--- a/template/default/default/sauerei.gif
+++ b/template/default/default/sauerei.gif
Binary files differ
diff --git a/template/default/help_config.html b/template/default/help_config.html
index b58e31f..4034b2c 100644
--- a/template/default/help_config.html
+++ b/template/default/help_config.html
@@ -74,7 +74,7 @@
<dt><%! Password: !%></dt>
<dd><%! The main user's password. !%></dd>
<dt><%! Guest Account: !%></dt>
- <dd><%! If you want an user account having only limited privileges, this is for you. The guest user cannot modify anything, it's only allowed to view the EPG, timers, AutoTimers and recordings listings. !%></dd>
+ <dd><%! If you want a user account having only limited privileges, this is for you. The guest user cannot modify anything, it's only allowed to view the EPG, timers, AutoTimers and recordings listings. !%></dd>
<dt><%! Guest Username: !%></dt>
<dd><%! The username for the guest user. !%></dd>
<dt><%! Guest Password: !%></dt>
@@ -108,7 +108,7 @@
<dt><%! Send email after programming timer: !%></dt>
<dd><%! VDRAdmin-AM will send an email whenever an event matches an AutoTimer and a timer has been programmed if you enable this feature. !%></dd>
<dt><%! Send email as: !%></dt>
- <dd><%! Here you set the sending domain of the generated email. !%></dd>
+ <dd><%! Here you set the sending email address of the generated email. !%></dd>
<dt><%! Send email to: !%></dt>
<dd><%! The email address the email is sent to. !%></dd>
<dt><%! Mail server: !%></dt>
diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html
index 9bc3ba9..75e2c78 100644
--- a/template/default/prog_timeline.html
+++ b/template/default/prog_timeline.html
@@ -42,8 +42,8 @@
-%?>
<style type="text/css">
- #prgtable { border-left-width:1px; border-left-style:solid; border-bottom-width:1px; border-bottom-style:solid; padding:2px; }
- #timertable { border-left-width:1px; border-left-style:solid; border-bottom-width:1px; border-bottom-style:solid; padding:2px; }
+ #prgtable { border-left-width:1px; border-left-style:solid; border-bottom-width:1px; border-bottom-style:solid; padding-left:1px; }
+ #timertable { border-left-width:1px; border-left-style:solid; border-bottom-width:1px; border-bottom-style:solid; padding-left:1px; }
<?% IF jetzt_stunde >= akt_stunde && jetzt_stunde < akt_stunde + zeitrahmen %?>
#timeline { position:absolute; filter:Alpha(opacity=50); top:150px; left:<?% left + seite + (einheit * diff_minute) + 30 %?>px; width:1px; height:<?% shows.keys.size * 21 + 2 %?>px; z-index:10; z-index:2; }