publify_core 9.0.0.pre6 → 9.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (176) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +44 -0
  3. data/README.md +9 -0
  4. data/app/controllers/admin/base_controller.rb +0 -6
  5. data/app/controllers/admin/content_controller.rb +34 -15
  6. data/app/controllers/admin/dashboard_controller.rb +4 -9
  7. data/app/controllers/admin/feedback_controller.rb +1 -0
  8. data/app/controllers/admin/notes_controller.rb +1 -1
  9. data/app/controllers/admin/pages_controller.rb +3 -7
  10. data/app/controllers/admin/sidebar_controller.rb +1 -0
  11. data/app/controllers/admin/tags_controller.rb +1 -0
  12. data/app/controllers/articles_controller.rb +50 -55
  13. data/app/controllers/comments_controller.rb +2 -3
  14. data/app/controllers/content_controller.rb +8 -17
  15. data/app/controllers/feedback_controller.rb +5 -39
  16. data/app/controllers/notes_controller.rb +1 -3
  17. data/app/controllers/setup_controller.rb +14 -18
  18. data/app/controllers/tags_controller.rb +13 -15
  19. data/app/controllers/theme_controller.rb +7 -5
  20. data/app/controllers/xml_controller.rb +11 -59
  21. data/app/helpers/authors_helper.rb +2 -2
  22. data/app/helpers/base_helper.rb +11 -4
  23. data/app/helpers/xml_helper.rb +2 -2
  24. data/app/jobs/application_job.rb +2 -0
  25. data/app/models/archives_sidebar.rb +8 -11
  26. data/app/models/article.rb +53 -72
  27. data/app/models/article/factory.rb +1 -1
  28. data/app/models/blog.rb +17 -40
  29. data/app/models/comment.rb +4 -3
  30. data/app/models/content.rb +18 -21
  31. data/app/models/content_base.rb +0 -5
  32. data/app/models/feedback.rb +76 -54
  33. data/app/models/meta_sidebar.rb +1 -0
  34. data/app/models/note.rb +7 -0
  35. data/app/models/page.rb +10 -5
  36. data/app/models/ping.rb +0 -113
  37. data/app/models/post_type.rb +1 -0
  38. data/app/models/redirect.rb +1 -1
  39. data/app/models/resource.rb +1 -19
  40. data/app/models/sidebar.rb +1 -1
  41. data/app/models/static_sidebar.rb +1 -0
  42. data/app/models/tag.rb +13 -9
  43. data/app/models/tag_sidebar.rb +4 -4
  44. data/app/models/trackback.rb +1 -8
  45. data/app/models/trigger.rb +1 -15
  46. data/app/models/user.rb +2 -9
  47. data/app/uploaders/resource_uploader.rb +33 -2
  48. data/app/views/accounts/confirm.html.erb +0 -1
  49. data/app/views/admin/content/_article_list.html.erb +1 -1
  50. data/app/views/admin/content/_form.html.erb +3 -7
  51. data/app/views/admin/pages/_form.html.erb +2 -2
  52. data/app/views/admin/seo/_general.html.erb +33 -28
  53. data/app/views/admin/seo/_permalinks.html.erb +2 -2
  54. data/app/views/admin/seo/_titles.html.erb +36 -36
  55. data/app/views/admin/settings/display.html.erb +20 -27
  56. data/app/views/admin/settings/feedback.html.erb +44 -51
  57. data/app/views/admin/settings/index.html.erb +14 -14
  58. data/app/views/admin/settings/write.html.erb +12 -30
  59. data/app/views/admin/tags/_index_and_form.html.erb +1 -1
  60. data/app/views/articles/_archives_article.html.erb +9 -0
  61. data/app/views/articles/_article.html.erb +8 -6
  62. data/app/views/articles/_article_collection.html.erb +1 -1
  63. data/app/views/articles/_article_excerpt.html.erb +10 -8
  64. data/app/views/articles/_article_links.html.erb +4 -2
  65. data/app/views/articles/_comment_list.html.erb +5 -5
  66. data/app/views/articles/_full_article_content.html.erb +4 -2
  67. data/app/views/articles/archives.html.erb +10 -20
  68. data/app/views/articles/feedback_atom_feed.atom.builder +5 -5
  69. data/app/views/articles/feedback_rss_feed.rss.builder +12 -13
  70. data/app/views/articles/index_atom_feed.atom.builder +3 -4
  71. data/app/views/articles/index_rss_feed.rss.builder +9 -10
  72. data/app/views/articles/read.html.erb +5 -31
  73. data/app/views/articles/search.html.erb +1 -1
  74. data/app/views/articles/trackback.xml.builder +1 -1
  75. data/app/views/authors/show.html.erb +11 -21
  76. data/app/views/authors/show_atom_feed.atom.builder +3 -4
  77. data/app/views/authors/show_rss_feed.rss.builder +9 -10
  78. data/app/views/comments/_comment.html.erb +17 -16
  79. data/app/views/feedback/index.atom.builder +7 -0
  80. data/app/views/feedback/index.rss.builder +19 -0
  81. data/app/views/notes/_note.html.erb +16 -15
  82. data/app/views/notes/index.html.erb +1 -1
  83. data/app/views/notification_mailer/_mail_footer.html.erb +0 -2
  84. data/app/views/notification_mailer/_mail_header.html.erb +2 -0
  85. data/app/views/notification_mailer/article.html.erb +4 -3
  86. data/app/views/notification_mailer/comment.html.erb +7 -6
  87. data/app/views/notification_mailer/notif_user.html.erb +3 -8
  88. data/app/views/setup/index.html.erb +4 -0
  89. data/app/views/shared/_atom_header.atom.builder +3 -3
  90. data/app/views/shared/_atom_item_article.atom.builder +26 -19
  91. data/app/views/shared/_atom_item_comment.atom.builder +3 -5
  92. data/app/views/shared/_atom_item_trackback.atom.builder +3 -4
  93. data/app/views/shared/_page_header.html.erb +1 -1
  94. data/app/views/shared/_rss_item_article.rss.builder +10 -15
  95. data/app/views/shared/_rss_item_comment.rss.builder +1 -2
  96. data/app/views/shared/_rss_item_trackback.rss.builder +1 -1
  97. data/app/views/tags/index.html.erb +2 -2
  98. data/app/views/xml/sitemap.googlesitemap.builder +7 -0
  99. data/config/initializers/mime_types.rb +0 -1
  100. data/config/locales/da.yml +8 -37
  101. data/config/locales/de.yml +7 -36
  102. data/config/locales/en.yml +7 -36
  103. data/config/locales/es-MX.yml +8 -37
  104. data/config/locales/fr.yml +7 -36
  105. data/config/locales/he.yml +4 -33
  106. data/config/locales/it.yml +7 -36
  107. data/config/locales/ja.yml +5 -34
  108. data/config/locales/lt.yml +7 -36
  109. data/config/locales/nb-NO.yml +7 -36
  110. data/config/locales/nl.yml +9 -38
  111. data/config/locales/pl.yml +8 -37
  112. data/config/locales/pt-BR.yml +8 -37
  113. data/config/locales/ro.yml +9 -38
  114. data/config/locales/ru.yml +7 -36
  115. data/config/locales/zh-CN.yml +6 -35
  116. data/config/locales/zh-TW.yml +7 -36
  117. data/config/routes.rb +6 -28
  118. data/db/migrate/113_initial_schema.rb +191 -191
  119. data/db/migrate/114_fixes_buggy_articles_and_notes.rb +6 -7
  120. data/db/migrate/115_drops_categories_for_tags.rb +3 -3
  121. data/db/migrate/20150207131657_add_missing_indexes.rb +1 -1
  122. data/db/migrate/20150807134129_simplify_redirect_relations.rb +1 -1
  123. data/db/migrate/20150808052637_add_blog_ids.rb +3 -5
  124. data/db/migrate/20150808191127_add_blog_id_to_redirects.rb +1 -1
  125. data/db/migrate/20150810094754_add_blog_id_to_tags.rb +1 -1
  126. data/db/migrate/20160108111120_add_devise_to_users.rb +3 -3
  127. data/db/migrate/20160108184201_move_last_connection_to_last_sign_in_at.rb +1 -1
  128. data/db/migrate/20160110094906_remove_profiles_rights.rb +1 -1
  129. data/db/migrate/20160605103918_replace_profile_id_with_string.rb +1 -3
  130. data/db/migrate/20160605154632_remove_profiles.rb +2 -2
  131. data/db/migrate/20160701061851_demand_blog_id_on_contents.rb +1 -1
  132. data/db/migrate/20160701062604_add_blog_id_to_resources.rb +1 -1
  133. data/db/migrate/20170528093024_move_resources_to_content.rb +5 -0
  134. data/db/migrate/20170528094923_move_tags_to_content.rb +6 -0
  135. data/db/migrate/20170528201606_remove_separate_published_flag.rb +5 -0
  136. data/db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb +6 -0
  137. data/db/migrate/20170702105201_remove_published_at_from_feedback.rb +5 -0
  138. data/db/seeds.rb +1 -1
  139. data/lib/publify_core.rb +0 -1
  140. data/lib/publify_core/version.rb +1 -1
  141. data/lib/publify_guid.rb +1 -1
  142. data/lib/publify_time.rb +2 -2
  143. data/lib/sidebar_field.rb +19 -12
  144. data/lib/transforms.rb +1 -0
  145. metadata +102 -66
  146. data/.gitignore +0 -13
  147. data/.rspec +0 -2
  148. data/.rubocop.yml +0 -84
  149. data/.rubocop_todo.yml +0 -148
  150. data/.travis.yml +0 -27
  151. data/Gemfile +0 -17
  152. data/README.rdoc +0 -3
  153. data/Rakefile +0 -35
  154. data/app/assets/stylesheets/publify_core/.keep +0 -0
  155. data/app/controllers/.keep +0 -0
  156. data/app/controllers/admin/migrations_controller.rb +0 -19
  157. data/app/controllers/concerns/.keep +0 -0
  158. data/app/controllers/trackbacks_controller.rb +0 -36
  159. data/app/helpers/.keep +0 -0
  160. data/app/mailers/.keep +0 -0
  161. data/app/models/.keep +0 -0
  162. data/app/models/article/states.rb +0 -179
  163. data/app/models/concerns/.keep +0 -0
  164. data/app/models/feedback/states.rb +0 -256
  165. data/app/services/migrator.rb +0 -25
  166. data/app/views/.keep +0 -0
  167. data/app/views/comments/index.html.erb +0 -1
  168. data/app/views/comments/index_atom_feed.atom.builder +0 -8
  169. data/app/views/comments/index_rss_feed.rss.builder +0 -20
  170. data/app/views/trackbacks/index_atom_feed.atom.builder +0 -7
  171. data/app/views/trackbacks/index_rss_feed.rss.builder +0 -20
  172. data/app/views/trackbacks/trackback.xml.builder +0 -4
  173. data/app/views/xml/feed.googlesitemap.builder +0 -7
  174. data/app/views/xml/rsd.rsd.builder +0 -8
  175. data/lib/stateful.rb +0 -106
  176. data/publify_core.gemspec +0 -54
