bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fix for undefined other field on registration page

Browse Source
This commit is contained in:
Godwin 2015-09-12 18:18:46 -07:00
parent a0e8563d9d
commit c09e495bb0
16 changed files with 55 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/conferences/_done.html.haml
View File

@ -10,16 +10,16 @@
%table
%tr
%th=_'articles.conference_registration.headings.name'
%td=_!current_user.firstname
%td=_!(current_user.firstname || '')
%tr
%th=_'articles.conference_registration.headings.location'
%td=_!@registration.city
%td=_!(@registration.city || '')
%tr
%th=_'articles.conference_registration.headings.arrival'
%td=date(@registration.arrival)
%td=date(@registration.arrival || @this_conference.start_date)
%tr
%th=_'articles.conference_registration.headings.departure'
%td=date(@registration.departure)
%td=date(@registration.departure || @this_conference.end_date)
%tr
%th=_'articles.conference_registration.headings.languages'
%td=_!((JSON.parse(@registration.languages || '[]').map { |x| _"languages.#{x}" }).join(', ').to_s).html_safe
@ -41,10 +41,10 @@
=_!@registration.allergies
%tr
%th=_'articles.conference_registration.headings.other'
%td=_!@registration.other
%td=_!(@registration.other || '')
%tr
%th=_'articles.conference_registration.headings.payment'
%td=_!('$' + @amount)
%td=_!('$' + (@amount || 0))
= form_tag register_path(@this_conference.slug) do
.actions
= button_tag :edit_registration, :value => :register

2
config/locales/data/html_records/Broadcast-message---1.html
View File

@ -46,7 +46,7 @@
<div class="details">
<h3 class="primary">San Marcos, Texas</h3>
<div class="secondary">
August 12 – 16, 2015
August 13 – 17, 2015
</div>
</div>
</div>

2
config/locales/data/html_records/Broadcast-message--.html
View File

@ -46,7 +46,7 @@
<div class="details">
<h3 class="primary">San Marcos, Texas</h3>
<div class="secondary">
August 12 – 16, 2015
August 13 – 17, 2015
</div>
</div>
</div>

4
config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html
View File

@ -77,7 +77,7 @@
<table align='center' border='0' cellpadding='0' cellspacing='0'>
<tr>
<td colspan='2' style='text-align: center' valign='top'>
<img class='image_fix' src='http://127.0.0.1:51317'>
<img class='image_fix' src='http://127.0.0.1:56924'>
</td>
</tr>
<tr>
@ -93,7 +93,7 @@
<img class='image_fix' src='/assets/bblogo-paypal'>
</td>
<td style='width: 50%; text-align: left'>
<a href='http://127.0.0.1:51317'>&copy; Bike!Bike! 2015</a>
<a href='http://127.0.0.1:56924'>&copy; Bike!Bike! 2015</a>
</td>
</tr>
<tr>

2
config/locales/data/html_records/Create-workshop---1.html
View File

@ -46,7 +46,7 @@
<div class="details">
<h3 class="primary">San Marcos, Texas</h3>
<div class="secondary">
August 12 – 16, 2015
August 13 – 17, 2015
</div>
</div>
</div>

2
config/locales/data/html_records/Create-workshop--.html
View File

@ -46,7 +46,7 @@
<div class="details">
<h3 class="primary">San Marcos, Texas</h3>
<div class="secondary">
August 12 – 16, 2015
August 13 – 17, 2015
</div>
</div>
</div>

2
config/locales/data/html_records/See-a-more-info-link---1.html
View File

@ -50,7 +50,7 @@
<div class="details">
<h3 class="primary">Halifax, Nova Scotia</h3>
<div class="secondary">
August 12 – 16, 2015
August 13 – 17, 2015
</div>
</div>
</div>

2
config/locales/data/html_records/See-a-register-link---1.html
View File

@ -41,7 +41,7 @@
<div class="details">
<h3 class="primary">Sackville, New Brunswick</h3>
<div class="secondary">
August 12 – 16, 2015
August 13 – 17, 2015
</div>
</div>
</div>

2
config/locales/data/html_records/See-a-register-link--.html
View File

