Skip to content

Commit

Permalink
#66 - first round of redesign...
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbellone
cbellone committed Aug 4, 2015
1 parent 6b2fe8e commit f8ea029
Show file tree
Hide file tree
Showing 13 changed files with 255 additions and 161 deletions.
7 changes: 5 additions & 2 deletions src/main/resources/alfio/i18n/public.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ show-event.add-to-calendar=Add to my calendar:

#reservation-page.ms
reservation-page.header.title=Order summary for {0}
reservation-page.title=Order summary for
reservation-page.title=Order summary
reservation-page.category=Category
reservation-page.price=Price
reservation-page.amount=Amount
Expand Down Expand Up @@ -257,4 +257,7 @@ show-event.sold-out.subscription-error=Something went wrong, please retry in few
email-waiting-queue.subscribed.subject=You joined the waiting queue for {0}
email-waiting-queue.subscribed.text=As requested, you joined the waiting queue for the event {0}. We''ll keep you posted if something comes up\!
email-waiting-queue.subscribed.admin.subject=[{0}] Waiting queue subscription
email-waiting-queue.subscribed.admin.text=Someone joined the waiting queue {0} for {1}. Please check the admin application for more details.
email-waiting-queue.subscribed.admin.text=Someone joined the waiting queue {0} for {1}. Please check the admin application for more details.
event-days.single-day.hours=from {0} to {1}
show.optional.fields=Show optional fields
hide.optional.fields=Hide optional fields
9 changes: 6 additions & 3 deletions src/main/resources/alfio/i18n/public_de.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ show-event.add-to-calendar=In meinem Kalender hinzuf\u00FCgen

#reservation-page.ms
reservation-page.header.title=Bestell\u00FCbersicht f\u00FCr {0}
reservation-page.title=Bestell\u00FCbersicht f\u00FCr
reservation-page.title=Bestell\u00FCbersicht
reservation-page.category=Kategorie
reservation-page.price=Preis
reservation-page.amount=H\u00F6he
Expand All @@ -67,7 +67,7 @@ reservation-page.expiration-month=Monat (MM)
reservation-page.expiration-year=Jahr (YYYY)
reservation-page.pay=Zahlen
reservation-page.cancel=Stornieren
reservation-page.time-for-completition=Sie haben #Minuten# Minuten und #Sekunden# Sekunden Zeit, um diese Bestellung zu vervollst\u00E4ndigen
reservation-page.time-for-completition=Sie haben \#minutes\# Minuten und \#seconds\# Sekunden Zeit, um diese Bestellung zu vervollst\u00E4ndigen
reservation-page.tc.prefix=Ich habe gelesen und stimme zu
reservation-page.tc.link.text=Gesch\u00E4ftsbedingungen
reservation-page.tc.suffix=.
Expand Down Expand Up @@ -257,4 +257,7 @@ show-event.sold-out.subscription-error=Etwas ist schief gelaufen, bitte versuche
email-waiting-queue.subscribed.subject=Sie sind der Warteliste beigetreten {0}
email-waiting-queue.subscribed.text=Wie gew\u00FCnscht, haben wir Sie der Warteliste f\u00FCr die Veranstaltung {0} hinzugef\u00FCgt. \u00DCber Neuigkeiten halten wir Sie auf dem Laufenden!
email-waiting-queue.subscribed.admin.subject=[{0}] In der Warteschlange eingetragen
email-waiting-queue.subscribed.admin.text=Jemand trat der Warteschlange {0} bei {1}. Bitte \u00FCberpr\u00FCfen Sie die Admin-Anwendungen f\u00FCr weitere Details.
email-waiting-queue.subscribed.admin.text=Jemand trat der Warteschlange {0} bei {1}. Bitte \u00FCberpr\u00FCfen Sie die Admin-Anwendungen f\u00FCr weitere Details.
event-days.single-day.hours=von {0} bis {1}
show.optional.fields=Optionale Felder zeigen
hide.optional.fields=Optionale Felder verstecken
8 changes: 6 additions & 2 deletions src/main/resources/alfio/i18n/public_it.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ show-event.add-to-calendar=Aggiungi al mio calendario:


