droom 0.4.3 → 0.5.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (396) hide show
  1. checksums.yaml +7 -0
  2. data/app/assets/images/droom/admin_menu.png +0 -0
  3. data/app/assets/images/droom/applications_menu.png +0 -0
  4. data/app/assets/images/droom/arrows_small.png +0 -0
  5. data/app/assets/images/droom/config_menu.png +0 -0
  6. data/app/assets/images/droom/dropdown.png +0 -0
  7. data/app/assets/images/droom/menu/asterisk.png +0 -0
  8. data/app/assets/images/droom/{smalladd.png → menu/smalladd.png} +0 -0
  9. data/app/assets/images/droom/{small_asterisk.png → menu/smallasterisk.png} +0 -0
  10. data/app/assets/images/droom/{smalldelete.png → menu/smalldelete.png} +0 -0
  11. data/app/assets/images/droom/{smalldownload.png → menu/smalldownload.png} +0 -0
  12. data/app/assets/images/droom/{smalledit.png → menu/smalledit.png} +0 -0
  13. data/app/assets/images/droom/message.png +0 -0
  14. data/app/assets/images/droom/missing/scrap.jpg +0 -0
  15. data/app/assets/images/droom/missing/scrap.png +0 -0
  16. data/app/assets/images/droom/missing/thumb.png +0 -0
  17. data/app/assets/images/droom/missing/user.png +0 -0
  18. data/app/assets/images/droom/object_icons.png +0 -0
  19. data/app/assets/images/droom/panel/add.png +0 -0
  20. data/app/assets/images/droom/panel/edit.png +0 -0
  21. data/app/assets/images/droom/panel/manage.png +0 -0
  22. data/app/assets/images/droom/pointer_upwards.png +0 -0
  23. data/app/assets/images/droom/search_menu.png +0 -0
  24. data/app/assets/images/droom/setter.png +0 -0
  25. data/app/assets/images/droom/small_icons.png +0 -0
  26. data/app/assets/images/droom/stream/closer.png +0 -0
  27. data/app/assets/images/droom/stream/next.png +0 -0
  28. data/app/assets/images/droom/stream/prev.png +0 -0
  29. data/app/assets/images/droom/stream/previous.png +0 -0
  30. data/app/assets/images/droom/subscribe.png +0 -0
  31. data/app/assets/javascripts/droom.js.coffee +23 -13
  32. data/app/assets/javascripts/droom/actions.js.coffee +104 -10
  33. data/app/assets/javascripts/droom/ajax.js.coffee +36 -24
  34. data/app/assets/javascripts/droom/extensions.js.coffee +13 -0
  35. data/app/assets/javascripts/droom/lib/jquery.datepicker.js +1026 -0
  36. data/app/assets/javascripts/droom/lib/jquery.deserialize.js +142 -0
  37. data/app/assets/javascripts/droom/lib/jquery_ujs.js +416 -0
  38. data/app/assets/javascripts/droom/lib/swipe.js +568 -0
  39. data/app/assets/javascripts/droom/lib/underscore.js +1276 -0
  40. data/app/assets/javascripts/droom/popups.js.coffee +98 -37
  41. data/app/assets/javascripts/droom/stream.js.coffee +119 -77
  42. data/app/assets/javascripts/droom/utilities.js.coffee +25 -3
  43. data/app/assets/javascripts/droom/widgets.js.coffee +318 -253
  44. data/app/assets/stylesheets/droom.css.sass +482 -955
  45. data/app/assets/stylesheets/droom/_mixins.css.sass +12 -42
  46. data/app/assets/stylesheets/droom/_popups.css.sass +28 -11
  47. data/app/assets/stylesheets/droom/_stream.css.sass +375 -0
  48. data/app/assets/stylesheets/droom/_toolbar.css.sass +0 -6
  49. data/app/assets/stylesheets/droom/_variables.css.sass +4 -2
  50. data/app/controllers/droom/agenda_categories_controller.rb +6 -14
  51. data/app/controllers/droom/api/api_controller.rb +56 -0
  52. data/app/controllers/droom/api/events_controller.rb +74 -0
  53. data/app/controllers/droom/api/users_controller.rb +92 -0
  54. data/app/controllers/droom/api/venues_controller.rb +71 -0
  55. data/app/controllers/droom/calendars_controller.rb +4 -10
  56. data/app/controllers/droom/{user_confirmations_controller.rb → confirmations_controller.rb} +8 -7
  57. data/app/controllers/droom/dashboard_controller.rb +2 -19
  58. data/app/controllers/droom/documents_controller.rb +12 -60
  59. data/app/controllers/droom/dropbox_tokens_controller.rb +3 -4
  60. data/app/controllers/droom/engine_controller.rb +39 -11
  61. data/app/controllers/droom/events_controller.rb +62 -84
  62. data/app/controllers/droom/folders_controller.rb +30 -40
  63. data/app/controllers/droom/group_invitations_controller.rb +6 -23
  64. data/app/controllers/droom/group_permissions_controller.rb +26 -0
  65. data/app/controllers/droom/groups_controller.rb +10 -14
  66. data/app/controllers/droom/invitations_controller.rb +7 -25
  67. data/app/controllers/droom/memberships_controller.rb +13 -18
  68. data/app/controllers/droom/organisations_controller.rb +6 -25
  69. data/app/controllers/droom/permissions_controller.rb +50 -0
  70. data/app/controllers/droom/preferences_controller.rb +9 -10
  71. data/app/controllers/droom/scraps_controller.rb +23 -26
  72. data/app/controllers/droom/services_controller.rb +50 -0
  73. data/app/controllers/droom/suggestions_controller.rb +6 -4
  74. data/app/controllers/droom/users/confirmations_controller.rb +24 -0
  75. data/app/controllers/droom/users/passwords_controller.rb +39 -0
  76. data/app/controllers/droom/users/sessions_controller.rb +7 -0
  77. data/app/controllers/droom/users_controller.rb +60 -38
  78. data/app/controllers/droom/venues_controller.rb +8 -15
  79. data/app/controllers/droom/youtube_controller.rb +1 -1
  80. data/app/helpers/droom/droom_helper.rb +22 -17
  81. data/app/models/droom/ability.rb +81 -0
  82. data/app/models/droom/agenda_category.rb +0 -1
  83. data/app/models/droom/calendar.rb +12 -7
  84. data/app/models/droom/category.rb +4 -10
  85. data/app/models/droom/concerns/slugged.rb +21 -0
  86. data/app/models/droom/document.rb +15 -17
  87. data/app/models/droom/dropbox_document.rb +3 -6
  88. data/app/models/droom/dropbox_token.rb +2 -3
  89. data/app/models/droom/event.rb +117 -163
  90. data/app/models/droom/event_type.rb +25 -0
  91. data/app/models/droom/folder.rb +36 -48
  92. data/app/models/droom/group.rb +35 -27
  93. data/app/models/droom/group_invitation.rb +7 -10
  94. data/app/models/droom/group_permission.rb +29 -0
  95. data/app/models/droom/invitation.rb +14 -23
  96. data/app/models/droom/mailing_list_membership.rb +0 -1
  97. data/app/models/droom/membership.rb +32 -31
  98. data/app/models/droom/organisation.rb +6 -3
  99. data/app/models/droom/permission.rb +19 -0
  100. data/app/models/droom/personal_folder.rb +9 -21
  101. data/app/models/droom/preference.rb +1 -2
  102. data/app/models/droom/scrap.rb +31 -26
  103. data/app/models/droom/service.rb +31 -0
  104. data/app/models/droom/tag.rb +10 -9
  105. data/app/models/droom/tagging.rb +1 -1
  106. data/app/models/droom/user.rb +453 -130
  107. data/app/models/droom/user_permission.rb +8 -0
  108. data/app/models/droom/venue.rb +21 -32
  109. data/app/serializers/droom/user_serializer.rb +45 -0
  110. data/app/serializers/droom/venue_serializer.rb +5 -0
  111. data/app/views/droom/dashboard/_documents.html.haml +1 -1
  112. data/app/views/droom/dashboard/_folders.html.haml +1 -1
  113. data/app/views/droom/dashboard/_future_events.html.haml +10 -8
  114. data/app/views/droom/dashboard/_groups.html.haml +1 -1
  115. data/app/views/droom/dashboard/_past_events.haml +19 -12
  116. data/app/views/droom/dashboard/_stream.html.haml +2 -2
  117. data/app/views/droom/{users/_extra_columns.html.haml → dashboard/_welcome.html.haml} +0 -0
  118. data/app/views/droom/dashboard/index.html.haml +3 -0
  119. data/app/views/droom/documents/_document.html.haml +0 -2
  120. data/app/views/droom/documents/_documents.html.haml +1 -1
  121. data/app/views/droom/documents/_documents_list.html.haml +1 -1
  122. data/app/views/droom/documents/_documents_table.html.haml +1 -1
  123. data/app/views/droom/documents/_form.html.haml +8 -5
  124. data/app/views/droom/documents/_listing.html.haml +4 -2
  125. data/app/views/droom/documents/index.html.haml +13 -7
  126. data/app/views/droom/documents/new.html.haml +1 -4
  127. data/app/views/droom/events/_action_menu.html.haml +2 -2
  128. data/app/views/droom/events/_attachments.html.haml +8 -0
  129. data/app/views/droom/events/_calendar.html.haml +4 -8
  130. data/app/views/droom/events/_event.html.haml +44 -63
  131. data/app/views/droom/events/_event_line.html.haml +1 -1
  132. data/app/views/droom/events/_events.html.haml +18 -2
  133. data/app/views/droom/events/_form.html.haml +26 -19
  134. data/app/views/droom/events/_invitations.html.haml +7 -3
  135. data/app/views/droom/events/_scrap_events.html.haml +8 -0
  136. data/app/views/droom/events/_suggested.html.haml +4 -1
  137. data/app/views/droom/events/calendar.html.haml +8 -0
  138. data/app/views/droom/events/index.html.haml +24 -26
  139. data/app/views/droom/events/show.html.haml +6 -6
  140. data/app/views/droom/folders/_contents.html.haml +34 -4
  141. data/app/views/droom/folders/_folder.html.haml +7 -2
  142. data/app/views/droom/folders/_form.html.haml +11 -8
  143. data/app/views/droom/folders/index.html.haml +19 -22
  144. data/app/views/droom/group_invitations/_attending_groups.html.haml +1 -1
  145. data/app/views/droom/group_permissions/_toggle.html.haml +18 -0
  146. data/app/views/droom/groups/_action_menu.haml +0 -2
  147. data/app/views/droom/groups/_created.html.haml +0 -1
  148. data/app/views/droom/groups/_form.html.haml +3 -0
  149. data/app/views/droom/groups/_group.html.haml +10 -8
  150. data/app/views/droom/groups/_groups.html.haml +1 -1
  151. data/app/views/droom/groups/_search_result.html.haml +1 -1
  152. data/app/views/droom/groups/_suggested.html.haml +1 -1
  153. data/app/views/droom/groups/index.html.haml +15 -16
  154. data/app/views/droom/invitations/_form.html.haml +1 -1
  155. data/app/views/droom/invitations/_invitation.html.haml +1 -1
  156. data/app/views/droom/invitations/_invitations.html.haml +4 -4
  157. data/app/views/droom/memberships/_button.html.haml +5 -5
  158. data/app/views/droom/memberships/_form.html.haml +26 -7
  159. data/app/views/droom/memberships/_member.html.haml +1 -1
  160. data/app/views/droom/memberships/{_membership_toggle.html.haml → _toggle.html.haml} +4 -4
  161. data/app/views/droom/memberships/index.html.haml +9 -0
  162. data/app/views/droom/organisations/_action_menu.html.haml +1 -1
  163. data/app/views/droom/organisations/_organisation.html.haml +2 -2
  164. data/app/views/droom/organisations/_suggested.html.haml +1 -1
  165. data/app/views/droom/organisations/index.html.haml +11 -11
  166. data/app/views/droom/panels/_admin.html.haml +2 -2
  167. data/app/views/droom/panels/_configuration.html.haml +28 -0
  168. data/app/views/droom/panels/_devices.html.haml +2 -4
  169. data/app/views/droom/panels/_search.html.haml +9 -0
  170. data/app/views/droom/permissions/_action_menu.html.haml +10 -0
  171. data/app/views/droom/permissions/_created.html.haml +3 -0
  172. data/app/views/droom/permissions/_form.html.haml +17 -0
  173. data/app/views/droom/permissions/edit.html.haml +7 -0
  174. data/app/views/droom/permissions/new.html.haml +8 -0
  175. data/app/views/droom/permissions/show.html.haml +4 -0
  176. data/app/views/droom/preferences/_checkbox.html.haml +4 -2
  177. data/app/views/droom/scraps/_caption.html.haml +0 -2
  178. data/app/views/droom/scraps/_credit.html.haml +1 -1
  179. data/app/views/droom/scraps/_form.html.haml +68 -69
  180. data/app/views/droom/scraps/_preload.html.haml +4 -0
  181. data/app/views/droom/scraps/_stream.html.haml +11 -3
  182. data/app/views/droom/scraps/_thumb.html.haml +33 -1
  183. data/app/views/droom/scraps/edit.html.haml +6 -1
  184. data/app/views/droom/scraps/full/_document.html.haml +4 -3
  185. data/app/views/droom/scraps/full/_event.html.haml +17 -16
  186. data/app/views/droom/scraps/full/_image.html.haml +1 -2
  187. data/app/views/droom/scraps/full/_link.html.haml +4 -3
  188. data/app/views/droom/scraps/full/_quote.html.haml +4 -7
  189. data/app/views/droom/scraps/full/_text.html.haml +3 -2
  190. data/app/views/droom/scraps/full/_video.html.haml +2 -2
  191. data/app/views/droom/scraps/new.html.haml +6 -1
  192. data/app/views/droom/scraps/show.html.haml +4 -3
  193. data/app/views/droom/services/_action_menu.html.haml +12 -0
  194. data/app/views/droom/services/_created.html.haml +3 -0
  195. data/app/views/droom/services/_form.html.haml +18 -0
  196. data/app/views/droom/services/_services.html.haml +44 -0
  197. data/app/views/droom/services/edit.html.haml +7 -0
  198. data/app/views/droom/services/index.html.haml +5 -0
  199. data/app/views/droom/{people → services}/new.html.haml +4 -3
  200. data/app/views/droom/services/show.html.haml +4 -0
  201. data/app/views/droom/shared/_controls.html.haml +2 -2
  202. data/app/views/droom/shared/_navigation.html.haml +2 -2
  203. data/app/views/droom/shared/_toolbar.html.haml +1 -1
  204. data/app/views/droom/suggestions/index.html.haml +1 -0
  205. data/app/views/droom/users/_action_menu.html.haml +21 -0
  206. data/app/views/droom/users/_suggested.html.haml +14 -0
  207. data/app/views/droom/users/_user.html.haml +2 -2
  208. data/app/views/droom/users/_users.html.haml +7 -0
  209. data/app/views/droom/users/_users_table.html.haml +21 -22
  210. data/app/views/droom/users/admin.html.haml +10 -0
  211. data/app/views/droom/users/confirmations/_after_confirmation.html.haml +2 -0
  212. data/app/views/droom/users/confirmations/_password_required.html.haml +30 -0
  213. data/app/views/droom/users/confirmations/failure.en.html.haml +22 -0
  214. data/app/views/droom/users/confirmations/show.html.haml +13 -0
  215. data/app/views/droom/users/edit.html.haml +2 -10
  216. data/app/views/droom/users/edit/_details.html.haml +13 -0
  217. data/app/views/droom/users/edit/_memberships.html.haml +13 -0
  218. data/app/views/droom/users/edit/_password_fields.html.haml +16 -0
  219. data/app/views/droom/users/edit/_preferences.html.haml +37 -0
  220. data/app/views/droom/users/edit/_profile.html.haml +26 -0
  221. data/app/views/droom/users/edit/_user_fields.html.haml +66 -0
  222. data/app/views/droom/users/index.html.haml +6 -32
  223. data/app/views/droom/users/new.html.haml +3 -0
  224. data/app/views/droom/users/passwords/completed.html.haml +13 -0
  225. data/app/views/{devise → droom/users}/passwords/edit.html.haml +10 -4
  226. data/app/views/{devise → droom/users}/passwords/new.html.haml +4 -3
  227. data/app/views/droom/users/passwords/show.html.haml +6 -0
  228. data/app/views/droom/users/show.html.haml +2 -0
  229. data/app/views/droom/users/show/_listed.html.haml +46 -0
  230. data/app/views/droom/users/show/_profile.html.haml +33 -0
  231. data/app/views/droom/users/show/_tabled.html.haml +28 -0
  232. data/config/initializers/chronic.rb +2 -0
  233. data/config/initializers/devise.rb +35 -2
  234. data/config/initializers/paperclip.rb +11 -6
  235. data/config/locales/devise.en.yml +1 -1
  236. data/config/locales/en.yml +198 -103
  237. data/config/routes.rb +37 -45
  238. data/db/migrate/20130207123614_stream.rb +5 -1
  239. data/db/migrate/20130225095328_create_droom_calendars.rb +0 -1
  240. data/db/migrate/20130627065459_permissions.rb +34 -0
  241. data/db/migrate/20130627071938_users_take_over.rb +38 -0
  242. data/db/migrate/20130627073759_user_properties.rb +34 -0
  243. data/db/migrate/20130627080021_no_more_people.rb +11 -0
  244. data/db/migrate/20130701122935_directory_groups.rb +8 -0
  245. data/db/migrate/20130701123152_remove_old_access_control.rb +16 -0
  246. data/db/migrate/20130729102857_more_scrap_data.rb +12 -0
  247. data/db/migrate/20130904080340_international_names.rb +17 -0
  248. data/db/migrate/20130904080341_honours.rb +5 -0
  249. data/db/migrate/20131124082222_simple_addresses.rb +25 -0
  250. data/db/migrate/20131201093351_event_time_zone.rb +5 -0
  251. data/db/migrate/20131217060311_session_revocable.rb +5 -0
  252. data/db/migrate/20131219180311_event_types.rb +15 -0
  253. data/lib/devise/strategies/cookie_authenticatable.rb +46 -0
  254. data/lib/droom.rb +48 -33
  255. data/lib/droom/auth_cookie.rb +82 -0
  256. data/lib/droom/cropper.rb +24 -0
  257. data/lib/droom/engine.rb +20 -2
  258. data/lib/droom/folders.rb +6 -6
  259. data/lib/droom/lazy_hash.rb +11 -1
  260. data/lib/droom/monkeys.rb +6 -6
  261. data/lib/droom/taggability.rb +1 -1
  262. data/lib/droom/validators.rb +1 -1
  263. data/lib/droom/version.rb +1 -1
  264. data/lib/generators/droom/install/templates/droom_initializer.rb +10 -2
  265. data/lib/paperclip/geometry_transformation.rb +80 -0
  266. data/lib/paperclip/validators/attachment_height_validator.rb +89 -0
  267. data/lib/paperclip/validators/attachment_width_validator.rb +89 -0
  268. data/lib/paperclip_processors/offset_thumbnail.rb +85 -0
  269. data/spec/dummy/config/application.rb +0 -7
  270. data/spec/dummy/config/environments/development.rb +1 -10
  271. data/spec/dummy/config/environments/production.rb +1 -0
  272. data/spec/dummy/config/environments/test.rb +2 -7
  273. data/spec/dummy/db/migrate/20130130120631_folder_ancestry_to_parents.droom.rb +1 -1
  274. data/spec/dummy/db/migrate/20130724124758_dropbox_tokens.droom.rb +10 -0
  275. data/spec/dummy/db/migrate/20130724124759_preference_uuids.droom.rb +6 -0
  276. data/spec/dummy/db/migrate/20130724124760_stream.droom.rb +14 -0
  277. data/spec/dummy/db/migrate/20130724124761_access_token_secret.droom.rb +6 -0
  278. data/spec/dummy/db/migrate/20130724124762_person_image.droom.rb +10 -0
  279. data/spec/dummy/db/migrate/20130724124763_devise_confirmable.droom.rb +14 -0
  280. data/spec/dummy/db/migrate/20130724124764_create_droom_calendars.droom.rb +20 -0
  281. data/spec/dummy/db/migrate/20130724124765_give_scraps_document.droom.rb +6 -0
  282. data/spec/dummy/db/migrate/20130724124766_privateness.droom.rb +10 -0
  283. data/spec/dummy/db/migrate/20130724124767_store_metadata.droom.rb +6 -0
  284. data/spec/dummy/db/migrate/20130724124768_folders_nicely.droom.rb +7 -0
  285. data/spec/dummy/db/migrate/20130724124769_niceties.droom.rb +8 -0
  286. data/spec/dummy/db/migrate/20130724124770_create_droom_dropbox_documents.droom.rb +12 -0
  287. data/spec/dummy/db/migrate/20130724124771_dropbox_documents_changed.droom.rb +6 -0
  288. data/spec/dummy/db/migrate/20130724124772_user_titles.droom.rb +6 -0
  289. data/spec/dummy/db/migrate/20130724124773_permissions.droom.rb +35 -0
  290. data/spec/dummy/db/migrate/20130724124774_users_take_over.droom.rb +39 -0
  291. data/spec/dummy/db/migrate/20130724124775_user_properties.droom.rb +35 -0
  292. data/spec/dummy/db/migrate/20130724124776_no_more_people.droom.rb +12 -0
  293. data/spec/dummy/db/migrate/20130724124777_directory_groups.droom.rb +9 -0
  294. data/spec/dummy/db/migrate/20130724124778_remove_old_access_control.droom.rb +17 -0
  295. data/spec/dummy/db/schema.rb +217 -140
  296. data/spec/factories/documents.rb +0 -5
  297. data/spec/factories/events.rb +0 -9
  298. data/spec/factories/user.rb +4 -2
  299. data/spec/lib/droom/folders_spec.rb +8 -8
  300. data/spec/models/droom/document_spec.rb +6 -43
  301. data/spec/models/droom/event_spec.rb +0 -34
  302. data/spec/models/droom/mailing_list_membership_spec.rb +4 -4
  303. data/spec/models/droom/membership_spec.rb +2 -2
  304. data/spec/spec_helper.rb +1 -10
  305. metadata +322 -282
  306. data/app/assets/images/droom/Untitled-1.png +0 -0
  307. data/app/assets/images/droom/asterisk.png +0 -0
  308. data/app/assets/images/droom/smallmanage.png +0 -0
  309. data/app/assets/javascripts/droom/lib/kalendae.js +0 -1692
  310. data/app/assets/stylesheets/lib/_kalendae.css.sass +0 -139
  311. data/app/controllers/droom/pages_controller.rb +0 -61
  312. data/app/controllers/droom/people_controller.rb +0 -111
  313. data/app/models/droom/document_attachment.rb +0 -37
  314. data/app/models/droom/page.rb +0 -26
  315. data/app/models/droom/person.rb +0 -309
  316. data/app/models/droom/recurrence_rule.rb +0 -82
  317. data/app/models/droom/user_action_observer.rb +0 -12
  318. data/app/views/devise/confirmations/failure.en.html.haml +0 -20
  319. data/app/views/devise/confirmations/show.html.haml +0 -19
  320. data/app/views/droom/confirmations/show.html.haml +0 -40
  321. data/app/views/droom/documents/_document_line.html.haml +0 -2
  322. data/app/views/droom/events/_created.html.haml +0 -2
  323. data/app/views/droom/folders/_attachments.html.haml +0 -3
  324. data/app/views/droom/pages/_contents.html.haml +0 -10
  325. data/app/views/droom/pages/_form.html.haml +0 -36
  326. data/app/views/droom/pages/_full_page.html.haml +0 -17
  327. data/app/views/droom/pages/_page.html.haml +0 -5
  328. data/app/views/droom/pages/_pages.html.haml +0 -2
  329. data/app/views/droom/pages/admin.html.haml +0 -24
  330. data/app/views/droom/pages/edit.html.haml +0 -1
  331. data/app/views/droom/pages/index.html.haml +0 -10
  332. data/app/views/droom/pages/new.html.haml +0 -4
  333. data/app/views/droom/pages/show.html.haml +0 -5
  334. data/app/views/droom/panels/_account.html.haml +0 -16
  335. data/app/views/droom/panels/_readers.html.haml +0 -18
  336. data/app/views/droom/panels/_suggestions.html.haml +0 -15
  337. data/app/views/droom/people/_action_menu.html.haml +0 -22
  338. data/app/views/droom/people/_created.html.haml +0 -6
  339. data/app/views/droom/people/_form.html.haml +0 -66
  340. data/app/views/droom/people/_listing.html.haml +0 -19
  341. data/app/views/droom/people/_memberships.html.haml +0 -24
  342. data/app/views/droom/people/_people.html.haml +0 -5
  343. data/app/views/droom/people/_person.html.haml +0 -32
  344. data/app/views/droom/people/_search_result.html.haml +0 -14
  345. data/app/views/droom/people/_suggested.html.haml +0 -14
  346. data/app/views/droom/people/edit.html.haml +0 -9
  347. data/app/views/droom/people/index.html.haml +0 -8
  348. data/app/views/droom/people/show.html.haml +0 -31
  349. data/app/views/droom/scraps/_heading.html.haml +0 -16
  350. data/app/views/droom/scraps/thumbs/_document.html.haml +0 -9
  351. data/app/views/droom/scraps/thumbs/_event.html.haml +0 -17
  352. data/app/views/droom/scraps/thumbs/_image.html.haml +0 -6
  353. data/app/views/droom/scraps/thumbs/_link.html.haml +0 -10
  354. data/app/views/droom/scraps/thumbs/_quote.html.haml +0 -8
  355. data/app/views/droom/scraps/thumbs/_text.html.haml +0 -8
  356. data/app/views/droom/scraps/thumbs/_video.html.haml +0 -6
  357. data/app/views/droom/users/_extra_columns_header.html.haml +0 -0
  358. data/app/views/droom/users/_extra_columns_note.html.haml +0 -0
  359. data/app/views/droom/users/_form.html.haml +0 -14
  360. data/app/views/droom/users/_password_fields.html.haml +0 -15
  361. data/app/views/droom/users/_user_or_person.html.haml +0 -72
  362. data/app/views/kaminari/_paginator.html.haml +0 -16
  363. data/lib/droom/dav_resource.rb +0 -36
  364. data/lib/droom/model_helpers.rb +0 -25
  365. data/lib/droom/routing.rb +0 -13
  366. data/spec/datasets/calendar_events_dataset.rb +0 -44
  367. data/spec/datasets/calendar_pages_dataset.rb +0 -8
  368. data/spec/datasets/calendar_sites_dataset.rb +0 -6
  369. data/spec/datasets/calendars_dataset.rb +0 -34
  370. data/spec/datasets/documents_dataset.rb +0 -28
  371. data/spec/datasets/recurrence_dataset.rb +0 -7
  372. data/spec/dummy/config/sunspot.yml +0 -17
  373. data/spec/dummy/log/dav.log +0 -1
  374. data/spec/dummy/log/development.log +0 -2
  375. data/spec/dummy/log/test.log +0 -1
  376. data/spec/dummy/solr/conf/admin-extra.html +0 -31
  377. data/spec/dummy/solr/conf/elevate.xml +0 -36
  378. data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt +0 -246
  379. data/spec/dummy/solr/conf/protwords.txt +0 -21
  380. data/spec/dummy/solr/conf/schema.xml +0 -238
  381. data/spec/dummy/solr/conf/scripts.conf +0 -24
  382. data/spec/dummy/solr/conf/solrconfig.xml +0 -934
  383. data/spec/dummy/solr/conf/spellings.txt +0 -2
  384. data/spec/dummy/solr/conf/stopwords.txt +0 -58
  385. data/spec/dummy/solr/conf/synonyms.txt +0 -31
  386. data/spec/dummy/solr/data/development/index/segments.gen +0 -0
  387. data/spec/dummy/solr/data/development/index/segments_1 +0 -0
  388. data/spec/dummy/solr/data/development/spellchecker/segments.gen +0 -0
  389. data/spec/dummy/solr/data/development/spellchecker/segments_1 +0 -0
  390. data/spec/dummy/solr/data/test/index/segments.gen +0 -0
  391. data/spec/dummy/solr/data/test/index/segments_3nu +0 -0
  392. data/spec/dummy/solr/data/test/spellchecker/segments.gen +0 -0
  393. data/spec/dummy/solr/data/test/spellchecker/segments_1 +0 -0
  394. data/spec/factories/recurrence_rules.rb +0 -25
  395. data/spec/models/droom/person_spec.rb +0 -72
  396. data/spec/models/droom/recurrence_rule_spec.rb +0 -81
