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,243 +1,243 @@
1
1
  <%= error_messages_for :page %>
2
2
 
3
3
  <% form_for [:admin, @page] do |f| %>
4
- <div class='field'>
5
- <%= f.label :title %>
6
- <%= f.text_field :title, :class => "larger", :style => 'width: 954px' %>
7
- </div>
8
- <div class='clearfix'>
9
- <div class='clearfix'>
10
- <ul id='page_parts'>
11
- <% @page.parts.each do |p| %>
12
- <li class='tab<%= " active" if @page.parts.index(p) == 0 %>'>
13
- <%= link_to p.title.titleize, "#part_#{p.title}" %>
14
- </li>
15
- <% end %>
16
- </ul>
17
- <% if RefinerySetting.find_or_set(:new_page_parts, false) %>
18
- <ul id='page_parts_controls'>
19
- <li>
20
- <%= link_to refinery_icon_tag("add.png"), "#", :id => "add_page_part", :title => "Create Content Section" %>
21
- </li>
22
- <li>
23
- <%= link_to(refinery_icon_tag("delete.png"), "#", :title => 'Delete content section', :class => 'delete_page_part', :name => "Delete Content Section", :id => "delete_page_part") %>
24
- </li>
25
- </ul>
26
- <% end %>
4
+ <div class='field'>
5
+ <%= f.label :title %>
6
+ <%= f.text_field :title, :class => "larger", :style => 'width: 954px' %>
7
+ </div>
8
+ <div class='clearfix'>
9
+ <div class='clearfix'>
10
+ <ul id='page_parts'>
11
+ <% @page.parts.each do |p| %>
12
+ <li class='tab<%= " active" if @page.parts.index(p) == 0 %>'>
13
+ <%= link_to p.title.titleize, "#part_#{p.title}" %>
14
+ </li>
15
+ <% end %>
16
+ </ul>
17
+ <% if RefinerySetting.find_or_set(:new_page_parts, false) %>
18
+ <ul id='page_parts_controls'>
19
+ <li>
20
+ <%= link_to refinery_icon_tag("add.png"), "#", :id => "add_page_part", :title => "Create Content Section" %>
21
+ </li>
22
+ <li>
23
+ <%= link_to(refinery_icon_tag("delete.png"), "#", :title => 'Delete content section', :class => 'delete_page_part', :name => "Delete Content Section", :id => "delete_page_part") %>
24
+ </li>
25
+ </ul>
26
+ <% end %>
27
27
  </div>
