From d4df7c82d37149509433da124318c3dcd1ab4eaa Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 23 Jan 2013 18:35:00 +0800 Subject: [PATCH] relpace seminar to conference --- app/assets/javascripts/desktop.js | 2 +- .../{seminar_pages.js => conference_pages.js} | 14 +- .../desktop_publications_controller.000.rb | 75 -- .../desktop_publications_controller.rb | 12 +- app/views/desktop/index.html.erb | 2 +- app/views/desktop/patents/add.html.erb | 6 +- .../desktop/research_domain/add.html.erb | 6 +- .../desktop/research_project/add.html.erb | 6 +- app/views/desktop/seminar_p.html.erb | 14 +- app/views/desktop/seminar_pages/add.html.erb | 6 +- config/routes.rb | 6 +- lib/desktopapp/views/index.html.erb | 2 +- log/sunspot-solr-development.log.1 | 222 ---- route | 1038 +++++++++++++++++ .../.gitignore | 0 .../Gemfile | 2 +- .../MIT-LICENSE | 0 .../README.rdoc | 0 .../Rakefile | 2 +- .../images/personal_conference}/.gitkeep | 0 .../javascripts/personal_conference}/.gitkeep | 0 .../stylesheets/personal_conference}/.gitkeep | 0 .../app/controllers/.gitkeep | 0 .../app/controllers/application_controller.rb | 0 .../conference_author_types_controller.rb | 8 + .../conference_paper_types_controller.rb | 8 + .../back_end/tags_controller.rb | 8 + ...writing_conference_categorys_controller.rb | 145 +++ .../writing_conferences_controller.rb | 309 +++++ .../plugin/writing_conferences_controller.rb | 187 +++ .../app/helpers/.gitkeep | 0 .../app/mailers/.gitkeep | 0 .../app/models/.gitkeep | 0 .../app/models/conference_author_type.rb | 9 + .../app/models/conference_paper_type.rb | 9 + .../app/models/personal_conference_tag.rb | 9 + .../app/models/writing_conference.rb} | 32 +- .../models/writing_conference_category.rb} | 12 +- .../app/models/writing_conference_file.rb} | 4 +- .../app/views/.gitkeep | 0 .../_form.html.erb | 8 +- .../_quick_edit_qe.html.erb | 0 .../_writing_conference_category.html.erb | 22 + .../create.js.erb | 2 + .../destroy.js.erb | 1 + .../edit.html.erb | 7 + .../writing_conference_categorys}/edit.js.erb | 0 .../index.html.erb | 8 +- .../writing_conference_categorys/new.html.erb | 19 + .../writing_conference_categorys}/new.js.erb | 0 .../update.js.erb | 4 + .../_author_type_qe.html.erb | 4 +- .../writing_conferences}/_filter.html.erb | 0 .../writing_conferences}/_form.html.erb | 68 +- .../writing_conferences}/_form_file.html.erb | 0 .../_list_author_type.html.erb | 11 + .../_list_paper_type.html.erb | 11 + .../_paper_type_qe.html.erb | 4 +- .../_sort_headers.html.erb | 4 + .../_writing_conference.html.erb | 21 + .../author_type_quick_add.js.erb | 0 .../author_type_quick_edit.js.erb | 0 .../create_writing_conference_setting.js.erb | 10 + .../writing_conferences/destroy.js.erb | 1 + .../writing_conferences/edit.html.erb | 5 + .../writing_conferences/index.html.erb | 22 + .../back_end/writing_conferences/index.js.erb | 3 + .../back_end/writing_conferences/new.html.erb | 10 + .../paper_type_quick_add.js.erb | 0 .../paper_type_quick_edit.js.erb | 0 .../writing_conferences}/show.html.erb | 0 .../writing_conferences}/toggle_enable.js.erb | 0 .../update_writing_conference_setting.js.erb | 10 + .../writing_conference_setting.html.erb} | 6 +- .../plugin/_profile.html.erb | 62 + .../writing_conferences}/_filter.html.erb | 0 .../writing_conferences}/_form.html.erb | 68 +- .../writing_conferences}/_form_file.html.erb | 0 .../_sort_headers.html.erb | 3 + .../_writing_conference.html.erb | 20 + .../plugin/writing_conferences/destroy.js.erb | 1 + .../plugin/writing_conferences/edit.html.erb | 5 + .../plugin/writing_conferences/index.html.erb | 22 + .../plugin/writing_conferences/index.js.erb | 3 + .../plugin/writing_conferences/new.html.erb | 10 + .../plugin/writing_conferences}/show.html.erb | 0 .../writing_conferences}/toggle_enable.js.erb | 0 .../config/locales/en.yml | 0 .../config/locales/zh_tw.yml | 0 .../personal_conference/config/routes.rb | 36 + .../init.rb | 10 +- .../lib/personal_conference.rb | 4 + .../lib/personal_conference}/engine.rb | 2 +- .../lib/personal_conference/version.rb | 3 + .../lib/tasks/personal_conference_tasks.rake} | 2 +- .../personal_conference.gemspec} | 4 +- .../personal_conference.json} | 6 +- .../script/rails | 0 .../test/dummy/Rakefile | 0 .../app/assets/javascripts/application.js | 0 .../app/assets/stylesheets/application.css | 0 .../app/controllers/application_controller.rb | 0 .../dummy/app/helpers/application_helper.rb | 0 .../test/dummy/app/mailers/.gitkeep | 0 .../test/dummy/app/models/.gitkeep | 0 .../app/views/layouts/application.html.erb | 0 .../test/dummy/config.ru | 0 .../test/dummy/config/application.rb | 2 +- .../test/dummy/config/boot.rb | 0 .../test/dummy/config/database.yml | 0 .../test/dummy/config/environment.rb | 0 .../dummy/config/environments/development.rb | 0 .../dummy/config/environments/production.rb | 0 .../test/dummy/config/environments/test.rb | 0 .../initializers/backtrace_silencers.rb | 0 .../dummy/config/initializers/inflections.rb | 0 .../dummy/config/initializers/mime_types.rb | 0 .../dummy/config/initializers/secret_token.rb | 0 .../config/initializers/session_store.rb | 0 .../config/initializers/wrap_parameters.rb | 0 .../test/dummy/config/locales/en.yml | 0 .../test/dummy/config/routes.rb | 0 .../test/dummy/lib/assets/.gitkeep | 0 .../test/dummy/log/.gitkeep | 0 .../test/dummy/public/404.html | 0 .../test/dummy/public/422.html | 0 .../test/dummy/public/500.html | 0 .../test/dummy/public/favicon.ico | 0 .../test/dummy/script/rails | 0 .../test/integration/navigation_test.rb | 0 .../test/personal_conference_test.rb | 7 + .../test/test_helper.rb | 0 .../seminar_author_types_controller.rb | 8 - .../seminar_paper_types_controller.rb | 8 - .../back_end/tags_controller.rb | 8 - .../writing_seminar_categorys_controller.rb | 145 --- .../back_end/writing_seminars_controller.rb | 311 ----- .../plugin/writing_seminars_controller.rb | 187 --- .../app/models/personal_seminar_tag.rb | 9 - .../app/models/seminar_author_type.rb | 9 - .../app/models/seminar_paper_type.rb | 9 - .../_writing_seminar_category.html.erb | 22 - .../writing_seminar_categorys/create.js.erb | 2 - .../writing_seminar_categorys/destroy.js.erb | 1 - .../writing_seminar_categorys/edit.html.erb | 7 - .../writing_seminar_categorys/new.html.erb | 19 - .../writing_seminar_categorys/update.js.erb | 4 - .../_list_author_type.html.erb | 11 - .../_list_paper_type.html.erb | 11 - .../writing_seminars/_sort_headers.html.erb | 4 - .../_writing_seminar.html.erb | 21 - .../create_writing_seminar_setting.js.erb | 10 - .../back_end/writing_seminars/destroy.js.erb | 1 - .../back_end/writing_seminars/edit.html.erb | 5 - .../back_end/writing_seminars/index.html.erb | 22 - .../back_end/writing_seminars/index.js.erb | 3 - .../back_end/writing_seminars/new.html.erb | 10 - .../update_writing_seminar_setting.js.erb | 10 - .../personal_seminar/plugin/_profile.html.erb | 62 - .../writing_seminars/_sort_headers.html.erb | 3 - .../_writing_seminar.html.erb | 20 - .../plugin/writing_seminars/destroy.js.erb | 1 - .../plugin/writing_seminars/edit.html.erb | 5 - .../plugin/writing_seminars/index.html.erb | 22 - .../plugin/writing_seminars/index.js.erb | 3 - .../plugin/writing_seminars/new.html.erb | 10 - .../personal_seminar/config/routes.rb | 40 - .../personal_seminar/lib/personal_seminar.rb | 4 - .../lib/personal_seminar/version.rb | 3 - .../test/personal_seminar_test.rb | 7 - 170 files changed, 2229 insertions(+), 1494 deletions(-) rename app/assets/javascripts/desktop/{seminar_pages.js => conference_pages.js} (71%) delete mode 100644 app/controllers/desktop_publications_controller.000.rb delete mode 100644 log/sunspot-solr-development.log.1 create mode 100644 route rename vendor/built_in_modules/{personal_seminar => personal_conference}/.gitignore (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/Gemfile (89%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/MIT-LICENSE (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/README.rdoc (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/Rakefile (95%) rename vendor/built_in_modules/{personal_seminar/app/assets/images/personal_seminar => personal_conference/app/assets/images/personal_conference}/.gitkeep (100%) rename vendor/built_in_modules/{personal_seminar/app/assets/javascripts/personal_seminar => personal_conference/app/assets/javascripts/personal_conference}/.gitkeep (100%) rename vendor/built_in_modules/{personal_seminar/app/assets/stylesheets/personal_seminar => personal_conference/app/assets/stylesheets/personal_conference}/.gitkeep (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/app/controllers/.gitkeep (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/app/controllers/application_controller.rb (100%) create mode 100644 vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/conference_author_types_controller.rb create mode 100644 vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/conference_paper_types_controller.rb create mode 100644 vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/tags_controller.rb create mode 100644 vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conference_categorys_controller.rb create mode 100644 vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb create mode 100644 vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb rename vendor/built_in_modules/{personal_seminar => personal_conference}/app/helpers/.gitkeep (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/app/mailers/.gitkeep (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/app/models/.gitkeep (100%) create mode 100644 vendor/built_in_modules/personal_conference/app/models/conference_author_type.rb create mode 100644 vendor/built_in_modules/personal_conference/app/models/conference_paper_type.rb create mode 100644 vendor/built_in_modules/personal_conference/app/models/personal_conference_tag.rb rename vendor/built_in_modules/{personal_seminar/app/models/writing_seminar.rb => personal_conference/app/models/writing_conference.rb} (73%) rename vendor/built_in_modules/{personal_seminar/app/models/writing_seminar_category.rb => personal_conference/app/models/writing_conference_category.rb} (65%) rename vendor/built_in_modules/{personal_seminar/app/models/writing_seminar_file.rb => personal_conference/app/models/writing_conference_file.rb} (78%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/app/views/.gitkeep (100%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminar_categorys => personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys}/_form.html.erb (76%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminar_categorys => personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys}/_quick_edit_qe.html.erb (100%) create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/_writing_conference_category.html.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/create.js.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/destroy.js.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/edit.html.erb rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminar_categorys => personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys}/edit.js.erb (100%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminar_categorys => personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys}/index.html.erb (56%) create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/new.html.erb rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminar_categorys => personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys}/new.js.erb (100%) create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conference_categorys/update.js.erb rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars => personal_conference/app/views/panel/personal_conference/back_end/writing_conferences}/_author_type_qe.html.erb (92%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars => personal_conference/app/views/panel/personal_conference/back_end/writing_conferences}/_filter.html.erb (100%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars => personal_conference/app/views/panel/personal_conference/back_end/writing_conferences}/_form.html.erb (69%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars => personal_conference/app/views/panel/personal_conference/back_end/writing_conferences}/_form_file.html.erb (100%) create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_list_author_type.html.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_list_paper_type.html.erb rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars => personal_conference/app/views/panel/personal_conference/back_end/writing_conferences}/_paper_type_qe.html.erb (93%) create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_sort_headers.html.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_writing_conference.html.erb rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars => personal_conference/app/views/panel/personal_conference/back_end/writing_conferences}/author_type_quick_add.js.erb (100%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars => personal_conference/app/views/panel/personal_conference/back_end/writing_conferences}/author_type_quick_edit.js.erb (100%) create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/create_writing_conference_setting.js.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/destroy.js.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/edit.html.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/index.html.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/index.js.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/new.html.erb rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars => personal_conference/app/views/panel/personal_conference/back_end/writing_conferences}/paper_type_quick_add.js.erb (100%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars => personal_conference/app/views/panel/personal_conference/back_end/writing_conferences}/paper_type_quick_edit.js.erb (100%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars => personal_conference/app/views/panel/personal_conference/back_end/writing_conferences}/show.html.erb (100%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars => personal_conference/app/views/panel/personal_conference/back_end/writing_conferences}/toggle_enable.js.erb (100%) create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/update_writing_conference_setting.js.erb rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/writing_seminar_setting.html.erb => personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/writing_conference_setting.html.erb} (94%) create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/_profile.html.erb rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars => personal_conference/app/views/panel/personal_conference/plugin/writing_conferences}/_filter.html.erb (100%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars => personal_conference/app/views/panel/personal_conference/plugin/writing_conferences}/_form.html.erb (68%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars => personal_conference/app/views/panel/personal_conference/plugin/writing_conferences}/_form_file.html.erb (100%) create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_sort_headers.html.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_writing_conference.html.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/destroy.js.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/edit.html.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/index.html.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/index.js.erb create mode 100644 vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/new.html.erb rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars => personal_conference/app/views/panel/personal_conference/plugin/writing_conferences}/show.html.erb (100%) rename vendor/built_in_modules/{personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars => personal_conference/app/views/panel/personal_conference/plugin/writing_conferences}/toggle_enable.js.erb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/config/locales/en.yml (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/config/locales/zh_tw.yml (100%) create mode 100644 vendor/built_in_modules/personal_conference/config/routes.rb rename vendor/built_in_modules/{personal_seminar => personal_conference}/init.rb (73%) create mode 100644 vendor/built_in_modules/personal_conference/lib/personal_conference.rb rename vendor/built_in_modules/{personal_seminar/lib/personal_seminar => personal_conference/lib/personal_conference}/engine.rb (61%) create mode 100644 vendor/built_in_modules/personal_conference/lib/personal_conference/version.rb rename vendor/built_in_modules/{personal_seminar/lib/tasks/personal_seminar_tasks.rake => personal_conference/lib/tasks/personal_conference_tasks.rake} (68%) rename vendor/built_in_modules/{personal_seminar/personal_seminar.gemspec => personal_conference/personal_conference.gemspec} (89%) rename vendor/built_in_modules/{personal_seminar/personal_seminar.json => personal_conference/personal_conference.json} (66%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/script/rails (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/Rakefile (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/app/assets/javascripts/application.js (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/app/assets/stylesheets/application.css (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/app/controllers/application_controller.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/app/helpers/application_helper.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/app/mailers/.gitkeep (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/app/models/.gitkeep (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/app/views/layouts/application.html.erb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config.ru (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/application.rb (98%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/boot.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/database.yml (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/environment.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/environments/development.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/environments/production.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/environments/test.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/initializers/backtrace_silencers.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/initializers/inflections.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/initializers/mime_types.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/initializers/secret_token.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/initializers/session_store.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/initializers/wrap_parameters.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/locales/en.yml (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/config/routes.rb (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/lib/assets/.gitkeep (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/log/.gitkeep (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/public/404.html (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/public/422.html (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/public/500.html (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/public/favicon.ico (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/dummy/script/rails (100%) rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/integration/navigation_test.rb (100%) create mode 100644 vendor/built_in_modules/personal_conference/test/personal_conference_test.rb rename vendor/built_in_modules/{personal_seminar => personal_conference}/test/test_helper.rb (100%) delete mode 100644 vendor/built_in_modules/personal_seminar/app/controllers/panel/personal_seminar/back_end/seminar_author_types_controller.rb delete mode 100644 vendor/built_in_modules/personal_seminar/app/controllers/panel/personal_seminar/back_end/seminar_paper_types_controller.rb delete mode 100644 vendor/built_in_modules/personal_seminar/app/controllers/panel/personal_seminar/back_end/tags_controller.rb delete mode 100644 vendor/built_in_modules/personal_seminar/app/controllers/panel/personal_seminar/back_end/writing_seminar_categorys_controller.rb delete mode 100644 vendor/built_in_modules/personal_seminar/app/controllers/panel/personal_seminar/back_end/writing_seminars_controller.rb delete mode 100644 vendor/built_in_modules/personal_seminar/app/controllers/panel/personal_seminar/plugin/writing_seminars_controller.rb delete mode 100644 vendor/built_in_modules/personal_seminar/app/models/personal_seminar_tag.rb delete mode 100644 vendor/built_in_modules/personal_seminar/app/models/seminar_author_type.rb delete mode 100644 vendor/built_in_modules/personal_seminar/app/models/seminar_paper_type.rb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminar_categorys/_writing_seminar_category.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminar_categorys/create.js.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminar_categorys/destroy.js.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminar_categorys/edit.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminar_categorys/new.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminar_categorys/update.js.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_list_author_type.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_list_paper_type.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_sort_headers.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_writing_seminar.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/create_writing_seminar_setting.js.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/destroy.js.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/edit.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/index.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/index.js.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/new.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/update_writing_seminar_setting.js.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/_profile.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/_sort_headers.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/_writing_seminar.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/destroy.js.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/edit.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/index.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/index.js.erb delete mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/new.html.erb delete mode 100644 vendor/built_in_modules/personal_seminar/config/routes.rb delete mode 100644 vendor/built_in_modules/personal_seminar/lib/personal_seminar.rb delete mode 100644 vendor/built_in_modules/personal_seminar/lib/personal_seminar/version.rb delete mode 100644 vendor/built_in_modules/personal_seminar/test/personal_seminar_test.rb diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js index e5e4a05a..52f48bdd 100644 --- a/app/assets/javascripts/desktop.js +++ b/app/assets/javascripts/desktop.js @@ -15,4 +15,4 @@ //= require orbitTimeline //= require orbitdesktop //= require desktop/books_pages -//= require desktop/seminar_pages +//= require desktop/conference_pages diff --git a/app/assets/javascripts/desktop/seminar_pages.js b/app/assets/javascripts/desktop/conference_pages.js similarity index 71% rename from app/assets/javascripts/desktop/seminar_pages.js rename to app/assets/javascripts/desktop/conference_pages.js index ebe62c18..d341a60a 100644 --- a/app/assets/javascripts/desktop/seminar_pages.js +++ b/app/assets/javascripts/desktop/conference_pages.js @@ -1,6 +1,6 @@ -orbitDesktop.prototype.initializeSeminar = function(target,url,cache){ +orbitDesktop.prototype.initializeConference = function(target,url,cache){ - this.initializeSeminar.list = function(){ + this.initializeConference.list = function(){ var bindHandlers = function(){ o.tinyscrollbar_ext({ main : ".tinycanvas", @@ -13,7 +13,7 @@ orbitDesktop.prototype.initializeSeminar = function(target,url,cache){ } - this.initializeSeminar.addseminar = function(){ + this.initializeConference.addconference = function(){ var bindHandlers = function(){ o.simple_drop_down(); @@ -26,7 +26,7 @@ orbitDesktop.prototype.initializeSeminar = function(target,url,cache){ bindHandlers(); } - this.initializeSeminar.seminar = function(){ + this.initializeConference.conference = function(){ var bindHandlers = function(){ o.simple_drop_down(); @@ -39,7 +39,7 @@ orbitDesktop.prototype.initializeSeminar = function(target,url,cache){ bindHandlers(); } - this.initializeSeminar.rues = function(){ + this.initializeConference.rues = function(){ var bindHandlers = function(){ o.simple_drop_down(); @@ -53,6 +53,6 @@ orbitDesktop.prototype.initializeSeminar = function(target,url,cache){ } - this.initializeSeminar.list(); + this.initializeConference.list(); - } \ No newline at end of file + } diff --git a/app/controllers/desktop_publications_controller.000.rb b/app/controllers/desktop_publications_controller.000.rb deleted file mode 100644 index fc3f36ab..00000000 --- a/app/controllers/desktop_publications_controller.000.rb +++ /dev/null @@ -1,75 +0,0 @@ -class DesktopPublicationsController< ApplicationController - def journal_p - render "desktop/journal_p", :layout => false - end - - def journal_p_list - render "desktop/journal_pages/list", :layout => false - end - - def journal_p_add - debugger - render "desktop/journal_pages/add", :layout => false - end - - def books - render "desktop/books", :layout => false - end - - def books_list - render "desktop/books/list", :layout => false - end - - def books_add - render "desktop/books/add", :layout => false - end - - def seminar_p - render "desktop/seminar_p", :layout => false - end - - def seminar_p_list - render "desktop/seminar_pages/list", :layout => false - end - - def seminar_p_add - render "desktop/seminar_pages/add", :layout => false - end - - def create_journal - Journal.create(user_id: current_user.id, title: "Ice Cream Sandwich") - b = Array.new - b << {"success"=>"true"} - render :json=>b.to_json - end - - def getjournals - @journals = current_user.journals - data = Array.new - @journals.each do |journal| - @papers = journal.papers.all - data << {"title" => journal.title, "papers" => @papers} - end - render :json=>data.to_json - end - - def delete_journal - @journals = Journal.find("") - @journals.delete - b = Array.new - b << {"success"=>"true"} - render :json=>b.to_json - end - - def update_journal - @journal = Journal.find("4ff2d6ebbd98eb02b9000017") - @papers = @journal.papers - @papers.each do |paper| - paper.update_attributes(:user_id => current_user.id) - end - b = Array.new - - b << {"success"=>"true"} - render :json=>b.to_json - end -end diff --git a/app/controllers/desktop_publications_controller.rb b/app/controllers/desktop_publications_controller.rb index ae77ed19..6902e0ef 100644 --- a/app/controllers/desktop_publications_controller.rb +++ b/app/controllers/desktop_publications_controller.rb @@ -17,16 +17,16 @@ class DesktopPublicationsController< ApplicationController render "desktop/books/add", :layout => false end - def seminar_p - render "desktop/seminar_p", :layout => false + def conference_p + render "desktop/conference_p", :layout => false end - def seminar_p_list - render "desktop/seminar_pages/list", :layout => false + def conference_p_list + render "desktop/conference_pages/list", :layout => false end - def seminar_p_add - render "desktop/seminar_pages/add", :layout => false + def conference_p_add + render "desktop/conference_pages/add", :layout => false end # def create_journal diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index 01903447..e62f40d6 100644 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -13,7 +13,7 @@
  • Journal Papers
    • -
  • Seminar Papers
    • +
  • Conference Papers
  • Books
    • diff --git a/app/views/desktop/patents/add.html.erb b/app/views/desktop/patents/add.html.erb index 190e8abd..28283456 100644 --- a/app/views/desktop/patents/add.html.erb +++ b/app/views/desktop/patents/add.html.erb @@ -41,10 +41,10 @@
      -
      • +
    • OralPoster
      • -
      • +
      • +
    • OralPoster
      • -
      • +
      • +
    • OralPoster
      • -
      • +
    • @@ -13,10 +13,10 @@
    -
    \ No newline at end of file + diff --git a/app/views/desktop/seminar_pages/add.html.erb b/app/views/desktop/seminar_pages/add.html.erb index 190e8abd..28283456 100644 --- a/app/views/desktop/seminar_pages/add.html.erb +++ b/app/views/desktop/seminar_pages/add.html.erb @@ -41,10 +41,10 @@
      -
      • +
    • OralPoster
      • -
      • +