@@ -8,7 +8,7 @@
8
8
  - else
9
9
  = link_to group.name, path
10
10
  %span.note
11
- = t :group_members, :count => group.people.count
11
+ = t :group_members, :count => group.users.count
12
12
  .excerpt
13
13
  - if hit and (highlights = hit.highlights.select{|hl| hl.field_name != :name}).any?
14
14
  = render :partial => "droom/shared/excerpt", :locals => { :highlights => highlights }
@@ -3,5 +3,5 @@
3
3
  %li.group
4
4
  = link_to group.name, group_url(group)
5
5
  %span.note
6
- = t :group_members, :count => group.people.count
6
+ = t :group_members, :count => group.users.count
7
7
 
@@ -1,29 +1,28 @@
1
1
  - content_for :title do
2
2
  = t :group_admin
3
3
 
4
- #groups.main
5
-
6
- %p.standfirst
4
+ - content_for :standfirst do
5
+ %p
7
6
  = t :directory_introduction
7
+
8
8
 
9
- - if current_user.admin?
10
- %p.action
9
+ - content_for :margin do
10
+ %p.action
11
+ - if can?(:create, Droom::Group)
11
12
  = link_to t(:add_group), droom.new_group_url, :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => "div.groups"}
12
- = link_to t(:add_person), droom.new_person_url, :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => "div.groups"}
13
-
14
- = render :partial => 'groups'
13
+ - if can?(:create, Droom::User)
14
+ = link_to t(:add_person), droom.new_user_url, :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => "div.groups"}
15
15
 
