From 6028e4692d172b63f8af79c4460f9dbff5a9a01c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 26 May 2016 02:21:05 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
interface/web/admin/templates/tpl_default_basic.htm | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/web/admin/templates/tpl_default_basic.htm b/interface/web/admin/templates/tpl_default_basic.htm
index 3520f3a..29772bc 100644
--- a/interface/web/admin/templates/tpl_default_basic.htm
+++ b/interface/web/admin/templates/tpl_default_basic.htm
@@ -7,7 +7,7 @@
<div class="form-group">
<label for="logo_url" class="col-sm-3 control-label">{tmpl_var name='logo_url_txt'}Logo URL</label>
- <div class="col-sm-9"><input type="text" name="logo_url" id="logo_url" value="{tmpl_var name='logo_url'}" size="" maxlength="" class="form-control" /> 152x46px
+ <div class="col-sm-6"><input type="text" name="logo_url" id="logo_url" value="{tmpl_var name='logo_url'}" size="" maxlength="" class="form-control" /></div><div class="col-sm-3 input-sm"> 152x46px
</div></div>
@@ -15,6 +15,6 @@
<input type="hidden" name="username" value="global">
<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','admin/tpl_default.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="admin/tpl_default.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="admin/server_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
--
Gitblit v1.9.1