diff --git a/app/views/additional_content_boxes/_article_box.html.erb b/app/views/additional_content_boxes/_article_box.html.erb index 3bfc8bb37..def7d1305 100644 --- a/app/views/additional_content_boxes/_article_box.html.erb +++ b/app/views/additional_content_boxes/_article_box.html.erb @@ -1,20 +1,20 @@
"> + data-details="<%= article.organization&.slug %>__<%= article.slug %>" + id="<%= classification == "boosted" ? "partner-content-display" : "classic_article_#{article.id}" %>">
<%= classification_text %>
<%= render "additional_content_boxes/article_content_area", - article: article, - classification: classification, - organization: article.organization %> + article: article, + classification: classification, + organization: article.organization %>
<%= render "additional_content_boxes/article_followable_area", - article: article, - followable: article.organization || article.user, - classification: classification, - follow_cue: follow_cue %> + article: article, + followable: article.organization || article.user, + classification: classification, + follow_cue: follow_cue %>
diff --git a/app/views/additional_content_boxes/_article_content_area.html.erb b/app/views/additional_content_boxes/_article_content_area.html.erb index e25c8e646..b69fe4994 100644 --- a/app/views/additional_content_boxes/_article_content_area.html.erb +++ b/app/views/additional_content_boxes/_article_content_area.html.erb @@ -1,4 +1,6 @@ -

" data-details="<%= organization&.slug %>__<%= article.slug %>"><%= article.title %>

+

+ " data-details="<%= organization&.slug %>__<%= article.slug %>"><%= article.title %> +

<%= article.user.username %> profile image @@ -9,12 +11,12 @@ " data-details="<%= organization&.slug %>__<%= article.slug %>"> <%= article.description %> -
- <% if article.positive_reactions_count > 0 %> - " alt="Reactions" /> <%= article.positive_reactions_count %> - <% end %> - <% if article.comments_count > 0 %> - " alt="Reactions" class="comments-bubble" /> <%= article.comments_count %> - <% end %> -
+
+ <% if article.positive_reactions_count > 0 %> + " alt="Reactions" /> <%= article.positive_reactions_count %> + <% end %> + <% if article.comments_count > 0 %> + " alt="Reactions" class="comments-bubble" /> <%= article.comments_count %> + <% end %> +

diff --git a/app/views/additional_content_boxes/_article_followable_area.html.erb b/app/views/additional_content_boxes/_article_followable_area.html.erb index 9dd9865ef..e234c8889 100644 --- a/app/views/additional_content_boxes/_article_followable_area.html.erb +++ b/app/views/additional_content_boxes/_article_followable_area.html.erb @@ -1,32 +1,33 @@ <% if followable.class.name == "Organization" && followable.nav_image.present? %> -
- - " /> +
+ + " />
<% else %>
- " - data-details="<%= followable&.slug if classification == "boosted" %>__PROFILE" /> - __PROFILE" - style="border: 4px solid <%= followable.bg_color_hex %>" /> + " + data-details="<%= followable&.slug if classification == "boosted" %>__PROFILE"> + __PROFILE" + style="border: 4px solid <%= followable.bg_color_hex %>" />
" - data-details="<%= followable&.slug if classification == "boosted" %>__PROFILE" /><%= followable.name %> + class="<%= "partner-link" if classification == "boosted" %>" + data-details="<%= followable&.slug if classification == "boosted" %>__PROFILE"><%= followable.name %>
<% end %> + style="color:<%= user_colors(followable)[:text] %>;background-color:<%= user_colors(followable)[:bg] %>" + data-info='{"id":<%= followable.id %>,"className":"<%= followable.class.name %>"}'>  + diff --git a/app/views/additional_content_boxes/boxes.html.erb b/app/views/additional_content_boxes/boxes.html.erb index 2c1905e27..472581ed5 100644 --- a/app/views/additional_content_boxes/boxes.html.erb +++ b/app/views/additional_content_boxes/boxes.html.erb @@ -1,16 +1,16 @@ <% if @boosted_article %> <%= render "additional_content_boxes/article_box", - article: @boosted_article, - classification: "boosted", - classification_text: "From one of our Community Sponsors", - follow_cue: @boosted_article.organization&.tag_line || @boosted_article.organization&.tag_line %> + article: @boosted_article, + classification: "boosted", + classification_text: "From one of our Community Sponsors", + follow_cue: @boosted_article.organization&.tag_line || @boosted_article.organization&.tag_line %> <% end %> <% if @suggested_articles.any? %> <% @suggested_articles.each do |article| %> <%= render "additional_content_boxes/article_box", - article: article, - classification: "for_user_article", - classification_text: "Another Post You Might Like", - follow_cue: article.organization&.tag_line || "Follow @#{article.user.username} to see more of their posts in your feed." %> - <% end %> + article: article, + classification: "for_user_article", + classification_text: "Another Post You Might Like", + follow_cue: article.organization&.tag_line || "Follow @#{article.user.username} to see more of their posts in your feed." %> + <% end %> <% end %> diff --git a/app/views/admin/application/_collection.html.erb b/app/views/admin/application/_collection.html.erb index 563cafcbe..e779657ae 100644 --- a/app/views/admin/application/_collection.html.erb +++ b/app/views/admin/application/_collection.html.erb @@ -20,14 +20,14 @@ to display a collection of resources in an HTML table. - - <% collection_presenter.attribute_types.each do |attr_name, attr_type| %> - - <% end %> - <% [valid_action?(:edit, collection_presenter.resource_name), - valid_action?(:destroy, collection_presenter.resource_name)].count(true).times do %> - - <% end %> - + + <% end %> + <% [valid_action?(:edit, collection_presenter.resource_name), + valid_action?(:destroy, collection_presenter.resource_name)].count(true).times do %> + + <% end %> + - <% resources.each do |resource| %> - - <%= %(role=link data-url=#{polymorphic_path([namespace, resource])}) %> - <% end %>> - <% collection_presenter.attributes_for(resource).each do |attribute| %> - - <% end %> + <% resources.each do |resource| %> + + <%= %(role=link data-url=#{polymorphic_path([namespace, resource])}) %> + <% end %>> + <% collection_presenter.attributes_for(resource).each do |attribute| %> + + <% end %> - <% if valid_action? :edit, collection_presenter.resource_name %> - - <% end %> + <% if valid_action? :edit, collection_presenter.resource_name %> + + <% end %> - <% if valid_action? :destroy, collection_presenter.resource_name %> - - <% end %> - - <% end %> + <% if valid_action? :destroy, collection_presenter.resource_name %> + + <% end %> + + <% end %>
cell-label--<%= collection_presenter.ordered_html_class(attr_name) %>" - scope="col" - role="columnheader" - aria-sort="<%= sort_order(collection_presenter.ordered_html_class(attr_name)) %>"> + scope="col" + role="columnheader" + aria-sort="<%= sort_order(collection_presenter.ordered_html_class(attr_name)) %>"> <%= link_to(sanitized_order_params( page, collection_field_name ).merge( @@ -45,59 +45,59 @@ to display a collection of resources in an HTML table. <% end %> <% end %> -
- <% if show_action? :show, resource -%> - - <%= render_field attribute %> - - <% end -%> -
+ <% if show_action? :show, resource -%> + + <%= render_field attribute %> + + <% end -%> + - <% if show_action? :edit, resource %> - <%= link_to( - t("administrate.actions.edit"), - [:edit, namespace, resource], - class: "action-edit", - ) %> - <% end %> - + <% if show_action? :edit, resource %> + <%= link_to( + t("administrate.actions.edit"), + [:edit, namespace, resource], + class: "action-edit", + ) %> + <% end %> + - <% if show_action? :destroy, resource %> - <%= link_to( - t("administrate.actions.destroy"), - [namespace, resource], - class: "text-color-red", - method: :delete, - data: { confirm: t("administrate.actions.confirm") }, - ) %> - <% end %> -
+ <% if show_action? :destroy, resource %> + <%= link_to( + t("administrate.actions.destroy"), + [namespace, resource], + class: "text-color-red", + method: :delete, + data: { confirm: t("administrate.actions.confirm") }, + ) %> + <% end %> +
diff --git a/app/views/comments/_comment_proper.html.erb b/app/views/comments/_comment_proper.html.erb index 54f12c7a8..83d1d7841 100644 --- a/app/views/comments/_comment_proper.html.erb +++ b/app/views/comments/_comment_proper.html.erb @@ -41,7 +41,7 @@ <%= image_tag("github-logo.svg", class: "icon-img") %> <% end %> - <% if commentable_author_is_op?(commentable, comment)%> + <% if commentable_author_is_op?(commentable, comment) %> <%= get_ama_or_op_banner(commentable) %> <% end %>
diff --git a/app/views/html_variants/_form.html.erb b/app/views/html_variants/_form.html.erb index d508f986b..25a43ebe1 100644 --- a/app/views/html_variants/_form.html.erb +++ b/app/views/html_variants/_form.html.erb @@ -7,9 +7,9 @@

<%= pluralize(@html_variant.errors.count, "error") %> prohibited this block from being saved:

    - <% @html_variant.errors.full_messages.each do |message| %> -
  • <%= message %>
    • - <% end %> + <% @html_variant.errors.full_messages.each do |message| %> +
  • <%= message %>
    • + <% end %>
<% end %> diff --git a/app/views/html_variants/_page_styles.html.erb b/app/views/html_variants/_page_styles.html.erb index 7ef1739bd..0270646e3 100644 --- a/app/views/html_variants/_page_styles.html.erb +++ b/app/views/html_variants/_page_styles.html.erb @@ -5,12 +5,14 @@ max-width: 96%; overflow: hidden; } + .html-variants-page nav a { display: inline-block; padding: 5px 12px; border-radius: 3px; color: blue; } + .html-variants-page nav a.selected { background: blue; color: white; @@ -23,6 +25,7 @@ padding: 10px 40px; border-radius: 100px; } + .flash { background: green; color: white; @@ -31,6 +34,7 @@ font-weight: bold; margin-bottom: 10px; } + input, textarea { width: 100%; font-size: 20px; @@ -38,6 +42,7 @@ padding: 10px; margin-bottom: 20px; } + input[type="submit"] { background: blue; color: white; @@ -45,23 +50,28 @@ padding: 15px 0px; border: 0px; } + textarea { height: calc(100vh - 500px); font-size: 0.8em; overflow-x: scroll; overflow-wrap: normal; } + .form-sub-details input { display: inline-block; max-width: 40%; margin-left: 1%; } + .form-sub-details input[type="checkbox"] { max-width: 5%; } + #error_explanation { margin-bottom: 20px; } + .html-variants-page-single-variant { border: 1px solid black; padding: 15px 15px 5px; @@ -73,29 +83,37 @@ overflow: hidden; position: relative; } + .html-variants-page-single-big { width: 962px; } + .html-variants-page-single-variant h3 { margin-top: 0px; - font-size:1.3em; + font-size: 1.3em; } + .html-variants-page-single-variant iframe { border: 0px; width: 310px; height: 350px; border: 1px solid #888888; } + .html-variants-page-single-big iframe { width: 800px; } + .html-variants-page-single-variant-details { padding: 10px; border-top: 1px solid gray; position: absolute; - bottom:0;left:0;right:0; + bottom: 0; + left: 0; + right: 0; } + .pill { padding: 3px 10px; display: inline-block; @@ -104,16 +122,19 @@ background: gray; color: white; } + .published { background: blue; } + .approved { background: green; } + .html-variants-page-single-variant-details input { background: green; padding: 20px; - font-size:35px; + font-size: 35px; border-radius: 3px; border: 0px; margin-top: 15px; diff --git a/app/views/html_variants/_single_html_variant.html.erb b/app/views/html_variants/_single_html_variant.html.erb index 17c2d3bf7..df8096196 100644 --- a/app/views/html_variants/_single_html_variant.html.erb +++ b/app/views/html_variants/_single_html_variant.html.erb @@ -6,13 +6,13 @@
<% if html_variant.published %> - published - fork + published + fork <% else %> - view/edit + view/edit <% end %> <% if html_variant.approved %> - <%= html_variant.success_rate %> + <%= html_variant.success_rate %> <% elsif admin %> <%= form_for(html_variant) do |f| %> <%= f.hidden_field :approved, value: "true" %> diff --git a/app/views/html_variants/index.html.erb b/app/views/html_variants/index.html.erb index 15dfd56ce..3c74c5e9d 100644 --- a/app/views/html_variants/index.html.erb +++ b/app/views/html_variants/index.html.erb @@ -10,7 +10,7 @@ <% if params[:state] == "mine" %>

