From 44866b1b26b87114a232166343b52fe3f87cf27d Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 20 Apr 2016 12:19:22 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
---
interface/web/sites/templates/web_vhost_domain_edit.htm | 4 ++--
interface/web/sites/lib/lang/de_web_vhost_domain_list.lng | 2 ++
interface/web/sites/lib/lang/en_web_vhost_domain_list.lng | 2 ++
interface/web/sites/lib/lang/en_web_vhost_domain_admin_list.lng | 2 ++
interface/web/sites/lib/lang/de_web_vhost_domain_admin_list.lng | 2 ++
5 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/interface/web/sites/lib/lang/de_web_vhost_domain_admin_list.lng b/interface/web/sites/lib/lang/de_web_vhost_domain_admin_list.lng
index d9dc65c..70242c9 100644
--- a/interface/web/sites/lib/lang/de_web_vhost_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/de_web_vhost_domain_admin_list.lng
@@ -6,4 +6,6 @@
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Neue Webseite hinzufügen';
+$wb['add_new_subdomain_txt'] = 'Neue Subdomain hinzufügen';
+$wb['add_new_aliasdomain_txt'] = 'Neue Aliasdomain hinzufügen';
?>
diff --git a/interface/web/sites/lib/lang/de_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/de_web_vhost_domain_list.lng
index c2c291f..3750834 100644
--- a/interface/web/sites/lib/lang/de_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_vhost_domain_list.lng
@@ -5,5 +5,7 @@
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Neue Domain hinzufügen';
+$wb['add_new_subdomain_txt'] = 'Neue Subdomain hinzufügen';
+$wb['add_new_aliasdomain_txt'] = 'Neue Aliasdomain hinzufügen';
$wb['parent_domain_id_txt'] = 'Webseite';
?>
diff --git a/interface/web/sites/lib/lang/en_web_vhost_domain_admin_list.lng b/interface/web/sites/lib/lang/en_web_vhost_domain_admin_list.lng
index e8825ae..0b3a969 100644
--- a/interface/web/sites/lib/lang/en_web_vhost_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/en_web_vhost_domain_admin_list.lng
@@ -6,4 +6,6 @@
$wb["server_id_txt"] = 'Server';
$wb["domain_txt"] = 'Domain';
$wb["add_new_record_txt"] = 'Add new website';
+$wb['add_new_subdomain_txt'] = 'Add new subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new aliasdomain';
?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/en_web_vhost_domain_list.lng
index b8f85d3..6477c9e 100644
--- a/interface/web/sites/lib/lang/en_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/en_web_vhost_domain_list.lng
@@ -5,6 +5,8 @@
$wb['server_id_txt'] = 'Server';
$wb['domain_txt'] = 'Domain';
$wb['add_new_record_txt'] = 'Add new website';
+$wb['add_new_subdomain_txt'] = 'Add new subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new aliasdomain';
$wb['parent_domain_id_txt'] = 'Website';
?>
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index 468797e..95e97e7 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -126,7 +126,7 @@
</tmpl_if>
<div class="form-group">
<label for="web_folder" class="col-sm-3 control-label">{tmpl_var name='web_folder_txt'}</label>
- <div class="col-sm-6"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'></div><div class="col-sm-3 input-sm"> readonly="readonly"</div></tmpl_if> />
+ <div class="col-sm-9"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'>readonly="readonly"</tmpl_if> /></div>
</div>
</tmpl_if>
<tmpl_if name="vhostdomain_type" value="aliasdomain">
@@ -148,7 +148,7 @@
</div>
<div class="form-group">
<label for="web_folder" class="col-sm-3 control-label">{tmpl_var name='web_folder_txt'}</label>
- <div class="col-sm-6"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'></div><div class="col-sm-3 input-sm"> readonly="readonly"</div></tmpl_if> />
+ <div class="col-sm-9"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</tmpl_if> /></div>
</div>
</tmpl_if>
<div class="form-group">
--
Gitblit v1.9.1