diff options
| author | Jochen Topf <jochen@topf.org> | 2013-01-10 17:18:40 +0100 |
|---|---|---|
| committer | Jochen Topf <jochen@topf.org> | 2013-01-10 17:18:40 +0100 |
| commit | 00f907bc0084e94db927f427c64381fbca3dcc34 (patch) | |
| tree | 4eb48ddd239f5f6438a0de3dc6a10c99ce2460ef /web/lib/ui | |
| parent | 44b679202ce7d1fdf265ee2254db833cd7c548f4 (diff) | |
| download | taginfo-00f907bc0084e94db927f427c64381fbca3dcc34.tar taginfo-00f907bc0084e94db927f427c64381fbca3dcc34.tar.gz | |
Improve wiki image display
Diffstat (limited to 'web/lib/ui')
| -rw-r--r-- | web/lib/ui/keys_tags.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/web/lib/ui/keys_tags.rb b/web/lib/ui/keys_tags.rb index 5e21c6e..9d9653f 100644 --- a/web/lib/ui/keys_tags.rb +++ b/web/lib/ui/keys_tags.rb @@ -6,6 +6,9 @@ class Taginfo < Sinatra::Base def build_image_url(row) w = row['width'].to_i h = row['height'].to_i + if w <= MAX_IMAGE_WIDTH + return row['image_url'] + end if w > 0 && h > 0 return "#{row['thumb_url_prefix']}#{ h <= w ? MAX_IMAGE_WIDTH : (MAX_IMAGE_WIDTH * w / h).to_i }#{ row['thumb_url_suffix'] }" end @@ -36,10 +39,10 @@ class Taginfo < Sinatra::Base if @desc == '' @desc = "<span class='empty'>#{ t.pages.key.no_description_in_wiki }</span>" else - @desc = "<span title='#{ t.pages.key.description_from_wiki }' tipsy='w'>#{ @desc }</span" + @desc = "<span title='#{ t.pages.key.description_from_wiki }' tipsy='w'>#{ @desc }</span>" end - @db.select("SELECT width, height, thumb_url_prefix, thumb_url_suffix FROM wiki.wikipages LEFT OUTER JOIN wiki.wiki_images USING(image) WHERE lang=? AND key=? AND value IS NULL UNION SELECT width, height, thumb_url_prefix, thumb_url_suffix FROM wiki.wikipages LEFT OUTER JOIN wiki.wiki_images USING(image) WHERE lang='en' AND key=? AND value IS NULL LIMIT 1", r18n.locale.code, @key, @key). + @db.select("SELECT width, height, image_url, thumb_url_prefix, thumb_url_suffix FROM wiki.wikipages LEFT OUTER JOIN wiki.wiki_images USING(image) WHERE lang=? AND key=? AND value IS NULL UNION SELECT width, height, image_url, thumb_url_prefix, thumb_url_suffix FROM wiki.wikipages LEFT OUTER JOIN wiki.wiki_images USING(image) WHERE lang='en' AND key=? AND value IS NULL LIMIT 1", r18n.locale.code, @key, @key). execute() do |row| @image_url = build_image_url(row) end @@ -120,10 +123,10 @@ class Taginfo < Sinatra::Base if @desc == '' @desc = "<span class='empty'>#{ t.pages.tag.no_description_in_wiki }</span>" else - @desc = "<span title='#{ t.pages.tag.description_from_wiki }' tipsy='w'>#{ @desc }</span" + @desc = "<span title='#{ t.pages.tag.description_from_wiki }' tipsy='w'>#{ @desc }</span>" end - @db.select("SELECT width, height, thumb_url_prefix, thumb_url_suffix FROM wiki.wikipages LEFT OUTER JOIN wiki.wiki_images USING(image) WHERE lang=? AND key=? AND value=? UNION SELECT width, height, thumb_url_prefix, thumb_url_suffix FROM wiki.wikipages LEFT OUTER JOIN wiki.wiki_images USING(image) WHERE lang='en' AND key=? AND value=? LIMIT 1", r18n.locale.code, @key, @value, @key, @value). + @db.select("SELECT width, height, image_url, thumb_url_prefix, thumb_url_suffix FROM wiki.wikipages LEFT OUTER JOIN wiki.wiki_images USING(image) WHERE lang=? AND key=? AND value=? UNION SELECT width, height, image_url, thumb_url_prefix, thumb_url_suffix FROM wiki.wikipages LEFT OUTER JOIN wiki.wiki_images USING(image) WHERE lang='en' AND key=? AND value=? LIMIT 1", r18n.locale.code, @key, @value, @key, @value). execute() do |row| @image_url = build_image_url(row) end |