From 8a4a057376d8371aa976f3f37b178cd738c4eb59 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 21 Feb 2016 12:27:11 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/vm/templates/openvz_vm_edit.htm | 195 ++++++++++++++++++++++++------------------------
1 files changed, 96 insertions(+), 99 deletions(-)
diff --git a/interface/web/vm/templates/openvz_vm_edit.htm b/interface/web/vm/templates/openvz_vm_edit.htm
index 2f8ac77..a045012 100644
--- a/interface/web/vm/templates/openvz_vm_edit.htm
+++ b/interface/web/vm/templates/openvz_vm_edit.htm
@@ -1,104 +1,101 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_openvz_vm">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Settings</legend>
- <tmpl_if name="is_admin">
- <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" onChange="loadOptionInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
- {tmpl_var name='server_id'}
- </select>
- </tmpl_if>
- </div>
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
- {tmpl_var name='client_group_id'}
- </select>
- </div>
- </tmpl_if>
- <tmpl_if name="is_reseller">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
- {tmpl_var name='client_group_id'}
- </select>
- </div>
- </tmpl_if>
- <tmpl_if name="edit_disabled">
- <div class="ctrlHolder">
- <label for="ostemplate_id_disabled">{tmpl_var name='ostemplate_id_txt'}</label>
- <select name="ostemplate_id_disabled" id="ostemplate_id_disabled" class="selectInput" disabled="disabled">
- {tmpl_var name='ostemplate_id'}
- </select>
- </div>
- <input type="hidden" name="ostemplate_id" value="{tmpl_var name='ostemplate_id_value'}">
- <tmpl_else>
- <div class="ctrlHolder">
- <label for="ostemplate_id">{tmpl_var name='ostemplate_id_txt'}</label>
- <select name="ostemplate_id" id="ostemplate_id" class="selectInput">
- {tmpl_var name='ostemplate_id'}
- </select>
- </div>
- </tmpl_if>
- <div class="ctrlHolder">
- <label for="template_id">{tmpl_var name='template_id_txt'}</label>
- <select name="template_id" id="template_id" class="selectInput">
- {tmpl_var name='template_id'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
- <select name="ip_address" id="ip_address" class="selectInput">
- {tmpl_var name='ip_address'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="hostname">{tmpl_var name='hostname_txt'}</label>
- <input name="hostname" id="hostname" value="{tmpl_var name='hostname'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="vm_password">{tmpl_var name='vm_password_txt'}</label>
- <input name="vm_password" id="vm_password" value="{tmpl_var name='vm_password'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='start_boot_txt'}</p>
- <div class="multiField">
- {tmpl_var name='start_boot'}
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
- {tmpl_var name='active'}
- </div>
- </div>
- <div class="ctrlHolder">
- <label for="active_until_date">{tmpl_var name='active_until_date_txt'}</label>
- <input name="active_until_date" id="active_until_date" value="{tmpl_var name='active_until_date'}" size="30" maxlength="255" type="text" class="textInput formLengthDate" />
- </div>
- <div class="ctrlHolder">
- <label for="description">{tmpl_var name='description_txt'}</label>
- <textarea name="description" id="description" rows='5' cols='30' style='height:60px;'>{tmpl_var name='description'}</textarea>
- </div>
- </fieldset>
+ <legend>Settings</legend>
+ <tmpl_if name="is_admin">
+ <div class="form-group">
+ <tmpl_if name="edit_disabled">
+ <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
+ {tmpl_var name='server_id'}
+ </select></div>
+ <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ <tmpl_else>
+ <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" onChange="ISPConfig.loadOptionInto('ip_address','vm/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
+ {tmpl_var name='server_id'}
+ </select></div>
+ </tmpl_if>
+ </div>
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
+ {tmpl_var name='client_group_id'}
+ </select></div>
+ </div>
+ </tmpl_if>
+ <tmpl_if name="is_reseller">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
+ {tmpl_var name='client_group_id'}
+ </select></div>
+ </div>
+ </tmpl_if>
+ <tmpl_if name="edit_disabled">
+ <div class="form-group">
+ <label for="ostemplate_id_disabled" class="col-sm-3 control-label">{tmpl_var name='ostemplate_id_txt'}</label>
+ <div class="col-sm-9"><select name="ostemplate_id_disabled" id="ostemplate_id_disabled" class="form-control" disabled="disabled">
+ {tmpl_var name='ostemplate_id'}
+ </select></div>
+ </div>
+ <input type="hidden" name="ostemplate_id" value="{tmpl_var name='ostemplate_id_value'}">
+ <tmpl_else>
+ <div class="form-group">
+ <label for="ostemplate_id" class="col-sm-3 control-label">{tmpl_var name='ostemplate_id_txt'}</label>
+ <div class="col-sm-9"><select name="ostemplate_id" id="ostemplate_id" class="form-control">
+ {tmpl_var name='ostemplate_id'}
+ </select></div>
+ </div>
+ </tmpl_if>
+ <div class="form-group">
+ <label for="template_id" class="col-sm-3 control-label">{tmpl_var name='template_id_txt'}</label>
+ <div class="col-sm-9"><select name="template_id" id="template_id" class="form-control">
+ {tmpl_var name='template_id_select'}
+ </select></div>
+ </div>
+ <div class="form-group">
+ <label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
+ <div class="col-sm-9"><select name="ip_address" id="ip_address" class="form-control">
+ {tmpl_var name='ip_address'}
+ </select></div>
+ </div>
+ <div class="form-group">
+ <label for="hostname" class="col-sm-3 control-label">{tmpl_var name='hostname_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="hostname" id="hostname" value="{tmpl_var name='hostname'}" class="form-control" /></div></div>
+ <div class="form-group">
+ <label for="vm_password" class="col-sm-3 control-label">{tmpl_var name='vm_password_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="vm_password" id="vm_password" value="{tmpl_var name='vm_password'}" class="form-control" /></div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='start_boot_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='start_boot'}
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="bootorder" class="col-sm-3 control-label">{tmpl_var name='bootorder_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bootorder" id="bootorder" value="{tmpl_var name='bootorder'}" class="form-control" /></div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='active'}
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="active_until_date" class="col-sm-3 control-label">{tmpl_var name='active_until_date_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="active_until_date" id="active_until_date" value="{tmpl_var name='active_until_date'}" class="form-control" data-input-element="date" data-date-format="{tmpl_var name='conf_format_datetime_js'}" /></div></div>
+ <div class="form-group">
+ <label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
+ <div class="col-sm-9"><textarea class="form-control" name="description" id="description" rows='5' cols='30' style='height:60px;'>{tmpl_var name='description'}</textarea></div>
+ </div>
+
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_vm_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_vm_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <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_vm_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_vm_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ </div></div>
--
Gitblit v1.9.1