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,47 +1,47 @@
1
1
  WYMeditor.STRINGS['zh_cn'] = {
2
- Strong: '加粗',
3
- Emphasis: '斜体',
4
- Superscript: '上标',
5
- Subscript: '下标',
6
- Ordered_List: '有序列表',
7
- Unordered_List: '无序列表',
8
- Indent: '增加缩进',
9
- Outdent: '减少缩进',
10
- Undo: '撤消',
11
- Redo: '重做',
12
- Link: '链接',
13
- Unlink: '取消链接',
14
- Image: '图片',
15
- Table: '表格',
16
- HTML: 'HTML源代码',
17
- Paragraph: '段落',
18
- Heading_1: '标题 1',
19
- Heading_2: '标题 2',
20
- Heading_3: '标题 3',
21
- Heading_4: '标题 4',
22
- Heading_5: '标题 5',
23
- Heading_6: '标题 6',
24
- Preformatted: '原始文本',
25
- Blockquote: '引语',
26
- Table_Header: '表头',
27
- URL: '地址',
28
- Title: '提示文字',
29
- Alternative_Text: '失效文字',
30
- Caption: '标题',
31
- Summary: 'Summary',
32
- Number_Of_Rows: '行数',
33
- Number_Of_Cols: '列数',
34
- Submit: '提交',
35
- Cancel: '放弃',
36
- Choose: '选择',
37
- Preview: '预览',
38
- Paste_From_Word: '从Word粘贴纯文本',
39
- Tools: '工具',
40
- Containers: '容器',
41
- Classes: '预定义样式',
42
- Status: '状态',
43
- Source_Code: '源代码',
44
- Attachment: '附件',
45
- NewParagraph: '新段落'
2
+ Strong: '加粗',
3
+ Emphasis: '斜体',
4
+ Superscript: '上标',
5
+ Subscript: '下标',
6
+ Ordered_List: '有序列表',
7
+ Unordered_List: '无序列表',
8
+ Indent: '增加缩进',
9
+ Outdent: '减少缩进',
10
+ Undo: '撤消',
11
+ Redo: '重做',
12
+ Link: '链接',
13
+ Unlink: '取消链接',
14
+ Image: '图片',
15
+ Table: '表格',
16
+ HTML: 'HTML源代码',
17
+ Paragraph: '段落',
18
+ Heading_1: '标题 1',
19
+ Heading_2: '标题 2',
20
+ Heading_3: '标题 3',
21
+ Heading_4: '标题 4',
22
+ Heading_5: '标题 5',
23
+ Heading_6: '标题 6',
24
+ Preformatted: '原始文本',
25
+ Blockquote: '引语',
26
+ Table_Header: '表头',
27
+ URL: '地址',
28
+ Title: '提示文字',
29
+ Alternative_Text: '失效文字',
30
+ Caption: '标题',
31
+ Summary: 'Summary',
32
+ Number_Of_Rows: '行数',
33
+ Number_Of_Cols: '列数',
34
+ Submit: '提交',
35
+ Cancel: '放弃',
36
+ Choose: '选择',
37
+ Preview: '预览',
38
+ Paste_From_Word: '从Word粘贴纯文本',
39
+ Tools: '工具',
40
+ Containers: '容器',
41
+ Classes: '预定义样式',
42
+ Status: '状态',
43
+ Source_Code: '源代码',
44
+ Attachment: '附件',
45
+ NewParagraph: '新段落'
46
46
  };
47
47
 
