diff --git a/lib/philomena_web/templates/activity/_channel_strip.html.heex b/lib/philomena_web/templates/activity/_channel_strip.html.heex index 143e49a0..8072ea2c 100644 --- a/lib/philomena_web/templates/activity/_channel_strip.html.heex +++ b/lib/philomena_web/templates/activity/_channel_strip.html.heex @@ -16,13 +16,11 @@
<%= @channel.viewers %> - <%= - if @channel.viewers == 1 do - "viewer" - else - "viewers" - end - %> + <%= if @channel.viewers == 1 do + "viewer" + else + "viewers" + end %> <% else %> OFF AIR diff --git a/lib/philomena_web/templates/activity/_comment_strip.html.heex b/lib/philomena_web/templates/activity/_comment_strip.html.heex index 5660ee55..81e0eb95 100644 --- a/lib/philomena_web/templates/activity/_comment_strip.html.heex +++ b/lib/philomena_web/templates/activity/_comment_strip.html.heex @@ -4,8 +4,7 @@
- # - <%= @comment.image.id %> + # <%= @comment.image.id %> by diff --git a/lib/philomena_web/templates/activity/_topic_strip.html.heex b/lib/philomena_web/templates/activity/_topic_strip.html.heex index d9e85222..a0589b65 100644 --- a/lib/philomena_web/templates/activity/_topic_strip.html.heex +++ b/lib/philomena_web/templates/activity/_topic_strip.html.heex @@ -8,7 +8,5 @@ <%= link("replied to", to: ~p"/forums/#{@topic.forum}/topics/#{@topic}?#{[post_id: @topic.last_post]}" <> "#post_#{@topic.last_post.id}") %> <% end %> - <%= link(@topic.title, to: ~p"/forums/#{@topic.forum}/topics/#{@topic}") %> - in - <%= link(@topic.forum.name, to: ~p"/forums/#{@topic.forum}") %> + <%= link(@topic.title, to: ~p"/forums/#{@topic.forum}/topics/#{@topic}") %> in <%= link(@topic.forum.name, to: ~p"/forums/#{@topic.forum}") %>
diff --git a/lib/philomena_web/templates/admin/advert/index.html.heex b/lib/philomena_web/templates/admin/advert/index.html.heex index 9732ca92..b186ef58 100644 --- a/lib/philomena_web/templates/admin/advert/index.html.heex +++ b/lib/philomena_web/templates/admin/advert/index.html.heex @@ -3,8 +3,7 @@
- - New advert + New advert <%= pagination %>
@@ -77,16 +76,11 @@ <%= advert.restrictions %> - Impressions: - <%= advert.impressions %> -
- Clicks: - <%= advert.clicks %> + Impressions: <%= advert.impressions %> +
Clicks: <%= advert.clicks %> - <%= link("Edit", to: ~p"/admin/adverts/#{advert}/edit") %> - • - <%= link("Destroy", to: ~p"/admin/adverts/#{advert}", data: [confirm: "Are you really, really sure?", method: "delete"]) %> + <%= link("Edit", to: ~p"/admin/adverts/#{advert}/edit") %> • <%= link("Destroy", to: ~p"/admin/adverts/#{advert}", data: [confirm: "Are you really, really sure?", method: "delete"]) %> <% end %> diff --git a/lib/philomena_web/templates/admin/artist_link/index.html.heex b/lib/philomena_web/templates/admin/artist_link/index.html.heex index 515d3eab..6b8097fd 100644 --- a/lib/philomena_web/templates/admin/artist_link/index.html.heex +++ b/lib/philomena_web/templates/admin/artist_link/index.html.heex @@ -56,13 +56,8 @@ <%= link_state_name(link) %> <%= if contacted?(link) do %> -
- by - <%= link.contacted_by_user.name %> -
- ( - <%= pretty_time(link.contacted_at) %> - ) +
by <%= link.contacted_by_user.name %> +
( <%= pretty_time(link.contacted_at) %> ) <% end %> @@ -77,14 +72,10 @@ <% end %> - <%= link("View", to: ~p"/profiles/#{link.user}/artist_links/#{link}") %> - • - <%= link("Edit", to: ~p"/profiles/#{link.user}/artist_links/#{link}/edit") %> + <%= link("View", to: ~p"/profiles/#{link.user}/artist_links/#{link}") %> • <%= link("Edit", to: ~p"/profiles/#{link.user}/artist_links/#{link}/edit") %> - <%= link("Verify", to: ~p"/admin/artist_links/#{link}/verification", method: :post) %> - • - <%= link("Reject", to: ~p"/admin/artist_links/#{link}/reject", method: :post) %> + <%= link("Verify", to: ~p"/admin/artist_links/#{link}/verification", method: :post) %> • <%= link("Reject", to: ~p"/admin/artist_links/#{link}/reject", method: :post) %>
<%= if not verified?(link) do %> <%= if contacted?(link) do %> diff --git a/lib/philomena_web/templates/admin/badge/index.html.heex b/lib/philomena_web/templates/admin/badge/index.html.heex index a556b5d1..b1fcba5d 100644 --- a/lib/philomena_web/templates/admin/badge/index.html.heex +++ b/lib/philomena_web/templates/admin/badge/index.html.heex @@ -6,8 +6,7 @@
- - New Badge + New Badge <%= pagination %>
@@ -36,9 +35,7 @@ <%= badge_image(badge, width: 32, height: 32) %> - <%= link("Users", to: ~p"/admin/badges/#{badge}/users") %> - • - <%= link("Edit", to: ~p"/admin/badges/#{badge}/edit") %> + <%= link("Users", to: ~p"/admin/badges/#{badge}/users") %> • <%= link("Edit", to: ~p"/admin/badges/#{badge}/edit") %> <% end %> diff --git a/lib/philomena_web/templates/admin/badge/user/index.html.heex b/lib/philomena_web/templates/admin/badge/user/index.html.heex index ee4095b5..40e9425e 100644 --- a/lib/philomena_web/templates/admin/badge/user/index.html.heex +++ b/lib/philomena_web/templates/admin/badge/user/index.html.heex @@ -1,7 +1,5 @@

- Users with - <%= @badge.title %> - badge + Users with <%= @badge.title %> badge

