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
@@ -1,7 +1,7 @@
1
1
  module Refinery
2
-
3
- def self.add_gems
4
- ActiveRecord::Base.module_eval do
2
+
3
+ def self.add_gems
4
+ ActiveRecord::Base.module_eval do
5
5
  begin
6
6
  require 'friendly_id'
7
7
  require 'will_paginate'
@@ -9,13 +9,13 @@ module Refinery
9
9
  rescue LoadError => load_error
10
10
  # this will stop us running rake gems:install which we don't really want so just trap this error.
11
11
  end
12
-
12
+
13
13
  # Stub has_friendly_id. This will get overriden when/if included.
14
14
  # The config will still complain that the gem is missing but this allows it to do so.
15
- def self.has_friendly_id(column, options = {}, &block)
16
- super if defined? super and table_exists?
17
- end
18
- end
15
+ def self.has_friendly_id(column, options = {}, &block)
16
+ super if defined? super and table_exists?
17
+ end
18
+ end
19
19
  end
20
-
21
- end
20
+
21
+ end
@@ -1,16 +1,16 @@
1
1
  module Refinery
2
2
  class Activity
3
-
3
+
4
4
  attr_accessor :class, :title, :url_prefix, :order, :conditions, :limit, :created_image, :updated_image, :conditions
5
-
5
+
6
6
  def initialize(new_options)
7
7
  options = {:class => nil, :title => nil, :url_prefix => "", :order => 'updated_at DESC', :conditions => nil, :limit => 10, :created_image => "add.png", :updated_image => "edit.png"}
8
8
  options.merge!(new_options).each { |key,value| eval("self.#{key} = value") }
9
9
  end
10
-
10
+
11
11
  def url_prefix
12
12
  @url_prefix.blank? ? "" : "#{@url_prefix}_".gsub("__", "_")
13
13
  end
14
-
14
+
15
15
  end
16
- end
16
+ end
@@ -1,16 +1,16 @@
1
1
  class Refinery::AdminBaseController < ApplicationController
2
-
2
+
3
3
  layout proc { |controller| "admin#{"_dialog" if controller.from_dialog?}" }
4
-
4
+
5
5
  before_filter :login_required, :restrict_plugins, :restrict_controller
6
6
 
7
7
  helper_method :searching?
8
8
 
9
- def admin?
10
- true # we're in the admin base controller, so always true.
11
- end
12
-
13
- def searching?
9
+ def admin?
10
+ true # we're in the admin base controller, so always true.
11
+ end
12
+
13
+ def searching?
14
14
  not params[:search].blank?
15
15
  end
16
16
 
