From 66d692b8bb04d4bd2f4cdc54103a7cd705a89e76 Mon Sep 17 00:00:00 2001
From: Ant Zucaro <azucaro@gmail.com>
Date: Sun, 15 Jun 2014 22:37:02 -0400
Subject: [PATCH] Make a merge player form. Does not do anything yet though.

---
 xonstat/templates/merge.mako | 43 ++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/xonstat/templates/merge.mako b/xonstat/templates/merge.mako
index da82beb..1b4f8ef 100644
--- a/xonstat/templates/merge.mako
+++ b/xonstat/templates/merge.mako
@@ -7,5 +7,44 @@ ${nav.nav('players')}
 
 <h1>Player Merge</h1>
 
-<h2>Merge two players below. The destination player_id is on the right.</h2>
-<p>(the destination player_id is the one that lives on after the merge)</p>
+<h2>Merge two players below.</h2>
+
+<div class="row">
+  <div class="span6">
+    <form style="margin-top:20px;" class="form-horizontal">
+      <fieldset>
+
+        <div class="control-group">
+          <label class="control-label" for="w_pid">Winning Player</label>
+          <div class="controls">
+            <input id="w_pid" name="w_pid" placeholder="Player ID #" class="input-small" type="text">
+            <p class="help-block">This player record will live on after the merge is complete.</p>
+          </div>
+        </div>
+
+        <div class="control-group">
+          <label class="control-label" for="l_pid">Losing Player</label>
+          <div class="controls">
+            <input id="l_pid" name="l_pid" placeholder="Player ID #" class="input-small" type="text">
+            <p class="help-block">This player record will be deactivated when the merge is complete.</p>
+          </div>
+        </div>
+
+        <!-- Form submitted? -->
+        <input type="hidden" name="fs" />
+
+        <input type="hidden" name="token" value=${request.session.get_csrf_token()}/>
+
+        <!-- Button -->
+        <div class="control-group">
+          <label class="control-label"></label>
+          <div class="controls">
+            <button id="submit" name="submit" type="submit" class="btn btn-primary">Submit</button>
+          </div>
+        </div>
+
+      </fieldset>
+    </form>
+
+  </div>
+</div>
-- 
2.39.2