Commit Graph

803 Commits

Author SHA1 Message Date
Rueshyna 5dabfe9319 refine co-authro page 2012-12-04 00:31:06 +08:00
Rueshyna 5986817e16 add journal_list. now, those pair, (journal_title, journal_levels), is uniq 2012-12-04 00:31:06 +08:00
Rueshyna b1ddc9950a adjust update password textfield position 2012-12-04 00:31:06 +08:00
Rueshyna 8a7ae3f061 correct user passwd and sent json to front-end 2012-12-04 00:31:06 +08:00
Rueshyna 7f7b33f310 fixed journal update method 2012-12-04 00:31:06 +08:00
Rueshyna 6426fb74d9 remove edit page cancel buttom 2012-12-04 00:25:58 +08:00
Harry Bomrah d70ef4666b delete fixed.. 2012-12-04 00:25:58 +08:00
Harry Bomrah 43a9f231a6 multiple file fixed 2012-12-04 00:25:58 +08:00
Rueshyna d806e8cf82 have done multiple file 2012-12-04 00:25:58 +08:00
Rueshyna 4a0cc61852 can add multiple file 2012-12-04 00:25:58 +08:00
Rueshyna 5a9d9151d9 add journal list template 2012-12-04 00:25:58 +08:00
chris dc3be3c9a1 Translation changes 2012-12-03 23:00:04 +08:00
chris 9c6c622a49 Add missing icons and css for icons in layout 2012-12-03 22:31:00 +08:00
chris 036d7bbb0e Module store 2012-11-29 02:02:37 +08:00
chris 06335f9bd1 Joshua's html 2012-11-29 00:59:46 +08:00
chris 390da0e49a Change icons 2012-11-29 00:49:53 +08:00
Rueshyna 9e2d6cfcdd add quick link to change user password, but it's not work 2012-11-28 23:44:43 +08:00
Rueshyna 6ed1dd0cc6 change template 2012-11-28 23:43:39 +08:00
Rueshyna 7853aec886 Merge branch 'publication' into multiple_file_upload
* publication:
  url fixed and edit form fixed for tinyscrollbar
2012-11-28 18:19:06 +08:00
Rueshyna 6d159a3a9e add templete 2012-11-28 18:12:37 +08:00
Rueshyna 254a81fa5d add templete 2012-11-28 18:12:21 +08:00
Harry Bomrah 2f67a96532 url fixed and edit form fixed for tinyscrollbar 2012-11-28 18:12:00 +08:00
Rueshyna 25324809bb add account link 2012-11-28 14:42:15 +08:00
Harry Bomrah 9cc518b456 autocomplete done 2012-11-27 15:55:32 +08:00
Rueshyna c9e3d5271a remove '"' candidate list 2012-11-26 16:06:22 +08:00
Rueshyna 0125010a05 modified error msgs and cancle button, but those two have bug... 2012-11-26 15:45:51 +08:00
Rueshyna 065d38c797 add autocomplete js 2012-11-26 14:44:35 +08:00
unknown 8a79d7ff2e member selects 2012-11-26 10:25:34 +08:00
Rueshyna 9061448c5f add paper status textfield 2012-11-26 10:23:50 +08:00
Matthew K. Fu JuYuan 9a684f54b4 fix for showing subroles 2012-11-26 10:22:36 +08:00
chris 1e89c30150 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP 2012-11-26 05:02:58 +08:00
Rueshyna 996a69f595 add co-author json 2012-11-23 10:44:48 +08:00
Matthew K. Fu JuYuan 5b39d10ac6 user roles starts 2012-11-22 21:10:35 +08:00
Matthew K. Fu JuYuan 77386f0284 disable data transform when switching attribute field type. new member stable 2012-11-22 21:10:35 +08:00
Rueshyna 78500e0661 fixed add journal and co-author curd problem, but have redirect problem... 2012-11-22 21:06:30 +08:00
Rueshyna c281ae9447 hidden file field, and fixed updated function 2012-11-22 21:06:30 +08:00
Rueshyna c0ac69fc84 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP
* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit:
  calendar js minor update
  Fix:   - Widgets for announcement   - Facebook link   - AdBanner nav
  visitor now can browse gallery
  routes fixed
  small fix for journal_pages desktop
  new file created for journal pages
  tmp
  add co-author db and curd page, but it can't destory it...
  add co-author page and new it, but can't destory it...
  visitor now can browse gallery
  done add journals function
  fix and hide for visitors,except for album
  album and gallery is now opened
  fixed sutpid bug for calendar
  back button fix for frontend
  fix and hide for visitors,except for album
  calendar js minor update
  minor update for gallery and calendar backend
