refinerycms 0.9.5.13 → 0.9.5.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (294) hide show
  1. data/Rakefile +6 -1
  2. data/app/controllers/admin/base_controller.rb +2 -2
  3. data/app/controllers/application.rb +1 -1
  4. data/app/controllers/application_controller.rb +2 -2
  5. data/app/helpers/application_helper.rb +2 -2
  6. data/config/environment.rb +6 -6
  7. data/config/environments/development.rb +1 -1
  8. data/config/initializers/inflections.rb +1 -1
  9. data/config/preinitializer.rb +3 -3
  10. data/config/routes.rb +5 -5
  11. data/db/migrate/20091109012126_add_missing_indexes.rb +4 -4
  12. data/db/schema.rb +1 -2
  13. data/db/seeds.rb +35 -35
  14. data/lib/refinery_initializer.rb +2 -2
  15. data/public/404.html +15 -15
  16. data/public/422.html +8 -8
  17. data/public/500.html +8 -8
  18. data/public/images/refinery/logo-large.png +0 -0
  19. data/public/images/refinery/logo-medium.png +0 -0
  20. data/public/images/refinery/logo-small-medium.png +0 -0
  21. data/public/images/refinery/logo-small.png +0 -0
  22. data/public/images/refinery/resolve_digital_footer_logo.png +0 -0
  23. data/public/javascripts/builder.js +97 -97
  24. data/public/javascripts/controls.js +655 -655
  25. data/public/javascripts/dragdrop.js +936 -936
  26. data/public/javascripts/effects.js +713 -713
  27. data/public/javascripts/jquery/GPL-LICENSE.txt +96 -96
  28. data/public/javascripts/jquery/jquery.js +168 -168
  29. data/public/javascripts/lightbox.js +397 -397
  30. data/public/javascripts/livepipe.js +146 -146
  31. data/public/javascripts/prototype.js +2996 -2996
  32. data/public/javascripts/refinery/admin.js +20 -20
  33. data/public/javascripts/refinery/boot_wym.js +110 -110
  34. data/public/javascripts/refinery/dialog.js +1 -1
  35. data/public/javascripts/refinery/parse_url.js +27 -27
  36. data/public/javascripts/refinery/prototype.enhancements.js +17 -17
  37. data/public/javascripts/refinery/tooltips.js +34 -34
  38. data/public/javascripts/scriptaculous.js +22 -22
  39. data/public/javascripts/slider.js +239 -239
  40. data/public/javascripts/tabs.js +130 -130
  41. data/public/javascripts/thickbox.js +23 -23
  42. data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js +23 -23
  43. data/public/javascripts/wymeditor/lang/ca.js +42 -42
  44. data/public/javascripts/wymeditor/lang/cs.js +42 -42
  45. data/public/javascripts/wymeditor/lang/de.js +42 -42
  46. data/public/javascripts/wymeditor/lang/en.js +44 -44
  47. data/public/javascripts/wymeditor/lang/es.js +42 -42
  48. data/public/javascripts/wymeditor/lang/fa.js +42 -42
  49. data/public/javascripts/wymeditor/lang/fr.js +42 -42
  50. data/public/javascripts/wymeditor/lang/he.js +42 -42
  51. data/public/javascripts/wymeditor/lang/hu.js +42 -42
  52. data/public/javascripts/wymeditor/lang/it.js +42 -42
  53. data/public/javascripts/wymeditor/lang/nb.js +42 -42
  54. data/public/javascripts/wymeditor/lang/nl.js +42 -42
  55. data/public/javascripts/wymeditor/lang/nn.js +42 -42
  56. data/public/javascripts/wymeditor/lang/pl.js +42 -42
  57. data/public/javascripts/wymeditor/lang/pt-br.js +42 -42
  58. data/public/javascripts/wymeditor/lang/pt.js +42 -42
  59. data/public/javascripts/wymeditor/lang/ru.js +42 -42
  60. data/public/javascripts/wymeditor/lang/sv.js +42 -42
  61. data/public/javascripts/wymeditor/lang/tr.js +42 -42
  62. data/public/javascripts/wymeditor/lang/zh_cn.js +44 -44
  63. data/public/javascripts/wymeditor/skins/refinery/skin.js +31 -31
  64. data/public/stylesheets/application.css +3 -3
  65. data/public/stylesheets/formatting.css +3 -3
  66. data/public/stylesheets/home.css +2 -2
  67. data/public/stylesheets/lightbox.css +1 -1
  68. data/public/stylesheets/refinery/application.css +13 -13
  69. data/public/stylesheets/refinery/formatting.css +3 -3
  70. data/public/stylesheets/refinery/refinery.css +49 -44
  71. data/public/stylesheets/refinery/theme.css +1 -1
  72. data/public/stylesheets/refinery/thickbox.css +4 -4
  73. data/public/stylesheets/wymeditor/skins/refinery/skin.css +115 -115
  74. data/public/stylesheets/wymeditor/skins/refinery/wymiframe.css +66 -66
  75. data/public/wymeditor/GPL-license.txt +96 -96
  76. data/script/performance/benchmarker +3 -0
  77. data/vendor/plugins/acts_as_indexed/lib/acts_as_indexed.rb +12 -12
  78. data/vendor/plugins/acts_as_indexed/lib/search_atom.rb +7 -7
  79. data/vendor/plugins/acts_as_indexed/lib/search_index.rb +7 -7
  80. data/vendor/plugins/acts_as_indexed/lib/will_paginate_search.rb +1 -1
  81. data/vendor/plugins/acts_as_indexed/test/abstract_unit.rb +5 -5
  82. data/vendor/plugins/acts_as_indexed/test/acts_as_indexed_test.rb +2 -2
  83. data/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb +140 -140
  84. data/vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb +18 -18
  85. data/vendor/plugins/attachment_fu/install.rb +1 -1
  86. data/vendor/plugins/attachment_fu/lib/geometry.rb +2 -2
  87. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/cloud_file_backend.rb +3 -3
  88. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb +4 -4
  89. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb +11 -11
  90. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb +7 -7
  91. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/core_image_processor.rb +5 -5
  92. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/gd2_processor.rb +4 -4
  93. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/image_science_processor.rb +1 -1
  94. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb +11 -11
  95. data/vendor/plugins/attachment_fu/test/backends/db_file_test.rb +2 -2
  96. data/vendor/plugins/attachment_fu/test/backends/file_system_test.rb +24 -24
  97. data/vendor/plugins/attachment_fu/test/backends/remote/cloudfiles_test.rb +14 -14
  98. data/vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb +7 -7
  99. data/vendor/plugins/attachment_fu/test/base_attachment_tests.rb +10 -10
  100. data/vendor/plugins/attachment_fu/test/basic_test.rb +10 -10
  101. data/vendor/plugins/attachment_fu/test/extra_attachment_test.rb +9 -9
  102. data/vendor/plugins/attachment_fu/test/fixtures/attachment.rb +10 -10
  103. data/vendor/plugins/attachment_fu/test/geometry_test.rb +12 -12
  104. data/vendor/plugins/attachment_fu/test/processors/core_image_test.rb +6 -6
  105. data/vendor/plugins/attachment_fu/test/processors/gd2_test.rb +4 -4
  106. data/vendor/plugins/attachment_fu/test/processors/image_science_test.rb +4 -4
  107. data/vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb +13 -13
  108. data/vendor/plugins/attachment_fu/test/processors/rmagick_test.rb +33 -33
  109. data/vendor/plugins/attachment_fu/test/schema.rb +14 -14
  110. data/vendor/plugins/attachment_fu/test/test_helper.rb +11 -11
  111. data/vendor/plugins/attachment_fu/test/validation_test.rb +7 -7
  112. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/color.rb +7 -7
  113. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/effects.rb +7 -7
  114. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/perspective.rb +5 -5
  115. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/quality.rb +7 -7
  116. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/scale.rb +5 -5
  117. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/watermark.rb +6 -6
  118. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/processor.rb +16 -16
  119. data/vendor/plugins/authentication/app/controllers/admin/users_controller.rb +30 -30
  120. data/vendor/plugins/authentication/app/controllers/sessions_controller.rb +4 -4
  121. data/vendor/plugins/authentication/app/controllers/users_controller.rb +7 -7
  122. data/vendor/plugins/authentication/app/helpers/sessions_helper.rb +1 -1
  123. data/vendor/plugins/authentication/app/helpers/users_helper.rb +1 -1
  124. data/vendor/plugins/authentication/app/models/user.rb +56 -56
  125. data/vendor/plugins/authentication/app/models/user_mailer.rb +6 -6
  126. data/vendor/plugins/authentication/app/models/user_observer.rb +2 -2
  127. data/vendor/plugins/authentication/app/models/user_plugin.rb +4 -4
  128. data/vendor/plugins/authentication/app/views/admin/users/_form.html.erb +36 -36
  129. data/vendor/plugins/authentication/app/views/admin/users/edit.html.erb +1 -1
  130. data/vendor/plugins/authentication/app/views/admin/users/index.html.erb +1 -1
  131. data/vendor/plugins/authentication/app/views/admin/users/new.html.erb +1 -1
  132. data/vendor/plugins/authentication/app/views/sessions/new.html.erb +19 -19
  133. data/vendor/plugins/authentication/app/views/user_mailer/activation.html.erb +1 -1
  134. data/vendor/plugins/authentication/app/views/user_mailer/signup_notification.html.erb +1 -1
  135. data/vendor/plugins/authentication/app/views/users/new.html.erb +3 -3
  136. data/vendor/plugins/authentication/config/routes.rb +1 -1
  137. data/vendor/plugins/authentication/init.rb +5 -5
  138. data/vendor/plugins/authentication/lib/authenticated_system.rb +1 -1
  139. data/vendor/plugins/authentication/test/functional/sessions_controller_test.rb +2 -2
  140. data/vendor/plugins/authentication/test/functional/users_controller_test.rb +3 -3
  141. data/vendor/plugins/authentication/test/test_helper.rb +1 -1
  142. data/vendor/plugins/dashboard/app/controllers/admin/dashboard_controller.rb +1 -1
  143. data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb +1 -1
  144. data/vendor/plugins/dashboard/app/views/admin/dashboard/_recent_activity.html.erb +10 -10
  145. data/vendor/plugins/dashboard/app/views/admin/dashboard/index.html.erb +30 -30
  146. data/vendor/plugins/dashboard/config/routes.rb +2 -2
  147. data/vendor/plugins/dashboard/init.rb +6 -6
  148. data/vendor/plugins/images/app/controllers/admin/images_controller.rb +28 -28
  149. data/vendor/plugins/images/app/helpers/admin/images_helper.rb +14 -14
  150. data/vendor/plugins/images/app/models/image.rb +11 -11
  151. data/vendor/plugins/images/app/views/admin/images/_form.html.erb +21 -21
  152. data/vendor/plugins/images/app/views/admin/images/_grid_view.html.erb +13 -13
  153. data/vendor/plugins/images/app/views/admin/images/_list_view.html.erb +1 -1
  154. data/vendor/plugins/images/app/views/admin/images/_list_view_image.html.erb +2 -2
  155. data/vendor/plugins/images/app/views/admin/images/edit.html.erb +1 -1
  156. data/vendor/plugins/images/app/views/admin/images/index.html.erb +15 -15
  157. data/vendor/plugins/images/app/views/admin/images/insert.html.erb +91 -91
  158. data/vendor/plugins/images/app/views/admin/images/new.html.erb +1 -1
  159. data/vendor/plugins/images/config/routes.rb +2 -2
  160. data/vendor/plugins/images/init.rb +7 -7
  161. data/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb +4 -4
  162. data/vendor/plugins/inquiries/app/controllers/admin/inquiry_settings_controller.rb +5 -5
  163. data/vendor/plugins/inquiries/app/controllers/inquiries_controller.rb +3 -3
  164. data/vendor/plugins/inquiries/app/helpers/inquiries_helper.rb +3 -3
  165. data/vendor/plugins/inquiries/app/models/inquiry.rb +6 -6
  166. data/vendor/plugins/inquiries/app/models/inquiry_mailer.rb +1 -1
  167. data/vendor/plugins/inquiries/app/models/inquiry_setting.rb +3 -3
  168. data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb +19 -19
  169. data/vendor/plugins/inquiries/app/views/admin/inquiries/index.html.erb +27 -27
  170. data/vendor/plugins/inquiries/app/views/admin/inquiries/show.html.erb +59 -59
  171. data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/_confirmation_email_form.html.erb +44 -44
  172. data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/_notification_recipients_form.html.erb +15 -15
  173. data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/edit.html.erb +3 -3
  174. data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/index.html.erb +29 -29
  175. data/vendor/plugins/inquiries/app/views/inquiries/new.html.erb +32 -32
  176. data/vendor/plugins/inquiries/app/views/inquiries/thank_you.html.erb +8 -8
  177. data/vendor/plugins/inquiries/app/views/inquiry_mailer/confirmation.html.erb +1 -1
  178. data/vendor/plugins/inquiries/app/views/inquiry_mailer/notification.html.erb +1 -1
  179. data/vendor/plugins/inquiries/config/routes.rb +3 -3
  180. data/vendor/plugins/inquiries/init.rb +10 -10
  181. data/vendor/plugins/news/app/controllers/admin/news_items_controller.rb +3 -3
  182. data/vendor/plugins/news/app/controllers/news_items_controller.rb +2 -2
  183. data/vendor/plugins/news/app/models/news_item.rb +5 -5
  184. data/vendor/plugins/news/app/views/admin/news_items/_form.html.erb +16 -16
  185. data/vendor/plugins/news/app/views/admin/news_items/_news_item.html.erb +14 -14
  186. data/vendor/plugins/news/app/views/admin/news_items/edit.html.erb +1 -1
  187. data/vendor/plugins/news/app/views/admin/news_items/index.html.erb +25 -25
  188. data/vendor/plugins/news/app/views/admin/news_items/new.html.erb +1 -1
  189. data/vendor/plugins/news/app/views/news_items/_recent_posts.html.erb +6 -6
  190. data/vendor/plugins/news/app/views/news_items/index.html.erb +20 -20
  191. data/vendor/plugins/news/app/views/news_items/show.html.erb +16 -16
  192. data/vendor/plugins/news/config/routes.rb +3 -3
  193. data/vendor/plugins/news/init.rb +7 -7
  194. data/vendor/plugins/pages/app/controllers/admin/page_dialogs_controller.rb +10 -10
  195. data/vendor/plugins/pages/app/controllers/admin/page_parts_controller.rb +4 -4
  196. data/vendor/plugins/pages/app/controllers/admin/pages_controller.rb +4 -4
  197. data/vendor/plugins/pages/app/controllers/pages_controller.rb +3 -3
  198. data/vendor/plugins/pages/app/helpers/pages_helper.rb +1 -1
  199. data/vendor/plugins/pages/app/models/page.rb +95 -95
  200. data/vendor/plugins/pages/app/models/page_part.rb +5 -5
  201. data/vendor/plugins/pages/app/views/admin/page_dialogs/_page_link.html.erb +1 -1
  202. data/vendor/plugins/pages/app/views/admin/page_dialogs/link_to.html.erb +222 -222
  203. data/vendor/plugins/pages/app/views/admin/pages/_form.html.erb +232 -232
  204. data/vendor/plugins/pages/app/views/admin/pages/_list.html.erb +26 -26
  205. data/vendor/plugins/pages/app/views/admin/pages/_page_part_field.html.erb +3 -3
  206. data/vendor/plugins/pages/app/views/admin/pages/_sortable_list.html.erb +2 -2
  207. data/vendor/plugins/pages/app/views/admin/pages/edit.html.erb +1 -1
  208. data/vendor/plugins/pages/app/views/admin/pages/index.html.erb +37 -37
  209. data/vendor/plugins/pages/app/views/admin/pages/new.html.erb +1 -1
  210. data/vendor/plugins/pages/app/views/pages/home.html.erb +8 -8
  211. data/vendor/plugins/pages/app/views/pages/show.html.erb +11 -11
  212. data/vendor/plugins/pages/config/routes.rb +5 -5
  213. data/vendor/plugins/pages/init.rb +7 -7
  214. data/vendor/plugins/refinery/app/controllers/admin/refinery_core_controller.rb +7 -7
  215. data/vendor/plugins/refinery/app/views/admin/_head.html.erb +30 -30
  216. data/vendor/plugins/refinery/app/views/admin/_menu.html.erb +61 -61
  217. data/vendor/plugins/refinery/app/views/layouts/admin.html.erb +32 -32
  218. data/vendor/plugins/refinery/app/views/layouts/application.html.erb +28 -28
  219. data/vendor/plugins/refinery/app/views/shared/_footer.html.erb +4 -4
  220. data/vendor/plugins/refinery/app/views/shared/_google_analytics.html.erb +11 -11
  221. data/vendor/plugins/refinery/app/views/shared/_header.html.erb +3 -3
  222. data/vendor/plugins/refinery/app/views/shared/_ie6check.html.erb +1 -1
  223. data/vendor/plugins/refinery/app/views/shared/_menu.html.erb +14 -14
  224. data/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb +21 -21
  225. data/vendor/plugins/refinery/app/views/shared/_message.html.erb +8 -8
  226. data/vendor/plugins/refinery/app/views/shared/_submenu.html.erb +2 -2
  227. data/vendor/plugins/refinery/app/views/shared/_submenu_branch.html.erb +7 -7
  228. data/vendor/plugins/refinery/app/views/shared/admin/_continue_editing.html.erb +41 -41
  229. data/vendor/plugins/refinery/app/views/shared/admin/_error_messages_for.html.erb +1 -1
  230. data/vendor/plugins/refinery/app/views/shared/admin/_form_actions.html.erb +13 -13
  231. data/vendor/plugins/refinery/app/views/shared/admin/_image_picker.html.erb +31 -31
  232. data/vendor/plugins/refinery/app/views/shared/admin/_make_sortable.html.erb +65 -65
  233. data/vendor/plugins/refinery/app/views/shared/admin/_resource_picker.html.erb +16 -16
  234. data/vendor/plugins/refinery/app/views/shared/admin/_search.html.erb +5 -5
  235. data/vendor/plugins/refinery/app/views/shared/admin/_sortable_list.html.erb +8 -8
  236. data/vendor/plugins/refinery/app/views/welcome.html.erb +1 -1
  237. data/vendor/plugins/refinery/app/views/wymiframe.html.erb +6 -6
  238. data/vendor/plugins/refinery/config/routes.rb +5 -5
  239. data/vendor/plugins/refinery/init.rb +8 -8
  240. data/vendor/plugins/refinery/lib/crud.rb +17 -17
  241. data/vendor/plugins/refinery/lib/generators/refinery/install.rb +1 -1
  242. data/vendor/plugins/refinery/lib/generators/refinery/refinery_generator.rb +17 -17
  243. data/vendor/plugins/refinery/lib/generators/refinery/templates/config/routes.rb +3 -3
  244. data/vendor/plugins/refinery/lib/generators/refinery/templates/controller.rb +2 -2
  245. data/vendor/plugins/refinery/lib/generators/refinery/templates/init.rb +6 -6
  246. data/vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb +22 -22
  247. data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb +4 -4
  248. data/vendor/plugins/refinery/lib/generators/refinery/templates/public_controller.rb +10 -10
  249. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb +3 -3
  250. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_singular_name.html.erb +15 -15
  251. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_sortable_list.html.erb +1 -1
  252. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/edit.html.erb +1 -1
  253. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/index.html.erb +33 -33
  254. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/new.html.erb +1 -1
  255. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/index.html.erb +14 -14
  256. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/show.html.erb +21 -21
  257. data/vendor/plugins/refinery/lib/indexer.rb +29 -29
  258. data/vendor/plugins/refinery/lib/refinery.rb +10 -10
  259. data/vendor/plugins/refinery/lib/refinery/activity.rb +5 -5
  260. data/vendor/plugins/refinery/lib/refinery/admin_base_controller.rb +15 -15
  261. data/vendor/plugins/refinery/lib/refinery/application_controller.rb +39 -39
  262. data/vendor/plugins/refinery/lib/refinery/application_helper.rb +69 -69
  263. data/vendor/plugins/refinery/lib/refinery/form_helpers.rb +18 -18
  264. data/vendor/plugins/refinery/lib/refinery/html_truncation_helper.rb +5 -5
  265. data/vendor/plugins/refinery/lib/refinery/initializer.rb +2 -2
  266. data/vendor/plugins/refinery/lib/refinery/link_renderer.rb +13 -13
  267. data/vendor/plugins/refinery/lib/refinery/plugin.rb +24 -24
  268. data/vendor/plugins/refinery/lib/refinery/plugins.rb +2 -2
  269. data/vendor/plugins/refinery_dialogs/app/controllers/admin/dialogs_controller.rb +8 -8
  270. data/vendor/plugins/refinery_dialogs/app/views/admin/dialogs/show.html.erb +19 -19
  271. data/vendor/plugins/refinery_dialogs/app/views/layouts/admin_dialog.html.erb +29 -29
  272. data/vendor/plugins/refinery_dialogs/config/routes.rb +2 -2
  273. data/vendor/plugins/refinery_dialogs/init.rb +7 -7
  274. data/vendor/plugins/refinery_settings/app/controllers/admin/refinery_settings_controller.rb +2 -2
  275. data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb +52 -52
  276. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_form.html.erb +11 -11
  277. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_make_sortable.html.erb +3 -3
  278. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_refinery_setting.html.erb +12 -12
  279. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/edit.html.erb +2 -2
  280. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/index.html.erb +19 -19
  281. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/new.html.erb +1 -1
  282. data/vendor/plugins/refinery_settings/config/routes.rb +3 -3
  283. data/vendor/plugins/refinery_settings/init.rb +8 -8
  284. data/vendor/plugins/resources/app/controllers/admin/resources_controller.rb +48 -48
  285. data/vendor/plugins/resources/app/models/resource.rb +12 -12
  286. data/vendor/plugins/resources/app/views/admin/resources/_form.html.erb +21 -21
  287. data/vendor/plugins/resources/app/views/admin/resources/_resource.html.erb +15 -15
  288. data/vendor/plugins/resources/app/views/admin/resources/edit.html.erb +1 -1
  289. data/vendor/plugins/resources/app/views/admin/resources/index.html.erb +19 -19
  290. data/vendor/plugins/resources/app/views/admin/resources/insert.html.erb +86 -86
  291. data/vendor/plugins/resources/app/views/admin/resources/new.html.erb +1 -1
  292. data/vendor/plugins/resources/config/routes.rb +2 -2
  293. data/vendor/plugins/resources/init.rb +6 -6
  294. metadata +31 -23
