diff --git a/app/assets/Archive/javascripts/orbitdesktop.js b/app/assets/Archive/javascripts/orbitdesktop.js index 9f2599b0..26f67fb9 100755 --- a/app/assets/Archive/javascripts/orbitdesktop.js +++ b/app/assets/Archive/javascripts/orbitdesktop.js @@ -579,12 +579,12 @@ var orbitDesktop = function(dom){ $(o.contentHolder).html(o.desktopData[o.currentface]); try{ if(!customload){ - o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]")); + o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]); }else{ if(submenuitem) - o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]")); + o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"),o.desktopData[o.currentface]); else - o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]")); + o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]); } }catch(EX){} cache = true; diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index 642ab112..071648ae 100644 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -97,5 +97,4 @@ var od = new orbitDesktop("#ajax_container"); o.notify("Welcome "+o.currentUsername+"!!","alert",3); -<%= javascript_include_tag "personal_journal" %> -<%= javascript_include_tag "personal_conference" %> + diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_authors_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_authors_controller.rb index 2eec83f6..72487985 100644 --- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_authors_controller.rb +++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_authors_controller.rb @@ -5,7 +5,7 @@ class Panel::PersonalConference::Desktop::ConferenceCoAuthorsController < Applic @conference_co_authors = ConferenceCoAuthor.where(name_id: current_user.id).asc(:co_author) @conference_co_author_relations = ConferenceCoAuthorRelation.all - @conference_co_authors = @conference_co_authors.page(page).per(50) + @conference_co_authors = @conference_co_authors.page(page).per(40) respond_to do |format| format.html { render :layout => false} 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 index a711dd1b..7f3603aa 100644 --- 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 @@ -104,7 +104,7 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio ] end - @conference_lists = all_conference_lists.uniq + @conference_lists = all_conference_lists respond_to do |format| format.html { render :layout => false} diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb index e854164c..8f3be405 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb @@ -1,3 +1,4 @@ +<%= javascript_include_tag "personal_conference" %>