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
@@ -1,108 +1,107 @@
1
1
  <% content_for :page_heading do %>
2
2
  <h2>
3
- <i class="glyphicon glyphicon-large glyphicon-cog"></i>
4
- <%= t(".feedback_settings") %>
3
+ <%= t('.feedback_settings') %>
5
4
  </h2>
6
5
  <% end %>
7
6
 
8
7
  <%= form_tag action: 'update' do %>
9
8
  <fieldset class='form-horizontal'>
10
- <legend><%= t(".feedback")%></legend>
9
+ <legend><%= t('.feedback') %></legend>
11
10
  <div class='form-group'>
12
- <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".comments") %></label>
11
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.comments') %></label>
13
12
  <div class='col-sm-8 col-md-6 col-lg-4'>
14
13
  <div class='checkbox'>
15
14
  <label for="setting_default_allow_comments">
16
15
  <%= check_box(:setting, :default_allow_comments) %>
17
- <%= t(".enable_comments_by_default") %>
16
+ <%= t('.enable_comments_by_default') %>
18
17
  </label>
19
18
  </div>
20
19
  <div class='checkbox'>
21
20
  <label for="setting_default_moderate_comments">
22
21
  <%= check_box(:setting, :default_moderate_comments) %>
23
- <%= t(".enable_feedback_moderation") %>
22
+ <%= t('.enable_feedback_moderation') %>
24
23
  </label>
25
- <small class='help-block'><%= t(".explain_feedback_moderation") %></small>
24
+ <small class='help-block'><%= t('.explain_feedback_moderation') %></small>
26
25
  </div>
27
26
  </div>
28
27
  </div>
29
28
  <div class='form-group'>
30
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="comment_text_filter"><%= t(".comments_filter") %></label>
29
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="comment_text_filter"><%= t('.comments_filter') %></label>
31
30
  <div class='col-sm-8 col-md-6 col-lg-4'>
32
31
  <select name="setting[comment_text_filter]" id="comment_text_filter" class='form-control'>
33
- <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.comment_text_filter) %>
32
+ <%= options_for_select text_filter_options, this_blog.comment_text_filter %>
34
33
  </select>
35
34
  </div>
36
35
  </div>
37
36
  <div class='form-group'>
38
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_plugin_avatar"><%= t(".avatars_provider") %></label>
37
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_plugin_avatar"><%= t('.avatars_provider') %></label>
39
38
  <div class='col-sm-8 col-md-6 col-lg-4'>
40
39
  <select name="setting[plugin_avatar]" id="setting_plugin_avatar" class='form-control'>
41
- <%= options_for_select plugin_options(:avatar).push([t(".none"),'']), this_blog.plugin_avatar %>
40
+ <%= options_for_select plugin_options(:avatar).push([t('.none'), '']), this_blog.plugin_avatar %>
42
41
  </select>
43
42
  </div>
44
43
  </div>
45
44
  </fieldset>
46
45
 
47
46
  <fieldset class='form-horizontal'>
48
- <legend><%= t(".spam") %></legend>
47
+ <legend><%= t('.spam') %></legend>
49
48
  <div class='form-group'>
50
- <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".spam_protection") %></label>
49
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.spam_protection') %></label>
51
50
  <div class='col-sm-8 col-md-6 col-lg-4'>
52
51
  <div class='checkbox'>
53
52
  <label for="setting_sp_global">
54
53
  <%= check_box(:setting, :sp_global) %>
55
- <%= t(".enable_spam_protection")%>
54
+ <%= t('.enable_spam_protection') %>
56
55
  </label>
57
- <small class='help-block'><%= t(".explain_spam_protection") %>.</small>
56
+ <small class='help-block'><%= t('.explain_spam_protection') %>.</small>
58
57
  </div>
59
58
  </div>
60
59
  </div>
61
60
  <div class='form-group'>
62
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_sp_akismet_key"><%= t(".askimet_key") %></label>
61
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_sp_akismet_key"><%= t('.askimet_key') %></label>
63
62
  <div class='col-sm-8 col-md-6 col-lg-4'>
64
- <%= text_field(:setting, :sp_akismet_key, {:class => 'form-control'}) %>
65
- <small class='help-block'><%= t(".explain_spamfiltering_html") %>.</small>
63
+ <%= text_field(:setting, :sp_akismet_key, class: 'form-control') %>
64
+ <small class='help-block'><%= t('.explain_spamfiltering_html') %>.</small>
66
65
  </div>
