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,17 +1,17 @@
1
1
  <ul id="image_grid" class="clearfix">
2
2
  <% @images.each do |image| -%>
3
- <li id="image_<%= image.id %>" <%= "class='row-end'" if (@images.index(image)+1) % 4 == 0 %>>
4
- <%= image_fu image, :grid, :title => image.title %>
5
- <span class='actions'>
6
- <%= link_to refinery_icon_tag('eye.png'), image.public_filename,
3
+ <li id="image_<%= image.id %>" <%= "class='row-end'" if (@images.index(image)+1) % 4 == 0 %>>
4
+ <%= image_fu image, :grid, :title => image.title %>
5
+ <span class='actions'>
6
+ <%= link_to refinery_icon_tag('eye.png'), image.public_filename,
7
7
  :target => "_blank", :title => "Click to view '#{image.title}'<br/><em>Opens in a new window</em>" %>
8
- <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_image_path(image),
9
- :title => 'Edit this image' %>
10
- <%= link_to refinery_icon_tag('delete.png'), admin_image_path(image),
11
- :confirm => "Are you sure you want to delete #{image.title}?",
12
- :class => "cancel", :method => :delete,
13
- :title => "Remove this image forever" %>
14
- </span>
15
- </li>
8
+ <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_image_path(image),
9
+ :title => 'Edit this image' %>
10
+ <%= link_to refinery_icon_tag('delete.png'), admin_image_path(image),
11
+ :confirm => "Are you sure you want to delete #{image.title}?",
12
+ :class => "cancel", :method => :delete,
13
+ :title => "Remove this image forever" %>
14
+ </span>
15
+ </li>
16
16
  <% end -%>
17
- </ul>
17
+ </ul>
@@ -9,4 +9,4 @@
9
9
  <ul>
10
10
  <%= render :partial => 'list_view_image', :collection => @images %>
11
11
  </ul>
12
- <% end %>
12
+ <% end %>
@@ -1,5 +1,5 @@
1
1
  <% if list_view_image.parent_id.nil? %>
2
- <li id="sortable_<%= list_view_image.id %>" class='clearfix record <%= cycle("on", "on-hover") %>'>
2
+ <li id="sortable_<%= list_view_image.id %>" class='clearfix record <%= cycle("on", "on-hover") %>'>
3
3
  <span class='title'>
4
4
  <span class='actions'>
5
5
  <%= link_to refinery_icon_tag('eye.png'), list_view_image.public_filename,
@@ -14,4 +14,4 @@
14
14
  <%= list_view_image.title %> <span class="preview">&nbsp;</span>
15
15
  </span>
16
16
  </li>
17
- <% end %>
17
+ <% end %>
@@ -1 +1 @@
1
- <%= render :partial => "form" %>
1
+ <%= render :partial => "form" %>
@@ -1,23 +1,23 @@
1
1
  <div id='actions'>
2
2
  <ul>
3
- <li>
4
- <%= render :partial => "/shared/admin/search", :locals => {:url => admin_images_url} %>
5
- </li>
3
+ <li>
4
+ <%= render :partial => "/shared/admin/search", :locals => {:url => admin_images_url} %>
5
+ </li>
6
6
  <li>
7
7
  <%= link_to "Create New Image", new_admin_image_url, :class => "add_icon" %>
8
8
  </li>
9
9
  </ul>
10
10
  <ul>
11
- <% image_views.delete_if {|image_view| image_view.to_s == current_image_view.to_s }.each do |image_view| %>
12
- <li>
13
- <%= link_to "Switch to #{image_view.to_s.titleize} View",
14
- admin_images_url(:view => image_view, :page => params[:page]),
15
- :class => "reorder_icon" %>
16
- </li>
17
- <% end %>
11
+ <% image_views.delete_if {|image_view| image_view.to_s == current_image_view.to_s }.each do |image_view| %>
12
+ <li>
13
+ <%= link_to "Switch to #{image_view.to_s.titleize} View",
14
+ admin_images_url(:view => image_view, :page => params[:page]),
15
+ :class => "reorder_icon" %>
16
+ </li>
17
+ <% end %>
18
18
  </ul>
