From 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 May 2015 04:14:10 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'
---
interface/web/tools/templates/interface_settings.htm | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/interface/web/tools/templates/interface_settings.htm b/interface/web/tools/templates/interface_settings.htm
index a9057c8..ccd5000 100644
--- a/interface/web/tools/templates/interface_settings.htm
+++ b/interface/web/tools/templates/interface_settings.htm
@@ -1,32 +1,29 @@
-<h2><tmpl_var name="page_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="page_head_txt"></h1>
+</div>
<p><tmpl_var name="page_desc_txt"></p>
-<div class="panel panel_tools_interface">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
<!-- TODO: If user theme change is activated -->
- <div class="ctrlHolder">
- <label for="app_theme">{tmpl_var name='app_theme_txt'}</label>
- <select name="app_theme" id="app_theme" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="app_theme" class="col-sm-3 control-label">{tmpl_var name='app_theme_txt'}</label>
+ <div class="col-sm-9"><select name="app_theme" id="app_theme" class="form-control">
{tmpl_var name='app_theme'}
- </select>
+ </select></div>
</div>
<!-- TODO: Limit to activated modules -->
- <div class="ctrlHolder">
- <label for="startmodule">{tmpl_var name='startmodule_txt'}</label>
- <select name="startmodule" id="startmodule" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="startmodule" class="col-sm-3 control-label">{tmpl_var name='startmodule_txt'}</label>
+ <div class="col-sm-9"><select name="startmodule" id="startmodule" class="form-control">
{tmpl_var name='startmodule'}
- </select>
+ </select></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','tools/interface_settings.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('tools/index.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'}" data-submit-form="pageForm" data-form-action="tools/interface_settings.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="tools/index.php">{tmpl_var name='btn_cancel_txt'}</button>
+ </div></div>
\ No newline at end of file
--
Gitblit v1.9.1