16
- - content_for :margin do
17
16
  #finder
18
- %h3
19
- = t :find_people
20
-
21
- %form.filter{:action => droom.people_url(:format => :js), :data => {:action => "filter"}}
17
+ %form.filter{:action => droom.users_url(:format => :js), :autocomplete => 'off', :data => {:action => "filter"}}
22
18
  %p
23
- = text_field_tag :q, params[:q], :placeholder => t(:by_name_or_email)
19
+ = search_field_tag :q, params[:q], :results => 5, :autosave => 'people_filter'
24
20
 
25
21
  .scroller
26
22
  #found
27
- %p.waiting
28
- = t :loading_people
23
+ %p.note
24
+ Type a fragment of name, email or phone number here to see everyone that matches.
29
25
 
26
+
27
+ #groups
28
+ = render :partial => 'groups'
@@ -1,7 +1,7 @@
1
1
  = form_for [@event, @invitation], :html => { :class => "invitation", :remote => true, :data => {:type => :html}} do |f|
2
2
  %p
3
3
  %input.person_selector.name{:type => "text", :placeholder => t(:type_name), :autocomplete => "off"}
4
- = f.hidden_field :person_id, :class => "person_picker_target"
4
+ = f.hidden_field :user_id, :class => "person_picker_target"
5
5
 
