maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- only show redirect-info on "path"-field for domain-pages, not for path-options pages, fixes #408

Browse Source 
refs #408
This commit is contained in:
Michael Kaufmann (d00p)
2010-09-17 05:16:06 +00:00
parent b103d719ea
commit ef97f63b73
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lng/english.lng.php
View File

@@ -497,7 +497,8 @@ $lng['admin']['mailserversettings'] = 'Mailserver settings';
$lng['admin']['nameserversettings'] = 'Nameserver settings'; $lng['admin']['nameserversettings'] = 'Nameserver settings';
$lng['admin']['updatecounters'] = 'Recalculate resource usage'; $lng['admin']['updatecounters'] = 'Recalculate resource usage';
$lng['question']['admin_counters_reallyupdate'] = 'Do you really want to recalculate resource usage?'; $lng['question']['admin_counters_reallyupdate'] = 'Do you really want to recalculate resource usage?';
$lng['panel']['pathDescription'] = 'If the directory doesn\'t exist, it will be created automatically.<br /><br />If you want a redirect to another domain than this entry has to start with http:// or https://'; $lng['panel']['pathDescription'] = 'If the directory doesn\'t exist, it will be created automatically.';
$lng['panel']['pathDescriptionEx'] = '<br /><br />If you want a redirect to another domain than this entry has to start with http:// or https://';
// ADDED IN 1.2.16-svn6 // ADDED IN 1.2.16-svn6

3
lng/german.lng.php
View File

@@ -496,7 +496,8 @@ $lng['admin']['mailserversettings'] = 'Mailservereinstellungen';
$lng['admin']['nameserversettings'] = 'Nameservereinstellungen'; $lng['admin']['nameserversettings'] = 'Nameservereinstellungen';
$lng['admin']['updatecounters'] = 'Ressourcenverbrauch'; $lng['admin']['updatecounters'] = 'Ressourcenverbrauch';
$lng['question']['admin_counters_reallyupdate'] = 'Wollen Sie den Ressourcenverbrauch neu berechnen?'; $lng['question']['admin_counters_reallyupdate'] = 'Wollen Sie den Ressourcenverbrauch neu berechnen?';
$lng['panel']['pathDescription'] = 'Wenn das Verzeichnis nicht existiert, wird es automatisch erstellt.<br /><br />Sollte eine Weiterleitung auf eine andere Domain gew&uuml;nscht sein, muss der Eintrag mit http:// oder https:// beginnen'; $lng['panel']['pathDescription'] = 'Wenn das Verzeichnis nicht existiert, wird es automatisch erstellt.';
$lng['panel']['pathDescriptionEx'] = '<br /><br />Sollte eine Weiterleitung auf eine andere Domain gew&uuml;nscht sein, muss der Eintrag mit http:// oder https:// beginnen';
// ADDED IN 1.2.16-svn6 // ADDED IN 1.2.16-svn6

2
templates/customer/domains/domains_add.tpl
View File

@@ -17,7 +17,7 @@ $header
</tr> </tr>
<if $settings['panel']['pathedit'] != 'Dropdown'> <if $settings['panel']['pathedit'] != 'Dropdown'>
<tr> <tr>
<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}</font></td> <td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}{$lng['panel']['pathDescriptionEx']}</font></td>
<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td> <td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
</tr> </tr>
</if> </if>

2
templates/customer/domains/domains_edit.tpl
View File

@@ -24,7 +24,7 @@ $header
</if> </if>
<if $settings['panel']['pathedit'] != 'Dropdown'> <if $settings['panel']['pathedit'] != 'Dropdown'>
<tr> <tr>
<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}</font></td> <td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}{$lng['panel']['pathDescriptionEx']}</font></td>
<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td> <td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
</tr> </tr>
</if> </if>