28
-
29
- <div id='page_part_editors'>
30
- <% part_index = -1 %>
31
- <% f.fields_for :parts do |p| %>
32
- <%= render :partial => "page_part_field", :locals => {:title => p.object.title, :body => p.object.body, :part_index => (part_index += 1), :new_part => @page.new_record?} %>
33
- <% end %>
34
- </div>
35
- </div>
36
- <p>
37
- <%= link_to "&raquo; Hide/Show Advanced Options", "", :id => "toggle_advanced_options",
38
- :rel => "Click to access meta tag settings and menu options" %>
39
- </p>
40
- <div id='more_options' style="display:none;">
41
- <div class='field'>
42
- <%= label_tag :custom_title %>
43
- <%= label_tag "", 'Type:', :class => "stripped" %>
44
- <% ["none", "text", "image"].each do |type| %>
45
- <%= f.radio_button :custom_title_type, "#{type}" %>
46
- <%= label_tag "page_custom_title_type_#{type}", "#{type.titleize}", :class => "stripped" %>
47
- <% end %>
48
- <br/>
49
- <div id='custom_title_none'></div>
50
- <div id='custom_title_text' style='display: <%= @page.custom_title_type == 'text' ? 'block' : 'none' %>'>
51
- <p>
52
- <%= f.text_field :custom_title, {:size => 103} %><br/>
53
- <small>
54
- If you want the page to have a different title than the one that shows in the menu and browser title then enter it here.<br/>
55
- </small>
56
- </p>
57
- </div>
58
- <div id='custom_title_image' style='display: <%= @page.custom_title_type == 'image' ? 'block' : 'none' %>' class='clearfix'>
59
- <%= render :partial => "/shared/admin/image_picker", :locals =>
60
- {
61
- :f => f,
62
- :field => :custom_title_image_id,
63
- :image => @page.custom_title_image
64
- }
65
- %>
66
- </div>
67
- </div>
68
- <div class='field'>
69
- <%= label_tag :skip_to_first_child? %>
70
- <%= f.check_box :skip_to_first_child %>
71
- <%= f.label :skip_to_first_child, "Check this box if you want the visitor to be redirected to this page's first child page if this page is selected.", :class => "stripped" %>
72
- </div>
73
- <div class='field'>
74
- <%= f.label :link_url, "Custom URL" %>
75
- <%= f.text_field :link_url, {:size => 103} %><br/>
76
- <small>
77
- Enter a URL if this page links to an external site or to a pre-existing resource e.g. a contact page.
78
- <br/>
79
- Note: This URL must point to a location that exists; a new one will not be created.
80
- </small>
81
- </div>
82
- <h2>Search Engine Optimization</h2>
83
- <div class='field'>
84
- <%= f.label :browser_title %>
85
- <%= f.text_field :browser_title, :size => 63 %><br/>
86
- <small>
87
- If you want to override the default browser title, do it here.
88
- </small>
89
- </div>
90
- <div class='field'>
91
- <%= f.label :meta_keywords %>
92
- <%= f.text_field :meta_keywords, :size => 63 %><br/>
93
- <small>
94
- Enter 5-10 keywords that relate to this page. Separate keywords by a comma.
95
- </small>
96
- </div>
97
- <div class='field'>
98
- <%= f.label :meta_description %>
99
- <%= f.text_area :meta_description, :cols => 95, :rows => 3 %><br/>
100
- <small>
101
- Enter a concise two or three sentences describing what this page is about.
102
- </small>
103
- </div>
104
- <div class='field'>
105
- <%= f.label :show_in_menu %>
106
- <%= f.check_box :show_in_menu %>
107
- <small>
108
- <%= f.label :show_in_menu, "Check this box if this page should appear in the site menu" %>
109
- </small>
110
- </div>
111
- </div>
112
- <div class='field'>
113
- <label>Draft</label>
114
- <%= f.check_box :draft %>
115
- <%= f.label :draft, "Save as Draft", :class => "stripped" %>
116
- </div>
117
- <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => true} %>
118
- <div id='new_page_part_dialog' style='display: none'>
119
- <div class='field'>
120
- <label for='new_page_part_title'>Title</label>
121
- <input id='new_page_part_title' value='' class='larger' size='40' />
122
- <input id='new_page_part_index' type='hidden' value='<%= @page.parts.size %>' />
123
- </div>
124
- <div id='dialog-form-actions' class='form-actions'>
125
- <%= f.submit 'Save', :id => "new_page_part_save" %>
126
- or
127
- <%= link_to "Cancel", "", :id => "new_page_part_cancel", :class => "close_dialog" %>
128
- </div>
129
- </div>
28
+
29
+ <div id='page_part_editors'>
30
+ <% part_index = -1 %>
31
+ <% f.fields_for :parts do |p| %>
32
+ <%= render :partial => "page_part_field", :locals => {:title => p.object.title, :body => p.object.body, :part_index => (part_index += 1), :new_part => @page.new_record?} %>
33
+ <% end %>
34
+ </div>
35
+ </div>
36
+ <p>
37
+ <%= link_to "&raquo; Hide/Show Advanced Options", "", :id => "toggle_advanced_options",
38
+ :rel => "Click to access meta tag settings and menu options" %>
39
+ </p>
40
+ <div id='more_options' style="display:none;">
41
+ <div class='field'>
42
+ <%= label_tag :custom_title %>
43
+ <%= label_tag "", 'Type:', :class => "stripped" %>
44
+ <% ["none", "text", "image"].each do |type| %>
45
+ <%= f.radio_button :custom_title_type, "#{type}" %>
46
+ <%= label_tag "page_custom_title_type_#{type}", "#{type.titleize}", :class => "stripped" %>
47
+ <% end %>
48
+ <br/>
49
+ <div id='custom_title_none'></div>
50
+ <div id='custom_title_text' style='display: <%= @page.custom_title_type == 'text' ? 'block' : 'none' %>'>
51
+ <p>
52
+ <%= f.text_field :custom_title, {:size => 103} %><br/>
53
+ <small>
54
+ If you want the page to have a different title than the one that shows in the menu and browser title then enter it here.<br/>
55
+ </small>
56
+ </p>
57
+ </div>
58
+ <div id='custom_title_image' style='display: <%= @page.custom_title_type == 'image' ? 'block' : 'none' %>' class='clearfix'>
59
+ <%= render :partial => "/shared/admin/image_picker", :locals =>
60
+ {
61
+ :f => f,
62
+ :field => :custom_title_image_id,
63
+ :image => @page.custom_title_image
64
+ }
65
+ %>
66
+ </div>
67
+ </div>
68
+ <div class='field'>
69
+ <%= label_tag :skip_to_first_child? %>
70
+ <%= f.check_box :skip_to_first_child %>
71
+ <%= f.label :skip_to_first_child, "Check this box if you want the visitor to be redirected to this page's first child page if this page is selected.", :class => "stripped" %>
72
+ </div>
73
+ <div class='field'>
74
+ <%= f.label :link_url, "Custom URL" %>
75
+ <%= f.text_field :link_url, {:size => 103} %><br/>
76
+ <small>
77
+ Enter a URL if this page links to an external site or to a pre-existing resource e.g. a contact page.
78
+ <br/>
79
+ Note: This URL must point to a location that exists; a new one will not be created.
80
+ </small>
81
+ </div>
82
+ <h2>Search Engine Optimization</h2>
83
+ <div class='field'>
84
+ <%= f.label :browser_title %>
85
+ <%= f.text_field :browser_title, :size => 63 %><br/>
86
+ <small>
87
+ If you want to override the default browser title, do it here.
88
+ </small>
89
+ </div>
90
+ <div class='field'>
91
+ <%= f.label :meta_keywords %>
92
+ <%= f.text_field :meta_keywords, :size => 63 %><br/>
93
+ <small>
94
+ Enter 5-10 keywords that relate to this page. Separate keywords by a comma.
95
+ </small>
96
+ </div>
97
+ <div class='field'>
98
+ <%= f.label :meta_description %>
99
+ <%= f.text_area :meta_description, :cols => 95, :rows => 3 %><br/>
100
+ <small>
101
+ Enter a concise two or three sentences describing what this page is about.
102
+ </small>
103
+ </div>
104
+ <div class='field'>
105
+ <%= f.label :show_in_menu %>
106
+ <%= f.check_box :show_in_menu %>
107
+ <small>
108
+ <%= f.label :show_in_menu, "Check this box if this page should appear in the site menu" %>
109
+ </small>
110
+ </div>
111
+ </div>
112
+ <div class='field'>
113
+ <label>Draft</label>
114
+ <%= f.check_box :draft %>
115
+ <%= f.label :draft, "Save as Draft", :class => "stripped" %>
116
+ </div>
117
+ <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => true} %>
118
+ <div id='new_page_part_dialog' style='display: none'>
119
+ <div class='field'>
120
+ <label for='new_page_part_title'>Title</label>
121
+ <input id='new_page_part_title' value='' class='larger' size='40' />
122
+ <input id='new_page_part_index' type='hidden' value='<%= @page.parts.size %>' />
123
+ </div>
124
+ <div id='dialog-form-actions' class='form-actions'>
125
+ <%= f.submit 'Save', :id => "new_page_part_save" %>
126
+ or
127
+ <%= link_to "Cancel", "", :id => "new_page_part_cancel", :class => "close_dialog" %>
128
+ </div>
129
+ </div>
130
130
  <% end %>