19
19
  </div>
20
- <div id='records'>
20
+ <div id='records'>
21
21
  <% if searching? %>
22
22
  <h2>Search Results for "<%= params[:search] %>"</h2>
23
23
  <% if @images.size > 0 %>
@@ -27,9 +27,9 @@
27
27
  <% end %>
28
28
  <% else %>
29
29
  <% if @images.size > 0 %>
30
- <%= will_paginate @images, :previous_label => '&laquo;', :next_label => '&raquo;' %>
31
- <%= render :partial => "#{current_image_view}_view" %>
32
- <%= will_paginate @images, :previous_label => '&laquo;', :next_label => '&raquo;' %>
30
+ <%= will_paginate @images, :previous_label => '&laquo;', :next_label => '&raquo;' %>
31
+ <%= render :partial => "#{current_image_view}_view" %>
32
+ <%= will_paginate @images, :previous_label => '&laquo;', :next_label => '&raquo;' %>
33
33
  <% else %>
34
34
  <p>
35
35
  <strong>
@@ -39,4 +39,4 @@
39
39
  </p>
40
40
  <% end %>
41
41
  <% end %>
42
- </div>
42
+ </div>
@@ -1,58 +1,58 @@
1
1
  <div class='clearfix'>
2
- <div id='dialog_menu_left'>
3
- <% unless @images.empty? %>
4
- <span id='existing_image_radio' class='radio'>
5
- <input type='radio' name='image_type' value='existing_image' id='image_type_existing' <%= "checked='true'" if @image.errors.empty? %> />
6
- <label for='image_type_existing' class='stripped'>Existing Image</label>
7
- </span>
8
- <% end %>
9
- <span id='upload_image_radio' class='radio<%= " selected_radio" if @image.errors.size > 0 %>'>
10
- <input type='radio' name='image_type' value='upload_image' id='image_type_upload' <%= "checked='true'" if @images.empty? or !@image.errors.empty? %> />
11
- <label for='image_type_upload' class='stripped'>New Image</label>
12
- </span>
13
- </div>
2
+ <div id='dialog_menu_left'>
3
+ <% unless @images.empty? %>
4
+ <span id='existing_image_radio' class='radio'>
5
+ <input type='radio' name='image_type' value='existing_image' id='image_type_existing' <%= "checked='true'" if @image.errors.empty? %> />
6
+ <label for='image_type_existing' class='stripped'>Existing Image</label>
7
+ </span>
8
+ <% end %>
9
+ <span id='upload_image_radio' class='radio<%= " selected_radio" if @image.errors.size > 0 %>'>
10
+ <input type='radio' name='image_type' value='upload_image' id='image_type_upload' <%= "checked='true'" if @images.empty? or !@image.errors.empty? %> />
11
+ <label for='image_type_upload' class='stripped'>New Image</label>
12
+ </span>
13
+ </div>
14
14
 