67
66
  </div>
68
67
  <div class='form-group'>
69
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_sp_article_auto_close"><%= t(".disable_comments_after") %></label>
68
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_sp_article_auto_close"><%= t('.disable_comments_after') %></label>
70
69
  <div class='col-sm-8 col-md-6 col-lg-4'>
71
70
  <div class="row">
72
71
  <div class='col-sm-3 col-md-2 col-lg-3'>
73
- <%= text_field(:setting, :sp_article_auto_close, {:size => 4, :class => 'form-control'}) %>
72
+ <%= text_field(:setting, :sp_article_auto_close, size: 4, class: 'form-control') %>
74
73
  </div>
75
74
  <div class='col-sm-9 col-md-10 col-lg-9'>
76
- <span class='help-block'><%= t(".days") %></span>
75
+ <span class='help-block'><%= t('.days') %></span>
77
76
  </div>
78
77
  <div class='col-sm-12'>
79
- <small class='help-block'><%= t(".set_to_0_to_never_disable_comments") %>.</small>
78
+ <small class='help-block'><%= t('.set_to_0_to_never_disable_comments') %>.</small>
80
79
  </div>
81
80
  </div>
82
81
  </div>
83
82
  </div>
84
83
  <div class='form-group'>
85
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_sp_url_limit"><%= t(".max_links") %></label>
84
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_sp_url_limit"><%= t('.max_links') %></label>
86
85
  <div class='col-sm-8 col-md-6 col-lg-4'>
87
86
  <div class="row">
88
87
  <div class='col-sm-3 col-md-2 col-lg-3'>
89
- <%= text_field(:setting, :sp_url_limit, {:size => 4, :class => 'form-control'}) %>
88
+ <%= text_field(:setting, :sp_url_limit, size: 4, class: 'form-control') %>
90
89
  </div>
91
90
  <div class='col-sm-12'>
92
- <small class='help-block'><%= t(".explain_reject_comments")%>. <%= t(".set_to_0_to_never_reject_comments") %>.</small>
91
+ <small class='help-block'><%= t('.explain_reject_comments') %>. <%= t('.set_to_0_to_never_reject_comments') %>.</small>
93
92
  </div>
94
93
  </div>
95
94
  </div>
96
95
  </div>
97
96
  <div class='form-group'>
98
- <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".captcha") %></label>
97
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.captcha') %></label>
99
98
  <div class='col-sm-8 col-md-6 col-lg-4'>
100
99
  <div class='checkbox'>
101
100
  <label for="setting_use_recaptcha">
102
101
  <%= check_box(:setting, :use_recaptcha) %>
103
- <%= t(".enable_recaptcha") %>
102
+ <%= t('.enable_recaptcha') %>
104
103
  </div>
105
- <small class='help-block'><%= t(".remember_to_set_your_recaptcha") %></small>
104
+ <small class='help-block'><%= t('.remember_to_set_your_recaptcha') %></small>
106
105
  </label>
107
106
  </div>
108
107
  </div>
@@ -110,9 +109,9 @@
110
109
 
111
110
  <%= hidden_field_tag 'from', 'feedback' %>
112
111
  <div class='form-group'>
113
- <hr>
114
- <%= link_to(t(".cancel"), {action: 'index'}) %>
115
- <%= t(".or") %>
116
- <%= submit_tag(t(".update_settings"), class: 'btn btn-success') %>
112
+ <hr />
113
+ <%= link_to(t('.cancel'), action: 'index') %>
114
+ <%= t('.or') %>
115
+ <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>
117
116
  </div>
118
117
  <% end %>
@@ -1,73 +1,72 @@
1
1
  <% content_for :page_heading do %>
2
2
  <h2>
