Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/vm/templates/openvz_ostemplate_edit.htm

@@ -7,18 +7,16 @@
        <legend>Domain</legend>
            <div class="form-group">
                <label for="template_name" class="col-sm-3 control-label">{tmpl_var name='template_name_txt'}</label>
                <div class="col-sm-9"><input type="text" name="template_name" id="template_name" value="{tmpl_var name='template_name'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="template_name" id="template_name" value="{tmpl_var name='template_name'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="template_file" class="col-sm-3 control-label">{tmpl_var name='template_file_txt'}</label>
                <div class="col-sm-9"><input type="text" name="template_file" id="template_file" value="{tmpl_var name='template_file'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="template_file" id="template_file" value="{tmpl_var name='template_file'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                    {tmpl_var name='server_id'}
                </select>
            </div></div>
                </select></div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='allservers_txt'}</label>
                <div class="col-sm-9">
@@ -40,6 +38,6 @@
        <input type="hidden" name="id" value="{tmpl_var name='id'}">
            
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_ostemplate_edit.php');">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="vm/openvz_ostemplate_edit.php">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_ostemplate_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>