@ -50,7 +50,7 @@
<div class="details">
<h3 class="primary">Halifax, Nova Scotia</h3>
<div class="secondary">
August 12 – 16, 2015
August 13 – 17, 2015
</div>
</div>
</div>

2
config/locales/data/html_records/Start-registration-from-landing-page---1.html
View File

@ -41,7 +41,7 @@
<div class="details">
<h3 class="primary">Halifax, Nova Scotia</h3>
<div class="secondary">
August 12 – 16, 2015
August 13 – 17, 2015
</div>
</div>
</div>

2
config/locales/data/html_records/Start-registration-from-landing-page--.html
View File

@ -41,7 +41,7 @@
<div class="details">
<h3 class="primary">Sackville, New Brunswick</h3>
<div class="secondary">
August 12 – 16, 2015
August 13 – 17, 2015
</div>
</div>
</div>

4
config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html
View File

@ -80,7 +80,7 @@
<p>
<h3>
<b>
<a href='/confirm/155ce6aa9736c06b09eaf5c6fc979f797fb97f71a889f116fb36231eed4d13c3'><span class="translated-content" data-i18n-key="email.confirmation.link.please_confirm" data-i18n-needs-translation="0">Confirm now</span></a>
<a href='/confirm/e344bf91238c89e6e914e9e87747f08539110ca68ac2d5fd026410b4e6718ece'><span class="translated-content" data-i18n-key="email.confirmation.link.please_confirm" data-i18n-needs-translation="0">Confirm now</span></a>
</b>
</h3>
</p>
@ -94,7 +94,7 @@
<img class='image_fix' src='/assets/bblogo-paypal'>
</td>
<td style='width: 50%; text-align: left'>
<a href='http://127.0.0.1:51317'>&copy; Bike!Bike! 2015</a>
<a href='http://127.0.0.1:56924'>&copy; Bike!Bike! 2015</a>
</td>
</tr>
<tr>

4
config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html
View File

@ -67,8 +67,8 @@
<label for="departure"><span class="translated-content" data-i18n-key="forms.labels.generic.departure" data-i18n-needs-translation="0">Departure date</span></label>
</div>
<div class="date-field input-field">
<input type="datetime-local" name="arrival" id="arrival" value="2015-08-12T00:00:00">
<input type="datetime-local" name="departure" id="departure" value="2015-08-16T00:00:00">
<input type="datetime-local" name="arrival" id="arrival" value="2015-08-13T00:00:00">
<input type="datetime-local" name="departure" id="departure" value="2015-08-17T00:00:00">
</div>
</div>
<h3><span class="translated-content" data-i18n-key="articles.conference_registration.headings.languages" data-i18n-needs-translation="0">Which languages do you speak?</span></h3>

4
config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html
View File

@ -80,7 +80,7 @@
<p>
<h3>
<b>
<a href='/confirm/155ce6aa9736c06b09eaf5c6fc979f797fb97f71a889f116fb36231eed4d13c3'><span class="translated-content" data-i18n-key="email.confirmation.link.please_confirm" data-i18n-needs-translation="0">Confirm now</span></a>
<a href='/confirm/e344bf91238c89e6e914e9e87747f08539110ca68ac2d5fd026410b4e6718ece'><span class="translated-content" data-i18n-key="email.confirmation.link.please_confirm" data-i18n-needs-translation="0">Confirm now</span></a>
</b>
</h3>
</p>
@ -94,7 +94,7 @@
<img class='image_fix' src='/assets/bblogo-paypal'>
</td>
<td style='width: 50%; text-align: left'>
<a href='http://127.0.0.1:51317'>&copy; Bike!Bike! 2015</a>
<a href='http://127.0.0.1:56924'>&copy; Bike!Bike! 2015</a>
</td>
</tr>
<tr>

2
config/locales/data/html_records/View-stats---1.html
View File

@ -46,7 +46,7 @@
<div class="details">
<h3 class="primary">Anchorage, Alaska</h3>
<div class="secondary">
August 12 – 16, 2015
August 13 – 17, 2015
</div>
</div>
</div>

64
config/locales/data/html_records/View-stats--.html
View File

