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
@@ -1,7 +1,7 @@
1
- <%= sortable_element('sortable_list',
1
+ <%= sortable_element('sortable_list',
2
2
  :loading => "$('sort-status').innerHTML = 'Saving order...'",
3
3
  :loaded => "$('sort-status').innerHTML = 'New Order Saved.';
4
- new Effect.Highlight('sort-status', {startcolor:'#00a017', endcolor:'#f2f1ed'})",
4
+ new Effect.Highlight('sort-status', {startcolor:'#00a017', endcolor:'#f2f1ed'})",
5
5
  :update => 'refinery_settings_list',
6
6
  :url => {:action => :update_positions}
7
- ) -%>
7
+ ) -%>
@@ -1,13 +1,13 @@
1
1
  <li class='clearfix record <%= cycle("on", "on-hover") %>'>
2
- <span class='title'>
3
- <span class='actions'>
4
- <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_refinery_setting_path(refinery_setting),
5
- :title => 'Edit this setting' %>
6
- <%= link_to refinery_icon_tag("delete.png"), admin_refinery_setting_path(refinery_setting),
7
- :confirm => 'Are you sure you want to remove this setting forever?',
8
- :class => "cancel", :method => :delete,
9
- :title => 'Remove this setting forever' if refinery_setting.destroyable %>
10
- </span>
11
- <%=h refinery_setting.name.titleize %> <span class="preview">- <%=h truncate(refinery_setting.value.to_s, :length => 40) %></span>
12
- </span>
13
- </li>
2
+ <span class='title'>
3
+ <span class='actions'>
4
+ <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_refinery_setting_path(refinery_setting),
5
+ :title => 'Edit this setting' %>
6
+ <%= link_to refinery_icon_tag("delete.png"), admin_refinery_setting_path(refinery_setting),
7
+ :confirm => 'Are you sure you want to remove this setting forever?',
8
+ :class => "cancel", :method => :delete,
9
+ :title => 'Remove this setting forever' if refinery_setting.destroyable %>
10
+ </span>
11
+ <%=h refinery_setting.name.titleize %> <span class="preview">- <%=h truncate(refinery_setting.value.to_s, :length => 40) %></span>
12
+ </span>
13
+ </li>
@@ -1,4 +1,4 @@
1
1
  <%= render :partial => "form" %>
2
2
  <div style='margin-top: 12px'>
3
- <strong>Please note</strong> that you may need to restart the website for this setting to take effect.
4
- </div>
3
+ <strong>Please note</strong> that you may need to restart the website for this setting to take effect.
4
+ </div>
@@ -1,33 +1,33 @@
1
1
  <div id='actions'>
2
- <ul>
3
- <li>
4
- <%= link_to "Create New Setting", new_admin_refinery_setting_url, :class => "add_icon" %>
5
- </li>
6
- </ul>
2
+ <ul>
3
+ <li>
4
+ <%= link_to "Create New Setting", new_admin_refinery_setting_url, :class => "add_icon" %>
5
+ </li>
6
+ </ul>
7
7
  </div>
8
8
  <div id='records'>
9
9
  <% if searching? %>
10
10
  <% if @refinery_settings.size > 0 %>
11
11
  <ul>
12
- <%= render :partial => 'refinery_setting', :collection => @refinery_settings %>
12
+ <%= render :partial => 'refinery_setting', :collection => @refinery_settings %>
13
13
  </ul>
14
14
  <% else %>
15
15
  <p>Sorry, no results found</p>
16
16
  <% end %>
17
17
  <% else %>
18
- <% if @refinery_settings.size > 0 %>
19
- <%= will_paginate @refinery_settings, :previous_label => '&laquo;', :next_label => '&raquo;' %>
18
+ <% if @refinery_settings.size > 0 %>
19
+ <%= will_paginate @refinery_settings, :previous_label => '&laquo;', :next_label => '&raquo;' %>
20
20
  <ul>