@@ -21,16 +21,16 @@ protected
21
21
  @page[:body] = @page[:body].gsub(/href=(\'|\")\/(\'|\")/, "href='/admin'").gsub("home page", "Dashboard")
22
22
  render :template => "/pages/show", :status => 404
23
23
  end
24
-
24
+
25
25
  def restrict_plugins
26
26
  Refinery::Plugins.set_active( current_user.authorized_plugins ) if current_user.respond_to? :plugins
27
27
  end
28
28
 
29
- def restrict_controller
29
+ def restrict_controller
30
30
  if Refinery::Plugins.active.reject {|plugin| params[:controller] !~ Regexp.new(plugin.menu_match) }.empty?
31
- flash[:error] = "You do not have permission to access the #{params[:controller]} controller on this plugin."
32
- logger.warn "'#{current_user.login}' tried to access '#{params[:controller]}'"
33
- end
34
- end
35
-
36
- end
31
+ flash[:error] = "You do not have permission to access the #{params[:controller]} controller on this plugin."
32
+ logger.warn "'#{current_user.login}' tried to access '#{params[:controller]}'"
33
+ end
34
+ end
35
+
36
+ end
@@ -1,53 +1,53 @@
1
1
  class Refinery::ApplicationController < ActionController::Base
2
-
3
- helper_method :home_page?, :local_request?, :just_installed?, :from_dialog?, :admin?
4
2
 
5
- protect_from_forgery # See ActionController::RequestForgeryProtection
3
+ helper_method :home_page?, :local_request?, :just_installed?, :from_dialog?, :admin?
6
4
 
7
- include Crud # basic create, read, update and delete methods
8
- include AuthenticatedSystem
5
+ protect_from_forgery # See ActionController::RequestForgeryProtection
9
6
 
10
- before_filter :find_pages_for_menu, :show_welcome_page
11
- rescue_from ActiveRecord::RecordNotFound, :with => :error_404
12
- rescue_from ActionController::UnknownAction, :with => :error_404
7
+ include Crud # basic create, read, update and delete methods
8
+ include AuthenticatedSystem
13
9
 
14
- def error_404
15
- @page = Page.find_by_menu_match("^/404$", :include => [:parts, :slugs])
16
- render :template => "/pages/show", :status => 404
17
- end
10
+ before_filter :find_pages_for_menu, :show_welcome_page
11
+ rescue_from ActiveRecord::RecordNotFound, :with => :error_404
12
+ rescue_from ActionController::UnknownAction, :with => :error_404
18
13
 
19
- def home_page?
20
- params[:action] == "home" and params[:controller] == "pages"
21
- end
14
+ def error_404
15
+ @page = Page.find_by_menu_match("^/404$", :include => [:parts, :slugs])
16
+ render :template => "/pages/show", :status => 404
17
+ end
22
18
 
23
- def local_request?
24
- request.remote_ip =~ /(::1)|(127.0.0.1)|((192.168).*)/ or ENV["RAILS_ENV"] == "development"
25
- end
19
+ def home_page?
20
+ params[:action] == "home" and params[:controller] == "pages"
21
+ end
26
22
 
27
- def just_installed?
28
- User.count == 0
29
- end
23
+ def local_request?
24
+ request.remote_ip =~ /(::1)|(127.0.0.1)|((192.168).*)/ or ENV["RAILS_ENV"] == "development"
25
+ end
30
26
 
31
- def from_dialog?
32
- params[:dialog] == "true" or params[:modal] == "true"
33
- end
27
+ def just_installed?
28
+ User.count == 0
29
+ end
34
30
 
35
- def admin?
36
- params[:controller] =~ /admin\/(.*)/
37
- end
31
+ def from_dialog?
32
+ params[:dialog] == "true" or params[:modal] == "true"
33
+ end
38
34
 
39
- def wymiframe
40
- render :template => "/wymiframe", :layout => false
41
- end
35
+ def admin?
36
+ params[:controller] =~ /admin\/(.*)/
37
+ end
42
38
 
43
- protected
39
+ def wymiframe
40
+ render :template => "/wymiframe", :layout => false
41
+ end
44
42
 
45
- def show_welcome_page
46
- render :template => "/welcome", :layout => "admin" if just_installed? and params[:controller] != "users"
47
- end
43
+ protected
48
44
 
49
- def find_pages_for_menu
50
- @menu_pages = Page.top_level(include_children=true) unless admin?
51
- end
52
-
53
- end
45
+ def show_welcome_page
46
+ render :template => "/welcome", :layout => "admin" if just_installed? and params[:controller] != "users"
47
+ end
48
+
49
+ def find_pages_for_menu
50
+ @menu_pages = Page.top_level(include_children=true) unless admin?
51
+ end
52
+
53
+ end
@@ -3,94 +3,94 @@ module Refinery::ApplicationHelper
3
3
  include Refinery::HtmlTruncationHelper
4
4
 
5
5
  def add_meta_tags
6
- content_for :head, "<meta name=\"keywords\" content=\"#{@page.meta_keywords}\" />" unless @page.meta_keywords.blank?
7
- content_for :head, "<meta name=\"description\" content=\"#{@page.meta_description}\" />" unless @page.meta_description.blank?
6
+ content_for :head, "<meta name=\"keywords\" content=\"#{@page.meta_keywords}\" />" unless @page.meta_keywords.blank?
7
+ content_for :head, "<meta name=\"description\" content=\"#{@page.meta_description}\" />" unless @page.meta_description.blank?
8
8
  end
9
-
9
+
10
10
  def add_page_title
11
- content_for :title,
12
- if @page.browser_title.blank?
13
- @page.path
11
+ content_for :title,
12
+ if @page.browser_title.blank?
13
+ @page.path
14
14
  else
15
- @page.browser_title
15
+ @page.browser_title
16
16
  end
17
17
  end
18
-
18
+
19
19
  def setup
20
20
  add_meta_tags
21
21
  add_page_title
22
22
  end
23
-
23
+
24
24
  def page_title(options = {})
25
- options = RefinerySetting.find_or_set(:page_title, {
26
- :chain_page_title => false,
27
- :ancestors => {
28
- :separator => " | ",
29
- :class => 'ancestors',
30
- :tag => 'span'
31
- },
32
- :page_title => {
33
- :class => nil,
34
- :tag => nil,
35
- :wrap_if_not_chained => false
36
- }
37
- }).merge(options)
38
-
39
- title = []
25
+ options = RefinerySetting.find_or_set(:page_title, {
26
+ :chain_page_title => false,
27
+ :ancestors => {
28
+ :separator => " | ",
29
+ :class => 'ancestors',
30
+ :tag => 'span'
31
+ },
32
+ :page_title => {
33
+ :class => nil,
34
+ :tag => nil,
35
+ :wrap_if_not_chained => false
36
+ }
37
+ }).merge(options)
38
+
39
+ title = []
40
40
  pages = options[:chain_page_title] ? [@page.ancestors, @page].flatten : [@page]
41
41
 
42
- pages.flatten.each do |page|
43
- title << case page.custom_title_type
44
- when "none"
45
- page.title
46
- when "text"
47
- page.custom_title
48
- when "image"
49
- image_fu page.custom_title_image, nil, {:alt => page.title} rescue page.title
50
- end
51
- end
52
-
53
- final_title = title.pop
54
- if (options[:page_title][:wrap_if_not_chained] and title.empty?) and !options[:page_title][:tag].blank?
55
- final_title = "<#{options[:page_title][:tag]}#{" class='#{options[:page_title][:class]}'" unless options[:page_title][:class].blank?}>#{final_title}</#{options[:page_title][:tag]}>"
56
- end
57
- if (title.empty?)
58
- final_title
59
- else
60
- "<#{options[:ancestors][:tag]} class='#{options[:ancestors][:class]}'>#{title.join options[:ancestors][:separator]}#{options[:ancestors][:separator]}</#{options[:ancestors][:tag]}>#{final_title}"
61
- end
42
+ pages.flatten.each do |page|
43
+ title << case page.custom_title_type
44
+ when "none"
45
+ page.title
46
+ when "text"
47
+ page.custom_title
48
+ when "image"
49
+ image_fu page.custom_title_image, nil, {:alt => page.title} rescue page.title
50
+ end
51
+ end
52
+
53
+ final_title = title.pop
54
+ if (options[:page_title][:wrap_if_not_chained] and title.empty?) and !options[:page_title][:tag].blank?
55
+ final_title = "<#{options[:page_title][:tag]}#{" class='#{options[:page_title][:class]}'" unless options[:page_title][:class].blank?}>#{final_title}</#{options[:page_title][:tag]}>"
56
+ end
57
+ if (title.empty?)
58
+ final_title
59
+ else
60
+ "<#{options[:ancestors][:tag]} class='#{options[:ancestors][:class]}'>#{title.join options[:ancestors][:separator]}#{options[:ancestors][:separator]}</#{options[:ancestors][:tag]}>#{final_title}"
61
+ end
62
62
  end
63
-
63
+
64
64
  def descendant_page_selected?(page)
65
- not page.descendants.reject {|descendant| not selected_page?(descendant) }.empty?
65
+ not page.descendants.reject {|descendant| not selected_page?(descendant) }.empty?
66
66
  end
67
-
67
+
68
68
  def selected_page?(page)
69
69
  selected = current_page?(page) or (request.path =~ Regexp.new(page.menu_match) unless page.menu_match.blank?) or (request.path == page.link_url)
70
- end
70
+ end
71
+
72
+ def image_fu(image, thumbnail = nil , options={})
73
+ begin
74
+ image_thumbnail = thumbnail.nil? ? image : image.thumbnails.collect {|t| t if t.thumbnail == thumbnail.to_s}.compact.first
75
+ image_tag image_thumbnail.public_filename, {:alt => image.title, :width => image_thumbnail.width, :height => image_thumbnail.height}.merge!(options)
76
+ rescue
77
+ image_tag image.public_filename(thumbnail), {:alt => image.title}.merge!(options)
78
+ end
79
+ end
80
+
81
+ def refinery_icon_tag(filename, options = {})
82
+ image_tag "refinery/icons/#{filename}", {:width => 16, :height => 16}.merge!(options)
83
+ end
71
84
 
72
- def image_fu(image, thumbnail = nil , options={})
73
- begin
74
- image_thumbnail = thumbnail.nil? ? image : image.thumbnails.collect {|t| t if t.thumbnail == thumbnail.to_s}.compact.first
75
- image_tag image_thumbnail.public_filename, {:alt => image.title, :width => image_thumbnail.width, :height => image_thumbnail.height}.merge!(options)
76
- rescue
77
- image_tag image.public_filename(thumbnail), {:alt => image.title}.merge!(options)
78
- end
79
- end
80
-
81
- def refinery_icon_tag(filename, options = {})
82
- image_tag "refinery/icons/#{filename}", {:width => 16, :height => 16}.merge!(options)
83
- end
84
-
85
85
  # replace all system images with a thumbnail version of them (handy for all images inside a page part)
86
86
  def content_fu(content, thumbnail)
87
87
  content.scan(/\/system\/images([^\"\ ]*)/).flatten.each do |match|
88
- parts = match.split(".")
89
- extension = parts.pop
90
- content.gsub!(match, "#{parts.join(".")}_#{thumbnail}.#{extension}")
91
- end
92
-
93
- return content
88
+ parts = match.split(".")
89
+ extension = parts.pop
90
+ content.gsub!(match, "#{parts.join(".")}_#{thumbnail}.#{extension}")
91
+ end
92
+
93
+ return content
94
94
  end
95
-
96
- end
95
+
96
+ end
@@ -1,28 +1,28 @@
1
1
  ActionView::Helpers::FormHelper.module_eval do
2
-
3
- def required_label(object_name, method, text = nil, options = {})
4
- options = {:class => "required"}.merge!(options)
5
- text ||= "#{method.to_s.humanize} *"
6
- label(object_name, method, text, options)
7
- end
8
-
2
+
3
+ def required_label(object_name, method, text = nil, options = {})
4
+ options = {:class => "required"}.merge!(options)
5
+ text ||= "#{method.to_s.humanize} *"
6
+ label(object_name, method, text, options)
7
+ end
8
+
9
9
  end
10
10
 
11
11
  ActionView::Helpers::FormBuilder.module_eval do
12
-
13
- def required_label(method, text = nil, options = {})
12
+
13
+ def required_label(method, text = nil, options = {})
14
14
  @template.required_label(@object_name, method, text, objectify_options(options))
15
15
  end
16
16
 
17
17
  end
18
18
 
19
19
  ActionView::Helpers::FormTagHelper.module_eval do
20
-
21
- def required_label_tag(name, text = nil, options = {})
22
- options = {:class => "required"}.merge!(options)
23
- text ||= "#{name.to_s.humanize} *"
24
-
25
- label_tag(name, text, options)
26
- end
27
-
28
- end
20
+
21
+ def required_label_tag(name, text = nil, options = {})
22
+ options = {:class => "required"}.merge!(options)
23
+ text ||= "#{name.to_s.humanize} *"
24
+
25
+ label_tag(name, text, options)
26
+ end
27
+
28
+ end
@@ -40,12 +40,12 @@ module Refinery::HtmlTruncationHelper
40
40
 
41
41
  if content_length > max_length
42
42
  truncated_doc = doc.truncate(actual_length)
43
-
43
+
44
44
  if (options[:preserve_full_words] || false)
45
45
  word_length = actual_length - (truncated_doc.inner_html.mb_chars.length - truncated_doc.inner_html.rindex(' '))
46
46
  truncated_doc = doc.truncate(word_length)
47
47
  end
48
-
48
+
49
49
  if (last_child = truncated_doc.children.last).inner_html.nil?
50
50
  "#{truncated_doc.inner_html}#{omission}#{options[:link]}" if options[:link]
51
51
  else
@@ -63,13 +63,13 @@ module Refinery::HtmlTruncationHelper
63
63
  else
64
64
  last_child.inner_html = last_child.inner_html.gsub(/\W.[^\s]+$/, "") + options[:link]
65
65
  doc
66
- end
66
+ end
67
67
  else
68
68
  text.to_s
69
69
  end
70
70
  end
71
71
  end
72
-
72
+
73
73
  end
74
74
 
75
75
  module HpricotTruncator
@@ -109,4 +109,4 @@ Hpricot::Doc.send(:include, HpricotTruncator::NodeWithChildren)
109
109
  Hpricot::Elem.send(:include, HpricotTruncator::NodeWithChildren)
110
110
  Hpricot::Text.send(:include, HpricotTruncator::TextNode)
111
111
  Hpricot::BogusETag.send(:include, HpricotTruncator::IgnoredTag)
112
- Hpricot::Comment.send(:include, HpricotTruncator::IgnoredTag)
112
+ Hpricot::Comment.send(:include, HpricotTruncator::IgnoredTag)
@@ -18,11 +18,11 @@ module Refinery
18
18
  Rails.configuration = configuration
19
19
  super
20
20
  end
21
-
21
+
22
22
  def load_plugins
23
23
  Refinery.add_gems
24
24
  super
25
25
  end
26
26
  end
27
27
  end
28
- end
28
+ end