From 6a9426c9c8ed1c8ec6d1b23394be22da33659163 Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Wed, 21 Nov 2012 01:54:06 +0800
Subject: [PATCH] add co-author page and new it, but can't destory it...

---
 app/assets/javascripts/orbitdesktop.js             | 14 ++++++++++++++
 .../desktop/journal_pages_controller.rb            |  5 -----
 app/views/desktop/journal_p.html.erb               |  8 ++++----
 app/views/desktop/journal_pages/_form.html.erb     |  1 -
 app/views/desktop/journal_pages/new.html.erb       |  2 +-
 config/routes.rb                                   |  4 ++--
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index de5500ea..3ddb9775 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -1034,6 +1034,20 @@ var orbitDesktop = function(dom){
       }
       bindHandlers();
     }
+
+    this.initializeJournalPapers.coauthor = function(){ // to open add pages in journal papers page
+      var bindHandlers = function(){ // to bind handlers for add page
+        o.simple_drop_down();
+
+        o.tinyscrollbar_ext({
+          main: '.tinycanvas',
+          fill: '.s_grid_con'
+        })
+      }
+      bindHandlers();
+    }
+
+
   };
   this.initializeAppstore = function(target,url,cache){
 
diff --git a/app/controllers/desktop/journal_pages_controller.rb b/app/controllers/desktop/journal_pages_controller.rb
index 661ea1bb..ee7a7167 100644
--- a/app/controllers/desktop/journal_pages_controller.rb
+++ b/app/controllers/desktop/journal_pages_controller.rb
@@ -36,11 +36,6 @@ class Desktop::JournalPagesController < ApplicationController
 
   def create
     if params[:commit].eql?"Save"
-      #if not params[:writing_journal][:publication_date].nil?
-      #  params[:writing_journal][:publication_date] =   \
-      #    Date.new *(params[:writing_journal][:publication_date].split("/").map{|s| s.to_i})
-      #end
-
       params[:writing_journal][:create_user_id] = current_user.id
 
       @writing_journal = WritingJournal.new(params[:writing_journal])
diff --git a/app/views/desktop/journal_p.html.erb b/app/views/desktop/journal_p.html.erb
index 1fc404a5..a900bca4 100644
--- a/app/views/desktop/journal_p.html.erb
+++ b/app/views/desktop/journal_p.html.erb
@@ -13,10 +13,10 @@
       <div id="panel_l" class="ph">
         <div class="s_menu sm_v" content-type="menu">
           <ul id='setting_left_nav'>
-            <li><a href="<%= desktop_journal_pages_path %>" callback-method="list" load="true" class="hh2 w2 hp thmc1 thmtxt xx" onclick='return false;'>List</a></li>
-            <li><a href="<%= new_desktop_journal_page_path %>" callback-method="addpaper" class="admtxt hh2 w2 hp xx" onclick='return false;'>Add/Edit</a></li>
-            <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li>
-            <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
+            <li><a href="<%= desktop_journal_pages_path %>" data-method="list" class="hh2 w2 hp active thmc1 thmtxt xx" onclick='return false;'>List</a></li>
+            <li><a href="<%= new_desktop_journal_page_path %>" data-method="addpaper" class="admtxt hh2 w2 hp xx" onclick='return false;'>Add/Edit</a></li>
+            <li><a href=""  class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li>
+            <li><a href="<%= new_desktop_co_author_path %>" data-method="coauthor" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
             <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags &amp; Keywords</a></li>
             <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Analysis</a></li>
             <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Import</a></li>
diff --git a/app/views/desktop/journal_pages/_form.html.erb b/app/views/desktop/journal_pages/_form.html.erb
index 019eb3a9..6acea10d 100644
--- a/app/views/desktop/journal_pages/_form.html.erb
+++ b/app/views/desktop/journal_pages/_form.html.erb
@@ -1,4 +1,3 @@
-
 <div class="toolbar hh2">
   <div class="fn_g hp">
     <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
diff --git a/app/views/desktop/journal_pages/new.html.erb b/app/views/desktop/journal_pages/new.html.erb
index c402e295..c4bba249 100644
--- a/app/views/desktop/journal_pages/new.html.erb
+++ b/app/views/desktop/journal_pages/new.html.erb
@@ -1,3 +1,3 @@
-<%= form_for @writing_journal, html: { multipart: true ,:type=>"ajax_form", "callback-method"=>"formCallback"} ,  url: desktop_journal_pages_path  do |f| %>
+<%= form_for @writing_journal ,  url: desktop_journal_pages_path  do |f| %>
   <%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %>
 <%end%>
diff --git a/config/routes.rb b/config/routes.rb
index 04298734..419295da 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -149,9 +149,8 @@ Orbit::Application.routes.draw do
   end
 
   namespace :desktop do
-
-    match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json' , via: :get
     match "/" =>  "desktop#index"
+    match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json'
     match '/desktop'=>'desktop#desktop'
     match '/app_manager'=>'desktop#app_manager'
     match '/sections'=>'desktop#sections'
@@ -169,6 +168,7 @@ Orbit::Application.routes.draw do
     match '/temp_func/'=>'desktop#temp_func'
 
     resources :journal_pages
+    resources :co_authors
   end
 
   # namespace :desktop_publications do