publify_core 9.1.0 → 9.2.0

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.

Files changed (357) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +34 -1
  3. data/app/assets/javascripts/bootstrap-sprockets.js +8 -0
  4. data/app/assets/javascripts/bootstrap/affix.js +164 -0
  5. data/app/assets/javascripts/bootstrap/alert.js +95 -0
  6. data/app/assets/javascripts/bootstrap/button.js +125 -0
  7. data/app/assets/javascripts/bootstrap/collapse.js +212 -0
  8. data/app/assets/javascripts/bootstrap/dropdown.js +165 -0
  9. data/app/assets/javascripts/bootstrap/modal.js +358 -0
  10. data/app/assets/javascripts/bootstrap/tab.js +155 -0
  11. data/app/assets/javascripts/bootstrap/transition.js +59 -0
  12. data/app/assets/javascripts/lightbox.js +4 -4
  13. data/app/assets/javascripts/publify_admin.js +1 -35
  14. data/app/assets/stylesheets/_bootstrap-compass.scss +9 -0
  15. data/app/assets/stylesheets/_bootstrap-mincer.scss +19 -0
  16. data/app/assets/stylesheets/_bootstrap-sprockets.scss +9 -0
  17. data/app/assets/stylesheets/_bootstrap.scss +42 -0
  18. data/app/assets/stylesheets/administration_structure.css.scss +1 -45
  19. data/app/assets/stylesheets/bootstrap/_alerts.scss +73 -0
  20. data/app/assets/stylesheets/bootstrap/_button-groups.scss +242 -0
  21. data/app/assets/stylesheets/bootstrap/_buttons.scss +168 -0
  22. data/app/assets/stylesheets/bootstrap/_close.scss +37 -0
  23. data/app/assets/stylesheets/bootstrap/_code.scss +69 -0
  24. data/app/assets/stylesheets/bootstrap/_component-animations.scss +38 -0
  25. data/app/assets/stylesheets/bootstrap/_dropdowns.scss +213 -0
  26. data/app/assets/stylesheets/bootstrap/_forms.scss +586 -0
  27. data/app/assets/stylesheets/bootstrap/_grid.scss +94 -0
  28. data/app/assets/stylesheets/bootstrap/_labels.scss +66 -0
  29. data/app/assets/stylesheets/bootstrap/_media.scss +66 -0
  30. data/app/assets/stylesheets/bootstrap/_mixins.scss +37 -0
  31. data/app/assets/stylesheets/bootstrap/_modals.scss +150 -0
  32. data/app/assets/stylesheets/bootstrap/_navbar.scss +479 -0
  33. data/app/assets/stylesheets/bootstrap/_navs.scss +242 -0
  34. data/app/assets/stylesheets/bootstrap/_normalize.scss +427 -0
  35. data/app/assets/stylesheets/bootstrap/_pagination.scss +86 -0
  36. data/app/assets/stylesheets/bootstrap/_panels.scss +222 -0
  37. data/app/assets/stylesheets/bootstrap/_print.scss +99 -0
  38. data/app/assets/stylesheets/bootstrap/_scaffolding.scss +160 -0
  39. data/app/assets/stylesheets/bootstrap/_tables.scss +234 -0
  40. data/app/assets/stylesheets/bootstrap/_theme.scss +224 -0
  41. data/app/assets/stylesheets/bootstrap/_type.scss +296 -0
  42. data/app/assets/stylesheets/bootstrap/_utilities.scss +55 -0
  43. data/app/assets/stylesheets/bootstrap/_variables.scss +638 -0
  44. data/app/assets/stylesheets/bootstrap/_wells.scss +29 -0
  45. data/app/assets/stylesheets/bootstrap/mixins/_alerts.scss +15 -0
  46. data/app/assets/stylesheets/bootstrap/mixins/_background-variant.scss +12 -0
  47. data/app/assets/stylesheets/bootstrap/mixins/_border-radius.scss +18 -0
  48. data/app/assets/stylesheets/bootstrap/mixins/_buttons.scss +56 -0
  49. data/app/assets/stylesheets/bootstrap/mixins/_center-block.scss +7 -0
  50. data/app/assets/stylesheets/bootstrap/mixins/_clearfix.scss +22 -0
  51. data/app/assets/stylesheets/bootstrap/mixins/_forms.scss +82 -0
  52. data/app/assets/stylesheets/bootstrap/mixins/_gradients.scss +56 -0
  53. data/app/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +81 -0
  54. data/app/assets/stylesheets/bootstrap/mixins/_grid.scss +122 -0
  55. data/app/assets/stylesheets/bootstrap/mixins/_hide-text.scss +21 -0
  56. data/app/assets/stylesheets/bootstrap/mixins/_image.scss +28 -0
  57. data/app/assets/stylesheets/bootstrap/mixins/_labels.scss +12 -0
  58. data/app/assets/stylesheets/bootstrap/mixins/_nav-divider.scss +10 -0
  59. data/app/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss +9 -0
  60. data/app/assets/stylesheets/bootstrap/mixins/_opacity.scss +7 -0
  61. data/app/assets/stylesheets/bootstrap/mixins/_pagination.scss +24 -0
  62. data/app/assets/stylesheets/bootstrap/mixins/_panels.scss +20 -0
  63. data/app/assets/stylesheets/bootstrap/mixins/_reset-filter.scss +8 -0
  64. data/app/assets/stylesheets/bootstrap/mixins/_resize.scss +6 -0
  65. data/app/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +17 -0
  66. data/app/assets/stylesheets/bootstrap/mixins/_size.scss +10 -0
  67. data/app/assets/stylesheets/bootstrap/mixins/_tab-focus.scss +9 -0
  68. data/app/assets/stylesheets/bootstrap/mixins/_table-row.scss +28 -0
  69. data/app/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +12 -0
  70. data/app/assets/stylesheets/bootstrap/mixins/_text-overflow.scss +8 -0
  71. data/app/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +222 -0
  72. data/app/assets/stylesheets/lightbox.css +3 -3
  73. data/app/assets/stylesheets/publify_admin.css.scss +0 -1
  74. data/app/controllers/accounts_controller.rb +2 -0
  75. data/app/controllers/admin/base_controller.rb +8 -5
  76. data/app/controllers/admin/content_controller.rb +37 -24
  77. data/app/controllers/admin/dashboard_controller.rb +16 -64
  78. data/app/controllers/admin/feedback_controller.rb +45 -38
  79. data/app/controllers/admin/notes_controller.rb +15 -9
  80. data/app/controllers/admin/pages_controller.rb +18 -15
  81. data/app/controllers/admin/post_types_controller.rb +7 -5
  82. data/app/controllers/admin/profiles_controller.rb +4 -2
  83. data/app/controllers/admin/redirects_controller.rb +9 -5
  84. data/app/controllers/admin/resources_controller.rb +7 -4
  85. data/app/controllers/admin/seo_controller.rb +14 -10
  86. data/app/controllers/admin/settings_controller.rb +7 -5
  87. data/app/controllers/admin/sidebar_controller.rb +7 -4
  88. data/app/controllers/admin/tags_controller.rb +6 -3
  89. data/app/controllers/admin/themes_controller.rb +10 -7
  90. data/app/controllers/admin/users_controller.rb +9 -6
  91. data/app/controllers/articles_controller.rb +49 -33
  92. data/app/controllers/authors_controller.rb +6 -3
  93. data/app/controllers/base_controller.rb +9 -5
  94. data/app/controllers/comments_controller.rb +12 -8
  95. data/app/controllers/content_controller.rb +4 -2
  96. data/app/controllers/feedback_controller.rb +4 -2
  97. data/app/controllers/notes_controller.rb +5 -3
  98. data/app/controllers/setup_controller.rb +14 -10
  99. data/app/controllers/tags_controller.rb +6 -4
  100. data/app/controllers/text_controller.rb +2 -4
  101. data/app/controllers/textfilter_controller.rb +2 -0
  102. data/app/controllers/theme_controller.rb +14 -12
  103. data/app/controllers/xml_controller.rb +2 -0
  104. data/app/helpers/admin/base_helper.rb +28 -28
  105. data/app/helpers/admin/feedback_helper.rb +34 -24
  106. data/app/helpers/articles_helper.rb +4 -2
  107. data/app/helpers/authors_helper.rb +6 -3
  108. data/app/helpers/base_helper.rb +50 -34
  109. data/app/helpers/blog_helper.rb +4 -2
  110. data/app/helpers/xml_helper.rb +2 -0
  111. data/app/jobs/application_job.rb +2 -0
  112. data/app/mailers/notification_mailer.rb +5 -3
  113. data/app/models/ability.rb +25 -23
  114. data/app/models/archives_sidebar.rb +14 -11
  115. data/app/models/article.rb +44 -32
  116. data/app/models/article/factory.rb +14 -6
  117. data/app/models/blog.rb +85 -65
  118. data/app/models/comment.rb +10 -7
  119. data/app/models/config_manager.rb +4 -2
  120. data/app/models/content.rb +34 -40
  121. data/app/models/content_base.rb +9 -3
  122. data/app/models/feedback.rb +19 -16
  123. data/app/models/meta_sidebar.rb +5 -2
  124. data/app/models/note.rb +25 -23
  125. data/app/models/page.rb +8 -6
  126. data/app/models/page_sidebar.rb +4 -2
  127. data/app/models/ping.rb +2 -0
  128. data/app/models/post_type.rb +3 -1
  129. data/app/models/redirect.rb +11 -6
  130. data/app/models/redirection.rb +2 -0
  131. data/app/models/resource.rb +4 -2
  132. data/app/models/search_sidebar.rb +4 -2
  133. data/app/models/sidebar.rb +10 -5
  134. data/app/models/static_sidebar.rb +15 -12
  135. data/app/models/tag.rb +14 -10
  136. data/app/models/tag_sidebar.rb +6 -3
  137. data/app/models/text_filter.rb +85 -11
  138. data/app/models/trackback.rb +7 -11
  139. data/app/models/trigger.rb +6 -3
  140. data/app/models/user.rb +43 -42
  141. data/app/services/title_builder.rb +56 -45
  142. data/app/uploaders/resource_uploader.rb +7 -3
  143. data/app/views/accounts/confirm.html.erb +3 -3
  144. data/app/views/admin/content/_article_list.html.erb +23 -8
  145. data/app/views/admin/content/_form.html.erb +71 -47
  146. data/app/views/admin/content/edit.html.erb +1 -1
  147. data/app/views/admin/content/index.html.erb +25 -15
  148. data/app/views/admin/content/new.html.erb +2 -2
  149. data/app/views/admin/dashboard/_comment.html.erb +5 -5
  150. data/app/views/admin/dashboard/_comments.html.erb +2 -2
  151. data/app/views/admin/dashboard/_drafts.html.erb +5 -5
  152. data/app/views/admin/dashboard/_overview.html.erb +7 -9
  153. data/app/views/admin/dashboard/_welcome.html.erb +11 -11
  154. data/app/views/admin/dashboard/index.html.erb +12 -7
  155. data/app/views/admin/feedback/_button.html.erb +6 -6
  156. data/app/views/admin/feedback/_feedback.html.erb +3 -3
  157. data/app/views/admin/feedback/_ham.html.erb +27 -9
  158. data/app/views/admin/feedback/_spam.html.erb +26 -16
  159. data/app/views/admin/feedback/article.html.erb +20 -21
  160. data/app/views/admin/feedback/edit.html.erb +14 -15
  161. data/app/views/admin/feedback/{ham.js → ham.js.erb} +0 -0
  162. data/app/views/admin/feedback/index.html.erb +25 -23
  163. data/app/views/admin/feedback/{spam.js → spam.js.erb} +0 -0
  164. data/app/views/admin/migrations/show.html.erb +10 -11
  165. data/app/views/admin/notes/_form.html.erb +13 -13
  166. data/app/views/admin/notes/_list.html.erb +19 -8
  167. data/app/views/admin/notes/_note.html.erb +12 -7
  168. data/app/views/admin/notes/edit.html.erb +6 -1
  169. data/app/views/admin/notes/index.html.erb +5 -1
  170. data/app/views/admin/notes/show.html.erb +2 -2
  171. data/app/views/admin/pages/_form.html.erb +86 -77
  172. data/app/views/admin/pages/_pages.html.erb +11 -4
  173. data/app/views/admin/pages/edit.html.erb +3 -1
  174. data/app/views/admin/pages/index.html.erb +10 -6
  175. data/app/views/admin/pages/new.html.erb +3 -1
  176. data/app/views/admin/post_types/_index_and_form.html.erb +15 -16
  177. data/app/views/admin/post_types/edit.html.erb +1 -1
  178. data/app/views/admin/post_types/index.html.erb +1 -1
  179. data/app/views/admin/profiles/index.html.erb +2 -3
  180. data/app/views/admin/redirects/_index_and_form.html.erb +10 -11
  181. data/app/views/admin/redirects/edit.html.erb +1 -1
  182. data/app/views/admin/redirects/index.html.erb +1 -1
  183. data/app/views/admin/resources/index.html.erb +19 -16
  184. data/app/views/admin/seo/_general.html.erb +23 -47
  185. data/app/views/admin/seo/_permalinks.html.erb +14 -14
  186. data/app/views/admin/seo/_titles.html.erb +63 -64
  187. data/app/views/admin/seo/show.html.erb +14 -19
  188. data/app/views/admin/settings/display.html.erb +22 -25
  189. data/app/views/admin/settings/feedback.html.erb +31 -32
  190. data/app/views/admin/settings/index.html.erb +23 -24
  191. data/app/views/admin/settings/write.html.erb +21 -22
  192. data/app/views/admin/shared/_edit.html.erb +3 -3
  193. data/app/views/admin/shared/_menu.html.erb +26 -26
  194. data/app/views/admin/shared/_twitter_alert.html.erb +1 -1
  195. data/app/views/admin/sidebar/_config.html.erb +5 -5
  196. data/app/views/admin/sidebar/_target_sidebar.html.erb +4 -4
  197. data/app/views/admin/sidebar/index.html.erb +7 -7
  198. data/app/views/admin/tags/_index_and_form.html.erb +11 -12
  199. data/app/views/admin/tags/edit.html.erb +1 -1
  200. data/app/views/admin/tags/index.html.erb +1 -1
  201. data/app/views/admin/themes/index.html.erb +5 -6
  202. data/app/views/admin/users/_form.html.erb +34 -34
  203. data/app/views/admin/users/edit.html.erb +2 -2
  204. data/app/views/admin/users/index.html.erb +10 -12
  205. data/app/views/admin/users/new.html.erb +2 -2
  206. data/app/views/archives_sidebar/_content.html.erb +2 -2
  207. data/app/views/articles/_archives_article.html.erb +3 -3
  208. data/app/views/articles/_article.html.erb +7 -9
  209. data/app/views/articles/_article_author.html.erb +4 -0
  210. data/app/views/articles/_article_content.html.erb +2 -2
  211. data/app/views/articles/_article_excerpt.html.erb +2 -2
  212. data/app/views/articles/_article_links.html.erb +1 -1
  213. data/app/views/articles/_comment_errors.html.erb +1 -1
  214. data/app/views/articles/_comment_form.html.erb +12 -12
  215. data/app/views/articles/_comment_preview.html.erb +3 -3
  216. data/app/views/articles/_password_form.html.erb +4 -4
  217. data/app/views/articles/_trackback.html.erb +2 -2
  218. data/app/views/articles/archives.html.erb +1 -1
  219. data/app/views/articles/feedback_atom_feed.atom.builder +3 -1
  220. data/app/views/articles/feedback_rss_feed.rss.builder +9 -7
  221. data/app/views/articles/index_atom_feed.atom.builder +5 -3
  222. data/app/views/articles/index_rss_feed.rss.builder +10 -8
  223. data/app/views/articles/live_search.html.erb +3 -3
  224. data/app/views/articles/read.html.erb +16 -8
  225. data/app/views/articles/search.html.erb +2 -2
  226. data/app/views/articles/trackback.xml.builder +3 -1
  227. data/app/views/articles/view_page.html.erb +1 -1
  228. data/app/views/authors/show.html.erb +9 -9
  229. data/app/views/authors/show_atom_feed.atom.builder +4 -2
  230. data/app/views/authors/show_rss_feed.rss.builder +10 -8
  231. data/app/views/comments/_comment.html.erb +3 -3
  232. data/app/views/devise/mailer/reset_password_instructions.html.erb +7 -9
  233. data/app/views/devise/passwords/edit.html.erb +4 -4
  234. data/app/views/devise/passwords/new.html.erb +1 -1
  235. data/app/views/devise/registrations/new.html.erb +5 -5
  236. data/app/views/devise/sessions/new.html.erb +3 -3
  237. data/app/views/errors/404.html.erb +2 -2
  238. data/app/views/feedback/index.atom.builder +3 -1
  239. data/app/views/feedback/index.rss.builder +9 -7
  240. data/app/views/layouts/accounts.html.erb +26 -26
  241. data/app/views/layouts/administration.html.erb +31 -31
  242. data/app/views/layouts/default.html.erb +3 -3
  243. data/app/views/layouts/editor.html.erb +5 -19
  244. data/app/views/meta_sidebar/_content.html.erb +2 -2
  245. data/app/views/notes/_note.html.erb +1 -1
  246. data/app/views/notes/index.html.erb +1 -1
  247. data/app/views/notes/show_in_reply.html.erb +1 -1
  248. data/app/views/notification_mailer/_mail_footer.html.erb +3 -3
  249. data/app/views/notification_mailer/article.html.erb +2 -2
  250. data/app/views/notification_mailer/comment.html.erb +5 -5
  251. data/app/views/notification_mailer/notif_user.html.erb +1 -1
  252. data/app/views/page_sidebar/_content.html.erb +1 -1
  253. data/app/views/search_sidebar/_content.html.erb +2 -2
  254. data/app/views/settings/install.html.erb +2 -2
  255. data/app/views/setup/index.html.erb +7 -7
  256. data/app/views/shared/_atom_header.atom.builder +4 -2
  257. data/app/views/shared/_atom_item_article.atom.builder +11 -6
  258. data/app/views/shared/_atom_item_comment.atom.builder +4 -2
  259. data/app/views/shared/_atom_item_trackback.atom.builder +4 -2
  260. data/app/views/shared/_page_header.html.erb +9 -12
  261. data/app/views/shared/_rss_item_article.rss.builder +6 -3
  262. data/app/views/shared/_rss_item_comment.rss.builder +3 -1
  263. data/app/views/shared/_rss_item_trackback.rss.builder +3 -1
  264. data/app/views/sidebar/display_plugins.html.erb +1 -1
  265. data/app/views/tag_sidebar/_content.html.erb +1 -1
  266. data/app/views/tags/index.html.erb +1 -1
  267. data/app/views/xml/_googlesitemap_item_article.googlesitemap.builder +2 -0
  268. data/app/views/xml/_googlesitemap_item_category.googlesitemap.builder +2 -0
  269. data/app/views/xml/_googlesitemap_item_page.googlesitemap.builder +2 -0
  270. data/app/views/xml/_googlesitemap_item_tag.googlesitemap.builder +2 -0
  271. data/app/views/xml/sitemap.googlesitemap.builder +4 -2
  272. data/config/i18n-tasks.yml +0 -5
  273. data/config/initializers/devise.rb +10 -4
  274. data/config/initializers/mime_types.rb +3 -1
  275. data/config/locales/da.yml +134 -71
  276. data/config/locales/de.yml +142 -75
  277. data/config/locales/en.yml +128 -66
  278. data/config/locales/es-MX.yml +135 -69
  279. data/config/locales/fr.yml +167 -86
  280. data/config/locales/he.yml +128 -70
  281. data/config/locales/it.yml +136 -72
  282. data/config/locales/ja.yml +110 -64
  283. data/config/locales/lt.yml +153 -74
  284. data/config/locales/nb-NO.yml +123 -65
  285. data/config/locales/nl.yml +140 -75
  286. data/config/locales/pl.yml +160 -69
  287. data/config/locales/pt-BR.yml +137 -70
  288. data/config/locales/ro.yml +148 -70
  289. data/config/locales/ru.yml +161 -69
  290. data/config/locales/zh-CN.yml +106 -59
  291. data/config/locales/zh-TW.yml +109 -61
  292. data/config/routes.rb +68 -63
  293. data/db/migrate/113_initial_schema.rb +192 -190
  294. data/db/migrate/114_fixes_buggy_articles_and_notes.rb +9 -6
  295. data/db/migrate/115_drops_categories_for_tags.rb +3 -1
  296. data/db/migrate/20150207131657_add_missing_indexes.rb +2 -0
  297. data/db/migrate/20150807134129_simplify_redirect_relations.rb +8 -1
  298. data/db/migrate/20150808052637_add_blog_ids.rb +4 -2
  299. data/db/migrate/20150808191127_add_blog_id_to_redirects.rb +2 -0
  300. data/db/migrate/20150810094754_add_blog_id_to_tags.rb +2 -0
  301. data/db/migrate/20160108111120_add_devise_to_users.rb +4 -2
  302. data/db/migrate/20160108184201_move_last_connection_to_last_sign_in_at.rb +2 -0
  303. data/db/migrate/20160110094906_remove_profiles_rights.rb +2 -0
  304. data/db/migrate/20160605103918_replace_profile_id_with_string.rb +2 -0
  305. data/db/migrate/20160605154632_remove_profiles.rb +10 -5
  306. data/db/migrate/20160701061851_demand_blog_id_on_contents.rb +2 -0
  307. data/db/migrate/20160701062604_add_blog_id_to_resources.rb +2 -0
  308. data/db/migrate/20170528093024_move_resources_to_content.rb +2 -0
  309. data/db/migrate/20170528094923_move_tags_to_content.rb +2 -0
  310. data/db/migrate/20170528201606_remove_separate_published_flag.rb +2 -0
  311. data/db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb +2 -0
  312. data/db/migrate/20170702105201_remove_published_at_from_feedback.rb +2 -0
  313. data/db/migrate/20190208151235_add_text_filter_name_fields.rb +9 -0
  314. data/db/migrate/20190208152646_move_text_filter_to_name.rb +97 -0
  315. data/db/migrate/20190209155717_remove_text_filter_ids.rb +19 -0
  316. data/db/migrate/20190209160610_remove_text_filters.rb +17 -0
  317. data/db/migrate/20200413140440_add_unique_indexes.rb +10 -0
  318. data/db/seeds.rb +9 -19
  319. data/lib/email_notify.rb +3 -1
  320. data/lib/format.rb +4 -2
  321. data/lib/publify_core.rb +36 -35
  322. data/lib/publify_core/engine.rb +8 -6
  323. data/lib/publify_core/lang.rb +5 -1
  324. data/lib/publify_core/testing_support/dns_mock.rb +15 -0
  325. data/lib/publify_core/testing_support/factories.rb +240 -0
  326. data/lib/publify_core/testing_support/feed_assertions.rb +48 -0
  327. data/lib/publify_core/testing_support/fixtures/exploit.svg +4 -0
  328. data/lib/publify_core/testing_support/fixtures/fakepng.png +1 -0
  329. data/lib/publify_core/testing_support/fixtures/otherfile.txt +1 -0
  330. data/lib/publify_core/testing_support/fixtures/testfile.png +0 -0
  331. data/lib/publify_core/testing_support/fixtures/testfile.txt +1 -0
  332. data/lib/publify_core/testing_support/upload_fixtures.rb +15 -0
  333. data/lib/publify_core/version.rb +3 -1
  334. data/lib/publify_guid.rb +3 -1
  335. data/lib/publify_plugins.rb +10 -5
  336. data/lib/publify_textfilter_markdown.rb +38 -25
  337. data/lib/publify_textfilter_none.rb +5 -3
  338. data/lib/publify_textfilter_smartypants.rb +5 -3
  339. data/lib/publify_textfilter_textile.rb +7 -4
  340. data/lib/publify_textfilter_twitterfilter.rb +13 -7
  341. data/lib/publify_time.rb +4 -0
  342. data/lib/sidebar_field.rb +15 -13
  343. data/lib/sidebar_registry.rb +5 -3
  344. data/lib/spam_protection.rb +16 -13
  345. data/lib/tasks/i18n.rake +9 -0
  346. data/lib/tasks/manifest.rake +30 -0
  347. data/lib/tasks/publify_core_tasks.rake +2 -0
  348. data/lib/text_filter_plugin.rb +27 -25
  349. data/lib/theme.rb +5 -3
  350. data/lib/transforms.rb +22 -19
  351. metadata +217 -87
  352. data/app/assets/javascripts/widearea.js +0 -486
  353. data/app/assets/stylesheets/widearea.css +0 -133
  354. data/app/controllers/admin/textfilters_controller.rb +0 -6
  355. data/app/views/admin/dashboard/_inbound.html.erb +0 -31
  356. data/app/views/admin/notes/_header.html.erb +0 -6
  357. data/app/views/articles/_protected_article_content.html.erb +0 -6
