From 8f334f694800c5fd7ef8760487c618624df62b63 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Thu, 24 Jan 2013 18:25:09 +0800 Subject: [PATCH] modularize conference --- app/assets/javascripts/desktop.js | 1 - .../desktop_publications_controller.rb | 44 ------------------- app/views/desktop/index.html.erb | 3 +- app/views/desktop/seminar_p.html.erb | 33 -------------- .../assets/javascripts/personal_conference.js | 1 + .../personal_conference/desktop/.gitkeep | 0 .../desktop/conference_pages.js | 2 +- .../desktop/conference_p_controller.rb | 5 +++ .../desktop/conference_pages_controller.rb | 14 ++++++ .../desktop/conference_p.html.erb | 33 ++++++++++++++ .../desktop/conference_pages/index.html.erb | 0 .../desktop/conference_pages/new.html.erb | 0 .../personal_conference/config/routes.rb | 4 ++ 13 files changed, 60 insertions(+), 80 deletions(-) delete mode 100644 app/views/desktop/seminar_p.html.erb create mode 100644 vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference.js create mode 100644 vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/.gitkeep rename {app/assets/javascripts => vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference}/desktop/conference_pages.js (95%) create mode 100644 vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_p_controller.rb create mode 100644 vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_p.html.erb rename app/views/desktop/seminar_pages/list.html.erb => vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb (100%) rename app/views/desktop/seminar_pages/add.html.erb => vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb (100%) diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js index 52f48bdd3..d8d67107d 100644 --- a/app/assets/javascripts/desktop.js +++ b/app/assets/javascripts/desktop.js @@ -15,4 +15,3 @@ //= require orbitTimeline //= require orbitdesktop //= require desktop/books_pages -//= require desktop/conference_pages diff --git a/app/controllers/desktop_publications_controller.rb b/app/controllers/desktop_publications_controller.rb index 6902e0ef7..918b99e2f 100644 --- a/app/controllers/desktop_publications_controller.rb +++ b/app/controllers/desktop_publications_controller.rb @@ -1,10 +1,6 @@ require 'mime/types' class DesktopPublicationsController< ApplicationController - #def journal_p - # render "desktop/journal_p", :layout => false - #end - def books render "desktop/books", :layout => false end @@ -16,44 +12,4 @@ class DesktopPublicationsController< ApplicationController def books_add render "desktop/books/add", :layout => false end - - def conference_p - render "desktop/conference_p", :layout => false - end - - def conference_p_list - render "desktop/conference_pages/list", :layout => false - end - - def conference_p_add - render "desktop/conference_pages/add", :layout => false - end - -# def create_journal -# Journal.create(user_id: current_user.id, title: "Ice Cream Sandwich") -# b = Array.new -# b << {"success"=>"true"} -# render :json=>b.to_json -# end -# -# -# def delete_journal -# @journals = Journal.find("") -# @journals.delete -# b = Array.new -# b << {"success"=>"true"} -# render :json=>b.to_json -# end -# -# def update_journal -# @journal = Journal.find("4ff2d6ebbd98eb02b9000017") -# @papers = @journal.papers -# @papers.each do |paper| -# paper.update_attributes(:user_id => current_user.id) -# end -# b = Array.new -# -# b << {"success"=>"true"} -# render :json=>b.to_json -# end end diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index e62f40d62..7446117b6 100644 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -13,7 +13,7 @@
  • Journal Papers
    • -
  • Conference Papers
    • +
  • Conference Papers
  • Books
    • @@ -103,3 +103,4 @@ o.notify("Welcome "+o.currentUsername+"!!","alert",3); <%= javascript_include_tag "personal_journal" %> +<%= javascript_include_tag "personal_conference" %> diff --git a/app/views/desktop/seminar_p.html.erb b/app/views/desktop/seminar_p.html.erb deleted file mode 100644 index 45cb08635..000000000 --- a/app/views/desktop/seminar_p.html.erb +++ /dev/null @@ -1,33 +0,0 @@ -
    -
    - -
    - -
    -
    -
    -
    -
    -
    - diff --git a/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference.js b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference.js new file mode 100644 index 000000000..20daf27e2 --- /dev/null +++ b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference.js @@ -0,0 +1 @@ +//= require_tree ./personal_conference/desktop diff --git a/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/.gitkeep b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/javascripts/desktop/conference_pages.js b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js similarity index 95% rename from app/assets/javascripts/desktop/conference_pages.js rename to vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js index d341a60a2..fdf3c3899 100644 --- a/app/assets/javascripts/desktop/conference_pages.js +++ b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js @@ -39,7 +39,7 @@ orbitDesktop.prototype.initializeConference = function(target,url,cache){ bindHandlers(); } - this.initializeConference.rues = function(){ + this.initializeConference.coauthor = function(){ var bindHandlers = function(){ o.simple_drop_down(); diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_p_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_p_controller.rb new file mode 100644 index 000000000..c10256a99 --- /dev/null +++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_p_controller.rb @@ -0,0 +1,5 @@ +class Panel::PersonalConference::Desktop::ConferencePController < ApplicationController + def conference_p + render panel_personal_conference_desktop_conference_p_path, :layout => false + end +end diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb new file mode 100644 index 000000000..602b24d0c --- /dev/null +++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb @@ -0,0 +1,14 @@ +class Panel::PersonalConference::Desktop::ConferencePagesController < ApplicationController + def index + respond_to do |format| + format.html { render :layout => false} + end + end + + def new + respond_to do |format| + format.html { render :layout => false} + end + end +end + diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_p.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_p.html.erb new file mode 100644 index 000000000..23e1484cc --- /dev/null +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_p.html.erb @@ -0,0 +1,33 @@ +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + diff --git a/app/views/desktop/seminar_pages/list.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb similarity index 100% rename from app/views/desktop/seminar_pages/list.html.erb rename to vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb diff --git a/app/views/desktop/seminar_pages/add.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb similarity index 100% rename from app/views/desktop/seminar_pages/add.html.erb rename to vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb diff --git a/vendor/built_in_modules/personal_conference/config/routes.rb b/vendor/built_in_modules/personal_conference/config/routes.rb index 7b5c9ead9..cd11c6c5d 100644 --- a/vendor/built_in_modules/personal_conference/config/routes.rb +++ b/vendor/built_in_modules/personal_conference/config/routes.rb @@ -2,6 +2,10 @@ Rails.application.routes.draw do namespace :panel do namespace :personal_conference do + namespace :desktop do + match 'conference_p' => 'conference_p#conference_p' + resources :conference_pages, :only => [:index, :new] + end namespace :back_end do match 'writing_conference_setting' => "writing_conferences#writing_conference_setting" ,:as => :writing_conference_setting resources :writing_conferences do