From cf190432c9be842708ba988ba8d96491a704f2da Mon Sep 17 00:00:00 2001 From: Jeffrey Warren Date: Wed, 10 Feb 2021 18:06:57 -0500 Subject: [PATCH 1/5] git rebase --- app/models/tag.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/tag.rb b/app/models/tag.rb index 552993b681..1dfc75f01e 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -392,7 +392,6 @@ def self.graph_data(limit = 250) .group(:tid) .where('node.status': 1) .where('term_data.name NOT LIKE (?)', '%:%') - .where.not(name: 'first-time-poster') .order(count: :desc) .limit(limit).each do |tag| data["tags"] << { From b6af6f8d7a28c11bbcd00299959fe3c5cb98313c Mon Sep 17 00:00:00 2001 From: Jeffrey Warren Date: Thu, 11 Feb 2021 14:47:46 -0500 Subject: [PATCH 2/5] better label sizing for cyto (#9189) --- app/models/tag.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/tag.rb b/app/models/tag.rb index 1dfc75f01e..552993b681 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -392,6 +392,7 @@ def self.graph_data(limit = 250) .group(:tid) .where('node.status': 1) .where('term_data.name NOT LIKE (?)', '%:%') + .where.not(name: 'first-time-poster') .order(count: :desc) .limit(limit).each do |tag| data["tags"] << { From 91e67d30eef8d3b95f79184bdbf826b945b28fdf Mon Sep 17 00:00:00 2001 From: Will Gutierrez Date: Sun, 14 Feb 2021 13:35:11 -0800 Subject: [PATCH 3/5] adjust padding on comments --- app/views/comments/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb index ef2077aee2..803918b974 100644 --- a/app/views/comments/_form.html.erb +++ b/app/views/comments/_form.html.erb @@ -8,7 +8,7 @@ style=" background-color: #f8f8f8; border: 1px solid #e7e7e7; - padding: 18px; + padding: 36px; <%= "display: none" if location == :edit %> " > From 15794f936714705e4c607823c3342568380249ad Mon Sep 17 00:00:00 2001 From: Will Gutierrez Date: Sun, 14 Feb 2021 13:36:09 -0800 Subject: [PATCH 4/5] add tooltips to freshly posted comments --- app/views/comments/create.js.erb | 2 ++ app/views/notes/_comment.html.erb | 16 ++++++---------- app/views/notes/_comments.html.erb | 2 ++ app/views/questions/show.html.erb | 2 ++ app/views/wiki/show.html.erb | 2 ++ 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb index 7456d2e763..a82100bb98 100644 --- a/app/views/comments/create.js.erb +++ b/app/views/comments/create.js.erb @@ -41,3 +41,5 @@ fileUploadElements.forEach(function(element) { }); notyNotification('mint', 3000, 'success', 'topRight', 'Comment Added!'); $('#comment-count')[0].innerHTML = parseInt($('#comment-count')[0].innerHTML, 10)+1; +// attach tooltips to comment buttons +$('[data-toggle="tooltip"]').tooltip(); \ No newline at end of file diff --git a/app/views/notes/_comment.html.erb b/app/views/notes/_comment.html.erb index 88f65adbd5..3a7e930837 100644 --- a/app/views/notes/_comment.html.erb +++ b/app/views/notes/_comment.html.erb @@ -56,7 +56,7 @@ + <% else %> - + <% end %> <% if logged_in_as(['admin', 'moderator']) || (current_user && (comment.uid == current_user.uid || comment.parent.uid == current_user.uid)) %> - + <% end %> <% if current_user %> -
@@ -132,13 +132,9 @@ } }); }); - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) -
+
<% comment_body = comment.render_body %>
diff --git a/app/views/notes/_comments.html.erb b/app/views/notes/_comments.html.erb index ea6267d4b2..f8b92b4fd5 100644 --- a/app/views/notes/_comments.html.erb +++ b/app/views/notes/_comments.html.erb @@ -36,5 +36,7 @@ $(function() { // create an instance of the editor $E = new Editor(); + // attach tooltips to comment buttons + $('[data-toggle="tooltip"]').tooltip(); }); \ No newline at end of file diff --git a/app/views/questions/show.html.erb b/app/views/questions/show.html.erb index 7909b483ef..377ea984e0 100644 --- a/app/views/questions/show.html.erb +++ b/app/views/questions/show.html.erb @@ -7,6 +7,8 @@ $("img").lazyload(); // create an instance of the editor $E = new Editor(); + // attach tooltips to comment buttons + $('[data-toggle="tooltip"]').tooltip(); }); <%= javascript_include_tag('question') %> diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb index ff71c42197..c6102369d8 100644 --- a/app/views/wiki/show.html.erb +++ b/app/views/wiki/show.html.erb @@ -69,6 +69,8 @@ <% if controller.action_name == 'comments' %> // create an instance of the editor $E = new Editor(); + // attach tooltips to comment buttons + $('[data-toggle="tooltip"]').tooltip(); <% end %> setupWiki(<%= @node.id %>, "<%= @node.title %>", <%= params[:raw] == 'true' %>, <%= current_user.nil? != true %>); From 4ed1839bf07a3132fa23cd7ad98549a7dbd654a7 Mon Sep 17 00:00:00 2001 From: Will Gutierrez Date: Mon, 15 Feb 2021 13:36:50 -0800 Subject: [PATCH 5/5] add hover tooltips to emoji reaction button --- app/views/notes/_comment.html.erb | 2 +- app/views/notes/_comments.html.erb | 1 + app/views/questions/show.html.erb | 1 + app/views/wiki/show.html.erb | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/notes/_comment.html.erb b/app/views/notes/_comment.html.erb index 3a7e930837..3e2e35a6ca 100644 --- a/app/views/notes/_comment.html.erb +++ b/app/views/notes/_comment.html.erb @@ -83,7 +83,7 @@ <% end %> <% if current_user %> -
diff --git a/app/views/notes/_comments.html.erb b/app/views/notes/_comments.html.erb index f8b92b4fd5..4d50ad6c15 100644 --- a/app/views/notes/_comments.html.erb +++ b/app/views/notes/_comments.html.erb @@ -38,5 +38,6 @@ $E = new Editor(); // attach tooltips to comment buttons $('[data-toggle="tooltip"]').tooltip(); + $('[rel="tooltip"]').tooltip(); }); \ No newline at end of file diff --git a/app/views/questions/show.html.erb b/app/views/questions/show.html.erb index 377ea984e0..187f2d4a40 100644 --- a/app/views/questions/show.html.erb +++ b/app/views/questions/show.html.erb @@ -9,6 +9,7 @@ $E = new Editor(); // attach tooltips to comment buttons $('[data-toggle="tooltip"]').tooltip(); + $('[rel="tooltip"]').tooltip(); }); <%= javascript_include_tag('question') %> diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb index c6102369d8..dea289b110 100644 --- a/app/views/wiki/show.html.erb +++ b/app/views/wiki/show.html.erb @@ -71,6 +71,7 @@ $E = new Editor(); // attach tooltips to comment buttons $('[data-toggle="tooltip"]').tooltip(); + $('[rel="tooltip"]').tooltip(); <% end %> setupWiki(<%= @node.id %>, "<%= @node.title %>", <%= params[:raw] == 'true' %>, <%= current_user.nil? != true %>);