data/app/views/admin/seo/_permalinks.html.erb CHANGED
@@ -1,53 +1,53 @@
1
1
  <div class='alert alert-info'>
2
- <p><%= t(".explain") %></p>
3
- <p><%= t(".sample") %></p>
2
+ <p><%= t('.explain') %></p>
3
+ <p><%= t('.sample') %></p>
4
4
  </div>
5
5
 
6
6
  <div class='form-horizontal'>
7
7
  <div class='form-group'>
8
- <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".permalink_format") %></label>
8
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.permalink_format') %></label>
9
9
  <div class='col-sm-8 col-md-6 col-lg-4'>
10
10
  <div class='radio'>
11
11
  <label for="setting_permalink_format_yearmonthdaytitle">
12
12
  <%= radio_button(:setting, :permalink_format, '/%year%/%month%/%day%/%title%') %>
13
- <%= t(".date_and_title") %>
13
+ <%= t('.date_and_title') %>
14
14
  </label>
15
15
  <small class='help-block'><%= "#{this_blog.base_url}/#{Time.zone.now.strftime('%Y/%m/%d')}/sample-article" %></small>
16
16
  <label for="setting_permalink_format_yearmonthtitle">
17
17
  <%= radio_button(:setting, :permalink_format, '/%year%/%month%/%title%') %>
