From 2e9ac915cb0efc7474443d317e317d9875a1feef Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 08 Jan 2015 12:18:40 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
interface/web/vm/templates/openvz_action.htm | 55 ++++++++++++++++++++++---------------------------------
1 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/interface/web/vm/templates/openvz_action.htm b/interface/web/vm/templates/openvz_action.htm
index 00bb65e..29bce75 100644
--- a/interface/web/vm/templates/openvz_action.htm
+++ b/interface/web/vm/templates/openvz_action.htm
@@ -1,10 +1,10 @@
-<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_language_import">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name="head_txt"} {tmpl_var name='veid'}</legend>
+
+ <legend>{tmpl_var name="head_txt"} {tmpl_var name='veid'}</legend>
<tmpl_if name="msg">
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
@@ -13,41 +13,30 @@
<div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
</tmpl_if>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='start_txt'}</p>
- <div class="multiField">
- <input id="action" type="radio" value="start" name="action" {tmpl_var name='start_option_enabled'}/>
- </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='start_txt'}</label>
+ <div class="col-sm-9"><input class="form-control" type="radio" id="action" value="start" name="action" {tmpl_var name='start_option_enabled'}/></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='stop_txt'}</p>
- <div class="multiField">
- <input id="action" type="radio" value="stop" name="action" {tmpl_var name='stop_option_enabled'}/>
- </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='stop_txt'}</label>
+ <div class="col-sm-9"><input class="form-control" type="radio" id="action" value="stop" name="action" {tmpl_var name='stop_option_enabled'}/></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='restart_txt'}</p>
- <div class="multiField">
- <input id="action" type="radio" value="restart" name="action" {tmpl_var name='restart_option_enabled'}/>
- </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='restart_txt'}</label>
+ <div class="col-sm-9"><input class="form-control" type="radio" id="action" value="restart" name="action" {tmpl_var name='restart_option_enabled'}/></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='ostemplate_txt'}</p>
- <div class="multiField">
- <input style="float:left; margin-right:10px;" id="action" type="radio" value="ostemplate" name="action" {tmpl_var name='ostemplate_option_enabled'}/>
- <input name="ostemplate_name" size="30" maxlength="255" type="text" class="textInput" value="{tmpl_var name='ostemplate_name'}" onclick="$('[name=action]').filter('[value=ostemplate]').attr('checked','checked');" /> {tmpl_var name='ostemplate_desc_txt'}
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ostemplate_txt'}</label>
+ <div class="col-sm-9"><input class="form-control" type="radio" style="float:left; margin-right:10px;" id="action" value="ostemplate" name="action" {tmpl_var name='ostemplate_option_enabled'}/></div><div class="col-sm-6"><input type="text" name="ostemplate_name" class="form-control" value="{tmpl_var name='ostemplate_name'}" onclick="$('[name=action]').filter('[value=ostemplate]').attr('checked','checked');" /></div><div class="col-sm-3 input-sm"> {tmpl_var name='ostemplate_desc_txt'}
</div>
</div>
- </fieldset>
+
<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_action.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>
\ No newline at end of file
+ <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_action.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>
\ No newline at end of file
--
Gitblit v1.9.1