Commit Graph

1407 Commits

Author SHA1 Message Date
devin 59c0cdd761 view update
not finish all required pages yet
2012-12-06 07:59:43 +08:00
Rueshyna b89e371393 can update co-author relation 2012-12-06 07:59:43 +08:00
devin a0cce2ae0d view update 2012-12-06 07:59:43 +08:00
Rueshyna e7fdac1d23 make coauthor relation can be edit 2012-12-06 07:59:43 +08:00
devin 8d110cce91 view update 2012-12-06 07:59:43 +08:00
devin d413f705a4 view update 2012-12-06 07:59:43 +08:00
devin 363ccdde4d view update 2012-12-06 07:59:43 +08:00
Harry Bomrah 79dc99d431 br fixed 2012-12-06 07:59:43 +08:00
devin 936101358c journal update 2012-12-06 07:59:43 +08:00
devin 2aa077bc85 journal list 2012-12-06 07:59:43 +08:00
devin d03f5dc1ff view update 2012-12-06 07:59:43 +08:00
Rueshyna 4ae7ac8388 clean route table about desktop 2012-12-06 07:59:42 +08:00
Rueshyna 6c33d353ba make journal list easy to read 2012-12-06 07:59:42 +08:00
Rueshyna 05027afa63 make journal list easy to read 2012-12-06 07:59:42 +08:00
Rueshyna 4f31b1362b fixed new co-author relation bug.... 2012-12-06 07:59:42 +08:00
Rueshyna 1289ad9f9d fixed co-author relation bug.... 2012-12-06 07:59:42 +08:00
Rueshyna afd8e7e380 when delete co-author relation, the co-author will be reset nil 2012-12-06 07:59:42 +08:00
Rueshyna 09c59c4e03 midify button type 2012-12-06 07:59:42 +08:00
Rueshyna 21b1432f7f change settings table default display 2012-12-06 07:59:42 +08:00
Rueshyna e0e1c30f68 delete onside widget in db 2012-12-06 07:59:42 +08:00
unknown 7d3c535e01 add info field 2012-12-06 07:58:39 +08:00
Matthew K. Fu JuYuan 99f28a0cba sidebar rewrited 2012-12-05 18:35:58 +08:00
chris e68c52bc00 Changes for store back-end 2012-12-05 13:46:10 +08:00
Matthew K. Fu JuYuan ca290f3519 Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config
Conflicts:
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
2012-12-05 11:36:32 +08:00
chris 9a79e432dd Fix typo 2012-12-04 01:12:15 +08:00
chris 2983b181e6 Fix some translations 2012-12-04 01:03:28 +08:00
Harry Bomrah c6e0b56012 stupid bug fixed 2012-12-04 00:31:46 +08:00
Rueshyna 58e71c29b3 uniq relation 2012-12-04 00:31:46 +08:00
Rueshyna 9759a32394 can display relation between author 2012-12-04 00:31:46 +08:00
Rueshyna f89a6194c4 add back button 2012-12-04 00:31:46 +08:00
Harry Bomrah 49d1ca6997 new type fixed 2012-12-04 00:31:46 +08:00
Rueshyna 5d6dd8cded separate relation list from index page and render it 2012-12-04 00:31:46 +08:00
Rueshyna e143f9a345 can select relection from relation db 2012-12-04 00:31:46 +08:00
Harry Bomrah 0e6c75e677 form for coauthor - fixed 2012-12-04 00:31:07 +08:00
Rueshyna 0affc73370 modify delete co-author message 2012-12-04 00:31:07 +08:00
Harry Bomrah a6a50227eb new type fixed 2012-12-04 00:31:07 +08:00
Harry Bomrah f7f55850fe coauthor edit and destroy fixed 2012-12-04 00:31:07 +08:00
Rueshyna 7822ffc33d can add relation between co-author 2012-12-04 00:31:06 +08:00
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 184f903b1c correct user passwd and sent json to front-end 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 eb97d417bd if coauthor not in coauthor db then it will be add in db 2012-12-04 00:31:06 +08:00
Rueshyna 7f7b33f310 fixed journal update method 2012-12-04 00:31:06 +08:00
Harry Bomrah ee830f148e jumping menus updated.. 2012-12-04 00:30:10 +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 9254b9960d Add timeout to user 2012-12-03 21:45:00 +08:00
Matthew K. Fu JuYuan 4bc80f2bd3 default widgets and sidebar. 2012-12-03 18:52:36 +08:00
chris 4f9aa63045 Remove extra end 2012-12-03 18:45:32 +08:00
chris 5c7f1aa164 Fix saving of page_part after layout change 2012-12-03 18:42:50 +08:00
chris 2757044c32 Forgot to save the page_parts 2012-12-03 17:49:26 +08:00
chris bdcfb46294 Fix previous commit 2012-12-03 17:38:55 +08:00
chris 6543491a53 Save pages to generate page_parts when a layout is updated 2012-12-03 17:25:27 +08:00
Matthew K. Fu JuYuan f9bcb27efc put module app json into init,making orbit app work with module app. 2012-11-29 14:21:46 +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
Matthew K. Fu JuYuan 3d573680b2 Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config
Conflicts:
	app/models/user/attribute_value.rb
	app/views/layouts/_side_bar_content.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-11-26 17:55:53 +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
