From a026ae5e6fb6ec04d536ec45347f9168f9bf56d4 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Sun, 5 Nov 2023 21:13:33 +0100 Subject: [PATCH 1/8] Hide spinner initially with a class --- app/assets/javascripts/spinnable.js | 9 +++++++-- app/views/admin/articles/index.html.erb | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/spinnable.js b/app/assets/javascripts/spinnable.js index b0d026a0..98527bb3 100644 --- a/app/assets/javascripts/spinnable.js +++ b/app/assets/javascripts/spinnable.js @@ -1,5 +1,10 @@ // Show and hide spinners on Ajax requests. $(document).ready(function(){ - $('form.spinnable').on('ajax:before', function(evt, xhr, status){ $('#spinner').show();}) - $('form.spinnable').on('ajax:complete', function(evt, xhr, status){ $('#spinner').hide();}) + $('#spinner').hide().removeClass("hidden"); + $('form.spinnable').on('ajax:before', function(evt, xhr, status){ + $('#spinner').show(); + }); + $('form.spinnable').on('ajax:complete', function(evt, xhr, status){ + $('#spinner').hide(); + }); }); diff --git a/app/views/admin/articles/index.html.erb b/app/views/admin/articles/index.html.erb index 088fb322..9410e31e 100644 --- a/app/views/admin/articles/index.html.erb +++ b/app/views/admin/articles/index.html.erb @@ -33,7 +33,7 @@
<%= submit_tag(t('.search'), class: 'btn btn-success') %> - +

