Till Brehm
2016-04-20 44866b1b26b87114a232166343b52fe3f87cf27d
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
5 files modified
12 ■■■■ changed files
interface/web/sites/lib/lang/de_web_vhost_domain_admin_list.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/de_web_vhost_domain_list.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/en_web_vhost_domain_admin_list.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/en_web_vhost_domain_list.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_edit.htm 4 ●●●● patch | view | raw | blame | history
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';
?>
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';
?>
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';
?>
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';
?>
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">