From 95a3831dce645c0258d6cd883b0a02a766647e22 Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Tue, 20 Nov 2012 14:58:15 +0800
Subject: [PATCH 1/7] done add journals function

---
 .../desktop/journal_pages_controller.rb       |  8 +--
 .../desktop/journal_pages/_form.html.erb      | 50 +++++++++++++++----
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/app/controllers/desktop/journal_pages_controller.rb b/app/controllers/desktop/journal_pages_controller.rb
index 7dd5c4b7..25754ea5 100644
--- a/app/controllers/desktop/journal_pages_controller.rb
+++ b/app/controllers/desktop/journal_pages_controller.rb
@@ -35,10 +35,10 @@ 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
+      #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
 
diff --git a/app/views/desktop/journal_pages/_form.html.erb b/app/views/desktop/journal_pages/_form.html.erb
index a87f2d72..b1d905e8 100644
--- a/app/views/desktop/journal_pages/_form.html.erb
+++ b/app/views/desktop/journal_pages/_form.html.erb
@@ -7,21 +7,22 @@
   <div class="hh2 hp sdm">
     <div class="sdm_t hh2">Entry Year</div>
     <div class="admbg sdm_o">
-      <ul>
+      <!--<ul>
         <li><a class="hp hh2 admtxt" href="">2012</a></li>
         <li><a class="hp hh2 admtxt" href="">2011</a></li>
         <li><a class="hp hh2 admtxt" href="">2010</a></li>
         <li><a class="hp hh2 admtxt" href="">2009</a></li>
         <li><a class="hp hh2 admtxt" href="">2008</a></li>
       </ul>
+      -->
     </div>
   </div>
   <div class="hh2 hp sdm">
     <div class="sdm_t hh2">Language</div>
     <div class="admbg sdm_o">
       <ul>
-        <li><a class="hp hh2 admtxt" href="">English</a></li>
-        <li><a class="hp hh2 admtxt" href="">Chinese</a></li>
+        <!--<li><a class="hp hh2 admtxt" href="">English</a></li>
+        <li><a class="hp hh2 admtxt" href="">Chinese</a></li>-->
       </ul>
     </div>
   </div>
@@ -136,23 +137,50 @@
           </select>
           </li>
 
-          <li class="s_grid_row">
-            <%= label_tag("", "Date of Publication", class: "s_grid_2 s_grid") %><%= f.text_field :publication_date, size: "20", value: "2012 / 05 / 01", class: "s_grid_4 s_grid"%>
-            <!--<%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_4 s_grid'} %>
-          </li>-->
+          <ul>
+            <li class="s_grid_row">
+             <%= label_tag("", "Date of Publication", class: "s_grid_4 s_grid") %>
+            </li>
+            <li class="s_grid_row">
+            <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_2 s_grid'} %>
+            </li>
+          </ul>
+
 
           <li class="s_grid_row">
              <%= f.text_field :keyword, size: "20", value: "Keywords", class: "s_grid_6 s_grid"%>
           </li>
 
           <li class="s_grid_row">
-             <%= f.text_field :tag, size: "20", value: "Tag", class: "s_grid_6 s_grid"%>
-            <span class="icon-plus input_append"></span>
+            <div><%= f.label :year ,:class => "s_grid_2 s_grid" %></div>
+            <div><%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "s_grid_4 s_grid"} ) %></div>
           </li>
 
           <li class="s_grid_row">
-            <%= label_tag("", "Full Text", class: "s_grid_2 s_grid") %>
-            <%= f.file_field :writing_journal_files, size: "20", class: "s_grid_4 s_grid"%>
+            <div><%= f.label :language ,:class => "s_grid_2 s_grid" %></div>
+            <select name="writing_journal[language][]" id="" class="s_grid s_grid_4">
+              <%= options_for_select(
+                [["Chinese", "Chinese"],
+                 ["English", "English"]]
+              )
+            %>
+           </select>
+          </li>
+
+          <li class="s_grid_row">
+             <%= f.text_field :tag, size: "20", value: "Tag", class: "s_grid_6 s_grid"%>
+            <span class="icon-plus input_append"></span>
+          </li>
+        </ul>
+      </div>
+      <div class="s_grid_con s_form">
+            <span class="icon-plus input_append"></span>
+        <ul>
+          <li class="s_grid_row">
+          <div> <%= label_tag("", "Full Text", class: "s_grid_2 s_grid") %></div>
+          <%= f.fields_for :writing_journal_files,@writing_journal do |wjf| %>
+            <%= wjf.file_field :file %>
+          <% end %>
           </li>
           <li class="s_grid_row">
             <%= f.text_area :note, size: "20x2", value: "Note", class: "s_grid_6 s_grid"%>

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

---
 app/assets/javascripts/orbitdesktop.js              | 12 ++++++++++++
 app/controllers/desktop/journal_pages_controller.rb |  5 -----
 app/views/desktop/journal_p.html.erb                |  4 ++--
 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, 17 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 2aca179b..57007b26 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -988,6 +988,18 @@ 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 25754ea5..c9d71e64 100644
