From 5e877fa287d7e89a19031d714a672a5563a5dcc9 Mon Sep 17 00:00:00 2001 From: nek0 Date: Mon, 5 Oct 2015 23:35:14 +0200 Subject: [PATCH] changed preview images to be of 1380px fixed width. also version bump of yesod-newsfeed. --- Handler/Upload.hs | 4 ++-- Migrations/0.0.3-0.0.4/Migration.hs | 4 ++-- eidolon.cabal | 2 +- static/css/images/loader.gif | Bin static/css/images/overlay.png | Bin static/fonts/FontAwesome.otf | Bin static/fonts/fontawesome-webfont.eot | Bin static/fonts/fontawesome-webfont.ttf | Bin static/fonts/fontawesome-webfont.woff | Bin static/img/album.jpg | Bin static/img/bg.jpg | Bin static/img/glyphicons-halflings-white.png | Bin static/img/glyphicons-halflings.png | Bin 13 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 static/css/images/loader.gif mode change 100644 => 100755 static/css/images/overlay.png mode change 100644 => 100755 static/fonts/FontAwesome.otf mode change 100644 => 100755 static/fonts/fontawesome-webfont.eot mode change 100644 => 100755 static/fonts/fontawesome-webfont.ttf mode change 100644 => 100755 static/fonts/fontawesome-webfont.woff mode change 100644 => 100755 static/img/album.jpg mode change 100644 => 100755 static/img/bg.jpg mode change 100644 => 100755 static/img/glyphicons-halflings-white.png mode change 100644 => 100755 static/img/glyphicons-halflings.png diff --git a/Handler/Upload.hs b/Handler/Upload.hs index 0f3d6d2..8a5257d 100755 --- a/Handler/Upload.hs +++ b/Handler/Upload.hs @@ -133,8 +133,8 @@ generateThumb path userId albumId = do h1 <- getImageHeight w let h2 = 230 let w2 = floor (fromIntegral w1 / fromIntegral h1 * fromIntegral h2 :: Double) - let h3 = h1 `div` 2 - let w3 = w1 `div` 2 + let w3 = 1380 + let h3 = floor (fromIntegral h1 / fromIntegral w1 * fromIntegral w3 :: Double) setImageAlphaChannel w deactivateAlphaChannel setImageAlphaChannel p deactivateAlphaChannel setImageFormat w "jpeg" diff --git a/Migrations/0.0.3-0.0.4/Migration.hs b/Migrations/0.0.3-0.0.4/Migration.hs index 9778d5b..54bf783 100755 --- a/Migrations/0.0.3-0.0.4/Migration.hs +++ b/Migrations/0.0.3-0.0.4/Migration.hs @@ -39,8 +39,8 @@ main = do readImage w (decodeString $ tail $ B.unpack path) w1 <- getImageWidth w h1 <- getImageHeight w - let w2 = w1 `div` 2 - let h2 = h1 `div` 2 + let w2 = 1380 + let h2 = floor (fromIntegral h1 / fromIntegral w1 * fromIntegral w2 :: Double) setImageAlphaChannel w deactivateAlphaChannel setImageFormat w (T.pack "jpeg") resizeImage w w2 h2 lanczosFilter 1 diff --git a/eidolon.cabal b/eidolon.cabal index fd28a75..2275b8b 100755 --- a/eidolon.cabal +++ b/eidolon.cabal @@ -112,7 +112,7 @@ library , yesod-markdown >= 0.10 , blaze-markup >= 0.7 , wai >= 3.0 - , yesod-newsfeed >= 1.4 + , yesod-newsfeed >= 1.5 , unix >= 2.7 -- for Migrations , HDBC diff --git a/static/css/images/loader.gif b/static/css/images/loader.gif old mode 100644 new mode 100755 diff --git a/static/css/images/overlay.png b/static/css/images/overlay.png old mode 100644 new mode 100755 diff --git a/static/fonts/FontAwesome.otf b/static/fonts/FontAwesome.otf old mode 100644 new mode 100755 diff --git a/static/fonts/fontawesome-webfont.eot b/static/fonts/fontawesome-webfont.eot old mode 100644 new mode 100755 diff --git a/static/fonts/fontawesome-webfont.ttf b/static/fonts/fontawesome-webfont.ttf old mode 100644 new mode 100755 diff --git a/static/fonts/fontawesome-webfont.woff b/static/fonts/fontawesome-webfont.woff old mode 100644 new mode 100755 diff --git a/static/img/album.jpg b/static/img/album.jpg old mode 100644 new mode 100755 diff --git a/static/img/bg.jpg b/static/img/bg.jpg old mode 100644 new mode 100755 diff --git a/static/img/glyphicons-halflings-white.png b/static/img/glyphicons-halflings-white.png old mode 100644 new mode 100755 diff --git a/static/img/glyphicons-halflings.png b/static/img/glyphicons-halflings.png old mode 100644 new mode 100755