From 322deabe87dea00b7dabba4f0abfd2530991973a Mon Sep 17 00:00:00 2001
From: rog1121 <rog1121@gmail.com>
Date: Sat, 1 Mar 2014 19:27:51 -0700
Subject: [PATCH] Update Login, Registration, TOS, and Donors Page

---
 .../bootstrap/about/donors/default.tpl        |   2 +-
 public/templates/bootstrap/login/default.tpl  |  45 +++----
 .../templates/bootstrap/register/default.tpl  | 118 +++++++++---------
 public/templates/bootstrap/tac/default.tpl    |  12 +-
 4 files changed, 80 insertions(+), 97 deletions(-)

diff --git a/public/templates/bootstrap/about/donors/default.tpl b/public/templates/bootstrap/about/donors/default.tpl
index d36a9e88..ac754545 100755
--- a/public/templates/bootstrap/about/donors/default.tpl
+++ b/public/templates/bootstrap/about/donors/default.tpl
@@ -5,7 +5,7 @@
         <i class="fa fa-bitbucket fa-fw"></i> Pool Donors
       </div>
       <div class="panel-body">
-      <table class="table table-striped table-bordered table-hover">
+      <table class="table table-striped table-bordered table-hover datatable">
         <thead>
           <tr>
             <th>Name</th>
diff --git a/public/templates/bootstrap/login/default.tpl b/public/templates/bootstrap/login/default.tpl
index 11ef473b..91ffb27e 100755
--- a/public/templates/bootstrap/login/default.tpl
+++ b/public/templates/bootstrap/login/default.tpl
@@ -1,30 +1,23 @@
-  <div class="container">
-    <div class="row">
-      <div class="col-md-4 col-md-offset-4">
-        <div class="login-panel panel panel-default">
-          <div class="panel-heading">
-            <h3 class="panel-title">Login with existing account</h3>
+<div class="row">
+  <form class="col-md-4" role="form" action="{$smarty.server.SCRIPT_NAME}?page=login" method="post" id="loginForm">
+  <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h3 class="panel-title">Login with existing account</h3>
+      </div>
+      <div class="panel-body">
+        <fieldset>
+          <div class="form-group">
+            <input class="form-control" placeholder="E-mail" name="username" type="email" autofocus required>
           </div>
-          <div class="panel-body">
-            <form role="form" action="{$smarty.server.SCRIPT_NAME}?page=login" method="post" id="loginForm">
-              <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
-              <fieldset>
-                <div class="form-group">
-                  <input class="form-control" placeholder="E-mail" name="username" type="email" autofocus required>
-                </div>
-                <div class="form-group">
-                  <input class="form-control" placeholder="Password" name="password" type="password" value="" required>
-                </div>
-                <div class="checkbox">
-                  <label>
-                    <input name="remember" type="checkbox" value="Remember Me">Remember Me
-                  </label>
-                </div>
-                <input type="submit" class="btn btn-lg btn-success btn-block" value="Login" />
-              </fieldset>
-            </form>
+          <div class="form-group">
+            <input class="form-control" placeholder="Password" name="password" type="password" value="" required>
           </div>
-        </div>
+        </fieldset>
+      </div>
+      <div class="panel-footer">
+        <input type="submit" class="btn btn-success" value="Login" >
       </div>
     </div>
-  </div>
\ No newline at end of file
+  </form>
+</div>
\ No newline at end of file
diff --git a/public/templates/bootstrap/register/default.tpl b/public/templates/bootstrap/register/default.tpl
index 2db8231b..88d67198 100755
--- a/public/templates/bootstrap/register/default.tpl
+++ b/public/templates/bootstrap/register/default.tpl
@@ -5,70 +5,70 @@
 
 <div class="row">
   <div class="col-lg-6">
-    <div class="panel panel-info">
+    <form class="panel panel-info" method="post" role="form">
+      <input type="hidden" name="page" value="{$smarty.request.page|escape}">
+      {if $smarty.request.token|default:""}
+      <input type="hidden" name="token" value="{$smarty.request.token|escape}">
+      {/if}
+      <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}">
+      <input type="hidden" name="action" value="register">
       <div class="panel-heading">
         <i class="fa fa-edit fa-fw"></i> Register new account
       </div>
       <div class="panel-body">
