Merge remote-tracking branch 'ispc3master/master'

Dominik

2014-01-23 6250b7ea002fd99e40d0170d31e7e19e69f97ccd

 interface/web/admin/templates/server_config_server_edit.htm

@@ -19,11 +19,10 @@
                <label for="netmask">{tmpl_var name='netmask_txt'}</label>
                <input name="netmask" id="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
            </div>
      <!--<div class="ctrlHolder">
       <div class="ctrlHolder">
      <label for="v6_prefix">{tmpl_var name='v6_prefix_txt'}</label>
      <input name="v6_prefix" id="v6_prefix" value="{tmpl_var name='v6_prefix'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
           </div>
         -->
            </div>
            <div class="ctrlHolder">
                <label for="gateway">{tmpl_var name='gateway_txt'}</label>
                <input name="gateway" id="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
@@ -75,6 +74,12 @@
                    {tmpl_var name='backup_mode'}
                </select>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='backup_delete_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='backup_delete'}
                </div>
            </div>
         <div class="ctrlHolder">
                <label for="monit_url">{tmpl_var name='monit_url_txt'}</label>
                <input name="monit_url" id="monit_url" value="{tmpl_var name='monit_url'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='monit_url_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>