My Entries

- <% elsif params[:state] == "admin" %> + <% elsif params[:state] == "admin" %>

All Published Entries

<% else %>

Leaderboard

diff --git a/app/views/html_variants/show.html.erb b/app/views/html_variants/show.html.erb index 93cd559fd..f4a7c534a 100644 --- a/app/views/html_variants/show.html.erb +++ b/app/views/html_variants/show.html.erb @@ -1,11 +1,13 @@ <%= render "layouts/styles" %> <% if @html_variant.group == "article_show_below_article_cta" %>
diff --git a/app/views/internal/articles/_article_script.html.erb b/app/views/internal/articles/_article_script.html.erb index 592d78791..8bc83ae03 100644 --- a/app/views/internal/articles/_article_script.html.erb +++ b/app/views/internal/articles/_article_script.html.erb @@ -1,28 +1,29 @@ diff --git a/app/views/internal/articles/_individual_article.html.erb b/app/views/internal/articles/_individual_article.html.erb index de9e77921..afa48b63f 100644 --- a/app/views/internal/articles/_individual_article.html.erb +++ b/app/views/internal/articles/_individual_article.html.erb @@ -13,7 +13,9 @@ <% if article.user&.notes&.any? %>

User Notes (<%= article.user&.notes&.size %> total)

<% article.user&.notes&.last(3)&.each do |note| %> -

<%= note.created_at.strftime("%d %B %Y %H:%M UTC") %> by <%= note.author_id ? User.find(note.author_id).username : "No Author" %> - <%= note.content %>

+

+ <%= note.created_at.strftime("%d %B %Y %H:%M UTC") %> by <%= note.author_id ? User.find(note.author_id).username : "No Author" %> - <%= note.content %> +

<% end %>

View All

<% end %> @@ -27,20 +29,21 @@ Originally Published <%= article.published_at&.strftime("%b %d, %Y") %>

<% elsif article.crossposted_at? %> -

- Crossposted <%= article.crossposted_at.strftime("%b %d, %Y") %> & Published <%= article.published_at&.strftime("%b %d, %Y") %> -

+

+ Crossposted <%= article.crossposted_at.strftime("%b %d, %Y") %> & Published <%= article.published_at&.strftime("%b %d, %Y") %> +

<% else %> -

- Published <%= article.published_at&.strftime("%b %d, %Y") %> -

+

+ Published <%= article.published_at&.strftime("%b %d, %Y") %> +

<% end %> <% if article.main_image.present? %> -
- cover image
-
+
+ cover image
+
<% end %> - <%= article.title %> EDIT + <%= article.title %> + EDIT <% article.decorate.cached_tag_list_array.each do |tag| %> #<%= tag %> <% end %> @@ -51,24 +54,33 @@ - Featured Number: + Featured Number: + + + Change author:   Featured: >   Approved: >   Live Now: > -   Email Digest Eligible: > -   Image BG color: - Social Image: +   Email Digest Eligible: + > +   Image BG color: + + Social Image: +

- Boosted (Additional articles): > -   Boosted (DEV Digest): > + Boosted (Additional articles): + > +   Boosted (DEV Digest): + > <% if params[:state]&.include?("classic") %>

<% end %> -     +     +
<% article.buffer_updates.order("created_at ASC").each do |buffer_update| %> @@ -92,14 +104,14 @@ BOOSTED IN <%= EmailMessage.where("subject LIKE ?", "%#{phrase}%").where.not(opened_at: nil).size %> EMAILS
BOOSTED IN <%= EmailMessage.where("subject LIKE ?", "%#{phrase}%").where.not(opened_at: nil).where("sent_at > ?", 1.week.ago).size %> EMAILS IN THE PAST WEEK -

+

BOOSTED IN <%= EmailMessage.where("subject LIKE ?", "%#{phrase}%").where.not(opened_at: nil).where.not(opened_at: nil).size %> OPENED EMAILS
BOOSTED IN <%= EmailMessage.where("subject LIKE ?", "%#{phrase}%").where.not(opened_at: nil).where.not(opened_at: nil).where("sent_at > ?", 1.week.ago).size %> OPENED EMAILS IN THE PAST WEEK <% end %>
- <% if (article.decorate.cached_tag_list_array & Tag.bufferized_tags).any? %> @@ -117,7 +129,8 @@

Twitter MAIN

- + <% end %> <% if (article.decorate.cached_tag_list_array & Tag.bufferized_tags).any? %> @@ -125,7 +138,8 @@

Twitter Satellite

- + <% end %> <% end %> diff --git a/app/views/internal/articles/index.html.erb b/app/views/internal/articles/index.html.erb index f711159cc..e32a02914 100644 --- a/app/views/internal/articles/index.html.erb +++ b/app/views/internal/articles/index.html.erb @@ -1,7 +1,8 @@ +

">Hot ">Chronological @@ -32,10 +38,10 @@ ">Boosted


- <% if params[:state] && params[:state].include?("top-") && params[:state] != "top-3" && params[:state] != "top-6" %> -

- <%= params[:state] %>-months -

+<% if params[:state] && params[:state].include?("top-") && params[:state] != "top-3" && params[:state] != "top-6" %> +

+ <%= params[:state] %>-months +

<% end %> <% if @featured_articles && @featured_articles.any? %> diff --git a/app/views/internal/articles/rss_articles.html.erb b/app/views/internal/articles/rss_articles.html.erb index 5477ef178..822896185 100644 --- a/app/views/internal/articles/rss_articles.html.erb +++ b/app/views/internal/articles/rss_articles.html.erb @@ -15,7 +15,8 @@ <% other_classes = [published, featured, publish_permission].join(" ") %>
<%= "background:#daf7ff;" if article.published %>"> - <%= article.title %> EDIT
+ <%= article.title %> + EDIT
by <%= article.username %>

@@ -30,11 +31,16 @@
- Featured Number: + Featured Number: + +   Featured: > -   Image BG color:

- Social Image: -     +   Image BG color: +

+ Social Image: + +     +
<% if article.published %>
PUBLISHED <%= "AND FEATURED".html_safe if article.featured %>
@@ -53,26 +59,26 @@

diff --git a/app/views/internal/dogfood/index.html.erb b/app/views/internal/dogfood/index.html.erb index 4d221d9e8..5190fc8cd 100644 --- a/app/views/internal/dogfood/index.html.erb +++ b/app/views/internal/dogfood/index.html.erb @@ -44,7 +44,7 @@

diff --git a/app/views/internal/feedback_messages/_feedback_message.html.erb b/app/views/internal/feedback_messages/_feedback_message.html.erb index ff175cdde..565a4e24b 100644 --- a/app/views/internal/feedback_messages/_feedback_message.html.erb +++ b/app/views/internal/feedback_messages/_feedback_message.html.erb @@ -18,125 +18,131 @@
-