21
- <%= render :partial => 'refinery_setting', :collection => @refinery_settings %>
21
+ <%= render :partial => 'refinery_setting', :collection => @refinery_settings %>
22
22
  </ul>
23
- <%= will_paginate @refinery_settings, :previous_label => '&laquo;', :next_label => '&raquo;' %>
24
- <% else %>
25
- <p>
26
- <strong>
27
- There are no settings yet.
28
- Click "Create New Setting" to add your first setting.
29
- </strong>
30
- </p>
31
- <% end %>
23
+ <%= will_paginate @refinery_settings, :previous_label => '&laquo;', :next_label => '&raquo;' %>
24
+ <% else %>
25
+ <p>
26
+ <strong>
27
+ There are no settings yet.
28
+ Click "Create New Setting" to add your first setting.
29
+ </strong>
30
+ </p>
31
+ <% end %>
32
32
  <% end %>
33
- </div>
33
+ </div>
@@ -1 +1 @@
1
- <%= render :partial => "form" %>
1
+ <%= render :partial => "form" %>
@@ -1,5 +1,5 @@
1
1
  ActionController::Routing::Routes.draw do |map|
2
- map.namespace(:admin) do |admin|
3
- admin.resources :refinery_settings, :as => :settings
2
+ map.namespace(:admin) do |admin|
3
+ admin.resources :refinery_settings, :as => :settings
4
4
  end
5
- end
5
+ end
@@ -1,9 +1,9 @@
1
1
  Refinery::Plugin.register do |plugin|
2
- plugin.directory = directory
3
- plugin.title = "Settings"
4
- plugin.description = "Manage Refinery settings"
5
- plugin.version = 1.0
6
- plugin.url = "/admin/settings"
7
- plugin.menu_match = /admin\/((refinery_settings)|(settings))$/
8
- plugin.activity = {:class => RefinerySetting, :title => 'title', :url_prefix => 'edit', :created_image => "cog_add.png", :updated_image => "cog_edit.png"}
9
- end
2
+ plugin.directory = directory
3
+ plugin.title = "Settings"
4
+ plugin.description = "Manage Refinery settings"
5
+ plugin.version = 1.0
6
+ plugin.url = "/admin/settings"
7
+ plugin.menu_match = /admin\/((refinery_settings)|(settings))$/
8
+ plugin.activity = {:class => RefinerySetting, :title => 'title', :url_prefix => 'edit', :created_image => "cog_add.png", :updated_image => "cog_edit.png"}
9
+ end
@@ -1,34 +1,34 @@
1
1
  class Admin::ResourcesController < Admin::BaseController
2
-
2
+
3
3
  crudify :resource, :order => "updated_at DESC"
4
-
5
- def new
6
- @resource = Resource.new
7
-
4
+
5
+ def new
6
+ @resource = Resource.new
7
+
8
8
  @url_override = admin_resources_url(:dialog => from_dialog?)
9
- end
10
-
11
- def create
9
+ end
10
+
11
+ def create
12
12
  @resource = Resource.create params[:resource]
13
-
14
- unless params[:insert]
15
- if @resource.valid?
16
- flash[:notice] = "'#{@resource.title}' was successfully created."
17
- unless from_dialog?
18
- redirect_to :action => 'index'
19
- else
20
- render :text => "<script type='text/javascript'>parent.window.location = '#{admin_resources_url}';</script>"
21
- end
22
- else
23
- render :action => 'new'
24
- end
25
- else
26
- @resource_id = @resource.id
27
- @resource = nil
28
- self.insert
29
- end
13
+
14
+ unless params[:insert]
15
+ if @resource.valid?
16
+ flash[:notice] = "'#{@resource.title}' was successfully created."
17
+ unless from_dialog?
18
+ redirect_to :action => 'index'
19
+ else
20
+ render :text => "<script type='text/javascript'>parent.window.location = '#{admin_resources_url}';</script>"
21
+ end
22
+ else
23
+ render :action => 'new'
24
+ end
25
+ else
26
+ @resource_id = @resource.id
27
+ @resource = nil
28
+ self.insert
29
+ end
30
30
  end
