From d855c38e078f2cd0bec86d5a20fc2f448799433b Mon Sep 17 00:00:00 2001 From: Michael Weimann Date: Tue, 28 Aug 2018 15:58:27 +0200 Subject: [PATCH] Moves the logo files to logo Signed-off-by: Michael Weimann --- apps/theming/lib/ImageManager.php | 7 ++++--- apps/theming/lib/ThemingDefaults.php | 8 ++++---- apps/theming/tests/ImageManagerTest.php | 6 +++--- apps/theming/tests/ThemingDefaultsTest.php | 4 ++-- core/Controller/LoginController.php | 2 +- core/Controller/SvgController.php | 5 ++--- core/css/guest.css | 2 +- core/img/logo-blue.png | Bin 6112 -> 0 bytes core/img/logo.svg | 1 - core/img/{ => logo}/logo-icon-175px.png | Bin core/img/{ => logo}/logo-mail.png | Bin core/img/{ => logo}/logo.png | Bin core/img/{logo-blue.svg => logo/logo.svg} | 17 ++++++----------- lib/private/legacy/defaults.php | 4 ++-- tests/lib/Files/Cache/ScannerTest.php | 4 ++-- tests/lib/Files/Cache/UpdaterLegacyTest.php | 8 ++++---- tests/lib/Files/Cache/WatcherTest.php | 2 +- .../lib/Files/ObjectStore/NoopScannerTest.php | 2 +- tests/lib/Files/ViewTest.php | 4 ++-- 19 files changed, 35 insertions(+), 41 deletions(-) delete mode 100644 core/img/logo-blue.png delete mode 100644 core/img/logo.svg rename core/img/{ => logo}/logo-icon-175px.png (100%) rename core/img/{ => logo}/logo-mail.png (100%) rename core/img/{ => logo}/logo.png (100%) rename core/img/{logo-blue.svg => logo/logo.svg} (82%) diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php index 6a42c22aba5..46598673f14 100644 --- a/apps/theming/lib/ImageManager.php +++ b/apps/theming/lib/ImageManager.php @@ -80,12 +80,13 @@ class ImageManager { } switch ($key) { + case 'logo-blue': + // the blue logo is only available as svg + return $this->urlGenerator->getAbsoluteURL('svg/core/logo/logo/0082C9') . '?v=' . $cacheBusterCounter; case 'logo': case 'logoheader': case 'favicon': - return $this->urlGenerator->imagePath('core', 'logo.png') . '?v=' . $cacheBusterCounter; - case 'logo-blue': - return $this->urlGenerator->imagePath('core', 'logo-blue.png') . '?v=' . $cacheBusterCounter; + return $this->urlGenerator->imagePath('core', 'logo/logo.png') . '?v=' . $cacheBusterCounter; case 'background': return $this->urlGenerator->imagePath('core', 'background.png') . '?v=' . $cacheBusterCounter; } diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index 5a14e8a7903..7a26b46516f 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -217,9 +217,9 @@ class ThemingDefaults extends \OC_Defaults { if(!$logo || !$logoExists) { if($useSvg) { - $logo = $this->urlGenerator->imagePath('core', 'logo.svg'); + $logo = $this->urlGenerator->imagePath('core', 'logo/logo.svg'); } else { - $logo = $this->urlGenerator->imagePath('core', 'logo.png'); + $logo = $this->urlGenerator->imagePath('core', 'logo/logo.png'); } return $logo . '?v=' . $cacheBusterCounter; } @@ -312,9 +312,9 @@ class ThemingDefaults extends \OC_Defaults { $primaryColor = $this->getColorPrimary(); $luminance = $this->util->calculateLuminance($primaryColor); if ($logoMime === '' & $luminance > 0.8) { - return $this->imageManager->getImageUrl('logo-blue'); + return $this->imageManager->getImageUrl('logo-blue', true); } else { - return $this->imageManager->getImageUrl('logo'); + return $this->imageManager->getImageUrl('logo', true); } } diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php index 38f5fb04969..fc9eac7f143 100644 --- a/apps/theming/tests/ImageManagerTest.php +++ b/apps/theming/tests/ImageManagerTest.php @@ -144,9 +144,9 @@ class ImageManagerTest extends TestCase { ->willReturnOnConsecutiveCalls(0, false); $this->urlGenerator->expects($this->once()) ->method('imagePath') - ->with('core', 'logo.png') - ->willReturn('logo.png'); - $this->assertEquals('logo.png?v=0', $this->imageManager->getImageUrl('logo')); + ->with('core', 'logo/logo.png') + ->willReturn('logo/logo.png'); + $this->assertEquals('logo/logo.png?v=0', $this->imageManager->getImageUrl('logo')); } public function testGetImageUrlAbsolute() { diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index fc3a737c3c8..3da39fbbf2f 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -593,11 +593,11 @@ class ThemingDefaultsTest extends TestCase { } public function testGetLogoDefaultWithSvg() { - $this->getLogoHelper('logo.svg', true); + $this->getLogoHelper('logo/logo.svg', true); } public function testGetLogoDefaultWithoutSvg() { - $this->getLogoHelper('logo.png', false); + $this->getLogoHelper('logo/logo.png', false); } public function testGetLogoCustom() { diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 09b6fe54384..fed97177eef 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -194,7 +194,7 @@ class LoginController extends Controller { Util::addHeader('meta', ['property' => 'og:site_name', 'content' => Util::sanitizeHTML($this->defaults->getName())]); Util::addHeader('meta', ['property' => 'og:url', 'content' => $this->urlGenerator->getAbsoluteURL('/')]); Util::addHeader('meta', ['property' => 'og:type', 'content' => 'website']); - Util::addHeader('meta', ['property' => 'og:image', 'content' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core','favicon-touch.png'))]); + Util::addHeader('meta', ['property' => 'og:image', 'content' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'favicon-touch.png'))]); return new TemplateResponse( $this->appName, 'login', $parameters, 'guest' diff --git a/core/Controller/SvgController.php b/core/Controller/SvgController.php index 1fad9c39c3b..f0fc1dac4d4 100644 --- a/core/Controller/SvgController.php +++ b/core/Controller/SvgController.php @@ -91,7 +91,7 @@ class SvgController extends Controller { $appRootPath = $this->appManager->getAppPath($app); $appPath = substr($appRootPath, strlen($this->serverRoot)); - + if (!$appPath) { return new NotFoundResponse(); } @@ -119,8 +119,7 @@ class SvgController extends Controller { } // add fill (fill is not present on black elements) - $fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;])+)\/>/mi'; - + $fillRe = '/<((circle|rect|path)((!fill)[a-z0-9 =".\-#():;])+)\/>/mi'; $svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg); // replace any fill or stroke colors diff --git a/core/css/guest.css b/core/css/guest.css index fc926688c44..52386e904c7 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -69,7 +69,7 @@ body { } #header .logo { - background-image: url('../img/logo.svg?v=1'); + background-image: url('../img/logo/logo.svg?v=1'); background-repeat: no-repeat; background-size: 175px; background-position: center; diff --git a/core/img/logo-blue.png b/core/img/logo-blue.png deleted file mode 100644 index e1b7352b3f670df14fbc7ddc841744bda21f848e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6112 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 m!otGB!otGB!otEL*Z6;g&ZJ(eTxSyi0000 diff --git a/core/img/logo-icon-175px.png b/core/img/logo/logo-icon-175px.png similarity index 100% rename from core/img/logo-icon-175px.png rename to core/img/logo/logo-icon-175px.png diff --git a/core/img/logo-mail.png b/core/img/logo/logo-mail.png similarity index 100% rename from core/img/logo-mail.png rename to core/img/logo/logo-mail.png diff --git a/core/img/logo.png b/core/img/logo/logo.png similarity index 100% rename from core/img/logo.png rename to core/img/logo/logo.png diff --git a/core/img/logo-blue.svg b/core/img/logo/logo.svg similarity index 82% rename from core/img/logo-blue.svg rename to core/img/logo/logo.svg index 66b17330d12..dda265dfa16 100644 --- a/core/img/logo-blue.svg +++ b/core/img/logo/logo.svg @@ -12,7 +12,7 @@ width="256" viewBox="0 0 256 128" id="svg10" - sodipodi:docname="logo-blue.svg" + sodipodi:docname="logo.svg" inkscape:version="0.92.3 (2405546, 2018-03-11)"> @@ -22,7 +22,6 @@ image/svg+xml - @@ -43,7 +42,7 @@ showgrid="false" inkscape:zoom="1.4296875" inkscape:cx="128" - inkscape:cy="64" + inkscape:cy="91.978142" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -52,25 +51,21 @@ stroke="#fff" stroke-width="22" fill="none" - id="g8" - style="stroke:#0082c9;stroke-opacity:1"> + id="g8"> + id="circle2" /> + id="circle4" /> + id="circle6" /> diff --git a/lib/private/legacy/defaults.php b/lib/private/legacy/defaults.php index 3a22c91a8df..0c95c1b81b7 100644 --- a/lib/private/legacy/defaults.php +++ b/lib/private/legacy/defaults.php @@ -315,9 +315,9 @@ class OC_Defaults { } if($useSvg) { - $logo = \OC::$server->getURLGenerator()->imagePath('core', 'logo.svg'); + $logo = \OC::$server->getURLGenerator()->imagePath('core', 'logo/logo.svg'); } else { - $logo = \OC::$server->getURLGenerator()->imagePath('core', 'logo.png'); + $logo = \OC::$server->getURLGenerator()->imagePath('core', 'logo/logo.png'); } return $logo . '?v=' . hash('sha1', implode('.', \OCP\Util::getVersion())); } diff --git a/tests/lib/Files/Cache/ScannerTest.php b/tests/lib/Files/Cache/ScannerTest.php index 075716f8033..736df2174d1 100644 --- a/tests/lib/Files/Cache/ScannerTest.php +++ b/tests/lib/Files/Cache/ScannerTest.php @@ -60,7 +60,7 @@ class ScannerTest extends \Test\TestCase { $this->assertEquals($cachedData['mimetype'], 'text/plain'); $this->assertNotEquals($cachedData['parent'], -1); //parent folders should be scanned automatically - $data = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png'); + $data = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png'); $this->storage->file_put_contents('foo.png', $data); $this->scanner->scanFile('foo.png'); @@ -98,7 +98,7 @@ class ScannerTest extends \Test\TestCase { private function fillTestFolders() { $textData = "dummy file data\n"; - $imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png'); + $imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png'); $this->storage->mkdir('folder'); $this->storage->file_put_contents('foo.txt', $textData); $this->storage->file_put_contents('foo.png', $imgData); diff --git a/tests/lib/Files/Cache/UpdaterLegacyTest.php b/tests/lib/Files/Cache/UpdaterLegacyTest.php index 707ed70af23..66fa8d51932 100644 --- a/tests/lib/Files/Cache/UpdaterLegacyTest.php +++ b/tests/lib/Files/Cache/UpdaterLegacyTest.php @@ -42,7 +42,7 @@ class UpdaterLegacyTest extends \Test\TestCase { $this->storage = new \OC\Files\Storage\Temporary(array()); $textData = "dummy file data\n"; - $imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png'); + $imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png'); $this->storage->mkdir('folder'); $this->storage->file_put_contents('foo.txt', $textData); $this->storage->file_put_contents('foo.png', $imgData); @@ -84,7 +84,7 @@ class UpdaterLegacyTest extends \Test\TestCase { public function testWrite() { $textSize = strlen("dummy file data\n"); - $imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png'); + $imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo/logo.png'); $this->cache->put('foo.txt', array('mtime' => 100, 'storage_mtime' => 150)); $rootCachedData = $this->cache->get(''); $this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']); @@ -145,7 +145,7 @@ class UpdaterLegacyTest extends \Test\TestCase { public function testDelete() { $textSize = strlen("dummy file data\n"); - $imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png'); + $imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo/logo.png'); $rootCachedData = $this->cache->get(''); $oldEtag = $rootCachedData['etag']; $this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']); @@ -206,7 +206,7 @@ class UpdaterLegacyTest extends \Test\TestCase { public function testRename() { $textSize = strlen("dummy file data\n"); - $imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png'); + $imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo/logo.png'); $rootCachedData = $this->cache->get(''); $this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']); diff --git a/tests/lib/Files/Cache/WatcherTest.php b/tests/lib/Files/Cache/WatcherTest.php index 3834b5591ff..d4aa9ac875e 100644 --- a/tests/lib/Files/Cache/WatcherTest.php +++ b/tests/lib/Files/Cache/WatcherTest.php @@ -179,7 +179,7 @@ class WatcherTest extends \Test\TestCase { private function getTestStorage($scan = true) { $storage = new \OC\Files\Storage\Temporary(array()); $textData = "dummy file data\n"; - $imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png'); + $imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png'); $storage->mkdir('folder'); $storage->file_put_contents('foo.txt', $textData); $storage->file_put_contents('foo.png', $imgData); diff --git a/tests/lib/Files/ObjectStore/NoopScannerTest.php b/tests/lib/Files/ObjectStore/NoopScannerTest.php index 16bd325a8df..6d593225e97 100644 --- a/tests/lib/Files/ObjectStore/NoopScannerTest.php +++ b/tests/lib/Files/ObjectStore/NoopScannerTest.php @@ -38,7 +38,7 @@ class NoopScannerTest extends \Test\TestCase { private function fillTestFolders() { $textData = "dummy file data\n"; - $imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png'); + $imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png'); $this->storage->mkdir('folder'); $this->storage->file_put_contents('foo.txt', $textData); $this->storage->file_put_contents('foo.png', $imgData); diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index 9b435f2b935..97e3d42684f 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -142,7 +142,7 @@ class ViewTest extends \Test\TestCase { Filesystem::mount($storage2, array(), $root . '/substorage'); Filesystem::mount($storage3, array(), $root . '/folder/anotherstorage'); $textSize = strlen("dummy file data\n"); - $imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png'); + $imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo/logo.png'); $storageSize = $textSize * 2 + $imageSize; $storageInfo = $storage3->getCache()->get(''); @@ -658,7 +658,7 @@ class ViewTest extends \Test\TestCase { */ $storage = new $class(array()); $textData = "dummy file data\n"; - $imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png'); + $imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png'); $storage->mkdir('folder'); $storage->file_put_contents('foo.txt', $textData); $storage->file_put_contents('foo.png', $imgData);