3
- <i class="glyphicon glyphicon-large glyphicon-cog"></i>
4
- <%= t(".general_settings") %>
3
+ <%= t('.general_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(".your_blog")%></legend>
10
+ <legend><%= t('.your_blog') %></legend>
12
11
  <div class='form-group'>
13
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_blog_name"><%= t(".blog_name") %></label>
12
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_blog_name"><%= t('.blog_name') %></label>
14
13
  <div class='col-sm-8 col-md-6 col-lg-4'>
15
- <%= text_field(:setting, :blog_name, {:class => 'form-control', :size => this_blog.blog_name.length }) %>
14
+ <%= text_field(:setting, :blog_name, class: 'form-control', size: this_blog.blog_name.length) %>
16
15
  </div>
17
16
  </div>
18
17
  <div class='form-group'>
19
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_blog_subtitle"><%= t(".blog_subtitle") %></label>
18
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_blog_subtitle"><%= t('.blog_subtitle') %></label>
20
19
  <div class='col-sm-8 col-md-6 col-lg-4'>
21
- <%= text_field(:setting, :blog_subtitle, {:class => 'form-control', :size => this_blog.blog_subtitle.length}) %>
20
+ <%= text_field(:setting, :blog_subtitle, class: 'form-control', size: this_blog.blog_subtitle.length) %>
22
21
  </div>
23
22
  </div>
24
23
  <div class='form-group'>
25
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_base_url"><%= t(".blog_url") %></label>
24
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_base_url"><%= t('.blog_url') %></label>
26
25
  <div class='col-sm-8 col-md-6 col-lg-4'>
27
- <%= text_field(:setting, :base_url, {:size => this_blog.base_url.length, :class => 'form-control'}) %>
26
+ <%= text_field(:setting, :base_url, size: this_blog.base_url.length, class: 'form-control') %>
28
27
  </div>
29
28
  </div>
30
29
  <div class='form-group'>
31
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_lang"><%= t(".language") %></label>
30
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_lang"><%= t('.language') %></label>
32
31
  <div class='col-sm-8 col-md-6 col-lg-4'>
33
32
  <select name="setting[lang]" id='setting_lang' class='form-control'>
34
- <% langs = Hash[PublifyCore::Lang::LIST.map{|l| [t("langs.#{l}"), l]}]%>
33
+ <% langs = Hash[PublifyCore::Lang::LIST.map { |l| [t("langs.#{l}"), l] }] %>
35
34
  <%= options_for_select(langs, this_blog.lang) %>
36
35
  </select>
37
36
  </div>
38
37
  </div>
39
38
  <div class='form-group'>
40
- <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".users") %></label>
39
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.users') %></label>
41
40
  <div class="col-sm-8 col-md-6 col-lg-4">
42
41
  <div class='checkbox'>
43
42
  <label for="setting_allow_signup">
44
43
  <%= check_box(:setting, :allow_signup) %>
45
- <%= t(".allow_users_to_register")%>
44
+ <%= t('.allow_users_to_register') %>
46
45
  </label>
47
46
  </div>
48
- <small class='help-block'><%= t(".explain_allow_users_to_register_html") %></small>
47
+ <small class='help-block'><%= t('.explain_allow_users_to_register_html') %></small>
49
48
  </div>
50
49
  </div>
51
50
  <div class='form-group'>
52
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_email_from"><%= t(".source_email") %></label>
51
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_email_from"><%= t('.source_email') %></label>
53
52
  <div class='col-sm-8 col-md-6 col-lg-4'>
54
- <%= text_field(:setting, :email_from, { :class => 'form-control'}) %>
55
- <small class='help-block'><%= t(".email_address_used_to_notify") %></small>
53
+ <%= text_field(:setting, :email_from, class: 'form-control') %>
54
+ <small class='help-block'><%= t('.email_address_used_to_notify') %></small>
56
55
  </div>
57
56
  </div>
58
57
  <div class='form-group'>
59
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_admin_display_elements"><%= t(".items_to_display_in_admin_lists") %></label>
58
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_admin_display_elements"><%= t('.items_to_display_in_admin_lists') %></label>
60
59
  <div class="col-sm-2 col-md-1">
61
- <%= text_field(:setting, :admin_display_elements, {:size => 4, :class => 'form-control'}) %>
60
+ <%= text_field(:setting, :admin_display_elements, size: 4, class: 'form-control') %>
62
61
  </div>
63
62
  </div>
64
63
  </fieldset>
65
64
 
66
65
  <%= hidden_field_tag 'from', 'index' %>
67
66
  <div class='form-group'>
68
- <hr>
69
- <%= link_to(t(".cancel"), {action: 'index'}) %>
70
- <%= t(".or") %>
71
- <%= submit_tag(t(".update_settings"), class: 'btn btn-success') %>
67
+ <hr />
68
+ <%= link_to(t('.cancel'), action: 'index') %>
69
+ <%= t('.or') %>
70
+ <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>
72
71
  </div>