<% route = fn p -> ~p"/admin/badges/#{@badge}/users?#{p}" end %> <% pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @users, route: route, conn: @conn) %> diff --git a/lib/philomena_web/templates/admin/dnp_entry/index.html.heex b/lib/philomena_web/templates/admin/dnp_entry/index.html.heex index 98391e09..2b5f683f 100644 --- a/lib/philomena_web/templates/admin/dnp_entry/index.html.heex +++ b/lib/philomena_web/templates/admin/dnp_entry/index.html.heex @@ -68,8 +68,7 @@ <%= pretty_state(request) %> <%= if request.modifying_user do %> - by - <%= link(request.modifying_user.name, to: ~p"/profiles/#{request.modifying_user}") %> + by <%= link(request.modifying_user.name, to: ~p"/profiles/#{request.modifying_user}") %> <% end %> @@ -79,30 +78,25 @@ <%= pretty_time(request.updated_at) %> - <%= link("Show", to: ~p"/dnp/#{request}") %> - • - <%= link("Send PM", to: ~p"/conversations/new?#{[recipient: request.requesting_user.name]}") %> + <%= link("Show", to: ~p"/dnp/#{request}") %> • <%= link("Send PM", to: ~p"/conversations/new?#{[recipient: request.requesting_user.name]}") %> <%= case request.aasm_state do %> <% s when s in ["requested", "claimed"] -> %> - • - <%= link("Claim", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "claimed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> - • - <%= link("Approve", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "listed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> - • - <%= link("Close", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "closed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> + • <%= link("Claim", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "claimed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> • <%= link("Approve", + to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "listed"]}", + data: [method: "post", confirm: "Are you really, really sure?"] + ) %> • <%= link("Close", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "closed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> <% "listed" -> %> - • - <%= link("Rescind", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "rescinded"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> - • - <%= link("Close", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "closed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> + • <%= link("Rescind", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "rescinded"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> • <%= link("Close", + to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "closed"]}", + data: [method: "post", confirm: "Are you really, really sure?"] + ) %> <% s when s in ["rescinded", "acknowledged"] -> %> - • - <%= link("Claim", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "acknowledged"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> - • - <%= link("Close", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "closed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> + • <%= link("Claim", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "acknowledged"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> • <%= link("Close", + to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "closed"]}", + data: [method: "post", confirm: "Are you really, really sure?"] + ) %> <% _state -> %> - • - <%= link("Claim", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "claimed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> + • <%= link("Claim", to: ~p"/admin/dnp_entries/#{request}/transition?#{[state: "claimed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> <% end %> diff --git a/lib/philomena_web/templates/admin/donation/user/index.html.heex b/lib/philomena_web/templates/admin/donation/user/index.html.heex index 14d6e81d..5442b79e 100644 --- a/lib/philomena_web/templates/admin/donation/user/index.html.heex +++ b/lib/philomena_web/templates/admin/donation/user/index.html.heex @@ -1,7 +1,6 @@

- <%= @user.name %> - 's Donations + <%= @user.name %> 's Donations

<%= render(PhilomenaWeb.Admin.DonationView, "_table.html", donations: @donations, conn: @conn) %>

diff --git a/lib/philomena_web/templates/admin/fingerprint_ban/index.html.heex b/lib/philomena_web/templates/admin/fingerprint_ban/index.html.heex index 6d1a9a64..64cde6b6 100644 --- a/lib/philomena_web/templates/admin/fingerprint_ban/index.html.heex +++ b/lib/philomena_web/templates/admin/fingerprint_ban/index.html.heex @@ -12,8 +12,7 @@
- - New fingerprint ban + New fingerprint ban <%= pagination %>
@@ -59,8 +58,7 @@ <%= if present?(ban.note) do %>

- Note: - <%= ban.note %> + Note: <%= ban.note %>

<% end %> @@ -71,8 +69,7 @@ <%= link("Edit", to: ~p"/admin/fingerprint_bans/#{ban}/edit") %> <%= if @current_user.role == "admin" do %> - • - <%= link("Destroy", to: ~p"/admin/fingerprint_bans/#{ban}", data: [confirm: "Are you really, really sure?", method: "delete"]) %> + • <%= link("Destroy", to: ~p"/admin/fingerprint_bans/#{ban}", data: [confirm: "Are you really, really sure?", method: "delete"]) %> <% end %> diff --git a/lib/philomena_web/templates/admin/mod_note/_table.html.heex b/lib/philomena_web/templates/admin/mod_note/_table.html.heex index 6d155fe2..df88520a 100644 --- a/lib/philomena_web/templates/admin/mod_note/_table.html.heex +++ b/lib/philomena_web/templates/admin/mod_note/_table.html.heex @@ -34,9 +34,7 @@ <%= link(note.moderator.name, to: ~p"/profiles/#{note.moderator}") %> - <%= link("Edit", to: ~p"/admin/mod_notes/#{note}/edit") %> - • - <%= link("Delete", to: ~p"/admin/mod_notes/#{note}", data: [confirm: "Are you really, really sure?", method: "delete"]) %> + <%= link("Edit", to: ~p"/admin/mod_notes/#{note}/edit") %> • <%= link("Delete", to: ~p"/admin/mod_notes/#{note}", data: [confirm: "Are you really, really sure?", method: "delete"]) %> <% end %> diff --git a/lib/philomena_web/templates/admin/mod_note/edit.html.heex b/lib/philomena_web/templates/admin/mod_note/edit.html.heex index db8cb4db..4e1aff7b 100644 --- a/lib/philomena_web/templates/admin/mod_note/edit.html.heex +++ b/lib/philomena_web/templates/admin/mod_note/edit.html.heex @@ -1,6 +1,5 @@

- Editing mod note for - <%= @mod_note.notable_type %> + Editing mod note for <%= @mod_note.notable_type %> <%= @mod_note.notable_id %>

<%= render(PhilomenaWeb.Admin.ModNoteView, "_form.html", changeset: @changeset, action: ~p"/admin/mod_notes/#{@mod_note}", conn: @conn) %> diff --git a/lib/philomena_web/templates/admin/mod_note/new.html.heex b/lib/philomena_web/templates/admin/mod_note/new.html.heex index 491ae650..e3843830 100644 --- a/lib/philomena_web/templates/admin/mod_note/new.html.heex +++ b/lib/philomena_web/templates/admin/mod_note/new.html.heex @@ -1,6 +1,5 @@

- New mod note for - <%= @conn.params["notable_type"] %> + New mod note for <%= @conn.params["notable_type"] %> <%= @conn.params["notable_id"] %>

<%= render(PhilomenaWeb.Admin.ModNoteView, "_form.html", changeset: @changeset, action: ~p"/admin/mod_notes", conn: @conn) %> diff --git a/lib/philomena_web/templates/admin/report/_reports.html.heex b/lib/philomena_web/templates/admin/report/_reports.html.heex index c7c372ba..2f044de3 100644 --- a/lib/philomena_web/templates/admin/report/_reports.html.heex +++ b/lib/philomena_web/templates/admin/report/_reports.html.heex @@ -57,19 +57,15 @@ <%= link("Show", to: ~p"/admin/reports/#{report}") %> <%= if report.open do %> <%= if report.user do %> - • - <%= link("Send PM", to: ~p"/conversations/new?#{[recipient: report.user.name]}") %> + • <%= link("Send PM", to: ~p"/conversations/new?#{[recipient: report.user.name]}") %> <% end %> <%= if is_nil(report.admin) and not current?(report.admin, @conn.assigns.current_user) do %> - • - <%= link("Claim", to: ~p"/admin/reports/#{report}/claim", data: [method: "post"]) %> + • <%= link("Claim", to: ~p"/admin/reports/#{report}/claim", data: [method: "post"]) %> <% end %> <%= if current?(report.admin, @conn.assigns.current_user) do %> - • - <%= link("Release", to: ~p"/admin/reports/#{report}/claim", data: [method: "delete"]) %> + • <%= link("Release", to: ~p"/admin/reports/#{report}/claim", data: [method: "delete"]) %> <% end %> - • - <%= link("Close", to: ~p"/admin/reports/#{report}/close", data: [method: "post", confirm: "Are you really, really sure?"]) %> + • <%= link("Close", to: ~p"/admin/reports/#{report}/close", data: [method: "post", confirm: "Are you really, really sure?"]) %> <% end %> diff --git a/lib/philomena_web/templates/admin/report/index.html.heex b/lib/philomena_web/templates/admin/report/index.html.heex index d5903302..10360f9a 100644 --- a/lib/philomena_web/templates/admin/report/index.html.heex +++ b/lib/philomena_web/templates/admin/report/index.html.heex @@ -55,8 +55,6 @@ <% end %>
diff --git a/lib/philomena_web/templates/admin/report/show.html.heex b/lib/philomena_web/templates/admin/report/show.html.heex index a7f185a7..3ceabd46 100644 --- a/lib/philomena_web/templates/admin/report/show.html.heex +++ b/lib/philomena_web/templates/admin/report/show.html.heex @@ -23,8 +23,7 @@
- Reported - <%= pretty_time(@report.created_at) %> + Reported <%= pretty_time(@report.created_at) %>
<%= link_to_ip(@conn, @report.ip) %> diff --git a/lib/philomena_web/templates/admin/site_notice/index.html.heex b/lib/philomena_web/templates/admin/site_notice/index.html.heex index b7cd35dc..5377da66 100644 --- a/lib/philomena_web/templates/admin/site_notice/index.html.heex +++ b/lib/philomena_web/templates/admin/site_notice/index.html.heex @@ -6,8 +6,7 @@
- - New site notice + New site notice <%= pagination %>
@@ -50,9 +49,7 @@ <%= live_text(site_notice) %> - <%= link("Edit", to: ~p"/admin/site_notices/#{site_notice}/edit") %> - • - <%= link("Destroy", to: ~p"/admin/site_notices/#{site_notice}", data: [confirm: "Are you really, really sure?", method: "delete"]) %> + <%= link("Edit", to: ~p"/admin/site_notices/#{site_notice}/edit") %> • <%= link("Destroy", to: ~p"/admin/site_notices/#{site_notice}", data: [confirm: "Are you really, really sure?", method: "delete"]) %> <% end %> diff --git a/lib/philomena_web/templates/admin/subnet_ban/index.html.heex b/lib/philomena_web/templates/admin/subnet_ban/index.html.heex index fdef24f5..ec769ba4 100644 --- a/lib/philomena_web/templates/admin/subnet_ban/index.html.heex +++ b/lib/philomena_web/templates/admin/subnet_ban/index.html.heex @@ -12,8 +12,7 @@
- - New subnet ban + New subnet ban <%= pagination %>
@@ -59,8 +58,7 @@ <%= if present?(ban.note) do %>

- Note: - <%= ban.note %> + Note: <%= ban.note %>

<% end %> @@ -71,8 +69,7 @@ <%= link("Edit", to: ~p"/admin/subnet_bans/#{ban}/edit") %> <%= if @current_user.role == "admin" do %> - • - <%= link("Destroy", to: ~p"/admin/subnet_bans/#{ban}", data: [confirm: "Are you really, really sure?", method: "delete"]) %> + • <%= link("Destroy", to: ~p"/admin/subnet_bans/#{ban}", data: [confirm: "Are you really, really sure?", method: "delete"]) %> <% end %> diff --git a/lib/philomena_web/templates/admin/user/force_filter/new.html.heex b/lib/philomena_web/templates/admin/user/force_filter/new.html.heex index 62d5b791..b5c442d8 100644 --- a/lib/philomena_web/templates/admin/user/force_filter/new.html.heex +++ b/lib/philomena_web/templates/admin/user/force_filter/new.html.heex @@ -1,6 +1,5 @@

- Force-assigning a filter for user - <%= @user.name %> + Force-assigning a filter for user <%= @user.name %>

<%= form_for @changeset, ~p"/admin/users/#{@user}/force_filter", [method: "post"], fn f -> %>
diff --git a/lib/philomena_web/templates/admin/user/index.html.heex b/lib/philomena_web/templates/admin/user/index.html.heex index 0ab2db37..bf8eb9af 100644 --- a/lib/philomena_web/templates/admin/user/index.html.heex +++ b/lib/philomena_web/templates/admin/user/index.html.heex @@ -7,9 +7,7 @@ <%= submit("Search", class: "button hform__button") %>
<% end %> -<%= link("Site staff", to: ~p"/admin/users?#{[staff: 1]}") %> -• -<%= link("2FA users", to: ~p"/admin/users?#{[twofactor: 1]}") %> +<%= link("Site staff", to: ~p"/admin/users?#{[staff: 1]}") %> • <%= link("2FA users", to: ~p"/admin/users?#{[twofactor: 1]}") %> <% route = fn p -> ~p"/admin/users?#{p}" end %> <% pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @users, route: route, conn: @conn, params: page_params(@conn.params)) %>
@@ -48,13 +46,11 @@ <%= cond do %> <% user.otp_required_for_login -> %> <% user.role != "user" and !user.otp_required_for_login -> %> <% true -> %> <% end %> @@ -92,8 +88,7 @@ <%= if can?(@conn, :edit, user) do %> <%= link to: ~p"/admin/users/#{user}/edit" do %> - - Edit + Edit <% end %> <% end %> <% # = if user.deleted_at do %> @@ -103,14 +98,12 @@ <% # ' • %> <%= if can?(@conn, :index, Philomena.Bans.User) do %> <%= link to: ~p"/admin/user_bans/new?#{[username: user.name]}" do %> - - Ban + Ban <% end %> <% end %> <%= if can?(@conn, :edit, Philomena.ArtistLinks.ArtistLink) do %> <%= link to: ~p"/profiles/#{user}/artist_links/new" do %> - - Add link + Add link <% end %> <% end %> diff --git a/lib/philomena_web/templates/admin/user_ban/index.html.heex b/lib/philomena_web/templates/admin/user_ban/index.html.heex index ce2a5832..b130adb0 100644 --- a/lib/philomena_web/templates/admin/user_ban/index.html.heex +++ b/lib/philomena_web/templates/admin/user_ban/index.html.heex @@ -12,8 +12,7 @@
- - New user ban + New user ban <%= pagination %>
@@ -59,8 +58,7 @@ <%= if present?(ban.note) do %>

- Note: - <%= ban.note %> + Note: <%= ban.note %>

<% end %> @@ -71,8 +69,7 @@ <%= link("Edit", to: ~p"/admin/user_bans/#{ban}/edit") %> <%= if @current_user.role == "admin" do %> - • - <%= link("Destroy", to: ~p"/admin/user_bans/#{ban}", data: [confirm: "Are you really, really sure?", method: "delete"]) %> + • <%= link("Destroy", to: ~p"/admin/user_bans/#{ban}", data: [confirm: "Are you really, really sure?", method: "delete"]) %> <% end %> diff --git a/lib/philomena_web/templates/advert/_box.html.heex b/lib/philomena_web/templates/advert/_box.html.heex index 822f92ef..f302c208 100644 --- a/lib/philomena_web/templates/advert/_box.html.heex +++ b/lib/philomena_web/templates/advert/_box.html.heex @@ -1,17 +1,13 @@
- Interested in advertising on Derpibooru? - <%= link("Click here", to: "/pages/advertising") %> - for information! + Interested in advertising on Derpibooru? <%= link("Click here", to: "/pages/advertising") %> for information!
{@advert.title}

- Derpibooru costs over $25 a day to operate - - <%= link("help support us financially", to: "/pages/donations") %> - ! + Derpibooru costs over $25 a day to operate - <%= link("help support us financially", to: "/pages/donations") %> !

diff --git a/lib/philomena_web/templates/ban/_ban_reason.html.heex b/lib/philomena_web/templates/ban/_ban_reason.html.heex index 416c0dd4..c3706bb5 100644 --- a/lib/philomena_web/templates/ban/_ban_reason.html.heex +++ b/lib/philomena_web/templates/ban/_ban_reason.html.heex @@ -3,18 +3,13 @@ You've been banned!

- You cannot create comments or posts or update metadata (or do anything but read, really) until - <%= pretty_time(@conn.assigns.current_ban.valid_until) %> - . + You cannot create comments or posts or update metadata (or do anything but read, really) until <%= pretty_time(@conn.assigns.current_ban.valid_until) %> .

- The reason given by the administrator who banned you is: -
+ The reason given by the administrator who banned you is:
<%= @conn.assigns.current_ban.reason %> - (Ban ID: - <%= @conn.assigns.current_ban.generated_ban_id %> - ). + (Ban ID: <%= @conn.assigns.current_ban.generated_ban_id %> ).

diff --git a/lib/philomena_web/templates/channel/_channel_box.html.heex b/lib/philomena_web/templates/channel/_channel_box.html.heex index e0d2d8b6..ceb9d480 100644 --- a/lib/philomena_web/templates/channel/_channel_box.html.heex +++ b/lib/philomena_web/templates/channel/_channel_box.html.heex @@ -44,12 +44,10 @@ <% end %> <%= if can?(@conn, :edit, @channel) do %> - - Edit + Edit - - Delete + Delete <% end %> <%= render(PhilomenaWeb.Channel.SubscriptionView, "_subscription.html", conn: @conn, watching: @subscriptions[@channel.id], channel: @channel) %> diff --git a/lib/philomena_web/templates/channel/_form.html.heex b/lib/philomena_web/templates/channel/_form.html.heex index c486a214..d7ac91e6 100644 --- a/lib/philomena_web/templates/channel/_form.html.heex +++ b/lib/philomena_web/templates/channel/_form.html.heex @@ -32,8 +32,7 @@ piczel_channel_name - . -
+ .

diff --git a/lib/philomena_web/templates/channel/index.html.heex b/lib/philomena_web/templates/channel/index.html.heex index 6f98a666..3c123432 100644 --- a/lib/philomena_web/templates/channel/index.html.heex +++ b/lib/philomena_web/templates/channel/index.html.heex @@ -16,13 +16,11 @@
<%= if @conn.cookies["chan_nsfw"] == "true" do %> - - Hide NSFW streams + Hide NSFW streams <% else %> - - Show NSFW streams + Show NSFW streams <% end %>
diff --git a/lib/philomena_web/templates/channel/subscription/_subscription.html.heex b/lib/philomena_web/templates/channel/subscription/_subscription.html.heex index f3740d08..7cd51dd4 100644 --- a/lib/philomena_web/templates/channel/subscription/_subscription.html.heex +++ b/lib/philomena_web/templates/channel/subscription/_subscription.html.heex @@ -1,22 +1,20 @@ -<% - watch_path = ~p"/channels/#{@channel}/subscription" +<% watch_path = ~p"/channels/#{@channel}/subscription" - watch_class = - if @watching do - "hidden" - else - "" - end +watch_class = + if @watching do + "hidden" + else + "" + end - unwatch_path = ~p"/channels/#{@channel}/subscription" +unwatch_path = ~p"/channels/#{@channel}/subscription" - unwatch_class = - if @watching do - "" - else - "hidden" - end -%> +unwatch_class = + if @watching do + "" + else + "hidden" + end %> <%= if @conn.assigns.current_user do %> diff --git a/lib/philomena_web/templates/comment/_comment.html.heex b/lib/philomena_web/templates/comment/_comment.html.heex index 8b59b888..228980d1 100644 --- a/lib/philomena_web/templates/comment/_comment.html.heex +++ b/lib/philomena_web/templates/comment/_comment.html.heex @@ -3,22 +3,19 @@

- - This comment is pending approval from a staff member. + This comment is pending approval from a staff member.

<%= if can?(@conn, :approve, @comment) do %>

@@ -44,12 +41,9 @@
<%= if @comment.hidden_from_users do %> - Deletion reason: - <%= @comment.deletion_reason %> + Deletion reason: <%= @comment.deletion_reason %> <%= if can?(@conn, :hide, @comment) and not is_nil(@comment.deleted_by) do %> - ( - <%= @comment.deleted_by.name %> - ) + ( <%= @comment.deleted_by.name %> ) <% end %> <%= if can?(@conn, :hide, @comment) do %> @@ -78,19 +72,16 @@ <%= cond do %> <% @comment.hidden_from_users and not @comment.destroyed_content -> %> <%= link(to: ~p"/images/#{@comment.image_id}/comments/#{@comment}/hide", data: [confirm: "Are you sure?"], method: "delete", class: "communication__interaction") do %> - - Restore + Restore <% end %> <%= if can?(@conn, :delete, @comment) do %> <%= link(to: ~p"/images/#{@comment.image_id}/comments/#{@comment}/delete", data: [confirm: "Are you sure?"], method: "post", class: "communication__interaction") do %> - - Delete Contents + Delete Contents <% end %> <% end %> <% not @comment.hidden_from_users and not @comment.destroyed_content -> %> - - Delete + Delete <% true -> %> <% end %> diff --git a/lib/philomena_web/templates/comment/_comment_options.html.heex b/lib/philomena_web/templates/comment/_comment_options.html.heex index aa128dd5..bf243527 100644 --- a/lib/philomena_web/templates/comment/_comment_options.html.heex +++ b/lib/philomena_web/templates/comment/_comment_options.html.heex @@ -1,18 +1,14 @@
- Posted - <%= pretty_time(@comment.created_at) %> + Posted <%= pretty_time(@comment.created_at) %> - - Report + Report <%= if not is_nil(@comment.edited_at) and can?(@conn, :show, @comment) do %>
- Edited - <%= pretty_time(@comment.edited_at) %> + Edited <%= pretty_time(@comment.edited_at) %> <%= if @comment.edit_reason not in [nil, ""] do %> - because: - <%= @comment.edit_reason %> + because: <%= @comment.edit_reason %> <% end %> <% end %> @@ -20,32 +16,26 @@
<% link_path = ~p"/images/#{@comment.image}" <> "#comment_#{@comment.id}" %> <% safe_author = PhilomenaWeb.PostView.markdown_safe_author(@comment) %> - <% - quote_body = - if @comment.hidden_from_users do - "" - else - @comment.body - end - %> + <% quote_body = + if @comment.hidden_from_users do + "" + else + @comment.body + end %> - - Link + Link - - Quote + Quote - - Reply + Reply <%= if can?(@conn, :edit, @comment) do %> - - Edit + Edit diff --git a/lib/philomena_web/templates/comment/_comment_with_image.html.heex b/lib/philomena_web/templates/comment/_comment_with_image.html.heex index 019ddc6f..b7c64dac 100644 --- a/lib/philomena_web/templates/comment/_comment_with_image.html.heex +++ b/lib/philomena_web/templates/comment/_comment_with_image.html.heex @@ -14,12 +14,9 @@
<%= if @comment.hidden_from_users do %> - Deletion reason: - <%= @comment.deletion_reason %> + Deletion reason: <%= @comment.deletion_reason %> <%= if can?(@conn, :hide, @comment) and not is_nil(@comment.deleted_by) do %> - ( - <%= @comment.deleted_by.name %> - ) + ( <%= @comment.deleted_by.name %> ) <% end %> <%= if can?(@conn, :hide, @comment) do %> @@ -48,19 +45,16 @@ <%= cond do %> <% @comment.hidden_from_users and not @comment.destroyed_content -> %> <%= link(to: ~p"/images/#{@comment.image_id}/comments/#{@comment}/hide", data: [confirm: "Are you sure?"], method: "delete", class: "communication__interaction") do %> - - Restore + Restore <% end %> <%= if can?(@conn, :delete, @comment) do %> <%= link(to: ~p"/images/#{@comment.image_id}/comments/#{@comment}/delete", data: [confirm: "Are you sure?"], method: "post", class: "communication__interaction") do %> - - Delete Contents + Delete Contents <% end %> <% end %> <% not @comment.hidden_from_users and not @comment.destroyed_content -> %> - - Delete + Delete <% true -> %> <% end %> diff --git a/lib/philomena_web/templates/commission/_directory_results.html.heex b/lib/philomena_web/templates/commission/_directory_results.html.heex index fc5b8506..a3d90051 100644 --- a/lib/philomena_web/templates/commission/_directory_results.html.heex +++ b/lib/philomena_web/templates/commission/_directory_results.html.heex @@ -1,7 +1,5 @@ -<% - route = fn p -> ~p"/commissions?#{p}" end - pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @commissions, route: route, conn: @conn, params: [commission: @conn.params["commission"]]) -%> +<% route = fn p -> ~p"/commissions?#{p}" end +pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @commissions, route: route, conn: @conn, params: [commission: @conn.params["commission"]]) %>
@@ -39,11 +37,7 @@ Price Range: - $ - <%= Decimal.round(min.base_price, 2) |> Decimal.to_string() %> - - $ - <%= Decimal.round(max.base_price, 2) |> Decimal.to_string() %> - USD + $ <%= Decimal.round(min.base_price, 2) |> Decimal.to_string() %> - $ <%= Decimal.round(max.base_price, 2) |> Decimal.to_string() %> USD

diff --git a/lib/philomena_web/templates/conversation/index.html.heex b/lib/philomena_web/templates/conversation/index.html.heex index 2e8f5601..0b7c98b1 100644 --- a/lib/philomena_web/templates/conversation/index.html.heex +++ b/lib/philomena_web/templates/conversation/index.html.heex @@ -1,7 +1,5 @@ -<% - route = fn p -> ~p"/conversations?#{p}" end - pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @conversations, route: route, conn: @conn) -%> +<% route = fn p -> ~p"/conversations?#{p}" end +pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @conversations, route: route, conn: @conn) %>