--- a/app/controllers/desktop/journal_pages_controller.rb
+++ b/app/controllers/desktop/journal_pages_controller.rb
@@ -35,11 +35,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 868136c4..657be84f 100644
--- a/app/views/desktop/journal_p.html.erb
+++ b/app/views/desktop/journal_p.html.erb
@@ -15,8 +15,8 @@
           <ul id='setting_left_nav'>
             <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="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</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 b1d905e8..6d33ca51 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">
     <%= button_tag "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 db2fb548..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"} ,  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

From 95fc5676bfb5bb53e5cb25346e546a1e2b649fad Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Wed, 21 Nov 2012 01:56:30 +0800
Subject: [PATCH 3/7] add co-author db and curd page, but it can't destory
 it...

---
 .../desktop/co_authors_controller.rb          | 71 +++++++++++++++++++
 app/models/user/co_author.rb                  | 19 +++++
 app/views/desktop/co_authors/_form.html.erb   | 44 ++++++++++++
 app/views/desktop/co_authors/edit.html.erb    |  3 +
 app/views/desktop/co_authors/index.html.erb   | 20 ++++++
 app/views/desktop/co_authors/new.html.erb     |  3 +
 app/views/desktop/co_authors/show.html.erb    |  0
 7 files changed, 160 insertions(+)
 create mode 100644 app/controllers/desktop/co_authors_controller.rb
 create mode 100644 app/models/user/co_author.rb
 create mode 100644 app/views/desktop/co_authors/_form.html.erb
 create mode 100644 app/views/desktop/co_authors/edit.html.erb
 create mode 100644 app/views/desktop/co_authors/index.html.erb
 create mode 100644 app/views/desktop/co_authors/new.html.erb
 create mode 100644 app/views/desktop/co_authors/show.html.erb