15
- <div id='dialog_main'>
16
- <% unless @images.empty? %>
17
- <div id='existing_image_area' class='dialog_area' <%= "style='display:none;'" unless @image.errors.empty? %>>
18
- <input type='hidden' name='selected_image' id='selected_image' />
19
- <div id='existing_image_area_content' class='clearfix'>
20
- <ul>
21
- <% @images.each do |image| %>
22
- <li<%= " class='selected'" if @image_id == image.id %>>
23
- <%= image_fu image, :dialog_thumb, {:alt => image.title, :title => image.title, :id => "image_#{image.id}"} -%>
24
- </li>
25
- <% end -%>
26
- </ul>
27
- </div>
28
- <%= will_paginate @images, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;', :renderer => Refinery::LinkRenderer, :url => {:controller => "admin/images", :action => "insert", :dialog => @dialog} unless @thickbox %>
29
- </div>
30
- <% end %>
31
- <div id='upload_image_area' class='dialog_area' <%= "style='display:none;'" unless @images.empty? %>>
32
- <%= render :partial => "form", :locals => {:insert => true} %>
33
- </div>
34
- </div>
15
+ <div id='dialog_main'>
16
+ <% unless @images.empty? %>
17
+ <div id='existing_image_area' class='dialog_area' <%= "style='display:none;'" unless @image.errors.empty? %>>
18
+ <input type='hidden' name='selected_image' id='selected_image' />
19
+ <div id='existing_image_area_content' class='clearfix'>
20
+ <ul>
21
+ <% @images.each do |image| %>
22
+ <li<%= " class='selected'" if @image_id == image.id %>>
23
+ <%= image_fu image, :dialog_thumb, {:alt => image.title, :title => image.title, :id => "image_#{image.id}"} -%>
24
+ </li>
25
+ <% end -%>
26
+ </ul>
27
+ </div>
28
+ <%= will_paginate @images, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;', :renderer => Refinery::LinkRenderer, :url => {:controller => "admin/images", :action => "insert", :dialog => @dialog} unless @thickbox %>
29
+ </div>
30
+ <% end %>
31
+ <div id='upload_image_area' class='dialog_area' <%= "style='display:none;'" unless @images.empty? %>>
32
+ <%= render :partial => "form", :locals => {:insert => true} %>
33
+ </div>
34
+ </div>
35
35
  </div>
36
36
  <% if @thickbox %>
37
37
  <div id='dialog-form-actions' class='form-actions'>
38
- <%= submit_tag 'Insert', :id => "submit_button" %>
39
- or
40
- <%= link_to "Cancel", "", :id => "cancel_button", :class => "close_dialog" %>
41
-
42
- <%= will_paginate @images, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;', :renderer => Refinery::LinkRenderer, :url => {:controller => "admin/images", :action => "insert", :dialog => @dialog } %>
38
+ <%= submit_tag 'Insert', :id => "submit_button" %>
39
+ or
40
+ <%= link_to "Cancel", "", :id => "cancel_button", :class => "close_dialog" %>
41
+
42
+ <%= will_paginate @images, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;', :renderer => Refinery::LinkRenderer, :url => {:controller => "admin/images", :action => "insert", :dialog => @dialog } %>
43
43
  </div>
44
44
  <% end %>
45
45
  <% content_for :head do %>
46
46
  <%= javascript_include_tag 'refinery/parse_url' %>