My Conversations

@@ -12,8 +10,7 @@
- - Create New Conversation + Create New Conversation
@@ -39,20 +36,14 @@ <%= link(c.title, to: ~p"/conversations/#{c}") %>
<%= count %> - <%= pluralize("message", "messages", count) %> - ; started - <%= pretty_time(c.created_at) %> - , last message - <%= pretty_time(c.last_message_at) %> + <%= pluralize("message", "messages", count) %> ; started <%= pretty_time(c.created_at) %> , last message <%= pretty_time(c.last_message_at) %>
<%= render(PhilomenaWeb.UserAttributionView, "_user.html", object: %{user: other_party(@current_user, c)}, conn: @conn) %> - <%= link("Last message", to: last_message_path(c, count)) %> - • - <%= link("Hide", to: ~p"/conversations/#{c}/hide", data: [method: "post"], data: [confirm: "Are you really, really sure?"]) %> + <%= link("Last message", to: last_message_path(c, count)) %> • <%= link("Hide", to: ~p"/conversations/#{c}/hide", data: [method: "post"], data: [confirm: "Are you really, really sure?"]) %> <% end %> diff --git a/lib/philomena_web/templates/conversation/new.html.heex b/lib/philomena_web/templates/conversation/new.html.heex index 2fe65c41..88c46dd9 100644 --- a/lib/philomena_web/templates/conversation/new.html.heex +++ b/lib/philomena_web/templates/conversation/new.html.heex @@ -3,8 +3,7 @@
- <%= link("Conversations", to: ~p"/conversations") %> - » + <%= link("Conversations", to: ~p"/conversations") %> » New Conversation diff --git a/lib/philomena_web/templates/conversation/show.html.heex b/lib/philomena_web/templates/conversation/show.html.heex index 49cf5cb9..2725d403 100644 --- a/lib/philomena_web/templates/conversation/show.html.heex +++ b/lib/philomena_web/templates/conversation/show.html.heex @@ -1,18 +1,12 @@ -<% - route = fn p -> ~p"/conversations/#{@conversation}?#{p}" end - pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @messages, route: route, conn: @conn) - other = other_party(@current_user, @conversation) -%> +<% route = fn p -> ~p"/conversations/#{@conversation}?#{p}" end +pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @messages, route: route, conn: @conn) +other = other_party(@current_user, @conversation) %>