18
- <%= t(".month_and_title") %>
18
+ <%= t('.month_and_title') %>
19
19
  </label>
20
20
  <small class='help-block'><%= "#{this_blog.base_url}/#{Time.zone.now.strftime('%Y/%m')}/sample-article" %></small>
21
21
  <label for="setting_permalink_format_title">
22
- <%= radio_button(:setting, :permalink_format, '/%title%') %> <%= t(".title_only") %>
22
+ <%= radio_button(:setting, :permalink_format, '/%title%') %> <%= t('.title_only') %>
23
23
  </label>
24
24
  <small class='help-block'><%= "#{this_blog.base_url}/sample-article" %></small>
25
25
  <label for="setting_permalink_format_custom">
26
- <%= radio_button(:setting, :permalink_format, 'custom') %> <%= t(".custom") %>
27
- <%= text_field(:setting, :custom_permalink, { :class => 'form-control'}) %>
26
+ <%= radio_button(:setting, :permalink_format, 'custom') %> <%= t('.custom') %>
27
+ <%= text_field(:setting, :custom_permalink, class: 'form-control') %>
28
28
  </label>
29
29
  </div>
30
30
  </div>
31
31
  </div>
32
32
  </div>
33
33
 
34
- <h3><%= t(".help_on_permalink_settings") %></h3>
35
- <p class='help-block'><%= t(".you_can_custom_your_url_structure") %></p>
34
+ <h3><%= t('.help_on_permalink_settings') %></h3>
35
+ <p class='help-block'><%= t('.you_can_custom_your_url_structure') %></p>
36
36
  <table class="table table-hover">