data/app/views/admin/settings/display.html.erb CHANGED
@@ -10,26 +10,26 @@
10
10
  <fieldset class='form-horizontal'>
11
11
  <legend><%= t('.publishing_options')%></legend>
12
12
  <div class='form-group'>
13
- <label class='control-label col-sm-2' for="setting_limit_article_display"><%= t('.display') %> </label>
14
- <div class='col-sm-1'>
13
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_limit_article_display"><%= t('.display') %> </label>
14
+ <div class='col-sm-2 col-md-1'>
15
15
  <%= text_field(:setting, :limit_article_display, {:size => 4, :class => 'form-control'}) %>
16
16
  </div>
17
- <div class='pull-left'>
17
+ <div class='col-sm-6 col-md-5 col-lg-3'>
18
18
  <span class='help-block'><%= t('.default_article_show') %></span>
19
19
  </div>
20
20
  </div>
21
21
  <div class='form-group'>
22
- <label class='control-label col-sm-2' for="setting_limit_archives_display"><%= t('.display') %> </label>
23
- <div class='col-sm-1'>
22
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_limit_archives_display"><%= t('.display') %> </label>
23
+ <div class='col-sm-2 col-md-1'>
24
24
  <%= text_field(:setting, :limit_archives_display, {:size => 4, :class => 'form-control'}) %>
