developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modularize personal journal and pull relational setting in desktop/index.rb

This commit is contained in:
Rueshyna 2013-01-11 10:55:19 +08:00 committed by chris
parent 68e14a7898
commit 1b6bfdb80f
4 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/desktop.js
View File

@ -14,6 +14,5 @@
//= require orbitdesktopAPI //= require orbitdesktopAPI
//= require orbitTimeline //= require orbitTimeline
//= require orbitdesktop //= require orbitdesktop
//= require desktop/journal_pages
//= require desktop/books_pages //= require desktop/books_pages
//= require desktop/seminar_pages //= require desktop/seminar_pages

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

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

1
vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal.js vendored Normal file
View File

@ -0,0 +1 @@
//= require_tree ./personal_journal/desktop

0
vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop/journal_pages.js → vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js vendored
View File