Merge branch 'master' into 'master'

Marius Cramer

2014-05-19 9b4702d833708415d0cf05a98a00aac1bc850ff7

 interface/web/admin/templates/server_config_web_edit.htm

@@ -125,6 +125,18 @@
                    {tmpl_var name='overquota_notify_client'}
                </div>
            </div>
         <div class="ctrlHolder">
            <p class="label">{tmpl_var name='overquota_db_notify_admin_txt'}</p>
            <div class="multiField">
               {tmpl_var name='overquota_db_notify_admin'}
             </div>
         </div>
         <div class="ctrlHolder">
            <p class="label">{tmpl_var name='overquota_db_notify_client_txt'}</p>
            <div class="multiField">
               {tmpl_var name='overquota_db_notify_client'}	
             </div>
         </div>
            <div class="ctrlHolder">
                <label for="overquota_notify_freq">{tmpl_var name='overquota_notify_freq_txt'}</label>
                <input name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='overquota_notify_freq_note_txt'}
@@ -145,11 +157,11 @@
                </div>
                <div class="ctrlHolder">
                    <label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
                    <input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" class="textInput" />
                    <input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" autocomplete="off" class="textInput" />
                </div>
                <div class="ctrlHolder">
                    <label for="CA_pass">{tmpl_var name='CA_pass_txt'}</label>
                    <input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" class="textInput" />
                    <input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" autocomplete="off" class="textInput" />
                </div>
            </div>
            <div class="subsectiontoggle"><span></span>{tmpl_var name='permissions_txt'}<em></em></div>