25
25
  </div>
26
- <div class='pull-left'>
26
+ <div class='col-sm-6 col-md-5 col-lg-3'>
27
27
  <span class='help-block'><%= t('.default_archives_show') %></span>
28
28
  </div>
29
29
  </div>
30
30
  <div class='form-group'>
31
- <label class='control-label col-sm-2'><%= t('.statuses') %></label>
32
- <div class='col-sm-5'>
31
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.statuses') %></label>
32
+ <div class='col-sm-8 col-md-6 col-lg-4'>
33
33
  <div class='checkbox'>
34
34
  <label>
35
35
  <%= check_box(:setting, :statuses_in_timeline) %>
@@ -39,8 +39,8 @@
39
39
  </div>
40
40
  </div>
41
41
  <div class='form-group'>
42
- <label class='control-label col-sm-2'><%= t('.date_format') %></label>
43
- <div class='col-sm-5'>
42
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.date_format') %></label>
43
+ <div class='col-sm-8 col-md-6 col-lg-4'>
44
44
  <%= select(:setting, :date_format, {
45
45
  Time.now.strftime('%d/%m/%Y') => '%d/%m/%Y',
46
46
  Time.now.strftime('%m/%d/%Y') => '%m/%d/%Y',
@@ -52,8 +52,8 @@
52
52
  </div>
53
53
  </div>
54
54
  <div class='form-group'>
55
- <label class='control-label col-sm-2'><%= t('.time_format') %></label>
56
- <div class='col-sm-5'>
55
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.time_format') %></label>
56
+ <div class='col-sm-8 col-md-6 col-lg-4'>
57
57
  <%= select(:setting, :time_format, {
58
58
  Time.now.strftime('%Hh%M') => '%Hh%M',
59
59
  Time.now.strftime('%H:%M') => '%H:%M',
@@ -62,8 +62,8 @@
62
62
  </div>
63
63
  </div>
64
64
  <div class='form-group'>
65
- <label class='control-label col-sm-2' for="setting_custom_url_shortener"><%= t('.custom_url') %></label>
66
- <div class='col-sm-5'>
65
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_custom_url_shortener"><%= t('.custom_url') %></label>
66
+ <div class='col-sm-8 col-md-6 col-lg-4'>
67
67
  <%= text_field(:setting, :custom_url_shortener, { :class => 'form-control'}) %>
68
68
  <small class='help block'><%= t('.custom_url_help') %></small>
69
69
  </div>
@@ -73,17 +73,17 @@
73
73
  <fieldset class='form-horizontal'>
74
74
  <legend><%= t('.feed_settings') %></legend>
75
75
  <div class='form-group'>
76
- <label class='control-label col-sm-2' for="setting_limit_rss_display"><%= t('.display') %> </label>
77
- <div class='col-sm-1'>
76
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_limit_rss_display"><%= t('.display') %> </label>
77
+ <div class='col-sm-2 col-md-1'>
78
78
  <%= text_field(:setting, :limit_rss_display, {:size => 4, :class => 'form-control'}) %>
79
79
  </div>
80
- <div class='pull-left'>
81
- <span class='help-block'><%= t('.default_feed_show') %></span>
80
+ <div class='col-sm-6 col-md-5 col-lg-3'>
81
+ <span class='help-block'><%= t('.default_feed_show') %></span>
82
82
  </div>
83
83
  </div>
84
84
  <div class='form-group'>
85
- <label class='control-label col-sm-2'><%= t('.feed_articles') %></label>
86
- <div class='col-sm-5'>
85
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.feed_articles') %></label>
86
+ <div class='col-sm-8 col-md-6 col-lg-4'>
87
87
  <div class='checkbox'>
88
88
  <label for="setting_hide_extended_on_rss">
89
89
  <%= check_box(:setting, :hide_extended_on_rss) %>
@@ -92,13 +92,6 @@
92
92
  </div>
93
93
  </div>
94
94
  </div>
95
- <div class='form-group'>
96
- <label class='control-label col-sm-2' for="setting_feedburner_url"><%= t('.feedburner_id') %></label>
97
- <div class='col-sm-5'>
98
- <%= text_field(:setting, :feedburner_url, :class => 'form-control') %>
99
- <small class='help-block'><%= t('.feedburner_help') %></small>
100
- </div>
101
- </div>
102
95
  </fieldset>
103
96
  <%= hidden_field_tag 'from', 'display' %>
104
97
  <div class='form-group'>
data/app/views/admin/settings/feedback.html.erb CHANGED
@@ -9,8 +9,8 @@
9
9
  <fieldset class='form-horizontal'>
10
10
  <legend><%= t(".feedback")%></legend>
11
11
  <div class='form-group'>
12
- <label class='control-label col-sm-2'><%= t(".comments") %></label>
13
- <div class='col-sm-5'>
12
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".comments") %></label>
13
+ <div class='col-sm-8 col-md-6 col-lg-4'>
14
14
  <div class='checkbox'>
15
15
  <label for="setting_default_allow_comments">
16
16
  <%= check_box(:setting, :default_allow_comments) %>
@@ -18,42 +18,25 @@
18
18
  </label>
19
19
  </div>
20
20
  <div class='checkbox'>
21
- <label for="setting_default_moderate_comments"><%= t(".enable_feedback_moderation") %>
22
- <%= check_box(:setting, :default_moderate_comments) %>
21
+ <label for="setting_default_moderate_comments">
22
+ <%= check_box(:setting, :default_moderate_comments) %>
23
+ <%= t(".enable_feedback_moderation") %>
23
24
  </label>
24
25
  <small class='help-block'><%= t(".explain_feedback_moderation") %></small>
25
26
  </div>
26
27
  </div>
27
28
  </div>
28
29
  <div class='form-group'>
29
- <label class='control-label col-sm-2'><%= t(".trackbacks") %></label>
30
- <div class='col-sm-5'>
31
- <div class='checkbox'>
32
- <label for="setting_default_allow_pings">
33
- <%= check_box(:setting, :default_allow_pings) %>
34
- <%= t(".enable_trackbacks_by_default") %>
35
- </label>
36
- </div>
37
- <div class='checkbox'>
38
- <label for="setting_global_pings_disable">
39
- <%= check_box(:setting, :global_pings_disable) %>
40
- <%= t(".disable_trackbacks_sitewide") %>
41
- </label>
42
- <small class='help-block'><%= t(".explain_disable_trackbacks") %></small>
43
- </div>
44
- </div>
45
- </div>
46
- <div class='form-group'>
47
- <label class='control-label col-sm-2' for="comment_text_filter"><%= t(".comments_filter") %></label>
48
- <div class='col-sm-5'>
30
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="comment_text_filter"><%= t(".comments_filter") %></label>
31
+ <div class='col-sm-8 col-md-6 col-lg-4'>
49
32
  <select name="setting[comment_text_filter]" id="comment_text_filter" class='form-control'>
50
33
  <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.comment_text_filter) %>
51
34
  </select>
52
35
  </div>
53
36
  </div>
54
37
  <div class='form-group'>
55
- <label class='control-label col-sm-2' for="setting_plugin_avatar"><%= t(".avatars_provider") %></label>
56
- <div class='col-sm-5'>
38
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_plugin_avatar"><%= t(".avatars_provider") %></label>
39
+ <div class='col-sm-8 col-md-6 col-lg-4'>
57
40
  <select name="setting[plugin_avatar]" id="setting_plugin_avatar" class='form-control'>
58
41
  <%= options_for_select plugin_options(:avatar).push([t(".none"),'']), this_blog.plugin_avatar %>
59
42
  </select>
@@ -64,50 +47,60 @@
64
47
  <fieldset class='form-horizontal'>
65
48
  <legend><%= t(".spam") %></legend>
66
49
  <div class='form-group'>
67
- <label class='control-label col-sm-2'><%= t(".spam_protection") %></label>
68
- <div class='col-sm-5'>
50
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".spam_protection") %></label>
51
+ <div class='col-sm-8 col-md-6 col-lg-4'>
69
52
  <div class='checkbox'>
70
- <label for="setting_sp_global"><%= t(".enable_spam_protection")%>
71
- <%= check_box(:setting, :sp_global) %>
53
+ <label for="setting_sp_global">
54
+ <%= check_box(:setting, :sp_global) %>
55
+ <%= t(".enable_spam_protection")%>
72
56
  </label>
73
57
  <small class='help-block'><%= t(".explain_spam_protection") %>.</small>
74
58
  </div>
75
59
  </div>
76
60
  </div>
77
61
  <div class='form-group'>
78
- <label class='control-label col-sm-2' for="setting_sp_akismet_key"><%= t(".askimet_key") %></label>
79
- <div class='col-sm-5'>
62
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_sp_akismet_key"><%= t(".askimet_key") %></label>
63
+ <div class='col-sm-8 col-md-6 col-lg-4'>
80
64
  <%= text_field(:setting, :sp_akismet_key, {:class => 'form-control'}) %>
81
65
  <small class='help-block'><%= t(".explain_spamfiltering_html") %>.</small>
82
66
  </div>
83
67
  </div>
84
68
  <div class='form-group'>
85
- <label class='control-label col-sm-2' for="setting_sp_article_auto_close"><%= t(".disable_comments_after") %></label>
86
- <div class='col-sm-1'>
87
- <%= text_field(:setting, :sp_article_auto_close, {:size => 4, :class => 'form-control'}) %>
88
- </div>
89
- <div class='pull-left'>
90
- <span class='help-block'><%= t(".days") %></span>
91
- </div>
92
- <div class='col-sm-10'>
93
- <small class='help-block'><%= t(".set_to_0_to_never_disable_comments") %>.</small>
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>
70
+ <div class='col-sm-8 col-md-6 col-lg-4'>
71
+ <div class="row">
72
+ <div class='col-sm-3 col-md-2 col-lg-3'>
73
+ <%= text_field(:setting, :sp_article_auto_close, {:size => 4, :class => 'form-control'}) %>
74
+ </div>
75
+ <div class='col-sm-9 col-md-10 col-lg-9'>
76
+ <span class='help-block'><%= t(".days") %></span>
77
+ </div>
78
+ <div class='col-sm-12'>
79
+ <small class='help-block'><%= t(".set_to_0_to_never_disable_comments") %>.</small>
80
+ </div>
81
+ </div>
94
82
  </div>
95
83
  </div>
96
84
  <div class='form-group'>
97
- <label class='control-label col-sm-2' for="setting_sp_url_limit"><%= t(".max_links") %></label>
98
- <div class='col-sm-1'>
99
- <%= text_field(:setting, :sp_url_limit, {:size => 4, :class => 'form-control'}) %>
100
- </div>
101
- <div class='col-md-offset-2 col-sm-10'>
102
- <small class='help-block'><%= t(".explain_reject_comments")%>. <%= t(".set_to_0_to_never_reject_comments") %>.</small>
85
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_sp_url_limit"><%= t(".max_links") %></label>
86
+ <div class='col-sm-8 col-md-6 col-lg-4'>
87
+ <div class="row">
88
+ <div class='col-sm-3 col-md-2 col-lg-3'>
89
+ <%= text_field(:setting, :sp_url_limit, {:size => 4, :class => 'form-control'}) %>
90
+ </div>
91
+ <div class='col-sm-12'>
92
+ <small class='help-block'><%= t(".explain_reject_comments")%>. <%= t(".set_to_0_to_never_reject_comments") %>.</small>
93
+ </div>
94
+ </div>
103
95
  </div>
104
96
  </div>
105
97
  <div class='form-group'>
106
- <label class='control-label col-sm-2'><%= t(".captcha") %></label>
107
- <div class='col-sm-5'>
98
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".captcha") %></label>
99
+ <div class='col-sm-8 col-md-6 col-lg-4'>
108
100
  <div class='checkbox'>