6
6
  .buttons
7
7
  = f.submit t(:invite), :class => "submit"
@@ -1,7 +1,7 @@
1
1
  - invitation ||= @invitation
2
2
 
3
3
  %li.invitation{:class => invitation.status, :id => "invitation_#{invitation.id}"}
4
- = link_to invitation.event.name, droom.event_url(invitation.event)
4
+ = link_to shorten(invitation.event.name, 24, ''), droom.event_url(invitation.event)
5
5
  %span.action
6
6
  - unless invitation.accepted?
7
7
  = link_to t(:accept), accept_event_invitation_url(invitation.event, invitation), :class => 'accept', :data => {:action => "replace", :method => "put", :replaced => "#invitation_#{invitation.id}"}
@@ -1,8 +1,8 @@
1
1
  - invitations ||= false
2
- - if invitations || current_person
3
- - invitations ||= current_person.invitations.future
4
- - if invitations && invitations.any?
2
+ - if invitations || current_user
3
+ - invitations ||= current_user.invitations.future
4
+ - if invitations && invitations.length > 0
5
5
  %h2.section
6
6
  = t :your_invitations
7
7
  %ul.invitations
8
- = render :partial => "droom/invitations/invitation", :collection => current_person.invitations.future
8
+ = render :partial => "droom/invitations/invitation", :collection => current_user.invitations.future
@@ -1,11 +1,11 @@
1
1
  - group ||= @group
