Select job after add button

Auto save on edit show errors immediately
juggy · Nov 10, 2010 · ff18826 · ff18826
1 parent 8206779
commit ff18826
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -17,6 +17,7 @@ gem 'mongo_session_store', :git => 'git://github.com/nmerouze/mongo_session_stor
 gem "haml"
 gem "json"
 gem "formtastic"
+gem "countries"
 gem "jammit"
 gem 'rails3-generators', :group => :development
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -58,6 +58,9 @@ GEM
     bson_ext (1.1.1)
     builder (2.1.2)
     closure-compiler (0.3.3)
+    countries (0.3.0)
+      currencies (>= 0.2.0)
+    currencies (0.2.1)
     database_cleaner (0.6.0)
     devise (1.1.3)
       bcrypt-ruby (~> 2.1.2)
@@ -148,6 +151,7 @@ DEPENDENCIES
   autotest-growl
   autotest-rails
   bson_ext
+  countries
   database_cleaner
   devise
   forgery

diff --git a/app/views/jobs/index.html.haml b/app/views/jobs/index.html.haml
@@ -3,7 +3,7 @@
 
 #connection-status{:style=>"display:none"}
   .working Syncing with the server...
-  .error There was an error while syncing. Please correct it.
+  .error There were errors while syncing. Please correct them.
   .ok Everything was synced successfully.
 #job-app
   #job-list

diff --git a/public/javascripts/views.js b/public/javascripts/views.js
@@ -24,6 +24,9 @@ $(function(){
 				item = this.items[job.cid] = new JobListItemView({model: job});
 				item.bind("edit:item", this.changeSelection);
 				item.bind("edit:item", JobEdit.changeSelection);
+				if(job.isNew()){
+					item.edit();
+				}
 			}else
 				item = this.items[job.cid];
 
@@ -105,9 +108,12 @@ $(function(){
 			"change input,textarea,select" : "formChanged"
 		},	
 		initialize: function(){
-			_.bindAll(this, "formChanged", "error", "success");
+			_.bindAll(this, "save", "formChanged", "error", "success");
 			_.extend(this, Backbone.Events);
 		},
+		save: function(){
+			this.formChanged();
+		},
 		formChanged: function(){
 			var formArray = $("form", this.el).serializeArray();
 			var formMap = {};
@@ -159,14 +165,19 @@ $(function(){
 						me.el.html(html);
 					}
 				);
+				if(this.model.isNew()){
+					this.save();
+				}
 			}
 		},
 		closeEdit: function(){
 			this.model = undefined;
+			StatusView.close();
 			this.render();
 		},
 		changeSelection: function(item){
 			this.model = item.model;
+			StatusView.close();
 			this.render();
 		}
 	});

diff --git a/public/stylesheets/formtastic_changes.css b/public/stylesheets/formtastic_changes.css
@@ -7,6 +7,20 @@ form.formtastic fieldset {
   form.formtastic fieldset ol li {
     display: block;
     margin: 0 0 0.5em 1em; }
+    form.formtastic fieldset ol li.error {
+      border: none;
+      background-color: transparent; }
+      form.formtastic fieldset ol li.error input, form.formtastic fieldset ol li.error textarea, form.formtastic fieldset ol li.error select {
+        border: 1px solid red;
+        background-color: #fbe3e4; }
+      form.formtastic fieldset ol li.error p {
+        display: inline-block;
+        margin: 0px 0.5em; }
+    form.formtastic fieldset ol li textarea {
+      padding: 5px;
+      margin: 0.5em 0px;
+      border: 1px solid #bbbbbb;
+      font-size: 1.5em; }
     form.formtastic fieldset ol li p.inline-hints {
       margin: 0.5em 0px 0px 15%; }
     form.formtastic fieldset ol li label {

diff --git a/public/stylesheets/job.css b/public/stylesheets/job.css
@@ -86,4 +86,5 @@
     border: 2px solid green;
     padding: 0.8em; }
   #connection-status .error {
-    margin: 0; }
+    margin: 0;
+    border: 2px solid red; }
diff --git a/public/stylesheets/sass/formtastic_changes.sass b/public/stylesheets/sass/formtastic_changes.sass
@@ -9,6 +9,20 @@ form.formtastic
       li
         display: block
         margin: 0 0 0.5em 1em
+        &.error
+          border: none
+          background-color: transparent
+          input, textarea, select
+            border: 1px solid red
+            background-color: #FBE3E4
+          p
+            display: inline-block
+            margin: 0px 0.5em 
+        textarea
+          padding: 5px
+          margin: 0.5em 0px
+          border: 1px solid #bbb
+          font-size: 1.5em
         p.inline-hints
           margin: 0.5em 0px 0px 15%
         label

diff --git a/public/stylesheets/sass/job.sass b/public/stylesheets/sass/job.sass
@@ -130,5 +130,6 @@
     padding: 0.8em
   .error
     margin: 0
+    border: 2px solid red
 
 
diff --git a/public/views/job_edit.haml b/public/views/job_edit.haml
@@ -20,6 +20,7 @@
         %input.title{name: 'state', value: job.state}
       %li.string.required
         %label Country:
+
         %input.title{name: 'country', value: job.country}
       %li.string
         %label Short Desc.: