[guadec-web-regcfp] more registration fixes

[Patrick Uiterwijk <puiterwijk src gnome org>]

commit deeb7bbad435826a802cd8f805e2eb91465e0179
Author: Andreas Nilsson <anilsson redhat com>
Date:   Fri Jun 5 15:52:48 2015 -0400

    more registration fixes

 public/css/style.css                        |    3 +--
 views/index/index.hbs                       |    4 ++--
 views/partials/registration/payment.hbs     |   13 ++++++++-----
 views/registration/register.hbs             |    2 +-
 views/registration/registration_success.hbs |    3 +--
 5 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/public/css/style.css b/public/css/style.css
index 9aa80f7..bf1a7c6 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -32,7 +32,7 @@ body {
 }
 
 .content {
-  max-width: 1024px;
+  max-width: 554px;
   margin: auto;
   padding-top: 20px;
 }
@@ -120,7 +120,6 @@ body {
   margin: 0 auto;
   background-color: #f25050;
   color: #fff;
-  width: 540px;
   padding: 10px;
   margin-bottom: 20px;
   font-size: 12px;
diff --git a/views/index/index.hbs b/views/index/index.hbs
index c0a1a1e..c00ebe9 100644
--- a/views/index/index.hbs
+++ b/views/index/index.hbs
@@ -35,11 +35,11 @@ Hello, please login, or choose an option below.
 {{#has_permission "registration/register" }}
 {{#if registration}}
 <h3>Registration ID: {{registration.display_id}}</h3>
-<div class="button"><a href="/registration/register">Update registration</a></div>
+<div class="button"><a href="/registration/register">Update registration</a></div><br/>
 {{#ifGTE registration.paid config.registration.min_amount_for_receipt}}
 <div class="button"><a href="/registration/receipt">Get receipt</a></div>
 {{else}}
-Not enough paid for receipt (Paid {{config.registration.currency_symbol}}{{registration.paid}}, outstanding 
for onsite payment: {{config.registration.currency_symbol}}{{registration.outstanding}})
+Not enough paid for receipt (Paid {{config.registration.currency_symbol}}{{registration.paid}}, outstanding 
for onsite payment: {{config.registration.currency_symbol}}{{registration.outstanding}})<br/>
 {{/ifGTE}}
 {{#has_permission "registration/pay_extra"}}
 <div class="button"><a href="/registration/pay">Pay more</a></div>
diff --git a/views/partials/registration/payment.hbs b/views/partials/registration/payment.hbs
index 8fed9c6..1393ef1 100644
--- a/views/partials/registration/payment.hbs
+++ b/views/partials/registration/payment.hbs
@@ -1,10 +1,13 @@
-Your selected registration fee: {{config.registration.currency_symbol}}{{regfee}}.
-<br />
-To complete your registration, choose a payment method below:<br/>
-Paypal: $INSERT_PAYPAL_BUTTON_HERE<br />
+To complete your registration, choose a payment for {{config.registration.currency_symbol}}{{regfee}} 
below:<br/><br/>
+<form class="submission-form">
+<input type="radio" name="method" value="paypal" checked="checked"> Pay using PayPal<br/>
+<input type="radio" name="method" value="on-site" style="vertical-align: top;"> <div style="display: 
inline-block;">Pay at the conference<p class="note">If you select this option, you can pay at the 
registration desk at GUADEC</p></div><br/><br/>
+<input class="submit-talk" type="submit" value="Complete registration" style="float: right;">
+</form>
 
+<!--
 <form action="/registration/pay/do" method="POST">
 <input type="hidden" name="method" value="onsite">
 <input type="hidden" name="regfee" value="{{regfee}}">
 <input type="submit" value="Pay at the conference">
-</form><br />
+</form><br />-->
diff --git a/views/registration/register.hbs b/views/registration/register.hbs
index e35460a..0307456 100644
--- a/views/registration/register.hbs
+++ b/views/registration/register.hbs
@@ -13,7 +13,7 @@
 {{#unless ask_regfee}}
 Registered
 {{else}}
-<input type="text" name="regfee" class="reg-fee" value="{{config.registration.currency_symbol}}40">
+{{config.registration.currency_symbol}} <input type="text" name="regfee" class="reg-fee" value="40">
 <p class="note">We can only provide receipts for payments over 
{{config.registration.currency_symbol}}{{config.registration.min_amount_for_receipt}}.
 {{/unless}}</p>
 </tr>
diff --git a/views/registration/registration_success.hbs b/views/registration/registration_success.hbs
index 893a92d..c8dbac7 100644
--- a/views/registration/registration_success.hbs
+++ b/views/registration/registration_success.hbs
@@ -1,4 +1,3 @@
-Thanks for registering for GUADEC 2015!<br/>
-To complete your registration, choose a payment method below:<br />
+<strong>Thanks for registering for GUADEC 2015!</strong><br/>
 
 {{>registration/payment}}