refinerycms 0.9.5.13 → 0.9.5.14

Sign up to get free protection for your applications and to get access to all the features.
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
@@ -104,7 +104,7 @@ module Foo #:nodoc:
104
104
  positive_quoted = run_quoted_queries(queries[:positive_quoted])
105
105
  negative = run_queries(queries[:negative])
106
106
  negative_quoted = run_quoted_queries(queries[:negative_quoted])
107
-
107
+
108
108
  if !queries[:positive].empty? && !queries[:positive_quoted].empty?
109
109
  p = positive.delete_if{ |r_id,w| !positive_quoted.include?(r_id) }
110
110
  pq = positive_quoted.delete_if{ |r_id,w| !positive.include?(r_id) }
@@ -114,7 +114,7 @@ module Foo #:nodoc:
114
114
  else
115
115
  results = positive_quoted
116
116
  end
117
-
117
+
118
118
  negative_results = (negative.keys + negative_quoted.keys)
119
119
  results.delete_if { |r_id, w| negative_results.include?(r_id) }
120
120
  #p results
@@ -189,7 +189,7 @@ module Foo #:nodoc:
189
189
  end
190
190
  @prefix_cache[prefix]
191
191
  end
192
-
192
+
193
193
  # Allows compatibility with 1.8.6 which has no ord method.
194
194
  def encode_character(char)
195
195
  if @@has_ord ||= char.respond_to?(:ord)
@@ -236,7 +236,7 @@ module Foo #:nodoc:
236
236
  atoms.uniq.each do |atom|
237
237
  interim_results = {}
238
238
  if include_atom?(atom)
239
-
239
+
240
240
  interim_results = @atoms[atom].weightings(@records_size)
241
241
  end
242
242
  if results.empty?
@@ -269,7 +269,7 @@ module Foo #:nodoc:
269
269
  matches = @atoms[atom_name].preceded_by(matches)
270
270
  end
271
271
  #results += matches.record_ids
272
-
272
+
273
273
  interim_results = matches.weightings(@records_size)
274
274
  if results.empty?
275
275
  results = interim_results
@@ -281,7 +281,7 @@ module Foo #:nodoc:
281
281
  #p results.class
282
282
  results = rr
283
283
  end
284
-
284
+
285
285
  end
286
286
  return results
287
287
  end
@@ -326,4 +326,4 @@ module Foo #:nodoc:
326
326
  end
327
327
  end
328
328
  end
329
- end
329
+ end
@@ -12,7 +12,7 @@ module WillPaginate
12
12
  def paginate_search(query, options)
13
13
 
14
14
  page, per_page, total_entries = wp_parse_options(options)
15
-
15
+
16
16
  total_entries ||= find_with_index(query,{},{:ids_only => true}).size
17
17
 
18
18
  returning WillPaginate::Collection.new(page, per_page, total_entries) do |pager|
@@ -24,24 +24,24 @@ class ActiveSupport::TestCase #:nodoc:
24
24
  self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
25
25
  self.use_transactional_fixtures = true
26
26
  self.use_instantiated_fixtures = false
27
-
27
+
28
28
  def destroy_index
29
29
  FileUtils::rm_rf(index_loc) if File.exists?(index_loc)
30
30
  assert !File.exists?(index_loc)
31
31
  true
32
32
  end
33
-
33
+
34
34
  def build_index
35
35
  # Makes a query to invoke the index build.
36
36
  assert_equal [], Post.find_with_index('badger')
37
37
  assert File.exists?(index_loc)
38
38
  true
39
39
  end
40
-
40
+
41
41
  protected
42
-
42
+
43
43
  def index_loc
44
44
  File.join(RAILS_ROOT,'index')
45
45
  end
46
-
46
+
47
47
  end
@@ -89,7 +89,7 @@ class ActsAsIndexedTest < ActiveSupport::TestCase
89
89
 
90
90
  end
91
91
 
92
- # When a atom already in a record is duplicated, it removes
92
+ # When a atom already in a record is duplicated, it removes
93
93
  # all records with that same atom from the index.
94
94
  def test_update_record_bug
95
95
  assert_equal 2, Post.find_with_index('crane',{},{:ids_only => true}).size
