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.
- data/Rakefile +6 -1
- data/app/controllers/admin/base_controller.rb +2 -2
- data/app/controllers/application.rb +1 -1
- data/app/controllers/application_controller.rb +2 -2
- data/app/helpers/application_helper.rb +2 -2
- data/config/environment.rb +6 -6
- data/config/environments/development.rb +1 -1
- data/config/initializers/inflections.rb +1 -1
- data/config/preinitializer.rb +3 -3
- data/config/routes.rb +5 -5
- data/db/migrate/20091109012126_add_missing_indexes.rb +4 -4
- data/db/schema.rb +1 -2
- data/db/seeds.rb +35 -35
- data/lib/refinery_initializer.rb +2 -2
- data/public/404.html +15 -15
- data/public/422.html +8 -8
- data/public/500.html +8 -8
- data/public/images/refinery/logo-large.png +0 -0
- data/public/images/refinery/logo-medium.png +0 -0
- data/public/images/refinery/logo-small-medium.png +0 -0
- data/public/images/refinery/logo-small.png +0 -0
- data/public/images/refinery/resolve_digital_footer_logo.png +0 -0
- data/public/javascripts/builder.js +97 -97
- data/public/javascripts/controls.js +655 -655
- data/public/javascripts/dragdrop.js +936 -936
- data/public/javascripts/effects.js +713 -713
- data/public/javascripts/jquery/GPL-LICENSE.txt +96 -96
- data/public/javascripts/jquery/jquery.js +168 -168
- data/public/javascripts/lightbox.js +397 -397
- data/public/javascripts/livepipe.js +146 -146
- data/public/javascripts/prototype.js +2996 -2996
- data/public/javascripts/refinery/admin.js +20 -20
- data/public/javascripts/refinery/boot_wym.js +110 -110
- data/public/javascripts/refinery/dialog.js +1 -1
- data/public/javascripts/refinery/parse_url.js +27 -27
- data/public/javascripts/refinery/prototype.enhancements.js +17 -17
- data/public/javascripts/refinery/tooltips.js +34 -34
- data/public/javascripts/scriptaculous.js +22 -22
- data/public/javascripts/slider.js +239 -239
- data/public/javascripts/tabs.js +130 -130
- data/public/javascripts/thickbox.js +23 -23
- data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js +23 -23
- data/public/javascripts/wymeditor/lang/ca.js +42 -42
- data/public/javascripts/wymeditor/lang/cs.js +42 -42
- data/public/javascripts/wymeditor/lang/de.js +42 -42
- data/public/javascripts/wymeditor/lang/en.js +44 -44
- data/public/javascripts/wymeditor/lang/es.js +42 -42
- data/public/javascripts/wymeditor/lang/fa.js +42 -42
- data/public/javascripts/wymeditor/lang/fr.js +42 -42
- data/public/javascripts/wymeditor/lang/he.js +42 -42
- data/public/javascripts/wymeditor/lang/hu.js +42 -42
- data/public/javascripts/wymeditor/lang/it.js +42 -42
- data/public/javascripts/wymeditor/lang/nb.js +42 -42
- data/public/javascripts/wymeditor/lang/nl.js +42 -42
- data/public/javascripts/wymeditor/lang/nn.js +42 -42
- data/public/javascripts/wymeditor/lang/pl.js +42 -42
- data/public/javascripts/wymeditor/lang/pt-br.js +42 -42
- data/public/javascripts/wymeditor/lang/pt.js +42 -42
- data/public/javascripts/wymeditor/lang/ru.js +42 -42
- data/public/javascripts/wymeditor/lang/sv.js +42 -42
- data/public/javascripts/wymeditor/lang/tr.js +42 -42
- data/public/javascripts/wymeditor/lang/zh_cn.js +44 -44
- data/public/javascripts/wymeditor/skins/refinery/skin.js +31 -31
- data/public/stylesheets/application.css +3 -3
- data/public/stylesheets/formatting.css +3 -3
- data/public/stylesheets/home.css +2 -2
- data/public/stylesheets/lightbox.css +1 -1
- data/public/stylesheets/refinery/application.css +13 -13
- data/public/stylesheets/refinery/formatting.css +3 -3
- data/public/stylesheets/refinery/refinery.css +49 -44
- data/public/stylesheets/refinery/theme.css +1 -1
- data/public/stylesheets/refinery/thickbox.css +4 -4
- data/public/stylesheets/wymeditor/skins/refinery/skin.css +115 -115
- data/public/stylesheets/wymeditor/skins/refinery/wymiframe.css +66 -66
- data/public/wymeditor/GPL-license.txt +96 -96
- data/script/performance/benchmarker +3 -0
- data/vendor/plugins/acts_as_indexed/lib/acts_as_indexed.rb +12 -12
- data/vendor/plugins/acts_as_indexed/lib/search_atom.rb +7 -7
- data/vendor/plugins/acts_as_indexed/lib/search_index.rb +7 -7
- data/vendor/plugins/acts_as_indexed/lib/will_paginate_search.rb +1 -1
- data/vendor/plugins/acts_as_indexed/test/abstract_unit.rb +5 -5
- data/vendor/plugins/acts_as_indexed/test/acts_as_indexed_test.rb +2 -2
- data/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb +140 -140
- data/vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb +18 -18
- data/vendor/plugins/attachment_fu/install.rb +1 -1
- data/vendor/plugins/attachment_fu/lib/geometry.rb +2 -2
- data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/cloud_file_backend.rb +3 -3
- data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb +4 -4
- data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb +11 -11
- data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb +7 -7
- data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/core_image_processor.rb +5 -5
- data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/gd2_processor.rb +4 -4
- data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/image_science_processor.rb +1 -1
- data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb +11 -11
- data/vendor/plugins/attachment_fu/test/backends/db_file_test.rb +2 -2
- data/vendor/plugins/attachment_fu/test/backends/file_system_test.rb +24 -24
- data/vendor/plugins/attachment_fu/test/backends/remote/cloudfiles_test.rb +14 -14
- data/vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb +7 -7
- data/vendor/plugins/attachment_fu/test/base_attachment_tests.rb +10 -10
- data/vendor/plugins/attachment_fu/test/basic_test.rb +10 -10
- data/vendor/plugins/attachment_fu/test/extra_attachment_test.rb +9 -9
- data/vendor/plugins/attachment_fu/test/fixtures/attachment.rb +10 -10
- data/vendor/plugins/attachment_fu/test/geometry_test.rb +12 -12
- data/vendor/plugins/attachment_fu/test/processors/core_image_test.rb +6 -6
- data/vendor/plugins/attachment_fu/test/processors/gd2_test.rb +4 -4
- data/vendor/plugins/attachment_fu/test/processors/image_science_test.rb +4 -4
- data/vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb +13 -13
- data/vendor/plugins/attachment_fu/test/processors/rmagick_test.rb +33 -33
- data/vendor/plugins/attachment_fu/test/schema.rb +14 -14
- data/vendor/plugins/attachment_fu/test/test_helper.rb +11 -11
- data/vendor/plugins/attachment_fu/test/validation_test.rb +7 -7
- data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/color.rb +7 -7
- data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/effects.rb +7 -7
- data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/perspective.rb +5 -5
- data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/quality.rb +7 -7
- data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/scale.rb +5 -5
- data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/watermark.rb +6 -6
- data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/processor.rb +16 -16
- data/vendor/plugins/authentication/app/controllers/admin/users_controller.rb +30 -30
- data/vendor/plugins/authentication/app/controllers/sessions_controller.rb +4 -4
- data/vendor/plugins/authentication/app/controllers/users_controller.rb +7 -7
- data/vendor/plugins/authentication/app/helpers/sessions_helper.rb +1 -1
- data/vendor/plugins/authentication/app/helpers/users_helper.rb +1 -1
- data/vendor/plugins/authentication/app/models/user.rb +56 -56
- data/vendor/plugins/authentication/app/models/user_mailer.rb +6 -6
- data/vendor/plugins/authentication/app/models/user_observer.rb +2 -2
- data/vendor/plugins/authentication/app/models/user_plugin.rb +4 -4
- data/vendor/plugins/authentication/app/views/admin/users/_form.html.erb +36 -36
- data/vendor/plugins/authentication/app/views/admin/users/edit.html.erb +1 -1
- data/vendor/plugins/authentication/app/views/admin/users/index.html.erb +1 -1
- data/vendor/plugins/authentication/app/views/admin/users/new.html.erb +1 -1
- data/vendor/plugins/authentication/app/views/sessions/new.html.erb +19 -19
- data/vendor/plugins/authentication/app/views/user_mailer/activation.html.erb +1 -1
- data/vendor/plugins/authentication/app/views/user_mailer/signup_notification.html.erb +1 -1
- data/vendor/plugins/authentication/app/views/users/new.html.erb +3 -3
- data/vendor/plugins/authentication/config/routes.rb +1 -1
- data/vendor/plugins/authentication/init.rb +5 -5
- data/vendor/plugins/authentication/lib/authenticated_system.rb +1 -1
- data/vendor/plugins/authentication/test/functional/sessions_controller_test.rb +2 -2
- data/vendor/plugins/authentication/test/functional/users_controller_test.rb +3 -3
- data/vendor/plugins/authentication/test/test_helper.rb +1 -1
- data/vendor/plugins/dashboard/app/controllers/admin/dashboard_controller.rb +1 -1
- data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb +1 -1
- data/vendor/plugins/dashboard/app/views/admin/dashboard/_recent_activity.html.erb +10 -10
- data/vendor/plugins/dashboard/app/views/admin/dashboard/index.html.erb +30 -30
- data/vendor/plugins/dashboard/config/routes.rb +2 -2
- data/vendor/plugins/dashboard/init.rb +6 -6
- data/vendor/plugins/images/app/controllers/admin/images_controller.rb +28 -28
- data/vendor/plugins/images/app/helpers/admin/images_helper.rb +14 -14
- data/vendor/plugins/images/app/models/image.rb +11 -11
- data/vendor/plugins/images/app/views/admin/images/_form.html.erb +21 -21
- data/vendor/plugins/images/app/views/admin/images/_grid_view.html.erb +13 -13
- data/vendor/plugins/images/app/views/admin/images/_list_view.html.erb +1 -1
- data/vendor/plugins/images/app/views/admin/images/_list_view_image.html.erb +2 -2
- data/vendor/plugins/images/app/views/admin/images/edit.html.erb +1 -1
- data/vendor/plugins/images/app/views/admin/images/index.html.erb +15 -15
- data/vendor/plugins/images/app/views/admin/images/insert.html.erb +91 -91
- data/vendor/plugins/images/app/views/admin/images/new.html.erb +1 -1
- data/vendor/plugins/images/config/routes.rb +2 -2
- data/vendor/plugins/images/init.rb +7 -7
- data/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb +4 -4
- data/vendor/plugins/inquiries/app/controllers/admin/inquiry_settings_controller.rb +5 -5
- data/vendor/plugins/inquiries/app/controllers/inquiries_controller.rb +3 -3
- data/vendor/plugins/inquiries/app/helpers/inquiries_helper.rb +3 -3
- data/vendor/plugins/inquiries/app/models/inquiry.rb +6 -6
- data/vendor/plugins/inquiries/app/models/inquiry_mailer.rb +1 -1
- data/vendor/plugins/inquiries/app/models/inquiry_setting.rb +3 -3
- data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb +19 -19
- data/vendor/plugins/inquiries/app/views/admin/inquiries/index.html.erb +27 -27
- data/vendor/plugins/inquiries/app/views/admin/inquiries/show.html.erb +59 -59
- data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/_confirmation_email_form.html.erb +44 -44
- data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/_notification_recipients_form.html.erb +15 -15
- data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/edit.html.erb +3 -3
- data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/index.html.erb +29 -29
- data/vendor/plugins/inquiries/app/views/inquiries/new.html.erb +32 -32
- data/vendor/plugins/inquiries/app/views/inquiries/thank_you.html.erb +8 -8
- data/vendor/plugins/inquiries/app/views/inquiry_mailer/confirmation.html.erb +1 -1
- data/vendor/plugins/inquiries/app/views/inquiry_mailer/notification.html.erb +1 -1
- data/vendor/plugins/inquiries/config/routes.rb +3 -3
- data/vendor/plugins/inquiries/init.rb +10 -10
- data/vendor/plugins/news/app/controllers/admin/news_items_controller.rb +3 -3
- data/vendor/plugins/news/app/controllers/news_items_controller.rb +2 -2
- data/vendor/plugins/news/app/models/news_item.rb +5 -5
- data/vendor/plugins/news/app/views/admin/news_items/_form.html.erb +16 -16
- data/vendor/plugins/news/app/views/admin/news_items/_news_item.html.erb +14 -14
- data/vendor/plugins/news/app/views/admin/news_items/edit.html.erb +1 -1
- data/vendor/plugins/news/app/views/admin/news_items/index.html.erb +25 -25
- data/vendor/plugins/news/app/views/admin/news_items/new.html.erb +1 -1
- data/vendor/plugins/news/app/views/news_items/_recent_posts.html.erb +6 -6
- data/vendor/plugins/news/app/views/news_items/index.html.erb +20 -20
- data/vendor/plugins/news/app/views/news_items/show.html.erb +16 -16
- data/vendor/plugins/news/config/routes.rb +3 -3
- data/vendor/plugins/news/init.rb +7 -7
- data/vendor/plugins/pages/app/controllers/admin/page_dialogs_controller.rb +10 -10
- data/vendor/plugins/pages/app/controllers/admin/page_parts_controller.rb +4 -4
- data/vendor/plugins/pages/app/controllers/admin/pages_controller.rb +4 -4
- data/vendor/plugins/pages/app/controllers/pages_controller.rb +3 -3
- data/vendor/plugins/pages/app/helpers/pages_helper.rb +1 -1
- data/vendor/plugins/pages/app/models/page.rb +95 -95
- data/vendor/plugins/pages/app/models/page_part.rb +5 -5
- data/vendor/plugins/pages/app/views/admin/page_dialogs/_page_link.html.erb +1 -1
- data/vendor/plugins/pages/app/views/admin/page_dialogs/link_to.html.erb +222 -222
- data/vendor/plugins/pages/app/views/admin/pages/_form.html.erb +232 -232
- data/vendor/plugins/pages/app/views/admin/pages/_list.html.erb +26 -26
- data/vendor/plugins/pages/app/views/admin/pages/_page_part_field.html.erb +3 -3
- data/vendor/plugins/pages/app/views/admin/pages/_sortable_list.html.erb +2 -2
- data/vendor/plugins/pages/app/views/admin/pages/edit.html.erb +1 -1
- data/vendor/plugins/pages/app/views/admin/pages/index.html.erb +37 -37
- data/vendor/plugins/pages/app/views/admin/pages/new.html.erb +1 -1
- data/vendor/plugins/pages/app/views/pages/home.html.erb +8 -8
- data/vendor/plugins/pages/app/views/pages/show.html.erb +11 -11
- data/vendor/plugins/pages/config/routes.rb +5 -5
- data/vendor/plugins/pages/init.rb +7 -7
- data/vendor/plugins/refinery/app/controllers/admin/refinery_core_controller.rb +7 -7
- data/vendor/plugins/refinery/app/views/admin/_head.html.erb +30 -30
- data/vendor/plugins/refinery/app/views/admin/_menu.html.erb +61 -61
- data/vendor/plugins/refinery/app/views/layouts/admin.html.erb +32 -32
- data/vendor/plugins/refinery/app/views/layouts/application.html.erb +28 -28
- data/vendor/plugins/refinery/app/views/shared/_footer.html.erb +4 -4
- data/vendor/plugins/refinery/app/views/shared/_google_analytics.html.erb +11 -11
- data/vendor/plugins/refinery/app/views/shared/_header.html.erb +3 -3
- data/vendor/plugins/refinery/app/views/shared/_ie6check.html.erb +1 -1
- data/vendor/plugins/refinery/app/views/shared/_menu.html.erb +14 -14
- data/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb +21 -21
- data/vendor/plugins/refinery/app/views/shared/_message.html.erb +8 -8
- data/vendor/plugins/refinery/app/views/shared/_submenu.html.erb +2 -2
- data/vendor/plugins/refinery/app/views/shared/_submenu_branch.html.erb +7 -7
- data/vendor/plugins/refinery/app/views/shared/admin/_continue_editing.html.erb +41 -41
- data/vendor/plugins/refinery/app/views/shared/admin/_error_messages_for.html.erb +1 -1
- data/vendor/plugins/refinery/app/views/shared/admin/_form_actions.html.erb +13 -13
- data/vendor/plugins/refinery/app/views/shared/admin/_image_picker.html.erb +31 -31
- data/vendor/plugins/refinery/app/views/shared/admin/_make_sortable.html.erb +65 -65
- data/vendor/plugins/refinery/app/views/shared/admin/_resource_picker.html.erb +16 -16
- data/vendor/plugins/refinery/app/views/shared/admin/_search.html.erb +5 -5
- data/vendor/plugins/refinery/app/views/shared/admin/_sortable_list.html.erb +8 -8
- data/vendor/plugins/refinery/app/views/welcome.html.erb +1 -1
- data/vendor/plugins/refinery/app/views/wymiframe.html.erb +6 -6
- data/vendor/plugins/refinery/config/routes.rb +5 -5
- data/vendor/plugins/refinery/init.rb +8 -8
- data/vendor/plugins/refinery/lib/crud.rb +17 -17
- data/vendor/plugins/refinery/lib/generators/refinery/install.rb +1 -1
- data/vendor/plugins/refinery/lib/generators/refinery/refinery_generator.rb +17 -17
- data/vendor/plugins/refinery/lib/generators/refinery/templates/config/routes.rb +3 -3
- data/vendor/plugins/refinery/lib/generators/refinery/templates/controller.rb +2 -2
- data/vendor/plugins/refinery/lib/generators/refinery/templates/init.rb +6 -6
- data/vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb +22 -22
- data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb +4 -4
- data/vendor/plugins/refinery/lib/generators/refinery/templates/public_controller.rb +10 -10
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb +3 -3
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_singular_name.html.erb +15 -15
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_sortable_list.html.erb +1 -1
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/edit.html.erb +1 -1
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/index.html.erb +33 -33
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/new.html.erb +1 -1
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/index.html.erb +14 -14
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/show.html.erb +21 -21
- data/vendor/plugins/refinery/lib/indexer.rb +29 -29
- data/vendor/plugins/refinery/lib/refinery.rb +10 -10
- data/vendor/plugins/refinery/lib/refinery/activity.rb +5 -5
- data/vendor/plugins/refinery/lib/refinery/admin_base_controller.rb +15 -15
- data/vendor/plugins/refinery/lib/refinery/application_controller.rb +39 -39
- data/vendor/plugins/refinery/lib/refinery/application_helper.rb +69 -69
- data/vendor/plugins/refinery/lib/refinery/form_helpers.rb +18 -18
- data/vendor/plugins/refinery/lib/refinery/html_truncation_helper.rb +5 -5
- data/vendor/plugins/refinery/lib/refinery/initializer.rb +2 -2
- data/vendor/plugins/refinery/lib/refinery/link_renderer.rb +13 -13
- data/vendor/plugins/refinery/lib/refinery/plugin.rb +24 -24
- data/vendor/plugins/refinery/lib/refinery/plugins.rb +2 -2
- data/vendor/plugins/refinery_dialogs/app/controllers/admin/dialogs_controller.rb +8 -8
- data/vendor/plugins/refinery_dialogs/app/views/admin/dialogs/show.html.erb +19 -19
- data/vendor/plugins/refinery_dialogs/app/views/layouts/admin_dialog.html.erb +29 -29
- data/vendor/plugins/refinery_dialogs/config/routes.rb +2 -2
- data/vendor/plugins/refinery_dialogs/init.rb +7 -7
- data/vendor/plugins/refinery_settings/app/controllers/admin/refinery_settings_controller.rb +2 -2
- data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb +52 -52
- data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_form.html.erb +11 -11
- data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_make_sortable.html.erb +3 -3
- data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_refinery_setting.html.erb +12 -12
- data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/edit.html.erb +2 -2
- data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/index.html.erb +19 -19
- data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/new.html.erb +1 -1
- data/vendor/plugins/refinery_settings/config/routes.rb +3 -3
- data/vendor/plugins/refinery_settings/init.rb +8 -8
- data/vendor/plugins/resources/app/controllers/admin/resources_controller.rb +48 -48
- data/vendor/plugins/resources/app/models/resource.rb +12 -12
- data/vendor/plugins/resources/app/views/admin/resources/_form.html.erb +21 -21
- data/vendor/plugins/resources/app/views/admin/resources/_resource.html.erb +15 -15
- data/vendor/plugins/resources/app/views/admin/resources/edit.html.erb +1 -1
- data/vendor/plugins/resources/app/views/admin/resources/index.html.erb +19 -19
- data/vendor/plugins/resources/app/views/admin/resources/insert.html.erb +86 -86
- data/vendor/plugins/resources/app/views/admin/resources/new.html.erb +1 -1
- data/vendor/plugins/resources/config/routes.rb +2 -2
- data/vendor/plugins/resources/init.rb +6 -6
- metadata +31 -23
@@ -1,7 +1,7 @@
|
|
1
1
|
class Refinery::LinkRenderer < WillPaginate::LinkRenderer
|
2
|
-
|
3
|
-
|
4
|
-
|
2
|
+
|
3
|
+
def url_for(page)
|
4
|
+
page_one = page == 1
|
5
5
|
@url_params = {}
|
6
6
|
# page links should preserve GET parameters
|
7
7
|
stringified_merge @url_params, @template.params if @template.request.get?
|
@@ -9,16 +9,16 @@ class Refinery::LinkRenderer < WillPaginate::LinkRenderer
|
|
9
9
|
|
10
10
|
if complex = param_name.index(/[^\w-]/)
|
11
11
|
page_param = parse_query_parameters("#{param_name}=#{page}")
|
12
|
-
|
12
|
+
|
13
13
|
stringified_merge @url_params, page_param
|
14
14
|
else
|
15
15
|
@url_params[param_name] = page_one ? 1 : 2
|
16
16
|
end
|
17
17
|
|
18
|
-
|
19
|
-
|
18
|
+
url = @template.url_for(@url_params.merge!(@options[:url]||{}).to_options)
|
19
|
+
#@options.delete(:url) # no, don't! We want it to use the url every time.
|
20
20
|
return url if page_one
|
21
|
-
|
21
|
+
|
22
22
|
if complex
|
23
23
|
@url_string = url.sub(%r!((?:\?|&)#{CGI.escape param_name}=)#{page}!, '\1@')
|
24
24
|
return url
|
@@ -34,12 +34,12 @@ class Refinery::LinkRenderer < WillPaginate::LinkRenderer
|
|
34
34
|
end
|
35
35
|
# finally!
|
36
36
|
@url_string.sub '@', page.to_s
|
37
|
-
|
38
|
-
|
37
|
+
end
|
38
|
+
|
39
39
|
private
|
40
|
-
|
41
|
-
|
40
|
+
|
41
|
+
def param_name
|
42
42
|
@options[:param_name].to_s
|
43
43
|
end
|
44
|
-
|
45
|
-
end
|
44
|
+
|
45
|
+
end
|
@@ -1,12 +1,12 @@
|
|
1
1
|
module Refinery
|
2
2
|
class Plugin
|
3
3
|
|
4
|
-
|
5
|
-
|
6
|
-
|
4
|
+
def self.register(&block)
|
5
|
+
yield self.new
|
6
|
+
end
|
7
7
|
|
8
8
|
attr_accessor :title, :version, :description, :url, :menu_match, :plugin_activity, :directory, :hide_from_menu, :always_allow_access
|
9
|
-
|
9
|
+
|
10
10
|
def initialize
|
11
11
|
Refinery::Plugins.registered << self # add me to the collection of registered plugins
|
12
12
|
end
|
@@ -14,34 +14,34 @@ module Refinery
|
|
14
14
|
def highlighted?(params)
|
15
15
|
params[:controller] =~ self.menu_match
|
16
16
|
end
|
17
|
-
|
17
|
+
|
18
18
|
def activity
|
19
19
|
self.plugin_activity ||= []
|
20
20
|
end
|
21
|
-
|
21
|
+
|
22
22
|
def activity=(activities)
|
23
23
|
[activities].flatten.each { |activity| add_activity(activity) }
|
24
24
|
end
|
25
|
-
|
25
|
+
|
26
26
|
def add_activity(options)
|
27
27
|
(self.plugin_activity ||= []) << Activity::new(options)
|
28
28
|
end
|
29
29
|
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
30
|
+
def url
|
31
|
+
@url ||= "/admin/#{self.directory.blank? ? self.title.downcase : self.directory.split('/').pop}"
|
32
|
+
end
|
33
|
+
|
34
|
+
def menu_match
|
35
|
+
@menu_match ||= /admin\/#{self.title.gsub(" ", "_").downcase}$/
|
36
|
+
end
|
37
|
+
|
38
|
+
def hide_from_menu
|
39
|
+
@hide_from_menu
|
40
|
+
end
|
41
|
+
|
42
|
+
def always_allow_access
|
43
|
+
@always_allow_access ||= false
|
44
|
+
end
|
45
|
+
|
46
46
|
end
|
47
|
-
end
|
47
|
+
end
|
@@ -1,24 +1,24 @@
|
|
1
1
|
class Admin::DialogsController < Admin::BaseController
|
2
|
-
|
2
|
+
|
3
3
|
layout 'admin_dialog'
|
4
|
-
|
4
|
+
|
5
5
|
def show
|
6
6
|
unless (@dialog_type = params[:id]).blank?
|
7
7
|
@submit_button_text = "Insert"
|
8
|
-
|
8
|
+
|
9
9
|
url_params = params.reject {|key, value| key =~ /(action)|(controller)/}
|
10
|
-
|
10
|
+
|
11
11
|
if @dialog_type.downcase.split("&")[0] == "image"
|
12
12
|
@iframe_src = insert_admin_images_url(:dialog => true)
|
13
13
|
elsif @dialog_type.downcase.split("&")[0] == "link"
|
14
14
|
@iframe_src = link_to_admin_pages_dialogs_url(url_params)
|
15
15
|
end
|
16
|
-
|
16
|
+
|
17
17
|
render :layout => false#"admin_dialog"
|
18
|
-
|
18
|
+
|
19
19
|
else
|
20
20
|
render :nothing => true
|
21
21
|
end
|
22
22
|
end
|
23
|
-
|
24
|
-
end
|
23
|
+
|
24
|
+
end
|
@@ -1,20 +1,20 @@
|
|
1
1
|
<form class='wym_dialog wym_dialog_<%= @dialog_type.downcase.split("&")[0] %>'>
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
</form>
|
2
|
+
<input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='<%= @dialog_type %>' />
|
3
|
+
<iframe src='<%= @iframe_src %>' id='dialog_frame' frameborder='0'></iframe>
|
4
|
+
<div class='wym_hideables'>
|
5
|
+
<% if @dialog_type.downcase.split("&")[0] == "image" %>
|
6
|
+
<input type='text' id='wym_src' class='wym_src' value='' size='40' />
|
7
|
+
<input type='text' id='wym_alt' class='wym_alt' value='' size='40' />
|
8
|
+
<input type='text' id='wym_title' class='wym_title' value='' size='40' />
|
9
|
+
<% elsif @dialog_type.downcase.split("&")[0] == "link" %>
|
10
|
+
<input type='text' id='wym_href' class='wym_href' value='' size='40' />
|
11
|
+
<input type='text' id='wym_title' class='wym_title' value='' size='40' />
|
12
|
+
<input type='text' id='wym_target' class='wym_target' value='' size='40' />
|
13
|
+
<% end %>
|
14
|
+
</div>
|
15
|
+
<div id='dialog-form-actions' class='form-actions'>
|
16
|
+
<input class='wym_submit submit_dialog' type='button' value='<%= @submit_button_text ||= 'Save' %>' />
|
17
|
+
or
|
18
|
+
<a href='' class='wym_cancel close_dialog'><%= @cancel_button_text ||= "Cancel" %></a>
|
19
|
+
</div>
|
20
|
+
</form>
|
@@ -1,31 +1,31 @@
|
|
1
1
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
2
2
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
</html>
|
3
|
+
<head>
|
4
|
+
<%= stylesheet_link_tag 'refinery/refinery' %>
|
5
|
+
<% unless local_request? %>
|
6
|
+
<script type='text/javascript' src="http://www.google.com/jsapi"></script>
|
7
|
+
<script type='text/javascript'>
|
8
|
+
google.load("prototype", "1.6");
|
9
|
+
google.load("scriptaculous", "1.8.2");
|
10
|
+
</script>
|
11
|
+
<% else %>
|
12
|
+
<%= javascript_include_tag "prototype", "scriptaculous" %>
|
13
|
+
<% end %>
|
14
|
+
<%= javascript_include_tag "fastinit", "refinery/tooltips", "refinery/dialog" %>
|
15
|
+
<%= yield :head %>
|
16
|
+
<%= "<script type='text/javascript' src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>" if RefinerySetting.find_or_set(:show_firebug_lite, false) == true %>
|
17
|
+
<% if @flash %>
|
18
|
+
<script type='text/javascript'>
|
19
|
+
document.observe('dom:loaded', function() {
|
20
|
+
$('flash').appear();
|
21
|
+
});
|
22
|
+
</script>
|
23
|
+
<% end %>
|
24
|
+
</head>
|
25
|
+
<body id='dialog_container' class='dialog'>
|
26
|
+
<div id="flash_container">
|
27
|
+
<%= render :partial => '/shared/message' %>
|
28
|
+
</div>
|
29
|
+
<%= yield %>
|
30
|
+
</body>
|
31
|
+
</html>
|
@@ -1,8 +1,8 @@
|
|
1
1
|
Refinery::Plugin.register do |plugin|
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
end
|
2
|
+
plugin.directory = directory
|
3
|
+
plugin.title = "Dialogs"
|
4
|
+
plugin.description = "Refinery Dialogs plugin"
|
5
|
+
plugin.version = 1.0
|
6
|
+
plugin.hide_from_menu = true
|
7
|
+
plugin.always_allow_access = true
|
8
|
+
end
|
@@ -1,62 +1,62 @@
|
|
1
1
|
class RefinerySetting < ActiveRecord::Base
|
2
|
-
|
3
|
-
|
2
|
+
class SettingNotFound < RuntimeError; end
|
3
|
+
|
4
4
|
validates_presence_of :name
|
5
5
|
validates_uniqueness_of :name
|
6
|
-
|
6
|
+
|
7
7
|
serialize :value
|
8
8
|
|
9
9
|
def title
|
10
10
|
self.name.titleize
|
11
11
|
end
|
12
12
|
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
13
|
+
# internals
|
14
|
+
|
15
|
+
def self.method_missing(method, *args)
|
16
|
+
method_name = method.to_s
|
17
|
+
super(method, *args)
|
18
|
+
|
19
|
+
rescue NoMethodError
|
20
|
+
if method_name =~ /=$/
|
21
|
+
self[method_name.gsub('=', '')] = args.first
|
22
|
+
else
|
23
|
+
self[method_name]
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
def self.find_or_set(name, or_this_value)
|
28
|
+
setting_value = find_or_create_by_name(:name => name.to_s, :value => or_this_value).value
|
29
|
+
end
|
30
|
+
|
31
|
+
def self.[](name)
|
32
|
+
self.find_by_name(name.to_s).value rescue nil
|
33
|
+
end
|
34
|
+
|
35
|
+
def self.[]=(name, value)
|
36
|
+
setting = find_or_create_by_name(name.to_s)
|
37
|
+
setting.value = value
|
38
|
+
setting.save!
|
29
39
|
end
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
return _value
|
54
|
-
end
|
55
|
-
|
56
|
-
def value=(new_value)
|
57
|
-
# must convert to string if true or false supplied otherwise it becomes 0 or 1, unfortunately.
|
58
|
-
new_value = new_value.to_s if ["trueclass","falseclass"].include?(new_value.class.to_s.downcase)
|
59
|
-
self[:value] = new_value
|
60
|
-
end
|
61
|
-
|
62
|
-
end
|
40
|
+
|
41
|
+
REPLACEMENTS = {"true" => true, "false" => false}
|
42
|
+
|
43
|
+
def value
|
44
|
+
_value = self[:value]
|
45
|
+
|
46
|
+
unless _value.nil?
|
47
|
+
REPLACEMENTS.each do |current_value, new_value|
|
48
|
+
_value = new_value if _value == current_value
|
49
|
+
end
|
50
|
+
_value = _value.to_i if _value.to_i.to_s == _value rescue _value
|
51
|
+
end
|
52
|
+
|
53
|
+
return _value
|
54
|
+
end
|
55
|
+
|
56
|
+
def value=(new_value)
|
57
|
+
# must convert to string if true or false supplied otherwise it becomes 0 or 1, unfortunately.
|
58
|
+
new_value = new_value.to_s if ["trueclass","falseclass"].include?(new_value.class.to_s.downcase)
|
59
|
+
self[:value] = new_value
|
60
|
+
end
|
61
|
+
|
62
|
+
end
|
@@ -1,17 +1,17 @@
|
|
1
1
|
<%= error_messages_for :refinery_setting %>
|
2
2
|
<% form_for [:admin, @refinery_setting] do |f| %>
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
3
|
+
<div class='field'>
|
4
|
+
<% if params[:action] =~ /(new)|(create)/ %>
|
5
|
+
<%= f.label :name %>
|
6
|
+
<%= f.text_field :name, :class => "larger", :size => 67 %>
|
7
|
+
<% else %>
|
8
|
+
<label>Name</label>
|
9
9
|
<%= @refinery_setting.name.titleize %> <span class="preview">- (<%= h @refinery_setting.name %>)</span>
|
10
|
-
|
10
|
+
<% end %>
|
11
11
|
</div>
|
12
|
-
|
13
|
-
|
14
|
-
|
12
|
+
<div class='field'>
|
13
|
+
<%= f.label :value %>
|
14
|
+
<%= f.text_area :value, :rows => 5, :cols => 100 %>
|
15
15
|
</div>
|
16
16
|
<%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
|
17
|
-
<% end -%>
|
17
|
+
<% end -%>
|