31
-
31
+
32
32
  def index
33
33
  if searching?
34
34
  @resources = Resource.paginate_search params[:search],
@@ -38,7 +38,7 @@ class Admin::ResourcesController < Admin::BaseController
38
38
  @resources = Resource.paginate :page => params[:page],
39
39
  :order => "created_at DESC"
40
40
  end
41
-
41
+
42
42
  if RefinerySetting.find_or_set(:group_resources_by_date_uploaded, true)
43
43
  @grouped_resources = []
44
44
  @resources.each do |resource|
@@ -48,7 +48,7 @@ class Admin::ResourcesController < Admin::BaseController
48
48
  end
49
49
  end
50
50
  end
51
-
51
+
52
52
  def insert
53
53
  self.new if @resource.nil?
54
54
  @dialog = from_dialog?
@@ -58,30 +58,30 @@ class Admin::ResourcesController < Admin::BaseController
58
58
  @update_text = params[:update_text]
59
59
  @thumbnail = params[:thumbnail]
60
60
  @callback = params[:callback]
61
- @conditions = params[:conditions]
62
- @current_link = params[:current_link]
61
+ @conditions = params[:conditions]
62
+ @current_link = params[:current_link]
63
63
  @url_override = admin_resources_url(:dialog => @dialog, :insert => true)
64
64
 
65
- unless params[:conditions].blank?
66
- extra_condition = params[:conditions].split(',')
67
-
68
- extra_condition[1] = true if extra_condition[1] == "true"
69
- extra_condition[1] = false if extra_condition[1] == "false"
70
- extra_condition[1] = nil if extra_condition[1] == "nil"
71
- paginate_resources({extra_condition[0].to_sym => extra_condition[1]})
72
- else
73
- paginate_resources
74
- end
65
+ unless params[:conditions].blank?
66
+ extra_condition = params[:conditions].split(',')
67
+
68
+ extra_condition[1] = true if extra_condition[1] == "true"
69
+ extra_condition[1] = false if extra_condition[1] == "false"
70
+ extra_condition[1] = nil if extra_condition[1] == "nil"
71
+ paginate_resources({extra_condition[0].to_sym => extra_condition[1]})
72
+ else
73
+ paginate_resources
74
+ end
75
75
  render :action => "insert"
76
76
  end
77
-
77
+
78
78
  protected
79
79
 
80
- def paginate_resources(conditions={})
81
- @resources = Resource.paginate :page => (@paginate_page_number ||= params[:page]),
82
- :conditions => conditions,
83
- :order => 'created_at DESC',
84
- :per_page => Resource.per_page(from_dialog?)
85
- end
80
+ def paginate_resources(conditions={})
81
+ @resources = Resource.paginate :page => (@paginate_page_number ||= params[:page]),
82
+ :conditions => conditions,
83
+ :order => 'created_at DESC',
84
+ :per_page => Resource.per_page(from_dialog?)
85
+ end
86
86
 
87
- end
87
+ end
@@ -1,14 +1,14 @@
1
1
  class Resource < ActiveRecord::Base
2
-
2
+
3
3
  has_attachment :storage => :file_system,
4
- :size => 0.kilobytes..50.megabytes,
4
+ :size => 0.kilobytes..50.megabytes,
5
5
  :path_prefix => 'public/system/resources'
6
6
 
7
7
  acts_as_indexed :fields => [:title, :type_of_content]
8
8
 
9
9
  def validate
10
10
  errors.add_to_base("You must choose a file to upload") unless self.filename
11
-
11
+
12
12
  unless self.filename.nil?
13
13
  [:size].each do |attr_name|
14
14
  enum = attachment_options[attr_name]
@@ -17,20 +17,20 @@ class Resource < ActiveRecord::Base
17
17
  end
18
18
  end
19
19
  end
20
-
20
+
21
21
  end
22
-
22
+
23
23
  # used for searching
24
24
  def type_of_content
25
25
  self.content_type.split("/").join(" ")
26
26
  end
27
27
 
