diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js index 52f48bdd..d8d67107 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 6902e0ef..918b99e2 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 e62f40d6..7446117b 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 45cb0863..00000000 --- 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 00000000..20daf27e --- /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 00000000..e69de29b 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 d341a60a..fdf3c389 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 00000000..c10256a9 --- /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 00000000..602b24d0 --- /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 00000000..23e1484c --- /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 7b5c9ead..cd11c6c5 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