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
@@ -11,27 +11,27 @@ class CoreImageTest < Test::Unit::TestCase
11
11
  # test core image thumbnail
12
12
  assert_equal 42, attachment.width
13
13
  assert_equal 55, attachment.height
14
-
14
+
15
15
  thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
16
16
  geo = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
17
-
17
+
18
18
  # test exact resize dimensions
19
19
  assert_equal 50, thumb.width
20
20
  assert_equal 51, thumb.height
21
-
21
+
22
22
  # test geometry string
23
23
  assert_equal 31, geo.width
24
24
  assert_equal 41, geo.height
25
-
25
+
26
26
  # This makes sure that we didn't overwrite the original file
27
27
  # and will end up with a thumbnail instead of the original
28
28
  assert_equal 42, attachment.width
29
29
  assert_equal 55, attachment.height
30
-
30
+
31
31
  end
32
32
  else
33
33
  def test_flunk
34
34
  puts "CoreImage not loaded, tests not running"
35
35
  end
36
36
  end
37
- end
37
+ end
@@ -11,14 +11,14 @@ class GD2Test < Test::Unit::TestCase
11
11
  # test gd2 thumbnail
12
12
  assert_equal 43, attachment.width
13
13
  assert_equal 55, attachment.height
14
-
14
+
15
15
  thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
16
16
  geo = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
17
-
17
+
18
18
  # test exact resize dimensions
19
19
  assert_equal 50, thumb.width
20
20
  assert_equal 51, thumb.height
21
-
21
+
22
22
  # test geometry string
23
23
  assert_equal 31, geo.width
24
24
  assert_equal 40, geo.height
@@ -28,4 +28,4 @@ class GD2Test < Test::Unit::TestCase
28
28
  puts "GD2 not loaded, tests not running"
29
29
  end
30
30
  end
31
- end
31
+ end
@@ -11,14 +11,14 @@ class ImageScienceTest < Test::Unit::TestCase
11
11
  # test image science thumbnail
12
12
  assert_equal 42, attachment.width
13
13
  assert_equal 55, attachment.height
14
-
14
+
15
15
  thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
16
16
  geo = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
17
-
17
+
18
18
  # test exact resize dimensions
19
19
  assert_equal 50, thumb.width
20
20
  assert_equal 51, thumb.height
21
-
21
+
22
22
  # test geometry string
23
23
  assert_equal 31, geo.width
24
24
  assert_equal 41, geo.height
@@ -28,4 +28,4 @@ class ImageScienceTest < Test::Unit::TestCase
28
28
  puts "ImageScience not loaded, tests not running"
29
29
  end
30
30
  end
31
- end
31
+ end
@@ -11,14 +11,14 @@ class MiniMagickTest < Test::Unit::TestCase
11
11
  # test MiniMagick thumbnail
12
12
  assert_equal 43, attachment.width
13
13
  assert_equal 55, attachment.height
14
-
14
+
15
15
  thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
16
16
  geo = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
17
-
17
+
18
18
  # test exact resize dimensions
19
19
  assert_equal 50, thumb.width
20
20
  assert_equal 51, thumb.height
21
-
21
+
22
22
  # test geometry string
23
23
  assert_equal 31, geo.width
24
24
  assert_equal 40, geo.height
@@ -34,7 +34,7 @@ class MiniMagickTest < Test::Unit::TestCase
34
34
  square = attachment.thumbnails.detect { |t| t.filename =~ /_square/ }
35
35
  vertical = attachment.thumbnails.detect { |t| t.filename =~ /_vertical/ }
36
36
  horizontal = attachment.thumbnails.detect { |t| t.filename =~ /_horizontal/ }
37
-
37
+
38
38
  # test excat resize
39
39
  assert_equal 50, square.width
40
40
  assert_equal 50, square.height
@@ -45,17 +45,17 @@ class MiniMagickTest < Test::Unit::TestCase
45
45
  assert_equal 60, horizontal.width
46
46
  assert_equal 30, horizontal.height
47
47
  end
48
-
48
+
49
49
  # tests the first step in resize, crop the image in original size to right format
50
- def test_should_crop_image_right(klass = ImageThumbnailCrop)
51
- @@testcases.collect do |testcase|
50
+ def test_should_crop_image_right(klass = ImageThumbnailCrop)
51
+ @@testcases.collect do |testcase|
52
52
  image_width, image_height, thumb_width, thumb_height = testcase[:data]
53
53
  image_aspect, thumb_aspect = image_width/image_height, thumb_width/thumb_height
