From 4a1b70f7b2d55bf26be35a2544e3b8e76bdc0585 Mon Sep 17 00:00:00 2001
From: Aleksei Kvitinskii <aleksei.wm@gmail.com>
Date: Mon, 7 Nov 2011 20:38:54 +0200
Subject: [PATCH] add tags to admin project form

---
 app/assets/javascripts/projects.js       | 16 ++++++++
 app/views/admin/projects/_form.html.haml | 49 ++++++++++++++----------
 app/views/projects/_form.html.haml       | 17 ++------
 3 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js
index 87be2f07..b4521fab 100644
--- a/app/assets/javascripts/projects.js
+++ b/app/assets/javascripts/projects.js
@@ -40,3 +40,19 @@ $(document).ready(function(){
 function focusSearch() {
   $("#search").focus();
 }
+
+function taggifyForm(){
+  var tag_field = $('#tag_field').tagify();
+
+  tag_field.tagify('inputField').autocomplete({
+      source: '/tags.json'
+  });
+
+
+  $('form').submit( function() {
+    var tag_field = $('#tag_field')
+       tag_field.val( tag_field.tagify('serialize') );
+       return true;
+  });
+}
+
diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml
index 9823e594..f64e10fd 100644
--- a/app/views/admin/projects/_form.html.haml
+++ b/app/views/admin/projects/_form.html.haml
@@ -1,30 +1,39 @@
 = form_for [:admin, @admin_project] do |f|
   -if @admin_project.errors.any?
     #error_explanation
-      %h2= "#{pluralize(@admin_project.errors.count, "error")} prohibited this admin_project from being saved:"
+      %h2= "#{pluralize(@admin_project.errors.count, "error")} prohibited this admin_project from being saved:" 
       %ul
         - @admin_project.errors.full_messages.each do |msg|
           %li= msg
 
-  .span-24
-    .span-12
-      .field
-        = f.label :name
-        %br
-        = f.text_field :name
-      .field
-        = f.label :code
-        %br
-        = f.text_field :code
-      .field
-        = f.label :path
-        %br
-        = f.text_field :path
-    .span-10
-      .field
-        = f.label :description
-        %br
-        = f.text_area :description
+  .form-row
+    = f.label :name
+    %br
+    = f.text_field :name
+  .form-row
+    = f.label :code
+    %br
+    = f.text_field :code
+  .form-row
+    = f.label :path
+    %br
+    = f.text_field :path
+
+
+  .form-row
+    = f.label :tag_list
+    %br
+    = f.text_area :tag_list, :placeholder => "project tags", :style => "height:50px", :id => :tag_field
+
+  .form-row
+    = f.label :description
+    %br
+    = f.text_area :description
   .clear
   .actions
     = f.submit 'Save', :class => "lbutton"
+
+:javascript
+  $(function(){
+    taggifyForm();
+  })  
diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml
index 2ddfda48..53b23f5f 100644
--- a/app/views/projects/_form.html.haml
+++ b/app/views/projects/_form.html.haml
@@ -29,8 +29,8 @@
       %tr
         %td= f.label :tag_list
         %td= f.text_area :tag_list, :placeholder => "project tags", :style => "height:50px", :id => :tag_field
-
-    .field
+  
+    .form-row
       = f.label :description
       %br/
       = f.text_area :description, :style => "height:140px;width:932px;"
@@ -55,16 +55,5 @@
 
 :javascript
   $(function(){
-    var tag_field = $('#tag_field').tagify();
-
-    tag_field.tagify('inputField').autocomplete({
-        source: '/tags.json'
-    });
-
-
-    $('form').submit( function() {
-      var tag_field = $('#tag_field')
-         tag_field.val( tag_field.tagify('serialize') );
-         return true;
-    });
+    taggifyForm();
   })