Merge remote-tracking branch 'ispc/master'

Marius Cramer

2014-04-30 8edabf647814a012307bbf68628e4656ecf89eff

 interface/web/sites/templates/database_edit.htm

@@ -20,6 +20,25 @@
                            </select>
                    </tmpl_if>
                </div>
            <tmpl_else>
                <tmpl_if name="only_one_server">
                    <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
                <tmpl_else>
                    <div class="ctrlHolder">
                        <tmpl_if name="edit_disabled">
                            <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
                            <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
                                {tmpl_var name='server_id'}
                            </select>
                            <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                            <tmpl_else>
                                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
                                <select name="server_id" id="server_id" class="selectInput">
                                    {tmpl_var name='server_id'}
                                </select>
                        </tmpl_if>
                    </div>
                </tmpl_if>
            </tmpl_if>
            <div class="ctrlHolder">
                <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
@@ -43,6 +62,10 @@
                        <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
                </tmpl_if>
            </div>
         <div class="ctrlHolder">
            <label for="database_quota">{tmpl_var name='limit_database_quota_txt'}</label>
            <input name="database_quota" id="database_quota" value="{tmpl_var name='limit_database_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
         </div>
            <div class="ctrlHolder">
                <label for="database_user_id">{tmpl_var name='database_user_txt'}</label>
                <select name="database_user_id" id="database_user_id" class="selectInput">
@@ -130,4 +153,4 @@
        searchFieldWatermark: '',
        resultBoxPosition: 'e'
    });
</script>
</script>