28
- def title
29
- (split_filename = self[:filename].split('.')).pop and return split_filename.join('.').titleize
30
- end
28
+ def title
29
+ (split_filename = self[:filename].split('.')).pop and return split_filename.join('.').titleize
30
+ end
31
31
 
32
- def self.per_page(dialog = false)
33
- size = (dialog ? 12 : 20)
32
+ def self.per_page(dialog = false)
33
+ size = (dialog ? 12 : 20)
34
34
  end
35
-
36
- end
35
+
36
+ end
@@ -1,26 +1,26 @@
1
1
  <%= error_messages_for :resource -%>
2
2
 
3
- <% form_for [:admin, @resource], :url => @url_override || @url,
4
- :html => {:multipart => true} do |f| -%>
5
- <div class='field'>
6
- <%= f.label :uploaded_data, 'File to upload' -%>
7
- <% if params[:action] =~ /(edit)|(update)/ -%>
8
- <%= link_to "Download current file", @resource.public_filename, {:title => @resource.title} -%>
9
- <em>or</em>, replace it with this one...
10
- <% end -%>
11
- <%= f.file_field :uploaded_data -%>
12
- </div>
3
+ <% form_for [:admin, @resource], :url => @url_override || @url,
4
+ :html => {:multipart => true} do |f| -%>
5
+ <div class='field'>
6
+ <%= f.label :uploaded_data, 'File to upload' -%>
7
+ <% if params[:action] =~ /(edit)|(update)/ -%>
8
+ <%= link_to "Download current file", @resource.public_filename, {:title => @resource.title} -%>
9
+ <em>or</em>, replace it with this one...
10
+ <% end -%>
11
+ <%= f.file_field :uploaded_data -%>
12
+ </div>
13
13
 
14
14
  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
15
15
 
16
- <% if @thickbox %>
17
- <input type='hidden' name='thickbox' value='<%= @thickbox %>' />
18
- <input type='hidden' name='field' value='<%= @field %>' />
19
- <input type='hidden' name='update_resource' value='<%= @update_resource %>' />
20
- <input type='hidden' name='update_text' value='<%= @update_text %>' />
21
- <input type='hidden' name='thumbnail' value='<%= @thumbnail %>' />
22
- <input type='hidden' name='callback' value='<%= @callback %>' />
23
- <input type='hidden' name='conditions' value='<%= @conditions %>' />
24
- <input type='hidden' name='current_link' value='<%= @current_link %>' />
25
- <% end %>
26
- <% end -%>
16
+ <% if @thickbox %>
17
+ <input type='hidden' name='thickbox' value='<%= @thickbox %>' />
18
+ <input type='hidden' name='field' value='<%= @field %>' />
19
+ <input type='hidden' name='update_resource' value='<%= @update_resource %>' />
20
+ <input type='hidden' name='update_text' value='<%= @update_text %>' />
21
+ <input type='hidden' name='thumbnail' value='<%= @thumbnail %>' />
22
+ <input type='hidden' name='callback' value='<%= @callback %>' />
23
+ <input type='hidden' name='conditions' value='<%= @conditions %>' />
24
+ <input type='hidden' name='current_link' value='<%= @current_link %>' />
25
+ <% end %>
26
+ <% end -%>
@@ -1,16 +1,16 @@
1
1
  <li class='clearfix record <%= cycle("on", "on-hover") %>'>