109
- <label for="setting_use_recaptcha"><%= t(".enable_recaptcha") %>
110
- <%= check_box(:setting, :use_recaptcha) %>
101
+ <label for="setting_use_recaptcha">
102
+ <%= check_box(:setting, :use_recaptcha) %>
103
+ <%= t(".enable_recaptcha") %>
111
104
  </div>
112
105
  <small class='help-block'><%= t(".remember_to_set_your_recaptcha") %></small>
113
106
  </label>
data/app/views/admin/settings/index.html.erb CHANGED
@@ -10,26 +10,26 @@
10
10
  <fieldset class='form-horizontal'>
11
11
  <legend><%= t(".your_blog")%></legend>
12
12
  <div class='form-group'>
13
- <label class='control-label col-sm-2' for="setting_blog_name"><%= t(".blog_name") %></label>
14
- <div class='col-sm-5'>
13
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_blog_name"><%= t(".blog_name") %></label>
14
+ <div class='col-sm-8 col-md-6 col-lg-4'>
15
15
  <%= text_field(:setting, :blog_name, {:class => 'form-control', :size => this_blog.blog_name.length }) %>
16
16
  </div>
17
17
  </div>
18
18
  <div class='form-group'>
19
- <label class='control-label col-sm-2' for="setting_blog_subtitle"><%= t(".blog_subtitle") %></label>
20
- <div class='col-sm-5'>
19
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_blog_subtitle"><%= t(".blog_subtitle") %></label>
20
+ <div class='col-sm-8 col-md-6 col-lg-4'>
21
21
  <%= text_field(:setting, :blog_subtitle, {:class => 'form-control', :size => this_blog.blog_subtitle.length}) %>
