diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss index 33ad64d..3d98601 100644 --- a/app/assets/stylesheets/_settings.scss +++ b/app/assets/stylesheets/_settings.scss @@ -296,7 +296,8 @@ $drilldown-background: $white; $dropdown-padding: 1rem; $dropdown-border: 1px solid $medium-gray; $dropdown-font-size: 1rem; -$dropdown-width: 300px; +// $dropdown-width: 300px; +$dropdown-width: 400px; $dropdown-radius: $global-radius; $dropdown-sizes: ( tiny: 100px, diff --git a/app/models/screenshot.rb b/app/models/screenshot.rb index 866597c..2dd5b92 100644 --- a/app/models/screenshot.rb +++ b/app/models/screenshot.rb @@ -55,7 +55,6 @@ class Screenshot < ActiveRecord::Base "live/screenshots/approved/#{self.package.name[0]}/#{self.package.name}/#{self.id}_#{size}.png" end - def status text = 'This image ' diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index 162e094..6caf728 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -7,27 +7,26 @@ - if @package.screenshots.count > 0 - @package.screenshots.each do |screenshot| .row.listview - .small-12.columns.text-center - a.black.fancybox href=screenshot.image.url(:large, timestamp: false) rel='fancybox-thumb' title=screenshot.caption - = image_tag(screenshot.image.url(:large, timestamp: false), alt: screenshot.caption) - .imgcaption =screenshot.caption + .small-12.columns + .text-center + a.black.fancybox href=screenshot.image.url(:large, timestamp: false) rel='fancybox-thumb' title=screenshot.caption + = image_tag(screenshot.image.url(:large, timestamp: false), alt: screenshot.caption) + .imgcaption =screenshot.caption // TODO: Show information only if admin - - if user_signed_in? - // TODO: Enable button only if admin or uploader + - if user_signed_in? + // Button that reveals a dropdown/modal for admins + .text-center + button.small.dropdown.warning.button type="button" data-toggle="admin-info-#{screenshot.id}" + 'Admin + .dropdown-pane data-dropdown=true id="admin-info-#{screenshot.id}" a.button.tiny.alert[ href=delete_screenshot_path(@package.name, screenshot.id) onclick="return confirm('Really delete the screenshot?');" ] Delete screenshot - .callout.primary - p.subtitle Administrative information - p Uploader IP=#{screenshot.uploaderip} - / p Token=#{screenshot.uploaderhash} - p Uploaded #{screenshot.age_days} (#{screenshot.uploaddatetime}) - p Approved: #{screenshot.approved} - p To be removed: #{screenshot.markedfordelete} - - if screenshot.markedfordelete - ' (#{screenshot.delete_reason})' - p URL: #{screenshot.image.url} + + p Uploader IP=#{screenshot.uploaderip} + p Uploaded #{screenshot.age_days} (#{screenshot.uploaddatetime}) + p Status: #{screenshot.status} - else .row.listview