2
- <span class='title'>
3
- <span class='actions'>
4
- <%= link_to refinery_icon_tag('page_white_put.png'), resource.public_filename,
5
- :title => "Download this file (#{number_to_human_size(resource.size)})" %>
6
- <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_resource_url(resource),
7
- :title => "Edit this file" %>
8
- <%= link_to refinery_icon_tag('delete.png'), admin_resource_path(resource),
9
- :confirm => "Are you sure you want to delete '#{resource.title}'?",
10
- :class => "cancel", :method => :delete,
11
- :title => "Remove this file forever" %>
12
- </span>
13
- <%=h resource.title %>
14
- <span class="preview">- <%= number_to_human_size(resource.size) %> - <%= resource.public_filename -%></span>
15
- </span>
16
- </li>
2
+ <span class='title'>
3
+ <span class='actions'>
4
+ <%= link_to refinery_icon_tag('page_white_put.png'), resource.public_filename,
5
+ :title => "Download this file (#{number_to_human_size(resource.size)})" %>
6
+ <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_resource_url(resource),
7
+ :title => "Edit this file" %>
8
+ <%= link_to refinery_icon_tag('delete.png'), admin_resource_path(resource),
9
+ :confirm => "Are you sure you want to delete '#{resource.title}'?",
10
+ :class => "cancel", :method => :delete,
11
+ :title => "Remove this file forever" %>
12
+ </span>
13
+ <%=h resource.title %>
14
+ <span class="preview">- <%= number_to_human_size(resource.size) %> - <%= resource.public_filename -%></span>
15
+ </span>
16
+ </li>
@@ -1 +1 @@
1
- <%= render :partial => "form" -%>
1
+ <%= render :partial => "form" -%>
@@ -1,26 +1,26 @@
1
1
  <div id='actions'>
2
- <ul>
3
- <li>
4
- <%= render :partial => "/shared/admin/search", :locals => {:url => admin_resources_url} %>
5
- </li>
6
- <li>
7
- <%= link_to "Upload New File", new_admin_resource_url, :class => "add_icon" %>
8
- </li>
9
- </ul>
2
+ <ul>
3
+ <li>
4
+ <%= render :partial => "/shared/admin/search", :locals => {:url => admin_resources_url} %>
5
+ </li>
6
+ <li>
7
+ <%= link_to "Upload New File", new_admin_resource_url, :class => "add_icon" %>
8
+ </li>
9
+ </ul>
10
10
  </div>
11
11
  <div id='records'>
12
12
  <% if searching? %>
13
13
  <h2>Search Results for "<%= params[:search] %>"</h2>
14
14
  <% if @resources.size > 0 %>
15
- <%= render :partial => "resource", :collection => @resources %>
15
+ <%= render :partial => "resource", :collection => @resources %>
16
16
  <% else %>
17
17
  <p>Sorry, no results found.</p>
18
18
  <% end %>
19
- <% else %>
19
+ <% else %>
20
20
  <% if @resources.size > 0 -%>
21
- <%= will_paginate @resources, :previous_label => '&laquo;', :next_label => '&raquo;' %>
22
- <% if RefinerySetting.find_or_set(:group_resources_by_date_uploaded, true) %>
23
- <% @grouped_resources.each do |container| %>
21
+ <%= will_paginate @resources, :previous_label => '&laquo;', :next_label => '&raquo;' %>
22
+ <% if RefinerySetting.find_or_set(:group_resources_by_date_uploaded, true) %>
23
+ <% @grouped_resources.each do |container| %>
24
24
  <h3><%= (resource_group = container.last).first.created_at.strftime("%A, %d %B %Y") %></h3>
25
25
  <ul>
26
26
  <%= render :partial => "resource", :collection => resource_group %>
@@ -28,14 +28,14 @@
28
28
  <% end %>
29
29
  <% else %>
30
30
  <ul>
31
- <%= render :partial => "resource", :collection => @resources %>
32
- </ul>
31
+ <%= render :partial => "resource", :collection => @resources %>
32
+ </ul>
33
33
  <% end %>
34
- <%= will_paginate @resources, :previous_label => '&laquo;', :next_label => '&raquo;' %>
34
+ <%= will_paginate @resources, :previous_label => '&laquo;', :next_label => '&raquo;' %>
35
35
  <% else -%>
36
- <p>
37
- <strong>There are no files yet. Click "Upload New Files" to add your first file.</strong>
38
- </p>
36
+ <p>
37
+ <strong>There are no files yet. Click "Upload New Files" to add your first file.</strong>
38
+ </p>
39
39
  <% end -%>
40
40
  <% end %>
41
41
  </div>