GNOME.org
 

[guadec-web-regcfp] fix registration layout

commit 2ec2f149c96adb2f87e651bade4a7dda3085587d
Author: Andreas Nilsson <anilsson redhat com>
Date:   Wed Jun 3 16:23:50 2015 -0400

    fix registration layout

 models/registration.js          |    1 -
 public/css/style.css            |   39 ++++++++++++++++++++++++++++--
 views/layouts/main.hbs          |    3 +-
 views/registration/register.hbs |   49 ++++++++++++---------------------------
 4 files changed, 53 insertions(+), 39 deletions(-)
---
diff --git a/models/registration.js b/models/registration.js
index d9c1581..c6995bf 100644
--- a/models/registration.js
+++ b/models/registration.js
@@ -6,7 +6,6 @@ module.exports = function(sequelize, DataTypes) {
     is_public: DataTypes.BOOLEAN,
     badge_printed: DataTypes.BOOLEAN,
     receipt_sent: DataTypes.BOOLEAN,
-    gender: DataTypes.ENUM('male', 'female', 'other'),
     country: DataTypes.STRING,
   }, {
     classMethods: {
diff --git a/public/css/style.css b/public/css/style.css
index 03b97d0..9aa80f7 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1,5 +1,5 @@
 body {
-  font-family: sans-serif;
+  font-family: "Open Sans",Helvetica,Arial,sans-serif;
   padding: 0;
   margin: 0;
   color: #555;
@@ -73,15 +73,25 @@ body {
   margin: 10px 0;
 }
 
+.submission-form {
+  margin: auto;
+}
+
+.submission-form tr td {
+  padding-bottom: 7px;
+  padding-top: 5px;
+}
+
 .submission-form tr td:first-child {
   text-align: right;
   vertical-align: top;
-  padding-top: 5px;
+  padding-right: 10px;
+  font-weight: bold;
 }
 
 .submission-form tr td input[type=text],
 .submission-form tr td textarea {
-  width: 300px;
+  width: 400px;
   border: 1px solid #555;
   padding: 3px;
 }
@@ -92,4 +102,27 @@ body {
 
 .submission-form tr td .submit-talk {
   float: right;
+  margin-top: 10px;
+}
+
+.submission-form p.note {
+  font-size: 11px;
+  font-style: italic;
+  margin-top: 4px;
+  margin-bottom: 0;
+}
+
+.submission-form tr td input[type="text"].reg-fee {
+  width: 100px;
+}
+
+.validation {
+  margin: 0 auto;
+  background-color: #f25050;
+  color: #fff;
+  width: 540px;
+  padding: 10px;
+  margin-bottom: 20px;
+  font-size: 12px;
+  text-align: center;
 }
diff --git a/views/layouts/main.hbs b/views/layouts/main.hbs
index 19eea82..a5c81ec 100644
--- a/views/layouts/main.hbs
+++ b/views/layouts/main.hbs
@@ -1,6 +1,6 @@
 <!doctype HTML>
 <html>
-    <head>
+    <head >
         <title>Event registration</title>
 
         <meta http-equiv="X-UA-Compatible" content="IE=Edge">
@@ -18,6 +18,7 @@
         </script>
         <script type="text/javascript" src="/javascripts/login.js"></script>
         <link rel="stylesheet" href="/css/style.css" type="text/css" media="all">
+        <link rel="stylesheet" id="ttfmake-google-fonts-css" 
href="//fonts.googleapis.com/css?family=Open+Sans%3Aregular%2Citalic%2C700&amp;subset=latin&amp;ver=1.5.2" 
type="text/css" media="all">
     </head>
     <body>
         {{#if development}}
diff --git a/views/registration/register.hbs b/views/registration/register.hbs
index bc5334c..ef16850 100644
--- a/views/registration/register.hbs
+++ b/views/registration/register.hbs
@@ -1,50 +1,31 @@
 {{#if submission_error}}
-<font color="red"><b>Something went wrong submitting. Please check you filled in all fields!</b></font>
+<div class="validation">Something went wrong. Please make sure you have filled all required fields.</div>
 {{/if}}
 
 <form action="/registration/register" method="post">
 <table class="submission-form">
-<tr><td>Your name:</td><td><input type="text" name="submitter_name" value="{{user.name}}" disabled 
/></td></tr>
-<tr><td>IRC nickname:</td><td><input type="text" name="irc" value="{{registration.irc}}"></td></tr>
+<tr><td>Your name</td><td><input type="text" name="submitter_name" value="{{user.name}}" disabled 
/></td></tr>
+<tr><td>IRC nickname</td><td><input type="text" name="irc" value="{{registration.irc}}" 
placeholder="(optional)"></td></tr>
 <input type="hidden" name="is_public" value="false">
-<tr><td>Registration public:</td><td><input type="checkbox" value="true" name="is_public" 
-{{#if registration.is_public}}
-checked
-{{/if}}
-></td></tr>
 
-<tr><td>Registration fee:</td><td>
+
+<tr><td>Registration fee</td><td>
 {{#unless ask_regfee}}
 Registered
 {{else}}
-{{#each config.registration.fee_options}}
-<input type="radio" name="regfee" value="{{this}}" id="regfee_{{this}}">
-<label for="regfee_{{this}}">{{../config.registration.currency_symbol}}{{this}}</label>
-<br />
-{{/each}}
-<input type="radio" name="regfee" value="custom">
-<input type="text" name="regfee_custom">
-</td>
-<td>NOTE: Only registrations with a fee of at least 
{{config.registration.currency_symbol}}{{config.registration.min_amount_for_receipt}} can get a receipt! (you 
can always pay more)
-{{/unless}}
-</td></tr>
-
-<tr><td colspan="2">Always private info for stats:</td></tr>
-<tr><td>Gender:</td><td>
-{{#each genders}}
-<input type="radio" name="gender" value="{{this}}" id="gender_{{this}}"
-{{#ifEqual ../registration/gender this}}
-checked
-{{/ifEqual}}
->
-<label for="gender_{{this}}">{{this}}</label>
-{{/each}}
-</td></tr>
-
-<tr><td>Country:</td><td><input type="text" name="country" value="{{registration.country}}"></td></tr>
+<input type="text" name="regfee_custom" class="reg-fee" value="{{config.registration.currency_symbol}}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>
 
+<tr><td>Country</td><td><input type="text" name="country" value="{{registration.country}}" 
placeholder="(optional)"><br/><p class="note">We will not publish country data.<br/> It will only be used for 
attendee statistics.</p></td></tr>
 
 
+<tr><td>&nbsp;</td><td><input type="checkbox" value="true" name="is_public" 
+{{#if registration.is_public}}
+checked
+{{/if}}
+> Hide my name in the public list of attendees</td></tr>
 <tr><td>&nbsp;</td>
 <td><input class="submit-talk" type="submit" value="Submit" /></td>
 </tr>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]