73
72
  <% end %>
@@ -1,69 +1,68 @@
1
1
  <% content_for :page_heading do %>
2
2
  <h2>
3
- <i class="glyphicon glyphicon-large glyphicon-cog"></i>
4
- <%= t(".write") %>
3
+ <%= t('.write') %>
5
4
  </h2>
6
5
  <% end %>
7
6
 
8
7
  <%= form_tag action: 'update' do %>
9
8
 
10
9
  <fieldset class='form-horizontal'>
11
- <legend><%= t(".publish") %></legend>
10
+ <legend><%= t('.publish') %></legend>
12
11
  <div class='form-group'>
13
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_geourl_location"><%= t(".latitude_longitude") %></label>
12
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_geourl_location"><%= t('.latitude_longitude') %></label>
14
13
  <div class='col-sm-8 col-md-6 col-lg-4'>
15
- <%= text_field(:setting, :geourl_location, { :class => 'form-control'}) %>
16
- <small class='help-block'><%= t(".display")%> <a href="http://geourl.org"><%= t(".your_geoloc") %></a> (<%= t(".example") %>: <tt>47.774,-122.201</tt>)</small>
14
+ <%= text_field(:setting, :geourl_location, class: 'form-control') %>
15
+ <small class='help-block'><%= t('.display') %> <a href="http://geourl.org"><%= t('.your_geoloc') %></a> (<%= t('.example') %>: <tt>47.774,-122.201</tt>)</small>
17
16
  </div>
18
17
  </div>
19
18
  </fieldset>
20
19
 
21
20
  <fieldset class='form-horizontal'>
22
- <legend><%= t(".media") %></legend>
21
+ <legend><%= t('.media') %></legend>
23
22
  <div class='form-group'>
24
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_image_thumb_size"><%= t(".image_thumbnail_size") %></label>
23
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_image_thumb_size"><%= t('.image_thumbnail_size') %></label>
25
24
  <div class='col-sm-2 col-md-1'>
26
- <%= text_field(:setting, :image_thumb_size, { :class => 'form-control'}) %>
25
+ <%= text_field(:setting, :image_thumb_size, class: 'form-control') %>
27
26
  </div>
28
27
  </div>
29
28
  <div class='form-group'>
30
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_image_medium_size"><%= t(".image_medium_size") %></label>
29
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_image_medium_size"><%= t('.image_medium_size') %></label>
31
30
  <div class='col-sm-2 col-md-1'>
32
- <%= text_field(:setting, :image_medium_size, { :class => 'form-control'}) %>
31
+ <%= text_field(:setting, :image_medium_size, class: 'form-control') %>
33
32
  </div>
34
33
  </div>
35
34
  <div class='form-group'>
36
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="image_avatar_size"><%= t(".avatar_size") %></label>
35
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="image_avatar_size"><%= t('.avatar_size') %></label>
37
36
  <div class='col-sm-2 col-md-1'>
38
- <%= text_field(:setting, :image_avatar_size, { :class => 'form-control'}) %>
37
+ <%= text_field(:setting, :image_avatar_size, class: 'form-control') %>
39
38
  </div>
40
39
  </div>
41
40
  </fieldset>
42
41
 
43
42
  <fieldset class='form-horizontal'>
44
- <legend><%= t(".publish_on_twitter") %></legend>
43
+ <legend><%= t('.publish_on_twitter') %></legend>
45
44
  <% unless twitter_available?(this_blog, current_user) %>
46
45
  <%= render 'admin/shared/twitter_alert' %>
47
46
  <% end %>
48
47
  <div class='form-group'>
49
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_twitter_consumer_key"><%= t(".twitter_consumer_key") %></label>
48
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_twitter_consumer_key"><%= t('.twitter_consumer_key') %></label>
50
49
  <div class='col-sm-8 col-md-6 col-lg-4'>
51
- <%= text_field(:setting, :twitter_consumer_key, { :class => 'form-control'}) %>
50
+ <%= text_field(:setting, :twitter_consumer_key, class: 'form-control') %>
52
51
  </div>
53
52
  </div>
54
53
  <div class='form-group'>
55
- <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_twitter_consumer_secret"><%= t(".twitter_consumer_secret") %></label>
54
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_twitter_consumer_secret"><%= t('.twitter_consumer_secret') %></label>
56
55
  <div class='col-sm-8 col-md-6 col-lg-4'>