2
- - person ||= @person
3
- - member = Droom::Membership.find_by_person_id_and_group_id(person.id, group.id)
2
+ - user ||= @user
3
+ - membership = Droom::Membership.where(:user_id => user.id, :group_id => group.id)
4
4
 
5
5
  .holder
6
- - if member
7
- %a.toggle_active{:href => group_membership_path(group, member), :"data-type" => "html", :"data-remote" => "true", :"data-method" => :delete}
6
+ - if membership
7
+ %a.toggle_active{:href => group_membership_path(group, membership), :"data-type" => "html", :"data-remote" => "true", :"data-method" => :delete}
8
8
  .a_member
9
9
  - else
10
- %a.toggle_active{:href => new_group_membership_path(group, :person_id => person.id), :"data-type" => "html", :"data-remote" => "true"}
10
+ %a.toggle_active{:href => new_group_membership_path(group, :user_id => user.id), :"data-type" => "html", :"data-remote" => "true"}
11
11
  .not_a_member
@@ -1,7 +1,26 @@
1
- = form_for [@group, @membership], :html => {:remote => true, :data => {:type => :html}} do |f|
2
- %input.person_picker{:type => "text", :placeholder => t(:person_name), :autocomplete => "off"}
3
- = f.hidden_field :person_id, :class => "person_picker_target"
4
- = link_to t(:cancel), "/", :class => 'cancel'
5
- %p.formnote
6
- =t :new_membership_instructions, :name => @group.name
7
-
1
+ %p
2
+ %input#new_person{name: "how", type: "radio", value: "new", checked: true, data: {action: 'reveal', affected: '#new_user', converse: '#choose_user'}}
3
+ %label{for: "new_person"}
4
+ Invite a new person
5
+ %input#existing_person{name: "how", type: "radio", value: "existing", data: {action: 'reveal', affected: '#choose_user', converse: '#new_user'}}
6
+ %label{for: "existing_person"}
7
+ Choose someone already here
8
+
9
+ #new_user
10
+ - user = Droom::User.new
11
+ = form_for [@group, @membership], :html => {:class => 'edit user'} do |f|
12
+ = f.fields_for :user, user do |uf|
13
+ = render partial: "droom/users/edit/user_fields", locals: {f: uf, user: user}
14
+ %p.admin
15
+ = uf.check_box :defer_confirmation
16
+ = uf.label :defer_confirmation
17
+ .buttons
18
+ = f.submit t(:invite_to_group)
19
+ = t :or
20
+ = link_to t(:cancel), '#', :class => 'cancel'
21
+
22
+ #choose_user
23
+ %p{style: "margin: 20px"}
24
+ The person-picker will be here shortly.
25
+ You can also add people to groups on the
26
+ = link_to('user admin page', admin_users_url) + '.'
@@ -30,4 +30,4 @@
30
30
  / - if admin?