@ -13,59 +13,57 @@
<link href="/apple-touch-icon-144x144.png" rel="apple-touch-icon" sizes="144x144">
</head>
<body class="confirm">
<body class="home">
<nav>
<div id="main-nav">
<div class="inner-nav">
<a class="logo" href="/"><img src="/assets/bb-icon-logo.png" class="sprite icons bb-icon-logo">
<img src="/assets/bb-icon-logo-text.png" class="sprite icons bb-icon-logo-text">
</a><div class="nav">
<a href="/"><span>My Bike!Bike!</span></a>
<a class="current" href="/"><span>My Bike!Bike!</span></a>
<a href="/about/"><span><span class="translated-content" data-i18n-key="page_titles.About_BikeBike" data-i18n-needs-translation="0">About Bike!Bike!</span></span></a>
<a href="/policy/"><span><span class="translated-content" data-i18n-key="page_titles.Safe_Space_Policy" data-i18n-needs-translation="0">Safer Space Agreement</span></span></a>
</div>
<div class="actions">
<a class="button register" href="/conferences/MyBikeBike/register/"><span class="translated-content" data-i18n-key="conference.actions.Register" data-i18n-needs-translation="0">Register</span>
</a></div>
</a><form class="logout" action="/logout/" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="✓">
<input type="hidden" name="url" id="url" value="/">
<span class="translated-content" data-i18n-key="forms.actions.generic.Log_out" data-i18n-needs-translation="0"><button name="button" type="submit">Sign out</button></span>
</form>
</div>
</div>
</div>
</nav>
<main id="main">
<header id="banner">
<div class="short" id="header-title">
<svg>
<defs>
<filter id="saturate">
<feColorMatrix in="SourceGraphic" type="saturate" values=".25" result="A"></feColorMatrix>
</filter>
<image x="0" y="0" width="100%" height="100%" xlink:href="/assets/grafitti.jpg" id="banner-image" preserveAspectRatio="xMidYMid slice" filter="url(#saturate)"></image>
<div id="header-title">
<filter id="banner-img" x="0" y="0" width="1" height="1">
<feImage xlink:href="#banner-image" result="banner-image"></feImage>
<feBlend mode="multiply" in="banner-image" in2="SourceGraphic"></feBlend>
</filter>
</defs>
<rect x="0" y="0" width="100%" height="100%" filter="url(#banner-img)"></rect>
</svg>
<h1><span class="translated-content" data-i18n-key="page_titles.403.Please_Confirm_Email" data-i18n-needs-translation="0">Please confirm your email</span></h1>
<div class="cover" style="background-image: url()"></div>
<div class="title">
<h2 class="background">2015!</h2>
<div class="details">
<h3 class="primary">Anchorage, Alaska</h3>
<div class="secondary">
August 13 – 17, 2015
</div>
</div>
</div>
</div>
<figure>
<img>
</figure>
</header>
<div id="content"><article>
<div class="row"><div class="columns medium-12"><h2><span class="translated-content" data-i18n-key="articles.permission_denied.headings.confirm_email" data-i18n-needs-translation="0">Please confirm your email address</span></h2>
</div><div class="columns medium-6 large-5"><form action="/doconfirm/" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="✓">
<div class="email-field input-field">
<input type="email" name="email" id="email" required="required">
<label for="email"><span class="translated-content" data-i18n-key="forms.labels.generic.email" data-i18n-needs-translation="0">Email address</span></label>
</div>
<input type="hidden" name="token" id="token" value="test">
<span class="translated-content" data-i18n-key="forms.actions.generic.login" data-i18n-needs-translation="0"><button name="button" type="submit">Sign In</button></span>
</form>
</div></div>
<div id="content">
<article>
<h2>My Bike!Bike!</h2>
Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.
<h3><span class="translated-content" data-i18n-key="acticles.conferences.headings.Proposed_Workshops" data-i18n-needs-translation="1">Proposed Workshops</span></h3>
<p><span class="translated-content" data-i18n-key="acticles.conferences.paragraphs.Proposed_Workshops" data-i18n-needs-translation="1">Would you like to facilitate your own workshop? Simply register and visit the workshops page. If you have already registered you can access the page by restarting the registration process.</span></p>
<ul class="workshop-list">
</ul>
</article>
</div>
</main>
@ -94,7 +92,7 @@ EN
<div class="selector">
<ul>
<li>
<a href="/confirm/test">
<a href="/">
EN
</a>
<span>English</span>