@@ -1,40 +1,40 @@
1
1
  WYMeditor.SKINS['refinery'] = {
2
2
 
3
- init: function(wym) {
3
+ init: function(wym) {
4
4
 
5
- //render following sections as panels
6
- /* jQuery(wym._box).find(wym._options.classesSelector)
7
- .addClass("wym_panel"); */
5
+ //render following sections as panels
6
+ /* jQuery(wym._box).find(wym._options.classesSelector)
7
+ .addClass("wym_panel"); */
8
8
 
9
- //render following sections as buttons
10
- jQuery(wym._box).find(wym._options.toolsSelector)
11
- .addClass("wym_buttons");
9
+ //render following sections as buttons
10
+ jQuery(wym._box).find(wym._options.toolsSelector)
11
+ .addClass("wym_buttons");
12
12
 
13
- //render following sections as dropdown menus
14
- /* jQuery(wym._box).find(wym._options.classesSelector)
15
- .addClass("wym_dropdown")
16
- .find(WYMeditor.H2)
17
- .append("<span>&nbsp;&gt;</span>");
13
+ //render following sections as dropdown menus
14
+ /* jQuery(wym._box).find(wym._options.classesSelector)
15
+ .addClass("wym_dropdown")
16
+ .find(WYMeditor.H2)
17
+ .append("<span>&nbsp;&gt;</span>");
18
18
  */
19
- // auto add some margin to the main area sides if left area
20
- // or right area are not empty (if they contain sections)
21
- jQuery(wym._box).find("div.wym_area_right ul")
22
- .parents("div.wym_area_right").show()
23
- .parents(wym._options.boxSelector)
24
- .find("div.wym_area_main")
25
- .css({"margin-right": "155px"});
19
+ // auto add some margin to the main area sides if left area
20
+ // or right area are not empty (if they contain sections)
21
+ jQuery(wym._box).find("div.wym_area_right ul")
22
+ .parents("div.wym_area_right").show()
23
+ .parents(wym._options.boxSelector)
24
+ .find("div.wym_area_main")
25
+ .css({"margin-right": "155px"});
26
26
 
27
- jQuery(wym._box).find("div.wym_area_left ul")
28
- .parents("div.wym_area_left").show()
29
- .parents(wym._options.boxSelector)
30
- .find("div.wym_area_main")
31
- .css({"margin-left": "155px"});
27
+ jQuery(wym._box).find("div.wym_area_left ul")
28
+ .parents("div.wym_area_left").show()
29
+ .parents(wym._options.boxSelector)
30
+ .find("div.wym_area_main")
31
+ .css({"margin-left": "155px"});
32
32
 
33
- //make hover work under IE < 7
34
- jQuery(wym._box).find(".wym_section").hover(function(){
35
- jQuery(this).addClass("hover");
36
- },function(){
37
- jQuery(this).removeClass("hover");
38
- });
39
- }
33
+ //make hover work under IE < 7
34
+ jQuery(wym._box).find(".wym_section").hover(function(){
35
+ jQuery(this).addClass("hover");
36
+ },function(){
37
+ jQuery(this).removeClass("hover");
38
+ });
39
+ }
40
40
  };
@@ -1,5 +1,5 @@
1
1
  @import url('refinery/application.css');
2
- /*
3
- Override default refinery application CSS below.
4
- Formatting applies to all frontend.
2
+ /*
3
+ Override default refinery application CSS below.
4
+ Formatting applies to all frontend.
5
5
  */
@@ -1,5 +1,5 @@
1
1
  @import url('refinery/formatting.css');
2
- /*
3
- Override default refinery formatting below.
4
- Formatting applies to backend WYSIWYG editors and all frontend.
2
+ /*
3
+ Override default refinery formatting below.
4
+ Formatting applies to backend WYSIWYG editors and all frontend.
5
5
  */
@@ -1,5 +1,5 @@
1
1
  @import url('/stylesheets/refinery/home.css');
2
2
  /*
3
- Override default refinery homepage styles here.
4
- These only apply to the homepage of your site.
3
+ Override default refinery homepage styles here.
4
+ These only apply to the homepage of your site.
5
5
  */
@@ -22,6 +22,6 @@
22
22
  #imageData #imageDetails{ width: 70%; float: left; text-align: left; }
23
23
  #imageData #caption{ font-weight: bold; }
24
24
  #imageData #numberDisplay{ display: block; clear: left; padding-bottom: 1.0em; }
25
- #imageData #bottomNavClose{ width: 66px; float: right; padding-bottom: 0.7em; outline: none;}
25
+ #imageData #bottomNavClose{ width: 66px; float: right; padding-bottom: 0.7em; outline: none;}
26
26
 
27
27
  #overlay{ position: absolute; top: 0; left: 0; z-index: 90; width: 100%; height: 500px; background-color: #000; }
@@ -1,23 +1,23 @@
1
1
  #page {
2
- padding: 20px;
3
- width: 1000px;
4
- margin: 0px auto;
2
+ padding: 20px;
3
+ width: 1000px;
4
+ margin: 0px auto;
5
5
  }
6
6
  #body_content_left {
7
- float: left;
8
- width: 600px;
7
+ float: left;
8
+ width: 600px;
9
9
  }
10
10
  #body_content_right {