31
31
  / = link_to t(:edit_person), edit_person_url(person), :class => 'admin edit minimal', :remote => true, :data => {:action => "popup", :type => "html"}
32
32
  - if current_user.admin?
33
- = link_to t(:remove), group_membership_url(@group, Droom::Membership.find_by_group_id_and_person_id(@group.id, person.id)), :method => 'delete', :class => 'admin delete minimal', :remote => 'true', :data => {:confirm => t(:confirm_remove_member, :name => person.name, :group => @group.name)}
33
+ = link_to t(:remove), group_membership_url(@group, Droom::Membership.find_by(group_id: @group.id, person_id: person.id)), :method => 'delete', :class => 'admin delete minimal', :remote => 'true', :data => {:confirm => t(:confirm_remove_member, :name => person.name, :group => @group.name)}
@@ -1,10 +1,10 @@
1
1
  - group ||= @group
2
- - person ||= @person
3
- - membership ||= person.membership_of(group)
2
+ - user ||= @user
3
+ - membership ||= user.membership_of(group)
4
4
 
5
- - linkid = "#{person.id}_#{group.name.parameterize}"
5
+ - linkid = "#{user.id}_#{group.name.parameterize}"
6
6
 
7
7
  - if membership
8
8
  = link_to " ", group_membership_url(group, membership), :id => linkid, :class => "yes", :method => :delete, :data => {:action => "replace", :replaced => "##{linkid}"}
9
9
  - else
10
- = link_to " ", group_memberships_url(group, :membership => {:person_id => person.id}), :id => linkid, :class => "no", :method => :post, :data => {:action => "replace", :replaced => "##{linkid}"}
10
+ = link_to " ", group_memberships_url(group, :membership => {:user_id => user.id}), :id => linkid, :class => "no", :method => :post, :data => {:action => "replace", :replaced => "##{linkid}"}
@@ -0,0 +1,9 @@
1
+ #main.users
2
+
3
+ %p.standfirst
4
+ = t(:users_introduction)
5
+
6
+ = render :partial => "droom/users/users_table"
7
+
8
+ - content_for :title do
9
+ = t :user_admin
@@ -4,6 +4,6 @@
4
4
  %li
5
5
  = link_to t(:edit_organisation), droom.edit_organisation_url(organisation), :class => 'edit', :data => {:action => "popup", :replaced => "#organisation_#{organisation.id}"}
6
6
  %li
7
- = link_to t(:add_person), droom.new_organisation_person_url(organisation), :class => 'add', :data => {:action => "popup", :affected => "#organisation_#{organisation.id}"}
7
+ = link_to t(:add_user), droom.new_organisation_user_url(organisation), :class => 'add', :data => {:action => "popup", :affected => "#organisation_#{organisation.id}"}
8
8
  %li
9
9
  = link_to t(:delete_organisation), droom.organisation_url(organisation), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#organisation_#{organisation.id}", :affected => ".minimonth", :confirm => t(:confirm_delete_organisation, :name => organisation.name)}
@@ -17,6 +17,6 @@
17
17
  %p.note
18
18
  = link_to organisation.url_without_protocol, organisation.url_with_protocol, :class => "external"
19
19
 
20
- - if organisation.people.any?
20
+ - if organisation.users.any?
21
21
  %ul.people
22
- = render :partial => "droom/people/person", :collection => organisation.people.order("name ASC")
22
+ = render :partial => "droom/users/user", :collection => organisation.users.in_name_order
@@ -4,4 +4,4 @@
4
4
  %strong
5
5
  = link_to organisation.name, organisation_url(organisation)
6
6
 
7
- = render :partial => "droom/person/suggested", :collection => organisation.people
7
+ = render :partial => "droom/users/suggested", :collection => organisation.people
@@ -1,20 +1,20 @@
1
- #main.organisations
2
- = render :partial => 'droom/organisations/organisations'
3
-
4
1
  - content_for :title do
5
2
  = t :directory
6
3
 
4
+ - content_for :standfirst do
5
+ = t :organisations_introduction, org_count: @organisations.count, person_count: Droom::User.count
6
+
7
7
  - content_for :margin do
8
8
  #finder
9
- %h3
10
- = t :find_people
11
-
12
- %form.filter{:action => droom.people_url(:format => :js), :data => {:action => "filter"}}
9
+ %form.filter{:action => droom.users_url(:format => :js), :data => {:action => "filter"}}
13
10
  %p
14
- = text_field_tag :q, params[:q], :placeholder => t(:by_name_or_email)
11
+ = search_field_tag :q, params[:q], :results => 5, :autosave => 'person_filter'
15
12
 
16
13
  .scroller
17
14
  #found
18
- %p.waiting
19
- = t :loading_people
20
-
15
+ %p.note
16
+ = t :find_people_notes
17
+
18
+
19
+ #main.organisations
20
+ = render :partial => 'droom/organisations/organisations'
@@ -4,11 +4,11 @@
4
4
  = t :admin
5
5
  %ul
6
6
  %li
7
- = link_to t(:add_event), droom.new_event_url, :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => ".events_list, .minimonth"}
7
+ = link_to t(:add_event), droom.new_event_url, :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => "#events, .minimonth"}
8
8
  %li
9
9
  = link_to t(:add_document), droom.new_document_url, :class => "add", :remote => true, :data => {:action => "popup", :affected => "table.documents"}
10
10
  %li
