From 4e93d9e3a23f169dfc28d0ca8311a2d15180a0ad Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 21 May 2015 22:40:26 +0200 Subject: [PATCH 1/4] remove logo-wide from tests --- tests/data/desktopapp.png | Bin 0 -> 2364 bytes tests/data/desktopapp.svg | 5 + tests/data/logo-wide.png | Bin 2882 -> 0 bytes tests/data/logo-wide.svg | 875 ---------------------------- tests/lib/archive.php | 6 +- tests/lib/files/storage/storage.php | 12 +- tests/lib/helper.php | 4 +- 7 files changed, 16 insertions(+), 886 deletions(-) create mode 100644 tests/data/desktopapp.png create mode 100644 tests/data/desktopapp.svg delete mode 100644 tests/data/logo-wide.png delete mode 100644 tests/data/logo-wide.svg diff --git a/tests/data/desktopapp.png b/tests/data/desktopapp.png new file mode 100644 index 0000000000000000000000000000000000000000..272397c949e6846c73280de2a29a42e678e63a09 GIT binary patch literal 2364 zcmV-C3B&e@P){0D=aK5EiElB zE-o)GFEB7LF)=YRGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`>K0ZG` zKR`f0K|w)6LPA7DL`6kKMn*_~R#sM5S65hASXo(FT3T9LTU%UQTwPsVUS3{bUteHgU}0flVq#)r zV`F4wWMyS#W@ct*XJ=?=XlZF_YHDh0Yin$5Y;A3AZfSYo}QndpP-Ll?si~=|s;aB2 ztE{Z7t*x!EudlGMu(7eRva+(Yw6wLgwYIjlxVX5vxw*Q!y1To(yu7@=zP`V|zreu2 z!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4{l%+Aiv&(F`$(9qJ-($mw^)YR0~ z)z#M4*4Nk9*x1gww2>+9_7?CtIC?(XjI@9*&N@bU5S^78WY^Yixh_V@Sq`1ttw`T6?#`uqF) z{QUg={r&#_{{R2~AfpJV00007bW%=J018ByqSgJx$H)l)00sO>L_t(&-tF3dRMqtz z$MKuLp4V}q5Cj)UQzx3G2pWh(lTvT$#8eO`mDm>H55AK9m_IU2#g=(v)O0iFLNB1T z$VuC{M0$x)2*#3mO_PlxTT|8w)7{s<`{P39IV9@wp13>r{l`6@^SPhT=RWTDeD3G{ zJ>UB_nM|f0y?Xbd8%Lksy?U5TCX?xgp7=oYyuoBL`GgdDnoK?Lk?3LS>o4W}$U0p_cH=)*aO|5DFQifsVq{eoB zjqf*Ny-t;M`59jisP(|#8r<0^mkdwiVOvUfpdR1(+lmVv7x`PL4%xZ`)efXeX~5J~ zYvKXIAKvt6dB17v3V~IUbb2U; zKB$$n865iKzok~ISE##G!wQ{z;EDfe9tTyPvR)d8OU6R|Yc$FAdhJfjaWy|)>el_( zq>rC&RND^$Sgh9EpZ!CdF{HDb-;pNZkluf~MNJlOP`BzsTzUjvRs~JkpJ-lW+>T2{ zZEcg<_v&nEB)p<(Y|>CHt=a&<^tEXOzok7G(qw2-EOz<#5}L$taR>fTsl{$IU zXgAQPwO*h;B~7APDG-q`D#SXquO;P#3UF!ttzRkIL!BoLhkZJXP3{QHpXylv_UJ`8 zEIWoY9_qChhniuCwBR~ZKXF!lER{mO-ie=bO!;B|)h{Q`Y1WgtWbkX94x>zO+#KAj zW0}ACN=vax4U4OEek1@zs-L;l?V+AD4oK5*NEJ(tsimJ6vQ=At5QNuBQe`lClBD-S zaLFL@bNz~Jsg~*glq91uCViQDeGjWdtJOMn zL|*^`GGBOpwi$?Dx8u1*7MNfi1Y@js5jcN)HbmxZ-(Ur7DjTuRc2CDzw{BWHY@pS8 zqoIadR=$u1IFy(4+{UrjIR#ux*i_b8x1k0)@^GFP66^mtb(!)Ci9cGOe7OB z!!o#i%Jrx6*O0PdZ}xRj8djE1^0s-lXqHsiJ)HK1w5t5-1vT2UrsZ zm~k})T~Mza`VH*O?&*xx@OJ9Zl4qXzEFwRDWeM|J%)fh$qUG7e>;-t_=%c$Dqldh= zIHMvRIFLs4(f-Tt0`~97%S&pfR;L!c9aK5Mo_u+#t};Bck^^Bf#9Cs4hzTNP)<_Ez zQq0^mjv>*6EST31PlAfeSr7_QOP9w0L6d;ksN{QrIIGnV9=7$W4=Fvu$aqJ z+pbR9cExA6^;_ThQNL?T0b9Sg8tE5X{SPhuR6o^E^;0{e`p}>3K2*BkLj@r|RA%Et i#Y?_a66Q07cK-t#X|XPa)f*cC0000 + +Desktop app +Windows, OS X, Linux + diff --git a/tests/data/logo-wide.png b/tests/data/logo-wide.png deleted file mode 100644 index 648cb7e61563c8543fae69b561f626da202f9103..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2882 zcmV-I3%&G-P)@6jvH%P0VI@lXYuXD;^+5lTw5kZcz{zW(E)s zj$wvDL_|;o@c@*tidTfFh*{65Nkr5{MFm8oh#I`{7L5m9;2opLF@Pw7@bCMl-dJPP zbHHE>VpkKc?-LL*QZhZ#~j~yT!xsU7U`-iE$x6DQ$yk)s~E2Nzf27^=!XGvMr^Xf*5ck>N{rdk(;j1Hgi!ralP zz*Z+$kak0%N%-#b>;p@d~-fFvh z|92Q7nII#X)JBY(^vY_Bgdr)g_oykQm@;SVJ_vIbt^%*XDPZRo0G7@YRx&((QYMO{gqx>ZICbq z2J<@fxA%JFIBbmEg=8N*4v!u`l`Gam5)LJ$XOJP&mZdSr!yksMgmUrj6^wle@4H2eSFW$!%Jn$mQ}F#n0Lcx9@bIGW`5KZ+qBEDmNSE{EzDFB_ddns*+o zT>Osc71o9bW8vicJ#i~Fs+5jy%EdE8P8y+Tyxf8`MH(6!U}M@Ya3y0)%4CgP6UV`) z^gU3BB}Hq!zYy)RBXi+kp=ezB>-u`NO5c%{1J-;$cve!@>;QNxiDklL<~M40@eV2N zYRNZl=Y)x(Xs!2mPpgh3#eIaCkR}O^jE7%xj)1NbGI_TAcYZx`3M;|j6EqbD2uC(p z@%$>Sc#>Nr=GkP-b@$a1rWFvTb6&gg|8Moi8eAB}3!(hyUZis1F6oP5;vb8^{RoLeAy|8BeHfU)Q>h4ftqVCkAoElwDr&p2T2yHO=ii%WsH)fyU9ULwe&iex^FT#Hr0R)0>gpWqrn2Ei#B6M3tcqo!-c zQ4%P({hI*Y$!&U#wG31nVCu}azeQPg?#+dWX$fytWpNz{_rM^TYy?v94UTS6vf##X zT!(6ka2-W510GNDCR-C+WO*nz2tHJ3Q+5k`VaD|(9S)~gI)U$%gGWlWj4gl{T5^u zRd1}2gGW${66VZ>%McyExJhF;gMDNM63GWj6YNRf!hg0PVX(#!t>&R_B#2Zx9#3m7 z%_R)Z=QP0pHSXgAzAriwW;?-1jWLXcvu~j`rF^Wh4EK+O;7Rc?BVk#i^P-?A(54!! zt)Pob-IAqse_X({k#7ux>74 z@P)dfRnTj}6aRep#96JBf-BDh1pX>llqF+h^HSE^n!QQ0gQn;#HIuHi^@=Oimdeiu(DTG0SdC~uQG$zwb7(9L6%qFh)wN3t=!L+MvaQ zy~MZ%5_w`X2{VddfrfEhT0K_2{@*l=NvCn1BHqi?iZHk-%G^nG<_T z2VDr$iCP^^o4_JitjU)I$2E+@m}!>M@p_sHt4o^;>0iZhk zt%x#25)My_OH`i!X6X;FN$~k{Yi4#`QH)C%EHOF_G-axt;gYxKO4SZc~?u1 zE-Vvtq7S=+QX49Sx#iQIW(YGF?fn@kYI6yL5a5ajfrFZH-DxbrjFC1Ij8!qF2fg>s zN^SjUhN$Y(9b9vn%V?WR+g05gTA^ca8u}0Nl;HQ!Ik|Z%H@)D}K}>woEAPN5^=x}% zaQ`mHQB-1N?qXu@W;)ML>Ps&z>l|9 z(71uEz_^28CC%`Z>pmA~0N+iifG4H*%=UFfD7_E9lI7?{tl<;~LCRcI-Ov+L9-E*2l)fL-BikY(1pJ-8~Tp$2?uKYQu}%V`t->!j|4^BEW9h z4l*(o*cw~7Mp`*bGAx}Xzme2CwI^2?WN6{~<(ocSfg^DRyNO~SS@9&-xsIYAk#NBB zX)TU3Mh3`F;hq0{=Y42W#D}d7ahm^dtQi5i4@q)ZV+4{9kUvm!9Pg_FjSu grtN(9U8}_Z0q!l;tOs|I4*&oF07*qoM6N<$f - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/lib/archive.php b/tests/lib/archive.php index 690b4378b8..506679154f 100644 --- a/tests/lib/archive.php +++ b/tests/lib/archive.php @@ -26,7 +26,7 @@ abstract class Test_Archive extends \Test\TestCase { public function testGetFiles() { $this->instance=$this->getExisting(); $allFiles=$this->instance->getFiles(); - $expected=array('lorem.txt','logo-wide.png','dir/', 'dir/lorem.txt'); + $expected=array('lorem.txt','desktopapp.png','dir/', 'dir/lorem.txt'); $this->assertEquals(4, count($allFiles), 'only found '.count($allFiles).' out of 4 expected files'); foreach($expected as $file) { $this->assertContains($file, $allFiles, 'cant find '. $file . ' in archive'); @@ -35,7 +35,7 @@ abstract class Test_Archive extends \Test\TestCase { $this->assertFalse($this->instance->fileExists('non/existing/file')); $rootContent=$this->instance->getFolder(''); - $expected=array('lorem.txt','logo-wide.png', 'dir/'); + $expected=array('lorem.txt','desktopapp.png', 'dir/'); $this->assertEquals(3, count($rootContent)); foreach($expected as $file) { $this->assertContains($file, $rootContent, 'cant find '. $file . ' in archive'); @@ -113,7 +113,7 @@ abstract class Test_Archive extends \Test\TestCase { $this->instance->extract($tmpDir); $this->assertEquals(true, file_exists($tmpDir.'lorem.txt')); $this->assertEquals(true, file_exists($tmpDir.'dir/lorem.txt')); - $this->assertEquals(true, file_exists($tmpDir.'logo-wide.png')); + $this->assertEquals(true, file_exists($tmpDir.'desktopapp.png')); $this->assertEquals(file_get_contents($dir.'/lorem.txt'), file_get_contents($tmpDir.'lorem.txt')); OCP\Files::rmdirr($tmpDir); } diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php index e8602b6b24..62fba4c171 100644 --- a/tests/lib/files/storage/storage.php +++ b/tests/lib/files/storage/storage.php @@ -153,13 +153,13 @@ abstract class Storage extends \Test\TestCase { $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile, 'r')); $this->assertEquals('text/plain', $this->instance->getMimeType('/lorem.txt')); - $pngFile = \OC::$SERVERROOT . '/tests/data/logo-wide.png'; - $this->instance->file_put_contents('/logo-wide.png', file_get_contents($pngFile, 'r')); - $this->assertEquals('image/png', $this->instance->getMimeType('/logo-wide.png')); + $pngFile = \OC::$SERVERROOT . '/tests/data/desktopapp.png'; + $this->instance->file_put_contents('/desktopapp.png', file_get_contents($pngFile, 'r')); + $this->assertEquals('image/png', $this->instance->getMimeType('/desktopapp.png')); - $svgFile = \OC::$SERVERROOT . '/tests/data/logo-wide.svg'; - $this->instance->file_put_contents('/logo-wide.svg', file_get_contents($svgFile, 'r')); - $this->assertEquals('image/svg+xml', $this->instance->getMimeType('/logo-wide.svg')); + $svgFile = \OC::$SERVERROOT . '/tests/data/desktopapp.svg'; + $this->instance->file_put_contents('/desktopapp.svg', file_get_contents($svgFile, 'r')); + $this->assertEquals('image/svg+xml', $this->instance->getMimeType('/desktopapp.svg')); } diff --git a/tests/lib/helper.php b/tests/lib/helper.php index b7aa185f4e..03c6dacde6 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -85,11 +85,11 @@ class Test_Helper extends \Test\TestCase { $expected = 'application/zip'; $this->assertEquals($result, $expected); - $result = OC_Helper::getMimeType($dir."/logo-wide.svg"); + $result = OC_Helper::getMimeType($dir."/desktopapp.svg"); $expected = 'image/svg+xml'; $this->assertEquals($result, $expected); - $result = OC_Helper::getMimeType($dir."/logo-wide.png"); + $result = OC_Helper::getMimeType($dir."/desktopapp.png"); $expected = 'image/png'; $this->assertEquals($result, $expected); } From 78a04643545d692a8700706bd261f53151de2b0e Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 22 May 2015 00:04:47 +0200 Subject: [PATCH 2/4] replace logo-wide on share page as well with better icon + text --- apps/files_sharing/templates/public.php | 18 ++++++++++++++---- core/css/header.css | 15 ++++----------- core/css/mobile.css | 9 +++------ core/img/logo-wide.png | Bin 2022 -> 0 bytes core/img/logo-wide.svg | 2 -- core/templates/layout.user.php | 2 +- 6 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 core/img/logo-wide.png delete mode 100644 core/img/logo-wide.svg diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index fa349f2981..5a0119747f 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -46,12 +46,22 @@ $thumbSize = 1024;