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

diff --combined templates/conference/Registration.html.ep
index 507725d,20d82de..1d148a6
--- 1/templates/conference/Registration.html.ep
--- 2/templates/conference/Registration.html.ep
+++ b/templates/conference/Registration.html.ep
@@@ -45,22 -45,21 +45,21 @@@ console.debug( 'load symposium ', s_id 
        },
        reset: function() {
                console.debug( this.Registration );
-               var current_symposium = null;
-               var current_person = null;
-               if ( this.registration && this.registration.type == 'symposium' ) {
-                       current_symposium = this.registration.symposium;
-                       current_person = this.registration.person;
-                       if ( this.registration.$id ) current_symposium.work_nr++; // only if saved
- console.debug( 'current_symposium', current_symposium, this.registration )
+               var last = this.registration;
+               if ( last && last.type == 'symposium' ) {
+                       if ( last.$id ) last.symposium.work_nr++; // only if saved
                }
                this.registration = new this.Registration( this.master );
-               if ( current_symposium ) {
-                       this.registration.symposium = current_symposium;
-                       this.registration.type = 'symposium';
-                       this.registration.person = current_person;
+               if ( last ) {
+                       this.registration.category  = last.category;
+                       this.registration.type      = last.type;
+                       this.registration.person    = last.person;
+ 
+                       if ( last.type == 'symposium' )
+                       this.registration.symposium = last.symposium;
                }
                this.last_saved = {};
- console.debug( 'reset', current_symposium, this.registration, this.$location.hashPath );
+ console.debug( 'reset', this.registration, this.$location.hashPath, last );
        },
        save: function(){
                var self = this;
@@@ -281,7 -280,7 +280,7 @@@ input.ng-validation-error 
        </div>
  </div>
  <div id="participant" ng:show="registration.category == 'participant' || registration.type">
 -      <h2>Participant Registration</h2>
 +      <h2>Contact Information</h2>
        <div class="labelTop">
                <div class="pname">First name</div>
                <div class="pname">Surname</div>
@@@ -389,26 -388,22 +388,27 @@@
  <div id="buttons" ng:show="registration.category == 'participant' || registration.type">
        <span ng:show="$invalidWidgets.visible() == 0">
        <input type="submit" value="Save" ng:click="save();" ng:show="! last_saved.$equals(registration)">
 +      </span>
        <span ng:show="registration.work && registration.work.$id">
                <input type="reset" value="Add another work" ng:click="reset()">
 -              or <a href="http://psihologija.ffzg.hr/drzb2011/">go to conference home page</a></span>.<br>
 +              or <a href="http://psihologija.ffzg.hr/drzb2011/">go to conference home page</a>.<br>
        </span>
  
        <div ng:show="$invalidWidgets.visible() &gt; 0" style="color:red; margin-top: 20px">Please fill all required fields ({{$invalidWidgets.visible()}} fields left).
        </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">