@@ -14,7 +14,7 @@ ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
14
14
  db_adapter = ENV['DB']
15
15
 
16
16
  # no db passed, try one of these fine config-free DBs before bombing.
17
- db_adapter ||=
17
+ db_adapter ||=
18
18
  begin
19
19
  require 'rubygems'
20
20
  require 'sqlite'
@@ -53,7 +53,7 @@ class Test::Unit::TestCase #:nodoc:
53
53
  DbFile.transaction { [Attachment, FileAttachment, OrphanAttachment, MinimalAttachment, DbFile].each { |klass| klass.delete_all } }
54
54
  attachment_model self.class.attachment_model
55
55
  end
56
-
56
+
57
57
  def teardown
58
58
  FileUtils.rm_rf File.join(File.dirname(__FILE__), 'files')
59
59
  end
@@ -62,7 +62,7 @@ class Test::Unit::TestCase #:nodoc:
62
62
  self.use_instantiated_fixtures = false
63
63
 
64
64
  def self.attachment_model(klass = nil)
65
- @attachment_model = klass if klass
65
+ @attachment_model = klass if klass
66
66
  @attachment_model
67
67
  end
68
68
 
@@ -94,7 +94,7 @@ class Test::Unit::TestCase #:nodoc:
94
94
  return att
95
95
  end