- Reporter: - <% if feedback_message.reporter_id? %> - <%= feedback_message.reporter.name %> - @<%= feedback_message.reporter.username %> - <% else %> - Anonymous - <% end %> -

-

- Reported URL (new tab): -
- <%= feedback_message.reported_url %> -

-

Category: <%= feedback_message.category %>

-

- Message: -

-

- <% if feedback_message.message.blank? %> - No message was left. - <% else %> - <%= feedback_message.message %> - <% end %> -

-
-

Previous Emails:

-
- <% feedback_message_emails.each do |email| %> - -

Email Form:

- +

Email Form:

+ -
-
-

- Send to: -
- <%= email_field_tag :reporter_email_to, feedback_message.reporter&.email, class: "form-control", id: "reporter__emailto__#{feedback_message.id}", required: true %> -

-

Subject:

+
+
+

+ Send to: +
+ <%= email_field_tag :reporter_email_to, feedback_message.reporter&.email, class: "form-control", id: "reporter__emailto__#{feedback_message.id}", required: true %> +

+

Subject:

<%= text_field_tag :reporter_email_subject, reporter_email_details[:subject], class: "form-control", id: "reporter__subject__#{feedback_message.id}" %> -

Body:

- <%= text_area_tag :reporter_email_body, reporter_email_details[:body], class: "form-control", style: "height: 300px;", id: "reporter__body__#{feedback_message.id}" %> -
-
-

- Send to: -
- <%= email_field_tag :offender_email_to, feedback_message.offender&.email, class: "form-control", id: "offender__emailto__#{feedback_message.id}", required: true %> -

-

Subject:

+

Body:

+ <%= text_area_tag :reporter_email_body, reporter_email_details[:body], class: "form-control", style: "height: 300px;", id: "reporter__body__#{feedback_message.id}" %> +
+
+

+ Send to: +
+ <%= email_field_tag :offender_email_to, feedback_message.offender&.email, class: "form-control", id: "offender__emailto__#{feedback_message.id}", required: true %> +

+

Subject:

<%= text_field_tag :offender_email_subject, offender_email_details[:subject], class: "form-control", id: "offender__subject__#{feedback_message.id}" %> -

Body:

+

Body:

<%= text_area_tag :offender_email_body, offender_email_details[:body], class: "form-control", style: "height: 300px;", id: "offender__body__#{feedback_message.id}" %> -
-
-

- Send to: -
- <%= email_field_tag :affected_email_to, feedback_message.affected&.email, class: "form-control", id: "affected__emailto__#{feedback_message.id}", required: true %> -

-

Subject:

+
+
+

+ Send to: +
+ <%= email_field_tag :affected_email_to, feedback_message.affected&.email, class: "form-control", id: "affected__emailto__#{feedback_message.id}", required: true %> +

+

Subject:

<%= text_field_tag :affected_email_subject, affected_email_details[:subject], class: "form-control", id: "affected__subject__#{feedback_message.id}" %> -

Body:

+

Body:

<%= text_area_tag :affected_email_body, affected_email_details[:body], class: "form-control", style: "height: 300px;", id: "affected__body__#{feedback_message.id}" %> +
-
-
- - -

- Status: <%= f.select :status, ["Open", "Invalid", "Resolved"], {}, id: "status__#{feedback_message.id}" %> - -

-

Notes:

-
- <% feedback_message.notes&.order("created_at")&.each do |note| %> -
+
+ + +

+ Status: <%= f.select :status, ["Open", "Invalid", "Resolved"], {}, id: "status__#{feedback_message.id}" %> + +

+

Notes:

+
+ <% feedback_message.notes&.order("created_at")&.each do |note| %> +
<%= time_ago_in_words note.created_at %> ago -

- <%= note.author.name %>: <%= note.content %> -

-
- <% end %> -
- - - - - -
- -
-
- +

+ <%= note.author.name %>: <%= note.content %> +

