From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Tue, 9 Nov 2010 14:10:58 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dpavlin/angular-mojolicious
X-Git-Url: http://git.rot13.org/?p=angular-mojolicious.git;a=commitdiff_plain;h=a95625606e7d12287c963f93419510df1b850d9b;hp=-c

Merge branch 'master' of github.com:dpavlin/angular-mojolicious
---

a95625606e7d12287c963f93419510df1b850d9b
diff --combined templates/conference/Registration.html.ep
index 34271f4,e70a527..3665a69
--- a/templates/conference/Registration.html.ep
+++ b/templates/conference/Registration.html.ep
@@@ -5,15 -5,15 +5,15 @@@ if (typeof (console) === 'undefined') c
  function Registration($resource){
  	this.master = {
  		person: {
 -			name: '', surname: '', inst: '', email: '',
 +			name: '', surname: '', inst: '', email: ''
  		},
  		type: 'participant',
  		work: {
  			title: '',
  			abstract: '',
 -			authors:[ { name:'', surname:'', inst:'', email:'' } ],
 +			authors:[ { name:'', surname:'', inst:'', email:'' } ]
  		},
 -		symposium: { organizers: [ {name:'', surname:'', inst:'', email:'' } ], work_nr: 1, },
 +		symposium: { organizers: [ {name:'', surname:'', inst:'', email:'' } ], work_nr: 1 }
  	};
  	this.Registration = $resource( '/data/conference/Registration/:id', { id:'' } );
  	this.Symposium = $resource( '/data/conference/Symposium/:id', { id:'' } );
@@@ -79,7 -79,7 +79,7 @@@ console.debug('save_symposium', self.sy
  
  			self.last_saved = angular.copy(registration);
  		});
 -	},
 +	}
  };
  
  angular.validator.max_length = function(input, len) {
@@@ -125,59 -125,39 +125,39 @@@ label 
  	color: #374E5A;
  }
  
