From bf31d0c3dd2e245fc32ec3bf0a65cca26dabcfa0 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Tue, 8 Jan 2013 18:12:28 +0800 Subject: [PATCH] modularized personal journal --- .../desktop_publications_controller.rb | 6 +- app/views/desktop/index.html.erb | 174 +++++++++--------- config/routes.rb | 30 +-- .../javascripts/desktop/journal_pages.js.erb | 4 +- .../desktop/co_author_relations_controller.rb | 2 +- .../desktop/co_authors_controller.rb | 2 +- .../desktop/journal_lists_controller.rb | 18 +- .../desktop/journal_p_controller.rb | 5 + .../desktop/journal_pages_controller.rb | 22 ++- .../desktop/co_author_relations/_new.html.erb | 4 +- .../co_author_relations/_show_form.html.erb | 22 +-- .../desktop/co_author_relations/edit.html.erb | 4 +- .../desktop/co_authors/edit.html.erb | 4 +- .../desktop/co_authors/index.html.erb | 8 +- .../desktop/co_authors/new.html.erb | 4 +- .../desktop/journal_p.html.erb | 8 +- .../desktop/journal_pages/edit.html.erb | 4 +- .../desktop/journal_pages/new.html.erb | 4 +- .../desktop/journal_pages/show.html.erb | 2 - .../personal_journal/config/routes.rb | 32 ++-- 20 files changed, 185 insertions(+), 174 deletions(-) create mode 100644 vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_p_controller.rb diff --git a/app/controllers/desktop_publications_controller.rb b/app/controllers/desktop_publications_controller.rb index 6c38de37..ae77ed19 100644 --- a/app/controllers/desktop_publications_controller.rb +++ b/app/controllers/desktop_publications_controller.rb @@ -1,9 +1,9 @@ require 'mime/types' class DesktopPublicationsController< ApplicationController - def journal_p - render "desktop/journal_p", :layout => false - end + #def journal_p + # render "desktop/journal_p", :layout => false + #end def books render "desktop/books", :layout => false diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index 9ce9df2f..739090c2 100644 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -1,104 +1,104 @@
-
-
    -
  • Home -
      -
    • App Manager
      • -
    • All Sections
      • -
    • Settings
      • -
    -
    • -
  • Publication -
      - -
    • Journal Papers
      • +
      +
        +
      • Home +
          +
        • App Manager
          • +
        • All Sections
          • +
        • Settings
          • +
        +
        • +
      • Publication +
          -
        • Seminar Papers
          • +
        • Journal Papers
          • -
        • Books
          • +
        • Seminar Papers
          • -
        -
        • -
      • Research -
          -
        • Research Domain
          • -
        • Research Project
          • -
        • Patents
          • -
        • Labs
          • -
        -
        • -
      • Experience -
          -
        • Working
          • -
        • Education
          • -
        • Honors
          • -
        • Activities
          • -
        • Clubs
          • -
        -
        • -
      • Learning & Teaching -
          -
        • Courses
          • -
        • Homework
          • -
        • Certification
          • -
        -
        • -
      • Personal -
          -
        • myPage
          • -
        • Blog
          • -
        • Album
          • -
        • Calendar
          • -
        • Files
          • -
        -
        • -
      • Orbit -
          -
        • Academia Connection
          • -
        -
        • -
      • AppStore
        • -
      -
      -
      +
    • Books
      • + +
    +
    • +
  • Research +
      +
    • Research Domain
      • +
    • Research Project
      • +
    • Patents
      • +
    • Labs
      • +
    +
    • +
  • Experience +
      +
    • Working
      • +
    • Education
      • +
    • Honors
      • +
    • Activities
      • +
    • Clubs
      • +
    +
    • +
  • Learning & Teaching +
      +
    • Courses
      • +
    • Homework
      • +
    • Certification
      • +
    +
    • +
  • Personal +
      +
    • myPage
      • +
    • Blog
      • +
    • Album
      • +
    • Calendar
      • +
    • Files
      • +
    +
    • +
  • Orbit +
      +
    • Academia Connection
      • +
    +
    • +
  • AppStore
    • +