+
+ <% end %> +
+ + + + + +
+ +
+
+
@@ -158,23 +164,23 @@ body: formData, credentials: 'same-origin' }) - .then(response => response.json() - .then(json => { - if (json.outcome === 'Success') { - console.log(json.outcome) - statusBtn.innerText = "Saved!"; - setTimeout(function() { - statusBtn.innerText = "SAVE STATUS" - }, 1000); - } else { - } - })) + .then(response => response.json() + .then(json => { + if (json.outcome === 'Success') { + console.log(json.outcome) + statusBtn.innerText = "Saved!"; + setTimeout(function () { + statusBtn.innerText = "SAVE STATUS" + }, 1000); + } else { + } + })) } - document.getElementById('save__status__' + <%= feedback_message.id %>).addEventListener('click', function(event) { + document.getElementById('save__status__' + <%= feedback_message.id %>).addEventListener('click', function (event) { event.preventDefault(); var reportId = <%= feedback_message.id %> - saveStatus(reportId); + saveStatus(reportId); }); function successfulEmail(alert) { @@ -203,7 +209,7 @@ alert.classList.remove("alert-success"); alert.classList.remove("alert-danger"); - if(emailToAddress === "") { + if (emailToAddress === "") { alert.style.display = 'inline-block'; alert.classList.add("alert-warning"); alert.innerHTML = "Email can't be blank!" @@ -225,22 +231,22 @@ body: formData, credentials: 'same-origin' }) - .then(response => response.json() - .then(json => { - if (json.outcome === "Success") { - successfulEmail(alert); - } else { - console.log('email failed') - failedEmail(alert); - } - })) - .catch(error => { - failedEmail(alert); - console.log(error); - }) + .then(response => response.json() + .then(json => { + if (json.outcome === "Success") { + successfulEmail(alert); + } else { + console.log('email failed') + failedEmail(alert); + } + })) + .catch(error => { + failedEmail(alert); + console.log(error); + }) } - document.getElementById('send__email__btn__' + <%= feedback_message.id %>).addEventListener('click', function(event) { + document.getElementById('send__email__btn__' + <%= feedback_message.id %>).addEventListener('click', function (event) { event.preventDefault(); var reportId = <%= feedback_message.id %>; sendEmail(reportId); @@ -286,27 +292,27 @@ body: formData, credentials: 'same-origin' }) - .then(response => response.json() - .then(json => { - if (json.outcome === 'Success') { - addNoteToPage(json, id); - clearNote(id); - } else { + .then(response => response.json() + .then(json => { + if (json.outcome === 'Success') { + addNoteToPage(json, id); + clearNote(id); + } else { + // failedNote(); + } + }) + .catch(error => { // failedNote(); - } - }) - .catch(error => { - // failedNote(); - console.log(error); - })) + console.log(error); + })) } - document.getElementById('note__submit__<%= feedback_message.id %>').addEventListener('click', function() { + document.getElementById('note__submit__<%= feedback_message.id %>').addEventListener('click', function () { var reportId = <%= feedback_message.id %>; submitNote(reportId); }); - document.getElementById('minimize__report__button__<%= feedback_message.id %>').addEventListener('click', function() { + document.getElementById('minimize__report__button__<%= feedback_message.id %>').addEventListener('click', function () { document.getElementById('collapse__header__link-<%= feedback_message.id %>').click(); }); diff --git a/app/views/internal/feedback_messages/_style.html.erb b/app/views/internal/feedback_messages/_style.html.erb index fb6738ca3..a6263bbb2 100644 --- a/app/views/internal/feedback_messages/_style.html.erb +++ b/app/views/internal/feedback_messages/_style.html.erb @@ -1,35 +1,42 @@ diff --git a/app/views/internal/feedback_messages/index.html.erb b/app/views/internal/feedback_messages/index.html.erb index 2248a3059..150302b59 100644 --- a/app/views/internal/feedback_messages/index.html.erb +++ b/app/views/internal/feedback_messages/index.html.erb @@ -10,36 +10,37 @@ <%= paginate @feedback_messages %> - <% @vomits.each do |reaction| %> - <% next unless reaction.user && reaction.reactable %> -
-
- 🤢 @<%= reaction.user.username %> -
-
"> - <%= reaction.reactable_type %>: <%= reaction.reactable.title %> -
- <% if params[:status] == "Open" || params[:status].blank? %> -
- <%= form_for [:internal, reaction] do |f| %> - <%= f.hidden_field :status, value: "confirmed" %> - <%= f.submit "CONFIRMED", class: "btn btn-success btn-lg" %> - <% end %> -
-
- <%= form_for [:internal, reaction] do |f| %> - <%= f.hidden_field :status, value: "invalid" %> - <%= f.submit "INVALID", class: "btn btn-danger btn-lg" %> - <% end %> -
+<% @vomits.each do |reaction| %> + <% next unless reaction.user && reaction.reactable %> +
+
+ 🤢 @<%= reaction.user.username %> +
+
"> + <%= reaction.reactable_type %>: + <%= reaction.reactable.title %> +
+ <% if params[:status] == "Open" || params[:status].blank? %> +
+ <%= form_for [:internal, reaction] do |f| %> + <%= f.hidden_field :status, value: "confirmed" %> + <%= f.submit "CONFIRMED", class: "btn btn-success btn-lg" %> + <% end %> +
+
+ <%= form_for [:internal, reaction] do |f| %> + <%= f.hidden_field :status, value: "invalid" %> + <%= f.submit "INVALID", class: "btn btn-danger btn-lg" %> <% end %>
- <% end %> -
- <% @feedback_messages.each do |feedback_message| %> - <%= form_for [:internal, feedback_message] do |f| %> - <%= render "feedback_message", f: f, feedback_message: feedback_message %> <% end %> +
+<% end %> +
+<% @feedback_messages.each do |feedback_message| %> + <%= form_for [:internal, feedback_message] do |f| %> + <%= render "feedback_message", f: f, feedback_message: feedback_message %> <% end %> -
-
+<% end %> +
+
diff --git a/app/views/internal/tags/index.html.erb b/app/views/internal/tags/index.html.erb index 0a24f5e31..0c8d051ea 100644 --- a/app/views/internal/tags/index.html.erb +++ b/app/views/internal/tags/index.html.erb @@ -1,6 +1,6 @@ @@ -9,18 +9,18 @@ <%= label_tag(:search, "Find by tag name:") %> <%= text_field_tag(:search, params[:search]) %> <% if params[:state].present? %> - <%= hidden_field_tag(:state, params[:state]) %> + <%= hidden_field_tag(:state, params[:state]) %> <% end %> <%= submit_tag("Search") %> <% end %>

- ">All | - ">Supported | - ">Unsupported | + ">All | + ">Supported | + ">Unsupported |

<%= paginate @tags %> diff --git a/app/views/internal/tags/show.html.erb b/app/views/internal/tags/show.html.erb index 7d1542a9f..41518a8fe 100644 --- a/app/views/internal/tags/show.html.erb +++ b/app/views/internal/tags/show.html.erb @@ -1,4 +1,6 @@ -

#<%= @tag.name %>, tagged <%= @tag.taggings_count %> times.

+

+ #<%= @tag.name %>, tagged <%= @tag.taggings_count %> times. +

<% if @tag.tag_moderator_ids.any? %>

Moderators:

<% else %> @@ -6,7 +8,7 @@ <% end %>
    <% @tag.tag_moderator_ids.each do |id| %> - <%= form_for [:internal, @tag] do |f| %> + <%= form_for [:internal, @tag] do |f| %>
  • @<%= User.find(id).username %> <%= f.hidden_field :remove_moderator_id, value: id %> diff --git a/app/views/internal/users/_mentee_match.erb b/app/views/internal/users/_mentee_match.erb index 2a2eb7a46..ed1fe04d7 100644 --- a/app/views/internal/users/_mentee_match.erb +++ b/app/views/internal/users/_mentee_match.erb @@ -1,43 +1,43 @@ -<% if @user.seeking_mentorship && @user.mentee_description.present? && !@user.banned_from_mentorship %> +<% if @user.seeking_mentorship && @user.mentee_description.present? && !@user.banned_from_mentorship %>

    Mentee Description

    -
    -
    - -
    - @<%= @user.username %> -
    -
    -
    -

    Tags

    - <%= @user.cached_followed_tag_names.join(", ") %> -
    -
    -

    Mentee description

    - <%= @user.mentee_description %> -
    -
    -

    Skills/Languages

    - <%= @user.mostly_work_with %> -
    -
    -
    +
    +
    + +
    + @<%= @user.username %> +
    +
    +

    Tags

    + <%= @user.cached_followed_tag_names.join(", ") %> +
    +
    +

    Mentee description

    + <%= @user.mentee_description %> +
    +
    +

    Skills/Languages

    + <%= @user.mostly_work_with %> +
    +
    +
    +

    Possible Mentors

    <% count = 0 %> <% MentorRelationship. - unmatched_mentors.where.not(mentor_form_updated_at: nil, id: @user.id, mentor_description: [nil,""]). - order("mentor_form_updated_at DESC").limit(175). - sort_by { |possible_mentor| UserSimilarity.new(@user, possible_mentor).score }.reverse. - first(40).each do |possible_mentor| %> + unmatched_mentors.where.not(mentor_form_updated_at: nil, id: @user.id, mentor_description: [nil, ""]). + order("mentor_form_updated_at DESC").limit(175). + sort_by {|possible_mentor| UserSimilarity.new(@user, possible_mentor).score}.reverse. + first(40).each do |possible_mentor| %> <% if !possible_mentor.banned_from_mentorship %>
    -
    +
    @<%= possible_mentor.username %> -
    +
    Internal Profile (id #<%= possible_mentor.id %>)
    @@ -63,4 +63,4 @@
    <% end %> <% end %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/internal/users/edit.html.erb b/app/views/internal/users/edit.html.erb index b50d5d259..f31ea1210 100644 --- a/app/views/internal/users/edit.html.erb +++ b/app/views/internal/users/edit.html.erb @@ -1,7 +1,9 @@

    - <%= @user.name %> (@<%= @user.username %>) + <%= @user.name %> (@<%= @user.username %>)

    -

    click here view user details & take other actions

    +

    + click here view user details & take other actions +

    Member since <%= @user.created_at.strftime("%b %e '%y") %>

    Activity:

      @@ -9,32 +11,39 @@
    • <%= @user.articles.size %> articles
    • <%= @user.reactions.size %> reactions
    -
    -

    Banish User

    - <% if @user.banished? %> -

    User has been banished.

    - <% elsif @user.comments.where("created_at < ?", 100.days.ago).empty? && @user.created_at < 100.days.ago %> -

    This is extremely destructive. Banishing will delete all the user's existing content and change their username to @spam_###.

    -

    Do not do this lightly.

    - <%= form_for(@user, url: banish_internal_user_path(@user), html: { method: :post, onsumbit: "return confirm('Are you sure? This is extremely destructive and irreversible. Banishing will delete all articles and turn their username into @spam_###')" }) do %> - - <% end %> - <% elsif current_user.has_role?(:super_admin) %> -

    This is not a new user. You are only allowed to take this action because you are a super admin.

    -

    This is extremely destructive. Banishing will delete all the user's existing content and change their username to @spam_###.

    -

    Do not do this lightly.

    - <%= form_for(@user, url: banish_internal_user_path(@user), html: { method: :post, onsumbit: "return confirm('Are you sure? This is extremely destructive and irreversible.Banishing will delete all articles and turn their username into @spam_###')" }) do %> - - <% end %> - <% else %> -

    This is not a new user so you'll need to contact a super admin to banish this user.

    +
    +

    Banish User

    + <% if @user.banished? %> +

    User has been banished.

    + <% elsif @user.comments.where("created_at < ?", 100.days.ago).empty? && @user.created_at < 100.days.ago %> +

    + This is extremely destructive. Banishing will delete all the user's existing content and change their username to @spam_###. +

    +

    Do not do this lightly.

    + <%= form_for(@user, url: banish_internal_user_path(@user), html: { method: :post, onsumbit: "return confirm('Are you sure? This is extremely destructive and irreversible. Banishing will delete all articles and turn their username into @spam_###')" }) do %> + <% end %> -
    + <% elsif current_user.has_role?(:super_admin) %> +

    This is not a new user. You are only allowed to take this action because you are a + super admin.

    +

    + This is extremely destructive. Banishing will delete all the user's existing content and change their username to @spam_###. +

    +

    Do not do this lightly.

    + <%= form_for(@user, url: banish_internal_user_path(@user), html: { method: :post, onsumbit: "return confirm('Are you sure? This is extremely destructive and irreversible.Banishing will delete all articles and turn their username into @spam_###')" }) do %> + + <% end %> + <% else %> +

    This is not a new user so you'll need to contact a super admin to banish this user.

    + <% end %> +

    Fully Delete User

    <% if current_user.has_role?(:super_admin) %> -

    This will completely destroy the user and all of their activity from our database. This action is irreversible.

    +

    This will + completely destroy the user and all of their activity from our database. This action is irreversible. +

    Do not do this lightly.

    <%= form_for(@user, url: full_delete_internal_user_path(@user), html: { method: :post, onsubmit: "return confirm('Are you sure? This is extremely destructive and irreversible.')" }) do %> diff --git a/app/views/internal/users/index.html.erb b/app/views/internal/users/index.html.erb index 7aef6a5ad..65c130597 100644 --- a/app/views/internal/users/index.html.erb +++ b/app/views/internal/users/index.html.erb @@ -16,7 +16,7 @@ <%= label_tag(:search, "Find by:") %> <%= text_field_tag(:search, params[:search]) %> <% if params[:state].present? %> - <%= hidden_field_tag(:state, params[:state]) %> + <%= hidden_field_tag(:state, params[:state]) %> <% end %> <%= submit_tag("Search") %> (fields: name, username, twitter_username, github_username, email) diff --git a/app/views/internal/users/show.html.erb b/app/views/internal/users/show.html.erb index 3a87d29dd..eb1d4736e 100644 --- a/app/views/internal/users/show.html.erb +++ b/app/views/internal/users/show.html.erb @@ -3,27 +3,37 @@ width: calc(20% - 1rem); float: left; } + dd { width: calc(80% - 1rem) }

    - <%= @user.name %> (@<%= @user.username %>) + <%= @user.name %> (@<%= @user.username %>)

    -

    click here to banish or delete user

    +

    click here to banish or delete user +

    Member since <%= @user.created_at.strftime("%b %e '%y") %>

    General Info

    -
    ID:
    <%= @user.id %>
    -
    Username:
    <%= @user.username %>
    -
    Name:
    <%= @user.name %>
    -
    Email:
    <%= @user.email %>
    -
    Twitter:
    <%= @user.twitter_username || "N/A" %>
    -
    GitHub:
    <%= @user.github_username || "N/A" %>
    -
    Sustaining Member:
    <%= @user.a_sustaining_member? %>
    +
    ID:
    +
    <%= @user.id %>
    +
    Username:
    +
    <%= @user.username %>
    +
    Name:
    +
    <%= @user.name %>
    +
    Email:
    +
    <%= @user.email %>
    +
    Twitter:
    +
    <%= @user.twitter_username || "N/A" %>
    +
    GitHub:
    +
    <%= @user.github_username || "N/A" %>
    +
    Sustaining Member:
    +
    <%= @user.a_sustaining_member? %>
    <% if @user.a_sustaining_member? %> -
    Monthly Dues:
    <%= @user.monthly_dues %>
    +
    Monthly Dues:
    +
    <%= @user.monthly_dues %>
    <% end %>
    @@ -44,19 +54,19 @@

    (view full history in notes below)

      <% @user.roles.each do |role| %> -
    • <%= role.name %> <%= "- " + Tag.find(role.resource_id).name if role.resource_id.present? %>
      • +
    • <%= role.name %> <%= "- " + Tag.find(role.resource_id).name if role.resource_id.present? %>
      • <% end %>

    Privileges

    - <% if !@user.banned && !@user.warned %> - <%= form_for [:internal, @user] do |f| %> -

    Add Trusted Role (Community Moderator) + <% if !@user.banned && !@user.warned %> + <%= form_for [:internal, @user] do |f| %> +

    Add Trusted Role (Community Moderator) <%= f.check_box :trusted_user, checked: @user.trusted %>

    - <%= f.submit "Update Privileges" %> - <% end %> - <% else %> - User must be in good standing to have heigtened privileges of any kind. + <%= f.submit "Update Privileges" %> <% end %> + <% else %> + User must be in good standing to have heigtened privileges of any kind. + <% end %>

    Warn or Ban User

    <% if @user.banned %> @@ -84,30 +94,30 @@ <% if @user.mentors.count > 0 %>

    Mentor(s):

    <% elsif @user.mentees.count > 0 %>

    Mentee(s):

    <% end %> <%= form_for [:internal, @user] do |f| %> @@ -126,7 +136,8 @@ <% if @user.notes.count > 0 %> <% @user.notes.each do |note| %>

    <%= note.created_at.strftime("%d %B %Y %H:%M UTC") %> by <%= User.find(note.author_id).username %> - - <% if !note.reason.blank? %><%= note.reason %>: <% end %><%= note.content %>

    + <% if !note.reason.blank? %><%= note.reason %>: + <% end %><%= note.content %>

    <% end %> <% else %>

    No notes yet!

    @@ -145,7 +156,8 @@

    Recent Emails

      <% @user.email_messages.order("sent_at DESC").limit(50).each do |email| %> -
    • <%= email.subject %> <%= email.sent_at&.strftime("%b %e '%y") %>
      • +
    • <%= email.subject %> + <%= email.sent_at&.strftime("%b %e '%y") %>
      • <% end %>

    diff --git a/app/views/internal/welcome/index.html.erb b/app/views/internal/welcome/index.html.erb index 8428b63e4..42aa64c15 100644 --- a/app/views/internal/welcome/index.html.erb +++ b/app/views/internal/welcome/index.html.erb @@ -4,6 +4,6 @@

    All Welcome Threads

    <% @daily_threads.each do |thread| %> -<%= thread.title %> -
    + <%= thread.title %> +
    <% end %> diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index c75fc5708..a2a923030 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,7 +1,8 @@
    - + .wrapper { + display: grid; + grid-template-columns: 20% 20% 20% 20% 20%; + padding: 2px; + } -
    + .grid-item { + word-wrap: break-word; + } -
    - <% flash.each do |type, message| %> -
    - - <%= message %> -
    + .inner-row form { + display: inline-block; + } + + textarea { + font-size: 12px; + width: 75%; + } + + .btn { + min-width: 100px; + } + + .tab { + padding-top: 10px; + padding-bottom: 10px; + border-bottom: 10px solid white; + } + + .tab-current { + border-bottom: 10px solid rgb(193, 209, 224); + } + + .tab-current .btn { + opacity: 0.9; + } + + .row-plain { + padding: 0; + border: 0; + } + + .featured-bg { + background: #bbffd2 + } + + .approved-bg { + background: #92e8ae; + border: 12px solid #ff9900; + } + + a { + color: white !important; + } + + .highlighted-bg { + background: #2effa8 !important; + border: 20px solid black; + } + + .highlighted-border { + border: 20px solid black; + } + + + + + + +
    + +
    + <% flash.each do |type, message| %> +
    + + <%= message %>
    + <% end %> + <%= yield %> +
    -
    +
    - + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index c92c96df3..44e8734e2 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -1,30 +1,32 @@ - - - - - - <% if @user %> - - - - <% end %> -
    - <%= yield %> -
    - <% if @user.twitter_username.blank? %> - Reminder: You used GitHub to authenticate your account, so use that to sign in if prompted. - <% else %> - Reminder: You used Twitter to authenticate your account, so use that to sign in if prompted. - <% end %> -

    -
    - <% if @unsubscribe %> - <%= link_to "Unsubscribe", email_subscriptions_unsubscribe_url(ut: @unsubscribe), style: "color:#7d7d7d" %> | Adjust your email settings - <% else %> - Don't want to get emails like this? Adjust your email settings at dev.to/settings/notifications - <% end %> -
    -
    - + + + + + + <% if @user %> + + + + <% end %> +
    + <%= yield %> +
    + <% if @user.twitter_username.blank? %> + Reminder: You used GitHub to authenticate your account, so use that to sign in if prompted. + <% else %> + Reminder: You used Twitter to authenticate your account, so use that to sign in if prompted. + <% end %> +

    +
    + <% if @unsubscribe %> + <%= link_to "Unsubscribe", email_subscriptions_unsubscribe_url(ut: @unsubscribe), style: "color:#7d7d7d" %> | + Adjust your email settings + <% else %> + Don't want to get emails like this? Adjust your email settings at + dev.to/settings/notifications + <% end %> +
    +
    + diff --git a/app/views/mailers/digest_mailer/digest_email.html.erb b/app/views/mailers/digest_mailer/digest_email.html.erb index 915c3d580..faa8b0b73 100644 --- a/app/views/mailers/digest_mailer/digest_email.html.erb +++ b/app/views/mailers/digest_mailer/digest_email.html.erb @@ -17,7 +17,8 @@ DEV Digest is a new periodic email featuring the best posts from our community of developers.

    - Your digest is not yet customized. Follow the people and technologies on dev.to that interest you in order to receive the most relevant posts in your inbox. + Your digest is not yet customized. Follow the people and technologies on + dev.to that interest you in order to receive the most relevant posts in your inbox. <% else %> <% tip_rand = rand(5) %> <% if tip_rand == 0 %> diff --git a/app/views/mailers/membership_mailer/new_membership_subscription_email.html.erb b/app/views/mailers/membership_mailer/new_membership_subscription_email.html.erb index 34bb35e17..df8380e71 100644 --- a/app/views/mailers/membership_mailer/new_membership_subscription_email.html.erb +++ b/app/views/mailers/membership_mailer/new_membership_subscription_email.html.erb @@ -1,106 +1,114 @@ <% if @subscription_type == "triple_unicorn_member" %>

    - Whoa! You’re the best, and so generous. We tip our hats to you. + Whoa! You’re the best, and so generous. We tip our hats to you.

    - As a triple-unicorn, you have full access to all dev.to workshops! We’ll be releasing our workshop schedule Early February. + As a triple-unicorn, you have full access to all dev.to workshops! We’ll be releasing our workshop schedule Early February.

    - You’ll see your name at the featured position on our ‘Wall of Patrons and Scholars’ within the next few days, and you can claim your swag pack now by visiting your settings page. + You’ll see your name at the featured position on our ‘Wall of Patrons and Scholars’ within the next few days, and you can claim your swag pack now by visiting your + settings page.

    - We’ll be in touch to schedule a time for all of us to chat together, and we’ll also be putting together some additional goodies. + We’ll be in touch to schedule a time for all of us to chat together, and we’ll also be putting together some additional goodies.

    - Thank you again for supporting The DEV Community. Your membership means a lot to us, and all the recipients of our scholarship fund. You went above and beyond on this one. + Thank you again for supporting The DEV Community. Your membership means a lot to us, and all the recipients of our scholarship fund. You went above and beyond on this one.

    <% elsif @subscription_type == "level_4_member" %>

    - Thank you for becoming a DEV sustaining member. Your support means the world to us. + Thank you for becoming a DEV sustaining member. Your support means the world to us.

    - As part of your membership, you’ll have early access to beta features on the site. For instance, post analytics have now been added to your dashboard. + As part of your membership, you’ll have early access to beta features on the site. For instance, post analytics have now been added to your + dashboard.

    - On your membership settings page, you’ll find the coupon that you’ll use to request your exclusive sticker pack and t-shirt combo. + On your + membership settings page, you’ll find the coupon that you’ll use to request your exclusive sticker pack and t-shirt combo.

    - Your name will appear on our “Wall of Patrons and Scholars” soon, and you’ll also be receiving full access to all dev.to workshops! We’ll be releasing our first workshop schedule in early February. + Your name will appear on our “Wall of Patrons and Scholars” soon, and you’ll also be receiving full access to all dev.to workshops! We’ll be releasing our first workshop schedule in early February.

    - Above all, thank you for supporting The DEV Community. Your additional contribution means so much to us, and to all the recipients of our scholarship fund. You really went above and beyond on this one. + Above all, thank you for supporting The DEV Community. Your additional contribution means so much to us, and to all the recipients of our scholarship fund. You really went above and beyond on this one.

    - With sincere gratitude... + With sincere gratitude...

    - ❤️ -
    - PBJ + ❤️ +
    + PBJ

    - PS — feel free to reply to this email with any questions. + PS — feel free to reply to this email with any questions.

    <% elsif @subscription_type == "level_3_member" %>

    - Thank you for becoming a DEV sustaining member. Your support means the world to us. + Thank you for becoming a DEV sustaining member. Your support means the world to us.

    - As part of your membership, you’ll have early access to beta features on the site. For instance, post analytics have now been added to your dashboard. + As part of your membership, you’ll have early access to beta features on the site. For instance, post analytics have now been added to your + dashboard.

    - On your membership settings page, you’ll find the coupon that you’ll use to request your exclusive sticker pack and t-shirt combo. + On your membership + settings page, you’ll find the coupon that you’ll use to request your exclusive sticker pack and t-shirt combo.

    - Your name will appear on our “Wall of Patrons and Scholars” soon, and you’ll also be receiving full access to all dev.to workshops! We’ll be releasing our first workshop schedule in early February. + Your name will appear on our “Wall of Patrons and Scholars” soon, and you’ll also be receiving full access to all dev.to workshops! We’ll be releasing our first workshop schedule in early February.

    - Feel free to reply to this email with any questions :) + Feel free to reply to this email with any questions :)

    - Thanks again! ❤️ -
    - PBJ + Thanks again! ❤️ +
    + PBJ

    <% elsif @subscription_type == "level_2_member" %>

    - Thank you for becoming a DEV sustaining member. Your support means the world to us. + Thank you for becoming a DEV sustaining member. Your support means the world to us.

    - As part of your membership, you’ll have early access to beta features on the site. For instance, post analytics have now been added to your dashboard. + As part of your membership, you’ll have early access to beta features on the site. For instance, post analytics have now been added to your + dashboard.

    - On your membership settings page, you’ll find the coupon that you’ll use to request your exclusive sticker pack. Within the next few days, you’ll be appearing on our ‘Wall of Patrons and Scholars.’ + On your + membership settings page, you’ll find the coupon that you’ll use to request your exclusive sticker pack. Within the next few days, you’ll be appearing on our ‘Wall of Patrons and Scholars.’

    - Feel free to reply to this email with any questions :) + Feel free to reply to this email with any questions :)

    - Thanks again! ❤️ -
    - PBJ + Thanks again! ❤️ +
    + PBJ

    <% elsif @subscription_type == "level_1_member" %>

    - Thank you for becoming a DEV sustaining member. Your support means the world to us. + Thank you for becoming a DEV sustaining member. Your support means the world to us.

    - As part of your membership, you’ll have early access to beta features on the site. For instance, post analytics have now been added to your dashboard. + As part of your membership, you’ll have early access to beta features on the site. For instance, post analytics have now been added to your + dashboard.

    - Within the next few days, you’ll also appear on our ‘Wall of Patrons and Scholars.’ + Within the next few days, you’ll also appear on our ‘Wall of Patrons and Scholars.’

    - Feel free to reply to this email with any questions :) + Feel free to reply to this email with any questions :)

    - Thanks again! ❤️ -
    - PBJ + Thanks again! ❤️ +
    + PBJ

    <% end %>

    Thank you so much for your support.

    -Visit Your membership settings page for all details. + Visit Your membership settings page for all details.

    diff --git a/app/views/mailers/membership_mailer/subscription_cancellation_email.html.erb b/app/views/mailers/membership_mailer/subscription_cancellation_email.html.erb index e3aae25a8..f3ce780d7 100644 --- a/app/views/mailers/membership_mailer/subscription_cancellation_email.html.erb +++ b/app/views/mailers/membership_mailer/subscription_cancellation_email.html.erb @@ -1,12 +1,12 @@

    -Your DEV sustaining membership has been cancelled. Thank you so much for your support to date. + Your DEV sustaining membership has been cancelled. Thank you so much for your support to date.

    -If you have any feedback that can help us improve the membership experience, please feel free to reply to this email. + If you have any feedback that can help us improve the membership experience, please feel free to reply to this email.

    -Thanks again, -
    -PBJ + Thanks again, +
    + PBJ

    diff --git a/app/views/mailers/membership_mailer/subscription_cancellation_email.text.erb b/app/views/mailers/membership_mailer/subscription_cancellation_email.text.erb index 8f0de6ef3..9afff4488 100644 --- a/app/views/mailers/membership_mailer/subscription_cancellation_email.text.erb +++ b/app/views/mailers/membership_mailer/subscription_cancellation_email.text.erb @@ -1 +1 @@ - If you could send feedback to yo@dev.to to help us improve it would be much appreciated. +If you could send feedback to yo@dev.to to help us improve it would be much appreciated. diff --git a/app/views/mailers/membership_mailer/subscription_update_confirm_email.html.erb b/app/views/mailers/membership_mailer/subscription_update_confirm_email.html.erb index 105fe94db..df5e2f589 100644 --- a/app/views/mailers/membership_mailer/subscription_update_confirm_email.html.erb +++ b/app/views/mailers/membership_mailer/subscription_update_confirm_email.html.erb @@ -1,7 +1,8 @@ " style="height:200px; display: block; margin-left: auto; margin-right: auto;" />

    -Your DEV sustaining membership monthly contribution amount has been updated. Be sure to check your membership settings page to see the most up-to-date information. + Your DEV sustaining membership monthly contribution amount has been updated. Be sure to check your + membership settings page to see the most up-to-date information.

    -Thank you so much for the support, and please email members@dev.to with any questions. + Thank you so much for the support, and please email members@dev.to with any questions.

    diff --git a/app/views/mailers/notify_mailer/export_email.html.erb b/app/views/mailers/notify_mailer/export_email.html.erb index 6e64068af..6c46e356c 100644 --- a/app/views/mailers/notify_mailer/export_email.html.erb +++ b/app/views/mailers/notify_mailer/export_email.html.erb @@ -1,4 +1,4 @@

    Your content has been exported.

    -Please check the attached file. + Please check the attached file.

    diff --git a/app/views/mailers/notify_mailer/mentee_email.html.erb b/app/views/mailers/notify_mailer/mentee_email.html.erb index e174d2a76..421e66940 100644 --- a/app/views/mailers/notify_mailer/mentee_email.html.erb +++ b/app/views/mailers/notify_mailer/mentee_email.html.erb @@ -2,7 +2,8 @@ Hey @<%= @mentee.username %>!

    - Let me get straight to the point: your mentor is @<%= @mentor.username %>. We have had you two automatically follow each other, so you can find them on DEV Connect, and introduce yourself! + Let me get straight to the point: your mentor is + @<%= @mentor.username %>. We have had you two automatically follow each other, so you can find them on DEV Connect, and introduce yourself!

    A few notes: @@ -12,7 +13,8 @@ Every person is different so every mentor/mentee relationship is unique. We expect some mentorships to last longer than others and hope that at the very least, you’ll have made a solid new connection.

  • - We expect everyone to abide by our Code of Conduct, especially in this setting. Should your mentor demonstrate inappropriate behavior, please contact us immediately. + We expect everyone to abide by our + Code of Conduct, especially in this setting. Should your mentor demonstrate inappropriate behavior, please contact us immediately.
  • If you feel like this was a mismatch, or if your mentor is unresponsive after several days, let us know. @@ -21,7 +23,8 @@ We highly recommend setting goals and expectations with your mentor from Day 1.
  • - To help you all get started, we’ve put together some resources. + To help you all get started, we’ve put together some + resources.
diff --git a/app/views/mailers/notify_mailer/mentee_email.text.erb b/app/views/mailers/notify_mailer/mentee_email.text.erb index 823147eb9..bcc802305 100644 --- a/app/views/mailers/notify_mailer/mentee_email.text.erb +++ b/app/views/mailers/notify_mailer/mentee_email.text.erb @@ -2,14 +2,14 @@ Hey! Let me get straight to the point: your mentor is: https://dev.to/<%= @mentor.username %>. We have had you two automatically follow each other, so you can find them on DEV Connect, and introduce yourself! -A few notes: +A few notes: - Every person is different so every mentor/mentee relationship is unique. We expect some mentorships to last longer than others and hope that at the very least, you’ll have made a solid new connection. - We expect everyone to abide by our Code of Conduct: https://dev.to/code-of-conduct, especially in this setting. Should your mentor demonstrate inappropriate behavior, please contact us immediately. -- If you feel like this was a mismatch, or if your mentor is unresponsive after several days, let us know. -- We highly recommend setting goals and expectations with your mentor from Day 1. +- If you feel like this was a mismatch, or if your mentor is unresponsive after several days, let us know. +- We highly recommend setting goals and expectations with your mentor from Day 1. - To help you all get started, we’ve put together some resources: https://dev.to/jess/mentorship-resources-19p0 -Thanks again for participating in our program. +Thanks again for participating in our program. Good luck! diff --git a/app/views/mailers/notify_mailer/mentor_email.html.erb b/app/views/mailers/notify_mailer/mentor_email.html.erb index 672057a37..7cc4d939d 100644 --- a/app/views/mailers/notify_mailer/mentor_email.html.erb +++ b/app/views/mailers/notify_mailer/mentor_email.html.erb @@ -1,18 +1,21 @@

-Hey! + Hey!

-Let me get straight to the point: your mentee is @<%= @mentee.username %>. We had you two automatically follow each other, so you can find them DEV Connect, and introduce yourself! + Let me get straight to the point: your mentee is + @<%= @mentee.username %>. We had you two automatically follow each other, so you can find them + DEV Connect, and introduce yourself!

-A few notes: + A few notes:

  • Every person is different so every mentor/mentee relationship is unique. We expect some mentorships to last longer than others and hope that at the very least, you’ll have made a solid new connection.
  • - We expect everyone to abide by our Code of Conduct, especially in this setting. Should your mentee demonstrate inappropriate behavior, please contact us immediately. + We expect everyone to abide by our + Code of Conduct, especially in this setting. Should your mentee demonstrate inappropriate behavior, please contact us immediately.
  • If you feel like this was a mismatch, or if your mentee is unresponsive after several days, let us know. @@ -21,13 +24,14 @@ A few notes: We highly recommend setting goals and expectations with your mentee from Day 1.
  • - To help you all get started, we’ve put together some Mentorship Resources + To help you all get started, we’ve put together some + Mentorship Resources

-Thank you for volunteering your time to help someone along in their career. As this is the very first iteration of DEV Mentorships, please let us know if there’s anything we can do to better support you and your mentee. + Thank you for volunteering your time to help someone along in their career. As this is the very first iteration of DEV Mentorships, please let us know if there’s anything we can do to better support you and your mentee.

-Thanks again. You are awesome. + Thanks again. You are awesome.

Liana diff --git a/app/views/mailers/notify_mailer/new_badge_email.text.erb b/app/views/mailers/notify_mailer/new_badge_email.text.erb index 460218f76..6d491e4b9 100644 --- a/app/views/mailers/notify_mailer/new_badge_email.text.erb +++ b/app/views/mailers/notify_mailer/new_badge_email.text.erb @@ -4,4 +4,4 @@ Congratulations, <%= @user.name %>! You got the <%= @badge.title %> badge! Be su <%= strip_tags @badge_achievement.rewarding_context_message %> -https://dev.to/<%= @user.username%> \ No newline at end of file +https://dev.to/<%= @user.username %> diff --git a/app/views/mailers/notify_mailer/new_follower_email.html.erb b/app/views/mailers/notify_mailer/new_follower_email.html.erb index 0c1436b78..37320362a 100644 --- a/app/views/mailers/notify_mailer/new_follower_email.html.erb +++ b/app/views/mailers/notify_mailer/new_follower_email.html.erb @@ -2,8 +2,11 @@

You have <%= Follow.where(followable_id: @user.id, followable_type: "User").where("created_at > ?", 24.hours.ago).size %> new DEV followers in the past day!

<% end %> -

<%= @follower.name %> just followed you 🤗

-

You now have <%= pluralize(@user.followers_count, "total follower") %>. See all of your recent followers right here.

+

+ <%= @follower.name %> just followed you 🤗

+

You now have <%= pluralize(@user.followers_count, "total follower") %>. See all of your recent followers + right here.

-When someone follows you on dev.to, your posts will be prioritized in their feed and notifications. The perks of popularity I suppose. + When someone follows you on + dev.to, your posts will be prioritized in their feed and notifications. The perks of popularity I suppose.

diff --git a/app/views/mailers/notify_mailer/new_mention_email.html.erb b/app/views/mailers/notify_mailer/new_mention_email.html.erb index b2b6dd02c..1ac884a84 100644 --- a/app/views/mailers/notify_mailer/new_mention_email.html.erb +++ b/app/views/mailers/notify_mailer/new_mention_email.html.erb @@ -1,7 +1,16 @@ -

<%= @mentioner.name %> just mentioned you in their <%= @mention.mentionable_type.downcase %>!

- + + + + +
+

+ <%= @mentioner.name %> just mentioned you in their <%= @mention.mentionable_type.downcase %>! +

+ + +
-
- <%= @mentionable.processed_html.html_safe %> - view on dev.to -
+
+ <%= @mentionable.processed_html.html_safe %> + view on dev.to +
diff --git a/app/views/mailers/notify_mailer/new_message_email.html.erb b/app/views/mailers/notify_mailer/new_message_email.html.erb index 71a72fba0..d905c7689 100644 --- a/app/views/mailers/notify_mailer/new_message_email.html.erb +++ b/app/views/mailers/notify_mailer/new_message_email.html.erb @@ -1,10 +1,18 @@

<%= link_to(@message.user.name, "https://dev.to/#{@message.user.username}") %> sent you a message on DEV Connect

-
-
- <%= @message.message_html %> -

- view on dev.to -
+ + + + + + + +
+
+ <%= @message.message_html %> +

+ view on dev.to +

-You only get emails like this if you have not been active on dev.to/connect in the past day. You may disable this type of email in your settings. +You only get emails like this if you have not been active on + dev.to/connect in the past day. You may disable this type of email in your settings. diff --git a/app/views/mailers/notify_mailer/new_reply_email.html.erb b/app/views/mailers/notify_mailer/new_reply_email.html.erb index 98c2734a9..e7be6a631 100644 --- a/app/views/mailers/notify_mailer/new_reply_email.html.erb +++ b/app/views/mailers/notify_mailer/new_reply_email.html.erb @@ -1,11 +1,18 @@

<%= link_to(@comment.user.name, "https://dev.to/#{@comment.user.username}") %> replied to you on dev.to

- + + + + +
+ + +
<% unless @comment.is_root? %> <%= truncate(strip_tags(@comment.parent_or_root_article.processed_html.html_safe), length: 80) %> <% end %> -
-

re: <%= @comment.commentable.title %>

- <%= @comment.processed_html.html_safe %> - view on dev.to  - read original post -
+
+

re: <%= @comment.commentable.title %>

+ <%= @comment.processed_html.html_safe %> + view on dev.to  + read original post +
diff --git a/app/views/mailers/notify_mailer/tag_moderator_confirmation_email.html.erb b/app/views/mailers/notify_mailer/tag_moderator_confirmation_email.html.erb index c19319f77..58cd1c97b 100644 --- a/app/views/mailers/notify_mailer/tag_moderator_confirmation_email.html.erb +++ b/app/views/mailers/notify_mailer/tag_moderator_confirmation_email.html.erb @@ -1,11 +1,12 @@

-Hey <%= @user.name %>! + Hey <%= @user.name %>!

-Thanks for volunteering to be a DEV tag moderator. We’ve added you as a moderator for <%= @tag_name %>. You’re currently the only non-core DEV member that’s moderating this tag. Over time, we’ll add additional mods to join you because we view moderation as a collaborative endeavor that benefits from the support of multiple people. + Thanks for volunteering to be a DEV tag moderator. We’ve added you as a moderator for + <%= @tag_name %>. You’re currently the only non-core DEV member that’s moderating this tag. Over time, we’ll add additional mods to join you because we view moderation as a collaborative endeavor that benefits from the support of multiple people.

-As a tag moderator, you are now able to: + As a tag moderator, you are now able to:

  • @@ -15,16 +16,18 @@ As a tag moderator, you are now able to: Update the the tag sidebar.
-

For details on how to access these features, visit our tag moderation page.

+

For details on how to access these features, visit our + tag moderation page.

-To aid in communication, we’ve added you to a tag moderator DEV Connect channel. You can use this channel to meet other tag moderators across site, and to coordinate with the DEV team. When in doubt about how to exercise your new privileges, please ask! + To aid in communication, we’ve added you to a tag moderator + DEV Connect channel. You can use this channel to meet other tag moderators across site, and to coordinate with the DEV team. When in doubt about how to exercise your new privileges, please ask!

-Tag moderation is still very much in beta, so we’ll be making adjustments and expanding features over time as we receive feedback. + Tag moderation is still very much in beta, so we’ll be making adjustments and expanding features over time as we receive feedback.

Thanks for volunteering your time to benefit the DEV Community.

-Happy Coding! -
-- DEV Team + Happy Coding! +
+ - DEV Team

diff --git a/app/views/mailers/notify_mailer/unread_notifications_email.html.erb b/app/views/mailers/notify_mailer/unread_notifications_email.html.erb index 6760e8b25..2f903be3e 100644 --- a/app/views/mailers/notify_mailer/unread_notifications_email.html.erb +++ b/app/views/mailers/notify_mailer/unread_notifications_email.html.erb @@ -1,4 +1,4 @@

You're popular!

-Read my notifications + Read my notifications

diff --git a/app/views/mailers/scholarship_mailer/scholarship_awarded_email.html.erb b/app/views/mailers/scholarship_mailer/scholarship_awarded_email.html.erb index 357f12f4f..9d4d61368 100644 --- a/app/views/mailers/scholarship_mailer/scholarship_awarded_email.html.erb +++ b/app/views/mailers/scholarship_mailer/scholarship_awarded_email.html.erb @@ -1,17 +1,19 @@

Congratulations!

-We’ve received your DEV scholarship application and are excited to provide you with a workshop pass for -the year. You’ll get full access to all DEV talks and workshops by visiting dev.to/live during an event. See our events page -to check out the latest schedule. We appreciate your dedication to programming and hope you’ll benefit from these additional -resources. + We’ve received your DEV scholarship application and are excited to provide you with a workshop pass for + the year. You’ll get full access to all DEV talks and workshops by visiting + dev.to/live during an event. See our events page + to check out the latest schedule. We appreciate your dedication to programming and hope you’ll benefit from these additional + resources.

-Thanks again for applying and if within your means, please consider becoming a level 1 or 2 sustaining member. + Thanks again for applying and if within your means, please consider + becoming a level 1 or 2 sustaining member.

-Best, -
-PBJ + Best, +
+ PBJ

diff --git a/app/views/mailers/scholarship_mailer/scholarship_awarded_email.text.erb b/app/views/mailers/scholarship_mailer/scholarship_awarded_email.text.erb index 71568bfc5..b0eeba289 100644 --- a/app/views/mailers/scholarship_mailer/scholarship_awarded_email.text.erb +++ b/app/views/mailers/scholarship_mailer/scholarship_awarded_email.text.erb @@ -1 +1 @@ - Congratulations on your dev.to Scholarship! See https://dev.to/settings/misc for updated details +Congratulations on your dev.to Scholarship! See https://dev.to/settings/misc for updated details diff --git a/app/views/moderations/index.html.erb b/app/views/moderations/index.html.erb index 4b7da0b4f..f60831918 100644 --- a/app/views/moderations/index.html.erb +++ b/app/views/moderations/index.html.erb @@ -8,6 +8,7 @@ border: 2px solid black; font-weight: bold; } + .level-rating-button.selected { background: #9bebff; } @@ -35,8 +36,8 @@ <% end %>
- <%= HTML_Truncator.truncate(article.processed_html, - 200, ellipsis: '... Read Entire Post').html_safe %> + <%= HTML_Truncator.truncate(article.processed_html, + 200, ellipsis: '... Read Entire Post').html_safe %>

Moderate

diff --git a/app/views/moderations/mod.html.erb b/app/views/moderations/mod.html.erb index d3e04b52d..f61e043e6 100644 --- a/app/views/moderations/mod.html.erb +++ b/app/views/moderations/mod.html.erb @@ -1,46 +1,54 @@ @@ -108,7 +121,7 @@ <% end %>
<% end %> -

<%= @article.title %>

+

<%= @article.title %>

<%= truncate @article.user.name, length: 25 %>・<%= @article.readable_publish_date %> diff --git a/app/views/social_previews/tag.html.erb b/app/views/social_previews/tag.html.erb index 9b27d5cc3..3520190f2 100644 --- a/app/views/social_previews/tag.html.erb +++ b/app/views/social_previews/tag.html.erb @@ -2,77 +2,88 @@ <% color = HexComparer.new([@tag.bg_color_hex, @tag.text_color_hex]).brightness(1.4) %> <% dark_color = HexComparer.new([@tag.bg_color_hex, @tag.text_color_hex]).brightness(0.7) %> diff --git a/app/views/social_previews/user.html.erb b/app/views/social_previews/user.html.erb index 80a39e152..445b377f4 100644 --- a/app/views/social_previews/user.html.erb +++ b/app/views/social_previews/user.html.erb @@ -2,70 +2,80 @@ <% color = HexComparer.new([user_colors(@user)[:bg], user_colors(@user)[:text]]).brightness(1.4) %> <% dark_color = HexComparer.new([user_colors(@user)[:bg], user_colors(@user)[:text]]).brightness(0.7) %> @@ -77,7 +87,7 @@

<%= @user.name %> -

+

diff --git a/app/views/stories/_stories_list_script.html.erb b/app/views/stories/_stories_list_script.html.erb index 3b9a3e590..a191d847b 100644 --- a/app/views/stories/_stories_list_script.html.erb +++ b/app/views/stories/_stories_list_script.html.erb @@ -4,23 +4,23 @@ function hasClass(el, cls) { return el.className && new RegExp("(\\s|^)" + cls + "(\\s|$)").test(el.className); } - var activeLinks = document.getElementsByClassName('active'); - Array.prototype.forEach.call(activeLinks, function(el) { el.classList.remove("active"); }); - document.getElementById('articles-list').addEventListener('click', function(event) { - var clickedEl = event.target; - if (hasClass(clickedEl,"bm-initial") || hasClass(clickedEl,"bm-success")){ - //do nothing - } - else if (hasClass(clickedEl.parentNode,"single-article")) { - clickedEl.parentNode.classList.add('active'); - } - else if (hasClass(clickedEl.parentNode.parentNode,"single-article")) { - clickedEl.parentNode.parentNode.classList.add('active'); - } - else if (hasClass(clickedEl.parentNode.parentNode.parentNode,"single-article")) { - clickedEl.parentNode.parentNode.parentNode.classList.add('active'); - } + var activeLinks = document.getElementsByClassName('active'); + Array.prototype.forEach.call(activeLinks, function (el) { + el.classList.remove("active"); + }); + + document.getElementById('articles-list').addEventListener('click', function (event) { + var clickedEl = event.target; + if (hasClass(clickedEl, "bm-initial") || hasClass(clickedEl, "bm-success")) { + //do nothing + } else if (hasClass(clickedEl.parentNode, "single-article")) { + clickedEl.parentNode.classList.add('active'); + } else if (hasClass(clickedEl.parentNode.parentNode, "single-article")) { + clickedEl.parentNode.parentNode.classList.add('active'); + } else if (hasClass(clickedEl.parentNode.parentNode.parentNode, "single-article")) { + clickedEl.parentNode.parentNode.parentNode.classList.add('active'); + } }); } diff --git a/app/views/stripe_subscriptions/create.html.erb b/app/views/stripe_subscriptions/create.html.erb index 42b23bcb7..991a799bf 100644 --- a/app/views/stripe_subscriptions/create.html.erb +++ b/app/views/stripe_subscriptions/create.html.erb @@ -23,12 +23,14 @@
@@ -43,8 +44,11 @@

Grow the team

Invite teammates by sending them the secret and the following instructions:
    -
  1. Sign up at ">https://<%= ApplicationConfig["APP_DOMAIN"] %>
    2. -
  2. Navigate to /settings/organization">https://<%= ApplicationConfig["APP_DOMAIN"] %>/settings/organization
    3. +
  3. Sign up at + ">https://<%= ApplicationConfig["APP_DOMAIN"] %>
    4. +
  4. Navigate to + /settings/organization">https://<%= ApplicationConfig["APP_DOMAIN"] %>/settings/organization +
  5. Paste the secret code below and click Join Organization
Your secret: (You should rotate this regularly)
@@ -125,7 +129,9 @@

Call-to-action box

Customizable text that appears to the right of every post for your organization

-

See an example from the /devteam/the-dev-badge-is-available-on-font-awesome-2ihe" target="_blank">DEV Team.

+

See an example from the + /devteam/the-dev-badge-is-available-on-font-awesome-2ihe" target="_blank">DEV Team. +

<%= f.label "Body text (Limited markdown — bold/italic/etc)" %> <%= f.text_area :cta_body_markdown, maxlength: 256, placeholder: "**This is an example** diff --git a/app/views/users/_profile.html.erb b/app/views/users/_profile.html.erb index d6a2baf1f..7b5517616 100644 --- a/app/views/users/_profile.html.erb +++ b/app/views/users/_profile.html.erb @@ -1,6 +1,5 @@ - -<% unless @user.identities.exists?(provider:'github') %> +<% unless @user.identities.exists?(provider: 'github') %>
" /> CONNECT GITHUB ACCOUNT @@ -8,7 +7,7 @@
<% end %> -<% unless @user.identities.exists?(provider:'twitter') %> +<% unless @user.identities.exists?(provider: 'twitter') %>
<%= ApplicationConfig["APP_DOMAIN"] %>/users/auth/twitter/callback" class="big-button cta" data-no-instant> " /> CONNECT TWITTER ACCOUNT diff --git a/app/views/users/_profile_header.html.erb b/app/views/users/_profile_header.html.erb index 8470300a3..21c601e0c 100644 --- a/app/views/users/_profile_header.html.erb +++ b/app/views/users/_profile_header.html.erb @@ -1,11 +1,13 @@
-

<%= @user.name %> +

+ <%= @user.name %> @@ -24,7 +27,7 @@ <%= @user.summary.present? ? @user.summary : ["404 bio not found"].sample %>

diff --git a/app/views/users/_publishing_from_rss.html.erb b/app/views/users/_publishing_from_rss.html.erb index 293f5bef7..0aec88776 100644 --- a/app/views/users/_publishing_from_rss.html.erb +++ b/app/views/users/_publishing_from_rss.html.erb @@ -1,15 +1,18 @@

Publishing to dev.to from RSS

- Posts will land in your dashboard as drafts, and then you can publish from there (or give dev.to admins permission to do so). + Posts will land in your dashboard + as drafts, and then you can publish from there (or give dev.to admins permission to do so).

Formatting will typically look good, but you may have to make manual fixes. In the case of Medium, you may have to manually fix embeds.

- To find out more about how drafts are created from your feed, read this guide. + To find out more about how drafts are created from your feed, read this + guide.

- Your feed will be fetched every time you submit this form and updates will be automatically fetched periodically thereafter. Contact yo@dev.to if you encounter issues. + Your feed will be fetched every time you submit this form and updates will be automatically fetched periodically thereafter. Contact + yo@dev.to if you encounter issues.

FYI: Medium RSS feed URLs are https://medium.com/feed/@your_username diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index bc718fa5f..6aefcd4ce 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -14,7 +14,8 @@ <% if params[:state] == "previous-registration" %>

- There is an existing account authorized with that social account. Contact yo@dev.to if this is a mistake. + There is an existing account authorized with that social account. Contact + yo@dev.to if this is a mistake.
<% end %> @@ -42,7 +43,8 @@
Email Verification
- you have requested a change to <%= @user.unconfirmed_email %>
+ you have requested a change to + <%= @user.unconfirmed_email %>
check your inbox for the verification link to finalize the change.
@@ -74,7 +76,7 @@
<% @tab_list.each do |possible_tab| %> - <% if @tab == possible_tab.downcase.gsub(" ","-") %> + <% if @tab == possible_tab.downcase.gsub(" ", "-") %>
<%= possible_tab %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index d9fd183fa..4e765bac3 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -6,13 +6,15 @@ <% cache "main-user-profile-header-area-#{@user.id}-#{@user.profile_updated_at}", expires_in: 10.days do %>
-

<%= @user.name %> +

+ <%= @user.name %> @@ -31,7 +34,7 @@ <%= @user.summary.presence || ["404 bio not found"].sample %>

@@ -99,10 +102,10 @@ <% end %>
" - data-feed="<%= params[:timeframe] || "base-feed" %>" - data-articles-since="0"> + data-params="<%= params.to_json(only: %i[tag username q]) %>" data-which="<%= @list_of %>" + data-algolia-tag="<%= "user_#{@user.id}" %>" + data-feed="<%= params[:timeframe] || "base-feed" %>" + data-articles-since="0"> <%= render "users/sidebar" %>