11
- float: right;
12
- width: 360px;
11
+ float: right;
12
+ width: 360px;
13
13
  }
14
14
 
15
15
  .inquiries form label {
16
- width: 150px;
17
- float: left;
16
+ width: 150px;
17
+ float: left;
18
18
  }
19
19
  .inquiries form input {
20
-
20
+
21
21
  }
22
22
  .inquiries form input, .inquiries form textarea {
23
23
 
@@ -26,16 +26,16 @@
26
26
 
27
27
  }
28
28
  .inquiries form .actions {
29
- margin-left: 150px;
29
+ margin-left: 150px;
30
30
  }
31
31
 
32
32
  .inquiries form .actions input {
33
33
  }
34
34
 
35
35
  .inquiries .field {
36
- margin: 12px 0px;
36
+ margin: 12px 0px;
37
37
  }
38
38
 
39
39
  .inquiries form {
40
- padding-top: 12px;
40
+ padding-top: 12px;
41
41
  }
@@ -1,7 +1,7 @@
1
1
  /* Default error colouring */
2
2
 
3
3
  div.fieldWithErrors {
4
- display: inline;
4
+ display: inline;
5
5
  }
6
6
 
7
7
  #errorExplanation {
@@ -19,12 +19,12 @@ div.fieldWithErrors {
19
19
  /* remove borders from images */
20
20
 
21
21
  a img {
22
- border: 0px none;
22
+ border: 0px none;
23
23
  }
24
24
 
25
25
  /*
26
26
  Firefox Dotted Line Fix
27
- - http://sonspring.com/journal/removing-dotted-links
27
+ - http://sonspring.com/journal/removing-dotted-links
28
28
  */
29
29
  a:focus {
30
30
  outline: none;
@@ -4,10 +4,10 @@
4
4
  font-size: 13px;
5
5
  }
6
6
  html {
7
- min-height: 100%;
7
+ min-height: 100%;
8
8
  }
9
9
  body {
10
- min-height: 100%;
10
+ min-height: 100%;
11
11
  margin: 0;
12
12
  padding: 0;
13
13
  font: 10px/1.5em Verdana;
@@ -176,27 +176,27 @@ a:hover {
176
176
  }
177
177
 
178
178
  #page_container.login div.session_username, #page_container.login div.session_password {
179
- float: left;
179
+ float: left;
180
180
  }
181
181
 
182
182
  #page_container.login div.session_password {
183
- margin-left: 25px;
183
+ margin-left: 25px;
184
184
  }
185
185
 
186
186
  #page_container.login div.remember_me {
187
- margin-top: 12px;
187
+ margin-top: 12px;
188
188
  }
189
189
 
190
190
  #page_container.login div.remember_me label {
191
- display: inline;
191
+ display: inline;
192
192
  }
193
193
 
194
194
  #page_container.login div.session_username input, #page_container.login div.session_password input {
195
- width: 260px;
195
+ width: 260px;
196
196
  }
197
197
 
198
198
  #page_container.login div.actions {
199
- margin-top: 12px;
199
+ margin-top: 12px;
200
200
  }
201
201
 
202
202
  #header ul#menu {
@@ -261,7 +261,7 @@ pre {
261
261
  }
262
262
 
263
263
  #page_container.login #header {
264
- padding: 42px 15px 42px 15px;
264
+ padding: 42px 15px 42px 15px;
265
265
  }
266
266
 
267
267
  #site_link {
@@ -298,21 +298,21 @@ pre {
298
298
  }
299
299
 
300
300
  #footer {
301
- margin: 0px auto;
302
- text-align: center;
301
+ margin: 0px auto;
302
+ text-align: center;
303
303
  }
304
304
 
305
305
  #footer_logo {
306
- border: 0px none;
307
- display:inline-block;
308
- *display:inline;
309
- margin: 50px auto 40px auto;
310
- width: auto;
306
+ border: 0px none;
307
+ display:inline-block;
308
+ *display:inline;
309
+ margin: 50px auto 40px auto;
310
+ width: auto;
311
311
  }
312
312
 
313
313
  #footer p, #footer a {
314
- color: white;
315
- font-size: 11px;
314
+ color: white;
315
+ font-size: 11px;
316
316
  }
317
317
 
318
318
  #submenu {
@@ -628,6 +628,11 @@ label.stripped {
628
628
  padding: 5px;
629
629
  }
