publify_core 9.0.0.pre6 → 9.2.1
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 +103 -8
- data/README.md +9 -0
- 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 -22
- data/app/controllers/admin/content_controller.rb +69 -48
- data/app/controllers/admin/dashboard_controller.rb +20 -74
- data/app/controllers/admin/feedback_controller.rb +45 -36
- data/app/controllers/admin/notes_controller.rb +16 -10
- data/app/controllers/admin/pages_controller.rb +20 -34
- 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 +7 -5
- data/app/controllers/admin/tags_controller.rb +7 -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 +92 -81
- data/app/controllers/authors_controller.rb +6 -3
- data/app/controllers/base_controller.rb +9 -11
- data/app/controllers/comments_controller.rb +15 -16
- data/app/controllers/content_controller.rb +12 -19
- data/app/controllers/feedback_controller.rb +7 -39
- data/app/controllers/notes_controller.rb +6 -6
- data/app/controllers/setup_controller.rb +25 -26
- data/app/controllers/tags_controller.rb +16 -16
- data/app/controllers/text_controller.rb +2 -4
- data/app/controllers/textfilter_controller.rb +2 -0
- data/app/controllers/theme_controller.rb +23 -16
- data/app/controllers/xml_controller.rb +13 -59
- 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 +9 -18
- data/app/helpers/base_helper.rb +66 -55
- data/app/helpers/blog_helper.rb +4 -2
- data/app/helpers/xml_helper.rb +5 -3
- data/app/jobs/application_job.rb +4 -0
- data/app/mailers/notification_mailer.rb +5 -3
- data/app/models/ability.rb +25 -23
- data/app/models/archives_sidebar.rb +18 -18
- data/app/models/article.rb +84 -99
- data/app/models/article/factory.rb +14 -6
- data/app/models/blog.rb +98 -110
- data/app/models/comment.rb +14 -10
- data/app/models/config_manager.rb +4 -2
- data/app/models/content.rb +45 -61
- data/app/models/content_base.rb +7 -6
- data/app/models/feedback.rb +91 -65
- data/app/models/meta_sidebar.rb +5 -3
- data/app/models/note.rb +31 -23
- data/app/models/page.rb +16 -10
- data/app/models/page_sidebar.rb +4 -2
- data/app/models/ping.rb +2 -113
- data/app/models/post_type.rb +4 -3
- data/app/models/redirect.rb +13 -7
- data/app/models/redirection.rb +3 -1
- data/app/models/resource.rb +6 -22
- data/app/models/search_sidebar.rb +4 -2
- data/app/models/sidebar.rb +12 -7
- data/app/models/static_sidebar.rb +15 -13
- data/app/models/tag.rb +23 -15
- data/app/models/tag_sidebar.rb +10 -7
- data/app/models/text_filter.rb +85 -11
- data/app/models/trackback.rb +7 -18
- data/app/models/trigger.rb +8 -19
- data/app/models/user.rb +46 -52
- data/app/services/title_builder.rb +52 -45
- data/app/uploaders/resource_uploader.rb +35 -2
- data/app/views/accounts/confirm.html.erb +3 -4
- data/app/views/admin/content/_article_list.html.erb +24 -9
- data/app/views/admin/content/_form.html.erb +71 -51
- 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 +40 -59
- data/app/views/admin/seo/_permalinks.html.erb +17 -17
- data/app/views/admin/seo/_titles.html.erb +81 -82
- data/app/views/admin/seo/show.html.erb +14 -19
- data/app/views/admin/settings/display.html.erb +42 -52
- data/app/views/admin/settings/feedback.html.erb +59 -67
- data/app/views/admin/settings/index.html.erb +30 -31
- data/app/views/admin/settings/write.html.erb +27 -46
- 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 +9 -0
- data/app/views/articles/_article.html.erb +9 -9
- data/app/views/articles/_article_author.html.erb +4 -0
- data/app/views/articles/_article_collection.html.erb +1 -1
- data/app/views/articles/_article_content.html.erb +2 -2
- data/app/views/articles/_article_excerpt.html.erb +11 -9
- data/app/views/articles/_article_links.html.erb +5 -3
- 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_list.html.erb +5 -5
- data/app/views/articles/_comment_preview.html.erb +3 -3
- data/app/views/articles/_full_article_content.html.erb +4 -2
- 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 +11 -21
- data/app/views/articles/feedback_atom_feed.atom.builder +7 -5
- data/app/views/articles/feedback_rss_feed.rss.builder +11 -11
- data/app/views/articles/index_atom_feed.atom.builder +5 -4
- data/app/views/articles/index_rss_feed.rss.builder +8 -8
- data/app/views/articles/live_search.html.erb +3 -3
- data/app/views/articles/read.html.erb +19 -37
- data/app/views/articles/search.html.erb +3 -3
- 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 +18 -28
- data/app/views/authors/show_atom_feed.atom.builder +5 -4
- data/app/views/authors/show_rss_feed.rss.builder +8 -8
- data/app/views/comments/_comment.html.erb +17 -16
- 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 +9 -0
- data/app/views/feedback/index.rss.builder +20 -0
- 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 +16 -15
- data/app/views/notes/index.html.erb +2 -2
- data/app/views/notes/show_in_reply.html.erb +1 -1
- data/app/views/notification_mailer/_mail_footer.html.erb +3 -5
- data/app/views/notification_mailer/_mail_header.html.erb +2 -0
- data/app/views/notification_mailer/article.html.erb +5 -4
- data/app/views/notification_mailer/comment.html.erb +9 -8
- data/app/views/notification_mailer/notif_user.html.erb +4 -9
- 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 +9 -5
- data/app/views/shared/_atom_header.atom.builder +4 -4
- data/app/views/shared/_atom_item_article.atom.builder +19 -22
- data/app/views/shared/_atom_item_comment.atom.builder +5 -5
- data/app/views/shared/_atom_item_trackback.atom.builder +5 -4
- data/app/views/shared/_google_analytics.html.erb +8 -0
- data/app/views/shared/_page_header.html.erb +10 -13
- data/app/views/shared/_rss_item_article.rss.builder +12 -15
- data/app/views/shared/_rss_item_comment.rss.builder +2 -1
- data/app/views/shared/_rss_item_trackback.rss.builder +2 -0
- 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 +2 -2
- 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 +9 -0
- data/config/i18n-tasks.yml +0 -5
- data/config/initializers/devise.rb +10 -4
- data/config/initializers/mime_types.rb +3 -2
- data/config/locales/da.yml +140 -108
- data/config/locales/de.yml +147 -111
- data/config/locales/en.yml +133 -102
- data/config/locales/es-MX.yml +141 -106
- data/config/locales/fr.yml +172 -122
- data/config/locales/he.yml +132 -105
- data/config/locales/it.yml +141 -108
- data/config/locales/ja.yml +115 -100
- data/config/locales/lt.yml +158 -110
- data/config/locales/nb-NO.yml +128 -101
- data/config/locales/nl.yml +147 -113
- data/config/locales/pl.yml +335 -275
- data/config/locales/pt-BR.yml +143 -107
- data/config/locales/ro.yml +155 -108
- data/config/locales/ru.yml +166 -105
- data/config/locales/zh-CN.yml +112 -96
- data/config/locales/zh-TW.yml +116 -99
- data/config/routes.rb +70 -87
- data/db/migrate/113_initial_schema.rb +6 -6
- data/db/migrate/114_fixes_buggy_articles_and_notes.rb +8 -6
- data/db/migrate/115_drops_categories_for_tags.rb +7 -6
- data/db/migrate/20150207131657_add_missing_indexes.rb +3 -1
- data/db/migrate/20150807134129_simplify_redirect_relations.rb +6 -1
- data/db/migrate/20150808052637_add_blog_ids.rb +11 -7
- data/db/migrate/20150808191127_add_blog_id_to_redirects.rb +3 -1
- data/db/migrate/20150810094754_add_blog_id_to_tags.rb +3 -1
- data/db/migrate/20160108111120_add_devise_to_users.rb +3 -1
- data/db/migrate/20160108184201_move_last_connection_to_last_sign_in_at.rb +3 -1
- data/db/migrate/20160110094906_remove_profiles_rights.rb +3 -1
- data/db/migrate/20160605103918_replace_profile_id_with_string.rb +3 -3
- data/db/migrate/20160605154632_remove_profiles.rb +12 -7
- data/db/migrate/20160701061851_demand_blog_id_on_contents.rb +3 -1
- data/db/migrate/20160701062604_add_blog_id_to_resources.rb +3 -1
- data/db/migrate/20170528093024_move_resources_to_content.rb +7 -0
- data/db/migrate/20170528094923_move_tags_to_content.rb +8 -0
- data/db/migrate/20170528201606_remove_separate_published_flag.rb +7 -0
- data/db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb +8 -0
- data/db/migrate/20170702105201_remove_published_at_from_feedback.rb +7 -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 -36
- 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 +4 -2
- 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 +6 -2
- data/lib/sidebar_field.rb +29 -20
- 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 +22 -20
- data/{app/assets/stylesheets/publify_core/.keep → themes/plain/javascripts/theme.js} +0 -0
- metadata +304 -130
- data/.gitignore +0 -13
- data/.rspec +0 -2
- data/.rubocop.yml +0 -84
- data/.rubocop_todo.yml +0 -148
- data/.travis.yml +0 -27
- data/Gemfile +0 -17
- data/README.rdoc +0 -3
- data/Rakefile +0 -35
- data/app/assets/javascripts/widearea.js +0 -486
- data/app/assets/stylesheets/widearea.css +0 -133
- data/app/controllers/.keep +0 -0
- data/app/controllers/admin/migrations_controller.rb +0 -19
- data/app/controllers/admin/textfilters_controller.rb +0 -6
- data/app/controllers/concerns/.keep +0 -0
- data/app/controllers/trackbacks_controller.rb +0 -36
- data/app/helpers/.keep +0 -0
- data/app/mailers/.keep +0 -0
- data/app/models/.keep +0 -0
- data/app/models/article/states.rb +0 -179
- data/app/models/concerns/.keep +0 -0
- data/app/models/feedback/states.rb +0 -256
- data/app/services/migrator.rb +0 -25
- data/app/views/.keep +0 -0
- 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
- data/app/views/comments/index.html.erb +0 -1
- data/app/views/comments/index_atom_feed.atom.builder +0 -8
- data/app/views/comments/index_rss_feed.rss.builder +0 -20
- data/app/views/trackbacks/index_atom_feed.atom.builder +0 -7
- data/app/views/trackbacks/index_rss_feed.rss.builder +0 -20
- data/app/views/trackbacks/trackback.xml.builder +0 -4
- data/app/views/xml/feed.googlesitemap.builder +0 -7
- data/app/views/xml/rsd.rsd.builder +0 -8
- data/lib/stateful.rb +0 -106
- data/publify_core.gemspec +0 -54
@@ -1,9 +1,9 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
1
|
+
<% cache article do %>
|
2
|
+
<h2><%= link_to_permalink article, article.title %></h2>
|
3
|
+
<%= render 'articles/article_author', article: article %>
|
4
|
+
<% if article.password.blank? %>
|
5
|
+
<%= render 'articles/article_excerpt', article: article %>
|
6
|
+
<% else %>
|
7
|
+
<%= render 'articles/password_form', article: article %>
|
8
|
+
<% end %>
|
9
|
+
<% end %>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<% if controller.action_name == 'redirect' %>
|
2
|
-
<%= render 'articles/full_article_content',
|
2
|
+
<%= render 'articles/full_article_content', article: article %>
|
3
3
|
<% else %>
|
4
|
-
<%= render 'articles/article_excerpt',
|
4
|
+
<%= render 'articles/article_excerpt', article: article %>
|
5
5
|
<% end %>
|
@@ -1,13 +1,15 @@
|
|
1
|
-
<%
|
2
|
-
|
3
|
-
|
4
|
-
<p><%= link_to_permalink article, t(".continue_reading") %></p>
|
5
|
-
</div>
|
6
|
-
<% else %>
|
7
|
-
<%= raw article.html(:body) %>
|
8
|
-
<% if article.extended? %>
|
1
|
+
<% cache article do %>
|
2
|
+
<% if article.excerpt? %>
|
3
|
+
<%= article.excerpt %>
|
9
4
|
<div class="extended">
|
10
|
-
<p><%= link_to_permalink article, t(
|
5
|
+
<p><%= link_to_permalink article, t('.continue_reading') %></p>
|
11
6
|
</div>
|
7
|
+
<% else %>
|
8
|
+
<%= raw article.html(:body) %>
|
9
|
+
<% if article.extended? %>
|
10
|
+
<div class="extended">
|
11
|
+
<p><%= link_to_permalink article, t('.continue_reading') %></p>
|
12
|
+
</div>
|
13
|
+
<% end %>
|
12
14
|
<% end %>
|
13
15
|
<% end %>
|
@@ -1,10 +1,12 @@
|
|
1
|
-
|
1
|
+
<% cache article do %>
|
2
|
+
<p class="meta">
|
2
3
|
<% if article.tags.any? %>
|
3
|
-
<%= t(
|
4
|
+
<%= t('.tags') %>
|
4
5
|
<%= tag_links article %>
|
5
6
|
<% end %>
|
6
7
|
|
7
8
|
<%= link_to(t('.comments', count: article.published_comments.size), article.permalink_url('comments', true)) if article.allow_comments? %>
|
8
9
|
|
9
10
|
<%= link_to(t('.trackbacks', count: article.published_trackbacks.size), article.permalink_url('trackbacks', true)) if article.allow_pings? %>
|
10
|
-
</p>
|
11
|
+
</p>
|
12
|
+
<% end %>
|
@@ -1,2 +1,2 @@
|
|
1
1
|
<p><%= t('.message') %></p>
|
2
|
-
<%= error_messages_for(
|
2
|
+
<%= error_messages_for('comment') %>
|
@@ -6,28 +6,28 @@
|
|
6
6
|
<a name="respond"></a>
|
7
7
|
<table cellpadding="4" cellspacing="0" class="frm-tbl">
|
8
8
|
<tr>
|
9
|
-
<td><p><label for="comment_author"><%= t(
|
9
|
+
<td><p><label for="comment_author"><%= t('.your_name') %></label></p></td>
|
10
10
|
<td>
|
11
|
-
<%= text_field
|
11
|
+
<%= text_field 'comment', 'author', size: 20 %>
|
12
12
|
<small>
|
13
13
|
<%= link_to '#', onclick: "$('.optional_field').fadeToggle();return false" do %>
|
14
|
-
(<%= t(
|
14
|
+
(<%= t('.leave_url_email') %> »)
|
15
15
|
<% end %>
|
16
16
|
</small>
|
17
17
|
</td>
|
18
18
|
</tr>
|
19
19
|
<tr class="optional_field" style="display: none">
|
20
|
-
<td><p><label for="comment_url"><%= t(
|
21
|
-
<td> <%= text_field
|
20
|
+
<td><p><label for="comment_url"><%= t('.your_blog') %></label></p></td>
|
21
|
+
<td> <%= text_field 'comment', 'url' %></td>
|
22
22
|
</tr>
|
23
23
|
<tr class="optional_field" style="display: none">
|
24
|
-
<td><p><label for="comment_email"><%= t(
|
25
|
-
<td> <%= text_field
|
24
|
+
<td><p><label for="comment_email"><%= t('.your_email') %></label></p></td>
|
25
|
+
<td> <%= text_field 'comment', 'email' %></td>
|
26
26
|
</tr>
|
27
27
|
<tr>
|
28
|
-
<td><p><label for="comment_body"><%= t(
|
28
|
+
<td><p><label for="comment_body"><%= t('.your_message') %></label></p></td>
|
29
29
|
<td valign="top" colspan="2">
|
30
|
-
<%= text_area
|
30
|
+
<%= text_area 'comment', 'body' %>
|
31
31
|
</td>
|
32
32
|
</tr>
|
33
33
|
<% if this_blog.use_recaptcha %>
|
@@ -38,9 +38,9 @@
|
|
38
38
|
<% end %>
|
39
39
|
<tr>
|
40
40
|
<td colspan="2" id="frm-btns">
|
41
|
-
<%= markup_help_popup TextFilter.
|
42
|
-
<a href="#" onclick="$.post('<%= @article.preview_comment_url %>', $('#comment_form').serialize());return false"><%= t(
|
43
|
-
<input type="submit" name="submit" id="form-submit-button" value="submit" class="button"
|
41
|
+
<%= markup_help_popup TextFilter.make_filter(this_blog.comment_text_filter), t('.comment_markup_help') %>
|
42
|
+
<a href="#" onclick="$.post('<%= @article.preview_comment_url %>', $('#comment_form').serialize());return false"><%= t('.preview_comment') %></a>
|
43
|
+
<input type="submit" name="submit" id="form-submit-button" value="submit" class="button" />
|
44
44
|
</td>
|
45
45
|
</tr>
|
46
46
|
</table>
|
@@ -1,5 +1,5 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
<%= render @article.published_comments %>
|
4
|
-
|
5
|
-
|
1
|
+
<% cache @article do %>
|
2
|
+
<ol id="commentList" class="comments">
|
3
|
+
<%= render @article.published_comments, partial: 'articles/comment' %>
|
4
|
+
</ol>
|
5
|
+
<% end %>
|
@@ -1,4 +1,4 @@
|
|
1
1
|
<%= avatar_tag(email: comment.email, url: comment.url) %>
|
2
|
-
<cite><strong><%=h
|
3
|
-
<%= t(
|
4
|
-
<%=
|
2
|
+
<cite><strong><%= h comment[:author] %></strong></cite>
|
3
|
+
<%= t('.is_about_to_say') %>:<br />
|
4
|
+
<%= comment.html %>
|
@@ -1,10 +1,10 @@
|
|
1
1
|
<div id='content-<%= article.id %>'>
|
2
2
|
<p>This post is password protected. Please fill in your password or login to view the content</p>
|
3
|
-
<%= form_for(article,
|
4
|
-
|
5
|
-
|
3
|
+
<%= form_for(article, remote: true,
|
4
|
+
url: { controller: 'articles', action: 'check_password' },
|
5
|
+
update: "content-#{article.id}") do |f| %>
|
6
6
|
<%= password_field(:article, :password) %>
|
7
|
-
<input type='hidden' name='article[id]' value='<%= article.id %>'
|
7
|
+
<input type='hidden' name='article[id]' value='<%= article.id %>' />
|
8
8
|
<%= submit_tag(t('.submit') + '!', name: 'check_password') %>
|
9
9
|
<% end %>
|
10
10
|
</div>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<li id="trackback-<%= trackback.id %>"<%= onhover_show_admin_tools(:trackback, trackback.id) %>>
|
2
2
|
<a name="trackback-<%= trackback.id %>"></a>
|
3
|
-
<%= t(
|
4
|
-
<a href="<%= trackback.url %>" rel="nofollow"><%=h trackback.title %></a><br
|
3
|
+
<%= t('.from') %> <strong><%= trackback.blog_name %></strong><br />
|
4
|
+
<a href="<%= trackback.url %>" rel="nofollow"><%= h trackback.title %></a><br />
|
5
5
|
<%= trackback.excerpt %>
|
6
6
|
</li>
|
@@ -1,25 +1,15 @@
|
|
1
1
|
<% if @articles.empty? %>
|
2
|
-
|
3
|
-
<p><%= t(
|
2
|
+
<div class="post">
|
3
|
+
<p><%= t('.no_articles_found') %></p>
|
4
4
|
</div>
|
5
|
-
<% else
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
<h3 class="archivemonth">
|
13
|
-
<%= l(article.published_at, format: :letters_month_with_year) %>
|
14
|
-
</h3>
|
15
|
-
<% end %>
|
16
|
-
<div class="archivepost">
|
17
|
-
<%= article.published_at.mday %> -
|
18
|
-
<%= link_to_permalink(article,h(article.title)) %>
|
19
|
-
<% if !article.tags.empty? %> <%= t(".posted_in") %>
|
20
|
-
<%= safe_join(article.tags.collect {|t| link_to_permalink t,t.display_name }, ", ") %>
|
5
|
+
<% else %>
|
6
|
+
<%= cache [@articles, params[:page]] do %>
|
7
|
+
<% @articles.group_by(&:publication_month).each do |_month, articles| %>
|
8
|
+
<h3 class="archivemonth">
|
9
|
+
<%= l(articles.first.published_at, format: :letters_month_with_year) %>
|
10
|
+
</h3>
|
11
|
+
<%= render partial: 'archives_article', collection: articles, as: :article %>
|
21
12
|
<% end %>
|
22
|
-
</div>
|
23
|
-
<% end %>
|
24
13
|
<% end %>
|
25
|
-
|
14
|
+
<% end %>
|
15
|
+
<%= paginate @articles %>
|
@@ -1,8 +1,10 @@
|
|
1
|
-
|
2
|
-
render "shared/atom_header", {:feed => feed, :items => @feedback}
|
1
|
+
# frozen_string_literal: true
|
3
2
|
|
4
|
-
|
5
|
-
|
3
|
+
atom_feed root_url: @article.permalink_url do |feed|
|
4
|
+
feedback = @article.published_feedback
|
5
|
+
render "shared/atom_header", feed: feed, items: feedback
|
6
|
+
|
7
|
+
feedback.each do |item|
|
8
|
+
render "shared/atom_item_#{item.type.downcase}", feed: feed, item: item
|
6
9
|
end
|
7
10
|
end
|
8
|
-
|
@@ -1,21 +1,21 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
xml.instruct! :xml, version: "1.0", encoding: "UTF-8"
|
4
|
+
xml.instruct! "xml-stylesheet", type: "text/css", href: url_for("/stylesheets/rss.css")
|
3
5
|
|
4
6
|
xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
|
5
|
-
"xmlns:atom" => "http://www.w3.org/2005/Atom"
|
6
|
-
"xmlns:trackback" => "http://madskills.com/public/xml/rss/module/trackback/" do
|
7
|
+
"xmlns:atom" => "http://www.w3.org/2005/Atom" do
|
7
8
|
xml.channel do
|
8
9
|
xml.title feed_title
|
9
|
-
xml.link
|
10
|
-
xml.atom :link, :
|
11
|
-
xml.language this_blog.lang.
|
10
|
+
xml.link @article.permalink_url
|
11
|
+
xml.atom :link, href: request.url, rel: "self", type: "application/rss+xml"
|
12
|
+
xml.language this_blog.lang.tr("_", "-").downcase
|
12
13
|
xml.ttl "40"
|
13
14
|
xml.description this_blog.blog_subtitle
|
14
15
|
|
15
|
-
|
16
|
-
|
16
|
+
feedback = @article.published_feedback
|
17
|
+
feedback.each do |item|
|
18
|
+
render "shared/rss_item_#{item.type.downcase}", feed: xml, item: item
|
17
19
|
end
|
18
20
|
end
|
19
21
|
end
|
20
|
-
|
21
|
-
|
@@ -1,8 +1,9 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
atom_feed(language: this_blog.lang.split("_").first, root_url: this_blog.base_url) do |feed|
|
4
|
+
render "shared/atom_header", feed: feed, items: @articles
|
3
5
|
|
4
6
|
@articles.each do |item|
|
5
|
-
render "shared/atom_item_article",
|
7
|
+
render "shared/atom_item_article", feed: feed, item: item
|
6
8
|
end
|
7
9
|
end
|
8
|
-
|
@@ -1,20 +1,20 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
xml.instruct! :xml, version: "1.0", encoding: "UTF-8"
|
4
|
+
xml.instruct! "xml-stylesheet", type: "text/css", href: url_for("/stylesheets/rss.css")
|
3
5
|
|
4
6
|
xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
|
5
|
-
"xmlns:atom" => "http://www.w3.org/2005/Atom"
|
6
|
-
"xmlns:trackback" => "http://madskills.com/public/xml/rss/module/trackback/" do
|
7
|
+
"xmlns:atom" => "http://www.w3.org/2005/Atom" do
|
7
8
|
xml.channel do
|
8
9
|
xml.title feed_title
|
9
10
|
xml.link this_blog.base_url
|
10
|
-
xml.atom :link, :
|
11
|
-
xml.language this_blog.lang.
|
11
|
+
xml.atom :link, href: request.url, rel: "self", type: "application/rss+xml"
|
12
|
+
xml.language this_blog.lang.tr("_", "-").downcase
|
12
13
|
xml.ttl "40"
|
13
14
|
xml.description this_blog.blog_subtitle
|
14
15
|
|
15
16
|
@articles.each do |item|
|
16
|
-
render "shared/rss_item_article",
|
17
|
+
render "shared/rss_item_article", xm: xml, item: item
|
17
18
|
end
|
18
19
|
end
|
19
20
|
end
|
20
|
-
|
@@ -1,10 +1,10 @@
|
|
1
1
|
<% if !@search.to_s.blank? %>
|
2
|
-
<h3>Searched for <em>"<%=h @search %>"</em></h3>
|
2
|
+
<h3>Searched for <em>"<%= h @search %>"</em></h3>
|
3
3
|
<ul>
|
4
4
|
<% for article in @articles.to_a %>
|
5
|
-
<li><%= link_to_permalink article,h(article.title) %></li>
|
5
|
+
<li><%= link_to_permalink article, h(article.title) %></li>
|
6
6
|
<% end %>
|
7
|
-
|
7
|
+
</ul>
|
8
8
|
<% else %>
|
9
9
|
|
10
10
|
<% end %>
|
@@ -1,23 +1,14 @@
|
|
1
|
-
<!--
|
2
|
-
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
3
|
-
xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
|
4
|
-
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
5
|
-
<rdf:Description
|
6
|
-
rdf:about=""
|
7
|
-
<% if @article.allow_pings? %>
|
8
|
-
trackback:ping="<%= @article.trackback_url %>"
|
9
|
-
<% end %>
|
10
|
-
dc:title="<%=h @article.title.gsub(/-+/, '-') %>"
|
11
|
-
dc:identifier="<%= @article.permalink_url %>"
|
12
|
-
dc:description="<%=h (html(@article).strip_html[0..255]).gsub(/-+/, '-') %>"
|
13
|
-
dc:creator="<%= h @article.author %>"
|
14
|
-
dc:date="<%= @article.updated_at.xmlschema %>">
|
15
|
-
</rdf:RDF>
|
16
|
-
-->
|
17
|
-
|
18
1
|
<div class="post"<%= onhover_show_admin_tools(:article) %>>
|
19
|
-
<%= link_to(t(
|
20
|
-
|
2
|
+
<%= link_to(t('.edit'), { controller: 'admin/content', action: 'edit', id: @article.id }, { class: 'admintools', style: 'display: none', id: 'admin_article' }) %>
|
3
|
+
<% cache @article do %>
|
4
|
+
<h2><%= link_to_permalink @article, @article.title %></h2>
|
5
|
+
<%= render 'articles/article_author', article: @article %>
|
6
|
+
<% if @article.password.blank? %>
|
7
|
+
<%= render 'articles/full_article_content', article: @article %>
|
8
|
+
<% else %>
|
9
|
+
<%= render 'articles/password_form', article: @article %>
|
10
|
+
<% end %>
|
11
|
+
<% end %>
|
21
12
|
</div>
|
22
13
|
|
23
14
|
<%= render 'article_links', article: @article %>
|
@@ -26,36 +17,27 @@
|
|
26
17
|
<a name="comments"></a><h4 class="blueblk"><%= t('.comments') %></h4>
|
27
18
|
<% unless @article.comments_closed? %>
|
28
19
|
<p class="postmetadata alt">
|
29
|
-
|
20
|
+
<small><a href="#respond"><%= t('.leave_a_response') %></a></small>
|
30
21
|
</p>
|
31
22
|
<% end %>
|
32
|
-
<%= render
|
23
|
+
<%= render 'articles/comment_list' %>
|
33
24
|
<% end %>
|
34
25
|
|
35
|
-
<% if @article.
|
36
|
-
<a name="trackbacks"></a><h4 class="blueblk"><%= t(
|
37
|
-
<
|
38
|
-
<%=
|
39
|
-
|
40
|
-
</p>
|
41
|
-
<% unless @article.published_trackbacks.blank? %>
|
42
|
-
<ol id="trackbackList" class="trackback-list">
|
43
|
-
<%= render(partial: "trackback", collection: @article.published_trackbacks) %>
|
44
|
-
</ol>
|
45
|
-
<% end %>
|
26
|
+
<% if @article.published_trackbacks.any? %>
|
27
|
+
<a name="trackbacks"></a><h4 class="blueblk"><%= t('.trackbacks') %></h4>
|
28
|
+
<ol id="trackbackList" class="trackback-list">
|
29
|
+
<%= render(partial: 'trackback', collection: @article.published_trackbacks) %>
|
30
|
+
</ol>
|
46
31
|
<% end %>
|
47
32
|
|
48
33
|
<p class="postmetadata alt">
|
49
34
|
<small>
|
50
|
-
<a href="<%= @article.feed_url('rss') %>" title="RSS Feed"><%= t(
|
51
|
-
<% if @article.allow_pings? %>
|
52
|
-
<a href="<%= @article.trackback_url %>" ><%= t(".trackback_uri")%></a>
|
53
|
-
<% end %>
|
35
|
+
<a href="<%= @article.feed_url('rss') %>" title="RSS Feed"><%= t('.rss_feed') %></a>
|
54
36
|
</small>
|
55
37
|
</p>
|
56
38
|
|
57
39
|
<% unless @article.comments_closed? %>
|
58
40
|
<%= render 'comment_form' %>
|
59
41
|
<% else %>
|
60
|
-
<p><%= t(
|
42
|
+
<p><%= t('.comments_are_disabled') %></p>
|
61
43
|
<% end %>
|
@@ -1,8 +1,8 @@
|
|
1
1
|
<% for article in @articles %>
|
2
2
|
<div class="post">
|
3
|
-
<h2><%= link_to_permalink article,article.title %></h2>
|
4
|
-
<%= article.html(:body).gsub(
|
3
|
+
<h2><%= link_to_permalink article, article.title %></h2>
|
4
|
+
<%= article.html(:body).gsub(%r{</?[^>]*>}, '').slice(0..300) %>...
|
5
5
|
</div>
|
6
6
|
<% end %>
|
7
7
|
|
8
|
-
<%= paginate @articles
|
8
|
+
<%= paginate @articles %>
|