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
@@ -17,4 +17,4 @@ class InquiryMailer < ActionMailer::Base
17
17
  body :inquiry => inquiry
18
18
  end
19
19
 
20
- end
20
+ end
@@ -1,5 +1,5 @@
1
1
  class InquirySetting < ActiveRecord::Base
2
-
2
+
3
3
  def self.confirmation_body
4
4
  find_or_create_by_name("Confirmation Body")
5
5
  end
@@ -7,5 +7,5 @@ class InquirySetting < ActiveRecord::Base
7
7
  def self.notification_recipients
8
8
  find_or_create_by_name("Notification Recipients")
9
9
  end
10
-
11
- end
10
+
11
+ end
@@ -1,25 +1,25 @@
1
1
  <li class='clearfix record <%= cycle("on", "on-hover") %>'>
2
2
  <span class='title'>
3
- <span class='actions'>
4
- <% if inquiry.open? %>
5
- <%= link_to refinery_icon_tag('accept.png'), {:action => 'toggle_status', :id => inquiry.id},
6
- {:title => "Move this inquiry to closed"} -%>
7
- <% else %>
8
- <%= link_to refinery_icon_tag('arrow_up.png'), {:action => 'toggle_status', :id => inquiry.id},
9
- {:title => "Move this inquiry to open"} -%>
3
+ <span class='actions'>
4
+ <% if inquiry.open? %>
5
+ <%= link_to refinery_icon_tag('accept.png'), {:action => 'toggle_status', :id => inquiry.id},
6
+ {:title => "Move this inquiry to closed"} -%>
7
+ <% else %>
8
+ <%= link_to refinery_icon_tag('arrow_up.png'), {:action => 'toggle_status', :id => inquiry.id},
9
+ {:title => "Move this inquiry to open"} -%>
10
10
  <% end %>
11
- <%= link_to refinery_icon_tag('email_open.png'), {:action => 'show', :id => inquiry.id},
12
- {:title => "Read this inquiry"} -%>
13
- <%= link_to refinery_icon_tag('delete.png'), admin_inquiry_url(inquiry),
14
- :method => :delete, :class => "cancel",
15
- :confirm => "Are you sure you want to delete #{inquiry.name}?",
16
- :title => "Remove this inquiry forever" -%>
17
- </span>
18
- <%=h inquiry.name %>
19
- <span class="preview">
20
- - <%= truncate(strip_tags(inquiry.message), :length => 50) -%>
21
- </span>
22
- </span>
11
+ <%= link_to refinery_icon_tag('email_open.png'), {:action => 'show', :id => inquiry.id},
12
+ {:title => "Read this inquiry"} -%>
13
+ <%= link_to refinery_icon_tag('delete.png'), admin_inquiry_url(inquiry),
14
+ :method => :delete, :class => "cancel",
15
+ :confirm => "Are you sure you want to delete #{inquiry.name}?",
16
+ :title => "Remove this inquiry forever" -%>
17
+ </span>
18
+ <%=h inquiry.name %>
19
+ <span class="preview">
20
+ - <%= truncate(strip_tags(inquiry.message), :length => 50) -%>
21
+ </span>
22
+ </span>
23
23
  </li>
24
24
 
25
25
 
@@ -1,43 +1,43 @@
1
1
  <div id='actions'>
2
- <ul>
3
- <li>
4
- <%= render :partial => "/shared/admin/search", :locals => {:url => admin_inquiries_url} %>
5
- </li>
6
- <li>
7
- <%= link_to "Update who gets notified", edit_admin_inquiry_setting_url(InquirySetting.notification_recipients),
8
- :class => "user_comment_icon" %>
9
- </li>
10
- <li>
11
- <%= link_to "Edit confirmation email", edit_admin_inquiry_setting_url(InquirySetting.confirmation_body),
12
- :class => "edit_email_icon" %>
13
- </li>
14
- </ul>
2
+ <ul>
3
+ <li>
4
+ <%= render :partial => "/shared/admin/search", :locals => {:url => admin_inquiries_url} %>
5
+ </li>
6
+ <li>
7
+ <%= link_to "Update who gets notified", edit_admin_inquiry_setting_url(InquirySetting.notification_recipients),
8
+ :class => "user_comment_icon" %>
9
+ </li>
10
+ <li>
11
+ <%= link_to "Edit confirmation email", edit_admin_inquiry_setting_url(InquirySetting.confirmation_body),
12
+ :class => "edit_email_icon" %>
13
+ </li>
14
+ </ul>
15
15
  </div>
16
16
  <div id='records'>
17
17
  <% if searching? %>
18
18
  <h2>Search Results for "<%= params[:search] %>"</h2>