96
96
  end
97
-
97
+
98
98
  def use_temp_file(fixture_filename)
99
99
  temp_path = File.join('/tmp', File.basename(fixture_filename))
100
100
  FileUtils.mkdir_p File.join(fixture_path, 'tmp')
@@ -115,11 +115,11 @@ class Test::Unit::TestCase #:nodoc:
115
115
  end
116
116
  end
117
117
  end
118
-
118
+
119
119
  def assert_not_created
120
120
  assert_created(0) { yield }
121
121
  end
122
-
122
+
123
123
  def should_reject_by_size_with(klass)
124
124
  attachment_model klass
125
125
  assert_not_created do
@@ -129,22 +129,22 @@ class Test::Unit::TestCase #:nodoc:
129
129
  assert_nil attachment.db_file if attachment.respond_to?(:db_file)
130
130
  end
131
131
  end
132
-
132
+
133
133
  def assert_difference(object, method = nil, difference = 1)
134
134
  initial_value = object.send(method)
135
135
  yield
136
136
  assert_equal initial_value + difference, object.send(method)
137
137
  end
138
-
138
+
139
139
  def assert_no_difference(object, method, &block)
140
140
  assert_difference object, method, 0, &block
141
141
  end
142
-
142
+
143
143
  def attachment_model(klass = nil)
