Merge branch 'master' of bitbucket.org:signum/debshots

Conflicts:
	README.Developer
	app/views/packages/details.slim
	bin/get-data-from-old-live-server.sh
This commit is contained in:
Christoph Haas 2015-06-14 12:36:58 +02:00
commit 4abfb29599
10 changed files with 63 additions and 12 deletions

View file

@ -151,7 +151,7 @@ html, body {
img
{
box-shadow: 0 0 10px 0px #888888;
filter: drop-shadow( 0px 0px 5px #888888 );
}
}

View file

@ -42,7 +42,7 @@ class Screenshot < ActiveRecord::Base
# Return Debshots 1.x path to allow migration of images into Paperclip filesystem schema
def image_url(size)
'#{Rails.configuration.images_path_prefix}/#{self.package.name[0]}/#{self.package.name}/#{self.id}_#{size}.png'
"#{Rails.configuration.images_path_prefix}/#{self.package.name[0]}/#{self.package.name}/#{self.id}_#{size}.png"
end

View file

@ -15,6 +15,8 @@ html
body
// TODO: move topbar somewhere else than packages
= render 'layouts/topbar'
#messages
= render 'layouts/messages'
#content
= yield
= render 'layouts/footer'

View file

@ -19,13 +19,13 @@
onclick="return confirm('Really delete the screenshot?');"
] Delete screenshot
- else
img src='/images/dummy/no-screenshots-available.svg' width='100%'
.row.listview
img src='/images/dummy/no-screenshots-available.svg' width='100%'
// TODO: Enable comments in a later version
// = partial '/package/comments'
.small-5.medium-5.columns
= render 'layouts/messages'
.bigpanel
p.subtitle Details
// TODO: split long_description by <p> tags

View file

@ -101,8 +101,7 @@
p
' Whether you are a developer or not - we appreciate if you upload screenshots.
' See if your favorite package does not yet have a screenshot and
a href=upload_package_path upload one
' .
' upload one.
h2 Statistics