dizajn drzb2013

[angular-drzb] / app / partials / registration.html

diff --git a/app/partials/registration.html b/app/partials/registration.html
index aecd0f3..bf5c7ad 100644 (file)
--- a/app/partials/registration.html
+++ b/app/partials/registration.html
@@ -8,72 +8,90 @@ Svi sudionici skupa, bez obzira na to jesu li izlagači, suautori ili slušači,
 
 <h2>Odaberite tip registracije</h2>
 
-<label class="left"><input type="radio" ng-model="user.registration_type" value="lecture" >Prijava usmenog izlaganja - <i>popunjava prvi autor, odnosno osoba koja će izložiti rad. Ostali autori trebaju se samo registrirati.</i></label>
-<label class="left"><input type="radio" ng-model="user.registration_type" value="poster" >Prijava poster prezentacije - <i>popunjava prvi autor, ondnosno osoba koja će izložiti rad. Ostali autori trebaju se samo registrirati.</i></label>
-<label class="left"><input type="radio" ng-model="user.registration_type" value="symposium" >Prijava simpozija - <i>popunjava organizator simpozija, upisuje sažetke svih radova. Autori radova na simpoziju trebaju se samo registrirati.</i></label>
-<label class="left"><input type="radio" ng-model="user.registration_type" value="round" >Prijava okruglog stola - <i>popunjava organizator okruglog stola. Sudionici se trebaju registrirati.</i></label>
+<label class="radio"><input type="radio" ng-model="user.registration_type" value="lecture" >Prijava usmenog izlaganja - <i>popunjava prvi autor, odnosno osoba koja će izložiti rad. Ostali autori trebaju se samo registrirati.</i></label>
+<label class="radio"><input type="radio" ng-model="user.registration_type" value="poster" >Prijava poster prezentacije - <i>popunjava prvi autor, ondnosno osoba koja će izložiti rad. Ostali autori trebaju se samo registrirati.</i></label>
+<label class="radio"><input type="radio" ng-model="user.registration_type" value="symposium" >Prijava simpozija - <i>popunjava organizator simpozija, upisuje sažetke svih radova. Autori radova na simpoziju trebaju se samo registrirati.</i></label>
+<label class="radio"><input type="radio" ng-model="user.registration_type" value="round" >Prijava okruglog stola - <i>popunjava organizator okruglog stola. Sudionici se trebaju registrirati.</i></label>
 <hr />
-<label class="left"><input type="radio" ng-model="user.registration_type" value="participant" >Registracija - <i>popunjavaju slušači i suatori, te autori i suatori radova na simpoziju i sudionici okruglog stola.</i></label>
-<label class="left"><input type="radio" ng-model="user.registration_type" value="accomp" >Registracija za osobe u pratnji.</label>
+<label class="radio"><input type="radio" ng-model="user.registration_type" value="participant" >Registracija - <i>popunjavaju slušači i suatori, te autori i suatori radova na simpoziju i sudionici okruglog stola.</i></label>
+<label class="radio"><input type="radio" ng-model="user.registration_type" value="accomp" >Registracija za osobe u pratnji.</label>
 
-<div ng-show="user.registration_type">
+<fieldset ng-show="user.registration_type">
 
-<h2>Registracija - podaci za kontakt</h2>
+<legend>Registracija - kontakt podaci</legend>
 
-<input class="my-input w2" ng-model="user.firstname" placeholder="Ime" ng-required="true" />
-<input class="my-input w2" ng-model="user.surname"   placeholder="Prezime" ng-required="true" />
+<div class="controls controls-row">
+ <input class="my-input span6" ng-model="user.firstname" placeholder="Ime" ng-required="true" />
+ <input class="my-input span6" ng-model="user.surname"   placeholder="Prezime" ng-required="true" />
+</div>
 
-<input class="my-input w1" ng-model="user.organization" placeholder="Ustanova" >
+<div class="controls controls-row">
+ <input class="my-input span12" ng-model="user.organization" placeholder="Ustanova" >
+</div>
 
-<input class="my-input w1" ng-model="user.address" placeholder="Adresa" >
+<div class="controls controls-row">
+ <input class="my-input span12" ng-model="user.address" placeholder="Adresa" >
+</div>
 
-<input class="my-input w3 left" ng-model="user.town" placeholder="Grad" ng-required="true" >
-<input class="my-input w3" ng-model="user.zip_code" placeholder="Poštanski br." >
-<input class="my-input w3" ng-model="user.country" placeholder="Zemlja" >
+<div class="controls controls-row">
+ <input class="my-input span4" ng-model="user.city" placeholder="Grad" ng-required="true" >
+ <input class="my-input span4" ng-model="user.zip_code" placeholder="Poštanski br." >
+ <input class="my-input span4" ng-model="user.country" placeholder="Zemlja" >
+</div>
 