144
- @attachment_model = klass if klass
144
+ @attachment_model = klass if klass
145
145
  @attachment_model
146
146
  end
147
147
  end
148
148
 
149
149
  require File.join(File.dirname(__FILE__), 'fixtures/attachment')
150
- require File.join(File.dirname(__FILE__), 'base_attachment_tests')
150
+ require File.join(File.dirname(__FILE__), 'base_attachment_tests')
@@ -5,11 +5,11 @@ class ValidationTest < Test::Unit::TestCase
5
5
  @attachment = SmallAttachment.new
6
6
  assert !@attachment.valid?
7
7
  assert @attachment.errors.on(:size)
8
-
8
+
9
9
  @attachment.size = 2000
10
10
  assert !@attachment.valid?
11
11
  assert @attachment.errors.on(:size), @attachment.errors.full_messages.to_sentence
12
-
12
+
13
13
  @attachment.size = 1000
14
14
  assert !@attachment.valid?
15
15
  assert_nil @attachment.errors.on(:size)
@@ -19,16 +19,16 @@ class ValidationTest < Test::Unit::TestCase
19
19
  @attachment = BigAttachment.new
20
20
  assert !@attachment.valid?
21
21
  assert @attachment.errors.on(:size)
22
-
22
+
23
23
  @attachment.size = 2000