37
37
  <tr>
38
38
  <td><code>%title%</code></td>
39
- <td><%= t(".your_article_slug_html") %></td>
39
+ <td><%= t('.your_article_slug_html') %></td>
40
40
  </tr>
41
41
  <tr>
42
42
  <td><code>%year%</code></td>
43
- <td><%= t(".your_article_year") %></td>
43
+ <td><%= t('.your_article_year') %></td>
44
44
  </tr>
45
45
  <tr>
46
46
  <td><code>%month%</code></td>
47
- <td><%= t(".your_article_month") %></td>
47
+ <td><%= t('.your_article_month') %></td>
48
48
  </tr>
49
49
  <tr>
50
50
  <td><code>%day%</code></td>
51
- <td><%= t(".your_article_day") %></td>
51
+ <td><%= t('.your_article_day') %></td>
52
52
  </tr>
53
53
  </table>
data/app/views/admin/seo/_titles.html.erb CHANGED
@@ -1,210 +1,209 @@
1
1
  <fieldset class='form-horizontal'>
2
- <legend><%= t(".home") %></legend>
2
+ <legend><%= t('.home') %></legend>
3
3
  <div class='form-group'>
4
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_home_title_template"><%= t(".title_template") %></label>
4
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_home_title_template"><%= t('.title_template') %></label>
5
5
  <div class='col-sm-8 col-md-6 col-lg-4'>