2012-11-22 10:51:30 +08:00
Rueshyna 9e400e6e6a fixed add journal and co-author curd problem, but have redirect problem... 2012-11-22 10:49:54 +08:00
chris 475642d375 Remove news and fix default_url in ImageUploader 2012-11-22 09:30:25 +08:00
Rueshyna bb69a059e8 hidden file field, and fixed updated function 2012-11-22 02:37:56 +08:00
chris 6ca52226ba Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP
Conflicts:
	app/views/desktop/journal_p.html.erb
2012-11-21 18:38:28 +08:00
Harry Bomrah c53581c999 small fix for journal_pages desktop 2012-11-21 18:36:56 +08:00
Rueshyna b47be52309 tmp 2012-11-21 18:36:56 +08:00
Rueshyna d502f561ef add co-author db and curd page, but it can't destory it... 2012-11-21 18:36:32 +08:00
Rueshyna 6a9426c9c8 add co-author page and new it, but can't destory it... 2012-11-21 18:36:32 +08:00
Rueshyna 5006cd2f61 done add journals function 2012-11-21 18:34:03 +08:00
Matthew K. Fu JuYuan 1279af0c11 fix and hide for visitors,except for album 2012-11-21 18:31:57 +08:00
Harry Bomrah c94940214c small fix for journal_pages desktop 2012-11-21 17:11:18 +08:00
Rueshyna 5c0b137c6d tmp 2012-11-21 14:52:26 +08:00
Rueshyna da1b871481 merge 2012-11-21 10:46:33 +08:00
Harry Bomrah 8f65284932 Desktop updates various 2012-11-21 07:37:44 +08:00
Rueshyna b359d5d566 some bugs 2012-11-21 07:37:44 +08:00
Rueshyna d7599f1ccf add edit function 2012-11-21 07:37:43 +08:00
Rueshyna a3edebce6a midify checkbox value 2012-11-21 07:37:43 +08:00
Rueshyna 5eb8cc4063 finished some method of list and journal 2012-11-21 07:37:43 +08:00
Rueshyna 7e9b60a527 split form from add.html.erb 2012-11-21 07:37:43 +08:00
Rueshyna fe373fad92 add.html convert to add.html.erb done 2012-11-21 07:37:43 +08:00
Rueshyna ae10a2b8a2 convert html template to html.erb 2012-11-21 07:37:43 +08:00
Rueshyna b6004958c9 make it real 2012-11-21 07:37:43 +08:00
Rueshyna 95fc5676bf add co-author db and curd page, but it can't destory it... 2012-11-21 01:56:30 +08:00
Rueshyna ccfecb8243 add co-author page and new it, but can't destory it... 2012-11-21 01:54:06 +08:00
Matthew K. Fu JuYuan 96fe482d50 for openness 2012-11-20 20:20:59 +08:00
Rueshyna 95a3831dce done add journals function 2012-11-20 14:58:15 +08:00
chris 6789d44431 Fix design edit 2012-11-20 10:04:50 +08:00
Matthew K. Fu JuYuan 2aa9a19deb complete address field. still have javascript issue for fill back and display address ext fields in modal. 2012-11-20 09:53:37 +08:00
Matthew K. Fu JuYuan 17988f2fb2 address field and text field convert 2012-11-20 09:53:37 +08:00
Matthew K. Fu JuYuan a85e5fcc0d address field. js and style is broken 2012-11-20 09:53:36 +08:00
Matthew K. Fu JuYuan be448d42c9 add_more ok 2012-11-20 09:52:50 +08:00
Rueshyna 398432d0fc some bugs 2012-11-19 16:28:05 +08:00
Rueshyna 8abb20b4c8 add edit function 2012-11-19 12:07:24 +08:00
Rueshyna 9501bf2df3 midify checkbox value 2012-11-18 14:15:00 +08:00
Rueshyna 26436395f5 finished some method of list and journal 2012-11-18 03:07:50 +08:00
Rueshyna 024b331cf3 split form from add.html.erb 2012-11-16 16:02:17 +08:00
Rueshyna e60480a4be add.html convert to add.html.erb done 2012-11-16 15:33:31 +08:00
Rueshyna b51397d2e2 convert html template to html.erb 2012-11-16 12:54:21 +08:00
Rueshyna b998b8f346 make it real 2012-11-16 01:54:10 +08:00
chris 69bf552fa7 Fix: remove i18n_variable from reload_frontend_pages.js.erb 2012-11-15 18:11:01 +08:00
chris 9b1ada0af9 Fix these bugs:
1.結構部份
    a.原選單,點選編輯,無動作反應
    b.新增選單後,左邊灰色架構部份不會更新

  2.檔案室
    a.無法編輯分類
