From b553b2bf146cf20bd3ddfeba52ec5cc5b70a1da9 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 27 Nov 2014 02:31:46 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc/master' into new-layout-3.1
---
interface/web/admin/templates/users_user_edit.htm | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index b973a34..91c35bb 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -60,6 +60,12 @@
{tmpl_var name='language'}
</select>
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='lost_password_function_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='lost_password_function'}
+ </div>
+ </div>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
@@ -70,4 +76,4 @@
</div>
</div>
-</div>
\ No newline at end of file
+</div>
--
Gitblit v1.9.1