From 67b693cd3a708c336baf232b309d265fa833a564 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Thu, 19 Feb 2015 23:02:52 -0500
Subject: [PATCH] pass in expected format of active rewards

---
 public/src/admin/extend/rewards.js | 15 ++++++++++++---
 src/rewards/admin.js               |  6 +++++-
 src/views/admin/extend/rewards.tpl |  6 +++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js
index 54177ea4c9..77055fe32e 100644
--- a/public/src/admin/extend/rewards.js
+++ b/public/src/admin/extend/rewards.js
@@ -135,11 +135,20 @@ define('admin/extend/rewards', function() {
 		var activeRewards = [];
 
 		$('#active li').each(function() {
-			var data = $(this).find('form.main').serializeArray();
+			var data = {rewards: {}},
+				main = $(this).find('form.main').serializeArray(),
+				rewards = $(this).find('form.rewards').serializeArray();
+			
+			main.forEach(function(obj) {
+				data[obj.name] = obj.value;
+			});
+
+			rewards.forEach(function(obj) {
+				data.rewards[obj.name] = obj.value;
+			});
 
-			data.rewards = $(this).find('form.rewards').serializeArray();
 			data.disabled = $(this).find('.toggle').html() === 'Enable';
-			
+
 			activeRewards.push(data);
 		});
 
diff --git a/src/rewards/admin.js b/src/rewards/admin.js
index dfb70ae78f..a279f44284 100644
--- a/src/rewards/admin.js
+++ b/src/rewards/admin.js
@@ -2,7 +2,8 @@
 
 var rewards = {},
 	async = require('async'),
-	plugins = require('../plugins');
+	plugins = require('../plugins'),
+	db = require('../database');
 
 var defaults = {
 	conditionals: [
@@ -29,6 +30,9 @@ var defaults = {
 	]
 };
 
+rewards.save = function(data, callback) {
+	
+};
 
 rewards.get = function(callback) {
 	async.parallel({
diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl
index af6dac1865..9d060fe965 100644
--- a/src/views/admin/extend/rewards.tpl
+++ b/src/views/admin/extend/rewards.tpl
@@ -6,7 +6,7 @@
 				<ul id="active">
 					<!-- BEGIN active -->
 					<li data-id="{active.id}" data-index="@index">
-						<form class="main">
+						<form class="main inline-block">
 							<div class="well inline-block">
 								<label for="condition">If User's</label><br />
 								<select name="condition" data-selected="{active.condition}">
@@ -33,8 +33,8 @@
 								</select>
 							</div>
 						</form>
-						
-						<form class="rewards">
+
+						<form class="rewards inline-block">
 							<div class="inputs well inline-block"></div>
 						</form>