57
- <%= text_field(:setting, :twitter_consumer_secret, { :class => 'form-control'}) %>
56
+ <%= text_field(:setting, :twitter_consumer_secret, class: 'form-control') %>
58
57
  </div>
59
58
  </div>
60
59
  </fieldset>
61
60
 
62
61
  <%= hidden_field_tag 'from', 'write' %>
63
62
  <div class='form-group'>
64
- <hr>
65
- <%= link_to(t(".cancel"), {action: 'index'}) %>
66
- <%= t(".or") %>
67
- <%= submit_tag(t(".update_settings"), class: 'btn btn-success') %>
63
+ <hr />
64
+ <%= link_to(t('.cancel'), action: 'index') %>
65
+ <%= t('.or') %>
66
+ <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>
68
67
  </div>
69
68
  <% end %>
@@ -1,4 +1,4 @@
1
- <% className = form_action.delete(:class) %>
2
- <%= form_tag(form_action, id: "#{form_type}_form", enctype: "multipart/form-data", class: className) do %>
3
- <%= render partial: "form" %>
1
+ <% class_name = form_action.delete(:class) %>
2
+ <%= form_tag(form_action, id: "#{form_type}_form", enctype: 'multipart/form-data', class: class_name) do %>
3
+ <%= render partial: 'form' %>
4
4
  <% end %>
@@ -1,6 +1,6 @@
1
1
  <nav class='navbar navbar-default navbar-fixed-top' role="navigation">
2
2
  <div class="navbar-header">
3
- <%= link_to content_tag(:span, '', class: 'glyphicon glyphicon-home'), {controller: 'admin/dashboard'}, {class: "navbar-brand"} %>
3
+ <%= link_to t(".home"), { controller: 'admin/dashboard' }, { class: 'navbar-brand' } %>
4
4
  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#sidebar-top">
5
5
  <span class="sr-only">Toggle navigation</span>
6
6
  <span class="icon-bar"></span>
@@ -18,11 +18,11 @@
18
18
  </a>
19
19
  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
20
20
  <%= menu_item(t('.all_articles'), admin_content_index_path) %>
21
- <%= menu_item(t('.new_article'), new_admin_content_path) %>
22
- <%= menu_item(t('.feedback'), admin_feedback_index_path) %>
23
- <%= menu_item(t('.tags'), admin_tags_path) %>
24
- <%= menu_item(t('.article_types'),admin_post_types_path) %>
25
- <%= menu_item(t('.redirects'), admin_redirects_path) %>
21
+ <%= menu_item(t('.new_article'), new_admin_content_path) %>
22
+ <%= menu_item(t('.feedback'), admin_feedback_index_path) %>
23
+ <%= menu_item(t('.tags'), admin_tags_path) %>
24
+ <%= menu_item(t('.article_types'), admin_post_types_path) %>
25
+ <%= menu_item(t('.redirects'), admin_redirects_path) %>
26
26
  </ul>
27
27
  </li>
28
28
  <% end %>
@@ -37,7 +37,7 @@
37
37
  </a>
38
38
  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
39
39
  <%= menu_item(t('.all_pages'), admin_pages_path) %>
40
- <%= menu_item(t('.new_page'), new_admin_page_path) %>
40
+ <%= menu_item(t('.new_page'), new_admin_page_path) %>
41
41
  </ul>
42
42
  </li>
43
43
  <% end %>
@@ -51,7 +51,7 @@
51
51
  <b class="caret"></b>
52
52
  </a>
53
53
  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
54
- <%= menu_item(t('.choose_theme'), admin_themes_path) %>
54
+ <%= menu_item(t('.choose_theme'), admin_themes_path) %>
55
55
  <%= menu_item(t('.customize_sidebar'), admin_sidebar_index_path) %>
56
56
  </ul>
57
57
  </li>
@@ -64,10 +64,10 @@
64
64
  </a>
65
65
  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
66
66
  <%= menu_item(t('.general_settings'), admin_settings_path) %>
