From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Mon, 8 Nov 2010 22:15:02 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dpavlin/angular-mojolicious
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=0f3d8e74e07518d7440b8bbad55c13011f34d502;p=angular-mojolicious.git

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

0f3d8e74e07518d7440b8bbad55c13011f34d502
diff --cc templates/conference/Registration.html.ep
index 507725d,20d82de..1d148a6
--- a/templates/conference/Registration.html.ep
+++ b/templates/conference/Registration.html.ep
@@@ -399,16 -397,13 +398,17 @@@ input.ng-validation-error 
  	</div>
  </div>
  
 -<div ng:show="registration.$id" class="saved">
 -	<span ng:show="registration.category == 'participant'">Your registration has been submitted successfully.<br><br>
 -		Please review your data, correct and save if needed or <a href="http://psihologija.ffzg.hr/drzb2011/">go to conference home page</a>.<br><br>
 -	 </span>
 +<div ng:show="registration.$id" style="margin-bottom: 40px">
 +	<span class="saved" ng:show="registration.category == 'participant'">Your registration has been submitted successfully.<br><br>
 +	</span>
 +	<span class="saved" ng:show="registration.type != 'symposium' && registration.category != 'participant'">
 +	Your work has been submitted successfully.<br><br>
 +	</span>
 +	Please review your data, correct and save if needed or <a href="http://psihologija.ffzg.hr/drzb2011/">go to conference home page</a>.<br><br>
 +	Registration ID: <a href="#{{registration.$id}}">{{registration.$id}}</a>.<br>You can bookmark this page and review it later.
  </div>
  
+ <input type="reset" value="Another work proposal to submit?" ng:click="reset()" ng:show="registration.$id">
  
  <!--
  <div ng:show="registration.$id">