jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uploads: allow changing thumbnail size on My Uploads / All Uploads pages.

Browse Source 
* Add a "Size" menu to the My Uploads / All Uploads pages to allow
  changing the thumbnail size.
* Make the My Uploads / All Uploads pages use the same thumbnail size as
  the post index page.
* Change the "Gallery | Table" links on the My Uploads page to icons.
This commit is contained in:
evazion
2022-02-16 14:11:02 -06:00
parent f890e8595e
commit 0b8d042c06
19 changed files with 127 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/media_assets/_gallery.html.erb
View File

@@ -1,5 +1,5 @@
<%= render(MediaAssetGalleryComponent.new) do |gallery| %>
<% @media_assets.each do |media_asset| %>
<%= render(MediaAssetGalleryComponent.new(size: size)) do |gallery| %>
<% media_assets.each do |media_asset| %>
<% if policy(media_asset).can_see_image? %>
<% gallery.media_asset do %>
<%= render "media_assets/preview", media_asset: media_asset, size: gallery.size %>

7
app/views/media_assets/index.html.erb
View File

@@ -1,6 +1,9 @@
<div id="c-media-assets">
<div id="a-index">
<h1>All Uploads</h1>
<div class="flex mb-4">
<h1 class="flex-grow-1">All Uploads</h1>
<%= render PreviewSizeMenuComponent.new(current_size: @preview_size) %>
</div>
<% if params[:search].present? %>
<%= search_form_for(media_assets_path) do |f| %>
@@ -17,7 +20,7 @@
<% if params[:mode] == "table" %>
<%= render "media_assets/table" %>
<% else %>
<%= render "media_assets/gallery" %>
<%= render "media_assets/gallery", media_assets: @media_assets, size: @preview_size %>
<% end %>
<%= numbered_paginator(@media_assets) %>

57
app/views/posts/index.html.erb
View File

@@ -77,62 +77,7 @@
<a class="mobile-only" href="#search-box">Search &raquo;</a>
</li>
<%= render PopupMenuComponent.new(classes: "post-preview-size-menu") do |menu| %>
<% menu.button do %>
<span class="text-sm">Size <%= caret_down_icon %></span>
<% end %>
<% menu.item do %>
<% if @preview_size == "150" %>
<%= link_to "Small", posts_path(tags: params[:tags], page: params[:page], limit: params[:limit], show_votes: params[:show_votes], size: "150"), class: "font-bold", rel: "nofollow" %>
<% else %>
<%= link_to "Small", posts_path(tags: params[:tags], page: params[:page], limit: params[:limit], show_votes: params[:show_votes], size: "150"), rel: "nofollow" %>
<% end %>
<% end %>
<% menu.item do %>
<% if @preview_size == "180" %>
<%= link_to "Medium", posts_path(tags: params[:tags], page: params[:page], limit: params[:limit], show_votes: params[:show_votes], size: "180"), class: "font-bold", rel: "nofollow" %>
<% else %>
<%= link_to "Medium", posts_path(tags: params[:tags], page: params[:page], limit: params[:limit], show_votes: params[:show_votes], size: "180"), rel: "nofollow" %>
<% end %>
<% end %>
<% menu.item do %>
<% if @preview_size == "225" %>
<%= link_to "Large", posts_path(tags: params[:tags], page: params[:page], limit: params[:limit], show_votes: params[:show_votes], size: "225"), class: "font-bold", rel: "nofollow" %>
<% else %>
<%= link_to "Large", posts_path(tags: params[:tags], page: params[:page], limit: params[:limit], show_votes: params[:show_votes], size: "225"), rel: "nofollow" %>
<% end %>
<% end %>
<%# Mobile only %>
<% menu.item do %>
<% if @preview_size == "360" %>
<%= link_to "Huge", posts_path(tags: params[:tags], page: params[:page], limit: params[:limit], show_votes: params[:show_votes], size: "360"), class: "mobile-only font-bold", rel: "nofollow" %>
<% else %>
<%= link_to "Huge", posts_path(tags: params[:tags], page: params[:page], limit: params[:limit], show_votes: params[:show_votes], size: "360"), class: "mobile-only", rel: "nofollow" %>
<% end %>
<% end %>
<%# Desktop only %>
<% menu.item do %>
<% if @preview_size == "270" %>
<%= link_to "Huge", posts_path(tags: params[:tags], page: params[:page], limit: params[:limit], show_votes: params[:show_votes], size: "270"), class: "desktop-only font-bold", rel: "nofollow" %>
<% else %>
<%= link_to "Huge", posts_path(tags: params[:tags], page: params[:page], limit: params[:limit], show_votes: params[:show_votes], size: "270"), class: "desktop-only", rel: "nofollow" %>
<% end %>
<% end %>
<%# Desktop only %>
<% menu.item do %>
<% if @preview_size == "360" %>
<%= link_to "Gigantic", posts_path(tags: params[:tags], page: params[:page], limit: params[:limit], show_votes: params[:show_votes], size: "360"), class: "desktop-only font-bold", rel: "nofollow" %>
<% else %>
<%= link_to "Gigantic", posts_path(tags: params[:tags], page: params[:page], limit: params[:limit], show_votes: params[:show_votes], size: "360"), class: "desktop-only", rel: "nofollow" %>
<% end %>
<% end %>
<% end %>
<%= render PreviewSizeMenuComponent.new(current_size: @preview_size) %>
<%= render PopupMenuComponent.new(classes: "post-preview-options-menu") do |menu| %>
<% menu.item do %>