+
+
- -
- - -
+ +
+ + +
diff --git a/config/routes.rb b/config/routes.rb index 61c12340..0d51680a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -40,7 +40,6 @@ Orbit::Application.routes.draw do end end - match 'ad_banners/:id/preview' => 'ad_banners#realtime_preview',:as => :realtime_preview_ad_banner,:via => :put match 'ad_banners/:id/rename' => 'ad_banners#rename',:as => :rename_ad_banner,:via => :post @@ -51,6 +50,7 @@ Orbit::Application.routes.draw do end resources :ad_images ,:except => [:show,:index] end + resources :dashboards resources :designs do collection do @@ -64,22 +64,27 @@ Orbit::Application.routes.draw do post 'upload_image' => 'designs#upload_image' end end + resources :infos do get 'add_attribute_field' end + resources :items + match 'update_position' => 'items#update_position' resources :links do member do get 'delete' end end + resources :pages do member do get 'delete' get 'reload_themes' end end + resources :module_apps do match 'manager_auth_proc' => "module_apps_new_interface#setting" ,:as => :manager_auth_proc,:via => :get match 'manager_auth_proc' => "module_apps_new_interface#update_setting" ,:as => :manager_auth_proc,:via => :post @@ -99,6 +104,7 @@ Orbit::Application.routes.draw do get 'reload_frontend_pages' end end + resources :page_parts do member do get 'reload_widgets' @@ -106,6 +112,7 @@ Orbit::Application.routes.draw do get 'reload_r_tag_options' end end + resources :plugins resources :purchases do collection do @@ -116,6 +123,7 @@ Orbit::Application.routes.draw do get 'download' end end + resources :roles do get 'role_field' get 'sub_role_field' @@ -124,6 +132,7 @@ Orbit::Application.routes.draw do get 'edit_sub_role' get 'add_attribute_field' end + resources :sites do get 'mail_setting' get 'site_info' @@ -134,18 +143,20 @@ Orbit::Application.routes.draw do get 'ui_theme' get 'change_design' end + resources :tags resources :users + resources :users_new_interface do member do get 'temp_edit' end end - + resources :member_selects do - match 'member_select_search' => "member_selects#member_select_search" ,:as => :member_select_search,:via => "post" - match 'member_select_add' => "member_selects#member_select_add" ,:as => :member_select_add,:via => "post" - end + match 'member_select_search' => "member_selects#member_select_search" ,:as => :member_select_search,:via => "post" + match 'member_select_add' => "member_selects#member_select_add" ,:as => :member_select_add,:via => "post" + end match 'module_store' => 'module_store#index' match 'module_store/show' => 'module_store#show' @@ -185,16 +196,7 @@ Orbit::Application.routes.draw do match '/desktop/widget_layout' => 'desktop#widget_layout' match '/desktop/temp_func/'=>'desktop#temp_func' - namespace :desktop do - match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json' - resources :journal_pages, except: :show - resources :journal_lists, only: :index - resources :co_authors, except: :show - resources :co_author_relations, except: :show - end - # namespace :desktop_publications do - match 'desktop_publications/journal_p'=>'desktop_publications#journal_p' match 'desktop_publications/books' => 'desktop_publications#books' match 'desktop_publications/books_list'=>'desktop_publications#books_list' match 'desktop_publications/books_add'=>'desktop_publications#books_add' diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop/journal_pages.js.erb b/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop/journal_pages.js.erb index 79f1d17e..a16830ba 100644 --- a/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop/journal_pages.js.erb +++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop/journal_pages.js.erb @@ -50,7 +50,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // return false; }) } - + var bindSecondaryHandlers = function(){ $("#journal_p div#paper_list a.icon-check-empty").click(function(){ if($(this).hasClass("icon-check-empty")){ @@ -177,7 +177,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // } var getData = function(){ - $.getJSON("/desktop/journal_pages/get_journals_json",function(journals){ + $.getJSON("/panel/personal_journal/desktop/get_journals_json",function(journals){ journalData = eval(journals); journalview(); bindHandlers(); diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_author_relations_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_author_relations_controller.rb index f07cc07d..26b5acd9 100644 --- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_author_relations_controller.rb +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_author_relations_controller.rb @@ -1,4 +1,4 @@ -class Desktop::CoAuthorRelationsController < ApplicationController +class Panel::PersonalJournal::Desktop::CoAuthorRelationsController < ApplicationController def index @co_author_relations = CoAuthorRelation.all new diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_authors_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_authors_controller.rb index 6d7b41d6..b9e1deaa 100644 --- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_authors_controller.rb +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/co_authors_controller.rb @@ -1,4 +1,4 @@ -class Desktop::CoAuthorsController < ApplicationController +class Panel::PersonalJournal::Desktop::CoAuthorsController < ApplicationController def index nils, not_nils = CoAuthor.where(name_id: current_user.id)\ .asc(:co_author).partition{|p| p.email.nil?} diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_lists_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_lists_controller.rb index 2667a5a7..b7d05a24 100644 --- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_lists_controller.rb +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_lists_controller.rb @@ -1,18 +1,2 @@ -class Desktop::JournalListsController < ApplicationController - def index - level_types = JournalLevelType.all - all_journal_lists = WritingJournal.where(create_user_id: current_user.id) - all_journal_lists = all_journal_lists.map do |j| - [ j.journal_title, - j.journal_level_type_ids.map do |type| - level_types.find(type).title - end] - end - - @journal_lists = all_journal_lists.uniq - - respond_to do |format| - format.html { render :layout => false} - end - end +class Panel::PersonalJournal::Desktop::JournalListsController < ApplicationController end diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_p_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_p_controller.rb new file mode 100644 index 00000000..3526d6ff --- /dev/null +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_p_controller.rb @@ -0,0 +1,5 @@ +class Panel::PersonalJournal::Desktop::JournalPController < ApplicationController + def journal_p + render panel_personal_journal_desktop_journal_p_path, :layout => false + end +end diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb index 8a2312b8..9599ce9a 100644 --- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb @@ -1,4 +1,4 @@ -class Desktop::JournalPagesController < ApplicationController +class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationController def index @writing_journal = WritingJournal.where(create_user_id: current_user.id) @level_types = JournalLevelType.all @@ -89,8 +89,8 @@ class Desktop::JournalPagesController < ApplicationController abstract: publication.abstract, coauthors: publication.authors, year: publication.year, - url_edit: edit_desktop_journal_page_path(publication), - url_delete: desktop_journal_page_path(publication), + url_edit: edit_panel_personal_journal_desktop_journal_page_path(publication), + url_delete: panel_personal_journal_desktop_journal_page_path(publication), files: publication.writing_journal_files.collect{|file| {title: file.title, url: file.file.url, icon: check_file_type(file.file.url)} } @@ -104,4 +104,20 @@ class Desktop::JournalPagesController < ApplicationController render json: JSON.pretty_generate(data) end + def journal_type + level_types = JournalLevelType.all + all_journal_lists = WritingJournal.where(create_user_id: current_user.id) + all_journal_lists = all_journal_lists.map do |j| + [ j.journal_title, + j.journal_level_type_ids.map do |type| + level_types.find(type).title + end] + end + + @journal_lists = all_journal_lists.uniq + + respond_to do |format| + format.html { render :layout => false} + end + end end diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_new.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_new.html.erb index fc0d0891..68bf9ed6 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_new.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_new.html.erb @@ -1,3 +1,3 @@ -<%= form_for(@co_author_relation, url: desktop_co_author_relations_path, html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationForm"} ) do |f| %> - <%= render partial: 'desktop/co_author_relations/form' , locals: {:f => f}%> +<%= form_for(@co_author_relation, url: panel_personal_journal_desktop_co_author_relations_path, html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationForm"} ) do |f| %> + <%= render partial: 'panel/personal_journal/desktop/co_author_relations/form' , locals: {:f => f}%> <% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_show_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_show_form.html.erb index ad943e45..246f0413 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_show_form.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/_show_form.html.erb @@ -2,16 +2,16 @@ <% if ( i % 6 ) == 0 %>
+ <% end %> +
  • +
    <%= co_author_relation.relation %>
    +
    + <%= link_to 'Edit', edit_panel_personal_journal_desktop_co_author_relation_path(co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %> + <%= link_to 'Destroy', panel_personal_journal_desktop_co_author_relation_path(co_author_relation), "confirm-message"=>'Are you sure?', "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %>
    +
    • + <% if ( i % 6 ) == 5 %> + +
    <% end %> -<% end %> \ No newline at end of file +<% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/edit.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/edit.html.erb index 0132d45b..66fc1dff 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/edit.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/edit.html.erb @@ -1,3 +1,3 @@ -<%= form_for(@co_author_relation, url: desktop_co_author_relation_path(@co_author_relation), html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationEditForm"} ) do |f| %> - <%= render partial: 'desktop/co_author_relations/form' , locals: {:f => f}%> +<%= form_for(@co_author_relation, url: panel_personal_journal_desktop_co_author_relation_path(@co_author_relation), html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationEditForm"} ) do |f| %> + <%= render partial: 'panel/personal_journal/desktop/co_author_relations/form' , locals: {:f => f}%> <% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/edit.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/edit.html.erb index 015f6321..a8250528 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/edit.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/edit.html.erb @@ -1,3 +1,3 @@ -<%= form_for @co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: desktop_co_author_path(@co_author) do |f| %> - <%= render partial: 'desktop/co_authors/form', locals: {:f => f} %> +<%= form_for @co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: panel_personal_journal_desktop_co_author_path(@co_author) do |f| %> + <%= render partial: 'panel/personal_journal/desktop/co_authors/form', locals: {:f => f} %> <% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/index.html.erb index 4c8e297e..d216e33e 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/index.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/index.html.erb @@ -1,7 +1,7 @@
    - <%= link_to "New Co-Author", new_desktop_co_author_path, :class=>"bt-co-author fn_btn hp hh2 thmc2 thmtxt", "ajax-remote"=>"get" %> - <%= link_to "New Type", desktop_co_author_relations_path, :class=>"bt-new-type fn_btn hp hh2 thmc2 thmtxt", "ajax-remote"=>"get" %> + <%= link_to "New Co-Author", new_panel_personal_journal_desktop_co_author_path, :class=>"bt-co-author fn_btn hp hh2 thmc2 thmtxt", "ajax-remote"=>"get" %> + <%= link_to "New Type", panel_personal_journal_desktop_co_author_relations_path, :class=>"bt-new-type fn_btn hp hh2 thmc2 thmtxt", "ajax-remote"=>"get" %>
    @@ -20,8 +20,8 @@
  • <%= @co_author_relations.find(co_author.co_author_relations_id).relation unless co_author.co_author_relations_id.nil?%>
    • - <%= link_to 'Edit', edit_desktop_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %> - <%= link_to 'Destroy', desktop_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>'Are you sure?', "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt" %> + <%= link_to 'Edit', edit_panel_personal_journal_desktop_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %> + <%= link_to 'Destroy', panel_personal_journal_desktop_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>'Are you sure?', "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt" %>
    <% if ( i % 4 ) == 3 %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/new.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/new.html.erb index 1a4ec2d5..ed12b132 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/new.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/new.html.erb @@ -1,3 +1,3 @@ -<%= form_for @co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: desktop_co_authors_path do |f| %> - <%= render partial: 'desktop/co_authors/form', locals: {:f => f} %> +<%= form_for @co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: panel_personal_journal_desktop_co_authors_path do |f| %> + <%= render partial: 'panel/personal_journal/desktop/co_authors/form', locals: {:f => f} %> <% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb index d5526450..44248371 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb @@ -13,10 +13,10 @@
      -
    • List
      • -
    • Add/Edit
      • -
    • Journals
      • -
    • Co-Authors
      • +
    • List
      • +
    • Add/Edit
      • +
    • Journals
      • +
    • Co-Authors
    • Tags & Keywords
    • Analysis
    • Import
      • diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/edit.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/edit.html.erb index 80d8ae2e..3811274a 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/edit.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/edit.html.erb @@ -1,3 +1,3 @@ -<%= form_for @writing_journal, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: desktop_journal_page_path(@writing_journal) do |f| %> - <%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %> +<%= form_for @writing_journal, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_journal_desktop_journal_page_path(@writing_journal) do |f| %> + <%= render partial: 'panel/personal_journal/desktop/journal_pages/form', locals: {:f => f} %> <%end%> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/new.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/new.html.erb index c872e7cf..82480c21 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/new.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/new.html.erb @@ -1,3 +1,3 @@ -<%= 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} %> +<%= form_for @writing_journal, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_journal_desktop_journal_pages_path do |f| %> + <%= render partial: 'panel/personal_journal/desktop/journal_pages/form', locals: {:f => f} %> <%end%> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/show.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/show.html.erb index f2a44a9c..e69de29b 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/show.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/show.html.erb @@ -1,2 +0,0 @@ -

      Desktop::JournalPages#show

      -

      Find me in app/views/desktop/journal_pages/show.html.erb

      diff --git a/vendor/built_in_modules/personal_journal/config/routes.rb b/vendor/built_in_modules/personal_journal/config/routes.rb index fd80bf0f..8e170854 100644 --- a/vendor/built_in_modules/personal_journal/config/routes.rb +++ b/vendor/built_in_modules/personal_journal/config/routes.rb @@ -1,40 +1,46 @@ Rails.application.routes.draw do - namespace :panel do namespace :personal_journal do + namespace :desktop do + match 'journal_p'=>'journal_p#journal_p' + match 'get_journals_json' => 'journal_pages#get_journals_json' + resources :journal_pages, except: :show + resources :journal_lists, only: :index + resources :co_authors, except: :show + resources :co_author_relations, except: :show + end + namespace :back_end do - match 'writing_journal_setting' => "writing_journals#writing_journal_setting" ,:as => :writing_journal_setting - resources :writing_journals do collection do get 'delete' end - + match "level_type_quick_add" => "writing_journals#level_type_quick_add" ,:as => :level_type_quick_add match "level_type_quick_edit" => "writing_journals#level_type_quick_edit" ,:as => :level_type_quick_edit - match "author_type_quick_add" => "writing_journals#author_type_quick_add" ,:as => :author_type_quick_add match "author_type_quick_edit" => "writing_journals#author_type_quick_edit" ,:as => :author_type_quick_edit - match "paper_type_quick_add" => "writing_journals#paper_type_quick_add" ,:as => :paper_type_quick_add match "paper_type_quick_edit" => "writing_journals#paper_type_quick_edit" ,:as => :paper_type_quick_edit - match "tag_quick_add" => "writing_journals#tag_quick_add" ,:as => :tag_quick_add match "tag_quick_edit" => "writing_journals#tag_quick_edit" ,:as => :tag_quick_edit end - - resources :journal_paper_types - resources :journal_author_types - resources :journal_level_types + + resources :journal_paper_types + resources :journal_author_types + resources :journal_level_types resources :tags end + namespace :front_end do resources :writing_journals end + namespace :plugin do resources :writing_journals end + namespace :widget do match "writing_journals" => "writing_journals#index" match "home_list" => "writing_journals#home_list" @@ -42,6 +48,6 @@ Rails.application.routes.draw do end end end - match "/appfront/*path" => redirect("/panel/*path") - + match "/appfront/*path" => redirect("/panel/*path") + end