24
24
  assert !@attachment.valid?
25
25
  assert @attachment.errors.on(:size), @attachment.errors.full_messages.to_sentence
26
-
26
+
27
27
  @attachment.size = 1.megabyte
28
28
  assert !@attachment.valid?
29
29
  assert_nil @attachment.errors.on(:size)
30
30
  end
31
-
31
+
32
32
  def test_should_validate_content_type
33
33
  @attachment = PdfAttachment.new
34
34
  assert !@attachment.valid?
@@ -47,9 +47,9 @@ class ValidationTest < Test::Unit::TestCase
47
47
  @attachment = Attachment.new
48
48
  assert !@attachment.valid?
49
49
  assert @attachment.errors.on(:filename)
50
-
50
+
51
51
  @attachment.filename = 'foo'
52
52
  assert !@attachment.valid?
53
53
  assert_nil @attachment.errors.on(:filename)
54
54
  end
55
- end
55
+ end
@@ -2,26 +2,26 @@ module RedArtisan
2
2
  module CoreImage
3
3
  module Filters
4
4
  module Color
5
-
5
+
6
6
  def greyscale(color = nil, intensity = 1.00)
7
7
  create_core_image_context(@original.extent.size.width, @original.extent.size.height)
8
-
8
+
9
9
  color = OSX::CIColor.colorWithString("1.0 1.0 1.0 1.0") unless color