6
- <%= text_field(:setting, :home_title_template, { :class => 'form-control'})%>
6
+ <%= text_field(:setting, :home_title_template, class: 'form-control') %>
7
7
  </div>
8
8
  </div>
9
9
  <div class='form-group'>
10
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_home_desc_template"><%= t(".description_template") %></label>
10
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_home_desc_template"><%= t('.description_template') %></label>
11
11
  <div class='col-sm-8 col-md-6 col-lg-4'>
12
- <%= text_area(:setting, :home_desc_template, :rows => 3, :class => 'form-control') %>
12
+ <%= text_area(:setting, :home_desc_template, rows: 3, class: 'form-control') %>
13
13
  </div>
14
14
  </div>
15
15
  </fieldset>
16
16
  <fieldset class='form-horizontal'>
17
- <legend><%= t(".articles") %></legend>
17
+ <legend><%= t('.articles') %></legend>
18
18
  <div class='form-group'>
19
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_article_title_template"><%= t(".title_template") %></label>
19
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_article_title_template"><%= t('.title_template') %></label>
20
20
  <div class='col-sm-8 col-md-6 col-lg-4'>
21
- <%= text_field(:setting, :article_title_template, { :class => 'form-control'}) %>
21
+ <%= text_field(:setting, :article_title_template, class: 'form-control') %>
22
22
  </div>
23
23
  </div>
24
24
  <div class='form-group'>
25
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_article_desc_template"><%= t(".description_template") %></label>
25
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_article_desc_template"><%= t('.description_template') %></label>
26
26
  <div class='col-sm-8 col-md-6 col-lg-4'>
27
- <%= text_area(:setting, :article_desc_template, :rows => 3, :class => 'form-control') %>
27
+ <%= text_area(:setting, :article_desc_template, rows: 3, class: 'form-control') %>
28
28
  </div>
29
29
  </div>
30
30
  </fieldset>
31
31
  <fieldset class='form-horizontal'>
32
- <legend><%= t(".pages") %></legend>
32
+ <legend><%= t('.pages') %></legend>
33
33
  <div class='form-group'>
34
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_page_title_template"><%= t(".title_template") %></label>
34
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_page_title_template"><%= t('.title_template') %></label>
35
35
  <div class='col-sm-8 col-md-6 col-lg-4'>
36
- <%= text_field(:setting, :page_title_template, { :class => 'form-control'}) %>
36
+ <%= text_field(:setting, :page_title_template, class: 'form-control') %>
37
37
  </div>
38
38
  </div>
39
39
  <div class='form-group'>
40
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_page_desc_template"><%= t(".description_template") %></label>
40
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_page_desc_template"><%= t('.description_template') %></label>
41
41
  <div class='col-sm-8 col-md-6 col-lg-4'>