-<input class="my-input w2 left" ng-model="user.email" type="email" placeholder="E-pošta" ng-required="true" />
-<input class="my-input w2" ng-model="user.phone" placeholder="Tel. broj" />
+<div class="controls controls-row">
+ <input class="my-input span6" ng-model="user.email" type="email" placeholder="E-pošta" ng-required="true" />
+ <input class="my-input span6" ng-model="user.phone" placeholder="Tel. broj" />
+</div>
 
-<label class="left">
-<input ng-model="user.student" type="checkbox" ng-change="change_student()">
-Označite ako ste student.
+<label class="checkbox">
+ <input ng-model="user.student" type="checkbox" ng-change="change_student()">
+ Označite ako ste student.
 </label>
 
 <div ng-show="! user.student">
 
-<label class="left">
-<input ng-model="user.hpd_member" type="checkbox">
-Označite ako ste član HPD-a
-</label>
-
-<label class="left">
-<input type="checkbox" ng-model="user.reception">
-Označite ako ćete biti na domjenku dobrodošlice
+<label class="checkbox">
+ <input ng-model="user.hpd_member" type="checkbox">
+ Označite ako ste član HPD-a
 </label>
 
-<label class="left">
-<input type="checkbox" ng-model="user.dinner">
-Označite ako ćete biti na zajedničkoj večeri? (Večera je uključena u kotizaciju.)
-</label>
-
-<label class="left">
+<label class="checkbox">
 <input type="checkbox" ng-model="user.r1.required">
 Trebam R-1 račun
 </label>
 
 <div ng-show="user.r1.required">
-<h3>Organizacija koja uplaćuje R-1 račun</h3>
+<legend>
+Organizacija koja uplaćuje R-1 račun
+</legend>
 
-<input class="my-input w1" ng-model="user.r1.organization" ng-required="user.r1.required" placeholder="Naziv">
-<input class="my-input w1" ng-model="user.r1.address" ng-required="user.r1.required" placeholder="Adresa">
-<input class="my-input w1" ng-model="user.r1.OIB" ng-required="user.r1.required" placeholder="OIB">
+<input class="my-input span12" ng-model="user.r1.organization" ng-required="user.r1.required" placeholder="Naziv">
+<input class="my-input span12" ng-model="user.r1.address" ng-required="user.r1.required" placeholder="Adresa">
+<input class="my-input span5" ng-model="user.r1.OIB" ng-required="user.r1.required" placeholder="OIB">
 
 </div><!-- r1.required -->
+</div><!-- ! user.student -->
+
+<legend>
+Hoćete li biti na domjenku dobrodošlice
+</legend>
+<label class="radio"><input type="radio" ng-model="user.reception" value="yes" ng-required="true">Da</label>
+<label class="radio"><input type="radio" ng-model="user.reception" value="no"  ng-required="true">Ne</label>
+
+<div ng-show="! user.student">
+
+<legend>
+Hoćete li biti na zajedničkoj večeri?
+</legend>
+Večera je uključena u kotizaciju.
+<label class="radio"><input type="radio" ng-model="user.dinner" value="yes" ng-required="! user.student && ! user.dinner">Da</label>
+<label class="radio"><input type="radio" ng-model="user.dinner" value="no"  ng-required="! user.student && ! user.dinner">Ne</label>
 
 
 </div><!-- not student -->
 
-</div><!-- selected registration_type -->
+</fieldset><!-- selected registration_type -->
 
 
 <div ng-show="has_work">
@@ -86,25 +104,26 @@ Trebam R-1 račun
 <b ng-switch-default>Has unknown work type {{work.type}} to submit</b>
 </div>
 
-<input class="my-input w1" ng-model="work.title" placeholder="Naslov" ng-required="has_work" >
-<h3 ng-show="is_symposium">Organizator simpozija</h3>
-<div ng-repeat="person in work.persons" class="persons">
-       <input class="my-input w4 left" ng-model="person.firstname" placeholder="Ime" ng-required="has_work" />
-       <input class="my-input w4" ng-model="person.surname"   placeholder="Prezime" ng-required="has_work" />
-       <input class="my-input w4" ng-model="person.organization" placeholder="Ustanova" >
-       <input class="my-input w4" ng-model="person.email" type="email" placeholder="E-mail" ng-required="has_work" />
-       <a class="" href="" ng-click="removePerson(work.persons,person)">obriši</a>
+<input class="my-input input-block-level" ng-model="work.title" placeholder="Naslov" ng-required="has_work" >
+<h3 ng-show="user.registration_type == 'symposium'">Organizator simpozija</h3>
+<div ng-repeat="person in work.persons" class="controls controls-row">
+       <input class="span2 my-input" ng-model="person.firstname" placeholder="Ime" ng-required="has_work" />
+       <input class="span2 my-input" ng-model="person.surname"   placeholder="Prezime" ng-required="has_work" />
+       <input class="span4 my-input" ng-model="person.organization" placeholder="Ustanova" >
+       <input class="span2 my-input" ng-model="person.email" type="email" placeholder="E-mail" ng-required="has_work" />
+       <a class="btn btn-danger" href="" ng-click="removePerson(work.persons,person)">obriši</a>
+</div>
+<a class="btn" href="" ng-click="addPerson(work.persons)">dodaj osobu</a>
+<div class="controls">
+ <label>
+ Sažetak ({{work.abstract.length || 0}}  od maks. 2000 znakova s razmacima)
+ </label>
+ <textarea class="span12" ng-model="work.abstract" ng-maxlength="2000" rows="10" cols="80" ng-required="has_work" ></textarea>
 </div>