22
22
  </div>
23
23
  </div>
24
24
  <div class='form-group'>
25
- <label class='control-label col-sm-2' for="setting_base_url"><%= t(".blog_url") %></label>
26
- <div class='col-sm-5'>
25
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_base_url"><%= t(".blog_url") %></label>
26
+ <div class='col-sm-8 col-md-6 col-lg-4'>
27
27
  <%= text_field(:setting, :base_url, {:size => this_blog.base_url.length, :class => 'form-control'}) %>
28
28
  </div>
29
29
  </div>
30
30
  <div class='form-group'>
31
- <label class='control-label col-sm-2' for="setting_lang"><%= t(".language") %></label>
32
- <div class='col-sm-5'>
31
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_lang"><%= t(".language") %></label>
32
+ <div class='col-sm-8 col-md-6 col-lg-4'>
33
33
  <select name="setting[lang]" id='setting_lang' class='form-control'>
34
34
  <% langs = Hash[PublifyCore::Lang::LIST.map{|l| [t("langs.#{l}"), l]}]%>
35
35
  <%= options_for_select(langs, this_blog.lang) %>
@@ -37,8 +37,8 @@
37
37
  </div>
38
38
  </div>
39
39
  <div class='form-group'>
40
- <label class='control-label col-sm-2'><%= t(".users") %></label>
41
- <div class="col-sm-5">
40
+ <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".users") %></label>
41
+ <div class="col-sm-8 col-md-6 col-lg-4">
42
42
  <div class='checkbox'>