11
- = link_to t(:add_person), droom.new_person_url, :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => "table.people"}
11
+ = link_to t(:add_person), droom.new_user_url, :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => "table.people"}
12
12
  %li
13
13
  = link_to t(:add_organisation), droom.new_organisation_url, :class => "add", :remote => true, :data => {:action => "popup", :affected => ".organisations_list"}
14
14
 
@@ -0,0 +1,28 @@
1
+ .panel{:data => {:panel => 'configuration'}}
2
+ %p.account_controls
3
+ = t(:signed_in_as, :name => current_user.name).html_safe
4
+ = link_to t(:sign_out), droom.destroy_user_session_url, :method => :delete, :class => 'signout'
5
+
6
+ %p
7
+ = link_to t(:edit_your_profile), droom.edit_user_url(current_user, view: 'profile'), :data => {:action => "popup", :affected => ".people_list"}
8
+ %br
9
+ %span.note
10
+ = t(:edit_your_profile_note)
11
+ %p
12
+ = link_to t(:edit_your_preferences), droom.edit_user_url(current_user, view: 'preferences'), :data => {:action => "popup", :affected => ".people_list"}
13
+ %br
14
+ %span.note
15
+ = t(:edit_your_preferences_note)
16
+
17
+ - if dropbox?
18
+ = form_for [droom, current_user], :format => :js, :html => {:remote => true, :class => "preferences"} do |f|
19
+ = preference_radio_set 'dropbox.strategy', 'everything', 'relevant', 'clicked'
20
+ %p
21
+ = button_to "revoke dropbox access", droom.dropbox_token_url(current_user.dropbox_token), :method => 'delete', :class => "dropbox revoke"
22
+
23
+ - else
24
+ %p
25
+ = link_to "Connect to your dropbox", droom.new_dropbox_token_url, :class => "dropbox"
26
+ %br
27
+ %span.note
28
+ = t :dropbox_introduction, :name => Droom.dropbox_app_name
@@ -4,16 +4,14 @@
4
4
  %p
5
5
  = t :device_instructions
6
6
  %ul
7
- - if current_user.person
7
+ - if current_user
8
8
  %li
9
9
  = link_to t(:subscribe_to_calendar), droom.feed_events_url(:auth_token => current_user.authentication_token, :protocol => "webcals", :format => :ics)
10
10
  %li
11
- = link_to t(:download_contacts), droom.people_url(:format => :vcf)
11
+ = link_to t(:download_contacts), droom.users_url(:format => :vcf)
12
12
  %li
13
13
  = link_to t(:follow_stream), droom.feed_scraps_url(:format => :rss, :auth_token => current_user.authentication_token)
14
14
  %li
15
15
  = link_to t(:setup_dropbox), '#'
16
- %li
17
- = link_to t(:setup_dav), '#'
18
16
  %p.note
19
17
  These links are all personal to you and include an automatic login. Keep them secret.
@@ -0,0 +1,9 @@
1
+ .panel{:data => {:panel => 'search'}}
2
+
3
+ %form#suggestions{:action => droom.suggestions_url}
4
+ %p
5
+ %label{:for => 'term'}
6
+ = t :quick_search
7
+ = text_field_tag :term, params[:term], :placeholder => t(:quick_search_prompt), :autocomplete => "off", :autofocus => true
8
+
9
+ #suggestion_box
@@ -0,0 +1,10 @@
1
+ - permission ||= @permission
2
+
3
+ - if can?(:edit, permission)
4
+ .menu{:data => {:for => "permission_#{permission.id}"}}
5
+ %ul.actions
6
+ %li
7
+ = link_to t(:edit_permission), droom.edit_service_permission_url(permission.service, permission), :class => 'edit', :data => {:action => "popup", :affected => "#services"}
8
+ %li
9
+ = link_to t(:delete_permission), droom.service_permission_url(permission.service, permission), :method => 'delete', :class => 'delete', :data => {:action => "remove_all", :removed => ".p_#{permission.id}", :affected => "#services", :confirm => t(:confirm_delete_permission, :name => permission.name, :service_name => permission.service.name)}
10
+
@@ -0,0 +1,3 @@
1
+ %p.notification
2
+ = @permission.name
3
+ = t :created
@@ -0,0 +1,17 @@
1
+ = form_for [@service, @permission], :html => { :multipart => true, :class => 'edit permission', :remote => true, :data => {:type => :html}} do |f|
2
+
3
+ %p.name
4
+ = f.text_field :name, :class => 'name', :placeholder => t("helpers.label.service.name"), :autofocus => true
5
+
6
+ %p.description
7
+ = f.text_area :description, :class => 'description', :placeholder => t("helpers.label.service.description")
8
+
9
+ %p.service
10
+ = f.label :service_id
11
+ %br
12
+ = f.select :service_id, Droom::Service.for_selection
13
+
14
+ .buttons
15
+ = f.submit t(:save_permission)
16
+ = t :or
17
+ = link_to t(:cancel), "/", :class => 'cancel'
@@ -0,0 +1,7 @@
1
+ #permission
2
+ .header
3
+ = link_to "X", '#', :class => "closer", :data => {:action => "close"}
4
+ %h2
5
+ = t :edit_permission
6
+
7
+ = render :partial => 'form'
@@ -0,0 +1,8 @@
1
+ #permission
2
+ .header
3
+ = link_to "X", '#', :class => "closer", :data => {:action => "close"}
4
+ %h2
5
+ = t :add_permission_to
6
+ = @service.name
7
+
8
+ = render :partial => 'form'
@@ -0,0 +1,4 @@
1
+ %p.title
2
+ = @permission.name
3
+ %p.description
4
+ = @permission.description
@@ -1,7 +1,9 @@
1
+ - child_index ||= 0
2
+
1
3
  = fields_for current_user do |f|
2
4
  - pref = current_user.preference(key)
3
- = f.fields_for :preferences, pref, :child_index => pref.uuid do |pf|
5
+ = f.fields_for :preferences, pref, :child_index => child_index do |pf|
4
6
  = pf.hidden_field :key
5
7
  = pf.hidden_field :uuid
6
- = pf.check_box :value
8
+ = pf.check_box :value, class: "preference_#{key.gsub('.', '_')}"
7
9
  = pf.label :value, t(:"preferences.#{key}")
@@ -3,7 +3,5 @@
3
3
  .caption
4
4
  %p.scrapnote
5
5
  = scrap.note
6
-
7
- %p
8
6
  = render "droom/scraps/credit", :scrap => scrap
9
7
 
@@ -3,7 +3,7 @@
3
3
  %span.credit
4
4
  - if scrap.created_by
5
5
  = t :posted_by
6
- = scrap.created_by.name
6
+ = scrap.created_by.informal_name
7
7
  - else
8
8
  = t :posted
9
9
  = time_ago_in_words scrap.created_at
@@ -1,77 +1,76 @@
1
1
  = form_for @scrap, :html => {:class => 'edit scrap'} do |f|