@@ -98,5 +98,5 @@ class ActsAsIndexedTest < ActiveSupport::TestCase
98
98
  assert_equal 2, Post.find_with_index('crane',{},{:ids_only => true}).size
99
99
  assert_equal 2, Post.find_with_index('ship',{},{:ids_only => true}).size
100
100
  end
101
-
101
+
102
102
  end
@@ -1,141 +1,141 @@
1
1
  module ActiveRecord
2
- module Acts
3
- module Tree
4
- def self.included(base)
5
- base.extend(ClassMethods)
6
- end
7
-
8
- # Specify this +acts_as+ extension if you want to model a tree structure by providing a parent association and a children
9
- # association. This requires that you have a foreign key column, which by default is called +parent_id+.
10
- #
11
- # class Category < ActiveRecord::Base
12
- # acts_as_tree :order => "name"
13
- # end
14
- #
15
- # Example:
16
- # root
17
- # \_ child1
18
- # \_ subchild1
19
- # \_ subchild2
20
- #
21
- # root = Category.create("name" => "root")
22
- # child1 = root.children.create("name" => "child1")
23
- # subchild1 = child1.children.create("name" => "subchild1")
24
- #
25
- # root.parent # => nil
26
- # child1.parent # => root
27
- # root.children # => [child1]
28
- # root.children.first.children.first # => subchild1
29
- #
30
- # In addition to the parent and children associations, the following instance methods are added to the class
31
- # after calling <tt>acts_as_tree</tt>:
32
- # * <tt>siblings</tt> - Returns all the children of the parent, excluding the current node (<tt>[subchild2]</tt> when called on <tt>subchild1</tt>)
33
- # * <tt>self_and_siblings</tt> - Returns all the children of the parent, including the current node (<tt>[subchild1, subchild2]</tt> when called on <tt>subchild1</tt>)
34
- # * <tt>ancestors</tt> - Returns all the ancestors of the current node (<tt>[child1, root]</tt> when called on <tt>subchild2</tt>)
35
- # * <tt>root</tt> - Returns the root of the current node (<tt>root</tt> when called on <tt>subchild2</tt>)
36
- # * <tt>descendants</tt> - Returns a flat list of the descendants of the current node (<tt>[child1, subchild1, subchild2]</tt> when called on <tt>root</tt>)
37
- module ClassMethods
38
- # Configuration options are:
39
- #
40
- # * <tt>foreign_key</tt> - specifies the column name to use for tracking of the tree (default: +parent_id+)
41
- # * <tt>order</tt> - makes it possible to sort the children according to this SQL snippet.
42
- # * <tt>counter_cache</tt> - keeps a count in a +children_count+ column if set to +true+ (default: +false+).
43
- # * <tt>include</tt> - ability to add eager loading to tree finds by specifying associations to include. 'children' association eager loaded by default. Disable by supplying :include => nil or :include => []
44
- def acts_as_tree(options = {})
45
- configuration = { :foreign_key => "parent_id", :order => nil, :counter_cache => nil, :include => [:children] }
46
- configuration.update(options) if options.is_a?(Hash) # to avoid something nasty happening check for Hash here.
47
- configuration.update({:include => []}) if configuration[:include].nil? # if calling class really doesn't want to eager load its children.
48
-
49
- belongs_to :parent, :class_name => name, :foreign_key => configuration[:foreign_key], :counter_cache => configuration[:counter_cache], :include => configuration[:include]
50
- has_many :children, :class_name => name, :foreign_key => configuration[:foreign_key], :order => configuration[:order], :dependent => :delete_all, :include => configuration[:include]
51
-
52
- class_eval <<-EOV
53
- include ActiveRecord::Acts::Tree::InstanceMethods
54
-
55
- def self.roots
56
- find :all, :conditions => "#{configuration[:foreign_key]} IS NULL", :order => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}}, :include => %W{#{configuration[:include].join(' ')}}
57
- end
58
-
59
- def self.root
60
- find :first, :conditions => "#{configuration[:foreign_key]} IS NULL", :order => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}}, :include => %W{#{configuration[:include].join(' ')}}
61
- end
62
-
63
- def self.childless
64
- nodes = []
65
-
66
- find(:all, :include => configuration[:include]).each do |node|
67
- nodes << node if node.children.empty?
68
- end
69
-
70
- nodes
71
- end
72
- EOV
73
- end
74
- end
75
-
76
- module InstanceMethods
77
- # Returns list of ancestors, starting from parent until root.
78
- #
79
- # subchild1.ancestors # => [child1, root]
80
- def ancestors
81
- node, nodes = self, []
82
- nodes << node = node.parent until node.parent.nil? and return nodes
83
- end
84
-
85
- # Returns the root node of the tree.
86
- def root
87
- node = self
88
- node = node.parent until node.parent.nil? and return node
89
- end
90
-
91
- # Returns all siblings of the current node.
92
- #
93
- # subchild1.siblings # => [subchild2]
94
- def siblings
95
- self_and_siblings - [self]
96
- end
97
-
98
- # Returns all siblings and a reference to the current node.
99
- #
100
- # subchild1.self_and_siblings # => [subchild1, subchild2]
101
- def self_and_siblings
102
- parent ? parent.children : self.class.roots
103
- end
104
-
105
- # Returns a flat list of the descendants of the current node.
106
- #
107
- # root.descendants # => [child1, subchild1, subchild2]
108
- def descendants(node=self)
109
- nodes = []
110
- nodes << node unless node == self
111
-
112
- node.children.each do |child|
113
- nodes += descendants(child)
114
- end
115
-
116
- nodes.compact
117
- end
118
-
119
- def chain
120
- [self.ancestors, self, self.descendants].flatten
121
- end
122
-
123
- # Returns a flat list of all of the children under the current node
124
- # which don't have any children belonging to them (childless)
125
- #
126
- # node.childess # => [subchild1, subchild2]
127
- def childless
128
- nodes = []
129
-
130
- unless self.children.empty?
131
- nodes << self.children.collect { |child| child.childless }
132
- else
133
- nodes << self
134
- end
135
-
136
- nodes.flatten.compact
137
- end
138
- end
139
- end
140
- end
141
- end
2
+ module Acts
3
+ module Tree
4
+ def self.included(base)
5
+ base.extend(ClassMethods)
6
+ end
7
+
8
+ # Specify this +acts_as+ extension if you want to model a tree structure by providing a parent association and a children
9
+ # association. This requires that you have a foreign key column, which by default is called +parent_id+.
10
+ #
11
+ # class Category < ActiveRecord::Base
12
+ # acts_as_tree :order => "name"
13
+ # end
14
+ #
15
+ # Example:
16
+ # root
17
+ # \_ child1
18
+ # \_ subchild1
19
+ # \_ subchild2
20
+ #
21
+ # root = Category.create("name" => "root")
22
+ # child1 = root.children.create("name" => "child1")
23
+ # subchild1 = child1.children.create("name" => "subchild1")
24
+ #
25
+ # root.parent # => nil
26
+ # child1.parent # => root
27
+ # root.children # => [child1]
28
+ # root.children.first.children.first # => subchild1
29
+ #
30
+ # In addition to the parent and children associations, the following instance methods are added to the class
31
+ # after calling <tt>acts_as_tree</tt>:
32
+ # * <tt>siblings</tt> - Returns all the children of the parent, excluding the current node (<tt>[subchild2]</tt> when called on <tt>subchild1</tt>)
33
+ # * <tt>self_and_siblings</tt> - Returns all the children of the parent, including the current node (<tt>[subchild1, subchild2]</tt> when called on <tt>subchild1</tt>)
34
+ # * <tt>ancestors</tt> - Returns all the ancestors of the current node (<tt>[child1, root]</tt> when called on <tt>subchild2</tt>)
35
+ # * <tt>root</tt> - Returns the root of the current node (<tt>root</tt> when called on <tt>subchild2</tt>)
36
+ # * <tt>descendants</tt> - Returns a flat list of the descendants of the current node (<tt>[child1, subchild1, subchild2]</tt> when called on <tt>root</tt>)
37
+ module ClassMethods
38
+ # Configuration options are:
39
+ #
40
+ # * <tt>foreign_key</tt> - specifies the column name to use for tracking of the tree (default: +parent_id+)
41
+ # * <tt>order</tt> - makes it possible to sort the children according to this SQL snippet.
42
+ # * <tt>counter_cache</tt> - keeps a count in a +children_count+ column if set to +true+ (default: +false+).
43
+ # * <tt>include</tt> - ability to add eager loading to tree finds by specifying associations to include. 'children' association eager loaded by default. Disable by supplying :include => nil or :include => []
44
+ def acts_as_tree(options = {})
45
+ configuration = { :foreign_key => "parent_id", :order => nil, :counter_cache => nil, :include => [:children] }
46
+ configuration.update(options) if options.is_a?(Hash) # to avoid something nasty happening check for Hash here.
47
+ configuration.update({:include => []}) if configuration[:include].nil? # if calling class really doesn't want to eager load its children.
48
+
49
+ belongs_to :parent, :class_name => name, :foreign_key => configuration[:foreign_key], :counter_cache => configuration[:counter_cache], :include => configuration[:include]
50
+ has_many :children, :class_name => name, :foreign_key => configuration[:foreign_key], :order => configuration[:order], :dependent => :delete_all, :include => configuration[:include]
51
+
52
+ class_eval <<-EOV
53
+ include ActiveRecord::Acts::Tree::InstanceMethods
54
+
55
+ def self.roots
56
+ find :all, :conditions => "#{configuration[:foreign_key]} IS NULL", :order => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}}, :include => %W{#{configuration[:include].join(' ')}}
57
+ end
58
+
59
+ def self.root
60
+ find :first, :conditions => "#{configuration[:foreign_key]} IS NULL", :order => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}}, :include => %W{#{configuration[:include].join(' ')}}
61
+ end
62
+
63
+ def self.childless
64
+ nodes = []
65
+
66
+ find(:all, :include => configuration[:include]).each do |node|
67
+ nodes << node if node.children.empty?
68
+ end
69
+
70
+ nodes
71
+ end
72
+ EOV
73
+ end
74
+ end
75
+
76
+ module InstanceMethods
77
+ # Returns list of ancestors, starting from parent until root.
78
+ #
79
+ # subchild1.ancestors # => [child1, root]
80
+ def ancestors
81
+ node, nodes = self, []
82
+ nodes << node = node.parent until node.parent.nil? and return nodes
83
+ end
84
+
85
+ # Returns the root node of the tree.
86
+ def root
87
+ node = self
88
+ node = node.parent until node.parent.nil? and return node
89
+ end
90
+
91
+ # Returns all siblings of the current node.
92
+ #
93
+ # subchild1.siblings # => [subchild2]
94
+ def siblings
95
+ self_and_siblings - [self]
96
+ end
97
+
98
+ # Returns all siblings and a reference to the current node.
99
+ #
100
+ # subchild1.self_and_siblings # => [subchild1, subchild2]
101
+ def self_and_siblings
102
+ parent ? parent.children : self.class.roots
103
+ end
104
+
105
+ # Returns a flat list of the descendants of the current node.
106
+ #
107
+ # root.descendants # => [child1, subchild1, subchild2]
108
+ def descendants(node=self)
109
+ nodes = []
110
+ nodes << node unless node == self
111
+
112
+ node.children.each do |child|
113
+ nodes += descendants(child)
114
+ end
115
+
116
+ nodes.compact
117
+ end
118
+
119
+ def chain
120
+ [self.ancestors, self, self.descendants].flatten
121
+ end
122
+
123
+ # Returns a flat list of all of the children under the current node
124
+ # which don't have any children belonging to them (childless)
125
+ #
126
+ # node.childess # => [subchild1, subchild2]
127
+ def childless
128
+ nodes = []
129
+
130
+ unless self.children.empty?
131
+ nodes << self.children.collect { |child| child.childless }
132
+ else
133
+ nodes << self
134
+ end
135
+
136
+ nodes.flatten.compact
137
+ end
138
+ end
139
+ end
140
+ end
141
+ end
@@ -43,7 +43,7 @@ end
43
43
  class Mixin < ActiveRecord::Base
44
44
  end
45
45
 
46
- class TreeMixin < Mixin
46
+ class TreeMixin < Mixin
47
47
  acts_as_tree :foreign_key => "parent_id", :order => "id"
48
48
  end
49
49
 
@@ -57,7 +57,7 @@ class RecursivelyCascadedTreeMixin < Mixin
57
57
  end
58
58
 
59
59
  class TreeTest < Test::Unit::TestCase
60
-
60
+
61
61
  def setup
62
62
  setup_db
63
63
  @root1 = TreeMixin.create!
@@ -146,12 +146,12 @@ class TreeTest < Test::Unit::TestCase
146
146
  assert_equal [@root_child1, @root_child2], @root_child2.self_and_siblings
147
147
  assert_equal [@root1, @root2, @root3], @root2.self_and_siblings
148
148
  assert_equal [@root1, @root2, @root3], @root3.self_and_siblings
149
- end
149
+ end
150
150
  end
151
151
 
152
152
  class TreeTestWithEagerLoading < Test::Unit::TestCase
153
-
154
- def setup
153
+
154
+ def setup
155
155
  teardown_db
156
156
  setup_db
157
157
  @root1 = TreeMixin.create!
@@ -160,9 +160,9 @@ class TreeTestWithEagerLoading < Test::Unit::TestCase
160
160
  @root_child2 = TreeMixin.create! :parent_id => @root1.id
161
161
  @root2 = TreeMixin.create!
162
162
  @root3 = TreeMixin.create!
163
-
163
+
164
164
  @rc1 = RecursivelyCascadedTreeMixin.create!
165
- @rc2 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc1.id
165
+ @rc2 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc1.id
166
166
  @rc3 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc2.id
167
167
  @rc4 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc3.id
168
168
  end
@@ -170,36 +170,36 @@ class TreeTestWithEagerLoading < Test::Unit::TestCase
170
170
  def teardown
171
171
  teardown_db
172
172
  end
173
-
173
+
174
174
  def test_eager_association_loading
175
175
  roots = TreeMixin.find(:all, :include => :children, :conditions => "mixins.parent_id IS NULL", :order => "mixins.id")
176
- assert_equal [@root1, @root2, @root3], roots
176
+ assert_equal [@root1, @root2, @root3], roots
177
177
  assert_no_queries do
178
178
  assert_equal 2, roots[0].children.size
179
179
  assert_equal 0, roots[1].children.size
180
180
  assert_equal 0, roots[2].children.size
181
- end
181
+ end
182
182
  end
183
-
183
+
184
184
  def test_eager_association_loading_with_recursive_cascading_three_levels_has_many
185
185
  root_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :children => { :children => :children } }, :order => 'mixins.id')