42
- <%= text_area(:setting, :page_desc_template, :rows => 3, :class => 'form-control') %>
42
+ <%= text_area(:setting, :page_desc_template, rows: 3, class: 'form-control') %>
43
43
  </div>
44
44
  </div>
45
45
  </fieldset>
46
46
 
47
47
  <fieldset class='form-horizontal'>
48
- <legend><%= t(".paginated_archives") %></legend>
48
+ <legend><%= t('.paginated_archives') %></legend>
49
49
  <div class='form-group'>
50
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_paginated_title_template"><%= t(".title_template") %></label>
50
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_paginated_title_template"><%= t('.title_template') %></label>
51
51
  <div class='col-sm-8 col-md-6 col-lg-4'>
52
- <%= text_field(:setting, :paginated_title_template, { :class => 'form-control'}) %>
52
+ <%= text_field(:setting, :paginated_title_template, class: 'form-control') %>
53
53
  </div>
54
54
  </div>
55
55
  <div class='form-group'>
56
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_paginated_desc_template"><%= t(".description_template") %></label>
56
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_paginated_desc_template"><%= t('.description_template') %></label>
57
57
  <div class='col-sm-8 col-md-6 col-lg-4'>
58
- <%= text_area(:setting, :paginated_desc_template, :rows => 3, :class => 'form-control') %>
58
+ <%= text_area(:setting, :paginated_desc_template, rows: 3, class: 'form-control') %>
59
59
  </div>
60
60
  </div>
61
61
  </fieldset>
62
62
  <fieldset class='form-horizontal'>
63
- <legend><%= t(".dated_archives") %></legend>
63
+ <legend><%= t('.dated_archives') %></legend>
64
64
  <div class='form-group'>
65
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_archives_title_template"><%= t(".title_template") %></label>
65
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_archives_title_template"><%= t('.title_template') %></label>
66
66
  <div class='col-sm-8 col-md-6 col-lg-4'>
67
- <%= text_field(:setting, :archives_title_template, { :class => 'form-control'}) %>
67
+ <%= text_field(:setting, :archives_title_template, class: 'form-control') %>
68
68
  </div>
69
69
  </div>
70
70
  <div class='form-group'>
71
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_archives_desc_template"><%= t(".description_template") %></label>
71
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_archives_desc_template"><%= t('.description_template') %></label>
72
72
  <div class='col-sm-8 col-md-6 col-lg-4'>
73
- <%= text_area(:setting, :archives_desc_template, :rows => 3, :class => 'form-control') %>
73
+ <%= text_area(:setting, :archives_desc_template, rows: 3, class: 'form-control') %>
74
74
  </div>
75
75
  </div>
76
76
  </fieldset>
77
77
 
78
78
  <fieldset class='form-horizontal'>
79
- <legend><%= t(".author_page") %></legend>
79
+ <legend><%= t('.author_page') %></legend>
80
80
  <div class='form-group'>
81
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_author_title_template"><%= t(".title_template") %></label>
81
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_author_title_template"><%= t('.title_template') %></label>
82
82
  <div class='col-sm-8 col-md-6 col-lg-4'>
83
- <%= text_field(:setting, :author_title_template, { :class => 'form-control'}) %>
83
+ <%= text_field(:setting, :author_title_template, class: 'form-control') %>
84
84
  </div>
85
85
  </div>
86
86
  <div class='form-group'>
87
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_author_desc_template"><%= t(".description_template") %></label>
87
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_author_desc_template"><%= t('.description_template') %></label>
88
88
  <div class='col-sm-8 col-md-6 col-lg-4'>
89
- <%= text_area(:setting, :author_desc_template, :rows => 3, :class => 'form-control') %>
89
+ <%= text_area(:setting, :author_desc_template, rows: 3, class: 'form-control') %>
90
90
  </div>
91
91
  </div>
92
92
  </fieldset>
93
93
 
94
94
  <fieldset class='form-horizontal'>
95
- <legend><%= t(".search_results") %></legend>
95
+ <legend><%= t('.search_results') %></legend>
96
96
  <div class='form-group'>
97
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_search_title_template"><%= t(".title_template") %></label>
97
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_search_title_template"><%= t('.title_template') %></label>
98
98
  <div class='col-sm-8 col-md-6 col-lg-4'>
99
- <%= text_field(:setting, :search_title_template, { :class => 'form-control'}) %>
99
+ <%= text_field(:setting, :search_title_template, class: 'form-control') %>
100
100
  </div>
101
101
  </div>
102
102
  <div class='form-group'>
103
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_search_desc_template"><%= t(".description_template") %></label>
103
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_search_desc_template"><%= t('.description_template') %></label>
104
104
  <div class='col-sm-8 col-md-6 col-lg-4'>
105
- <%= text_area(:setting, :search_desc_template, :rows => 3, :class => 'form-control') %>
105
+ <%= text_area(:setting, :search_desc_template, rows: 3, class: 'form-control') %>
106
106
  </div>
107
107
  </div>
108
108
  </fieldset>
109
109
 
110
110
  <fieldset class='form-horizontal'>
111
- <legend><%= t(".short_statuses_lists") %></legend>
111
+ <legend><%= t('.short_statuses_lists') %></legend>
112
112
  <div class='form-group'>
113
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_statuses_title_template"><%= t(".title_template") %></label>
113
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_statuses_title_template"><%= t('.title_template') %></label>
114
114
  <div class='col-sm-8 col-md-6 col-lg-4'>
115
- <%= text_field(:setting, :statuses_title_template, { :class => 'form-control'}) %>
115
+ <%= text_field(:setting, :statuses_title_template, class: 'form-control') %>
116
116
  </div>
117
117
  </div>
118
118
  <div class='form-group'>
119
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_statuses_desc_template"><%= t(".description_template") %></label>
119
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_statuses_desc_template"><%= t('.description_template') %></label>
120
120
  <div class='col-sm-8 col-md-6 col-lg-4'>
121
- <%= text_area(:setting, :statuses_desc_template, :rows => 3, :class => 'form-control') %>
121
+ <%= text_area(:setting, :statuses_desc_template, rows: 3, class: 'form-control') %>
122
122
  </div>
123
123
  </div>
124
124
  </fieldset>
125
125
 
126
126
  <fieldset class='form-horizontal'>
127
- <legend><%= t(".short_statuses") %></legend>
127
+ <legend><%= t('.short_statuses') %></legend>
128
128
  <div class='form-group'>
129
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_status_title_template"><%= t(".title_template") %></label>
129
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_status_title_template"><%= t('.title_template') %></label>
130
130
  <div class='col-sm-8 col-md-6 col-lg-4'>