2
app/views/upload_media_assets/show.html.erb
View File

@@ -1,6 +1,6 @@
<div id="c-uploads">
<div id="a-show">
<h1>Upload</h1>
<h1 class="mb-4">Upload</h1>
<div id="p-single-asset-upload">
<%= render "uploads/single_asset_upload", upload_media_asset: @upload_media_asset %>

15
app/views/uploads/_gallery.html.erb
View File

@@ -1,18 +1,9 @@
<div class="flex items-center mb-2">
<h1 class="flex-1">My Uploads</h1>
<span>
<strong>Gallery</strong> |
<%= link_to "Table", user_uploads_path(CurrentUser.user.id.to_i, mode: "table") %>
</span>
</div>
<%= render(MediaAssetGalleryComponent.new) do |gallery| %>
<% @uploads.each do |upload| %>
<%= render(MediaAssetGalleryComponent.new(size: size)) do |gallery| %>
<% uploads.each do |upload| %>
<% gallery.media_asset do %>
<%= render "uploads/preview", upload: upload, size: gallery.size %>
<% end %>
<% end %>
<% end %>
<%= numbered_paginator(@uploads) %>
<%= numbered_paginator(uploads) %>

2
app/views/uploads/_multiple_asset_upload.html.erb
View File

@@ -1,4 +1,4 @@
<%= render(MediaAssetGalleryComponent.new(classes: ["upload-media-asset-gallery"])) do |gallery| %>
<%= render(MediaAssetGalleryComponent.new(size: size, classes: ["upload-media-asset-gallery"])) do |gallery| %>
<% upload.upload_media_assets.order(id: :asc).each do |upload_media_asset| %>
<% gallery.media_asset do %>
<%= render "upload_media_assets/preview", upload_media_asset: upload_media_asset, size: gallery.size %>

13
app/views/uploads/_table.html.erb
View File

@@ -1,13 +1,4 @@
<div class="flex items-center mb-2">
<h1 class="flex-1">My Uploads</h1>
<span>
<%= link_to "Gallery", user_uploads_path(CurrentUser.user.id.to_i) %> |
<strong>Table</strong>
</span>
</div>
<%= table_for @uploads, class: "striped", width: "100%" do |t| %>
<%= table_for uploads, class: "striped", width: "100%" do |t| %>
<% t.column "Upload", td: { class: "text-center" } do |upload| %>
<%= render "uploads/preview", upload: upload, size: "180" %>
<% end %>
@@ -61,4 +52,4 @@
<% end %>
<% end %>
<%= numbered_paginator(@uploads) %>
<%= numbered_paginator(uploads) %>

18
app/views/uploads/index.html.erb
View File

@@ -1,9 +1,23 @@
<div id="c-uploads">
<div id="a-index">
<div class="flex items-center mb-4">
<h1 class="flex-1">My Uploads</h1>
<span>
<%= render PreviewSizeMenuComponent.new(current_size: @preview_size) %>
<% if @mode == "table" %>
<%= link_to grid_icon, current_page_path(mode: nil), title: "Gallery", class: "inactive-link" %>
<% else %>
<%= link_to list_icon, current_page_path(mode: "table"), title: "Table", class: "inactive-link" %>
<% end %>
</span>
</div>
<% if @mode == "gallery" %>
<%= render "uploads/gallery" %>
<%= render "uploads/gallery", uploads: @uploads, size: @preview_size %>
<% elsif @mode == "table" %>
<%= render "uploads/table" %>
<%= render "uploads/table", uploads: @uploads %>
<% end %>
</div>
</div>

10
app/views/uploads/show.html.erb
View File

@@ -1,6 +1,12 @@
<div id="c-uploads">
<div id="a-show">
<h1>Upload</h1>
<div class="flex mb-4">
<h1 class="flex-grow-1">Upload</h1>
<% if @upload.media_asset_count > 1 %>
<%= render PreviewSizeMenuComponent.new(current_size: @preview_size) %>
<% end %>
</div>
<% if @upload.is_errored? %>
<p>Error: <%= @upload.error %>.</p>
@@ -12,7 +18,7 @@
<% end %>
<% elsif @upload.media_asset_count > 1 %>
<div id="p-multiple-asset-upload">
<%= render "multiple_asset_upload", upload: @upload %>
<%= render "multiple_asset_upload", upload: @upload, size: @preview_size %>
</div>
<% elsif @upload.media_asset_count == 1 %>
<div id="p-single-asset-upload">