-<a class="left" href="" ng-click="addPerson(work.persons)">dodaj osobu</a>
-
-<label class="left">
-Sažetak ({{work.abstract.length || 0}}  od maks. 2000 znakova)
-</label>
-<textarea class="w1" ng-model="work.abstract" ng-maxlength="2000" rows="10" cols="80" ng-required="has_work" ></textarea>
 
 </div><!-- has_work -->
 
-<div ng-show="is_symposium">
+<div ng-show="user.registration_type == 'symposium'">
 
 <h2>Prijava radova unutar simpozija {{work.title}}</h2>
 
@@ -112,43 +131,37 @@ Sažetak ({{work.abstract.length || 0}}  od maks. 2000 znakova)
 
 <h3>{{$index + 1}}. rad na simpoziju</h3>
 
-<input class="my-input w1" ng-model="work.title" placeholder="Naslov" ng-required="has_work" >
-
-<div ng-repeat="person in work.persons" class="persons">
-       <input class="my-input w4 left" ng-model="person.firstname" placeholder="Ime" ng-required="has_work" />
-       <input class="my-input w4" ng-model="person.surname"   placeholder="Prezime" ng-required="has_work" />
-       <input class="my-input w4" ng-model="person.organization" placeholder="Ustanova" >
-       <input class="my-input w4" ng-model="person.email" type="email" placeholder="E-mail" ng-required="has_work" />
-       <a href="" ng-click="removePerson(work.persons,person)">obriši</a>
+<input class="my-input input-block-level" ng-model="work.title" placeholder="Naslov" ng-required="has_work" >
+<div ng-repeat="person in work.persons" class="controls controls-row">
+       <input class="span2 my-input" ng-model="person.firstname" placeholder="Ime" ng-required="has_work" />
+       <input class="span2 my-input" ng-model="person.surname"   placeholder="Prezime" ng-required="has_work" />
+       <input class="span4 my-input" ng-model="person.organization" placeholder="Ustanova" >
+       <input class="span2 my-input" ng-model="person.email" type="email" placeholder="E-mail" ng-required="has_work" />
+       <a class="btn btn-danger" href="" ng-click="removePerson(work.persons,person)">obriši</a>
+</div>
+<a class="btn" href="" ng-click="addPerson(work.persons)">dodaj osobu</a>
+<div class="controls">
+ <label>
+ Sažetak ({{work.abstract.length || 0}}  od maks. 2000 znakova s razmacima)
+ </label>
+ <textarea class="span12" ng-model="work.abstract" ng-maxlength="2000" rows="10" cols="80" ng-required="has_work" ></textarea>
 </div>
-<a class="left" href="" ng-click="addPerson(work.persons)">dodaj osobu</a>
-
-<label class="left">
-Sažetak ({{work.abstract.length || 0}}  od maks. 2000 znakova)
-</label>
-<textarea class="w1" ng-model="work.abstract" ng-maxlength="2000" rows="10" cols="80" ng-required="has_work" ></textarea>
 
 </div><!-- ng-repeat symposium_works  -->
 
-<a href="" ng-click="add_symposium_work(work.symposium_works)">Dodaj još jedan rad na simpoziju</a>
-
-</div><!-- is_symposium -->
+<a class="btn" href="" ng-click="add_symposium_work(work.symposium_works)">Dodaj još jedan rad na simpoziju</a>
 
-<button class="left" ng-click="update(registration)" ng-show="RegistrationForm.$valid">Registriraj se za konferenciju</button>
+</div><!-- user.registration_type == 'symposium' -->
 
-<p style="color: red" ng-show="! RegistrationForm.$valid">
-Molimo ispunite sva obavezna polja. Obratite pažnju na polja s narančastim okvirom. Odlučite o dolasku na domjenak i večeru.
+<div class="form-actions">
+ <button class="btn btn-primary" ng-click="update(registration)" ng-show="RegistrationForm.$valid">Pošalji</button>
+<p class="left" style="color: red" ng-show="! RegistrationForm.$valid">
+Molimo ispunite sva obavezna polja označena crvenim okvirom.
 </p>
+</div>
 
-<pre>
-user={{user}}
-
-work={{work}}
-
-registration={{registration}}
-
-$routeParams={{$routeParams}}
 
+<pre>
 {{RegistrationForm.$valid}}
 {{RegistrationForm.$error}}