43
43
  <label for="setting_allow_signup">
44
44
  <%= check_box(:setting, :allow_signup) %>
@@ -49,15 +49,15 @@
49
49
  </div>
50
50
  </div>
51
51
  <div class='form-group'>
52
- <label class='control-label col-sm-2' for="setting_email_from"><%= t(".source_email") %></label>
53
- <div class='col-sm-5'>
52
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_email_from"><%= t(".source_email") %></label>
53
+ <div class='col-sm-8 col-md-6 col-lg-4'>
54
54
  <%= text_field(:setting, :email_from, { :class => 'form-control'}) %>
55
55
  <small class='help-block'><%= t(".email_address_used_to_notify") %></small>
56
56
  </div>
57
57
  </div>
58
58
  <div class='form-group'>
59
- <label class='control-label col-sm-2' for="setting_admin_display_elements"><%= t(".items_to_display_in_admin_lists") %></label>
60
- <div class='col-sm-1'>
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>
60
+ <div class="col-sm-2 col-md-1">
61
61
  <%= text_field(:setting, :admin_display_elements, {:size => 4, :class => 'form-control'}) %>
62
62
  </div>
63
63
  </div>
data/app/views/admin/settings/write.html.erb CHANGED
@@ -10,26 +10,8 @@
10
10
  <fieldset class='form-horizontal'>