54
54
  crop_comand = klass.calculate_offset(image_width, image_height, image_aspect, thumb_width, thumb_height,thumb_aspect)
55
55
  # pattern matching on crop command
56
- if testcase.has_key?(:height)
56
+ if testcase.has_key?(:height)
57
57
  assert crop_comand.match(/^#{image_width}x#{testcase[:height]}\+0\+#{testcase[:yoffset]}$/)
58
- else
58
+ else
59
59
  assert crop_comand.match(/^#{testcase[:width]}x#{image_height}\+#{testcase[:xoffset]}\+0$/)
60
60
  end
61
61
  end
@@ -68,7 +68,7 @@ class MiniMagickTest < Test::Unit::TestCase
68
68
  end
69
69
 
70
70
  @@testcases = [
71
- # image_aspect <= 1 && thumb_aspect >= 1
71
+ # image_aspect <= 1 && thumb_aspect >= 1
72
72
  {:data => [10.0,40.0,2.0,1.0], :height => 5.0, :yoffset => 17.5}, # 1b
73
73
  {:data => [10.0,40.0,1.0,1.0], :height => 10.0, :yoffset => 15.0}, # 1b
74
74
 
@@ -80,8 +80,8 @@ class MiniMagickTest < Test::Unit::TestCase
80
80
  {:data => [10.0,10.0,1.0,1.0], :height => 10.0, :yoffset => 0.0}, # QUADRAT 1c
81
81
 
82
82
  # image_aspect >= 1 && thumb_aspect > 1 && image_aspect < thumb_aspect
83
- {:data => [6.0,3.0,4.0,1.0], :height => 1.5, :yoffset => 0.75}, # 2b
84
- {:data => [6.0,6.0,4.0,1.0], :height => 1.5, :yoffset => 2.25}, # 2b
83
+ {:data => [6.0,3.0,4.0,1.0], :height => 1.5, :yoffset => 0.75}, # 2b
84
+ {:data => [6.0,6.0,4.0,1.0], :height => 1.5, :yoffset => 2.25}, # 2b
85
85
 
86
86
  # image_aspect > 1 && thumb_aspect > 1 && image_aspect > thumb_aspect
87
87
  {:data => [9.0,3.0,2.0,1.0], :width => 6.0, :xoffset => 1.5}, # 2a
@@ -91,7 +91,7 @@ class MiniMagickTest < Test::Unit::TestCase
91
91
  {:data => [10.0,5.0,1.0,2.0], :width => 2.5, :xoffset => 3.75}, # 4
92
92
 
93
93
  # image_aspect > 1 && thumb_aspect > 1 && image_aspect > thumb_aspect
94
- {:data => [9.0,3.0,2.0,1.0], :width => 6.0, :xoffset => 1.5}, # 3a
94
+ {:data => [9.0,3.0,2.0,1.0], :width => 6.0, :xoffset => 1.5}, # 3a
95
95
  # image_aspect > 1 && thumb_aspect > 1 && image_aspect < thumb_aspect
96
96
  {:data => [9.0,3.0,5.0,1.0], :height => 1.8, :yoffset => 0.6} # 3a
97
97
  ]
@@ -17,7 +17,7 @@ class RmagickTest < Test::Unit::TestCase
17
17
  assert_equal '50x64', attachment.image_size
18
18
  end
19
19
  end
20
-
20
+
21
21
  def test_should_create_image_from_uploaded_file_with_custom_content_type
22
22
  assert_created do
23
23
  attachment = upload_file :content_type => 'foo/bar', :filename => '/files/rails.png'
@@ -31,10 +31,10 @@ class RmagickTest < Test::Unit::TestCase
31
31
  assert_equal [], attachment.thumbnails
32
32
  end
33
33
  end
34
-
34
+
35
35
  def test_should_create_thumbnail
36
36
  attachment = upload_file :filename => '/files/rails.png'
37
-
37
+
38
38
  assert_created do
39
39
  basename, ext = attachment.filename.split '.'
40
40
  thumbnail = attachment.create_or_update_thumbnail(attachment.create_temp_file, 'thumb', 50, 50)
@@ -48,10 +48,10 @@ class RmagickTest < Test::Unit::TestCase
48
48
  assert_equal "#{basename}_thumb.#{ext}", thumbnail.filename
49
49
  end
50
50
  end
51
-
51
+
52
52
  def test_should_create_thumbnail_with_geometry_string
53
53
  attachment = upload_file :filename => '/files/rails.png'
54
-
54
+
55
55
  assert_created do
56
56
  basename, ext = attachment.filename.split '.'
57
57
  thumbnail = attachment.create_or_update_thumbnail(attachment.create_temp_file, 'thumb', 'x50')
@@ -65,7 +65,7 @@ class RmagickTest < Test::Unit::TestCase
65
65
  assert_equal "#{basename}_thumb.#{ext}", thumbnail.filename
66
66
  end
67
67
  end
68
-
68
+
69
69
  def test_should_resize_image(klass = ImageAttachment)
70
70
  attachment_model klass
71
71
  assert_equal [50, 50], attachment_model.attachment_options[:resize_to]
@@ -78,9 +78,9 @@ class RmagickTest < Test::Unit::TestCase
78
78
  assert_equal 50, attachment.width
79
79
  assert_equal 50, attachment.height
80
80
  end
81
-
81
+
82
82
  test_against_subclass :test_should_resize_image, ImageAttachment
83
-
83
+
84
84
  def test_should_resize_image_with_geometry(klass = ImageOrPdfAttachment)
85
85
  attachment_model klass
86
86
  assert_equal 'x50', attachment_model.attachment_options[:resize_to]
@@ -93,26 +93,26 @@ class RmagickTest < Test::Unit::TestCase
93
93
  assert_equal 39, attachment.width
94
94
  assert_equal 50, attachment.height
95
95
  end
96
-
96
+
97
97
  test_against_subclass :test_should_resize_image_with_geometry, ImageOrPdfAttachment
98
-
98
+
99
99
  def test_should_give_correct_thumbnail_filenames(klass = ImageWithThumbsFileAttachment)
100
100
  attachment_model klass
101
101
  assert_created 3 do
102
102
  attachment = upload_file :filename => '/files/rails.png'
103
103
  thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
104
104
  geo = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
105
-
105
+
106
106
  [attachment, thumb, geo].each { |record| assert_valid record }
107
-
107
+
108
108
  assert_match /rails\.png$/, attachment.full_filename
109
109
  assert_match /rails_geometry\.png$/, attachment.full_filename(:geometry)
110
110
  assert_match /rails_thumb\.png$/, attachment.full_filename(:thumb)
111
111
  end
112
112
  end
113
-
113
+
114
114
  test_against_subclass :test_should_give_correct_thumbnail_filenames, ImageWithThumbsFileAttachment
115
-
115
+
116
116
  def test_should_automatically_create_thumbnails(klass = ImageWithThumbsAttachment)
117
117
  attachment_model klass
118
118
  assert_created 3 do
@@ -124,7 +124,7 @@ class RmagickTest < Test::Unit::TestCase
124
124
  assert_equal 55, attachment.height
125
125
  assert_equal 2, attachment.thumbnails.length
126
126
  assert_equal 1.0, attachment.aspect_ratio
127
-
127
+
128
128
  thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
129
129
  assert !thumb.new_record?, thumb.errors.full_messages.join("\n")
130
130
  assert !thumb.size.zero?
@@ -132,7 +132,7 @@ class RmagickTest < Test::Unit::TestCase
132
132
  assert_equal 50, thumb.width
133
133
  assert_equal 50, thumb.height
134
134
  assert_equal 1.0, thumb.aspect_ratio
135
-
135
+
136
136
  geo = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
137
137
  assert !geo.new_record?, geo.errors.full_messages.join("\n")
138
138
  assert !geo.size.zero?
@@ -142,13 +142,13 @@ class RmagickTest < Test::Unit::TestCase
142
142
  assert_equal 1.0, geo.aspect_ratio
143
143
  end
144
144
  end
145
-
145
+
146
146
  test_against_subclass :test_should_automatically_create_thumbnails, ImageWithThumbsAttachment
147
-
147
+
148
148
  # same as above method, but test it on a file model
149
149
  test_against_class :test_should_automatically_create_thumbnails, ImageWithThumbsFileAttachment
150
150
  test_against_subclass :test_should_automatically_create_thumbnails_on_class, ImageWithThumbsFileAttachment
151
-
151
+
152
152
  def test_should_use_thumbnail_subclass(klass = ImageWithThumbsClassFileAttachment)
153
153
  attachment_model klass
154
154
  attachment = nil
@@ -166,18 +166,18 @@ class RmagickTest < Test::Unit::TestCase
166
166
  "#full_filename does not use thumbnail class' path."
167
167
  assert_equal attachment.destroy, attachment
168
168
  end
169
-
169
+
170
170
  test_against_subclass :test_should_use_thumbnail_subclass, ImageWithThumbsClassFileAttachment
171
-
171
+
172
172
  def test_should_remove_old_thumbnail_files_when_updating(klass = ImageWithThumbsFileAttachment)
173
173
  attachment_model klass
174
174
  attachment = nil
175
175
  assert_created 3 do
176
176
  attachment = upload_file :filename => '/files/rails.png'
177
177
  end
178
-
178
+
179
179
  old_filenames = [attachment.full_filename] + attachment.thumbnails.collect(&:full_filename)
180
-
180
+
181
181
  assert_not_created do
182
182
  use_temp_file "files/rails.png" do |file|
183
183
  attachment.filename = 'rails2.png'
@@ -189,9 +189,9 @@ class RmagickTest < Test::Unit::TestCase
189
189
  end
190
190
  end
191
191
  end
192
-
192
+
193
193
  test_against_subclass :test_should_remove_old_thumbnail_files_when_updating, ImageWithThumbsFileAttachment
194
-
194
+
195
195
  def test_should_delete_file_when_in_file_system_when_attachment_record_destroyed(klass = ImageWithThumbsFileAttachment)
196
196
  attachment_model klass
197
197
  attachment = upload_file :filename => '/files/rails.png'
@@ -200,17 +200,17 @@ class RmagickTest < Test::Unit::TestCase
200
200
  attachment.destroy
201
201
  filenames.each { |f| assert !File.exists?(f), "#{f} still exists" }
202
202
  end
203
-
203
+
204
204
  test_against_subclass :test_should_delete_file_when_in_file_system_when_attachment_record_destroyed, ImageWithThumbsFileAttachment
205
-
205
+
206
206
  def test_should_have_full_filename_method(klass = FileAttachment)
207
207
  attachment_model klass
208
208
  attachment = upload_file :filename => '/files/rails.png'
209
209
  assert_respond_to attachment, :full_filename
210
210
  end
211
-
211
+
212
212
  test_against_subclass :test_should_have_full_filename_method, FileAttachment
213
-
213
+
214
214
  def test_should_overwrite_old_thumbnail_records_when_updating(klass = ImageWithThumbsAttachment)
215
215
  attachment_model klass
216
216
  attachment = nil
@@ -220,7 +220,7 @@ class RmagickTest < Test::Unit::TestCase
220
220
  assert_not_created do # no new db_file records
221
221
  use_temp_file "files/rails.png" do |file|
222
222
  attachment.filename = 'rails2.png'
223
- # The above test (#test_should_have_full_filename_method) to pass before be can set the temp_path below --
223
+ # The above test (#test_should_have_full_filename_method) to pass before be can set the temp_path below --
224
224
  # #temp_path calls #full_filename, which is not getting mixed into the attachment. Maybe we don't need to
225
225
  # set temp_path at all?
226
226
  #
@@ -229,9 +229,9 @@ class RmagickTest < Test::Unit::TestCase
229
229
  end
230
230
  end
231
231
  end
232
-
232
+
233
233
  test_against_subclass :test_should_overwrite_old_thumbnail_records_when_updating, ImageWithThumbsAttachment
234
-
234
+
235
235
  def test_should_overwrite_old_thumbnail_records_when_renaming(klass = ImageWithThumbsAttachment)
236
236
  attachment_model klass
237
237
  attachment = nil
@@ -245,7 +245,7 @@ class RmagickTest < Test::Unit::TestCase
245
245
  assert_equal 'rails2.png', attachment.filename
246
246
  end
247
247
  end
248
-
248
+
249
249
  test_against_subclass :test_should_overwrite_old_thumbnail_records_when_renaming, ImageWithThumbsAttachment
250
250
  else
251
251
  def test_flunk
@@ -13,7 +13,7 @@ ActiveRecord::Schema.define(:version => 0) do
13
13
 
14
14
  create_table :file_attachments, :force => true do |t|
15
15
  t.column :parent_id, :integer
16
- t.column :thumbnail, :string
16
+ t.column :thumbnail, :string
17
17
  t.column :filename, :string, :limit => 255
18
18
  t.column :content_type, :string, :limit => 255
19
19
  t.column :size, :integer
@@ -22,11 +22,11 @@ ActiveRecord::Schema.define(:version => 0) do
22
22
  t.column :type, :string
23
23
  t.column :aspect_ratio, :float
24
24
  end
25
-
25
+
26
26
  create_table :file_attachments_with_string_id, :id => false, :force => true do |t|
27
27
  t.column :id, :string
28
28
  t.column :parent_id, :string
29
- t.column :thumbnail, :string
29
+ t.column :thumbnail, :string
30
30
  t.column :filename, :string, :limit => 255
31
31
  t.column :content_type, :string, :limit => 255
32
32
  t.column :size, :integer
@@ -38,7 +38,7 @@ ActiveRecord::Schema.define(:version => 0) do
38
38
 
39
39
  create_table :gd2_attachments, :force => true do |t|
40
40
  t.column :parent_id, :integer
41
- t.column :thumbnail, :string
41
+ t.column :thumbnail, :string
42
42
  t.column :filename, :string, :limit => 255
43
43
  t.column :content_type, :string, :limit => 255
44
44
  t.column :size, :integer
@@ -49,7 +49,7 @@ ActiveRecord::Schema.define(:version => 0) do
49
49
 
50
50
  create_table :image_science_attachments, :force => true do |t|
51
51
  t.column :parent_id, :integer
52
- t.column :thumbnail, :string
52
+ t.column :thumbnail, :string
53
53
  t.column :filename, :string, :limit => 255
54
54
  t.column :content_type, :string, :limit => 255
55
55
  t.column :size, :integer
@@ -60,7 +60,7 @@ ActiveRecord::Schema.define(:version => 0) do
60
60
 
61
61
  create_table :core_image_attachments, :force => true do |t|
62
62
  t.column :parent_id, :integer
63
- t.column :thumbnail, :string
63
+ t.column :thumbnail, :string
64
64
  t.column :filename, :string, :limit => 255
65
65
  t.column :content_type, :string, :limit => 255
66
66
  t.column :size, :integer
@@ -68,10 +68,10 @@ ActiveRecord::Schema.define(:version => 0) do
68
68
  t.column :height, :integer
69
69
  t.column :type, :string
70
70
  end
71
-
71
+
72
72
  create_table :mini_magick_attachments, :force => true do |t|
73
73
  t.column :parent_id, :integer
74
- t.column :thumbnail, :string
74
+ t.column :thumbnail, :string
75
75
  t.column :filename, :string, :limit => 255
76
76
  t.column :content_type, :string, :limit => 255
77
77
  t.column :size, :integer
@@ -82,7 +82,7 @@ ActiveRecord::Schema.define(:version => 0) do
82
82
 
83
83
  create_table :mini_magick_attachments, :force => true do |t|
84
84
  t.column :parent_id, :integer
85
- t.column :thumbnail, :string
85
+ t.column :thumbnail, :string
86
86
  t.column :filename, :string, :limit => 255
87
87
  t.column :content_type, :string, :limit => 255
88
88
  t.column :size, :integer
@@ -97,7 +97,7 @@ ActiveRecord::Schema.define(:version => 0) do
97
97
  t.column :content_type, :string, :limit => 255
98
98
  t.column :size, :integer
99
99
  end
100
-
100
+
101
101
  create_table :minimal_attachments, :force => true do |t|
102
102
  t.column :size, :integer
103
103
  t.column :content_type, :string, :limit => 255
@@ -109,7 +109,7 @@ ActiveRecord::Schema.define(:version => 0) do
109
109
 
110
110
  create_table :s3_attachments, :force => true do |t|
111
111
  t.column :parent_id, :integer
112
- t.column :thumbnail, :string
112
+ t.column :thumbnail, :string
113
113
  t.column :filename, :string, :limit => 255
114
114
  t.column :content_type, :string, :limit => 255
115
115
  t.column :size, :integer
@@ -118,10 +118,10 @@ ActiveRecord::Schema.define(:version => 0) do
118
118
  t.column :type, :string
119
119
  t.column :aspect_ratio, :float
120
120
  end
121
-
121
+
122
122
  create_table :cloud_files_attachments, :force => true do |t|
123
123
  t.column :parent_id, :integer
124
- t.column :thumbnail, :string
124
+ t.column :thumbnail, :string
125
125
  t.column :filename, :string, :limit => 255
126
126
  t.column :content_type, :string, :limit => 255
127
127
  t.column :size, :integer
@@ -130,5 +130,5 @@ ActiveRecord::Schema.define(:version => 0) do
130
130
  t.column :type, :string
131
131
  t.column :aspect_ratio, :float
132
132
  end
133
-
133
+
134
134
  end