From 8ce5e3054e6bc70cc44e8d2d002ac035f02bd9ec Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 12 Nov 2015 05:58:36 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/admin/templates/system_config_misc_edit.htm | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm
index d5dc139..5e2f191 100644
--- a/interface/web/admin/templates/system_config_misc_edit.htm
+++ b/interface/web/admin/templates/system_config_misc_edit.htm
@@ -15,6 +15,12 @@
<label for="page_title" class="col-sm-3 control-label">{tmpl_var name='company_name_txt'}</label>
<div class="col-sm-9"><input type="text" name="company_name" id="company_name" value="{tmpl_var name='company_name'}" size="" maxlength="" class="form-control" /></div></div>
<div class="form-group">
+ <label for="page_title" class="col-sm-3 control-label">{tmpl_var name='custom_login_text_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="custom_login_text" id="custom_login_text" value="{tmpl_var name='custom_login_text'}" size="" maxlength="" class="form-control" /></div></div>
+ <div class="form-group">
+ <label for="page_title" class="col-sm-3 control-label">{tmpl_var name='custom_login_link_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="custom_login_link" id="custom_login_link" value="{tmpl_var name='custom_login_link'}" size="" maxlength="" class="form-control" /></div></div>
+ <div class="form-group">
<label for="dashboard_atom_url_admin" class="col-sm-3 control-label">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
<div class="col-sm-9"><input type="text" name="dashboard_atom_url_admin" id="dashboard_atom_url_admin" value="{tmpl_var name='dashboard_atom_url_admin'}" size="" maxlength="" class="form-control" /></div></div>
<div class="form-group">
--
Gitblit v1.9.1