diff --git a/app/controllers/desktop/co_authors_controller.rb b/app/controllers/desktop/co_authors_controller.rb
new file mode 100644
index 00000000..6c4d980a
--- /dev/null
+++ b/app/controllers/desktop/co_authors_controller.rb
@@ -0,0 +1,71 @@
+class Desktop::CoAuthorsController < ApplicationController
+  def index
+    @co_authors = CoAuthor.where(name_id: current_user.id)
+
+    respond_to do |format|
+      format.html { render :layout => false}
+      format.json { render json: @co_authors }
+    end
+  end
+
+  def show
+    @co_author = CoAuthor.find(params[:id])
+
+    respond_to do |format|
+      format.html { redirect_to desktop_co_authors_url, :layout => false }
+      format.json { render json: @co_author }
+    end
+  end
+
+  def new
+    @co_author = CoAuthor.new
+
+    respond_to do |format|
+      format.html { render :layout => false}
+    end
+  end
+
+  def edit
+    @co_author = CoAuthor.find(params[:id])
+    respond_to do |format|
+      format.html { render :layout => false}
+    end
+  end
+
+  def create
+    @co_author = CoAuthor.new(params[:co_author])
+    @co_author.name_id= current_user.id
+
+    respond_to do |format|
+      if @co_author.save
+        format.html { redirect_to desktop_co_authors_path, :layout => false, notice: 'CoAuthor was successfully created.' }
+      else
+        format.html { render action: "new", :layout => false}
+      end
+    end
+  end
+
+  def update
+    @co_author = CoAuthor.find(params[:id])
+
+      respond_to do |format|
+        if @co_author.update_attributes(params[:co_author])
+          format.html { redirect_to desktop_co_authors_url, notice: 'CoAuthor was successfully updated.' }
+          format.json { head :no_content }
+        else
+          format.html { render action: "edit" }
+          format.json { render json: @co_author.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  def delete
+    @co_author = CoAuthor.find(params[:id])
+    @co_author.destroy
+
+    respond_to do |format|
+      format.html { redirect_to desktop_co_authors_url, :layout => false }
+      format.json { head :no_content }
+    end
+  end
+end
diff --git a/app/models/user/co_author.rb b/app/models/user/co_author.rb
new file mode 100644
index 00000000..ab7c75a5
--- /dev/null
+++ b/app/models/user/co_author.rb
@@ -0,0 +1,19 @@
+class CoAuthor
+  include Mongoid::Document
+
+  LANGUAGE_TYPES = [ "English", "Chinese" ]
+
+  field :name_id, type: BSON::ObjectId
+  field :co_author, localize: true
+  field :email
+  field :type
+
+
+  VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
+  validates :email, format: { with: VALID_EMAIL_REGEX },
+             uniqueness: { case_sensitive: false }
+
+  validates :co_author, presence: true
+  before_save { |coauthor| coauthor.email = email.downcase }
+end
+
diff --git a/app/views/desktop/co_authors/_form.html.erb b/app/views/desktop/co_authors/_form.html.erb
new file mode 100644
index 00000000..22b8433e
--- /dev/null
+++ b/app/views/desktop/co_authors/_form.html.erb
@@ -0,0 +1,44 @@
+<% if @co_author.errors.any? %>
+  <div id="error_explanation">
+    <h2><%= pluralize(@co_author.errors.count, "error") %> prohibited this user from being saved:</h2>
+    <ul>
+      <% @co_author.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
+<div class="fn_g hp">
+
+  <%= button_tag "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
+  <%= button_tag "Cancel", name: "commit", value: "Cancel", class: "fn_btn hh2 thmc2 thmtxt" %>
+</div>
+
+<div></div>
+<ul>
+  <li class="s_grid_row">
+  <%= f.label :co_author %><br />
+  <%= f.text_field :co_author %>
+  </li>
+
+  <li class="s_grid_row">
+  <%= f.label :email %><br />
+  <%= f.text_field :email %>
+  </li>
+
+  <li class="s_grid_row">
+  <%= f.label :type%><br />
+  <select name="co_author[type]" id="" class="s_grid s_grid_4">
+    <%= options_for_select(
+      [["朋友","朋友"],
+       ["學生","摯友"],
+       ["老師","老師"],
+       ["摯友","摯友"],
+       ["親戚","親戚"],
+       ["同事","同事"],
+       ["共同作者","共同作者"]
+    ])
+  %>
+  </select>
+  </li>
+</ul>
diff --git a/app/views/desktop/co_authors/edit.html.erb b/app/views/desktop/co_authors/edit.html.erb
new file mode 100644
index 00000000..2f48f4c5
--- /dev/null
+++ b/app/views/desktop/co_authors/edit.html.erb
@@ -0,0 +1,3 @@
+<%= form_for @co_author, url: desktop_co_author_path(@co_author) do |f| %>
+  <%= render partial: 'desktop/co_authors/form', locals: {:f => f} %>
+<% end %>
diff --git a/app/views/desktop/co_authors/index.html.erb b/app/views/desktop/co_authors/index.html.erb
new file mode 100644
index 00000000..147552d2
--- /dev/null
+++ b/app/views/desktop/co_authors/index.html.erb
@@ -0,0 +1,20 @@
+<table>
+  <tr>
+    <th>Name</th>
+    <th>EMail</th>
+    <th>Type</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @co_authors.each do |co_author| %>
+  <tr>
+    <td><%= co_author.co_author %></td>
+    <td><%= co_author.email %></td>
+    <td><%= co_author.type%></td>
+    <td><%= link_to 'Destroy', desktop_co_author_path(co_author), method: :delete, confirm: 'Are you sure?'  %></td>
+  </tr>
+<% end %>
+</table>
+<br />
diff --git a/app/views/desktop/co_authors/new.html.erb b/app/views/desktop/co_authors/new.html.erb
new file mode 100644
index 00000000..5c6fab16
--- /dev/null
+++ b/app/views/desktop/co_authors/new.html.erb
@@ -0,0 +1,3 @@
+<%= form_for @co_author, url: desktop_co_authors_path do |f| %>
+  <%= render partial: 'desktop/co_authors/form', locals: {:f => f} %>
+<% end %>
diff --git a/app/views/desktop/co_authors/show.html.erb b/app/views/desktop/co_authors/show.html.erb
new file mode 100644
index 00000000..e69de29b

From 5c0b137c6dc89b61c3d2d9bcea30a1ae914ff087 Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Wed, 21 Nov 2012 14:52:26 +0800
Subject: [PATCH 4/7] tmp

---
 app/assets/javascripts/orbitdesktop.js        | 11 +++++++++-
 .../desktop/co_authors_controller.rb          | 10 ++++-----
 .../desktop/journal_pages_controller.rb       | 21 +++++--------------
 app/views/desktop/co_authors/new.html.erb     |  2 +-
 app/views/desktop/journal_pages/new.html.erb  |  2 +-
 5 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 3ddb9775..834e1931 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -1034,7 +1034,16 @@ var orbitDesktop = function(dom){
       }
       bindHandlers();
     }
-
+    this.initializeJournalPapers.coAuthorformCallback = function(ruse){
+      this.initializeJournalPapers.formCallback = function(data){
+        if(data.success){
+          o.notify(data.msg,"success");
+          o.sub_menu_item($("div[content-type=menu] a").eq(0));
+        }else{
+          o.notify(data.msg,"alert");
+        }
+      }
+    }
     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();
diff --git a/app/controllers/desktop/co_authors_controller.rb b/app/controllers/desktop/co_authors_controller.rb
index 6c4d980a..9b0d3bd1 100644
--- a/app/controllers/desktop/co_authors_controller.rb
+++ b/app/controllers/desktop/co_authors_controller.rb
@@ -36,12 +36,10 @@ class Desktop::CoAuthorsController < ApplicationController
     @co_author = CoAuthor.new(params[:co_author])
     @co_author.name_id= current_user.id
 
