From bb35950a5a6504605c017db956ea337c703574c7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 17:19:39 -0500 Subject: [PATCH] rewards acp - ability to set amount of times a user can claim reward --- public/less/admin/extend/rewards.less | 2 +- public/src/admin/extend/rewards.js | 5 +++-- src/views/admin/extend/rewards.tpl | 24 +++++++++++++++++------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/public/less/admin/extend/rewards.less b/public/less/admin/extend/rewards.less index cf62159695..2dc84b5bc3 100644 --- a/public/less/admin/extend/rewards.less +++ b/public/less/admin/extend/rewards.less @@ -1,5 +1,5 @@ #rewards { - .well { + .well, .panel-body { vertical-align: top; min-height: 100px; diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index cff8f7f74e..9a5f6327b8 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -135,11 +135,12 @@ define('admin/extend/rewards', function() { active: [{ id: id ? parseInt(id, 10) + 1 : 0, disabled: true, - value: '' + value: '', + claimable: 1 }], conditions: conditions, conditionals: conditionals, - rewards: available + rewards: available, }; templates.parse('admin/extend/rewards', 'active', data, function(li) { diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 87129fe3c7..29bf0b8288 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -37,14 +37,24 @@
+
-
- - - - - - +
+
+
+
+ + Enter 0 for infinite +
+
+
+ + + + + + +