67
- <%= menu_item(t('.write'), write_admin_settings_path) %>
68
- <%= menu_item(t('.display'), display_admin_settings_path) %>
69
- <%= menu_item(t('.feedback'), feedback_admin_settings_path) %>
70
- <%= menu_item(t('.manage_users'), admin_users_path) %>
67
+ <%= menu_item(t('.write'), write_admin_settings_path) %>
68
+ <%= menu_item(t('.display'), display_admin_settings_path) %>
69
+ <%= menu_item(t('.feedback'), feedback_admin_settings_path) %>
70
+ <%= menu_item(t('.manage_users'), admin_users_path) %>
71
71
  </ul>
72
72
  </li>
73
73
  <% end %>
@@ -79,8 +79,8 @@
79
79
  </a>
80
80
  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
81
81
  <%= menu_item(t('.global_seo_settings'), admin_seo_path(section: 'general')) %>
82
- <%= menu_item(t('.permalinks'), admin_seo_path(section: 'permalinks')) %>
83
- <%= menu_item(t('.titles'), admin_seo_path(section: 'titles')) %>
82
+ <%= menu_item(t('.permalinks'), admin_seo_path(section: 'permalinks')) %>
83
+ <%= menu_item(t('.titles'), admin_seo_path(section: 'titles')) %>
84
84
  </ul>
85
85
  </li>
86
86
  <% end %>
@@ -88,32 +88,32 @@
88
88
  <ul class='nav navbar-nav pull-right'>
89
89
  <li class='dropdown'>
90
90
  <a class="dropdown-toggle" data-toggle="dropdown" href="#">
91
- <%= t(".logged_in_as", login: current_user.display_name) %>
91
+ <%= t('.logged_in_as', login: current_user.display_name) %>
92
92
  <b class="caret"></b>
93
93
  </a>
94
94
  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
95
- <li><%= link_to t(".profile"), { :controller => 'admin/profiles', :action => 'index'} %></li>
95
+ <li><%= link_to t('.profile'), controller: 'admin/profiles', action: 'index' %></li>
96
96
  <li role="presentation" class="divider"></li>
97
- <li><%= link_to t(".documentation"), "https://github.com/fdv/publify/wiki" %></li>
98
- <li><%= link_to t(".report_a_bug"), "https://github.com/fdv/publify/issues" %></li>
99
- <li><%= link_to t(".in_page_plugins"), "https://github.com/fdv/publify/wiki/In-Page-Plugins" %></li>
100
- <li><%= link_to t(".sidebar_plugins"), "https://github.com/fdv/publify/wiki/Sidebar-plugins" %></li>
97
+ <li><%= link_to t('.documentation'), 'https://github.com/fdv/publify/wiki' %></li>
98
+ <li><%= link_to t('.report_a_bug'), 'https://github.com/fdv/publify/issues' %></li>
99
+ <li><%= link_to t('.in_page_plugins'), 'https://github.com/fdv/publify/wiki/In-Page-Plugins' %></li>
100
+ <li><%= link_to t('.sidebar_plugins'), 'https://github.com/fdv/publify/wiki/Sidebar-plugins' %></li>
101
101
  <li role="presentation" class="divider"></li>
102
- <li><%= link_to t(".logout_html"), destroy_user_session_path, method: :delete %></li>
102
+ <li><%= link_to t('.logout_html'), destroy_user_session_path, method: :delete %></li>
103
103
  </ul>
104
104
  </li>
105
105
  </ul>
106
106
  <ul class='nav navbar-nav pull-right'>
107
107
  <li class='dropdown'>
108
108
  <a class="dropdown-toggle" data-toggle="dropdown" href="#">
109
- <%= t(".new")%>
109
+ <%= t('.new') %>
110
110
  <b class="caret"></b>
111
111
  </a>
112
112
  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
113
- <li><%= link_to(t(".new_article"), {controller: 'content', action: 'new'}) %></li>
114
- <li><%= link_to(t(".new_page"), {controller: 'pages', actions: 'new'}) %></li>
115
- <li><%= link_to(t(".new_media"), {controller: 'resources', action: 'index'}) %></li>
116
- <li><%= link_to(t(".new_note"), {controller: 'notes'}) %></li>
113
+ <li><%= link_to(t('.new_article'), controller: 'content', action: 'new') %></li>
114
+ <li><%= link_to(t('.new_page'), controller: 'pages', actions: 'new') %></li>
115
+ <li><%= link_to(t('.new_media'), controller: 'resources', action: 'index') %></li>
116
+ <li><%= link_to(t('.new_note'), controller: 'notes') %></li>
117
117
  </ul>
118
118
  </li>
119
119
  </ul>