diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js index df73f9e0..a0fad151 100644 --- a/app/assets/javascripts/desktop.js +++ b/app/assets/javascripts/desktop.js @@ -14,5 +14,6 @@ //= require orbitdesktopAPI //= require orbitTimeline //= require orbitdesktop +//= require desktop/journal_pages //= require desktop/seminar_pages -//= require desktop/books_pages +//= require desktop/books_pages \ No newline at end of file diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop/journal_pages.js.erb b/app/assets/javascripts/desktop/journal_pages.js.erb similarity index 100% rename from vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop/journal_pages.js.erb rename to app/assets/javascripts/desktop/journal_pages.js.erb diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop.js deleted file mode 100644 index 85982324..00000000 --- a/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop.js +++ /dev/null @@ -1,8 +0,0 @@ -// This is a manifest file that'll be compiled into including all the files listed below. -// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically -// be included in the compiled file accessible from http://example.com/assets/application.js -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// the compiled file. -// -//= require desktop/journal_pages -