From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/vm/templates/openvz_vm_advanced_edit.htm | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/interface/web/vm/templates/openvz_vm_advanced_edit.htm b/interface/web/vm/templates/openvz_vm_advanced_edit.htm
index 2812ceb..a25d715 100644
--- a/interface/web/vm/templates/openvz_vm_advanced_edit.htm
+++ b/interface/web/vm/templates/openvz_vm_advanced_edit.htm
@@ -7,8 +7,7 @@
<legend>Advanced</legend>
<div class="form-group">
<label for="veid" class="col-sm-3 control-label">{tmpl_var name='veid_txt'}</label>
- <div class="col-sm-9"><input type="text" name="veid" id="veid" value="{tmpl_var name='veid'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="veid" id="veid" value="{tmpl_var name='veid'}" class="form-control" /></div></div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='create_dns_txt'}</label>
<div class="col-sm-9">
@@ -17,45 +16,57 @@
</div>
<div class="form-group">
<label for="diskspace" class="col-sm-3 control-label">{tmpl_var name='diskspace_txt'}</label>
- <div class="col-sm-9"><input type="text" name="diskspace" id="diskspace" value="{tmpl_var name='diskspace'}" class="form-control" /> GB
+ <div class="col-sm-6"><input type="text" name="diskspace" id="diskspace" value="{tmpl_var name='diskspace'}" class="form-control" /></div><div class="col-sm-3 input-sm"> GB
</div></div>
<div class="form-group">
<label for="ram" class="col-sm-3 control-label">{tmpl_var name='ram_txt'}</label>
- <div class="col-sm-9"><input type="text" name="ram" id="ram" value="{tmpl_var name='ram'}" class="form-control" /> MB
+ <div class="col-sm-6"><input type="text" name="ram" id="ram" value="{tmpl_var name='ram'}" class="form-control" /></div><div class="col-sm-3 input-sm"> MB
</div></div>
<div class="form-group">
<label for="ram_burst" class="col-sm-3 control-label">{tmpl_var name='ram_burst_txt'}</label>
- <div class="col-sm-9"><input type="text" name="ram_burst" id="ram_burst" value="{tmpl_var name='ram_burst'}" class="form-control" /> MB
+ <div class="col-sm-6"><input type="text" name="ram_burst" id="ram_burst" value="{tmpl_var name='ram_burst'}" class="form-control" /></div><div class="col-sm-3 input-sm"> MB
</div></div>
<div class="form-group">
<label for="cpu_units" class="col-sm-3 control-label">{tmpl_var name='cpu_units_txt'}</label>
- <div class="col-sm-9"><input type="text" name="cpu_units" id="cpu_units" value="{tmpl_var name='cpu_units'}" class="form-control" /> (8 - 500000)
+ <div class="col-sm-6"><input type="text" name="cpu_units" id="cpu_units" value="{tmpl_var name='cpu_units'}" class="form-control" /></div><div class="col-sm-3 input-sm"> (8 - 500000)
</div></div>
<div class="form-group">
<label for="cpu_num" class="col-sm-3 control-label">{tmpl_var name='cpu_num_txt'}</label>
- <div class="col-sm-9"><input type="text" name="cpu_num" id="cpu_num" value="{tmpl_var name='cpu_num'}" class="form-control" /> (1 - 64)
+ <div class="col-sm-6"><input type="text" name="cpu_num" id="cpu_num" value="{tmpl_var name='cpu_num'}" class="form-control" /></div><div class="col-sm-3 input-sm"> (1 - 64)
</div></div>
<div class="form-group">
<label for="cpu_limit" class="col-sm-3 control-label">{tmpl_var name='cpu_limit_txt'}</label>
- <div class="col-sm-9"><input type="text" name="cpu_limit" id="cpu_limit" value="{tmpl_var name='cpu_limit'}" class="form-control" /> (10 - 6400)
+ <div class="col-sm-6"><input type="text" name="cpu_limit" id="cpu_limit" value="{tmpl_var name='cpu_limit'}" class="form-control" /></div><div class="col-sm-3 input-sm"> (10 - 6400)
</div></div>
<div class="form-group">
<label for="io_priority" class="col-sm-3 control-label">{tmpl_var name='io_priority_txt'}</label>
- <div class="col-sm-9"><input type="text" name="io_priority" id="io_priority" value="{tmpl_var name='io_priority'}" class="form-control" /> (0 - 7)
+ <div class="col-sm-6"><input type="text" name="io_priority" id="io_priority" value="{tmpl_var name='io_priority'}" class="form-control" /></div><div class="col-sm-3 input-sm"> (0 - 7)
</div></div>
<div class="form-group">
<label for="nameserver" class="col-sm-3 control-label">{tmpl_var name='nameserver_txt'}</label>
- <div class="col-sm-9"><input type="text" name="nameserver" id="nameserver" value="{tmpl_var name='nameserver'}" class="form-control" /> {tmpl_var name='nameserver_desc_txt'}
+ <div class="col-sm-6"><input type="text" name="nameserver" id="nameserver" value="{tmpl_var name='nameserver'}" class="form-control" /></div><div class="col-sm-3 input-sm"> {tmpl_var name='nameserver_desc_txt'}
</div></div>
<div class="form-group">
<label for="capability" class="col-sm-3 control-label">{tmpl_var name='capability_txt'}</label>
<div class="col-sm-9"><input type="text" name="capability" id="capability" value="{tmpl_var name='capability'}" class="form-control" />
- </div></div>
+ </div></div>
+ <div class="form-group">
+ <label for="features" class="col-sm-3 control-label">{tmpl_var name='features_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="features" id="features" value="{tmpl_var name='features'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="iptables" class="col-sm-3 control-label">{tmpl_var name='iptables_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="iptables" id="iptables" value="{tmpl_var name='iptables'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="custom" class="col-sm-3 control-label">{tmpl_var name='custom_txt'}</label>
+ <div class="col-sm-9"><textarea class="form-control" name="custom" id="custom" rows='10' cols='30'>{tmpl_var name='custom'}</textarea></div>
+ </div>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="clear"><div class="right">
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_vm_edit.php');">{tmpl_var name='btn_save_txt'}</button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_vm_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div></div>
\ No newline at end of file
+ <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