10
-
10
+
11
11
  @original.color_monochrome :inputColor => color, :inputIntensity => intensity do |greyscale|
12
12
  @target = greyscale
13
13
  end
14
14
  end
15
-
15
+
16
16
  def sepia(intensity = 1.00)
17
17
  create_core_image_context(@original.extent.size.width, @original.extent.size.height)
18
-
18
+
19
19
  @original.sepia_tone :inputIntensity => intensity do |sepia|
20
20
  @target = sepia
21
21
  end
22
22
  end
23
-
23
+
24
24
  end
25
25
  end
26
26
  end
27
- end
27
+ end
@@ -2,26 +2,26 @@ module RedArtisan
2
2
  module CoreImage
3
3
  module Filters
4
4
  module Effects
5
-
5
+
6
6
  def spotlight(position, points_at, brightness, concentration, color)
7
7
  create_core_image_context(@original.extent.size.width, @original.extent.size.height)
8
-
9
- @original.spot_light :inputLightPosition => vector3(*position), :inputLightPointsAt => vector3(*points_at),
8
+
9
+ @original.spot_light :inputLightPosition => vector3(*position), :inputLightPointsAt => vector3(*points_at),
10
10
  :inputBrightness => brightness, :inputConcentration => concentration, :inputColor => color do |spot|
11
11
  @target = spot
12
12
  end
13
13
  end
14
-
14
+
15
15
  def edges(intensity = 1.00)
16
16
  create_core_image_context(@original.extent.size.width, @original.extent.size.height)
17
-
17
+
18
18
  @original.edges :inputIntensity => intensity do |edged|
19
19
  @target = edged
20
20
  end
21
21
  end
22
-
22
+
23
23
  private
24
-
24
+
25
25
  def vector3(x, y, w)
26
26
  OSX::CIVector.vectorWithX_Y_Z(x, y, w)
27
27
  end
@@ -2,10 +2,10 @@ module RedArtisan
2
2
  module CoreImage
3
3
  module Filters
4
4
  module Perspective
5
-
5
+
6
6
  def perspective(top_left, top_right, bottom_left, bottom_right)
7
7
  create_core_image_context(@original.extent.size.width, @original.extent.size.height)
8
-
8
+
9
9
  @original.perspective_transform :inputTopLeft => top_left, :inputTopRight => top_right, :inputBottomLeft => bottom_left, :inputBottomRight => bottom_right do |transformed|
10
10
  @target = transformed
11
11
  end
@@ -13,13 +13,13 @@ module RedArtisan
13
13
 
14
14
  def perspective_tiled(top_left, top_right, bottom_left, bottom_right)
15
15
  create_core_image_context(@original.extent.size.width, @original.extent.size.height)
16
-
16
+
17
17
  @original.perspective_tile :inputTopLeft => top_left, :inputTopRight => top_right, :inputBottomLeft => bottom_left, :inputBottomRight => bottom_right do |tiled|
18
18
  @target = tiled
19
19
  end
20
20
  end
21
-
21
+
22
22
  end
23
23
  end
24
24
  end
25
- end
25
+ end
@@ -2,24 +2,24 @@ module RedArtisan
2
2
  module CoreImage
3
3
  module Filters