11
11
  <legend><%= t(".publish") %></legend>
12
12
  <div class='form-group'>
13
- <label class='control-label col-sm-2'><%= t(".trackbacks") %></label>
14
- <div class="col-sm-5">
15
- <div class='checkbox'>
16
- <label for="setting_send_outbound_pings">
17
- <%= check_box(:setting, :send_outbound_pings) %>
18
- <%= t(".send_trackbacks") %>
19
- </label>
20
- <small class='help-block'><%= t(".explain") %></small>
21
- </div>
22
- </div>
23
- </div>
24
- <div class='form-group'>
25
- <label class='control-label col-sm-2' for="setting_ping_urls"><%= t(".urls_to_ping") %></label>
26
- <div class='col-sm-5'>
27
- <%= text_area(:setting, :ping_urls, :rows => 4, :class => 'form-control') %>
28
- </div>
29
- </div>
30
- <div class='form-group'>
31
- <label class='control-label col-sm-2' for="setting_geourl_location"><%= t(".latitude_longitude") %></label>
32
- <div class='col-sm-5'>
13
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_geourl_location"><%= t(".latitude_longitude") %></label>
14
+ <div class='col-sm-8 col-md-6 col-lg-4'>
33
15
  <%= text_field(:setting, :geourl_location, { :class => 'form-control'}) %>
34
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>
35
17
  </div>
@@ -39,20 +21,20 @@
39
21
  <fieldset class='form-horizontal'>
40
22
  <legend><%= t(".media") %></legend>
41
23
  <div class='form-group'>
42
- <label class='control-label col-sm-2' for="setting_image_thumb_size"><%= t(".image_thumbnail_size") %></label>
43
- <div class='col-sm-1'>
24
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_image_thumb_size"><%= t(".image_thumbnail_size") %></label>
25
+ <div class='col-sm-2 col-md-1'>
44
26
  <%= text_field(:setting, :image_thumb_size, { :class => 'form-control'}) %>
45
27
  </div>
46
28
  </div>
47
29
  <div class='form-group'>
48
- <label class='control-label col-sm-2' for="setting_image_medium_size"><%= t(".image_medium_size") %></label>
49
- <div class='col-sm-1'>
30
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_image_medium_size"><%= t(".image_medium_size") %></label>
31
+ <div class='col-sm-2 col-md-1'>
50
32
  <%= text_field(:setting, :image_medium_size, { :class => 'form-control'}) %>
51
33
  </div>
52
34
  </div>
53
35
  <div class='form-group'>