-    respond_to do |format|
-      if @co_author.save
-        format.html { redirect_to desktop_co_authors_path, :layout => false, notice: 'CoAuthor was successfully created.' }
-      else
-        format.html { render action: "new", :layout => false}
-      end
+    if @writing_journal.save
+      render :json => {success:true, msg: "Paper successfully saved!"}.to_json
+    else
+      render :json => {success:false, msg: "Saving failed!"}
     end
   end
 
diff --git a/app/controllers/desktop/journal_pages_controller.rb b/app/controllers/desktop/journal_pages_controller.rb
index ee7a7167..72bb54af 100644
--- a/app/controllers/desktop/journal_pages_controller.rb
+++ b/app/controllers/desktop/journal_pages_controller.rb
@@ -39,20 +39,14 @@ class Desktop::JournalPagesController < ApplicationController
       params[:writing_journal][:create_user_id] = current_user.id
 
       @writing_journal = WritingJournal.new(params[:writing_journal])
+      respond_to do |format|
       if @writing_journal.save
-        # respond_to do |format|
-        #   format.html { redirect_to desktop_journal_pages_url, :layout => false, notice: 'User was successfully created.'}
-        #   #      format.json { render json: @writing_journal, status: :created, location: @writing_journal}
-        #   #  format.js
-        # end
-        render :json => {"success"=>true,"msg"=>"Paper successfully saved!"}.to_json
+        format.json {render json: {success: true, msg: "Paper successfully saved!"}.to_json}
       else
-        render :json => {"success"=>false,"msg"=>"Saving failed!"}
+        format.json {render json: {success: false, msg: "Saving failed!"}.to_json }
       end
-
-    end   
-        render :json => {"success"=>true,"msg"=>"Paper successfully saved!"}.to_json
-     
+      end
+    end
   end
 
   def update
@@ -60,11 +54,6 @@ class Desktop::JournalPagesController < ApplicationController
       @writing_journal= WritingJournal.find(params[:id])
     end
 
-    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
-
     respond_to do |format|
       if @writing_journal.update_attributes(params[:writing_journal])
         format.html { redirect_to desktop_journal_pages_url, :layout => false, notice: 'User was successfully updated.'}