2
- .header
3
- = link_to "X", '#', :class => "closer", :data => {:action => "close"}
4
- %ul.scraptypes
5
- - Droom.scrap_types.each do |type|
6
- - cssclass = @scrap.scraptype == type ? "#{type} here" : type
7
- %li{:data => {:action => 'tab', :selector => ".#{type}"}}
8
- = f.radio_button :scraptype, type
9
- = f.label :"scraptype_#{type}", type, :class => cssclass
10
2
 
11
- %div{:class => "fields #{@scrap.scraptype}"}
12
- .upload
13
- - @scrap.build_image_upload unless @scrap.image_upload
14
- = f.fields_for :image_upload do |iuf|
15
- .uploadbox{:data => {:action => "upload", :url => cropper.uploads_path(:format => :js, :for => "scrap"), :scale => 2}}
16
- = iuf.file_field :file, :class => 'file_upload', :accept => "image"
17
- .img
18
- - if @scrap.image?
19
- .existing
20
- = link_to image_tag(@scrap.image.url(:cropped)), cropper.edit_upload_url(@scrap.image_upload, :for => "scrap", :offset_t => @scrap.image_offset_top, :offset_l => @scrap.image_offset_left, :scale_w => @scrap.image_scale_width, :scale_h => @scrap.image_scale_height), :data => {:action => "recrop"}, :title => "Click to adjust crop"
21
- = link_to t(:detach_upload), '#', :class => 'detach'
22
- .prompt
23
- = link_to t(:click_to_upload), cropper.new_upload_url, :class => 'picker'
24
- .droppable
25
- .note
26
- = t :drop_to_upload
3
+ %ul.scraptypes
4
+ - Droom.scrap_types.each do |type|
5
+ - cssclass = @scrap.scraptype == type ? "#{type} here" : type
6
+ %li{:data => {:action => 'tab', :selector => ".#{type}"}}
7
+ = f.radio_button :scraptype, type
8
+ = f.label :"scraptype_#{type}", type, :class => cssclass
9
+
10
+ .specifics.image
11
+ - if @scrap.image?
12
+ - img = @scrap.image.url(:thumb)
13
+ - else
14
+ - img = image_url('droom/missing/scrap.png')
15
+ .image-upload{:data => {:role => "imagepicker"}}
16
+ %a.box{:href => "#", :style => "background-image: url(#{img})", :data => {:action => "pick"}}
17
+ = f.file_field :image
27
18
 
28
- .scrapvideo
29
- .icon
30
- .summary
31
- %p.name
32
- %input.name{ :type => "text", :placeholder => "Search Youtube", :value => @scrap.body }
33
- .thumb
19
+ .specifics.video
20
+ - if @scrap.image?
21
+ - img = @scrap.image.url(:thumb)
22
+ - else
23
+ - img = image_url('droom/missing/scrap.png')
24
+ .youtube-search
25
+ .thumbnail.playable{:style => "background-image: url(#{img})"}
26
+ = f.text_field :youtube_id, :placeholder => t(:search_youtube), :data => {:role => "youtubepicker"}
34
27
 
35
- .body
36
- %p
37
- = f.text_area :body, :placeholder => "Body text", :class => 'body', :data => {:action => "fit"}
28
+ .specifics.event
29
+ - event = @scrap.event ||= @scrap.build_event(:start => Time.now.floor(30.minutes))
30
+ = f.fields_for :event, event do |ef|
31
+ = ef.hidden_field :calendar_id, :value => Droom::Calendar.stream_calendar
32
+ .datemark{data: {role: "datepicker"}}
33
+ %a{:href => "#"}
34
+ %span.mon= event.start.strftime('%b')
35
+ %span.dom= event.start.strftime('%d')
36
+ %span.year= event.start.strftime('%Y')
37
+ = ef.hidden_field :start, value: event.start.strftime('%Y-%b-%d')
38
38
 
39
- .scrapevent
40
- - event = @scrap.event ||= @scrap.build_event(:start => Time.now.floor(30.minutes))
41
- = f.fields_for :event, event do |ef|
42
- = ef.hidden_field :calendar_id, :value => Droom::Calendar.find_or_create_by_name("stream").id
43
- .datemark.datepicker
44
- %a{:href => "#"}
45
- %span.mon= event.start.strftime('%b')
46
- %span.dom= event.start.strftime('%d')
47
- %span.year= event.start.strftime('%Y')
48
- = ef.hidden_field :start_date
49
- .kal
39
+ .specifics.document
40
+ - document = @scrap.document ||= @scrap.build_document()
41
+ = f.fields_for :document, document do |df|
42
+ = df.hidden_field :folder_id, :value => Droom::Folder.where(slug: "Stream").first_or_create.id
43
+ .filemark.filepicker{:data => {:role => "filepicker"}}
44
+ = link_to "choose file", "#", :class => "ul minimal #{document.file_extension}", :data => {:action => "pick"}
45
+ = df.file_field :file, :class => "file"
46
+ %p.tip
47
+ = t :click_to_choose_file
50
48
 
51
- .summary
52
- %p.name
53
- = ef.text_field :name, :class => 'name', :placeholder => t(:event_name)
54
- %p.url
55
- = ef.text_field :url, :class => 'url', :placeholder => t(:event_url)
49
+ .non-image-data
50
+ %p.name
51
+ = f.label :name
52
+ %br
53
+ = f.text_field :name, :class => 'name'
56
54
 
57
- .scrapdocument
58
- - document = @scrap.document ||= @scrap.build_document()
59
- = f.fields_for :document, document do |df|
60
- = df.hidden_field :folder_id, :value => Droom::Folder.find_or_create_by_slug("Stream").id
61
- .filemark.filepicker{ :data => { :form => "form.scrap", :affected => "#scraps", :popup => ".popup" } }
62
- = link_to "choose file", "#", :class => "ul minimal #{document.file_extension}"
63
- = df.file_field :file, :class => "file"
64
- %p.tip
65
- = t :click_to_choose_file
66
- .summary
67
- %p.name
68
- = df.text_field :name, :class => 'name', :placeholder => t(:"activerecord.attributes.droom.document.name")
55
+ %p.url
56
+ = f.label :url
57
+ %br
58
+ = f.url_field :url, :class => 'url'
59
+
60
+ %p.body
61
+ = f.label :body
62
+ %br
63
+ = f.text_area :body, :class => 'body'
64
+
65
+ %div.youtube_preview
66
+
67
+ %p.caption
68
+ = f.label :caption
69
+ %br
70
+ = f.text_area :note, :class => 'note'
69
71
 
70
- .caption
71
- %p
72
- = f.text_area :note, :placeholder => "Caption", :class => 'note'
73
-
74
- .buttons
75
- = f.submit t(:save)
76
- = t :or
77
- = link_to t(:cancel), "/", :class => 'cancel'
72
+ .buttons
73
+ = f.submit t(:save)
74
+ = t :or
75
+ = link_to t(:cancel), "/", :class => 'cancel'
76
+