-        <form action="{$smarty.server.SCRIPT_NAME}" method="post" role="form">
-          <input type="hidden" name="page" value="{$smarty.request.page|escape}">
-          {if $smarty.request.token|default:""}
-          <input type="hidden" name="token" value="{$smarty.request.token|escape}" />
-          {/if}
-          <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
-          <input type="hidden" name="action" value="register">
-            <div class="form-group">
-              <label>Username</label>
-              <input type="text" class="form-control" name="username" value="{$smarty.post.username|escape|default:""}" size="15" maxlength="20" required>
-            </div>
-            <div class="form-group">
-              <label>Password</label>
-              <span style="padding-right:10px;display:block;margin-top:1px;float:right;color:#999;" id="pw_strength">Strength</span>
-              <input type="password" class="form-control" name="password1" value="" size="15" maxlength="100" id="pw_field" required>
-              <label>Repeat Password</label>
-              <span style="padding-right:10px;display:block;margin-top:1px;float:right;" id="pw_match"></span>
-              <input type="password" class="form-control" name="password2" value="" size="15" maxlength="100" id="pw_field2" required>
-            </div>
-            <div class="form-group">
-              <label>Email</label>
-              <input type="text" name="email1" class="form-control" value="{$smarty.post.email1|escape|default:""}" size="15" required>
-              <label>Email Repeat</label>
-              <input type="text" class="form-control" name="email2" value="{$smarty.post.email2|escape|default:""}" size="15" required>
-            </div>
-            <div class="form-group">
-              <label>PIN</label>
-              <input type="password" class="form-control" name="pin" value="" size="4" maxlength="4"><font size="1"> (4 digit number. <b>Remember this pin!</b>)</font>
-            </div>
-            <div class="form-group">
-              <label>TERMS AND CONDITIONS</label>
-            <div class="checkbox">
-              <label>
-              <input type="checkbox" value="1" name="tac" id="tac"><button type="button" class="btn btn-outline btn-link" data-toggle="modal" data-target="#TAC">Accept Terms and Conditions</button>
-              </label>
-            </div>
+        <div class="form-group">
+          <label>Username</label>
+          <input type="text" class="form-control" name="username" value="{$smarty.post.username|escape|default:""}" size="15" maxlength="20" required>
+        </div>
+        <div class="form-group">
+          <label>Password</label>
+          <span style="padding-right:10px;display:block;margin-top:1px;float:right;color:#999;" id="pw_strength">Strength</span>
+          <input type="password" class="form-control" name="password1" value="" size="15" maxlength="100" id="pw_field" required>
+          <label>Repeat Password</label>
+          <span style="padding-right:10px;display:block;margin-top:1px;float:right;" id="pw_match"></span>
+          <input type="password" class="form-control" name="password2" value="" size="15" maxlength="100" id="pw_field2" required>
+        </div>
+        <div class="form-group">
+          <label>Email</label>
+          <input type="text" name="email1" class="form-control" value="{$smarty.post.email1|escape|default:""}" size="15" required>
+          <label>Email Repeat</label>
+          <input type="text" class="form-control" name="email2" value="{$smarty.post.email2|escape|default:""}" size="15" required>
+        </div>
+        <div class="form-group">
+          <label>PIN</label>
+          <input type="password" class="form-control" name="pin" value="" size="4" maxlength="4"><font size="1">Four digit number. <b>Remember this pin!</b></font>
+        </div>
+        <div class="form-group">
+          <div class="checkbox">
+            <label>
+              <input type="checkbox" value="1" name="tac" id="tac">
+              I Accept The <a data-toggle="modal" data-target="#TAC">Terms and Conditions</a>
+            </label>
           </div>
-          <div class="panel-body">
-            <div class="modal fade" id="TAC" tabindex="-1" role="dialog" aria-labelledby="TACLabel" aria-hidden="true">
-              <div class="modal-dialog modal-lg">
-                <div class="modal-content">
-                  <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                    <h4 class="modal-title" id="TACLabel">Terms and Conditions</h4>
-                  </div>
-                  <div class="modal-body">
-                  {include file="tac/default.tpl"}
-                  </div>
-                  <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <center>{nocache}{$RECAPTCHA|default:"" nofilter}{/nocache}</center>
-          <input type="submit" value="Register" class="btn btn-outline btn-success btn-lg btn-block" />
-        </form>
+        </div>
+        <center>{nocache}{$RECAPTCHA|default:"" nofilter}{/nocache}</center>
+      </div>
+      <div class="panel-footer">
+        <input type="submit" value="Register" class="btn btn-success">
+      </div>
+    </form>
+  </div>
+</div>
+
+<div class="modal fade" id="TAC" tabindex="-1" role="dialog" aria-labelledby="TACLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h4 class="modal-title" id="TACLabel">Terms and Conditions</h4>
+        </div>
+        <div class="modal-body">
+          {include file="tac/content.tpl"}
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        </div>
       </div>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/templates/bootstrap/tac/default.tpl b/public/templates/bootstrap/tac/default.tpl
index 75c6070b..4fa30528 100755
--- a/public/templates/bootstrap/tac/default.tpl
+++ b/public/templates/bootstrap/tac/default.tpl
@@ -5,18 +5,8 @@
           <i class="fa fa-book fa-fw"></i> Terms &amp; Conditions
         </div>
         <div class="panel-body">
-          <p>This Agreement governs your use of {$GLOBAL.website.name}.</p>
-          <ul>
-            <li>By using any of the Pools or registering an account on the website, you agree to be bound by the terms and conditions below. If you do not agree with the terms and conditions in this Agreement you may not use the Pool.</li>
-            <li>The {$GLOBAL.website.name} staff may modify this Agreement and any policies affecting the Site at any point of time. Such modification is effective immediately upon posting to the website and will be distribution via email, forum post and a link in chat. Your continued use of the Pool following any modification to this Agreement shall be deemed an acceptance of all modifications.</li>
-            <li>The Pool rewards miners according to a <strong>{$GLOBAL.config.payout_system}</strong> system with <strong>{$GLOBAL.fees}%</strong> fee. The fee may change at any time, but notice will be given before doing so. Any fee change will be communicated through the pools news page.</li>
-            <li>The Pool is not an e-wallet or a bank for your coins. The Pool and it's operators are not responsible for any loss of coins which are stored on the Pool. It is your responsibility to configure your account so that the coins you mine are regularly transferred to your own secured offline wallet.</li>
-            <li>The uptime of the pool or website is not guaranteed, maintenance and downtime may be required at times. Users are responsible for configuring their miners so that they will automatically reconnect, switch to all the pools we offer or a backup pool in the case of downtime.</li>
-            <li>Botnets are not welcome. Accounts with a large amount of miners connecting from different IPs may be suspended without prior notice. If we are uncertian then an investigation will be opened and the user will be notified via their configured e-mail address. If we do not receive a response your account may be suspended.</li>
-            <li>Multiple accounts controlled by one person may be considered as a botnet and a investigation will be opened, see 6.</li>
-          </ul>
+        {include file="tac/content.tpl"}
         </div>
       </div>
     </div>
-    <!-- /.col-lg-12 -->
   </div>