diff --git a/app/views/desktop/co_authors/new.html.erb b/app/views/desktop/co_authors/new.html.erb
index 5c6fab16..c794f218 100644
--- a/app/views/desktop/co_authors/new.html.erb
+++ b/app/views/desktop/co_authors/new.html.erb
@@ -1,3 +1,3 @@
-<%= form_for @co_author, url: desktop_co_authors_path do |f| %>
+<%= form_for @co_author, html: { multipart: true ,:type=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: desktop_co_authors_path do |f| %>
   <%= render partial: 'desktop/co_authors/form', locals: {:f => f} %>
 <% end %>
diff --git a/app/views/desktop/journal_pages/new.html.erb b/app/views/desktop/journal_pages/new.html.erb
index c402e295..5b889e6a 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, html: { multipart: true, :type=>"ajax_form", "callback-method"=>"formCallback"} ,  url: desktop_journal_pages_path  do |f| %>
   <%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %>
 <%end%>

From b571373c8ff022d5d054e66547dee2a77404bfa2 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harminder_bomrah@yahoo.co.in>
Date: Wed, 21 Nov 2012 15:35:23 +0800
Subject: [PATCH 5/7] new file created for journal pages

---
 app/assets/javascripts/desktop.js             |   3 +-
 .../javascripts/desktop/journal_pages.js.erb  | 233 +++++++++++++++++
 app/assets/javascripts/orbitdesktop.js        | 234 +-----------------
 3 files changed, 236 insertions(+), 234 deletions(-)

diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js
index 37c654c7..de5f7f71 100644
--- a/app/assets/javascripts/desktop.js
+++ b/app/assets/javascripts/desktop.js
@@ -13,4 +13,5 @@
 //= require bootstrap
 //= require orbitdesktopAPI
 //= require orbitTimeline
-//= require orbitdesktop
\ No newline at end of file
+//= require orbitdesktop
+//= require desktop/journal_pages
\ No newline at end of file
diff --git a/app/assets/javascripts/desktop/journal_pages.js.erb b/app/assets/javascripts/desktop/journal_pages.js.erb
index e69de29b..4720686c 100644
--- a/app/assets/javascripts/desktop/journal_pages.js.erb
+++ b/app/assets/javascripts/desktop/journal_pages.js.erb
@@ -0,0 +1,233 @@
+orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // this init journal papers
+    this.initializeJournalPapers.formCallback = function(data){
+      if(data.success){
+        o.notify(data.msg,"success");
+        o.sub_menu_item($("div[content-type=menu] a").eq(0));
+      }else{
+        o.notify(data.msg,"alert");
+      }
+    }
+
+    this.initializeJournalPapers.list = function(){ // to open list part in journal papers page
+      var journalData;
+      var bindHandlers = function(){ // to bind handlers for list page
+        o.simple_drop_down();
+
+        o.tinyscrollbar_ext({
+          main: '.tinycanvas',
+          fill: '.list_t'
+        })
+
+        $("#journal_selection_options a").click(function(){
+          switch($(this).attr("href")){
+            case "all":
+              $(".list_item_action > .icon-check-empty").switchClass("icon-check-empty","icon-check",0);
+              break;
+            case "none":
+              $(".list_item_action > .icon-check").switchClass("icon-check","icon-check-empty",0);
+              break;
+          }
+          return false;
+        })
+        $("#journal_view_selection a").click(function(){
+          switch($(this).attr("href")){
+            case "journal":
+              journalview();
+              break;
+            case "keywords":
+              keywordsview();
+              break;
+            case "title":
+              titleview();
+              break;
+            case "abstract":
+              abstractview();
+              break;
+            case "file":
+              fileview();
+              break;
+          }
+          return false;
+        })
+
+         $("div[container=true]").on("click",".journal_paper_edit",function(){
+            $.ajax({
+              url : $(this).attr("href"),
+              type : "get",
+              success : function(data){
+                var prev_data = $("div[container=true]").html();
+                $("div[container=true]").html(data);
+                $(".bt-cancel").click(function(){
+                  $("div[container=true]").html(prev_data);
+                })
+              }
+            })
+            return false;
+         })
+
+      }
+
+      var bindSecondaryHandlers = function(){
+        $("#journal_p div#paper_list a.icon-check-empty").click(function(){
+          if($(this).hasClass("icon-check-empty")){
+            $(this).switchClass("icon-check-empty","icon-check",0);
+          } else if($(this) .hasClass("icon-check")) {
+            $(this).switchClass("icon-check","icon-check-empty",0);
+          } else if($(this).hasClass("icon-star")){
+            $(this).removeClass("icon-star").addClass("icon-star-empty");
+          } else if($(this).hasClass("icon-star-empty")){
+            $(this).removeClass("icon-star-empty").addClass("icon-star");
+          }
+          return false;
+        })
+      }
+
+      var journalview = function(){
+        $("#journal_p div#paper_list div.overview").empty();
+        var column = $('<div class="g_col list_t"><ul></ul></div>'),
+            counter = 1,
+            li;
+        $.each(journalData,function(i,journal){
+          $.each(journal.papers,function(j,paper){
+            li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+journal.title+'</div><div class="list_t_des">'+paper.title+'</div><a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a></li>');
+            column.find("ul").append(li);
+            if(counter%5==0){
+              $("#journal_p div#paper_list div.overview").append(column);
+              column = $('<div class="g_col list_t"><ul></ul></div>');
+            }
+            counter++;
+          })
+        })
+        $("#journal_p div#paper_list div.overview").append(column);
+        bindSecondaryHandlers();
+      }
+      var fileview = function(){
+        $("#journal_p div#paper_list div.overview").empty();
+        var column = $('<div class="g_col list_t"><ul></ul></div>'),
+            counter = 1,
+            li = null;
+        $.each(journalData,function(i,journal){
+          $.each(journal.papers,function(j,paper){
+            li = null;
+            li = $('<li class="list_t_item"></li>');
+            li.append('<div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+journal.title+'</div>');
+            $.each(paper.files,function(k,file){
+              var thistitle = file.title;
+              if(!file.title)
+              thistitle = "Untitled File";
+            var img = $('<div class="list_t_des"><a href="'+file.url+'" target="_blank" ><img src="'+file.icon+'" />'+thistitle+'</a></div>');
+            li.append(img);
+            })
+            li.append('<a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a>');
+            column.find("ul").append(li);
+            if(counter%5==0){
+              $("#journal_p div#paper_list div.overview").append(column);
+              column = $('<div class="g_col list_t"><ul></ul></div>');
+            }
+            counter++;
+          })
+        })
+        $("#journal_p div#paper_list div.overview").append(column);
+        bindSecondaryHandlers();
+      }
+      var keywordsview = function(){
+        $("#journal_p div#paper_list div.overview").empty();
+        var column = $('<div class="g_col list_t"><ul></ul></div>'),
+            counter = 1,
+            li;
+        $.each(journalData,function(i,journal){
+          $.each(journal.papers,function(j,paper){
+            li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><div class="list_t_des">'+paper.keywords+'</div><a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a></li>');
+            column.find("ul").append(li);
+            if(counter%5==0){
+              $("#journal_p div#paper_list div.overview").append(column);
+              column = $('<div class="g_col list_t"><ul></ul></div>');
+            }
+            counter++;
+          })
+        })
+        $("#journal_p div#paper_list div.overview").append(column);
+        bindSecondaryHandlers();
+      }
+
+      var titleview = function(){
+        $("#journal_p div#paper_list div.overview").empty();
+        var column = $('<div class="g_col list_t"><ul></ul></div>'),
+            counter = 1,
+            li;
+        $.each(journalData,function(i,journal){
+          $.each(journal.papers,function(j,paper){
+            li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a></li>');
+            column.find("ul").append(li);
+            if(counter%5==0){
+              $("#journal_p div#paper_list div.overview").append(column);
+              column = $('<div class="g_col list_t"><ul></ul></div>');
+            }
+            counter++;
+          })
+        })
+        $("#journal_p div#paper_list div.overview").append(column);
+        bindSecondaryHandlers();
+      }
+
+      var abstractview = function(){
+        $("#journal_p div#paper_list div.overview").empty();
+        var column = $('<div class="g_col list_t"><ul></ul></div>'),
+            li;
+        $.each(journalData,function(i,journal){
+          $.each(journal.papers,function(j,paper){
+            li = $('<li class="list_t_item"  style="height:auto;"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><div class="list_t_des">'+paper.abstract+'</div><a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a></li>');
+            column.find("ul").append(li);
+              $("#journal_p div#paper_list div.overview").append(column);
+              column = $('<div class="g_col list_t"><ul></ul></div>');
+          })
+        })
+        $("#journal_p div#paper_list div.overview").append(column);
+        bindSecondaryHandlers();
+      }
+
+      var getData = function(){
+        $.getJSON("/desktop/journal_pages/get_journals_json",function(journals){
+          journalData = eval(journals);
+          journalview();
+          bindHandlers();
+        })
+      }
+      getData();
+    }
+
+    this.initializeJournalPapers.addpaper = 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.initializeJournalPapers.coAuthorformCallback = function(ruse){
+      this.initializeJournalPapers.formCallback = function(data){
+        if(data.success){
+          o.notify(data.msg,"success");
+          o.sub_menu_item($("div[content-type=menu] a").eq(0));
+        }else{
+          o.notify(data.msg,"alert");
+        }
+      }
+    }
+    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();
+    }
+
+
+  };
\ No newline at end of file
diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 834e1931..bebaa016 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -825,239 +825,7 @@ var orbitDesktop = function(dom){
     timeline.initialize();
 
   };