<%= @conversation.title %>

- <%= link("Message Center", to: ~p"/conversations") %> - » - <%= link(@conversation.title, to: ~p"/conversations/#{@conversation}") %> - Conversation with - <%= render(PhilomenaWeb.UserAttributionView, "_user.html", object: %{user: other}, conn: @conn) %> + <%= link("Message Center", to: ~p"/conversations") %> » <%= link(@conversation.title, to: ~p"/conversations/#{@conversation}") %> Conversation with <%= render(PhilomenaWeb.UserAttributionView, "_user.html", object: %{user: other}, conn: @conn) %>
@@ -84,8 +78,7 @@ We'd like to ask you to make a new conversation. Don't worry, this one won't go anywhere if you need to refer back to it.

- <%= link("Click here", to: ~p"/conversations/new?#{[receipient: other.name]}") %> - to make a new conversation with this user. + <%= link("Click here", to: ~p"/conversations/new?#{[receipient: other.name]}") %> to make a new conversation with this user.

<% end %> diff --git a/lib/philomena_web/templates/dnp_entry/index.html.heex b/lib/philomena_web/templates/dnp_entry/index.html.heex index c168fb7e..7b75a41d 100644 --- a/lib/philomena_web/templates/dnp_entry/index.html.heex +++ b/lib/philomena_web/templates/dnp_entry/index.html.heex @@ -34,9 +34,7 @@
<%= link("My Listings", to: ~p"/dnp?#{[mine: "1"]}") %> <% not is_nil(@current_user) -> %> - You must have a verified artist link to create and manage DNP entries. - <%= link("Request an artist link", to: ~p"/profiles/#{@current_user}/artist_links/new") %> - . + You must have a verified artist link to create and manage DNP entries. <%= link("Request an artist link", to: ~p"/profiles/#{@current_user}/artist_links/new") %> . <% true -> %> You must be logged in and have a verified artist link to create and manage DNP entries. <% end %> diff --git a/lib/philomena_web/templates/dnp_entry/show.html.heex b/lib/philomena_web/templates/dnp_entry/show.html.heex index 933c89af..0a202eee 100644 --- a/lib/philomena_web/templates/dnp_entry/show.html.heex +++ b/lib/philomena_web/templates/dnp_entry/show.html.heex @@ -1,6 +1,5 @@