54
- <label class='control-label col-sm-2' for="image_avatar_size"><%= t(".avatar_size") %></label>
55
- <div class='col-sm-1'>
36
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="image_avatar_size"><%= t(".avatar_size") %></label>
37
+ <div class='col-sm-2 col-md-1'>
56
38
  <%= text_field(:setting, :image_avatar_size, { :class => 'form-control'}) %>
57
39
  </div>
58
40
  </div>
@@ -64,14 +46,14 @@
64
46
  <%= render 'admin/shared/twitter_alert' %>
65
47
  <% end %>
66
48
  <div class='form-group'>
67
- <label class='control-label col-sm-2' for="setting_twitter_consumer_key"><%= t(".twitter_consumer_key") %></label>
68
- <div class='col-sm-5'>
49
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_twitter_consumer_key"><%= t(".twitter_consumer_key") %></label>
50
+ <div class='col-sm-8 col-md-6 col-lg-4'>
69
51
  <%= text_field(:setting, :twitter_consumer_key, { :class => 'form-control'}) %>
70
52
  </div>
71
53
  </div>
72
54
  <div class='form-group'>
73
- <label class='control-label col-sm-2' for="setting_twitter_consumer_secret"><%= t(".twitter_consumer_secret") %></label>
74
- <div class='col-sm-5'>
55
+ <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_twitter_consumer_secret"><%= t(".twitter_consumer_secret") %></label>
56
+ <div class='col-sm-8 col-md-6 col-lg-4'>
75
57
  <%= text_field(:setting, :twitter_consumer_secret, { :class => 'form-control'}) %>
76
58
  </div>
77
59
  </div>
data/app/views/admin/tags/_index_and_form.html.erb CHANGED
@@ -48,7 +48,7 @@
48
48
  <%= link_to tag.display_name, edit_admin_tag_path(tag), { class: 'edit' } %>
49
49
  <%= link_to content_tag(:span, '', class: 'glyphicon glyphicon-pencil'), edit_admin_tag_path(tag), { class: 'btn btn-primary btn-xs btn-action' } %>
50
50
  <%= link_to content_tag(:span, '', class: 'glyphicon glyphicon-trash'), admin_tag_path(tag), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger btn-xs btn-action' %>
51
- <%= link_to_permalink(tag, "#{tag.articles.size} <span class='glyphicon glyphicon-link'></span>".html_safe, nil, 'btn btn-success btn-xs').html_safe %>
51
+ <%= link_to_permalink(tag, "#{tag.contents.size} <span class='glyphicon glyphicon-link'></span>".html_safe, nil, 'btn btn-success btn-xs').html_safe %>
52
52
  </td>
53
53
  <td><%= tag.name %></td>
54
54
  </tr>
data/app/views/articles/_archives_article.html.erb ADDED
@@ -0,0 +1,9 @@
1
+ <%= cache article do %>
2
+ <div class="archivepost">
3
+ <%= article.published_at.mday %> -
4
+ <%= link_to_permalink(article,h(article.title)) %>
5
+ <% if !article.tags.empty? %> <%= t(".posted_in") %>
6
+ <%= safe_join(article.tags.collect {|t| link_to_permalink t,t.display_name }, ", ") %>
7
+ <% end %>
8
+ </div>
9
+ <% end %>
data/app/views/articles/_article.html.erb CHANGED
@@ -1,9 +1,11 @@
1
- <h2>
2
- <%= link_to_permalink article,article.title %>
3
- </h2>
4
- <p class="auth">
1
+ <% cache article do %>
2
+ <h2>
3
+ <%= link_to_permalink article,article.title %>
4
+ </h2>
5
+ <p class="auth">
5
6
  <%= t(".posted_by")%>
6
7
  <%= author_link(article) %>
7
8
  <%= display_date_and_time article.published_at %>
8
- </p>
9
- <%= render 'articles/protected_article_content', { :article => article } %>
9
+ </p>
10
+ <%= render 'articles/protected_article_content', { :article => article } %>
11
+ <% end %>
data/app/views/articles/_article_collection.html.erb CHANGED
@@ -5,4 +5,4 @@
5
5
  </div>
6
6
  <% end %>
7
7
 
8
- <%= paginate articles, next_label: "#{t("pagination.next_page")} &raquo;", previous_label: "&laquo; #{t('pagination.previous_page')}" %>
8
+ <%= paginate articles %>
data/app/views/articles/_article_excerpt.html.erb CHANGED
@@ -1,13 +1,15 @@
1
- <% if article.excerpt? %>
2
- <%= article.excerpt %>
3
- <div class="extended">
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
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 %>