19
19
  <%= render :partial => "inquiry", :collection => @inquiries %>
20
20
  <% else %>
21
- <h2>Open Inquiries</h2>
22
- <% if @open_inquiries.size > 0 -%>
21
+ <h2>Open Inquiries</h2>
22
+ <% if @open_inquiries.size > 0 -%>
23
23
  <ul>
24
24
  <%= render :partial => "inquiry", :collection => @open_inquiries %>
25
25
  </ul>
26
- <% else -%>
26
+ <% else -%>
27
27
  <p>
28
- <%= refinery_icon_tag('accept.png', :style => 'vertical-align: bottom') %>
29
- Hooray! There are no open inquiries because you've dealt with them all.
28
+ <%= refinery_icon_tag('accept.png', :style => 'vertical-align: bottom') %>
29
+ Hooray! There are no open inquiries because you've dealt with them all.
30
30
  </p>
31
- <% end -%>
32
- <h2>Closed Inquiries</h2>
33
- <% if @closed_inquiries.size > 0 -%>
31
+ <% end -%>
32
+ <h2>Closed Inquiries</h2>
33
+ <% if @closed_inquiries.size > 0 -%>
34
34
  <ul>
35
35
  <%= render :partial => "inquiry", :collection => @closed_inquiries %>
36
36
  </ul>
37
- <% else -%>
38
- <p>
39
- You haven't closed any inquiries yet.
40
- </p>
41
- <% end -%>
37
+ <% else -%>
38
+ <p>
39
+ You haven't closed any inquiries yet.
40
+ </p>
41
+ <% end -%>
42
42
  <% end %>
43
- </div>
43
+ </div>
@@ -1,62 +1,62 @@
1
1
  <div id='actions'>
2
- <h2>Details</h2>
3
- <p>
4
- <strong>Status:</strong> <%= @inquiry.open? ? "Open" : "Closed" %><br/>
5
- <strong>Age:</strong> <%= time_ago_in_words(@inquiry.created_at) %>
6
- </p>
7
- <h2>Actions</h2>
8
- <ul>
9
- <li>
10
- <%= link_to "Back to all Inquiries", {:action => 'index'}, :class => "back_icon" %>
11
- </li>
12
- </ul>
2
+ <h2>Details</h2>
3
+ <p>
4
+ <strong>Status:</strong> <%= @inquiry.open? ? "Open" : "Closed" %><br/>
5
+ <strong>Age:</strong> <%= time_ago_in_words(@inquiry.created_at) %>
6
+ </p>
7
+ <h2>Actions</h2>
8
+ <ul>
9
+ <li>
10
+ <%= link_to "Back to all Inquiries", {:action => 'index'}, :class => "back_icon" %>
11
+ </li>
12
+ </ul>
13
13
  </div>
14
14
  <div id='records'>
15
- <h2>Inquiry</h2>
16
- <table id='inquiry'>
17
- <tr>
18
- <td>
19
- <strong>To</strong>
20
- </td>
21
- <td>
22
- <%= RefinerySetting[:site_name] %>
23
- </td>
24
- </tr>
25
- <tr>
26
- <td>
27
- <strong>From</strong>
28
- </td>
29
- <td>
30
- <%= @inquiry.name %> [<%= mail_to @inquiry.email, @inquiry.email, {:title => "Click to email this address"} %>]
31
- </td>
32
- </tr>
33
- <% unless @inquiry.phone.blank? %>
34
- <tr>
35
- <td>
36
- <strong>Phone</strong>
37
- </td>
38
- <td>
39
- <%= @inquiry.phone %>
40
- </td>
41
- </tr>
42
- <% end %>
43
- <tr>
44
- <td>
45
- <strong>Date</strong>
46
- </td>
47
- <td>
48
- <%= @inquiry.created_at.strftime("%A, %d of %b, %Y") %>
49
- </td>
50
- </tr>
51
- <tr>
52
- <td valign='top'>
53
- <strong>Message</strong>
54
- </td>
55
- <td>
56
- <p style='margin-top: 0px'>
57
- <%= @inquiry.message.gsub("\r\n\r\n", "\r\n").gsub("\r\n", "</p><p>") %>
58
- </p>
59
- </td>
60
- </tr>
61
- </table>
62
- </div>
15
+ <h2>Inquiry</h2>
16
+ <table id='inquiry'>
17
+ <tr>
18
+ <td>
19
+ <strong>To</strong>
20
+ </td>
21
+ <td>
22
+ <%= RefinerySetting[:site_name] %>
23
+ </td>
24
+ </tr>
25
+ <tr>
26
+ <td>
27
+ <strong>From</strong>
28
+ </td>
29
+ <td>
30
+ <%= @inquiry.name %> [<%= mail_to @inquiry.email, @inquiry.email, {:title => "Click to email this address"} %>]
31
+ </td>
32
+ </tr>
33
+ <% unless @inquiry.phone.blank? %>
34
+ <tr>
35
+ <td>
36
+ <strong>Phone</strong>
37
+ </td>
38
+ <td>
39
+ <%= @inquiry.phone %>
40
+ </td>
41
+ </tr>
42
+ <% end %>
43
+ <tr>
44
+ <td>
45
+ <strong>Date</strong>
46
+ </td>
47
+ <td>
48
+ <%= @inquiry.created_at.strftime("%A, %d of %b, %Y") %>
49
+ </td>
50
+ </tr>
51
+ <tr>
52
+ <td valign='top'>
53
+ <strong>Message</strong>
54
+ </td>
55
+ <td>
56
+ <p style='margin-top: 0px'>
57
+ <%= @inquiry.message.gsub("\r\n\r\n", "\r\n").gsub("\r\n", "</p><p>") %>
58
+ </p>
59
+ </td>
60
+ </tr>
61
+ </table>
62
+ </div>
@@ -1,46 +1,46 @@
1
1
  <%= error_messages_for :inquiry_setting %>