- DNP Listing for Tag - <%= @dnp_entry.tag.name %> + DNP Listing for Tag <%= @dnp_entry.tag.name %>

@@ -90,21 +89,22 @@ <%= if can?(@conn, :index, Philomena.DnpEntries.DnpEntry) do %> <%= case @dnp_entry.aasm_state do %> <% s when s in ["requested", "claimed"] -> %> - <%= link("Claim", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "claimed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> - • - <%= link("Approve", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "listed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> - • - <%= link("Close", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "closed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> + <%= link("Claim", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "claimed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> • <%= link("Approve", + to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "listed"]}", + data: [method: "post", confirm: "Are you really, really sure?"] + ) %> • <%= link("Close", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "closed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> <% "listed" -> %> - <%= link("Rescind", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "rescinded"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> - • - <%= link("Close", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "closed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> + <%= link("Rescind", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "rescinded"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> • <%= link("Close", + to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "closed"]}", + data: [method: "post", confirm: "Are you really, really sure?"] + ) %> <% s when s in ["rescinded", "acknowledged"] -> %> - <%= link("Claim", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "acknowledged"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> - • - <%= link("Close", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "closed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> + <%= link("Claim", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "acknowledged"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> • <%= link("Close", + to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "closed"]}", + data: [method: "post", confirm: "Are you really, really sure?"] + ) %> <% _state -> %> - <%= link("Claim", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "claimed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> + <%= link("Claim", to: ~p"/admin/dnp_entries/#{@dnp_entry}/transition?#{[state: "claimed"]}", data: [method: "post", confirm: "Are you really, really sure?"]) %> <% end %> <% end %> <%= if assigns[:mod_notes] do %> diff --git a/lib/philomena_web/templates/duplicate_report/_form.html.heex b/lib/philomena_web/templates/duplicate_report/_form.html.heex index 026f9ad0..006fdb47 100644 --- a/lib/philomena_web/templates/duplicate_report/_form.html.heex +++ b/lib/philomena_web/templates/duplicate_report/_form.html.heex @@ -1,8 +1,7 @@ <%= form_for @changeset, ~p"/duplicate_reports", fn f -> %> <%= hidden_input(f, :image_id, value: @image.id) %>
- Delete this image and redirect to - <%= number_input(f, :duplicate_of_image_id, class: "input", min: 0, placeholder: "image number.", required: true) %> + Delete this image and redirect to <%= number_input(f, :duplicate_of_image_id, class: "input", min: 0, placeholder: "image number.", required: true) %> <%= text_input(f, :reason, class: "input input--separate-left", placeholder: "Explanation") %>
diff --git a/lib/philomena_web/templates/duplicate_report/_image_cell.html.heex b/lib/philomena_web/templates/duplicate_report/_image_cell.html.heex index c4050137..83ab3cc2 100644 --- a/lib/philomena_web/templates/duplicate_report/_image_cell.html.heex +++ b/lib/philomena_web/templates/duplicate_report/_image_cell.html.heex @@ -3,15 +3,12 @@ <%= if is_nil(@image) do %> (Image now hard-deleted) <% else %> - # - <%= @image.id %> + # <%= @image.id %> <% end %>

<%= render(PhilomenaWeb.ImageView, "_image_container.html", image: @image, size: :thumb_small, conn: @conn) %>

- <%= @image.image_width %> - x - <%= @image.image_height %> + <%= @image.image_width %> x <%= @image.image_height %>

<%= render(PhilomenaWeb.UserAttributionView, "_anon_user.html", object: @image, conn: @conn) %> @@ -20,15 +17,13 @@ <%= if @source do %> <% else %> <% end %> diff --git a/lib/philomena_web/templates/duplicate_report/_list.html.heex b/lib/philomena_web/templates/duplicate_report/_list.html.heex index ee417de1..1a18d8b9 100644 --- a/lib/philomena_web/templates/duplicate_report/_list.html.heex +++ b/lib/philomena_web/templates/duplicate_report/_list.html.heex @@ -91,18 +91,15 @@ <%= cond do %> <% same_format?(report) -> %> - Same format - <%= file_types(report) %> + Same format <%= file_types(report) %> <% better_format?(report) -> %> - Target format better - <%= file_types(report) %> + Target format better <%= file_types(report) %> <% true -> %> - Source format better - <%= file_types(report) %> + Source format better <%= file_types(report) %> <% end %> @@ -191,24 +188,21 @@

<%= String.capitalize(report.state) %> <%= if can?(@conn, :edit, report) and not is_nil(report.modifier) do %> - by - <%= report.modifier.name %> + by <%= report.modifier.name %> <% end %> <%= if can?(@conn, :edit, report) do %>
<%= if report.state == "open" do %> "#report_options_#{report.id}")}> <% end %> <%= if report.state != "rejected" do %> <% end %> @@ -217,11 +211,9 @@
- Reported - <%= pretty_time(report.created_at) %> + Reported <%= pretty_time(report.created_at) %> <%= if report.user do %> - by - <%= link(report.user.name, to: ~p"/profiles/#{report.user}") %> + by <%= link(report.user.name, to: ~p"/profiles/#{report.user}") %> <% end %>
<%= escape_nl2br(report.reason) %> diff --git a/lib/philomena_web/templates/duplicate_report/show.html.heex b/lib/philomena_web/templates/duplicate_report/show.html.heex index 2a91c799..2cbec2cc 100644 --- a/lib/philomena_web/templates/duplicate_report/show.html.heex +++ b/lib/philomena_web/templates/duplicate_report/show.html.heex @@ -1,8 +1,6 @@ -<% - source_url = comparison_url(@conn, @duplicate_report.image) - target_url = comparison_url(@conn, @duplicate_report.duplicate_of_image) - {width, height} = largest_dimensions([@duplicate_report.image, @duplicate_report.duplicate_of_image]) -%> +<% source_url = comparison_url(@conn, @duplicate_report.image) +target_url = comparison_url(@conn, @duplicate_report.duplicate_of_image) +{width, height} = largest_dimensions([@duplicate_report.image, @duplicate_report.duplicate_of_image]) %>

Difference

diff --git a/lib/philomena_web/templates/error/show.html.heex b/lib/philomena_web/templates/error/show.html.heex index 87e1a86b..70af705d 100644 --- a/lib/philomena_web/templates/error/show.html.heex +++ b/lib/philomena_web/templates/error/show.html.heex @@ -5,8 +5,7 @@ <%= viewport_meta_tag(@conn) %> - <%= @status %> - - Philomena + <%= @status %> - Philomena @@ -16,8 +15,7 @@

- - Philomena + Philomena

<%= @short_msg %> diff --git a/lib/philomena_web/templates/filter/_filter.html.heex b/lib/philomena_web/templates/filter/_filter.html.heex index c0c6a0d4..366b33ce 100644 --- a/lib/philomena_web/templates/filter/_filter.html.heex +++ b/lib/philomena_web/templates/filter/_filter.html.heex @@ -4,8 +4,7 @@

<%= if @filter.user do %>

- Maintained by - <%= render(PhilomenaWeb.UserAttributionView, "_user.html", object: @filter, conn: @conn) %> + Maintained by <%= render(PhilomenaWeb.UserAttributionView, "_user.html", object: @filter, conn: @conn) %>

<% end %> <%= if @filter.system do %> @@ -16,10 +15,7 @@
  • - Spoilers - <%= length(@filter.spoilered_tag_ids) %> - , hides - <%= length(@filter.hidden_tag_ids) %> + Spoilers <%= length(@filter.spoilered_tag_ids) %> , hides <%= length(@filter.hidden_tag_ids) %>
  • <%= link("View this filter", to: ~p"/filters/#{@filter}", class: "button") %> diff --git a/lib/philomena_web/templates/filter/index.html.heex b/lib/philomena_web/templates/filter/index.html.heex index 3e3547b9..411dc2c6 100644 --- a/lib/philomena_web/templates/filter/index.html.heex +++ b/lib/philomena_web/templates/filter/index.html.heex @@ -65,8 +65,7 @@ Recent Filters

    - Clicking this button will clear the recent filters list in the header dropdown. - <%= button_to("Clear recent filter list", ~p"/filters/clear_recent", method: "delete", class: "button") %> + Clicking this button will clear the recent filters list in the header dropdown. <%= button_to("Clear recent filter list", ~p"/filters/clear_recent", method: "delete", class: "button") %>

    <% end %> <% end %> diff --git a/lib/philomena_web/templates/filter/show.html.heex b/lib/philomena_web/templates/filter/show.html.heex index 149e6ce0..6d31e006 100644 --- a/lib/philomena_web/templates/filter/show.html.heex +++ b/lib/philomena_web/templates/filter/show.html.heex @@ -1,16 +1,12 @@

    - Viewing full filter details for - <%= @filter.name %> + Viewing full filter details for <%= @filter.name %>

    • - Spoilers - <%= number_with_delimiter(length(@filter.spoilered_tag_ids)) %> - <%= pluralize("tag", "tags", length(@filter.spoilered_tag_ids)) %> - and hides - <%= number_with_delimiter(length(@filter.hidden_tag_ids)) %> + Spoilers <%= number_with_delimiter(length(@filter.spoilered_tag_ids)) %> + <%= pluralize("tag", "tags", length(@filter.spoilered_tag_ids)) %> and hides <%= number_with_delimiter(length(@filter.hidden_tag_ids)) %> <%= pluralize("tag", "tags", length(@filter.hidden_tag_ids)) %>
      • <%= if @filter.id == @conn.assigns.current_filter.id do %> @@ -36,8 +32,7 @@
    <%= if @filter.user do %>

    - This filter is maintained by - <%= render(PhilomenaWeb.UserAttributionView, "_user.html", object: @filter, conn: @conn) %> + This filter is maintained by <%= render(PhilomenaWeb.UserAttributionView, "_user.html", object: @filter, conn: @conn) %>

    <% end %>

    diff --git a/lib/philomena_web/templates/fingerprint_profile/show.html.heex b/lib/philomena_web/templates/fingerprint_profile/show.html.heex index 1f1e5ed3..7af195b1 100644 --- a/lib/philomena_web/templates/fingerprint_profile/show.html.heex +++ b/lib/philomena_web/templates/fingerprint_profile/show.html.heex @@ -1,6 +1,5 @@

    - <%= @fingerprint %> - 's fingerprint profile + <%= @fingerprint %> 's fingerprint profile

    • @@ -42,12 +41,10 @@ <%= link("Revert all tag changes", to: ~p"/tag_changes/full_revert?#{[fingerprint: @fingerprint]}", data: [confirm: "Are you really, really sure?", method: "create"]) %>
    • - <%= - link("...the button above didn't work (use carefully, this is resource-intensive)", - to: ~p"/tag_changes/full_revert?#{[fingerprint: @fingerprint, batch_size: 1]}", - data: [confirm: "Please confirm that you're aware that this may crash the site and are ready to take on the full wrath of the admins if it does so after you press this button.", method: "create"] - ) - %> + <%= link("...the button above didn't work (use carefully, this is resource-intensive)", + to: ~p"/tag_changes/full_revert?#{[fingerprint: @fingerprint, batch_size: 1]}", + data: [confirm: "Please confirm that you're aware that this may crash the site and are ready to take on the full wrath of the admins if it does so after you press this button.", method: "create"] + ) %>

    @@ -77,8 +74,7 @@ <%= link(ufp.user.name, to: ~p"/profiles/#{ufp.user}") %> - <%= ufp.uses %> - times + <%= ufp.uses %> times <%= pretty_time(ufp.updated_at) %> diff --git a/lib/philomena_web/templates/fingerprint_profile/source_change/index.html.heex b/lib/philomena_web/templates/fingerprint_profile/source_change/index.html.heex index a8597b9d..cb1a592e 100644 --- a/lib/philomena_web/templates/fingerprint_profile/source_change/index.html.heex +++ b/lib/philomena_web/templates/fingerprint_profile/source_change/index.html.heex @@ -1,6 +1,5 @@

    - Source changes by - <%= @fingerprint %> + Source changes by <%= @fingerprint %>

    <% route = fn p -> ~p"/fingerprint_profiles/#{@fingerprint}/source_changes?#{p}" end %> <% pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @source_changes, route: route, conn: @conn) %> diff --git a/lib/philomena_web/templates/fingerprint_profile/tag_change/index.html.heex b/lib/philomena_web/templates/fingerprint_profile/tag_change/index.html.heex index 8df89999..5dc69862 100644 --- a/lib/philomena_web/templates/fingerprint_profile/tag_change/index.html.heex +++ b/lib/philomena_web/templates/fingerprint_profile/tag_change/index.html.heex @@ -1,14 +1,11 @@

    - Tag changes by - <%= @fingerprint %> + Tag changes by <%= @fingerprint %>

    <% route = fn p -> ~p"/fingerprint_profiles/#{@fingerprint}/tag_changes?#{p}" end %> -<% - params = - if @conn.params["added"] do - [added: @conn.params["added"]] - end -%> +<% params = + if @conn.params["added"] do + [added: @conn.params["added"]] + end %> <% pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @tag_changes, route: route, conn: @conn, params: params) %>
    diff --git a/lib/philomena_web/templates/forum/index.html.heex b/lib/philomena_web/templates/forum/index.html.heex index 56bf05d9..df40c482 100644 --- a/lib/philomena_web/templates/forum/index.html.heex +++ b/lib/philomena_web/templates/forum/index.html.heex @@ -4,12 +4,10 @@
    - - Search Posts + Search Posts - <%= @topic_count %> - topics + <%= @topic_count %> topics
    @@ -51,9 +49,7 @@ <%= link(forum.last_post.topic.title, to: ~p"/forums/#{forum.last_post.topic.forum}/topics/#{forum.last_post.topic}") %>
    - <%= link("Go to post", to: ~p"/forums/#{forum.last_post.topic.forum}/topics/#{forum.last_post.topic}?#{[post_id: forum.last_post.id]}" <> "#post_#{forum.last_post.id}") %> - by - <%= render(PhilomenaWeb.UserAttributionView, "_anon_user.html", object: forum.last_post, conn: @conn) %> + <%= link("Go to post", to: ~p"/forums/#{forum.last_post.topic.forum}/topics/#{forum.last_post.topic}?#{[post_id: forum.last_post.id]}" <> "#post_#{forum.last_post.id}") %> by <%= render(PhilomenaWeb.UserAttributionView, "_anon_user.html", object: forum.last_post, conn: @conn) %>
    <%= pretty_time(forum.last_post.created_at) %> <% end %> diff --git a/lib/philomena_web/templates/forum/show.html.heex b/lib/philomena_web/templates/forum/show.html.heex index 79268395..34ac93a1 100644 --- a/lib/philomena_web/templates/forum/show.html.heex +++ b/lib/philomena_web/templates/forum/show.html.heex @@ -4,20 +4,15 @@
    - <%= link("Forums", to: ~p"/forums") %> - » - <%= link(@forum.name, to: ~p"/forums/#{@forum}") %> + <%= link("Forums", to: ~p"/forums") %> » <%= link(@forum.name, to: ~p"/forums/#{@forum}") %> - - New Topic + New Topic - - Search Posts + Search Posts - <%= @forum.topic_count %> - topics + <%= @forum.topic_count %> topics
    @@ -61,10 +56,7 @@ <% end %> <%= link(topic.title, to: ~p"/forums/#{@forum}/topics/#{topic}") %>
    - Posted - <%= pretty_time(topic.created_at) %> - by - <%= render(PhilomenaWeb.UserAttributionView, "_anon_user.html", object: topic, conn: @conn) %> + Posted <%= pretty_time(topic.created_at) %> by <%= render(PhilomenaWeb.UserAttributionView, "_anon_user.html", object: topic, conn: @conn) %>
    @@ -72,9 +64,7 @@ <%= if topic.last_post do %> - <%= link("Go to post", to: ~p"/forums/#{topic.forum}/topics/#{topic}?#{[post_id: topic.last_post]}" <> "#post_#{topic.last_post.id}") %> - by - <%= render(PhilomenaWeb.UserAttributionView, "_anon_user.html", object: topic.last_post, conn: @conn) %> + <%= link("Go to post", to: ~p"/forums/#{topic.forum}/topics/#{topic}?#{[post_id: topic.last_post]}" <> "#post_#{topic.last_post.id}") %> by <%= render(PhilomenaWeb.UserAttributionView, "_anon_user.html", object: topic.last_post, conn: @conn) %>
    <%= pretty_time(topic.last_post.created_at) %> <% end %> diff --git a/lib/philomena_web/templates/forum/subscription/_subscription.html.heex b/lib/philomena_web/templates/forum/subscription/_subscription.html.heex index 330fe5ca..a41f94d7 100644 --- a/lib/philomena_web/templates/forum/subscription/_subscription.html.heex +++ b/lib/philomena_web/templates/forum/subscription/_subscription.html.heex @@ -1,22 +1,20 @@ -<% - watch_path = ~p"/forums/#{@forum}/subscription" +<% watch_path = ~p"/forums/#{@forum}/subscription" - watch_class = - if @watching do - "hidden" - else - "" - end +watch_class = + if @watching do + "hidden" + else + "" + end - unwatch_path = ~p"/forums/#{@forum}/subscription" +unwatch_path = ~p"/forums/#{@forum}/subscription" - unwatch_class = - if @watching do - "" - else - "hidden" - end -%> +unwatch_class = + if @watching do + "" + else + "hidden" + end %> <%= if @conn.assigns.current_user do %> diff --git a/lib/philomena_web/templates/gallery/index.html.heex b/lib/philomena_web/templates/gallery/index.html.heex index 3510a583..16bce610 100644 --- a/lib/philomena_web/templates/gallery/index.html.heex +++ b/lib/philomena_web/templates/gallery/index.html.heex @@ -1,7 +1,5 @@ -<% - route = fn p -> ~p"/galleries?#{p}" end - pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @galleries, route: route, params: [gallery: @conn.params["gallery"]]) -%> +<% route = fn p -> ~p"/galleries?#{p}" end +pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @galleries, route: route, params: [gallery: @conn.params["gallery"]]) %>
    diff --git a/lib/philomena_web/templates/gallery/show.html.heex b/lib/philomena_web/templates/gallery/show.html.heex index 61903b3c..b018821e 100644 --- a/lib/philomena_web/templates/gallery/show.html.heex +++ b/lib/philomena_web/templates/gallery/show.html.heex @@ -1,10 +1,8 @@ -<% - scope = scope(@conn) - image_url = fn image, hit -> ~p"/images/#{image}?#{Keyword.put(scope, :sort, hit["sort"])}" end - route = fn p -> ~p"/galleries/#{@gallery}?#{p}" end - pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @images, route: route, params: scope) - info = render(PhilomenaWeb.PaginationView, "_pagination_info.html", page: @images) -%> +<% scope = scope(@conn) +image_url = fn image, hit -> ~p"/images/#{image}?#{Keyword.put(scope, :sort, hit["sort"])}" end +route = fn p -> ~p"/galleries/#{@gallery}?#{p}" end +pagination = render(PhilomenaWeb.PaginationView, "_pagination.html", page: @images, route: route, params: scope) +info = render(PhilomenaWeb.PaginationView, "_pagination_info.html", page: @images) %>
    @@ -89,8 +82,7 @@
  • - - + <%= gallery.title %>
    • <% else %> <% # Options to add %>
  • - + <%= gallery.title %> -
    • diff --git a/lib/philomena_web/templates/image/_description.html.heex b/lib/philomena_web/templates/image/_description.html.heex index e09e8d51..c5ac731b 100644 --- a/lib/philomena_web/templates/image/_description.html.heex +++ b/lib/philomena_web/templates/image/_description.html.heex @@ -1,14 +1,12 @@
    - - Description + Description <%= if can?(@conn, :edit_description, @image) do %>
    - - Edit + Edit
    <% end %> diff --git a/lib/philomena_web/templates/image/_image_box.html.heex b/lib/philomena_web/templates/image/_image_box.html.heex index 05303da1..b4b8679c 100644 --- a/lib/philomena_web/templates/image/_image_box.html.heex +++ b/lib/philomena_web/templates/image/_image_box.html.heex @@ -1,19 +1,17 @@ -<% - link = assigns[:link] || ~p"/images/#{@image}" +<% link = assigns[:link] || ~p"/images/#{@image}" - size_class = - case @size do - :thumb -> "media-box__content--large" - :medium -> "media-box__content--featured" - _ -> "media-box__content--small" - end +size_class = + case @size do + :thumb -> "media-box__content--large" + :medium -> "media-box__content--featured" + _ -> "media-box__content--small" + end - header_class = - case @size do - :thumb_small -> "media-box__header--small" - _ -> nil - end -%> +header_class = + case @size do + :thumb_small -> "media-box__header--small" + _ -> nil + end %>
    diff --git a/lib/philomena_web/templates/image/_image_meta.html.heex b/lib/philomena_web/templates/image/_image_meta.html.heex index 3f9061a7..dcd82a77 100644 --- a/lib/philomena_web/templates/image/_image_meta.html.heex +++ b/lib/philomena_web/templates/image/_image_meta.html.heex @@ -70,38 +70,29 @@
    - - View + View - - VS + VS - - Download + Download - - DS + DS
    - Uploaded - <%= pretty_time(@image.created_at) %> + Uploaded <%= pretty_time(@image.created_at) %> <%= render(PhilomenaWeb.ImageView, "_uploader.html", assigns) %>
    -   - <%= @image.image_width %> - x - <%= @image.image_height %> +   <%= @image.image_width %> x <%= @image.image_height %> <%= if not is_nil(@image.image_duration) and @image.image_is_animated and @image.image_duration > 0 do %> -   - <% dur = trunc(@image.image_duration) %> +   <% dur = trunc(@image.image_duration) %> <% ms = trunc((@image.image_duration - dur) * 100) %> <% {mm, ss} = {div(dur, 60), rem(dur, 60)} %> <%= :io_lib.format("~2..0B:~2..0B.~2..0B", [mm, ss, ms]) %> @@ -112,11 +103,9 @@ <% size_mb = Float.round(size_kb / 1000.0, 2) %> <%= if size_kb <= 1000 do %> - <%= size_kb %> - kB + <%= size_kb %> kB <% else %> - <%= size_mb %> - MB + <%= size_mb %> MB <% end %> diff --git a/lib/philomena_web/templates/image/_image_target.html.heex b/lib/philomena_web/templates/image/_image_target.html.heex index 13a570e5..c8104e33 100644 --- a/lib/philomena_web/templates/image/_image_target.html.heex +++ b/lib/philomena_web/templates/image/_image_target.html.heex @@ -9,11 +9,18 @@ <%= img_tag(static_path(@conn, "/images/tagblocked.svg"), width: 250, height: 250, data: [click_unfilter: @image.id]) %>

    - <%= link("your current filter", to: ~p"/filters/#{@conn.assigns.current_filter}", class: "filter-link") %> - . + <%= link("your current filter", to: ~p"/filters/#{@conn.assigns.current_filter}", class: "filter-link") %> .
    <%= if size == :full and not embed_display do %> -