From 996a69f5954ece9540d640f31178cc2b143c065b Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Fri, 23 Nov 2012 10:44:48 +0800
Subject: [PATCH] add co-author json

---
 .../desktop/co_authors_controller.rb          | 14 +++++++++++
 .../desktop/journal_pages/_form.html.erb      | 25 ++++++++++---------
 config/routes.rb                              |  1 +
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/app/controllers/desktop/co_authors_controller.rb b/app/controllers/desktop/co_authors_controller.rb
index 1c74314e..ccda3786 100644
--- a/app/controllers/desktop/co_authors_controller.rb
+++ b/app/controllers/desktop/co_authors_controller.rb
@@ -62,4 +62,18 @@ class Desktop::CoAuthorsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  def get_co_authors_json
+    @co_authors = CoAuthor.where(name_id: current_user.id)
+    data = Array.new
+
+    @co_authors.each do |co_author|
+      data << {
+        author: co_author.co_author,
+        email: co_author.email,
+        type: co_author.type
+      }
+    end
+    render json: JSON.pretty_generate(data)
+  end
 end
diff --git a/app/views/desktop/journal_pages/_form.html.erb b/app/views/desktop/journal_pages/_form.html.erb
index 223bea04..b6320c6a 100644
--- a/app/views/desktop/journal_pages/_form.html.erb
+++ b/app/views/desktop/journal_pages/_form.html.erb
@@ -1,7 +1,8 @@
 <div class="toolbar hh2">
   <div class="fn_g hp">
     <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
-<!--    <%= submit_tag "Cancel", :class=>"fn_btn hh2 bt-cancel thmc2 thmtxt" %>-->
+    <!-- class: bt-cancle can't be remove
+    <%= submit_tag "Cancel", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %> -->
   </div>
   <div class="hh2 hp sdm">
     <div class="sdm_t hh2">Entry Year</div>
@@ -48,10 +49,10 @@
       <div class="s_grid_con s_form">
         <ul>
           <li class="s_grid_row">
-            <%= f.text_area :paper_title, size: "20x2", value: @writing_journal.paper_title ||= "Paper Title", class: "s_grid_6 s_grid"%>
+            <%= f.text_area :paper_title, size: "20x2", placeholder: "Paper Title", class: "s_grid_6 s_grid"%>
           </li>
           <li class="s_grid_row">
-            <%= f.text_field :journal_title, size: "20" ,value: @writing_journal.journal_title ||= "Journal Title", class: "s_grid_6 s_grid"%>
+            <%= f.text_field :journal_title, size: "20", placeholder: "Journal Title", class: "s_grid_6 s_grid"%>
             <span class="icon-plus input_append"></span>
           </li>
           <li class="s_grid_row">
@@ -85,34 +86,34 @@
           </li>
 
           <li class="s_grid_row">
-            <%= label_tag("", "ISSN(ISBN)", class: "s_grid_2 s_grid") %><%= f.text_field :isbn, size: "20" ,value: @writing_journal.isbn ||= "829872987", class: "s_grid_4 s_grid"%>
+            <%= label_tag("", "ISSN(ISBN)", class: "s_grid_2 s_grid") %><%= f.text_field :isbn, size: "20", placeholder: "829872987", class: "s_grid_4 s_grid"%>
           </li>
 
           <li class="s_grid_row">
-            <%= label_tag("", "Volume No.", class: "s_grid_2 s_grid") %><%= f.text_field :vol_no, size: "20" ,value: @writing_journal.vol_no ||= "829872987", class: "s_grid_4 s_grid"%>
+            <%= label_tag("", "Volume No.", class: "s_grid_2 s_grid") %><%= f.text_field :vol_no, size: "20", placeholder: "829872987", class: "s_grid_4 s_grid"%>
           </li>
 
           <li class="s_grid_row">
-            <%= label_tag("", "Issue No.", class: "s_grid_2 s_grid") %><%= f.text_field :issue_no, size: "20" ,value: @writing_journal.issue_no ||= "829872987", class: "s_grid_4 s_grid"%>
+            <%= label_tag("", "Issue No.", class: "s_grid_2 s_grid") %><%= f.text_field :issue_no, size: "20", placeholder:"829872987", class: "s_grid_4 s_grid"%>
           </li>
 
           <li class="s_grid_row">
-            <%= label_tag("", "Total Pages", class: "s_grid_2 s_grid") %><%= f.text_field :total_pages, size: "20" ,value: @writing_journal.total_pages ||= "20", class: "s_grid_4 s_grid"%>
+            <%= label_tag("", "Total Pages", class: "s_grid_2 s_grid") %><%= f.text_field :total_pages, size: "20", placeholder:"20", class: "s_grid_4 s_grid"%>
           </li>
 
           <li class="s_grid_row">
-            <%= label_tag("", "Pages", class: "s_grid_2 s_grid") %><%= label_tag("", "from", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_start, size: "10" ,value: @writing_journal.form_to_start ||= "1", class: "s_grid_1 s_grid"%><%= label_tag("", "to", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_end, size: "10" ,value: @writing_journal.form_to_end ||= "20", class: "s_grid_1 s_grid"%>
+            <%= label_tag("", "Pages", class: "s_grid_2 s_grid") %><%= label_tag("", "from", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_start, size: "10", placeholder: "1", class: "s_grid_1 s_grid"%><%= label_tag("", "to", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_end, size: "10", placeholder: "20", class: "s_grid_1 s_grid"%>
           </li>
 
           <li class="s_grid_row">
-            <%= label_tag("", "Reference URL", class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20" ,value: @writing_journal.url ||= "www.sample.com", class: "s_grid_4 s_grid"%>
+            <%= label_tag("", "Reference URL", class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%>
           </li>
         </ul>
       </div>
       <div class="s_grid_con s_form">
         <ul>
           <li class="s_grid_row">
-            <%= f.text_area :authors, size: "20x2", value: @writing_journal.authors ||= "Authors", class: "s_grid_6 s_grid"%>
+            <%= f.text_area :authors, size: "20x2", placeholder: "Authors", class: "s_grid_6 s_grid"%>
             <span class="icon-plus input_append"></span>
           </li>
           <li class="s_grid_row">
@@ -184,14 +185,14 @@
           -->
           </li>
           <li class="s_grid_row">
-            <%= f.text_area :note, size: "20x2", value: @writing_journal.note ||= "Note", class: "s_grid_6 s_grid"%>
+            <%= f.text_area :note, size: "20x2", plcaeholder: "Note", class: "s_grid_6 s_grid"%>
           </li>
         </ul>
       </div>
       <div class="s_grid_con s_form">
         <ul>
           <li class="s_grid_row">
-            <%= f.text_area :abstract, size: "20x26", value: @writing_journal.abstract ||= "Abstract", class: "s_grid_6 s_grid"%>
+            <%= f.text_area :abstract, size: "20x26", placeholder: "Abstract", class: "s_grid_6 s_grid"%>
           </li>
         </ul>
       </div>
diff --git a/config/routes.rb b/config/routes.rb
index 45dae242..6b328019 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -151,6 +151,7 @@ Orbit::Application.routes.draw do
   namespace :desktop do
    match "desktop" => "desktop#desktop"
     match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json'
+    match '/co_authors/get_co_authors_json' => 'co_authors#get_co_authors_json'
     match '/desktop'=>'desktop#desktop'
     match '/app_manager'=>'desktop#app_manager'
     match '/sections'=>'desktop#sections'