-  this.initializeJournalPapers = function(target,url,cache){ // this init journal papers
-    this.initializeJournalPapers.formCallback = function(data){
-      if(data.success){
-        o.notify(data.msg,"success");
-        o.sub_menu_item($("div[content-type=menu] a").eq(0));
-      }else{
-        o.notify(data.msg,"alert");
-      }
-    }
-
-    this.initializeJournalPapers.list = function(){ // to open list part in journal papers page
-      var journalData;
-      var bindHandlers = function(){ // to bind handlers for list page
-        o.simple_drop_down();
-
-        o.tinyscrollbar_ext({
-          main: '.tinycanvas',
-          fill: '.list_t'
-        })
-
-        $("#journal_selection_options a").click(function(){
-          switch($(this).attr("href")){
-            case "all":
-              $(".list_item_action > .icon-check-empty").switchClass("icon-check-empty","icon-check",0);
-              break;
-            case "none":
-              $(".list_item_action > .icon-check").switchClass("icon-check","icon-check-empty",0);
-              break;
-          }
-          return false;
-        })
-        $("#journal_view_selection a").click(function(){
-          switch($(this).attr("href")){
-            case "journal":
-              journalview();
-              break;
-            case "keywords":
-              keywordsview();
-              break;
-            case "title":
-              titleview();
-              break;
-            case "abstract":
-              abstractview();
-              break;
-            case "file":
-              fileview();
-              break;
-          }
-          return false;
-        })
-
-         $("div[container=true]").on("click",".journal_paper_edit",function(){
-            $.ajax({
-              url : $(this).attr("href"),
-              type : "get",
-              success : function(data){
-                var prev_data = $("div[container=true]").html();
-                $("div[container=true]").html(data);
-                $(".bt-cancel").click(function(){
-                  $("div[container=true]").html(prev_data);
-                })
-              }
-            })
-            return false;
-         })
-
-      }
-
-      var bindSecondaryHandlers = function(){
-        $("#journal_p div#paper_list a.icon-check-empty").click(function(){
-          if($(this).hasClass("icon-check-empty")){
-            $(this).switchClass("icon-check-empty","icon-check",0);
-          } else if($(this) .hasClass("icon-check")) {
-            $(this).switchClass("icon-check","icon-check-empty",0);
-          } else if($(this).hasClass("icon-star")){
-            $(this).removeClass("icon-star").addClass("icon-star-empty");
-          } else if($(this).hasClass("icon-star-empty")){
-            $(this).removeClass("icon-star-empty").addClass("icon-star");
-          }
-          return false;
-        })
-      }
-
-      var journalview = function(){
-        $("#journal_p div#paper_list div.overview").empty();
-        var column = $('<div class="g_col list_t"><ul></ul></div>'),
-            counter = 1,
-            li;
-        $.each(journalData,function(i,journal){
-          $.each(journal.papers,function(j,paper){
-            li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+journal.title+'</div><div class="list_t_des">'+paper.title+'</div><a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a></li>');
-            column.find("ul").append(li);
-            if(counter%5==0){
-              $("#journal_p div#paper_list div.overview").append(column);
-              column = $('<div class="g_col list_t"><ul></ul></div>');
-            }
-            counter++;
-          })
-        })
-        $("#journal_p div#paper_list div.overview").append(column);
-        bindSecondaryHandlers();
-      }
-      var fileview = function(){
-        $("#journal_p div#paper_list div.overview").empty();
-        var column = $('<div class="g_col list_t"><ul></ul></div>'),
-            counter = 1,
-            li = null;
-        $.each(journalData,function(i,journal){
-          $.each(journal.papers,function(j,paper){
-            li = null;
-            li = $('<li class="list_t_item"></li>');
-            li.append('<div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+journal.title+'</div>');
-            $.each(paper.files,function(k,file){
-              var thistitle = file.title;
-              if(!file.title)
-              thistitle = "Untitled File";
-            var img = $('<div class="list_t_des"><a href="'+file.url+'" target="_blank" ><img src="'+file.icon+'" />'+thistitle+'</a></div>');
-            li.append(img);
-            })
-            li.append('<a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a>');
-            column.find("ul").append(li);
-            if(counter%5==0){
-              $("#journal_p div#paper_list div.overview").append(column);
-              column = $('<div class="g_col list_t"><ul></ul></div>');
-            }
-            counter++;
-          })
-        })
-        $("#journal_p div#paper_list div.overview").append(column);
-        bindSecondaryHandlers();
-      }
-      var keywordsview = function(){
-        $("#journal_p div#paper_list div.overview").empty();
-        var column = $('<div class="g_col list_t"><ul></ul></div>'),
-            counter = 1,
-            li;
-        $.each(journalData,function(i,journal){
-          $.each(journal.papers,function(j,paper){
-            li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><div class="list_t_des">'+paper.keywords+'</div><a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a></li>');
-            column.find("ul").append(li);
-            if(counter%5==0){
-              $("#journal_p div#paper_list div.overview").append(column);
-              column = $('<div class="g_col list_t"><ul></ul></div>');
-            }
-            counter++;
-          })
-        })
-        $("#journal_p div#paper_list div.overview").append(column);
-        bindSecondaryHandlers();
-      }
-
-      var titleview = function(){
-        $("#journal_p div#paper_list div.overview").empty();
-        var column = $('<div class="g_col list_t"><ul></ul></div>'),
-            counter = 1,
-            li;
-        $.each(journalData,function(i,journal){
-          $.each(journal.papers,function(j,paper){
-            li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a></li>');
-            column.find("ul").append(li);
-            if(counter%5==0){
-              $("#journal_p div#paper_list div.overview").append(column);
-              column = $('<div class="g_col list_t"><ul></ul></div>');
-            }
-            counter++;
-          })
-        })
-        $("#journal_p div#paper_list div.overview").append(column);
-        bindSecondaryHandlers();
-      }
-
-      var abstractview = function(){
-        $("#journal_p div#paper_list div.overview").empty();
-        var column = $('<div class="g_col list_t"><ul></ul></div>'),
-            li;
-        $.each(journalData,function(i,journal){
-          $.each(journal.papers,function(j,paper){
-            li = $('<li class="list_t_item"  style="height:auto;"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><div class="list_t_des">'+paper.abstract+'</div><a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a></li>');
-            column.find("ul").append(li);
-              $("#journal_p div#paper_list div.overview").append(column);
-              column = $('<div class="g_col list_t"><ul></ul></div>');
-          })
-        })
-        $("#journal_p div#paper_list div.overview").append(column);
-        bindSecondaryHandlers();
-      }
-
-      var getData = function(){
-        $.getJSON("/desktop/journal_pages/get_journals_json",function(journals){
-          journalData = eval(journals);
-          journalview();
-          bindHandlers();
-        })
-      }
-      getData();
-    }
-
-    this.initializeJournalPapers.addpaper = 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.initializeJournalPapers.coAuthorformCallback = function(ruse){
-      this.initializeJournalPapers.formCallback = function(data){
-        if(data.success){
-          o.notify(data.msg,"success");
-          o.sub_menu_item($("div[content-type=menu] a").eq(0));
-        }else{
-          o.notify(data.msg,"alert");
-        }
-      }
-    }
-    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){
 
 

From c94940214ceda853ee1b6ce39178f2b3a70827be Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harminder_bomrah@yahoo.co.in>
Date: Wed, 21 Nov 2012 17:11:18 +0800
Subject: [PATCH 6/7] small fix for journal_pages desktop

---
 .../javascripts/desktop/journal_pages.js.erb       |  4 +---
 app/assets/javascripts/orbitdesktop.js             |  2 +-
 .../desktop/journal_pages_controller.rb            | 14 +++++++-------
 app/views/desktop/journal_pages/edit.html.erb      |  2 +-
 app/views/desktop/journal_pages/new.html.erb       |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/desktop/journal_pages.js.erb b/app/assets/javascripts/desktop/journal_pages.js.erb
index 4720686c..0bb9063d 100644
--- a/app/assets/javascripts/desktop/journal_pages.js.erb
+++ b/app/assets/javascripts/desktop/journal_pages.js.erb
@@ -207,15 +207,13 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
       }
       bindHandlers();
     }
