diff --git a/airtime_mvc/application/common/FileDataHelper.php b/airtime_mvc/application/common/FileDataHelper.php index 983885c7e..3db19b116 100644 --- a/airtime_mvc/application/common/FileDataHelper.php +++ b/airtime_mvc/application/common/FileDataHelper.php @@ -155,20 +155,8 @@ class FileDataHelper { } else { $ext = 'jpg'; } + self::resizeGroup($file, $ext); - if (file_exists($file)) { - self::resizeImage($file, $file . '-32.jpg', $ext, 32, 100); - self::resizeImage($file, $file . '-64.jpg', $ext, 64, 100); - self::resizeImage($file, $file . '-128.jpg', $ext, 128, 100); - self::resizeImage($file, $file . '-256.jpg', $ext, 256, 100); - self::resizeImage($file, $file . '-512.jpg', $ext, 512, 100); - self::imgToDataURI($file . '-32.jpg', $file . '-32'); - self::imgToDataURI($file . '-64.jpg', $file . '-64'); - self::imgToDataURI($file . '-128.jpg', $file . '-128'); - self::imgToDataURI($file . '-256.jpg', $file . '-256'); - } else { - Logging::error("The file $file does not exist"); - } } else { $get_img = ''; } @@ -231,20 +219,8 @@ class FileDataHelper { } else { $ext = 'jpg'; } + self::resizeGroup($rfile, $ext); - if (file_exists($rfile)) { - self::resizeImage($rfile, $rfile . '-32.jpg', $ext, 32, 100); - self::resizeImage($rfile, $rfile . '-64.jpg', $ext, 64, 100); - self::resizeImage($rfile, $rfile . '-128.jpg', $ext, 128, 100); - self::resizeImage($rfile, $rfile . '-256.jpg', $ext, 256, 100); - self::resizeImage($rfile, $rfile . '-512.jpg', $ext, 512, 100); - self::imgToDataURI($rfile . '-32.jpg', $rfile . '-32'); - self::imgToDataURI($rfile . '-64.jpg', $rfile . '-64'); - self::imgToDataURI($rfile . '-128.jpg', $rfile . '-128'); - self::imgToDataURI($rfile . '-256.jpg', $rfile . '-256'); - } else { - Logging::error("The file $rfile does not exist"); - } } else { $get_img = ""; } @@ -296,24 +272,34 @@ class FileDataHelper { } else { $ext = 'jpg'; } - - if (file_exists($rfile)) { - self::resizeImage($rfile, $rfile . '-32.jpg', $ext, 32, 100); - self::resizeImage($rfile, $rfile . '-64.jpg', $ext, 64, 100); - self::resizeImage($rfile, $rfile . '-128.jpg', $ext, 128, 100); - self::resizeImage($rfile, $rfile . '-256.jpg', $ext, 256, 100); - self::resizeImage($rfile, $rfile . '-512.jpg', $ext, 512, 100); - self::imgToDataURI($rfile . '-32.jpg', $rfile . '-32'); - self::imgToDataURI($rfile . '-64.jpg', $rfile . '-64'); - self::imgToDataURI($rfile . '-128.jpg', $rfile . '-128'); - self::imgToDataURI($rfile . '-256.jpg', $rfile . '-256'); - } else { - Logging::error("The file $rfile does not exist"); - } + self::resizeGroup($rfile, $ext); return $get_img; } + /** + * Resize artwork group + * + * @param string $file + * @param string $ext + */ + public static function resizeGroup($file, $ext) + { + if (file_exists($file)) { + self::resizeImage($file, $file . '-32.jpg', $ext, 32, 100); + self::resizeImage($file, $file . '-64.jpg', $ext, 64, 100); + self::resizeImage($file, $file . '-128.jpg', $ext, 128, 100); + self::resizeImage($file, $file . '-256.jpg', $ext, 256, 100); + self::resizeImage($file, $file . '-512.jpg', $ext, 512, 100); + self::imgToDataURI($file . '-32.jpg', $file . '-32'); + self::imgToDataURI($file . '-64.jpg', $file . '-64'); + self::imgToDataURI($file . '-128.jpg', $file . '-128'); + self::imgToDataURI($file . '-256.jpg', $file . '-256'); + } else { + Logging::error("The file $file does not exist"); + } + } + /** * Render image * Used in API to render JPEG diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index ae9af550a..087bb5ba9 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -4345,33 +4345,3 @@ body.droppable .artwork-upload .artwork-preview { border: 2px dashed lightblue; z-index: 9999; } -.profile { - width: 50%; -} -.profile-avatar-wrap { - width: 33.33%; - float: left; - margin: 0 20px 5px 0; - position: relative; - pointer-events: none; - border: 5px solid transparent; -} -.profile-avatar-wrap:after { - content: ""; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; -} -.profile-avatar-wrap img { - width: 100%; - display: block; -} -.location { - text-transform: uppercase; - color: #999; - letter-spacing: 1px; - margin: 0 0 10px 0; - font-size: 90%; -}