131
- <%= text_field(:setting, :status_title_template, { :class => 'form-control'}) %>
131
+ <%= text_field(:setting, :status_title_template, class: 'form-control') %>
132
132
  </div>
133
133
  </div>
134
134
  <div class='form-group'>
135
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_status_desc_template"><%= t(".description_template") %></label>
135
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_status_desc_template"><%= t('.description_template') %></label>
136
136
  <div class='col-sm-8 col-md-6 col-lg-4'>
137
- <%= text_area(:setting, :status_desc_template, :rows => 3, :class => 'form-control') %>
137
+ <%= text_area(:setting, :status_desc_template, rows: 3, class: 'form-control') %>
138
138
  </div>
139
139
  </div>
140
140
  </fieldset>
141
141
 
142
- <h3><%= t(".help_on_title_settings")%></h3>
143
- <p class='help-block'><%= t(".these_tags_can_be_included") %></p>
142
+ <h3><%= t('.help_on_title_settings') %></h3>
143
+ <p class='help-block'><%= t('.these_tags_can_be_included') %></p>
144
144
  <table class="table table-hover">
145
145
  <tr>
146
146
  <td>%title%</td>
147
- <td><%= t(".replaced_with_the_title_of_the_article_page") %></td>
147
+ <td><%= t('.replaced_with_the_title_of_the_article_page') %></td>
148
148
  </tr>
149
149
  <tr>
150
150
  <td>%blog_name%</td>
151
- <td><%= t(".the_blog_s_name") %></td>
151
+ <td><%= t('.the_blog_s_name') %></td>
152
152
  </tr>
153
153
  <tr>
154
154
  <td>%blog_subtitle%</td>
155
- <td><%= t(".the_blog_s_tagline_description") %></td>
155
+ <td><%= t('.the_blog_s_tagline_description') %></td>
156
156
  </tr>
157
157
  <tr>
158
158
  <td>%excerpt%</td>
159
- <td><%= t(".replaced_with_the_post_page_excerpt") %></td>
159
+ <td><%= t('.replaced_with_the_post_page_excerpt') %></td>
160
160
  </tr>
161
161
  <tr>
162
162
  <td>%tags%</td>
163
- <td><%= t(".replaced_with_the_article_tags") %></td>
163
+ <td><%= t('.replaced_with_the_article_tags') %></td>
164
164
  </tr>
165
165
  <tr>
166
166
  <td>%categories</td>
167
- <td><%= t(".replaced_with_the_article_categories") %></td>
167
+ <td><%= t('.replaced_with_the_article_categories') %></td>
168
168
  </tr>
169
169
  <tr>
170
170
  <td>%title</td>
171
- <td><%= t(".replaced_with_the_article_page_title") %></td>
171
+ <td><%= t('.replaced_with_the_article_page_title') %></td>
172
172
  </tr>
173
173
  <tr>
174
174
  <td>%name%</td>
175
- <td><%= t(".replaced_with_the_category_tag_name") %></td>
175
+ <td><%= t('.replaced_with_the_category_tag_name') %></td>
176
176
  </tr>
177
177
  <tr>
178
178
  <td>%search%</td>
179
- <td><%= t(".replaced_with_the_current_search_phrase") %></td>
179
+ <td><%= t('.replaced_with_the_current_search_phrase') %></td>
180
180
  </tr>
181
181
  <tr>
182
182
  <td>%currenttime%</td>
183
- <td><%= t(".replaced_with_the_current_time") %></td>
183
+ <td><%= t('.replaced_with_the_current_time') %></td>
184
184
  </tr>
185
185
  <tr>
186
186
  <td>%currentdate%</td>
187
- <td><%= t(".replaced_with_the_current_date") %></td>
187
+ <td><%= t('.replaced_with_the_current_date') %></td>
188
188
  </tr>
189
189
  <tr>
190
190
  <td>%currentmonth%</td>
191
- <td><%= t(".replaced_with_the_current_month") %></td>
191
+ <td><%= t('.replaced_with_the_current_month') %></td>
192
192
  </tr>
193
193
  <tr>
194
194
  <td>%currentyear%</td>
195
- <td><%= t(".replaced_with_the_current_year") %></td>
195
+ <td><%= t('.replaced_with_the_current_year') %></td>
196
196
  </tr>
197
197
  <tr>
198
198
  <td>%page%</td>
199
- <td><%= t(".replaced_with_the_current_page_number") %></td>
199
+ <td><%= t('.replaced_with_the_current_page_number') %></td>
200
200
  </tr>
201
201
  <tr>
202
202
  <td>%date%</td>
203
- <td><%= t(".replaced_by_the_archive_date") %></td>
203
+ <td><%= t('.replaced_by_the_archive_date') %></td>
204
204
  </tr>
205
205
  <tr>
206
206
  <td>%body%</td>
207
- <td><%= t(".replaced_by_the_content_body") %></td>
207
+ <td><%= t('.replaced_by_the_content_body') %></td>
208
208
  </tr>
209
209
  </table>
210
-
data/app/views/admin/seo/show.html.erb CHANGED
@@ -1,32 +1,27 @@
1
1
  <% content_for :page_heading do %>
2
2
  <h2>
3
- <i class="glyphicon glyphicon-large glyphicon-cog"></i>
4
- <%=
5
- case @section
6
- when 'titles' then t(".title_settings")
7
- when 'permalinks' then t(".permalinks")
8
- else t(".global_settings")
9
- end
10
- %>
3
+ <%= case @section
4
+ when 'titles' then t('.title_settings')
5
+ when 'permalinks' then t('.permalinks')
6
+ else t('.global_settings')
7
+ end %>
11
8
  </h2>
12
9
  <% end %>
13
10
 
14
11
  <%= error_messages_for 'blog' %>
15
12
 
16
13
  <%= form_tag admin_seo_path, method: :put do %>
17
- <%=
18
- case @section
19
- when 'titles' then render 'titles'
20
- when 'permalinks' then render 'permalinks'
21
- else render 'general'
22
- end
23
- %>
14
+ <%= case @section
15
+ when 'titles' then render 'titles'
16
+ when 'permalinks' then render 'permalinks'
17
+ else render 'general'
18
+ end %>
24
19
 
25
20
  <%= hidden_field_tag 'section', @section %>
26
21
  <div class='form-group'>