47
- <script type='text/javascript'>
48
- set_image = function(img)
49
- {
50
- $$('#existing_image_area_content ul li.selected').each(function(selected)
51
- {
52
- $(selected).removeClassName('selected');
53
- });
54
- if (img != null) {
55
- $(img.parentNode).addClassName('selected');
47
+ <script type='text/javascript'>
48
+ set_image = function(img)
49
+ {
50
+ $$('#existing_image_area_content ul li.selected').each(function(selected)
51
+ {
52
+ $(selected).removeClassName('selected');
53
+ });
54
+ if (img != null) {
55
+ $(img.parentNode).addClassName('selected');
56
56
  imageUrl = parseURL(img.src);
57
57
  relevant_src = imageUrl.pathname.replace('_dialog_thumb', '');
58
58
  // Add any alternate image stores that need a absolute URL in the regex below
@@ -60,54 +60,54 @@
60
60
  relevant_src = imageUrl.protocol + '//' + imageUrl.host + relevant_src;
61
61
  }
62
62
  <% unless @thickbox %>
63
- try {
64
- parent.document.getElementById('wym_src').value = relevant_src;
65
- parent.document.getElementById('wym_title').value = img.title;
66
- parent.document.getElementById('wym_alt').value = img.alt;
67
- }
68
- catch($e){}
63
+ try {
64
+ parent.document.getElementById('wym_src').value = relevant_src;
65
+ parent.document.getElementById('wym_title').value = img.title;
66
+ parent.document.getElementById('wym_alt').value = img.alt;
67
+ }
68
+ catch($e){}
69
69
 
70
70
  <% end %>
71
- }
72
- }
73
-
74
- FastInit.addOnLoad(function()
75
- {
71
+ }
72
+ }
73
+
74
+ FastInit.addOnLoad(function()
75
+ {
76
76
  <% unless @image_id.nil? %>
77
- set_image($('image_<%= @image_id %>'));
77
+ set_image($('image_<%= @image_id %>'));
78
78
  <% end %>
79
- $$('#existing_image_area_content ul li img').each(function(img)
80
- {
81
- img.observe('click', function(){set_image(this);});
82
- });
83
-
79
+ $$('#existing_image_area_content ul li img').each(function(img)
80
+ {
81
+ img.observe('click', function(){set_image(this);});
82
+ });
83
+
84
84
  <% if @thickbox %>
85
- $('dialog-form-actions').down('#submit_button').observe('click', function(e)
86
- {
87
- selected = null;
88
- $$('#existing_image_area_content ul li.selected img').each(function(selected_img)
89
- {
90
- selected = selected_img;
91
- });
92
- if (selected != null)
93
- {
94
- <% unless @field.blank? %>
95
- if ((field = parent.document.getElementById('<%= @field %>')) != null)
96
- {
97
- field.value = selected.id.replace("image_", "");
98
- }
99
- if ((image = parent.document.getElementById('<%= @update_image %>')) != null)
100
- {
101
- image.src = selected.src.replace("_dialog_thumb", '<%= "_#{@thumbnail}" unless @thumbnail.blank? %>');
102
- $(image).writeAttribute("width", null).writeAttribute("height", null);
103
- }
104
- <% end %>
105
- <%= "self.parent.#{@callback}();" unless @callback.blank? %>
106
- self.parent.tb_remove();
107
- }
108
- e.stop();
109
- });
85
+ $('dialog-form-actions').down('#submit_button').observe('click', function(e)
86
+ {
87
+ selected = null;
88
+ $$('#existing_image_area_content ul li.selected img').each(function(selected_img)
89
+ {
90
+ selected = selected_img;
91
+ });
92
+ if (selected != null)
93
+ {
94
+ <% unless @field.blank? %>
95
+ if ((field = parent.document.getElementById('<%= @field %>')) != null)
96
+ {
97
+ field.value = selected.id.replace("image_", "");
98
+ }
99
+ if ((image = parent.document.getElementById('<%= @update_image %>')) != null)
100
+ {
101
+ image.src = selected.src.replace("_dialog_thumb", '<%= "_#{@thumbnail}" unless @thumbnail.blank? %>');
102
+ $(image).writeAttribute("width", null).writeAttribute("height", null);
103
+ }
104
+ <% end %>
105
+ <%= "self.parent.#{@callback}();" unless @callback.blank? %>
106
+ self.parent.tb_remove();
107
+ }
108
+ e.stop();
109
+ });
110
+ <% end %>
111
+ });
112
+ </script>
110
113
  <% end %>
111
- });
112
- </script>
113
- <% end %>
@@ -1 +1 @@
1
- <%= render :partial => "/admin/images/form" %>
1
+ <%= render :partial => "/admin/images/form" %>
@@ -1,5 +1,5 @@
1
1
  ActionController::Routing::Routes.draw do |map|
2
- map.namespace(:admin) do |admin|
2
+ map.namespace(:admin) do |admin|
3
3
  admin.resources :images, :collection => {:insert => :get}
4
4
  end
5
- end
5
+ end
@@ -1,8 +1,8 @@
1
1
  Refinery::Plugin.register do |plugin|
