chaas/debshots
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of git.workaround.org:chaas/debshots

Browse source
This commit is contained in:
Christoph Haas 2016-07-24 14:13:30 +02:00
commit 1c05dc26a6
3 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/moderate_controller.rb
View file

@ -17,6 +17,8 @@ class ModerateController < ApplicationController
# Number of screenshots that were already moderated (during this session) # Number of screenshots that were already moderated (during this session)
session[:already_moderated] ||= 0 session[:already_moderated] ||= 0
@moderated_screenshots = session[:already_moderated] @moderated_screenshots = session[:already_moderated]
# BUG: calculation is wrong when pending and reported screenshots are in the queue
# Percentage of already moderated screenshots # Percentage of already moderated screenshots
@percent_moderated = 100 * (@moderated_screenshots+1) / (@moderated_screenshots + @pending_screenshots.count) @percent_moderated = 100 * (@moderated_screenshots+1) / (@moderated_screenshots + @pending_screenshots.count)
# @percent_moderated = 100 * (@moderated_screenshots+1) / (@moderated_screenshots + @pending_screenshots.count + @reported_screenshots.count) # @percent_moderated = 100 * (@moderated_screenshots+1) / (@moderated_screenshots + @pending_screenshots.count + @reported_screenshots.count)

1
app/views/moderate/index.slim
View file

@ -9,6 +9,7 @@
p.progress-meter-text #{@percent_moderated}% p.progress-meter-text #{@percent_moderated}%
h2 Package: #{@package.name} h2 Package: #{@package.name}
p =@package.description
// Show moderation queue left - and existing screenshots right // Show moderation queue left - and existing screenshots right
.row.packagepage .row.packagepage

4
app/views/packages/details.slim
View file

@ -83,6 +83,10 @@
a.expand data-open="upload-modal" a.expand data-open="upload-modal"
= fa_icon 'upload' = fa_icon 'upload'
' Upload more screenshots ' Upload more screenshots
p
' Please help extend the collection of screenshots.
' Just make a screenshot and upload it here. You don't
' need to register or anything.
// Modal upload window // Modal upload window
#upload-modal.reveal data-reveal=true role='dialog' #upload-modal.reveal data-reveal=true role='dialog'
h1 Upload new screenshots h1 Upload new screenshots