2012-11-15 15:51:44 +08:00
Harry Bomrah e498be9753 desktopAPI update. 2012-11-12 15:11:36 +08:00
Harry Bomrah a56d80698f desktop api update.. 2012-11-12 15:11:36 +08:00
chris b40d4702d5 Merge branch 'master' into various_bugs
Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
2012-11-06 11:44:00 +08:00
Harry Bomrah da5e7f670e Desktop Widgtes updates.. 2012-11-06 10:36:34 +08:00
Harry Bomrah ca3e06c58b update for desktop widgets 2012-11-05 11:40:11 +08:00
Harry Bomrah 2e809c5c19 Calander view updated... 2012-11-05 11:40:11 +08:00
Matthew K. Fu JuYuan e47465d4b7 add new member with role interface. add more not usable.
role management new attribute is ok. delete is ok.
2012-11-04 05:56:29 +08:00
chris bc9082a858 Fix bug: Fix the bug due to not finding the ModuleApp 2012-10-30 17:10:59 +08:00
chris cc5e238576 Fix after merge from NCCU, the translations still need to be cleaned 2012-10-30 11:08:26 +08:00
Matthew K. Fu JuYuan 664c6d2f61 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts:
	vendor/built_in_modules/personal_patent/app - %BDƻs/assets/images/personal_patent/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/assets/javascripts/personal_patent/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/assets/stylesheets/personal_patent/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/application_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/tags_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.00.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/plugin/writing_patents_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/helpers/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/mailers/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/personal_patent_tag.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_category.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_file.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_patent_category.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/create.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/destroy.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/edit.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/new.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/update.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_filter.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_list_writing_patent_category.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent_category_qe.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/create_writing_patent_setting.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/destroy.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/edit.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/new.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/show.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/toggle_enable.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/update_writing_patent_setting.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_add.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_edit.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_filter.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_sort_headers.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_writing_patent.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/destroy.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/edit.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/new.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/show.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/toggle_enable.js.erb
2012-10-30 10:11:51 +08:00
chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master
Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
chris 9b5f4e4775 Fix bug: User cannot connect using the orbit button (Devise configuration) 2012-10-26 17:42:14 +08:00
Matthew K. Fu JuYuan bd0d975014 for user new interface, member role is working. 2012-10-26 11:27:37 +08:00
chris d7fd61ce55 Edit uploaded package 2012-10-26 11:19:57 +08:00
Matthew K. Fu JuYuan 0a1a9d2c2e member for THU 2012-10-26 11:19:56 +08:00
chris cbfa659928 Changes for side_bar 2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan f4f07c7206 fix sub role attribute fields
run: Role.any_in(:key=>['department_admin','administrator']).destroy_all
for deleting old role data to complete this code.
2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan 9c16da4f46 fixed html for add link. form html 2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan 03b608593d can add member 2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan 0a56c555bb new code for attribute fields and values for new member interface 2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan 8b9cffd4f2 new code for attribute fields and values for new member interface 2012-10-26 11:19:55 +08:00
Matthew K. Fu JuYuan 1b876d4305 for user new interface, member role is working. 2012-10-24 14:46:25 +08:00