diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js index a0fad151..df73f9e0 100644 --- a/app/assets/javascripts/desktop.js +++ b/app/assets/javascripts/desktop.js @@ -14,6 +14,5 @@ //= require orbitdesktopAPI //= require orbitTimeline //= require orbitdesktop -//= require desktop/journal_pages //= require desktop/seminar_pages -//= require desktop/books_pages \ No newline at end of file +//= require desktop/books_pages 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 new file mode 100644 index 00000000..85982324 --- /dev/null +++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop.js @@ -0,0 +1,8 @@ +// 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 + diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/.gitkeep b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb index 44248371..87255b06 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb @@ -15,7 +15,7 @@