27
- <hr>
28
- <%= link_to(t(".cancel"), admin_seo_path(section: @section)) %>
29
- <%= t(".or") %>
30
- <%= submit_tag(t(".update_settings"), class: 'btn btn-success') %>
22
+ <hr />
23
+ <%= link_to(t('.cancel'), admin_seo_path(section: @section)) %>
24
+ <%= t('.or') %>
25
+ <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>
31
26
  </div>
32
27
  <% end %>
data/app/views/admin/settings/display.html.erb CHANGED
@@ -1,18 +1,17 @@
1
1
  <% content_for :page_heading do %>
2
2
  <h2>
3
- <i class="glyphicon glyphicon-large glyphicon-cog"></i>
4
3
  <%= t('.display_settings') %>
5
4
  </h2>
6
5
  <% end %>
7
6
 
8
- <%= form_tag :action => 'update' do %>
7
+ <%= form_tag action: 'update' do %>
9
8
 
10
9
  <fieldset class='form-horizontal'>
11
- <legend><%= t('.publishing_options')%></legend>
10
+ <legend><%= t('.publishing_options') %></legend>
12
11
  <div class='form-group'>
13
12
  <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_limit_article_display"><%= t('.display') %> </label>
14
13
  <div class='col-sm-2 col-md-1'>
15
- <%= text_field(:setting, :limit_article_display, {:size => 4, :class => 'form-control'}) %>
14
+ <%= text_field(:setting, :limit_article_display, size: 4, class: 'form-control') %>
16
15
  </div>
17
16
  <div class='col-sm-6 col-md-5 col-lg-3'>
18
17
  <span class='help-block'><%= t('.default_article_show') %></span>
@@ -21,7 +20,7 @@
21
20
  <div class='form-group'>
22
21
  <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_limit_archives_display"><%= t('.display') %> </label>
23
22
  <div class='col-sm-2 col-md-1'>
24
- <%= text_field(:setting, :limit_archives_display, {:size => 4, :class => 'form-control'}) %>
23
+ <%= text_field(:setting, :limit_archives_display, size: 4, class: 'form-control') %>
25
24
  </div>
26
25
  <div class='col-sm-6 col-md-5 col-lg-3'>
27
26
  <span class='help-block'><%= t('.default_archives_show') %></span>
@@ -41,30 +40,28 @@
41
40
  <div class='form-group'>
42
41
  <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.date_format') %></label>
43
42
  <div class='col-sm-8 col-md-6 col-lg-4'>
44
- <%= select(:setting, :date_format, {
45
- Time.now.strftime('%d/%m/%Y') => '%d/%m/%Y',
46
- Time.now.strftime('%m/%d/%Y') => '%m/%d/%Y',
47
- Time.now.strftime('%d %b %Y') => '%d %b %Y',
48
- Time.now.strftime('%d %B %Y') => '%d %B %Y',
49
- Time.now.strftime('%Y/%m/%d') => '%Y/%m/%d',
50
- distance_of_time_in_words(Time.now, Time.now - 2.days) => 'setting_date_format_distance_of_time_in_words'})
51
- %>
43
+ <%= select(:setting, :date_format,
44
+ Time.zone.now.strftime('%d/%m/%Y') => '%d/%m/%Y',
45
+ Time.zone.now.strftime('%m/%d/%Y') => '%m/%d/%Y',
46
+ Time.zone.now.strftime('%d %b %Y') => '%d %b %Y',
47
+ Time.zone.now.strftime('%d %B %Y') => '%d %B %Y',
48
+ Time.zone.now.strftime('%Y/%m/%d') => '%Y/%m/%d',
49
+ distance_of_time_in_words(Time.zone.now, 2.days.ago) => 'setting_date_format_distance_of_time_in_words') %>
52
50
  </div>
53
51
  </div>
54
52
  <div class='form-group'>
55
53
  <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.time_format') %></label>
56
54
  <div class='col-sm-8 col-md-6 col-lg-4'>
57
- <%= select(:setting, :time_format, {
58
- Time.now.strftime('%Hh%M') => '%Hh%M',
59
- Time.now.strftime('%H:%M') => '%H:%M',
60
- Time.now.strftime('%I:%M%p') => '%I:%M%p'})
61
- %>
55
+ <%= select(:setting, :time_format,
56
+ Time.zone.now.strftime('%Hh%M') => '%Hh%M',
57
+ Time.zone.now.strftime('%H:%M') => '%H:%M',
58
+ Time.zone.now.strftime('%I:%M%p') => '%I:%M%p') %>
62
59
  </div>
63
60
  </div>
64
61
  <div class='form-group'>
65
62
  <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_custom_url_shortener"><%= t('.custom_url') %></label>
66
63
  <div class='col-sm-8 col-md-6 col-lg-4'>
67
- <%= text_field(:setting, :custom_url_shortener, { :class => 'form-control'}) %>
64
+ <%= text_field(:setting, :custom_url_shortener, class: 'form-control') %>
68
65
  <small class='help block'><%= t('.custom_url_help') %></small>
69
66
  </div>
70
67
  </div>
@@ -75,7 +72,7 @@
75
72
  <div class='form-group'>
76
73
  <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_limit_rss_display"><%= t('.display') %> </label>
77
74
  <div class='col-sm-2 col-md-1'>
78
- <%= text_field(:setting, :limit_rss_display, {:size => 4, :class => 'form-control'}) %>
75
+ <%= text_field(:setting, :limit_rss_display, size: 4, class: 'form-control') %>
79
76
  </div>
80
77
  <div class='col-sm-6 col-md-5 col-lg-3'>
81
78
  <span class='help-block'><%= t('.default_feed_show') %></span>
@@ -87,7 +84,7 @@
87
84
  <div class='checkbox'>
88
85
  <label for="setting_hide_extended_on_rss">
89
86
  <%= check_box(:setting, :hide_extended_on_rss) %>
90
- <%= t('.feed_excerpts_only')%>
87
+ <%= t('.feed_excerpts_only') %>
91
88
  </label>
92
89
  </div>
93
90
  </div>
@@ -95,9 +92,9 @@
95
92
  </fieldset>
96
93
  <%= hidden_field_tag 'from', 'display' %>
97
94
  <div class='form-group'>
98
- <hr>
99
- <%= link_to(t(".cancel"), {action: 'index'}) %>
100
- <%= t(".or") %>
101
- <%= submit_tag(t(".update_settings"), class: 'btn btn-success') %>
95
+ <hr />
96
+ <%= link_to(t('.cancel'), action: 'index') %>
97
+ <%= t('.or') %>
98
+ <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>
102
99
  </div>
103
100
  <% end %>