diff --git a/app/assets/stylesheets/fimfetch.css b/app/assets/stylesheets/fimfetch.css index 5745e2e..59d56a2 100644 --- a/app/assets/stylesheets/fimfetch.css +++ b/app/assets/stylesheets/fimfetch.css @@ -530,12 +530,7 @@ a.submit2.cancel:active { display: inline-block; margin: 0 0 0 5px; } -.fic-cell .popular { - display: block; - float: left; - overflow: hidden; - padding: 5px 10px; -} + .fic-cell .description { overflow: hidden; border: solid #adc 1px; @@ -3293,7 +3288,7 @@ body.story, .fic-cell header, .fic-cell .details, .user .name { - overflow: auto; + overflow: hidden; } .fic-cell .description a, .fic-data .u { diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb index 308f772..4702dc7 100644 --- a/app/controllers/images_controller.rb +++ b/app/controllers/images_controller.rb @@ -22,7 +22,7 @@ class ImagesController < ApplicationController if File.exist? path content_type = Marcel::MimeType.for Pathname.new(path) else - content_type, body = fetch_image uri + content_type, body = fetch_image parsed File.binwrite path, body end diff --git a/app/views/search/_advanced.html.slim b/app/views/search/_advanced.html.slim index a0643ef..3b202b1 100644 --- a/app/views/search/_advanced.html.slim +++ b/app/views/search/_advanced.html.slim @@ -119,7 +119,7 @@ div.search-adv b Sort By br => select_tag :sf, options_for_select({'Query Relevance' => 'rel', 'Title' => 'title', 'Author' => 'author', \ - 'Publish Date' => 'date_published', 'Updated Date' => 'date_updated', 'Word Count' => 'num_words'}, @search_params[:sf]) + 'Publish Date' => 'date_published', 'Updated Date' => 'date_updated', 'Word Count' => 'num_words', 'FiMFiction Rating' => 'rating'}, @search_params[:sf]) = select_tag :sd, options_for_select({'High to Low' => 'desc', 'Low to High' => 'asc'}, @search_params[:sd]) - if show_button .buttons diff --git a/app/views/stories/_card.html.slim b/app/views/stories/_card.html.slim index 8a6229b..d071030 100644 --- a/app/views/stories/_card.html.slim +++ b/app/views/stories/_card.html.slim @@ -13,11 +13,14 @@ section.fic-cell br span.popular span.stats - - if story.short_description - p.description= story.short_description - - else - div.description - == story.description_html + - if story.rating + span.likes + | Rating: #{story.rating}% + - if story.short_description + p.description= story.short_description + - else + div.description + == story.description_html footer .rating = rating_display(story.rating)