publify_core 9.0.0 → 9.2.2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of publify_core might be problematic. Click here for more details.
- checksums.yaml +5 -5
- data/CHANGELOG.md +92 -37
- data/app/assets/javascripts/bootstrap-sprockets.js +8 -0
- data/app/assets/javascripts/bootstrap/affix.js +164 -0
- data/app/assets/javascripts/bootstrap/alert.js +95 -0
- data/app/assets/javascripts/bootstrap/button.js +125 -0
- data/app/assets/javascripts/bootstrap/collapse.js +212 -0
- data/app/assets/javascripts/bootstrap/dropdown.js +165 -0
- data/app/assets/javascripts/bootstrap/modal.js +358 -0
- data/app/assets/javascripts/bootstrap/tab.js +155 -0
- data/app/assets/javascripts/bootstrap/transition.js +59 -0
- data/app/assets/javascripts/lightbox.js +4 -4
- data/app/assets/javascripts/publify_admin.js +1 -35
- data/app/assets/stylesheets/_bootstrap-compass.scss +9 -0
- data/app/assets/stylesheets/_bootstrap-mincer.scss +19 -0
- data/app/assets/stylesheets/_bootstrap-sprockets.scss +9 -0
- data/app/assets/stylesheets/_bootstrap.scss +42 -0
- data/app/assets/stylesheets/administration_structure.css.scss +1 -45
- data/app/assets/stylesheets/bootstrap/_alerts.scss +73 -0
- data/app/assets/stylesheets/bootstrap/_button-groups.scss +242 -0
- data/app/assets/stylesheets/bootstrap/_buttons.scss +168 -0
- data/app/assets/stylesheets/bootstrap/_close.scss +37 -0
- data/app/assets/stylesheets/bootstrap/_code.scss +69 -0
- data/app/assets/stylesheets/bootstrap/_component-animations.scss +38 -0
- data/app/assets/stylesheets/bootstrap/_dropdowns.scss +213 -0
- data/app/assets/stylesheets/bootstrap/_forms.scss +586 -0
- data/app/assets/stylesheets/bootstrap/_grid.scss +94 -0
- data/app/assets/stylesheets/bootstrap/_labels.scss +66 -0
- data/app/assets/stylesheets/bootstrap/_media.scss +66 -0
- data/app/assets/stylesheets/bootstrap/_mixins.scss +37 -0
- data/app/assets/stylesheets/bootstrap/_modals.scss +150 -0
- data/app/assets/stylesheets/bootstrap/_navbar.scss +479 -0
- data/app/assets/stylesheets/bootstrap/_navs.scss +242 -0
- data/app/assets/stylesheets/bootstrap/_normalize.scss +427 -0
- data/app/assets/stylesheets/bootstrap/_pagination.scss +86 -0
- data/app/assets/stylesheets/bootstrap/_panels.scss +222 -0
- data/app/assets/stylesheets/bootstrap/_print.scss +99 -0
- data/app/assets/stylesheets/bootstrap/_scaffolding.scss +160 -0
- data/app/assets/stylesheets/bootstrap/_tables.scss +234 -0
- data/app/assets/stylesheets/bootstrap/_theme.scss +224 -0
- data/app/assets/stylesheets/bootstrap/_type.scss +296 -0
- data/app/assets/stylesheets/bootstrap/_utilities.scss +55 -0
- data/app/assets/stylesheets/bootstrap/_variables.scss +638 -0
- data/app/assets/stylesheets/bootstrap/_wells.scss +29 -0
- data/app/assets/stylesheets/bootstrap/mixins/_alerts.scss +15 -0
- data/app/assets/stylesheets/bootstrap/mixins/_background-variant.scss +12 -0
- data/app/assets/stylesheets/bootstrap/mixins/_border-radius.scss +18 -0
- data/app/assets/stylesheets/bootstrap/mixins/_buttons.scss +56 -0
- data/app/assets/stylesheets/bootstrap/mixins/_center-block.scss +7 -0
- data/app/assets/stylesheets/bootstrap/mixins/_clearfix.scss +22 -0
- data/app/assets/stylesheets/bootstrap/mixins/_forms.scss +82 -0
- data/app/assets/stylesheets/bootstrap/mixins/_gradients.scss +56 -0
- data/app/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +81 -0
- data/app/assets/stylesheets/bootstrap/mixins/_grid.scss +122 -0
- data/app/assets/stylesheets/bootstrap/mixins/_hide-text.scss +21 -0
- data/app/assets/stylesheets/bootstrap/mixins/_image.scss +28 -0
- data/app/assets/stylesheets/bootstrap/mixins/_labels.scss +12 -0
- data/app/assets/stylesheets/bootstrap/mixins/_nav-divider.scss +10 -0
- data/app/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss +9 -0
- data/app/assets/stylesheets/bootstrap/mixins/_opacity.scss +7 -0
- data/app/assets/stylesheets/bootstrap/mixins/_pagination.scss +24 -0
- data/app/assets/stylesheets/bootstrap/mixins/_panels.scss +20 -0
- data/app/assets/stylesheets/bootstrap/mixins/_reset-filter.scss +8 -0
- data/app/assets/stylesheets/bootstrap/mixins/_resize.scss +6 -0
- data/app/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +17 -0
- data/app/assets/stylesheets/bootstrap/mixins/_size.scss +10 -0
- data/app/assets/stylesheets/bootstrap/mixins/_tab-focus.scss +9 -0
- data/app/assets/stylesheets/bootstrap/mixins/_table-row.scss +28 -0
- data/app/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +12 -0
- data/app/assets/stylesheets/bootstrap/mixins/_text-overflow.scss +8 -0
- data/app/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +222 -0
- data/app/assets/stylesheets/lightbox.css +3 -3
- data/app/assets/stylesheets/publify_admin.css.scss +0 -1
- data/app/controllers/accounts_controller.rb +2 -0
- data/app/controllers/admin/base_controller.rb +8 -16
- data/app/controllers/admin/content_controller.rb +38 -36
- data/app/controllers/admin/dashboard_controller.rb +16 -65
- data/app/controllers/admin/feedback_controller.rb +45 -37
- data/app/controllers/admin/notes_controller.rb +16 -10
- data/app/controllers/admin/pages_controller.rb +19 -29
- data/app/controllers/admin/post_types_controller.rb +7 -5
- data/app/controllers/admin/profiles_controller.rb +15 -5
- data/app/controllers/admin/redirects_controller.rb +9 -5
- data/app/controllers/admin/resources_controller.rb +7 -4
- data/app/controllers/admin/seo_controller.rb +12 -10
- data/app/controllers/admin/settings_controller.rb +7 -5
- data/app/controllers/admin/sidebar_controller.rb +6 -5
- data/app/controllers/admin/tags_controller.rb +6 -3
- data/app/controllers/admin/themes_controller.rb +10 -7
- data/app/controllers/admin/users_controller.rb +10 -7
- data/app/controllers/articles_controller.rb +49 -33
- data/app/controllers/authors_controller.rb +6 -3
- data/app/controllers/base_controller.rb +9 -11
- data/app/controllers/comments_controller.rb +13 -13
- data/app/controllers/content_controller.rb +4 -2
- data/app/controllers/feedback_controller.rb +4 -2
- data/app/controllers/notes_controller.rb +5 -3
- data/app/controllers/setup_controller.rb +15 -12
- data/app/controllers/tags_controller.rb +6 -4
- data/app/controllers/text_controller.rb +2 -4
- data/app/controllers/textfilter_controller.rb +2 -0
- data/app/controllers/theme_controller.rb +18 -13
- data/app/controllers/xml_controller.rb +2 -0
- data/app/helpers/admin/base_helper.rb +28 -29
- data/app/helpers/admin/feedback_helper.rb +34 -24
- data/app/helpers/articles_helper.rb +4 -2
- data/app/helpers/authors_helper.rb +7 -16
- data/app/helpers/base_helper.rb +56 -52
- data/app/helpers/blog_helper.rb +4 -2
- data/app/helpers/xml_helper.rb +3 -1
- data/app/jobs/application_job.rb +2 -0
- data/app/mailers/notification_mailer.rb +5 -3
- data/app/models/ability.rb +25 -23
- data/app/models/archives_sidebar.rb +14 -11
- data/app/models/article.rb +42 -42
- data/app/models/article/factory.rb +14 -6
- data/app/models/blog.rb +86 -75
- data/app/models/comment.rb +10 -11
- data/app/models/config_manager.rb +4 -2
- data/app/models/content.rb +37 -50
- data/app/models/content_base.rb +10 -4
- data/app/models/feedback.rb +21 -17
- data/app/models/meta_sidebar.rb +4 -3
- data/app/models/note.rb +26 -25
- data/app/models/page.rb +9 -8
- data/app/models/page_sidebar.rb +4 -2
- data/app/models/ping.rb +3 -1
- data/app/models/post_type.rb +3 -3
- data/app/models/redirect.rb +13 -7
- data/app/models/redirection.rb +3 -1
- data/app/models/resource.rb +5 -3
- data/app/models/search_sidebar.rb +4 -2
- data/app/models/sidebar.rb +11 -6
- data/app/models/static_sidebar.rb +14 -13
- data/app/models/tag.rb +15 -11
- data/app/models/tag_sidebar.rb +6 -3
- data/app/models/text_filter.rb +85 -11
- data/app/models/trackback.rb +7 -11
- data/app/models/trigger.rb +7 -4
- data/app/models/user.rb +44 -43
- data/app/services/title_builder.rb +52 -45
- data/app/uploaders/resource_uploader.rb +5 -3
- data/app/views/accounts/confirm.html.erb +3 -3
- data/app/views/admin/content/_article_list.html.erb +23 -8
- data/app/views/admin/content/_form.html.erb +71 -47
- data/app/views/admin/content/autosave.js.erb +2 -2
- data/app/views/admin/content/edit.html.erb +1 -1
- data/app/views/admin/content/index.html.erb +25 -15
- data/app/views/admin/content/new.html.erb +2 -2
- data/app/views/admin/dashboard/_comment.html.erb +5 -5
- data/app/views/admin/dashboard/_comments.html.erb +2 -2
- data/app/views/admin/dashboard/_drafts.html.erb +5 -5
- data/app/views/admin/dashboard/_overview.html.erb +7 -9
- data/app/views/admin/dashboard/_welcome.html.erb +11 -11
- data/app/views/admin/dashboard/index.html.erb +12 -7
- data/app/views/admin/feedback/_button.html.erb +6 -6
- data/app/views/admin/feedback/_feedback.html.erb +3 -3
- data/app/views/admin/feedback/_ham.html.erb +27 -9
- data/app/views/admin/feedback/_spam.html.erb +26 -16
- data/app/views/admin/feedback/article.html.erb +20 -21
- data/app/views/admin/feedback/edit.html.erb +14 -15
- data/app/views/admin/feedback/{ham.js → ham.js.erb} +0 -0
- data/app/views/admin/feedback/index.html.erb +25 -23
- data/app/views/admin/feedback/{spam.js → spam.js.erb} +0 -0
- data/app/views/admin/migrations/show.html.erb +10 -11
- data/app/views/admin/notes/_form.html.erb +13 -13
- data/app/views/admin/notes/_list.html.erb +19 -8
- data/app/views/admin/notes/_note.html.erb +12 -7
- data/app/views/admin/notes/edit.html.erb +6 -1
- data/app/views/admin/notes/index.html.erb +5 -1
- data/app/views/admin/notes/show.html.erb +2 -2
- data/app/views/admin/pages/_form.html.erb +86 -77
- data/app/views/admin/pages/_pages.html.erb +11 -4
- data/app/views/admin/pages/edit.html.erb +3 -1
- data/app/views/admin/pages/index.html.erb +10 -6
- data/app/views/admin/pages/new.html.erb +3 -1
- data/app/views/admin/post_types/_index_and_form.html.erb +15 -16
- data/app/views/admin/post_types/edit.html.erb +1 -1
- data/app/views/admin/post_types/index.html.erb +1 -1
- data/app/views/admin/profiles/index.html.erb +2 -3
- data/app/views/admin/redirects/_index_and_form.html.erb +10 -11
- data/app/views/admin/redirects/edit.html.erb +1 -1
- data/app/views/admin/redirects/index.html.erb +1 -1
- data/app/views/admin/resources/index.html.erb +19 -16
- data/app/views/admin/seo/_general.html.erb +23 -47
- data/app/views/admin/seo/_permalinks.html.erb +16 -16
- data/app/views/admin/seo/_titles.html.erb +63 -64
- data/app/views/admin/seo/show.html.erb +14 -19
- data/app/views/admin/settings/display.html.erb +22 -25
- data/app/views/admin/settings/feedback.html.erb +31 -32
- data/app/views/admin/settings/index.html.erb +23 -24
- data/app/views/admin/settings/write.html.erb +21 -22
- data/app/views/admin/shared/_edit.html.erb +3 -3
- data/app/views/admin/shared/_menu.html.erb +26 -26
- data/app/views/admin/shared/_twitter_alert.html.erb +1 -1
- data/app/views/admin/sidebar/_config.html.erb +5 -5
- data/app/views/admin/sidebar/_target_sidebar.html.erb +4 -4
- data/app/views/admin/sidebar/index.html.erb +7 -7
- data/app/views/admin/tags/_index_and_form.html.erb +11 -12
- data/app/views/admin/tags/edit.html.erb +1 -1
- data/app/views/admin/tags/index.html.erb +1 -1
- data/app/views/admin/themes/index.html.erb +5 -6
- data/app/views/admin/users/_form.html.erb +34 -34
- data/app/views/admin/users/edit.html.erb +2 -2
- data/app/views/admin/users/index.html.erb +10 -12
- data/app/views/admin/users/new.html.erb +2 -2
- data/app/views/archives_sidebar/_content.html.erb +2 -2
- data/app/views/articles/_archives_article.html.erb +3 -3
- data/app/views/articles/_article.html.erb +7 -9
- data/app/views/articles/_article_author.html.erb +4 -0
- data/app/views/articles/_article_content.html.erb +2 -2
- data/app/views/articles/_article_excerpt.html.erb +2 -2
- data/app/views/articles/_article_links.html.erb +1 -1
- data/app/views/articles/_comment_errors.html.erb +1 -1
- data/app/views/articles/_comment_form.html.erb +12 -12
- data/app/views/articles/_comment_preview.html.erb +3 -3
- data/app/views/articles/_password_form.html.erb +4 -4
- data/app/views/articles/_trackback.html.erb +2 -2
- data/app/views/articles/archives.html.erb +1 -1
- data/app/views/articles/feedback_atom_feed.atom.builder +3 -1
- data/app/views/articles/feedback_rss_feed.rss.builder +9 -8
- data/app/views/articles/index_atom_feed.atom.builder +5 -3
- data/app/views/articles/index_rss_feed.rss.builder +10 -9
- data/app/views/articles/live_search.html.erb +3 -3
- data/app/views/articles/read.html.erb +16 -8
- data/app/views/articles/search.html.erb +2 -2
- data/app/views/articles/trackback.xml.builder +3 -1
- data/app/views/articles/view_page.html.erb +2 -2
- data/app/views/authors/show.html.erb +9 -9
- data/app/views/authors/show_atom_feed.atom.builder +4 -2
- data/app/views/authors/show_rss_feed.rss.builder +10 -9
- data/app/views/comments/_comment.html.erb +3 -3
- data/app/views/devise/mailer/reset_password_instructions.html.erb +7 -9
- data/app/views/devise/passwords/edit.html.erb +4 -4
- data/app/views/devise/passwords/new.html.erb +1 -1
- data/app/views/devise/registrations/new.html.erb +5 -5
- data/app/views/devise/sessions/new.html.erb +3 -3
- data/app/views/errors/404.html.erb +2 -2
- data/app/views/feedback/index.atom.builder +3 -1
- data/app/views/feedback/index.rss.builder +9 -8
- data/app/views/layouts/accounts.html.erb +26 -26
- data/app/views/layouts/administration.html.erb +31 -31
- data/app/views/layouts/default.html.erb +4 -3
- data/app/views/layouts/editor.html.erb +5 -19
- data/app/views/meta_sidebar/_content.html.erb +2 -2
- data/app/views/notes/_note.html.erb +1 -1
- data/app/views/notes/index.html.erb +1 -1
- data/app/views/notes/show_in_reply.html.erb +1 -1
- data/app/views/notification_mailer/_mail_footer.html.erb +3 -3
- data/app/views/notification_mailer/article.html.erb +2 -2
- data/app/views/notification_mailer/comment.html.erb +5 -5
- data/app/views/notification_mailer/notif_user.html.erb +1 -1
- data/app/views/page_sidebar/_content.html.erb +1 -1
- data/app/views/search_sidebar/_content.html.erb +2 -2
- data/app/views/settings/install.html.erb +2 -2
- data/app/views/setup/index.html.erb +7 -7
- data/app/views/shared/_atom_header.atom.builder +4 -4
- data/app/views/shared/_atom_item_article.atom.builder +19 -29
- data/app/views/shared/_atom_item_comment.atom.builder +4 -2
- data/app/views/shared/_atom_item_trackback.atom.builder +4 -2
- data/app/views/shared/_google_analytics.html.erb +8 -0
- data/app/views/shared/_page_header.html.erb +9 -12
- data/app/views/shared/_rss_item_article.rss.builder +9 -7
- data/app/views/shared/_rss_item_comment.rss.builder +3 -1
- data/app/views/shared/_rss_item_trackback.rss.builder +3 -1
- data/app/views/sidebar/display_plugins.html.erb +1 -1
- data/app/views/tag_sidebar/_content.html.erb +1 -1
- data/app/views/tags/index.html.erb +1 -1
- data/app/views/xml/_googlesitemap_item_article.googlesitemap.builder +2 -0
- data/app/views/xml/_googlesitemap_item_category.googlesitemap.builder +2 -0
- data/app/views/xml/_googlesitemap_item_page.googlesitemap.builder +2 -0
- data/app/views/xml/_googlesitemap_item_tag.googlesitemap.builder +2 -0
- data/app/views/xml/sitemap.googlesitemap.builder +4 -2
- data/config/i18n-tasks.yml +0 -5
- data/config/initializers/devise.rb +10 -4
- data/config/initializers/mime_types.rb +3 -1
- data/config/locales/da.yml +134 -73
- data/config/locales/de.yml +142 -77
- data/config/locales/en.yml +128 -68
- data/config/locales/es-MX.yml +135 -71
- data/config/locales/fr.yml +167 -88
- data/config/locales/he.yml +128 -72
- data/config/locales/it.yml +136 -74
- data/config/locales/ja.yml +110 -66
- data/config/locales/lt.yml +153 -76
- data/config/locales/nb-NO.yml +123 -67
- data/config/locales/nl.yml +140 -77
- data/config/locales/pl.yml +329 -240
- data/config/locales/pt-BR.yml +137 -72
- data/config/locales/ro.yml +148 -72
- data/config/locales/ru.yml +161 -71
- data/config/locales/zh-CN.yml +106 -61
- data/config/locales/zh-TW.yml +109 -63
- data/config/routes.rb +68 -63
- data/db/migrate/113_initial_schema.rb +191 -191
- data/db/migrate/114_fixes_buggy_articles_and_notes.rb +10 -7
- data/db/migrate/115_drops_categories_for_tags.rb +5 -4
- data/db/migrate/20150207131657_add_missing_indexes.rb +2 -0
- data/db/migrate/20150807134129_simplify_redirect_relations.rb +5 -0
- data/db/migrate/20150808052637_add_blog_ids.rb +9 -3
- data/db/migrate/20150808191127_add_blog_id_to_redirects.rb +2 -0
- data/db/migrate/20150810094754_add_blog_id_to_tags.rb +2 -0
- data/db/migrate/20160108111120_add_devise_to_users.rb +4 -2
- data/db/migrate/20160108184201_move_last_connection_to_last_sign_in_at.rb +2 -0
- data/db/migrate/20160110094906_remove_profiles_rights.rb +2 -0
- data/db/migrate/20160605103918_replace_profile_id_with_string.rb +2 -0
- data/db/migrate/20160605154632_remove_profiles.rb +10 -5
- data/db/migrate/20160701061851_demand_blog_id_on_contents.rb +2 -0
- data/db/migrate/20160701062604_add_blog_id_to_resources.rb +2 -0
- data/db/migrate/20170528093024_move_resources_to_content.rb +2 -0
- data/db/migrate/20170528094923_move_tags_to_content.rb +2 -0
- data/db/migrate/20170528201606_remove_separate_published_flag.rb +2 -0
- data/db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb +2 -0
- data/db/migrate/20170702105201_remove_published_at_from_feedback.rb +2 -0
- data/db/migrate/20190208151235_add_text_filter_name_fields.rb +9 -0
- data/db/migrate/20190208152646_move_text_filter_to_name.rb +97 -0
- data/db/migrate/20190209155717_remove_text_filter_ids.rb +19 -0
- data/db/migrate/20190209160610_remove_text_filters.rb +17 -0
- data/db/migrate/20200413140440_add_unique_indexes.rb +10 -0
- data/db/seeds.rb +8 -20
- data/lib/email_notify.rb +3 -1
- data/lib/format.rb +4 -12
- data/lib/publify_core.rb +36 -35
- data/lib/publify_core/engine.rb +11 -4
- data/lib/publify_core/lang.rb +5 -1
- data/lib/publify_core/testing_support/dns_mock.rb +15 -0
- data/lib/publify_core/testing_support/factories.rb +240 -0
- data/lib/publify_core/testing_support/feed_assertions.rb +48 -0
- data/lib/publify_core/testing_support/fixtures/exploit.svg +4 -0
- data/lib/publify_core/testing_support/fixtures/fakepng.png +1 -0
- data/lib/publify_core/testing_support/fixtures/otherfile.txt +1 -0
- data/lib/publify_core/testing_support/fixtures/testfile.png +0 -0
- data/lib/publify_core/testing_support/fixtures/testfile.txt +1 -0
- data/lib/publify_core/testing_support/upload_fixtures.rb +15 -0
- data/lib/publify_core/version.rb +3 -1
- data/lib/publify_guid.rb +3 -1
- data/lib/publify_plugins.rb +10 -5
- data/lib/publify_textfilter_markdown.rb +38 -25
- data/lib/publify_textfilter_none.rb +5 -3
- data/lib/publify_textfilter_smartypants.rb +5 -3
- data/lib/publify_textfilter_textile.rb +7 -4
- data/lib/publify_textfilter_twitterfilter.rb +13 -7
- data/lib/publify_time.rb +4 -0
- data/lib/sidebar_field.rb +15 -13
- data/lib/sidebar_registry.rb +5 -3
- data/lib/spam_protection.rb +19 -17
- data/lib/tasks/i18n.rake +9 -0
- data/lib/tasks/manifest.rake +30 -0
- data/lib/tasks/publify_core_tasks.rake +2 -0
- data/lib/text_filter_plugin.rb +30 -29
- data/lib/theme.rb +5 -5
- data/lib/transforms.rb +21 -20
- data/themes/plain/javascripts/theme.js +0 -0
- metadata +247 -109
- data/app/assets/javascripts/widearea.js +0 -486
- data/app/assets/stylesheets/widearea.css +0 -133
- data/app/controllers/admin/textfilters_controller.rb +0 -6
- data/app/views/admin/dashboard/_inbound.html.erb +0 -31
- data/app/views/admin/notes/_header.html.erb +0 -6
- data/app/views/articles/_protected_article_content.html.erb +0 -6
@@ -1,80 +1,87 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class TitleBuilder
|
2
4
|
def initialize(template)
|
3
5
|
@template = template
|
4
6
|
end
|
5
7
|
|
6
8
|
def build(item, settings, parameters)
|
7
|
-
|
8
|
-
|
9
|
-
s = substitute_parameters(s, parameters)
|
10
|
-
s = substitute_settings(s, settings)
|
11
|
-
s = substitute_item(s, item)
|
12
|
-
s = substitute_time(s, settings)
|
9
|
+
str = @template
|
13
10
|
|
14
|
-
|
11
|
+
str = substitute_parameters(str, parameters)
|
12
|
+
str = substitute_settings(str, settings)
|
13
|
+
str = substitute_item(str, item)
|
14
|
+
substitute_time(str, settings)
|
15
15
|
end
|
16
16
|
|
17
17
|
private
|
18
18
|
|
19
|
-
def substitute_time(
|
19
|
+
def substitute_time(str, settings)
|
20
20
|
# Other
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
s
|
21
|
+
str = str.gsub("%currentdate%", Time.zone.now.strftime(settings.date_format))
|
22
|
+
str = str.gsub("%currenttime%", Time.zone.now.strftime(settings.time_format))
|
23
|
+
str = str.gsub("%currentmonth%", Time.zone.now.strftime("%B"))
|
24
|
+
str.gsub("%currentyear%", Time.zone.now.year.to_s)
|
26
25
|
end
|
27
26
|
|
28
|
-
def substitute_item(
|
27
|
+
def substitute_item(str, item)
|
29
28
|
# Tags for item
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
29
|
+
if str.include?("%title") && item.respond_to?(:title)
|
30
|
+
str = str.gsub("%title%", item.title)
|
31
|
+
end
|
32
|
+
if str.include?("%excerpt%") && item.respond_to?(:excerpt_text)
|
33
|
+
str = str.gsub("%excerpt%", item.excerpt_text)
|
34
|
+
end
|
35
|
+
if str.include?("%description%") && item.respond_to?(:description)
|
36
|
+
str = str.gsub("%description%", item.description)
|
37
|
+
end
|
38
|
+
str = str.gsub("%name%", item.name) if str.include?("%name%") && item.respond_to?(:name)
|
39
|
+
if str.include?("%author%") && item.respond_to?(:name)
|
40
|
+
str = str.gsub("%author%", item.name)
|
39
41
|
end
|
42
|
+
str = str.gsub("%body%", item.body) if str.include?("%body%") && item.respond_to?(:body)
|
40
43
|
|
41
|
-
if
|
42
|
-
|
44
|
+
if str.include?("%categories%") && item.respond_to?(:categories)
|
45
|
+
str = str.gsub("%categories%", item.categories.map(&:name).join(", "))
|
43
46
|
end
|
44
47
|
|
45
|
-
|
48
|
+
if str.include?("%tags%") && item.respond_to?(:tags)
|
49
|
+
str = str.gsub("%tags%", item.tags.map(&:display_name).join(", "))
|
50
|
+
end
|
51
|
+
|
52
|
+
str
|
46
53
|
end
|
47
54
|
|
48
|
-
def substitute_settings(
|
55
|
+
def substitute_settings(str, settings)
|
49
56
|
# Tags for settings
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
s
|
57
|
+
str = str.gsub("%blog_name%", settings.blog_name)
|
58
|
+
str = str.gsub("%blog_subtitle%", settings.blog_subtitle)
|
59
|
+
str.gsub("%meta_keywords%", settings.meta_keywords)
|
55
60
|
end
|
56
61
|
|
57
|
-
def substitute_parameters(
|
58
|
-
|
59
|
-
|
60
|
-
|
62
|
+
def substitute_parameters(str, parameters)
|
63
|
+
str = str.gsub("%date%", parse_date(str, parameters)) if /%date%/.match?(str)
|
64
|
+
str = str.gsub("%search%", parameters[:q]) if parameters[:q]
|
65
|
+
str = str.gsub("%page%", parse_page(str, parameters)) if /%page%/.match?(str)
|
61
66
|
|
62
|
-
|
67
|
+
str
|
63
68
|
end
|
64
69
|
|
65
70
|
def parse_date(string, params)
|
66
|
-
return
|
71
|
+
return "" unless params[:year]
|
67
72
|
|
68
|
-
format =
|
69
|
-
format <<
|
70
|
-
format <<
|
71
|
-
format <<
|
73
|
+
format = +""
|
74
|
+
format << "%A %d " if params[:day]
|
75
|
+
format << "%B " if params[:month]
|
76
|
+
format << "%Y" if params[:year]
|
72
77
|
|
73
|
-
string.gsub(
|
78
|
+
string.gsub("%date%", Time.zone.local(*params.values_at(:year, :month, :day)).
|
79
|
+
strftime(format))
|
74
80
|
end
|
75
81
|
|
76
82
|
def parse_page(_string, params)
|
77
|
-
return
|
78
|
-
|
83
|
+
return "" unless params[:page]
|
84
|
+
|
85
|
+
"#{I18n.t("articles.index.page")} #{params[:page]}"
|
79
86
|
end
|
80
87
|
end
|
@@ -1,4 +1,6 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "mimemagic"
|
2
4
|
|
3
5
|
class ResourceUploader < CarrierWave::Uploader::Base
|
4
6
|
include CarrierWave::MiniMagick
|
@@ -28,14 +30,14 @@ class ResourceUploader < CarrierWave::Uploader::Base
|
|
28
30
|
|
29
31
|
def image?(new_file)
|
30
32
|
content_type = new_file.content_type
|
31
|
-
content_type
|
33
|
+
content_type&.include?("image")
|
32
34
|
end
|
33
35
|
|
34
36
|
def check_image_content_type!(new_file)
|
35
37
|
if image?(new_file)
|
36
38
|
magic_type = mime_magic_content_type(new_file)
|
37
39
|
if magic_type != new_file.content_type
|
38
|
-
raise CarrierWave::IntegrityError,
|
40
|
+
raise CarrierWave::IntegrityError, "has MIME type mismatch"
|
39
41
|
end
|
40
42
|
end
|
41
43
|
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<p><%= t('.success') %></p>
|
2
|
-
<p><%= t(
|
3
|
-
<div class='alert alert-warning'><%= t(
|
2
|
+
<p><%= t('.login', login: current_user.login) %></p>
|
3
|
+
<div class='alert alert-warning'><%= t('.dont_lose_the_mail_sent', email: current_user.email) %></div>
|
4
4
|
|
5
5
|
<% content_for :account_links do %>
|
6
|
-
<%= raw t(
|
6
|
+
<%= raw t('.proceed_to', link: link_to(t('.admin'), controller: 'admin/dashboard')) %>
|
7
7
|
<% end %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<% if @articles.empty? %>
|
2
2
|
<tr>
|
3
|
-
<td colspan="
|
3
|
+
<td colspan="6">
|
4
4
|
<%= t('.no_articles') %>
|
5
5
|
</td>
|
6
6
|
</tr>
|
@@ -9,18 +9,33 @@
|
|
9
9
|
<tr>
|
10
10
|
<td>
|
11
11
|
<% if article.published? %>
|
12
|
-
<%= link_to_permalink(article, article.title, nil, 'published')%>
|
12
|
+
<%= link_to_permalink(article, article.title, nil, 'published') %>
|
13
13
|
<% else %>
|
14
|
-
<%= link_to(article.title, {controller: '/articles', action:
|
14
|
+
<%= link_to(article.title, { controller: '/articles', action: 'preview', id: article.id }, { class: 'unpublished', target: '_new' }) %>
|
15
15
|
<% end %>
|
16
|
-
<%= show_actions article %>
|
17
16
|
</td>
|
18
17
|
<td>
|
19
|
-
<%= author_link(article)
|
20
|
-
|
18
|
+
<%= author_link(article) %>
|
19
|
+
</td>
|
20
|
+
<td>
|
21
|
+
<%= l(article.created_at) %>
|
21
22
|
</td>
|
22
23
|
<td>
|
23
|
-
<%= (article.
|
24
|
+
<%= l(article.published_at) if article.published_at %>
|
25
|
+
</td>
|
26
|
+
<td>
|
27
|
+
<% if article.allow_comments? %>
|
28
|
+
<%= link_to("#{article.comments.ham.size} #{t(".feedback")}".html_safe, controller: '/admin/feedback', id: article.id, action: 'article') %>
|
29
|
+
<% else %>
|
30
|
+
-
|
31
|
+
<% end %>
|
32
|
+
</td>
|
33
|
+
<td>
|
34
|
+
<%= article.text_filter&.name %>
|
35
|
+
</td>
|
36
|
+
<td>
|
37
|
+
<%= show_actions article %>
|
38
|
+
</td>
|
24
39
|
</tr>
|
25
40
|
<% end %>
|
26
|
-
<%= display_pagination(@articles, 5, 'first', 'last')%>
|
41
|
+
<%= display_pagination(@articles, 5, 'first', 'last') %>
|
@@ -5,101 +5,109 @@
|
|
5
5
|
<div class="row save-bar">
|
6
6
|
<div class="col-md-8 col-md-offset-2" id="save-bar">
|
7
7
|
<div class="pull-right">
|
8
|
-
<%= link_to(t('.cancel'), {action: 'index'}, {class: 'btn btn-default'}) %>
|
8
|
+
<%= link_to(t('.cancel'), { action: 'index' }, { class: 'btn btn-default' }) %>
|
9
9
|
<span id="preview_link">
|
10
|
-
<%= link_to(t('.preview'), {controller: '/articles', action: 'preview', id: @article.id}, {target: 'new', class: 'btn btn-default'}) if @article.id %>
|
10
|
+
<%= link_to(t('.preview'), { controller: '/articles', action: 'preview', id: @article.id }, { target: 'new', class: 'btn btn-default' }) if @article.id %>
|
11
11
|
</span>
|
12
|
-
<input id="save_draft" type="submit" value="<%= t('.save_as_draft') %>" name="article[draft]" class="btn btn-default"
|
13
|
-
|
12
|
+
<input id="save_draft" type="submit" value="<%= t('.save_as_draft') %>" name="article[draft]" class="btn btn-default" />
|
13
|
+
<!-- Button trigger modal -->
|
14
|
+
<button class="btn btn-success" data-toggle="modal" type="button" data-target="#publishOptions">
|
14
15
|
<%= controller.action_name == 'new' ? t('.publish') : t('.save') %>
|
15
|
-
</
|
16
|
+
</button>
|
16
17
|
</div>
|
17
18
|
</div>
|
18
19
|
</div>
|
20
|
+
|
19
21
|
<div class="row">
|
20
22
|
<div class="col-md-8 col-md-offset-2" id="error-message-article">
|
21
23
|
<%= render 'shared/flash', flash: flash %>
|
22
24
|
<%= error_messages_for 'article' %>
|
23
25
|
</div>
|
24
26
|
</div>
|
27
|
+
|
25
28
|
<div class="row">
|
26
29
|
<div class="col-md-2" id="quicktags-block">
|
27
30
|
<div id="quicktags" class="pull-right">
|
28
|
-
<script type="text/javascript">edToolbar('article_body_and_extended', '<%= @article.
|
31
|
+
<script type="text/javascript">edToolbar('article_body_and_extended', '<%= @article.text_filter_name %>');</script>
|
29
32
|
</div>
|
30
33
|
</div>
|
31
34
|
<div class="col-md-8">
|
32
35
|
<%= text_field 'article', 'title', class: 'form-control', placeholder: t('.title') %>
|
33
36
|
<div id="editor">
|
34
|
-
<%= text_area('article', 'body_and_extended',
|
37
|
+
<%= text_area('article', 'body_and_extended', class: 'form-control ', style: 'height: 360px', placeholder: t('.type_your_post')) %>
|
35
38
|
</div>
|
36
39
|
</div>
|
37
40
|
</div>
|
38
|
-
|
41
|
+
|
42
|
+
<!-- Modal -->
|
43
|
+
<div class="modal fade" id="publishOptions" tabindex="-1" role="dialog" aria-labelledby="publishTitle" aria-hidden="true">
|
39
44
|
<div class="modal-dialog">
|
40
45
|
<div class="modal-content">
|
41
46
|
<div class="modal-header">
|
42
|
-
<h2 class="modal-title" id="
|
43
|
-
<%=
|
47
|
+
<h2 class="modal-title" id="publishTitle">
|
48
|
+
<%= t('.publish') %>
|
49
|
+
<%= submit_tag(t('.publish'), class: 'btn btn-success pull-right') %>
|
44
50
|
</h2>
|
45
51
|
</div>
|
46
52
|
<div class="modal-body">
|
47
53
|
<div class="well">
|
48
54
|
<h4><%= t('.tags') %></h4>
|
49
55
|
<div class="form-group">
|
50
|
-
<%= text_field 'article', 'keywords',
|
56
|
+
<%= text_field 'article', 'keywords', autocomplete: 'off', class: 'form-control tm-input' %>
|
51
57
|
</div>
|
52
|
-
<p class="alert alert-warning"><%=t('.tags_explanation_html') %></p>
|
58
|
+
<p class="alert alert-warning"><%= t('.tags_explanation_html') %></p>
|
53
59
|
</div>
|
60
|
+
|
54
61
|
<% post_types = @post_types || [] %>
|
55
62
|
<% if post_types.size.zero? %>
|
56
63
|
<%= hidden_field_tag 'article[post_type]', 'read' %>
|
57
64
|
<% else %>
|
58
65
|
<div class="well">
|
59
66
|
<h4><%= t('.article_type') %></h4>
|
60
|
-
<%= select :article, :post_type, post_types.map{|pt| [pt.name, pt.permalink]},
|
67
|
+
<%= select :article, :post_type, post_types.map { |pt| [pt.name, pt.permalink] }, include_blank: t('.default') %>
|
61
68
|
</div>
|
62
69
|
<% end %>
|
70
|
+
|
63
71
|
<div class="well">
|
64
72
|
<fieldset>
|
65
73
|
<legend><%= t('.publish_settings') %></legend>
|
66
74
|
<div class='control-group'>
|
67
75
|
<p>
|
68
|
-
|
69
|
-
|
76
|
+
<%= t('.permalink') %>:
|
77
|
+
<%= toggle_element('permalink') %>
|
70
78
|
</p>
|
71
79
|
<div id="permalink" class="collapse">
|
72
80
|
<div class="form-group">
|
73
|
-
<%= text_field 'article', 'permalink',
|
81
|
+
<%= text_field 'article', 'permalink', autocomplete: 'off', class: 'form-control' %>
|
74
82
|
</div>
|
75
83
|
<p>
|
76
|
-
|
77
|
-
|
78
|
-
|
84
|
+
<span class="btn btn-mini btn-default">
|
85
|
+
<%= toggle_element('permalink', t('.ok')) %>
|
86
|
+
</span>
|
79
87
|
</p>
|
80
88
|
</div>
|
81
89
|
</div>
|
82
90
|
<div class="control-group">
|
83
91
|
<p>
|
84
|
-
|
85
|
-
|
92
|
+
<%= t('.status') %>: <strong><%= @article.state.to_s.downcase %></strong>
|
93
|
+
<%= toggle_element('status') %>
|
86
94
|
</p>
|
87
95
|
<div id="status" class="collapse">
|
88
96
|
<label for="article_published" class="checkbox">
|
89
|
-
<%= check_box 'article', 'published?'
|
97
|
+
<%= check_box 'article', 'published?' %>
|
90
98
|
<%= t('.published') %>
|
91
99
|
</label>
|
92
100
|
<p>
|
93
|
-
|
94
|
-
|
95
|
-
|
101
|
+
<span class="btn btn-mini btn-default">
|
102
|
+
<%= toggle_element 'status', t('.ok') %>
|
103
|
+
</span>
|
96
104
|
</p>
|
97
105
|
</div>
|
98
106
|
</div>
|
99
107
|
<div class="control-group">
|
100
108
|
<p>
|
101
|
-
|
102
|
-
|
109
|
+
<%= t('.allowed_comments_html', allow_comment: content_tag(:strong, @article.allow_comments? ? t('.allow_comments_status.enabled') : t('.allow_comments_status.disabled'))) %>
|
110
|
+
<%= toggle_element('conversation') %>
|
103
111
|
</p>
|
104
112
|
<div id="conversation" class="collapse">
|
105
113
|
<label for="article_allow_comments" class="checkbox">
|
@@ -107,45 +115,61 @@
|
|
107
115
|
<%= t('.allow_comments') %>
|
108
116
|
</label>
|
109
117
|
<p>
|
110
|
-
|
111
|
-
|
112
|
-
|
118
|
+
<span class="btn btn-mini btn-default">
|
119
|
+
<%= toggle_element('conversation', t('.ok')) %>
|
120
|
+
</span>
|
113
121
|
</p>
|
114
122
|
</div>
|
115
123
|
</div>
|
116
124
|
<div class="control-group">
|
117
125
|
<p>
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
126
|
+
<%= t('.published') %>
|
127
|
+
<strong>
|
128
|
+
<% if @article.published_at.present? %>
|
129
|
+
<%= display_date_and_time(@article.published_at) %>
|
130
|
+
<% else %>
|
131
|
+
<%= t('.now') %>
|
132
|
+
<% end %>
|
133
|
+
</strong>
|
134
|
+
<%= toggle_element('publish') %>
|
127
135
|
</p>
|
128
136
|
<div id="publish" class="collapse">
|
129
137
|
<%= text_field 'article', 'published_at' %>
|
130
138
|
<p>
|
131
|
-
|
132
|
-
|
133
|
-
|
139
|
+
<span class="btn btn-mini btn-default">
|
140
|
+
<%= toggle_element('publish', t('.ok')) %>
|
141
|
+
</span>
|
134
142
|
</p>
|
135
143
|
</div>
|
136
144
|
</div>
|
137
145
|
<div class="control-group">
|
138
146
|
<p>
|
139
|
-
|
140
|
-
|
147
|
+
<%= t('.visibility') %>: <strong><%= @article.password.blank? ? t('.public') : t('.protected') %></strong>
|
148
|
+
<%= toggle_element('visibility') %>
|
141
149
|
</p>
|
142
150
|
<div id="visibility" class="collapse">
|
143
151
|
<label for="article_password"><%= t('.password') %></label>
|
144
152
|
<%= text_field 'article', 'password', class: 'form-control' %>
|
145
153
|
<p>
|
146
|
-
|
147
|
-
|
148
|
-
|
154
|
+
<span class="btn btn-mini btn-default">
|
155
|
+
<%= toggle_element('visibility', t('.ok')) %>
|
156
|
+
</span>
|
157
|
+
</p>
|
158
|
+
</div>
|
159
|
+
</div>
|
160
|
+
<div class="control-group">
|
161
|
+
<p>
|
162
|
+
<%= t('.article_filter') %>: <strong><%= @article.text_filter.description %></strong>
|
163
|
+
<%= toggle_element 'text_filter' %>
|
164
|
+
</p>
|
165
|
+
<div id="text_filter" class="collapse">
|
166
|
+
<select name="article[text_filter_name]" id="text_filter_name" class='form-control'>
|
167
|
+
<%= options_for_select text_filter_options, @article.text_filter_name %>
|
168
|
+
</select>
|
169
|
+
<p>
|
170
|
+
<span class="btn btn-mini btn-default">
|
171
|
+
<%= toggle_element 'text_filter', 'OK' %>
|
172
|
+
</span>
|
149
173
|
</p>
|
150
174
|
</div>
|
151
175
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
$('#autosave').html('<%= hidden_field_tag('article[id]', @article.id) %>');
|
2
2
|
$('#preview_link').replaceWith('<%= link_to('Preview', {:controller => '/articles', :action => 'preview', :id => @article.id}, {:target => 'new', :class => 'btn btn-default'}); %>');
|
3
3
|
<% if @article.state.to_s.downcase == "draft" %>
|
4
|
-
$("#article_published_at").val(<% Time.now() %>);
|
5
|
-
<% end %>
|
4
|
+
$("#article_published_at").val(<% Time.zone.now() %>);
|
5
|
+
<% end %>
|
@@ -1,3 +1,3 @@
|
|
1
|
-
<%= form_tag({action: 'update', id: @article.id}, method: :put, multipart: true, id:
|
1
|
+
<%= form_tag({ action: 'update', id: @article.id }, { method: :put, multipart: true, id: 'article_form', class: 'autosave' }) do %>
|
2
2
|
<%= render 'form' %>
|
3
3
|
<% end %>
|