- .fl {
+ .input {
  	color: #afafaf;
  	float: left;
  	margin: 2px;
  	padding: 0 6px;
  }
  
- .fl1 {
+ .input1 {
  	width: 40.8em;
  }
  
- .fl2 {
+ .input2 {
  	width: 8em;
  }
  
- .fl3 {
+ .input3 {
  	width: 13em;
  }
- 
- .flClear {
- 	clear: both;
- }
- 
- .labelTop .pname, .labelTop .name, .labelTop .surname, .labelTop .pinst, .labelTop .email, .labelTop .city, .labelTop .address, .labelTop .contact {
- 	color: #afafaf;
- 	float: left;
- 	margin: 2px;
- 	padding: 0 6px;
- }
- 
- .pname, .name, .surname, .email {
+ .input4 {
  	width: 10em;
  }
  
- .pinst {
+ .input5 {
  	width: 21.4em;
  }
- 
- .address {
- 	width: 14.1em;
- }
- 
- .city {
- 	width: 9em;
+ .input6 {
+ 	width: 6.3em;
  }
  
- .contact {
- 	width: 10em;
+ .clear {
+ 	clear: both;
  }
  
- .title, .summary {
- 	width: 93%;
- }
  
  .authors {
  	clear: both;
@@@ -191,7 -171,7 +171,7 @@@
  	font-size: 90%;
  }
  
- input, textarea
+ input, textarea, .gohome
  {
  	font: 14px arial;
  	color: #000000;
@@@ -229,10 -209,24 +209,24 @@@ input:focus, textarea:focu
  	background: #d74f25;
  }
  
- .button input:hover {
+ .button input:hover, .gohome:hover {
  	background: #dc6844;
  }
  
+ .gohome  {
+ 	float: left;
+ 	color: #ffffff;
+ 	display: block;
+ 	text-decoration: none;
+ 	background: #d74f25;
+ }
+ 
+ .gohome a {
+ 	color: #fff;
+ 	text-decoration: none;
+ }
+ 
+ 
  .warrning {
  	color: #FF6666;
  }
@@@ -263,43 -257,42 +257,42 @@@
  <div id="participant">
  	<h2>Contact Information</h2>
  	<div class="labelTop">
- 		<div class="pname">First name</div>
- 		<div class="pname">Surname</div>
+ 		<div class="input input4">First name</div>
+ 		<div class="input input4">Surname</div>
  	</div>
  	<div style="clear: both">
- 		<input class="pname" name="registration.person.name" ng:required>
- 		<input class="pname" name="registration.person.surname" ng:required>
+ 		<input class="input4" name="registration.person.name" ng:required>
+ 		<input class="input4" name="registration.person.surname" ng:required>
  	</div>
  	<div class="labelTop">
- 		<div class="pinst">Institution</div>
+ 		<div class="input input5">Institution</div>
  	</div>  
  	<div style="clear: both">
- 		<input class="pinst" name="registration.person.inst">
+ 		<input class="input5" name="registration.person.inst">
  	</div>
  	<div class="labelTop">
- 		<div class="address">Address</div>
+ 		<div class="input input5">Address</div>
  	</div>  
  	<div style="clear: both">
- 		<input class="address" name="registration.person.address1" ng:required>
- 		<input class="address" name="registration.person.address2">
+ 		<input class="input5" name="registration.person.address1" ng:required>
  	</div>
  	<div class="labelTop">
- 		<div class="city">City</div>
- 		<div class="city">ZIP</div>
- 		<div class="city">Country</div>
+ 		<div class="input input6">City</div>
+ 		<div class="input input6">ZIP</div>
+ 		<div class="input input6">Country</div>
  	</div>
  	<div style="clear: both">
- 		<input class="city" name="registration.person.city" ng:required>
- 		<input class="city" name="registration.person.zip">
- 		<input class="city" name="registration.person.country">
+ 		<input class="input6" name="registration.person.city" ng:required>
+ 		<input class="input6" name="registration.person.zip">
+ 		<input class="input6" name="registration.person.country">
  	</div>
  	<div class="labelTop">
- 		<div class="contact">E-mail</div>
- 		<div class="contact">Phone number</div>
+ 		<div class="input input4">E-mail</div>
+ 		<div class="input input4">Phone number</div>
  	</div>
  	<div style="clear: both">
- 		<input class="contact" name="registration.person.email" ng:validate="email" ng:required>
- 		<input class="contact" name="registration.person.phone">
+ 		<input class="input4" name="registration.person.email" ng:validate="email" ng:required>
+ 		<input class="input4" name="registration.person.phone">
  	</div>
  </div>
  
@@@ -323,21 -316,21 +316,21 @@@
  
  		<h2>Symposia</h2>
  		<label>Topic:</label>
- 			<input class="fl1" name="registration.symposium.title" ng:required>
+ 			<input class="input1" name="registration.symposium.title" ng:required>
  		<label>Organizer:</label>
  		<div>
- 			<div class="fl fl2">First name</div><div class="fl fl2">Surname</div><div class="fl fl3">Institution</div><div class="fl fl2">E-mail</div>
+ 			<div class="input input2">First name</div><div class="input input2">Surname</div><div class="input input3">Institution</div><div class="input input2">E-mail</div>
  		</div>
- 		<div class="flClear" ng:repeat="organizer in registration.symposium.organizers">
- 			<input class="fl2" name="organizer.name" ng:required>
- 			<input class="fl2" name="organizer.surname" ng:required>
- 			<input class="fl3" name="organizer.inst" >
- 			<input class="fl2" name="organizer.email" ng:required ng:validate="email">
+ 		<div class="clear" ng:repeat="organizer in registration.symposium.organizers">
+ 			<input class="input2" name="organizer.name" ng:required>
+ 			<input class="input2" name="organizer.surname" ng:required>
+ 			<input class="input3" name="organizer.inst" >
+ 			<input class="input2" name="organizer.email" ng:required ng:validate="email">
  			<a href="" ng:click="registration.symposium.organizers.$remove(organizer)">X</a>
  		</div>
  		<a class="addPerson" href="" ng:click="registration.symposium.organizers.$add()">Add another organizer</a>
- 		<label>Summary:</label>
- 			<textarea class="fl1" name="registration.symposium.abstract" rows="5" ng:validate="max_length:2000" ng:required></textarea>
+ 		<label>Summary (2000 characters max.)</label>
+ 			<textarea class="input1" name="registration.symposium.abstract" rows="5" ng:validate="max_length:2000" ng:required></textarea>
  		<div ng:show="symposium">
  			<label>List of already submitted works</label>
  			<ol>
@@@ -359,23 -352,23 +352,23 @@@
    <div ng:show="registration.type">
  
  	<label>Title:</label>
- 		<input class="fl1" name="registration.work.title" ng:required>
+ 		<input class="input1" name="registration.work.title" ng:required>
  	<label>Authors</label>
  	<div>
- 		<div class="fl fl2">First name</div><div class="fl fl2">Surname</div><div class="fl fl3">Institution</div><div class="fl fl2">E-mail</div>
+ 		<div class="input input2">First name</div><div class="input input2">Surname</div><div class="input input3">Institution</div><div class="input input2">E-mail</div>
  	</div>
- 	<div class="flClear" ng:repeat="author in registration.work.authors">
- 		<input class="fl2" name="author.name" ng:required>
- 		<input class="fl2" name="author.surname" ng:required>
- 		<input class="fl3" name="author.inst" >
- 		<input class="fl2" name="author.email" ng:required ng:validate="email">
+ 	<div class="clear" ng:repeat="author in registration.work.authors">
+ 		<input class="input2" name="author.name" ng:required>
+ 		<input class="input2" name="author.surname" ng:required>
+ 		<input class="input3" name="author.inst" >
+ 		<input class="input2" name="author.email" ng:required ng:validate="email">
  		<a href="" ng:click="registration.work.authors.$remove(author)">X</a>
  	</div>
  	<a class="addPerson" href="" ng:click="registration.work.authors.$add()">Add another author</a>
  
  
- 	<label>Abstract:</label>
- 		<textarea class="fl1" name="registration.work.abstract" rows="5" ng:validate="max_length:2000" ng:required></textarea>
+ 	<label>Abstract (2000 characters max.):</label>
+ 		<textarea class="input1" name="registration.work.abstract" rows="5" ng:validate="max_length:2000" ng:required></textarea>
  
  
    </div> <!-- ng:show="registration.type" -->
@@@ -397,19 -390,21 +390,21 @@@
  	</div>
  
  	<div class="saved" ng:show="registration.type != 'participant'" class="saved">
- 		<i>{{registration.work.title}}</i> submitted successfully.<br>
+ 		<i>{{registration.work.title}}</i> submitted successfully.
  	</div>
- 
- 	Please review your data, correct and save if needed.
- 	
+ <!--
+ 	Please review your data, correct and save if needed (just start typing and Save button will show automatically).
+ -->
+ <!--	
  	<div>
- 	Registration ID: <a href="#{{registration.$id}}">{{registration.$id}}</a>. You can bookmark this page and review it later.
+ 	Registration ID: {{registration.$id}}. You can bookmark this page and review it later.
  	</div>
+ -->
  </div>
  
  <div class="button" ng:show="registration.$id && registration.type != 'participant' && last_saved.$equals(registration)">
- <input type="reset" value="Submit another paper" ng:click="reset()">
- <div style="margin-left: 10px; margin-top: 8px; float: left;"> or <a href="http://psihologija.ffzg.hr/drzb2011/">Go to conference home page</a></div>
+ 	<input type="reset" value="Submit another paper" ng:click="reset()">
+ 	<div class="gohome"><a href="http://psihologija.ffzg.hr/drzb2011/">Finish and go to the conference home page</a></div>
  </div>
  
  <!--