X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=app%2Fhr%2Fpartials%2Fregistration.html;h=fe54034ced6202c21a73479e096cc304cdf5787a;hb=54c43628decabd9195b7f74eb4a58fdffae44471;hp=9fabf41f0444666ac35538a1a15f1ef9f2f202cd;hpb=85db372de09e4831d37ad0932c7aaf3278779933;p=angular-drzb

diff --git a/app/hr/partials/registration.html b/app/hr/partials/registration.html
index 9fabf41..fe54034 100644
--- a/app/hr/partials/registration.html
+++ b/app/hr/partials/registration.html
@@ -43,29 +43,31 @@ Jedna osoba može biti autor u <strong>najviše tri</strong> rada, pri čemu na
 <legend>Registracija - kontakt podaci</legend>
 
 <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" />
+ <input class="my-input span5" ng-model="user.firstname" placeholder="Ime" ng-required="true" />
+ <input class="my-input span5" ng-model="user.surname"   placeholder="Prezime" ng-required="true" />
 </div>
 
 <div class="controls controls-row">
- <input class="my-input span12" ng-model="user.organization" placeholder="Ustanova" >
+ <input class="my-input span10" ng-model="user.organization" placeholder="Ustanova" >
 </div>
 
 <div class="controls controls-row">
- <input class="my-input span12" ng-model="user.address" placeholder="Adresa" >
+ <input class="my-input span10" ng-model="user.address" placeholder="Adresa" >
 </div>
 
 <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 span3" ng-model="user.city" placeholder="Grad" ng-required="true" >
+ <input class="my-input span3" ng-model="user.zip_code" placeholder="Poštanski br." >
  <input class="my-input span4" ng-model="user.country" placeholder="Zemlja" >
 </div>
 
 <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" />
+ <input class="my-input span5" ng-model="user.email" type="email" placeholder="E-pošta" ng-required="true" />
+ <input class="my-input span5" ng-model="user.phone" placeholder="Tel. broj" />
 </div>
 
+<legend>
+</legend>
 <label class="checkbox">
  <input ng-model="user.student" type="checkbox" ng-change="change_student()">
  Označite ako ste student.
@@ -88,24 +90,24 @@ Trebam R-1 račun
 Organizacija koja uplaćuje R-1 račun
 </legend>
 
-<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 span10" ng-model="user.r1.organization" ng-required="user.r1.required" placeholder="Naziv">
+<input class="my-input span10" 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>
+<strong>Hoćete li biti na domjenku dobrodošlice?</strong>
 <label class="radio"><input type="radio" name="user.reception" ng-model="user.reception" value="yes" ng-required="true">Da</label>
 <label class="radio"><input type="radio" name="user.reception" 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>
+<strong>Hoćete li biti na zajedničkoj večeri?</strong>
 Večera je uključena u kotizaciju.
 <label class="radio"><input type="radio" name="user.dinner" ng-model="user.dinner" value="yes" ng-required="! user.student && ! user.dinner">Da</label>
 <label class="radio"><input type="radio" name="user.dinner" ng-model="user.dinner" value="no"  ng-required="! user.student && ! user.dinner">Ne</label>
@@ -119,28 +121,30 @@ Večera je uključena u kotizaciju.
 <div ng-show="has_work">
 
 <div ng-switch on="work.type">
-<h2 ng-switch-when="lecture">Prijava predavanja</h2>
-<h2 ng-switch-when="poster">Prijava postera</h2>
-<h2 ng-switch-when="symposium">Simpozij</h2>
+<h2 ng-switch-when="lecture">Prijava usmenog izlaganja</h2>
+<h2 ng-switch-when="poster">Prijava poster prezentacije</h2>
+<h2 ng-switch-when="symposium">Prijava teme simpozija</h2>
 <h2 ng-switch-when="round">Prijava teme okruglog stola</h2>
 <b ng-switch-default>Has unknown work type {{work.type}} to submit</b>
 </div>
 
-<input class="my-input input-block-level" ng-model="work.title" placeholder="Naslov" ng-required="has_work" >
+<div class="controls controls-row">
+ <input class="span10 my-input" ng-model="work.title" placeholder="Naslov" ng-required="has_work" >
+</div>
 <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="span3 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>
+	<a class="controls span1 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>
+ <textarea class="span10" ng-model="work.abstract" ng-maxlength="2000" rows="10" cols="80" ng-required="has_work" ></textarea>
 </div>
 
 </div><!-- has_work -->
@@ -153,20 +157,22 @@ Večera je uključena u kotizaciju.
 
 <h3>{{$index + 1}}. rad na simpoziju</h3>
 
-<input class="my-input input-block-level" ng-model="work.title" placeholder="Naslov" ng-required="has_work" >
+<div class="controls controls-row">
+ <input class="span10 my-input" ng-model="work.title" placeholder="Naslov" ng-required="has_work" >
+</div>
 <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="span3 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>
+	<a class="controls span1 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>
+ <textarea class="span10" ng-model="work.abstract" ng-maxlength="2000" rows="10" cols="80" ng-required="has_work" ></textarea>
 </div>
 
 </div><!-- ng-repeat symposium_works  -->
@@ -182,7 +188,7 @@ Molimo ispunite sva obavezna polja označena crvenim okvirom.
 </p>
 </div>
 
-
+<!--
 <pre>
 {{RegistrationForm.$valid}}
 {{RegistrationForm.$error}}
@@ -190,6 +196,6 @@ Molimo ispunite sva obavezna polja označena crvenim okvirom.
 location={{$location.path()}}
 
 </pre>
-
+-->
 </form>