diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js index e5e4a05a0..52f48bdd3 100644 --- a/app/assets/javascripts/desktop.js +++ b/app/assets/javascripts/desktop.js @@ -15,4 +15,4 @@ //= require orbitTimeline //= require orbitdesktop //= require desktop/books_pages -//= require desktop/seminar_pages +//= require desktop/conference_pages diff --git a/app/assets/javascripts/desktop/seminar_pages.js b/app/assets/javascripts/desktop/conference_pages.js similarity index 71% rename from app/assets/javascripts/desktop/seminar_pages.js rename to app/assets/javascripts/desktop/conference_pages.js index ebe62c181..d341a60a2 100644 --- a/app/assets/javascripts/desktop/seminar_pages.js +++ b/app/assets/javascripts/desktop/conference_pages.js @@ -1,6 +1,6 @@ -orbitDesktop.prototype.initializeSeminar = function(target,url,cache){ +orbitDesktop.prototype.initializeConference = function(target,url,cache){ - this.initializeSeminar.list = function(){ + this.initializeConference.list = function(){ var bindHandlers = function(){ o.tinyscrollbar_ext({ main : ".tinycanvas", @@ -13,7 +13,7 @@ orbitDesktop.prototype.initializeSeminar = function(target,url,cache){ } - this.initializeSeminar.addseminar = function(){ + this.initializeConference.addconference = function(){ var bindHandlers = function(){ o.simple_drop_down(); @@ -26,7 +26,7 @@ orbitDesktop.prototype.initializeSeminar = function(target,url,cache){ bindHandlers(); } - this.initializeSeminar.seminar = function(){ + this.initializeConference.conference = function(){ var bindHandlers = function(){ o.simple_drop_down(); @@ -39,7 +39,7 @@ orbitDesktop.prototype.initializeSeminar = function(target,url,cache){ bindHandlers(); } - this.initializeSeminar.rues = function(){ + this.initializeConference.rues = function(){ var bindHandlers = function(){ o.simple_drop_down(); @@ -53,6 +53,6 @@ orbitDesktop.prototype.initializeSeminar = function(target,url,cache){ } - this.initializeSeminar.list(); + this.initializeConference.list(); - } \ No newline at end of file + } diff --git a/app/controllers/desktop_publications_controller.000.rb b/app/controllers/desktop_publications_controller.000.rb deleted file mode 100644 index fc3f36ab9..000000000 --- a/app/controllers/desktop_publications_controller.000.rb +++ /dev/null @@ -1,75 +0,0 @@ -class DesktopPublicationsController< ApplicationController - def journal_p - render "desktop/journal_p", :layout => false - end - - def journal_p_list - render "desktop/journal_pages/list", :layout => false - end - - def journal_p_add - debugger - render "desktop/journal_pages/add", :layout => false - end - - def books - render "desktop/books", :layout => false - end - - def books_list - render "desktop/books/list", :layout => false - end - - def books_add - render "desktop/books/add", :layout => false - end - - def seminar_p - render "desktop/seminar_p", :layout => false - end - - def seminar_p_list - render "desktop/seminar_pages/list", :layout => false - end - - def seminar_p_add - render "desktop/seminar_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 getjournals - @journals = current_user.journals - data = Array.new - @journals.each do |journal| - @papers = journal.papers.all - data << {"title" => journal.title, "papers" => @papers} - end - render :json=>data.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/controllers/desktop_publications_controller.rb b/app/controllers/desktop_publications_controller.rb index ae77ed196..6902e0ef7 100644 --- a/app/controllers/desktop_publications_controller.rb +++ b/app/controllers/desktop_publications_controller.rb @@ -17,16 +17,16 @@ class DesktopPublicationsController< ApplicationController render "desktop/books/add", :layout => false end - def seminar_p - render "desktop/seminar_p", :layout => false + def conference_p + render "desktop/conference_p", :layout => false end - def seminar_p_list - render "desktop/seminar_pages/list", :layout => false + def conference_p_list + render "desktop/conference_pages/list", :layout => false end - def seminar_p_add - render "desktop/seminar_pages/add", :layout => false + def conference_p_add + render "desktop/conference_pages/add", :layout => false end # def create_journal diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index 019034476..e62f40d62 100644 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -13,7 +13,7 @@
  • Journal Papers
    • -
  • Seminar Papers
    • +
  • Conference Papers
  • Books
    • diff --git a/app/views/desktop/patents/add.html.erb b/app/views/desktop/patents/add.html.erb index 190e8abd6..28283456f 100644 --- a/app/views/desktop/patents/add.html.erb +++ b/app/views/desktop/patents/add.html.erb @@ -41,10 +41,10 @@
    -
    \ No newline at end of file + diff --git a/app/views/desktop/seminar_pages/add.html.erb b/app/views/desktop/seminar_pages/add.html.erb index 190e8abd6..28283456f 100644 --- a/app/views/desktop/seminar_pages/add.html.erb +++ b/app/views/desktop/seminar_pages/add.html.erb @@ -41,10 +41,10 @@