131
131
  <% content_for :head do %>
132
132
  <script type='text/javascript'>
133
- switch_custom_title_type = function(type)
134
- {
135
- $('custom_title_text').hide();
136
- $('custom_title_image').hide();
137
-
138
- $('custom_title_' + type).show();
139
- }
140
-
141
- FastInit.addOnLoad(function(){
142
- $('toggle_advanced_options').observe('click', function(e)
143
- {
144
- $('more_options').toggle();
145
- e.preventDefault();
146
- });
147
-
148
- $$('input[type=radio]').each(function(radio)
149
- {
150
- if (radio.name == 'page[custom_title_type]')
151
- {
152
- radio.observe('change', function(e)
153
- {
154
- switch_custom_title_type(this.value);
155
- });
156
- }
157
- });
158
-
133
+ switch_custom_title_type = function(type)
134
+ {
135
+ $('custom_title_text').hide();
136
+ $('custom_title_image').hide();
137
+
138
+ $('custom_title_' + type).show();
139
+ }
140
+
141
+ FastInit.addOnLoad(function(){
142
+ $('toggle_advanced_options').observe('click', function(e)
143
+ {
144
+ $('more_options').toggle();
145
+ e.preventDefault();
146
+ });
147
+
148
+ $$('input[type=radio]').each(function(radio)
149
+ {
150
+ if (radio.name == 'page[custom_title_type]')
151
+ {
152
+ radio.observe('change', function(e)
153
+ {
154
+ switch_custom_title_type(this.value);
155
+ });
156
+ }
157
+ });
158
+
159
159
  <% if RefinerySetting.find_or_set(:new_page_parts, false) %>
160
- $('add_page_part').observe('click', function(e) {
161
- tb_show('Create Content Section', '#?auto_size_content=true&draggable=true&titlebar=true&inlineId=new_page_part_dialog&TB_inline=true&modal=true');
162
-
163
- e.preventDefault();
164
- });
165
-
166
- $('new_page_part_save').observe('click', function(e) {
167
- if ((part_title = $('new_page_part_title').value).length > 0) {
168
- tab_title = part_title.toLowerCase().gsub(" ", "_");
169
- if ($$('#part_' + tab_title).size() == 0) {
170
- // first get the response from the server
171
- new Ajax.Request("<%= new_admin_page_part_url %>", {
172
- asynchronous: true
173
- , method: 'get'
174
- , parameters: {
175
- title: tab_title
176
- , part_index: $('new_page_part_index').value
177
- , body: ''
178
- }
179
- , onComplete: function(e){
180
- $('page_part_editors').insert(e.transport.responseText , {position: 'bottom'});
181
- // Add a new tab for the new content section.
182
- $$('#page_parts').first().insert((new Element("li").addClassName("tab").insert(new Element("a", {href: "#part_" + tab_title}).update(part_title))));
183
-
184
- // turn the new textarea into a wymeditor.
185
- jQuery('#page_parts_attributes_' + $('new_page_part_index').value + "_body").wymeditor(wymeditor_boot_options);
186
-
187
- // Wipe the title and increment the index counter by one.
188
- $('new_page_part_index').value = (parseInt($('new_page_part_index').value) + 1);
189
- $('new_page_part_title').value = "";
190
- }
191
- });
192
-
193
- tb_remove();
194
- } else {
195
- alert("A content section with that title already exists, please choose another.");
196
- }
197
- } else {
198
- alert("You have not entered a title for the content section, please enter one.");
199
- }
200
- });
201
-
202
- $('new_page_part_cancel').observe('click', function(e) {
203
- $('new_page_part_title').value = "";
204
- tb_remove();
205
- e.preventDefault();
206
- });
207
-
208
- $('delete_page_part').observe('click', function(e) {
209
- selected_part_link = $$('#page_parts li.active a').first();
210
- part_container = $(selected_part_link.getAttribute('href').gsub("#", ""));
211
- result = confirm("This will remove the content section '" + selected_part_link.innerHTML + "' when the page is saved and erase all content that has been entered into it, Are you sure?");
212
- if (result) {
213
- if ((part_id = $(part_container.down('textarea').id.gsub('_body', '_id'))) != null) {
214
- new Ajax.Request("<%= admin_page_parts_url %>/" + part_id.value, {
215
- asynchronous: true
216
- , method: "DELETE"
217
- , parameters:
218
- {
219
- authenticity_token: $$('input[name=authenticity_token]').first().value
220
- }
221
- });
222
- }
223
-
224
- // remove actual elements from DOM.
225
- part_container.remove();
226
- selected_part_link.up('li').remove();
227
-
228
- WYMeditor.loaded();
229
- }
230
-
231
- e.preventDefault();
232
- });
160
+ $('add_page_part').observe('click', function(e) {
161
+ tb_show('Create Content Section', '#?auto_size_content=true&draggable=true&titlebar=true&inlineId=new_page_part_dialog&TB_inline=true&modal=true');
162
+
163
+ e.preventDefault();
164
+ });
165
+
166
+ $('new_page_part_save').observe('click', function(e) {
167
+ if ((part_title = $('new_page_part_title').value).length > 0) {
168
+ tab_title = part_title.toLowerCase().gsub(" ", "_");
169
+ if ($$('#part_' + tab_title).size() == 0) {
170
+ // first get the response from the server
171
+ new Ajax.Request("<%= new_admin_page_part_url %>", {
172
+ asynchronous: true
173
+ , method: 'get'
174
+ , parameters: {
175
+ title: tab_title
176
+ , part_index: $('new_page_part_index').value
177
+ , body: ''
178
+ }
179
+ , onComplete: function(e){
180
+ $('page_part_editors').insert(e.transport.responseText , {position: 'bottom'});
181
+ // Add a new tab for the new content section.
182
+ $$('#page_parts').first().insert((new Element("li").addClassName("tab").insert(new Element("a", {href: "#part_" + tab_title}).update(part_title))));
183
+
184
+ // turn the new textarea into a wymeditor.
185
+ jQuery('#page_parts_attributes_' + $('new_page_part_index').value + "_body").wymeditor(wymeditor_boot_options);
186
+
187
+ // Wipe the title and increment the index counter by one.
188
+ $('new_page_part_index').value = (parseInt($('new_page_part_index').value) + 1);
189
+ $('new_page_part_title').value = "";
190
+ }
191
+ });
192
+
193
+ tb_remove();
194
+ } else {
195
+ alert("A content section with that title already exists, please choose another.");
196
+ }
197
+ } else {
198
+ alert("You have not entered a title for the content section, please enter one.");
199
+ }
200
+ });
201
+
202
+ $('new_page_part_cancel').observe('click', function(e) {
203
+ $('new_page_part_title').value = "";
204
+ tb_remove();
205
+ e.preventDefault();
206
+ });
207
+
208
+ $('delete_page_part').observe('click', function(e) {
209
+ selected_part_link = $$('#page_parts li.active a').first();
210
+ part_container = $(selected_part_link.getAttribute('href').gsub("#", ""));
211
+ result = confirm("This will remove the content section '" + selected_part_link.innerHTML + "' when the page is saved and erase all content that has been entered into it, Are you sure?");
212
+ if (result) {
213
+ if ((part_id = $(part_container.down('textarea').id.gsub('_body', '_id'))) != null) {
214
+ new Ajax.Request("<%= admin_page_parts_url %>/" + part_id.value, {
215
+ asynchronous: true
216
+ , method: "DELETE"
217
+ , parameters:
218
+ {
219
+ authenticity_token: $$('input[name=authenticity_token]').first().value
220
+ }
221
+ });
222
+ }
223
+
224
+ // remove actual elements from DOM.
225
+ part_container.remove();
226
+ selected_part_link.up('li').remove();
227
+
228
+ WYMeditor.loaded();
229
+ }
230
+
231
+ e.preventDefault();
232
+ });
233
233
  <% end %>
234
- });
235
-
236
- // Hook into the loaded function. This will be called when WYMeditor has done its thing.
237
- WYMeditor.loaded = function()
238
- {
239
- new Control.Tabs('page_parts', {setClassOnContainer: true}).first();
240
- }
241
-
234
+ });
235
+
236
+ // Hook into the loaded function. This will be called when WYMeditor has done its thing.
237
+ WYMeditor.loaded = function()
238
+ {
239
+ new Control.Tabs('page_parts', {setClassOnContainer: true}).first();
240
+ }
241
+
242
242
  </script>
243
243
  <% end %>