4
4
  module Quality
5
-
5
+
6
6
  def reduce_noise(level = 0.02, sharpness = 0.4)
7
7
  create_core_image_context(@original.extent.size.width, @original.extent.size.height)
8
-
8
+
9
9
  @original.noise_reduction :inputNoiseLevel => level, :inputSharpness => sharpness do |noise_reduced|
10
10
  @target = noise_reduced
11
11
  end
12
12
  end
13
-
13
+
14
14
  def adjust_exposure(input_ev = 0.5)
15
15
  create_core_image_context(@original.extent.size.width, @original.extent.size.height)
16
-
16
+
17
17
  @original.exposure_adjust :inputEV => input_ev do |adjusted|
18
18
  @target = adjusted
19
- end
19
+ end
20
20
  end
21
-
21
+
22
22
  end
23
23
  end
24
24
  end
25
- end
25
+ end
@@ -2,7 +2,7 @@ module RedArtisan
2
2
  module CoreImage
3
3
  module Filters
4
4
  module Scale
5
-
5
+
6
6
  def resize(width, height)
7
7
  create_core_image_context(width, height)
8
8
 
@@ -33,15 +33,15 @@ module RedArtisan
33
33
  scale = size.to_f / (original_size.width > original_size.height ? original_size.width : original_size.height)
34
34
  resize (original_size.width * scale).to_i, (original_size.height * scale).to_i
35
35
  end
36
-
36
+
37
37
  private
38
-
38
+
39
39
  def scale(width, height)
40
40
  original_size = @original.extent.size
41
41
  return width.to_f / original_size.width.to_f, height.to_f / original_size.height.to_f
42
42
  end
43
-
43
+
44
44
  end
45
45
  end
46
46
  end
47
- end
47
+ end
@@ -2,25 +2,25 @@ module RedArtisan
2
2
  module CoreImage
3
3
  module Filters
4
4
  module Watermark
5
-
5
+
6
6
  def watermark(watermark_image, tile = false, strength = 0.1)
7
7
  create_core_image_context(@original.extent.size.width, @original.extent.size.height)
8
-
8
+
9
9
  if watermark_image.respond_to? :to_str
10
10
  watermark_image = OSX::CIImage.from(watermark_image.to_str)
11
11
  end
12
-
12
+
13
13
  if tile
14
14
  tile_transform = OSX::NSAffineTransform.transform
15
15
  tile_transform.scaleXBy_yBy 1.0, 1.0
16
-
16
+
17
17
  watermark_image.affine_tile :inputTransform => tile_transform do |tiled|
18
18
  tiled.crop :inputRectangle => vector(0, 0, @original.extent.size.width, @original.extent.size.height) do |tiled_watermark|
19
19
  watermark_image = tiled_watermark
20
20
  end
21
21
  end
22
22
  end
23
-
23
+
24
24
  @original.dissolve_transition :inputTargetImage => watermark_image, :inputTime => strength do |watermarked|
25
25
  @target = watermarked
26
26
  end
@@ -29,4 +29,4 @@ module RedArtisan
29
29
  end
30
30
  end
31
31
  end
32
- end
32
+ end
@@ -58,7 +58,7 @@ require 'red_artisan/core_image/filters/effects'
58
58
  module RedArtisan
59
59
  module CoreImage
60
60
  class Processor
61
-
61
+
62
62
  def initialize(original)
63
63
  if original.respond_to? :to_str
64
64
  @original = OSX::CIImage.from(original.to_str)
@@ -66,23 +66,23 @@ module RedArtisan
66
66
  @original = original
67
67
  end
68
68
  end
69
-
69
+
70
70
  def render(&block)
71
71
  raise "unprocessed image: #{@original}" unless @target
72
72
  block.call @target
73
73
  end
74
-
74
+
75
75
  include Filters::Scale, Filters::Color, Filters::Watermark, Filters::Quality, Filters::Perspective, Filters::Effects
76
-
76
+
77
77
  private
78
-
78
+
79
79
  def create_core_image_context(width, height)
80
- output = OSX::NSBitmapImageRep.alloc.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel(nil, width, height, 8, 4, true, false, OSX::NSDeviceRGBColorSpace, 0, 0)
81
- context = OSX::NSGraphicsContext.graphicsContextWithBitmapImageRep(output)
82
- OSX::NSGraphicsContext.setCurrentContext(context)
83
- @ci_context = context.CIContext
80
+ output = OSX::NSBitmapImageRep.alloc.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel(nil, width, height, 8, 4, true, false, OSX::NSDeviceRGBColorSpace, 0, 0)
81
+ context = OSX::NSGraphicsContext.graphicsContextWithBitmapImageRep(output)
82
+ OSX::NSGraphicsContext.setCurrentContext(context)
83
+ @ci_context = context.CIContext
84
84
  end
85
-
85
+
86
86
  def vector(x, y, w, h)
87
87
  OSX::CIVector.vectorWithX_Y_Z_W(x, y, w, h)
88
88
  end
@@ -93,27 +93,27 @@ end
93
93
  module OSX
94
94
  class CIImage
95
95
  include OCObjWrapper
96
-
96
+
97
97
  def method_missing_with_filter_processing(sym, *args, &block)
98
98
  f = OSX::CIFilter.filterWithName("CI#{sym.to_s.camelize}")