2
2
  <% form_for [:admin, @inquiry_setting] do |f| %>
3
- <p>
4
- Every time someone contacts you on your website, Refinery sends
5
- out an email to confirm the inquiry with the person who made it.
6
- </p>
7
- <p>
8
- Below you can edit the email that is sent out.
9
- </p>
10
- <table id='inquiry'>
11
- <tr>
12
- <td>
13
- <strong>To</strong>
14
- </td>
15
- <td>
16
- The customer making the inquiry
17
- </td>
18
- </tr>
19
- <tr>
20
- <td>
21
- <strong>From</strong>
22
- </td>
23
- <td>
24
- <%= "#{RefinerySetting[:site_name]} &lt;no-reply@#{request.domain(RefinerySetting.find_or_set(:tld_length, 1))}&gt;" %>
25
- </td>
26
- </tr>
27
- <tr>
28
- <td>
29
- <strong>Subject</strong>
30
- </td>
31
- <td>
32
- Thank you for your inquiry
33
- </td>
34
- </tr>
35
- <tr>
36
- <td valign='top'>
37
- <strong>Message</strong>
38
- </td>
39
- <td>
40
- <%= f.text_area :value, :cols => "100", :rows => "5" %><br/>
41
- <em>Note: place the text %name% where you'd like the customer's name to appear in the email</em>
42
- </td>
43
- </tr>
44
- </table>
45
- <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :cancel_url => admin_inquiries_url} %>
46
- <% end %>
3
+ <p>
4
+ Every time someone contacts you on your website, Refinery sends
5
+ out an email to confirm the inquiry with the person who made it.
6
+ </p>
7
+ <p>
8
+ Below you can edit the email that is sent out.
9
+ </p>
10
+ <table id='inquiry'>
11
+ <tr>
12
+ <td>
13
+ <strong>To</strong>
14
+ </td>
15
+ <td>
16
+ The customer making the inquiry
17
+ </td>
18
+ </tr>
19
+ <tr>
20
+ <td>
21
+ <strong>From</strong>
22
+ </td>
23
+ <td>
24
+ <%= "#{RefinerySetting[:site_name]} &lt;no-reply@#{request.domain(RefinerySetting.find_or_set(:tld_length, 1))}&gt;" %>
25
+ </td>
26
+ </tr>
27
+ <tr>
28
+ <td>
29
+ <strong>Subject</strong>
30
+ </td>
31
+ <td>
32
+ Thank you for your inquiry
33
+ </td>
34
+ </tr>
35
+ <tr>
36
+ <td valign='top'>
37
+ <strong>Message</strong>
38
+ </td>
39
+ <td>
40
+ <%= f.text_area :value, :cols => "100", :rows => "5" %><br/>
41
+ <em>Note: place the text %name% where you'd like the customer's name to appear in the email</em>
42
+ </td>
43
+ </tr>
44
+ </table>
45
+ <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :cancel_url => admin_inquiries_url} %>
46
+ <% end %>
@@ -1,18 +1,18 @@
1
1
  <%= error_messages_for :inquiry_setting %>
2
2
  <% form_for [:admin, @inquiry_setting] do |f| %>