Harry Bomrah 3933c048b0 delete fixed 2012-11-23 13:22:01 +08:00
Rueshyna 8009c6aa34 fixed delete function 2012-11-23 12:28:36 +08:00
Rueshyna e06495d4ad 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:
  delete update
2012-11-23 10:50:10 +08:00
Harry Bomrah f38f32ac8b delete update 2012-11-23 10:46:42 +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 f6d3b4a9e9 correct 'edit' button of journal list 2012-11-22 21:06:31 +08:00
Harry Bomrah 868d1c2201 fix for json and some other bugs 2012-11-22 21:06:30 +08:00
Rueshyna e29583ed1f add delete link 2012-11-22 21:06:30 +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 9189ebffee correct 'edit' button of journal list 2012-11-22 18:15:07 +08:00
Harry Bomrah 90fd9de5a8 fix for json and some other bugs 2012-11-22 16:31:52 +08:00
Rueshyna e453cfce9c add delete link 2012-11-22 15:21:43 +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 39adbb35c1 Remove before_filter for sub_manager in users 2012-11-22 09:37:31 +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 2d0e8b37b2 Fix:
- Widgets for announcement
  - Facebook link
  - AdBanner nav
2012-11-21 18:42:14 +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 73e76f2477 routes fixed 2012-11-21 18:36:56 +08:00
Harry Bomrah c53581c999 small fix for journal_pages desktop 2012-11-21 18:36:56 +08:00
Harry Bomrah 0b9af044ba new file created for journal pages 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 91005bb00a routes fixed 2012-11-21 17:39:01 +08:00
Harry Bomrah c94940214c small fix for journal_pages desktop 2012-11-21 17:11:18 +08:00
Harry Bomrah b571373c8f new file created for journal pages 2012-11-21 15:35:23 +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 703324063e change journal list json link 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 1c6badfb10 add more fake data 2012-11-21 07:37:43 +08:00
Rueshyna b6004958c9 make it real 2012-11-21 07:37:43 +08:00
Rueshyna bf4c75fcdc add new function 2012-11-21 07:37:43 +08:00
Rueshyna f93d019ba0 check file type 2012-11-21 07:37:42 +08:00
Rueshyna 61c0c4b542 modified file of view bug 2012-11-21 07:37:42 +08:00
Harry Bomrah 97ffb5ff18 file view update 2012-11-21 07:37:42 +08:00
Rueshyna 02643c12bf modified getjournals format 2012-11-21 07:37:41 +08:00
Rueshyna 5643b0a528 delete demo db of journal and paper 2012-11-21 07:37:41 +08:00
Rueshyna 4ce10d2fd9 make a json format for view of journal_p 2012-11-21 07:37:41 +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
Matthew K. Fu JuYuan c6894be962 first version of confined sidebar render 2012-11-20 15:56:52 +08:00
chris 6273300c28 Fix for ad_image 2012-11-20 15:47:07 +08:00
Rueshyna 95a3831dce done add journals function 2012-11-20 14:58:15 +08:00
chris 7416020161 Add force_order_for_user for ad_images 2012-11-20 14:24:49 +08:00
chris c8bbb28d42 Fix wrong alias in design.rb for themes 2012-11-20 12:46:50 +08:00
chris 84c284fa71 Fix wrong naming in theme.rb 2012-11-20 12:42:53 +08:00
chris dcd781b36b Restore "force_order_for_user" for ad_banner 2012-11-20 12:38:35 +08:00
chris d61621e198 Remove some pry and add address code 2012-11-20 10:05:38 +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