99
99
  return method_missing_without_filter_processing(sym, *args, &block) unless f
100
-
100
+
101
101
  f.setDefaults if f.respond_to? :setDefaults
102
102
  f.setValue_forKey(self, 'inputImage')
103
103
  options = args.last.is_a?(Hash) ? args.last : {}
104
104
  options.each { |k, v| f.setValue_forKey(v, k.to_s) }
105
-
105
+
106
106
  block.call f.valueForKey('outputImage')
107
107
  end
108
-
108
+
109
109
  alias_method_chain :method_missing, :filter_processing
110
-
110
+
111
111
  def save(target, format = OSX::NSJPEGFileType, properties = nil)
112
112
  bitmapRep = OSX::NSBitmapImageRep.alloc.initWithCIImage(self)
113
113
  blob = bitmapRep.representationUsingType_properties(format, properties)
114
114
  blob.writeToFile_atomically(target, false)
115
115
  end
116
-
116
+
117
117
  def self.from(filepath)
118
118
  raise Errno::ENOENT, "No such file or directory - #{filepath}" unless File.exists?(filepath)
119
119
  OSX::CIImage.imageWithContentsOfURL(OSX::NSURL.fileURLWithPath(filepath))
@@ -1,73 +1,73 @@
1
1
  class Admin::UsersController < Admin::BaseController
2
-
2
+
3
3
  crudify :user, :order => 'login', :title_attribute => 'login', :conditions => "state = 'active'"
4
-
4
+
5
5
  # Protect these actions behind an admin login
6
6
  # before_filter :admin_required, :only => [:suspend, :unsuspend, :destroy, :purge]
7
7
  before_filter :find_user, :except => [:new, :create]
8
8
  before_filter :load_available_plugins, :only => [:new, :create, :edit, :update]
9
-
9
+
10
10
  filter_parameter_logging 'password', 'password_confirmation'
11
-
11
+
12
12
  layout 'admin'
13
-
14
- def new
15
- @user = User.new
16
- @selected_plugin_titles = []
17
- end
13
+
14
+ def new
15
+ @user = User.new
16
+ @selected_plugin_titles = []
17
+ end
18
18
 
19
19
  def create
20
20
  @user = User.new(params[:user])
21
- @selected_plugin_titles = params[:user][:plugins] || []
22
-
21
+ @selected_plugin_titles = params[:user][:plugins] || []
22
+
23
23
  if @user.save
24
- @user.plugins = @selected_plugin_titles
25
- @user.register!
24
+ @user.plugins = @selected_plugin_titles
25
+ @user.register!
26
26
  @user.activate!
27
27
  flash[:notice] = "'#{@user.login}' was successfully created."
28
28
  redirect_to :action => 'index'
29
- else
29
+ else
30
30
  render :action => 'new'
31
31
  end
32
32
  end
33
-
34
- def edit
35
- @user = User.find params[:id]
36
- @selected_plugin_titles = @user.plugins.collect{|p| p.title}
37
- end
33
+
34
+ def edit
35
+ @user = User.find params[:id]
36
+ @selected_plugin_titles = @user.plugins.collect{|p| p.title}
37
+ end
38
38
 
39
39
  def update
40
- @selected_plugin_titles = params[:user][:plugins]
40
+ @selected_plugin_titles = params[:user][:plugins]
41
41
  # Prevent the current user from locking themselves out of the User manager
42
42
  if current_user.id == @user.id and !params[:user][:plugins].include?("Users")
43
43
  flash.now[:error] = "You cannot remove the 'Users' plugin from the currently logged in account."
44
44
  render :action => "edit"
45
45
  else
46
- @previously_selected_plugins_titles = @user.plugins.collect{|p| p.title}
46
+ @previously_selected_plugins_titles = @user.plugins.collect{|p| p.title}
47
47
  if @user.update_attributes params[:user]
48
48
  flash[:notice] = "'#{@user.login}' was successfully updated."
49
49
  redirect_to admin_users_url
50
50
  else
51
- @user.plugins = @previously_selected_plugins_titles
52
- @user.save
51
+ @user.plugins = @previously_selected_plugins_titles
52
+ @user.save
53
53
  render :action => 'edit'
54
54
  end
55
55
  end
56
56
  end
57
-
57
+
58
58
  def suspend
59
- @user.suspend!
59
+ @user.suspend!
60
60
  redirect_to admin_users_path
61
61
  end
62
62
 
63
63
  def unsuspend
64
- @user.unsuspend!
64
+ @user.unsuspend!
65
65
  redirect_to admin_users_path
66
66
  end
67
67
 
68
68
  def destroy
69
69
  @user.delete!
70
- @user.destroy
70
+ @user.destroy
71
71
  flash[:notice] = "'#{@user.login}' was successfully deleted."
72
72
  redirect_to admin_users_path
73
73
  end
@@ -82,13 +82,13 @@ protected
82
82
  def find_user
83
83
  @user = User.find(params[:id])
84
84
  end
85
-
85
+
86
86
  def can_create_public_user
87
87
  User.count == 0
88
88
  end
89
-
89
+
90
90
  def load_available_plugins
91
91
  @available_plugins = Refinery::Plugins.registered.in_menu.titles.sort
92
92
  end
93
93
 
94
- end
94
+ end