3
- <p>
4
- Every time someone contacts you on your website, Refinery sends
5
- out an email to say there is a new inquiry.
6
- </p>
7
- <div class='field'>
8
- <%= f.label :value, 'Send notifications to' %>
9
- <%= f.text_field :value, :class => "larger", :style => 'width: 954px' %>
3
+ <p>
4
+ Every time someone contacts you on your website, Refinery sends
5
+ out an email to say there is a new inquiry.
6
+ </p>
7
+ <div class='field'>
8
+ <%= f.label :value, 'Send notifications to' %>
9
+ <%= f.text_field :value, :class => "larger", :style => 'width: 954px' %>
10
10
 
11
- <p>
12
- Enter an email address above. Want the notification to go to more than one person?
13
- Enter multiple email addresses separated by commas.<br/>
14
- E.g. me@domain.com, friend@msn.com, workmate@work.com
15
- </p>
16
- </div>
17
- <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :cancel_url => admin_inquiries_url} %>
18
- <% end %>
11
+ <p>
12
+ Enter an email address above. Want the notification to go to more than one person?
13
+ Enter multiple email addresses separated by commas.<br/>
14
+ E.g. me@domain.com, friend@msn.com, workmate@work.com
15
+ </p>
16
+ </div>
17
+ <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :cancel_url => admin_inquiries_url} %>
18
+ <% end %>
@@ -1,5 +1,5 @@
1
1
  <% if @inquiry_setting.name == "Notification Recipients" %>
2
- <%= render :partial => "notification_recipients_form", :locals => {:edit => true} -%>
2
+ <%= render :partial => "notification_recipients_form", :locals => {:edit => true} -%>
3
3
  <% else %>
4
- <%= render :partial => "confirmation_email_form", :locals => {:edit => true} -%>
5
- <% end %>
4
+ <%= render :partial => "confirmation_email_form", :locals => {:edit => true} -%>
5
+ <% end %>
@@ -1,32 +1,32 @@
1
1
  <div id='actions'>
2
- <ul>
3
- <li>
4
- <%= link_to "#{refinery_icon_tag( '/user_comment.png'} Update who gets notified",
5
- edit_admin_inquiry_setting_url(InquirySetting.notification_recipients) %>
6
- </li>
7
- <li>
8
- <%= link_to "#{refinery_icon_tag( '/email_edit.png'} Edit confirmation email",
9
- edit_admin_inquiry_setting_url(InquirySetting.confirmation_body) %>
10
- </li>
11
- </ul>
2
+ <ul>
3
+ <li>
4
+ <%= link_to "#{refinery_icon_tag( '/user_comment.png'} Update who gets notified",
5
+ edit_admin_inquiry_setting_url(InquirySetting.notification_recipients) %>
6
+ </li>
7
+ <li>
8
+ <%= link_to "#{refinery_icon_tag( '/email_edit.png'} Edit confirmation email",
9
+ edit_admin_inquiry_setting_url(InquirySetting.confirmation_body) %>
10
+ </li>
11
+ </ul>
12
12
  </div>
13
13
  <div id='records'>
14
- <% if @inquiry_settings.size > 0 %>
15
- <ul>
16
- <% @inquiry_settings.each do |setting| -%>
17
- <li class='clearfix record <%= cycle("on", "on-hover") %>'>
18
- <span class='title'>
19
- <span class='actions'>
20
- <%= link_to refinery_icon_tag("application_edit.png", :alt => "Edit"), edit_admin_inquiry_setting_path(setting) %>
21
- <%= link_to refinery_icon_tag("delete.png", :alt => "Delete"), admin_inquiry_setting_path(setting),
22
- :confirm => "Are you sure you want to delete #{setting.name}?",
23
- :class => "cancel", :method => :delete ,
24
- :title => "Remove this inquiry setting forever" if setting.destroyable? %>
25
- </span>
26
- <span><%=h setting.name %></span>
27
- </span>
28
- </li>
29
- <% end -%>
30
- </ul>
31
- <% end -%>
32
- </div>
14
+ <% if @inquiry_settings.size > 0 %>
15
+ <ul>
16
+ <% @inquiry_settings.each do |setting| -%>
17
+ <li class='clearfix record <%= cycle("on", "on-hover") %>'>
18
+ <span class='title'>
19
+ <span class='actions'>
20
+ <%= link_to refinery_icon_tag("application_edit.png", :alt => "Edit"), edit_admin_inquiry_setting_path(setting) %>
21
+ <%= link_to refinery_icon_tag("delete.png", :alt => "Delete"), admin_inquiry_setting_path(setting),
22
+ :confirm => "Are you sure you want to delete #{setting.name}?",
23
+ :class => "cancel", :method => :delete ,
24
+ :title => "Remove this inquiry setting forever" if setting.destroyable? %>
25
+ </span>
26
+ <span><%=h setting.name %></span>
27
+ </span>
28
+ </li>
29
+ <% end -%>
30
+ </ul>
31
+ <% end -%>
32
+ </div>