developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tiny scrollbar update

This commit is contained in:
Harry Bomrah 2013-04-16 16:17:37 +08:00 committed by Matt K. Fu
parent ead749cfed
commit d651669d5c
9 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/orbitdesktop.js
View File

@ -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;

3
app/views/desktop/index.html.erb
View File

@ -97,5 +97,4 @@
var od = new orbitDesktop("#ajax_container");
o.notify("Welcome "+o.currentUsername+"!!","alert",3);
</script>
<%= javascript_include_tag "personal_journal" %>
<%= javascript_include_tag "personal_conference" %>

2
vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_authors_controller.rb vendored
View File

@ -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}

2
vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb vendored
View File

@ -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}

1
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb vendored
View File

@ -1,3 +1,4 @@
<%= javascript_include_tag "personal_conference" %>
<div id="conference_p">
<div id="content">
<div id="header" class="hh2">

3
vendor/built_in_modules/personal_journal/app/assets/stylesheets/personal_journal/desktop/journal_pages.css vendored Normal file
View File

@ -0,0 +1,3 @@
/* css test*/
#harry { font-size: 10px;}

2
vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_authors_controller.rb vendored
View File

@ -5,7 +5,7 @@ class Panel::PersonalJournal::Desktop::JournalCoAuthorsController < ApplicationC
@journal_co_authors = JournalCoAuthor.where(name_id: current_user.id).asc(:co_author)
@journal_co_author_relations = JournalCoAuthorRelation.all
@journal_co_authors = @journal_co_authors.page(page).per(50)
@journal_co_authors = @journal_co_authors.page(page).per(40)
respond_to do |format|
format.html { render :layout => false}

2
vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb vendored
View File

@ -115,7 +115,7 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr
end]
end
@journal_lists = all_journal_lists.uniq
@journal_lists = all_journal_lists
respond_to do |format|
format.html { render :layout => false}

2
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb vendored
View File

@ -1,3 +1,5 @@
<%= javascript_include_tag "personal_journal" %>
<%= stylesheet_link_tag "personal_journal" %>
<div id="journal_p">
<div id="content">
<div id="header" class="hh2">