2
- plugin.directory = directory
3
- plugin.title = "Images"
4
- plugin.description = "Manage images"
5
- plugin.version = 1.0
6
- plugin.menu_match = /admin\/((images)|(image_dialogs))$/
7
- plugin.activity = {:class => Image, :title => 'title', :url_prefix => 'edit', :conditions => "parent_id IS NULL", :created_image => "image_add.png", :updated_image => "image_edit.png"}
8
- end
2
+ plugin.directory = directory
3
+ plugin.title = "Images"
4
+ plugin.description = "Manage images"
5
+ plugin.version = 1.0
6
+ plugin.menu_match = /admin\/((images)|(image_dialogs))$/
7
+ plugin.activity = {:class => Image, :title => 'title', :url_prefix => 'edit', :conditions => "parent_id IS NULL", :created_image => "image_add.png", :updated_image => "image_edit.png"}
8
+ end
@@ -4,11 +4,11 @@ class Admin::InquiriesController < Admin::BaseController
4
4
 
5
5
  before_filter :find_inquiry, :only => [:show, :toggle_status, :destroy]
6
6
  before_filter :find_all_inquiries, :only => [:index]
7
-
7
+
8
8
  def toggle_status
9
9
  @inquiry.toggle!(:open)
10
10
 
11
- flash[:notice] = "'#{@inquiry.name}' has been " +
11
+ flash[:notice] = "'#{@inquiry.name}' has been " +
12
12
  if @inquiry.open?
13
13
  "reopened"
14
14
  else
@@ -25,5 +25,5 @@ protected
25
25
  @closed_inquiries = Inquiry.closed
26
26
  @inquiries = @open_inquiries
27
27
  end
28
-
29
- end
28
+
29
+ end
@@ -1,10 +1,10 @@
1
1
  class Admin::InquirySettingsController < Admin::BaseController
2
-
2
+
3
3
  crudify :inquiry_setting, :title_attribute => "name", :order => 'name ASC'
4
-
4
+
5
5
  def update
6
6
  @inquiry_setting.update_attributes(params[:inquiry_setting])
7
-
7
+
8
8
  if @inquiry_setting.valid?
9
9
  flash[:notice] = "'#{@inquiry_setting.name}' was successfully updated."
10
10
  redirect_to admin_inquiries_url
@@ -12,5 +12,5 @@ class Admin::InquirySettingsController < Admin::BaseController
12
12
  render :action => 'edit'
13
13
  end
14
14
  end
15
-
16
- end
15
+
16
+ end
@@ -4,7 +4,7 @@ class InquiriesController < ApplicationController
4
4
 
5
5
  def thank_you
6
6
  @page = Page.find_by_menu_match("^/inquiries/thank_you$", :include => [:parts, :slugs])
7
-
7
+
8
8
  respond_to do |wants|
9
9
  wants.html
10
10
  end
@@ -12,7 +12,7 @@ class InquiriesController < ApplicationController
12
12
 
13
13
  def new
14
14
  @inquiry = Inquiry.new
15
-
15
+
16
16
  respond_to do |wants|
17
17
  wants.html
18
18
  end
@@ -46,4 +46,4 @@ protected
46
46
  @page = Page.find_by_link_url('/inquiries/new', :include => [:parts, :slugs])
47
47
  end
48
48
 
49
- end
49
+ end
@@ -1,5 +1,5 @@
1
1
  module InquiriesHelper
2
-
2
+
3
3
  def open_close_link(inquiry)
4
4
  if inquiry.open?
5
5
  link_to("Open", {:action => 'toggle_status', :id => inquiry.id},
@@ -9,5 +9,5 @@ module InquiriesHelper
9
9
  {:title => "Click to open this inquiry back up"})
10
10
  end
11
11
  end
12
-
13
- end
12
+
13
+ end
@@ -3,16 +3,16 @@ class Inquiry < ActiveRecord::Base
3
3
  validates_presence_of :name
4
4
  validates_format_of :email,
5
5
  :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i,
6
- :message => 'must be valid'
7
-
6
+ :message => 'must be valid'
7
+
8
8
  acts_as_indexed :fields => [:name, :email, :message, :phone]
9
-
9
+
10
10
  def self.closed
11
11
  find_all_by_open(false, :order => "created_at DESC")
12
12
  end
13
-
13
+
14
14
  def self.opened
15
15
  find_all_by_open(true, :order => "created_at DESC")
16
16
  end
17
-
18
- end
17
+
18
+ end