From 9d0b8c347e7549c1af5bc7a4a72a36e7edf28369 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Sun, 5 Nov 2023 21:13:46 +0100 Subject: [PATCH 2/8] Remove superfluous break --- app/views/search_sidebar/_content.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/search_sidebar/_content.html.erb b/app/views/search_sidebar/_content.html.erb index e953a451..7f14c806 100644 --- a/app/views/search_sidebar/_content.html.erb +++ b/app/views/search_sidebar/_content.html.erb @@ -7,4 +7,3 @@ <% end %> -
From 68cf5e4bd72259eaed464e0b2f839024429ef1b7 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Sat, 11 Nov 2023 11:39:09 +0100 Subject: [PATCH 3/8] Hide optional comment form fields with JavaScript This changes removes inline styles, and makes the comment form show the optional fields when JavaScript is disabled. This is a good thing since otherwise these fields could never be filled in that case. --- app/assets/javascripts/optional_field_toggle.js | 1 + app/views/articles/_comment_form.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/optional_field_toggle.js b/app/assets/javascripts/optional_field_toggle.js index f6b85516..7a43a5f1 100644 --- a/app/assets/javascripts/optional_field_toggle.js +++ b/app/assets/javascripts/optional_field_toggle.js @@ -1,4 +1,5 @@ $(document).ready(function() { + $('.optional_field').hide(); $('.optional-field-toggle').on("click", function(e){ $('.optional_field').fadeToggle(); e.preventDefault(); diff --git a/app/views/articles/_comment_form.html.erb b/app/views/articles/_comment_form.html.erb index 25ad844d..7c1edf6a 100644 --- a/app/views/articles/_comment_form.html.erb +++ b/app/views/articles/_comment_form.html.erb @@ -16,11 +16,11 @@ - +

<%= text_field 'comment', 'url' %> - +

<%= text_field 'comment', 'email' %> From 98ce17b7cbbd05dac8fbeda9942db57d586f9457 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Sat, 11 Nov 2023 11:41:09 +0100 Subject: [PATCH 4/8] Apply tag cloud styling using a class --- app/assets/stylesheets/publify.css.scss | 4 ++++ app/views/tag_sidebar/_content.html.erb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/publify.css.scss b/app/assets/stylesheets/publify.css.scss index b7270ecd..2b128f5c 100644 --- a/app/assets/stylesheets/publify.css.scss +++ b/app/assets/stylesheets/publify.css.scss @@ -28,3 +28,7 @@ .admin-tools-reveal:hover .admintools { display: block; } + +.tag-sidebar-tag-cloud { + overflow: hidden; +} diff --git a/app/views/tag_sidebar/_content.html.erb b/app/views/tag_sidebar/_content.html.erb index 987cab51..7b9f7373 100644 --- a/app/views/tag_sidebar/_content.html.erb +++ b/app/views/tag_sidebar/_content.html.erb @@ -1,7 +1,7 @@ <% unless sidebar.tags.blank? %>

<%= t('.tags') %>

-

+

<% sidebar.tags.each do |tag| %> <%= link_to tag.display_name, tag_url(tag.name) %> <% end %> From bff75ef3213cd95603494d8e4f99a161e4eb7970 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Sat, 11 Nov 2023 11:41:40 +0100 Subject: [PATCH 5/8] Ensure panel heading height using a class The original break was present to ensure the heading was high enough to contain the floating search form. Using the clearfix class achieves the same effect. --- app/views/admin/articles/index.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/admin/articles/index.html.erb b/app/views/admin/articles/index.html.erb index 9410e31e..b841c2f7 100644 --- a/app/views/admin/articles/index.html.erb +++ b/app/views/admin/articles/index.html.erb @@ -20,7 +20,7 @@

-
+
<%= select_tag('search[user_id]', options_from_collection_for_select(User.all, 'id', 'name'), prompt: t('.select_an_author'), class: 'form-control') %> @@ -36,7 +36,6 @@
-
From e92f16a1eb5f24ef1595950f7e0070f4bbe419e1 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Sat, 11 Nov 2023 11:44:22 +0100 Subject: [PATCH 6/8] Fix admin flash position without inline styling --- app/assets/stylesheets/administration_structure.css.scss | 2 +- app/views/layouts/administration.html.erb | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/administration_structure.css.scss b/app/assets/stylesheets/administration_structure.css.scss index c766e657..4ed9325f 100644 --- a/app/assets/stylesheets/administration_structure.css.scss +++ b/app/assets/stylesheets/administration_structure.css.scss @@ -1,7 +1,7 @@ /* General */ body { - padding-top: 40px; + padding-top: 60px; } footer { diff --git a/app/views/layouts/administration.html.erb b/app/views/layouts/administration.html.erb index c81847e2..554082f9 100644 --- a/app/views/layouts/administration.html.erb +++ b/app/views/layouts/administration.html.erb @@ -12,9 +12,7 @@ <%= render 'admin/shared/menu' %>
-
- <%= render 'shared/flash', flash: flash %> -
+ <%= render 'shared/flash', flash: flash %> <% if content_for?(:page_heading) %>
<%= yield :page_heading %> From e9a45963e2b7f17ae882babeffb1c96dbff2aadb Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Sun, 12 Nov 2023 13:56:58 +0100 Subject: [PATCH 7/8] Initially hide comment feedback elements using a class --- app/assets/stylesheets/publify.css.scss | 4 ++++ app/views/articles/_comment_form.html.erb | 4 ++-- app/views/articles/comment_failed.js.erb | 2 +- app/views/comments/preview.js.erb | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/publify.css.scss b/app/assets/stylesheets/publify.css.scss index 2b128f5c..34bd8cfc 100644 --- a/app/assets/stylesheets/publify.css.scss +++ b/app/assets/stylesheets/publify.css.scss @@ -32,3 +32,7 @@ .tag-sidebar-tag-cloud { overflow: hidden; } + +.hidden { + display: none; +} diff --git a/app/views/articles/_comment_form.html.erb b/app/views/articles/_comment_form.html.erb index 7c1edf6a..ba8c7365 100644 --- a/app/views/articles/_comment_form.html.erb +++ b/app/views/articles/_comment_form.html.erb @@ -1,7 +1,7 @@ <%= form_tag @article.comment_url, id: 'comment_form', remote: true do %>
- - + +
diff --git a/app/views/articles/comment_failed.js.erb b/app/views/articles/comment_failed.js.erb index 4705fa3a..136b9fe3 100644 --- a/app/views/articles/comment_failed.js.erb +++ b/app/views/articles/comment_failed.js.erb @@ -1,3 +1,3 @@ var message = "<%= j render 'articles/comment_errors', comment: @comment %>"; $('#preview').hide(); -$('#errors').hide().html(message).fadeIn(); +$('#errors').hide().removeClass("hidden").html(message).fadeIn(); diff --git a/app/views/comments/preview.js.erb b/app/views/comments/preview.js.erb index 3cfe95c6..41ab2ca3 100644 --- a/app/views/comments/preview.js.erb +++ b/app/views/comments/preview.js.erb @@ -1,3 +1,3 @@ var preview = "<%= j render 'articles/comment_preview', comment: @comment %>"; $('#errors').hide(); -$('#preview').hide().html(preview).fadeIn(); +$('#preview').hide().removeClass("hidden").html(preview).fadeIn(); From e5382f751f99e1b7464a7f0f1a6f8f7c147a5833 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Sun, 12 Nov 2023 15:24:09 +0100 Subject: [PATCH 8/8] Group tags into buckets with statically assigned sizes --- app/assets/stylesheets/publify.css.scss | 14 +++++++++++++ app/models/tag_sidebar.rb | 28 ++++++++++++++++++++++--- app/views/tag_sidebar/_content.html.erb | 2 +- spec/models/tag_sidebar_spec.rb | 2 +- 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/publify.css.scss b/app/assets/stylesheets/publify.css.scss index 34bd8cfc..f9007ae5 100644 --- a/app/assets/stylesheets/publify.css.scss +++ b/app/assets/stylesheets/publify.css.scss @@ -33,6 +33,20 @@ overflow: hidden; } +.tag-sidebar-tag-67 { font-size: 0.67em; } +.tag-sidebar-tag-75 { font-size: 0.75em; } +.tag-sidebar-tag-83 { font-size: 0.83em; } +.tag-sidebar-tag-91 { font-size: 0.91em; } +.tag-sidebar-tag-100 { font-size: 1em; } +.tag-sidebar-tag-112 { font-size: 1.12em; } +.tag-sidebar-tag-125 { font-size: 1.25em; } +.tag-sidebar-tag-137 { font-size: 1.37em; } +.tag-sidebar-tag-150 { font-size: 1.50em; } +.tag-sidebar-tag-162 { font-size: 1.62em; } +.tag-sidebar-tag-175 { font-size: 1.75em; } +.tag-sidebar-tag-187 { font-size: 1.87em; } +.tag-sidebar-tag-200 { font-size: 2em; } + .hidden { display: none; } diff --git a/app/models/tag_sidebar.rb b/app/models/tag_sidebar.rb index 9810211b..9c1c69f5 100644 --- a/app/models/tag_sidebar.rb +++ b/app/models/tag_sidebar.rb @@ -18,12 +18,34 @@ def sizes average = total.to_f / @tags.size @sizes = tags.reduce({}) do |h, tag| size = tag.content_counter.to_f / average - h.merge tag => size.clamp(2.0 / 3.0, 2) * 100 + h.merge tag => bucket(size) end end - def font_multiplier - 80 + BUCKETS = [ + 67, + 75, + 83, + 91, + 100, + 112, + 125, + 137, + 150, + 162, + 175, + 187, + 200 + ].freeze + + private + + def bucket(size) + base_size = size.clamp(2.0 / 3.0, 2) * 100 + BUCKETS.each do |sz| + return sz if sz >= base_size + end + BUCKETS.last end end diff --git a/app/views/tag_sidebar/_content.html.erb b/app/views/tag_sidebar/_content.html.erb index 7b9f7373..a10010c1 100644 --- a/app/views/tag_sidebar/_content.html.erb +++ b/app/views/tag_sidebar/_content.html.erb @@ -3,7 +3,7 @@

<% sidebar.tags.each do |tag| %> - <%= link_to tag.display_name, tag_url(tag.name) %> + <%= link_to tag.display_name, tag_url(tag.name) %> <% end %>

diff --git a/spec/models/tag_sidebar_spec.rb b/spec/models/tag_sidebar_spec.rb index 2eae0740..8016178b 100644 --- a/spec/models/tag_sidebar_spec.rb +++ b/spec/models/tag_sidebar_spec.rb @@ -43,7 +43,7 @@ create(:article, keywords: "foo, quuz") result = sidebar.sizes - expect(result.values.uniq).to contain_exactly (2.0 / 3.0 * 100), 200 + expect(result.values.uniq).to contain_exactly 67, 200 end end end