Skip to content

Commit 441d055

Browse files
author
Till Brehm
committed
Merge branch 'stable-3.1' into 'stable-3.1'
 fixed placeholder in server-templates See merge request !416
2 parents 38699b9 + 68c4830 commit 441d055

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

‎install/tpl/apache_ispconfig.conf.master‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
# ISPConfig Logfile configuration for vlogger
44
################################################
55

6+
SetEnvIf Request_URI "^/datalogstatus.php$" dontlog
7+
68
LogFormat "%v %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
7-
CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig
9+
CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig env=!dontlog
810

911
<Directory /var/www/clients>
1012
AllowOverride None

‎interface/web/admin/templates/server_config_server_edit.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
7777
</div>
7878
<div class="form-group">
7979
<label for="monit_url" class="col-sm-3 control-label">{tmpl_var name='monit_url_txt'}</label>
80-
<div class="col-sm-6"><input type="text" name="monit_url" id="monit_url" value="{tmpl_var name='monit_url'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='monit_url_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
80+
<div class="col-sm-6"><input type="text" name="monit_url" id="monit_url" value="{tmpl_var name='monit_url'}" class="form-control" />&nbsp;{tmpl_var name='monit_url_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a></div>
8181
</div>
8282
<div class="form-group">
8383
<label for="monit_user" class="col-sm-3 control-label">{tmpl_var name='monit_user_txt'}</label>
@@ -87,7 +87,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
8787
<div class="col-sm-9"><input type="text" name="monit_password" id="monit_password" value="{tmpl_var name='monit_password'}" class="form-control" /></div></div>
8888
<div class="form-group">
8989
<label for="munin_url" class="col-sm-3 control-label">{tmpl_var name='munin_url_txt'}</label>
90-
<div class="col-sm-6"><input type="text" name="munin_url" id="munin_url" value="{tmpl_var name='munin_url'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='munin_url_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
90+
<div class="col-sm-6"><input type="text" name="munin_url" id="munin_url" value="{tmpl_var name='munin_url'}" class="form-control" />&nbsp;{tmpl_var name='munin_url_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a></div>
9191
</div>
9292
<div class="form-group">
9393
<label for="munin_user" class="col-sm-3 control-label">{tmpl_var name='munin_user_txt'}</label>

‎interface/web/admin/templates/server_config_web_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h4 class="panel-title">
4646
</div>
4747
<div class="form-group">
4848
<label for="website_autoalias" class="col-sm-3 control-label">{tmpl_var name='website_autoalias_txt'}</label>
49-
<div class="col-sm-6"><input type="text" name="website_autoalias" id="website_autoalias" value="{tmpl_var name='website_autoalias'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='website_autoalias_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[client_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[client_username]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_domain]</a>
49+
<div class="col-sm-6"><input type="text" name="website_autoalias" id="website_autoalias" value="{tmpl_var name='website_autoalias'}" class="form-control" /> &nbsp;{tmpl_var name='website_autoalias_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[client_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[client_username]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_domain]</a></div>
5050
</div>
5151
<div class="form-group apache">
5252
<label for="vhost_rewrite_v6" class="col-sm-3 control-label">{tmpl_var name='vhost_rewrite_v6_txt'}</label>

‎interface/web/admin/templates/system_config_mail_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
3737
</div>
3838
<div class="form-group">
3939
<label for="webmail_url" class="col-sm-3 control-label">{tmpl_var name='webmail_url_txt'}</label>
40-
<div class="col-sm-6"><input type="text" name="webmail_url" id="webmail_url" value="{tmpl_var name='webmail_url'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='webmail_url_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
40+
<div class="col-sm-6"><input type="text" name="webmail_url" id="webmail_url" value="{tmpl_var name='webmail_url'}" class="form-control" />&nbsp;{tmpl_var name='webmail_url_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a></div>
4141
</div>
4242
<div class="form-group">
4343
<label class="col-sm-3 control-label">{tmpl_var name='mailmailinglist_link_txt'}</label>

‎interface/web/admin/templates/system_config_sites_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
2828
</div>
2929
<div class="form-group">
3030
<label for="phpmyadmin_url" class="col-sm-3 control-label">{tmpl_var name='phpmyadmin_url_txt'}</label>
31-
<div class="col-sm-6"><input type="text" name="phpmyadmin_url" id="phpmyadmin_url" value="{tmpl_var name='phpmyadmin_url'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='phpmyadmin_url_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>, <a href="javascript:void(0);" class="addPlaceholder">[DATABASENAME]</a>
31+
<div class="col-sm-6"><input type="text" name="phpmyadmin_url" id="phpmyadmin_url" value="{tmpl_var name='phpmyadmin_url'}" class="form-control" />&nbsp;{tmpl_var name='phpmyadmin_url_note_txt'}<a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>, <a href="javascript:void(0);" class="addPlaceholder">[DATABASENAME]</a></div>
3232
</div>
3333
<div class="form-group">
3434
<label for="webftp_url" class="col-sm-3 control-label">{tmpl_var name='webftp_url_txt'}</label>

‎interface/web/client/lib/lang/de_client.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ $wb['username_error_regex'] = 'Der Benutzername enthält ungültige Zeichen.';
8484
$wb['password_strength_txt'] = 'Passwortkomplexität';
8585
$wb['template_master_txt'] = 'Mastervorlage';
8686
$wb['template_additional_txt'] = 'Erweiterte Vorlage';
87-
$wb['active_template_additional_txt'] = 'Aktive erweiterte Vorlage';
87+
$wb['active_template_additional_txt'] = 'Aktive erweiterte Vorlage(n)';
8888
$wb['add_additional_template_txt'] = 'Zusätzliches Template hinzufügen';
8989
$wb['delete_additional_template_txt'] = 'Zusätzliches Template löschen';
9090
$wb['ssh_chroot_txt'] = 'SSH Chroot Optionen';

0 commit comments

Comments
 (0)