#reservation-page.ms
reservation-page.title=Riepilogo dell''ordine per
reservation-page.title=Riepilogo dell''ordine
reservation-page.category=Categoria
reservation-page.price=Prezzo
reservation-page.amount=Quantit\u00E0
Expand Down Expand Up @@ -246,4 +246,8 @@ show-event.sold-out.subscription-complete=Grazie per esserti iscritto alla lista
show-event.sold-out.subscription-error=Iscrizione non riuscita. Per favore riprova tra qualche minuto, grazie\!
email-waiting-queue.subscribed.subject=Conferma iscrizione alla lista d''attesa per {0}
email-waiting-queue.subscribed.admin.text=Qualcuno si \u00E8 aggiunto alla lista d''attesa ({0}) per {1}. Maggiori informazioni nell''admin area
email-waiting-queue.subscribed.text=Come richiesto, abbiamo aggiunto il tuo nome alla lista d''attesa per {0}. Ti faremo sapere non appena ci saranno novit\u00E0\!
email-waiting-queue.subscribed.text=Come richiesto, abbiamo aggiunto il tuo nome alla lista d''attesa per {0}. Ti faremo sapere non appena ci saranno novit\u00E0\!
event-days.single-day.hours=dalle {0} alle {1}
show.optional.fields=Visualizza campi opzionali
hide.optional.fields=Nascondi campi opzionali
show.more=
136 changes: 71 additions & 65 deletions src/main/webapp/WEB-INF/templates/event/assign-ticket-form.ms
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,78 +51,84 @@
{{/lockedAssignment}}
</div>
</div>
<!-- -->
<div class="form-group">
<label class="col-sm-3 control-label" for="job-title-{{uuid}}">{{#i18n}}reservation-page-complete.job-title{{/i18n}}</label>
<div class="col-sm-9">
<input type="text" name="jobTitle" value="{{jobTitle}}" id="job-title-{{uuid}}" class="form-control" maxlength="255">
</div>
<!-- optional values -->
<div class="hidden toggle-collapse center wMarginBottom">
<span class="collapse-more"><a class="btn btn-primary btn-xs toggle-collapse"><i class="fa fa-arrow-circle-o-down"></i> {{#i18n}}show.optional.fields{{/i18n}}</a></span>
<span class="collapse-less collapse-toggle hidden"><a class="btn btn-primary btn-xs toggle-collapse"><i class="fa fa-arrow-circle-o-up"></i> {{#i18n}}hide.optional.fields{{/i18n}}</a></span>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="company-{{uuid}}">{{#i18n}}reservation-page-complete.company{{/i18n}}</label>
<div class="col-sm-9">
<input type="text" name="company" value="{{company}}" id="company-{{uuid}}" class="form-control" maxlength="255">
<div {{^assigned}}class="collapsible"{{/assigned}}>
<div class="form-group">
<label class="col-sm-3 control-label" for="job-title-{{uuid}}">{{#i18n}}reservation-page-complete.job-title{{/i18n}}</label>
<div class="col-sm-9">
<input type="text" name="jobTitle" value="{{jobTitle}}" id="job-title-{{uuid}}" class="form-control" maxlength="255">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="phone-number-{{uuid}}">{{#i18n}}reservation-page-complete.phone-number{{/i18n}}</label>
<div class="col-sm-9">
<input type="tel" name="phoneNumber" value="{{phoneNumber}}" id="phone-number-{{uuid}}" class="form-control" maxlength="255">
<div class="form-group">
<label class="col-sm-3 control-label" for="company-{{uuid}}">{{#i18n}}reservation-page-complete.company{{/i18n}}</label>
<div class="col-sm-9">
<input type="text" name="company" value="{{company}}" id="company-{{uuid}}" class="form-control" maxlength="255">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="address-{{uuid}}">{{#i18n}}reservation-page-complete.address{{/i18n}}</label>
<div class="col-sm-9">
<textarea name="address" id="address-{{uuid}}" class="form-control" maxlength="450">{{address}}</textarea>
<div class="form-group">
<label class="col-sm-3 control-label" for="phone-number-{{uuid}}">{{#i18n}}reservation-page-complete.phone-number{{/i18n}}</label>
<div class="col-sm-9">
<input type="tel" name="phoneNumber" value="{{phoneNumber}}" id="phone-number-{{uuid}}" class="form-control" maxlength="255">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="country-{{uuid}}">{{#i18n}}reservation-page-complete.country{{/i18n}}</label>
<div class="col-sm-9">
<select name="country" value="{{country}}" id="country-{{uuid}}" class="form-control">
<option value=""></option>
{{#countries}}
<option value="{{left}}">{{right}}</option>
{{/countries}}
</select>
<div class="form-group">
<label class="col-sm-3 control-label" for="address-{{uuid}}">{{#i18n}}reservation-page-complete.address{{/i18n}}</label>
<div class="col-sm-9">
<textarea name="address" id="address-{{uuid}}" class="form-control" maxlength="450">{{address}}</textarea>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="t-shirt-size-{{uuid}}">{{#i18n}}reservation-page-complete.t-shirt-size{{/i18n}}</label>
<div class="col-sm-9">
<select name="tShirtSize" value="{{tshirtSize}}" id="t-shirt-size-{{uuid}}" class="form-control">
<option value=""></option>
<optgroup label="{{#i18n}}reservation-page-complete.women{{/i18n}}">
<option value="SMALL-F">Small</option>
<option value="MEDIUM-F">Medium</option>
<option value="LARGE-F">Large</option>
<option value="X-LARGE-F">X-Large</option>
</optgroup>
<optgroup label="{{#i18n}}reservation-page-complete.men{{/i18n}}">
<option value="SMALL">Small</option>
<option value="MEDIUM">Medium</option>
<option value="LARGE">Large</option>
<option value="X-LARGE">X-Large</option>
<option value="2X-LARGE">2X-Large</option>
</optgroup>
</select>
<div class="form-group">
<label class="col-sm-3 control-label" for="country-{{uuid}}">{{#i18n}}reservation-page-complete.country{{/i18n}}</label>
<div class="col-sm-9">
<select name="country" value="{{country}}" id="country-{{uuid}}" class="form-control">
<option value=""></option>
{{#countries}}
<option value="{{left}}">{{right}}</option>
{{/countries}}
</select>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="notes-{{uuid}}">{{#i18n}}reservation-page-complete.notes{{/i18n}}</label>
<div class="col-sm-9">
<textarea name="notes" id="notes-{{uuid}}" class="form-control" maxlength="1024" placeholder="{{#i18n}}reservation-page-complete.notes.placeholder{{/i18n}}">{{notes}}</textarea>
<div class="form-group">
<label class="col-sm-3 control-label" for="t-shirt-size-{{uuid}}">{{#i18n}}reservation-page-complete.t-shirt-size{{/i18n}}</label>
<div class="col-sm-9">
<select name="tShirtSize" value="{{tshirtSize}}" id="t-shirt-size-{{uuid}}" class="form-control">
<option value=""></option>
<optgroup label="{{#i18n}}reservation-page-complete.women{{/i18n}}">
<option value="SMALL-F">Small</option>
<option value="MEDIUM-F">Medium</option>
<option value="LARGE-F">Large</option>
<option value="X-LARGE-F">X-Large</option>
</optgroup>
<optgroup label="{{#i18n}}reservation-page-complete.men{{/i18n}}">
<option value="SMALL">Small</option>
<option value="MEDIUM">Medium</option>
<option value="LARGE">Large</option>
<option value="X-LARGE">X-Large</option>
<option value="2X-LARGE">2X-Large</option>
</optgroup>
</select>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="language-{{uuid}}">{{#i18n}}reservation-page-complete.language{{/i18n}}</label>
<div class="col-sm-9">
<select name="userLanguage" value="{{userLanguage}}" id="language-{{uuid}}" class="form-control">
<option value=""></option>
{{#availableLanguages}}
<option value="{{language}}">{{displayLanguage}}</option>
{{/availableLanguages}}
</select>
<div class="form-group">
<label class="col-sm-3 control-label" for="notes-{{uuid}}">{{#i18n}}reservation-page-complete.notes{{/i18n}}</label>
<div class="col-sm-9">
<textarea name="notes" id="notes-{{uuid}}" class="form-control" maxlength="1024" placeholder="{{#i18n}}reservation-page-complete.notes.placeholder{{/i18n}}">{{notes}}</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="language-{{uuid}}">{{#i18n}}reservation-page-complete.language{{/i18n}}</label>
<div class="col-sm-9">
<select name="userLanguage" value="{{userLanguage}}" id="language-{{uuid}}" class="form-control">
<option value=""></option>
{{#availableLanguages}}
<option value="{{language}}">{{displayLanguage}}</option>
{{/availableLanguages}}
</select>
</div>
</div>
</div>
<div class="text-center hide alert alert-danger" id="error-{{uuid}}"><i class="fa fa-exclamation"></i> {{#i18n}}error.generic{{/i18n}}</div>
Expand Down
63 changes: 34 additions & 29 deletions src/main/webapp/WEB-INF/templates/event/event-list.ms
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,40 @@
<ul class="list-group">
{{#events}}
<li class="list-group-item">
<a href="{{request.contextPath}}/event/{{shortName}}/">
<div>
<div>
{{>/event/output-event-image-tag}}
<h2>{{displayName}}</h2>
</div>
<div>
{{#sameDay}}
{{#i18n}}event-days.same-day
[{{#format-date}}{{begin}} EEEE dd MMMM yyyy locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]
[{{#format-date}}{{begin}} HH:mm{{/format-date}}]
[{{#format-date}}{{end}} HH:mm (z){{/format-date}}]
{{/i18n}}
{{/sameDay}}
{{^sameDay}}
{{#i18n}}event-days.not-same-day
[{{#format-date}}{{begin}} EEEE dd MMMM yyyy locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]
[{{#format-date}}{{begin}} HH:mm{{/format-date}}]
{{/i18n}}
-
{{#i18n}}event-days.not-same-day
[{{#format-date}}{{end}} EEEE dd MMMM yyyy locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]
[{{#format-date}}{{end}} HH:mm (z){{/format-date}}]
{{/i18n}}
{{/sameDay}}
</div>
<div>{{location}}</div>
</div>
</a>
<div class="row">
<div class="col-xs-12 col-sm-7 col-md-4">
<a href="{{request.contextPath}}/event/{{shortName}}/" class="no-decoration">
{{>/event/output-event-image-tag}}
</a>
</div>
<div class="col-xs-12 col-sm-5 col-md-8">
<a href="{{request.contextPath}}/event/{{shortName}}/" class="no-decoration">
<h2>{{displayName}}</h2>
<h6>{{description}}</h6>
<div>
{{#sameDay}}
{{#i18n}}event-days.same-day
[{{#format-date}}{{begin}} EEEE dd MMMM yyyy locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]
[{{#format-date}}{{begin}} HH:mm{{/format-date}}]
[{{#format-date}}{{end}} HH:mm (z){{/format-date}}]
{{/i18n}}
{{/sameDay}}
{{^sameDay}}
{{#i18n}}event-days.not-same-day
[{{#format-date}}{{begin}} EEEE dd MMMM yyyy locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]
[{{#format-date}}{{begin}} HH:mm{{/format-date}}]
{{/i18n}}
-
{{#i18n}}event-days.not-same-day
[{{#format-date}}{{end}} EEEE dd MMMM yyyy locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]
[{{#format-date}}{{end}} HH:mm (z){{/format-date}}]
{{/i18n}}
{{/sameDay}}
</div>
<div>{{location}}</div>
</a>
</div>
</div>
</li>
{{/events}}
</ul>
Expand Down
9 changes: 9 additions & 0 deletions src/main/webapp/WEB-INF/templates/event/header.ms
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div class="row wMarginBottom">
<div class="col-xs-12 col-sm-7 col-md-4">
{{>/event/output-event-image-tag}}
</div>
<div class="hidden-xs col-sm-5 col-md-8">
<h1>{{event.displayName}}</h1>
</div>
</div>
<hr/>
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/templates/event/output-event-image-tag.ms
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{{#event.imageIsPresent}}
{{#event.fileBlobIdIsPresent}}
<img src="{{request.contextPath}}/file/{{event.fileBlobId}}" alt="{{event.displayName}}" class="img-responsive img-center">
<img src="{{request.contextPath}}/file/{{event.fileBlobId}}" alt="{{event.displayName}}" class="img-responsive img-center logo">
{{/event.fileBlobIdIsPresent}}
{{^event.fileBlobIdIsPresent}}
<img src="{{event.imageUrl}}" alt="{{event.displayName}}" class="img-responsive img-center">
<img src="{{event.imageUrl}}" alt="{{event.displayName}}" class="img-responsive img-center logo">
{{/event.fileBlobIdIsPresent}}
{{/event.imageIsPresent}}
12 changes: 11 additions & 1 deletion src/main/webapp/WEB-INF/templates/event/page-top.ms
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="{{#i18n}}locale{{/i18n}}" prefix="og: http://ogp.me/ns#">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
Expand All @@ -8,6 +8,16 @@
<link rel="stylesheet" href="{{request.contextPath}}/resources/bower_components/components-font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="{{request.contextPath}}/resources/css/application.css">
<title>{{#i18n}}{{pageTitle}}[{{event.displayName}}]{{/i18n}}</title>
<meta property="og:type" content="website" />
{{#event.imageIsPresent}}
{{#event.fileBlobIdIsPresent}}
<meta property="og:image" content="{{request.contextPath}}/file/{{event.fileBlobId}}" />
{{/event.fileBlobIdIsPresent}}
{{^event.fileBlobIdIsPresent}}
<meta property="og:image" content="{{event.imageUrl}}" />
{{/event.fileBlobIdIsPresent}}
{{/event.imageIsPresent}}
<meta property="og:description" content="{{#i18n}}{{pageTitle}}[{{event.displayName}}]{{/i18n}}" />
</head>
<body>

Expand Down
16 changes: 7 additions & 9 deletions src/main/webapp/WEB-INF/templates/event/reservation-page-complete.ms
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{{>/event/page-top}}

<div>
{{>/event/output-event-image-tag}}
</div>
{{>/event/header}}

{{^ticketsAreAllAssigned}}
<ol class="breadcrumb wMarginTop">
<li class="active">{{#i18n}}breadcrumb.step1{{/i18n}}</li>
<li class="active">{{#i18n}}breadcrumb.step2{{/i18n}}</li>
<li><i class="fa fa-download"></i> {{#i18n}}breadcrumb.step3{{/i18n}}</li>
</ol>
<div class="wizard wMarginBottom wMarginTop center">
<a><span class="badge">1</span> {{#i18n}}breadcrumb.step1{{/i18n}}</a>
<a><span class="badge">2</span> {{#i18n}}breadcrumb.step2{{/i18n}}</a>
<a class="current"><span class="badge badge-inverse">3</span> {{#i18n}}breadcrumb.step3{{/i18n}}</a>
</div>
{{/ticketsAreAllAssigned}}

<div class="wMarginBottom"></div>
Expand Down Expand Up @@ -71,7 +69,7 @@
<h3><i class="fa fa-ticket"></i> {{#i18n}}reservation-page-complete.ticket-nr{{/i18n}}<span class="ticket-counter"></span></h3>
</div>
{{#i18n}}reservation-page-complete.ticket-type{{/i18n}} <strong>{{key.name}}</strong>
<div id="ticket-detail-{{uuid}}">
<div id="ticket-detail-{{uuid}}" data-collapse-enabled="true" class="collapsible-container">
{{> /event/assign-ticket-form}}
</div>
</li>
Expand Down
Loading

0 comments on commit f8ea029

Please sign in to comment.