630
630
 
631
+ #recent_activity td.time_ago {
632
+ text-align: right;
633
+ width: 80px;
634
+ }
635
+
631
636
  #recent_activity tr.on {
632
637
  background: #E6E5DC;
633
638
  }
@@ -796,16 +801,16 @@ body.dialog form {
796
801
  padding-left: 27px;
797
802
  }
798
803
  #dialog_main #pages_list li.child1 a {
799
- padding-left: 47px;
804
+ padding-left: 47px;
800
805
  }
801
806
  #dialog_main #pages_list li.child2 a {
802
- padding-left: 67px;
807
+ padding-left: 67px;
803
808
  }
804
809
  #dialog_main #pages_list li.child3 a {
805
- padding-left: 87px;
810
+ padding-left: 87px;
806
811
  }
807
812
  #dialog_main #pages_list li.child4 a {
808
- padding-left: 107px;
813
+ padding-left: 107px;
809
814
  }
810
815
  /*
811
816
  #dialog_main #pages_list ul li span {
@@ -816,8 +821,8 @@ body.dialog form {
816
821
  #dialog_main #pages_list ul li a {
817
822
  display: block;
818
823
  padding: 3px 3px 3px 27px;
819
- text-decoration: none;
820
- border-bottom: none;
824
+ text-decoration: none;
825
+ border-bottom: none;
821
826
  border: 1px solid transparent;
822
827
  }
823
828
  #dialog_main #pages_list li a:hover {
@@ -929,13 +934,13 @@ a img {
929
934
  /* page parts */
930
935
 
931
936
  ul#page_parts {
932
- float: left;
933
- width: 95%;
937
+ float: left;
938
+ width: 95%;
934
939
  }
935
940
 
936
941
  ul#page_parts, ul#page_parts_controls {
937
- margin: 20px 0 0 0;
938
- padding: 0;
942
+ margin: 20px 0 0 0;
943
+ padding: 0;
939
944
  }
940
945
 
941
946
  ul#page_parts li {
@@ -945,7 +950,7 @@ ul#page_parts li {
945
950
  }
946
951
 
947
952
  ul#page_parts li a {
948
- float: left;
953
+ float: left;
949
954
  line-height: 27px;
950
955
  background: #c2c3b3;
951
956
  padding: 0px 8px;
@@ -960,18 +965,18 @@ ul#page_parts li.active a, ul#page_parts li a.active {
960
965
  margin-top: 0px;
961
966
  }
962
967
  ul#page_parts_controls {
963
- float: right;
964
- width: 5%;
968
+ float: right;
969
+ width: 5%;
965
970
  }
966
971
 
967
972
  ul#page_parts_controls li {
968
- list-style: none;
969
- float: right;
970
- margin: 12px 3px 0px 3px;
973
+ list-style: none;
974
+ float: right;
975
+ margin: 12px 3px 0px 3px;
971
976
  }
972
977
 
973
978
  ul#page_parts_controls li a {
974
- border: 0px none;
979
+ border: 0px none;
975
980
  }
976
981
 
977
982
  ul#page_parts_controls img {
@@ -1074,10 +1079,10 @@ ul#image_grid li.row-end {
1074
1079
  float: right;
1075
1080
  }
1076
1081
  ul#image_grid li a {
1077
- border: 0 none;
1082
+ border: 0 none;
1078
1083
  }
1079
1084
  ul#image_grid li p {
1080
- margin: 3px 0;
1085
+ margin: 3px 0;
1081
1086
  }
1082
1087
  ul#image_grid li span.actions {
1083
1088
  width: 100%;
@@ -1090,15 +1095,15 @@ ul#plugins li {
1090
1095
  list-style: none;
1091
1096
  }
1092
1097
  .label_inline_with_link label {
1093
- float: left;
1094
- margin-right: 6px;
1098
+ float: left;
1099
+ margin-right: 6px;
1095
1100
  }
1096
1101
  .label_inline_with_link a {
1097
- border: 0px none;
1098
- margin-top: 19px;
1099
- line-height: 17px;
1100
- float: left;
1102
+ border: 0px none;
1103
+ margin-top: 19px;
1104
+ line-height: 17px;
1105
+ float: left;
1101
1106
  }
1102
1107
  .label_inline_with_link a img {
1103
- vertical-align: middle;
1108
+ vertical-align: middle;
1104
1109
  }