-    this.initializeJournalPapers.coAuthorformCallback = function(ruse){
-      this.initializeJournalPapers.formCallback = function(data){
+    this.initializeJournalPapers.coAuthorformCallback = function(data){
         if(data.success){
           o.notify(data.msg,"success");
           o.sub_menu_item($("div[content-type=menu] a").eq(0));
         }else{
           o.notify(data.msg,"alert");
         }
-      }
     }
     this.initializeJournalPapers.coauthor = function(){ // to open add pages in journal papers page
       var bindHandlers = function(){ // to bind handlers for add page
diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index bebaa016..7bcaa92c 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -133,7 +133,7 @@ var orbitDesktop = function(dom){
       }
     },'*[content-type=menu] a');
 
-    $("body").on("submit","form[type=ajax_form]",function(){
+    $("body").on("submit","form[form-type=ajax_form]",function(){
       var callback_method = $(this).attr("callback-method");
       var options = {
         success:function(responseText, statusText, xhr, $form){
diff --git a/app/controllers/desktop/journal_pages_controller.rb b/app/controllers/desktop/journal_pages_controller.rb
index 72bb54af..14397814 100644
--- a/app/controllers/desktop/journal_pages_controller.rb
+++ b/app/controllers/desktop/journal_pages_controller.rb
@@ -35,18 +35,18 @@ class Desktop::JournalPagesController < ApplicationController
   end
 
   def create
-    if params[:commit].eql?"Save"
+
       params[:writing_journal][:create_user_id] = current_user.id
 
       @writing_journal = WritingJournal.new(params[:writing_journal])
       respond_to do |format|
-      if @writing_journal.save
-        format.json {render json: {success: true, msg: "Paper successfully saved!"}.to_json}
-      else
-        format.json {render json: {success: false, msg: "Saving failed!"}.to_json }
+        if @writing_journal.save
+          format.json {render json: {success: true, msg: "Paper successfully saved!"}.to_json}
+        else
+          format.json {render json: {success: false, msg: "Saving failed!"}.to_json }
+        end
       end
-      end
-    end
+   
   end
 
   def update
diff --git a/app/views/desktop/journal_pages/edit.html.erb b/app/views/desktop/journal_pages/edit.html.erb
index e0f0837c..1377af92 100644
--- a/app/views/desktop/journal_pages/edit.html.erb
+++ b/app/views/desktop/journal_pages/edit.html.erb
@@ -1,3 +1,3 @@
-<%= form_for @writing_journal, url: desktop_journal_page_path(@writing_journal),html: { multipart: true ,:type=>"ajax_form", "callback-method"=>"formCallback"}   do |f| %>
+<%= form_for @writing_journal, url: desktop_journal_page_path(@writing_journal),html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"formCallback"}   do |f| %>
   <%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %>
 <%end%>
diff --git a/app/views/desktop/journal_pages/new.html.erb b/app/views/desktop/journal_pages/new.html.erb
index 5b889e6a..d5f5557b 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, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"} ,  url: desktop_journal_pages_path  do |f| %>
   <%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %>
 <%end%>

From 91005bb00ac1166105ad763f4f0467b0b3af58ec Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harminder_bomrah@yahoo.co.in>
Date: Wed, 21 Nov 2012 17:39:01 +0800
Subject: [PATCH 7/7] routes fixed

---
 app/assets/javascripts/orbitdesktop.js | 2 +-
 config/routes.rb                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 7bcaa92c..bf5e35fe 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -63,7 +63,7 @@ var orbitDesktop = function(dom){
           o.bindDesktopEvents();
           o.loadIconCache();
 
-          $(o.contentHolder).empty().load("desktop",function(){
+          $(o.contentHolder).empty().load("/desktop/desktop",function(){
             o.desktopData["d_desktop"] = "";
             o.initializeDesktop("d_desktop","",false);
           })
diff --git a/config/routes.rb b/config/routes.rb
index 419295da..45dae242 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -147,9 +147,9 @@ Orbit::Application.routes.draw do
       post 'upload'
     end
   end
-
+ match "desktop" =>  "desktop#index"
   namespace :desktop do
-    match "/" =>  "desktop#index"
+   match "desktop" => "desktop#desktop"
     match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json'
     match '/desktop'=>'desktop#desktop'
     match '/app_manager'=>'desktop#app_manager'