186
186
  assert_equal @rc4, assert_no_queries { root_node.children.first.children.first.children.first }
187
187
  end
188
-
188
+
189
189
  def test_eager_association_loading_with_recursive_cascading_three_levels_has_one
190
190
  root_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :first_child => { :first_child => :first_child } }, :order => 'mixins.id')
191
191
  assert_equal @rc4, assert_no_queries { root_node.first_child.first_child.first_child }
192
192
  end
193
-
193
+
194
194
  def test_eager_association_loading_with_recursive_cascading_three_levels_belongs_to
195
195
  leaf_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :parent => { :parent => :parent } }, :order => 'mixins.id DESC')
196
196
  assert_equal @rc1, assert_no_queries { leaf_node.parent.parent.parent }
197
- end
197
+ end
198
198
  end
199
199
 
200
200
  class TreeTestWithoutOrder < Test::Unit::TestCase
201
-
202
- def setup
201
+
202
+ def setup
203
203
  setup_db
204
204
  @root1 = TreeMixinWithoutOrder.create!
205
205
  @root2 = TreeMixinWithoutOrder.create!
@@ -212,8 +212,8 @@ class TreeTestWithoutOrder < Test::Unit::TestCase
212
212
  def test_root
213
213
  assert [@root1, @root2].include?(TreeMixinWithoutOrder.root)
214
214
  end
215
-
215
+
216
216
  def test_roots
217
217
  assert_equal [], [@root1, @root2] - TreeMixinWithoutOrder.roots
218
218
  end
219
- end
219
+ end