From f73c0a700a3a3cd5d5088a1d8439fe66720cb1f2 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 17 Jul 2017 20:35:19 +0200 Subject: [PATCH 1/3] Allow social image tags to be overwritten with partial params --- app/views/shared/_social_media_meta_tags.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/shared/_social_media_meta_tags.html.erb b/app/views/shared/_social_media_meta_tags.html.erb index c0e6a5e8a..3dc32128e 100644 --- a/app/views/shared/_social_media_meta_tags.html.erb +++ b/app/views/shared/_social_media_meta_tags.html.erb @@ -3,7 +3,7 @@ - + <% if setting['url'] %> @@ -14,7 +14,7 @@ <% end %> - + From 2844c03e431afa41973167eed151062d3c050795 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 18 Jul 2017 11:40:19 +0200 Subject: [PATCH 2/3] adds consistency on social media filenames --- CUSTOMIZE_EN.md | 3 ++- CUSTOMIZE_ES.md | 3 ++- app/models/site_customization/image.rb | 3 ++- .../shared/_social_media_meta_tags.html.erb | 4 ++-- public/social-media-icon.png | Bin 3524 -> 0 bytes public/social_media_icon.png | Bin 0 -> 3976 bytes public/social_media_icon_twitter.png | Bin 0 -> 3693 bytes .../admin/site_customization/images_spec.rb | 6 +++--- spec/fixtures/files/logo_header.png | Bin 463 -> 1618 bytes spec/fixtures/files/social-media-icon.png | Bin 3353 -> 0 bytes spec/fixtures/files/social_media_icon.png | Bin 0 -> 3976 bytes 11 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 public/social-media-icon.png create mode 100644 public/social_media_icon.png create mode 100644 public/social_media_icon_twitter.png delete mode 100644 spec/fixtures/files/social-media-icon.png create mode 100644 spec/fixtures/files/social_media_icon.png diff --git a/CUSTOMIZE_EN.md b/CUSTOMIZE_EN.md index 2e6c52aa0..542d11ee7 100644 --- a/CUSTOMIZE_EN.md +++ b/CUSTOMIZE_EN.md @@ -53,7 +53,8 @@ If you want to overwrite any image, firstly you need to findout the filename, an * logo_email.png * logo_header.png * map.jpg -* social-media-icon.png +* social_media_icon.png +* social_media_icon_twitter.png ### Views (HTML) diff --git a/CUSTOMIZE_ES.md b/CUSTOMIZE_ES.md index 3e9fd188d..e5bea19ad 100644 --- a/CUSTOMIZE_ES.md +++ b/CUSTOMIZE_ES.md @@ -53,7 +53,8 @@ Si quieres sobreescribir alguna imagen debes primero fijarte el nombre que tiene * logo_email.png * logo_header.png * map.jpg -* social-media-icon.png +* social_media_icon.png +* social_media_icon_twitter.png ### Vistas (HTML) diff --git a/app/models/site_customization/image.rb b/app/models/site_customization/image.rb index 5e7f38e4d..e336f6f9a 100644 --- a/app/models/site_customization/image.rb +++ b/app/models/site_customization/image.rb @@ -2,7 +2,8 @@ class SiteCustomization::Image < ActiveRecord::Base VALID_IMAGES = { "icon_home" => [330, 240], "logo_header" => [80, 80], - "social-media-icon" => [200, 200], + "social_media_icon" => [470, 246], + "social_media_icon_twitter" => [246, 246], "apple-touch-icon-200" => [200, 200] } diff --git a/app/views/shared/_social_media_meta_tags.html.erb b/app/views/shared/_social_media_meta_tags.html.erb index 3dc32128e..8c1196c96 100644 --- a/app/views/shared/_social_media_meta_tags.html.erb +++ b/app/views/shared/_social_media_meta_tags.html.erb @@ -3,7 +3,7 @@ - + <% if setting['url'] %> @@ -14,7 +14,7 @@ <% end %> - + diff --git a/public/social-media-icon.png b/public/social-media-icon.png deleted file mode 100644 index 512569d4894e16d878aaf61975a0661483973e47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3524 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 W{j{D#*~rF!70SZiyvX#_*?$4uPbGc; diff --git a/public/social_media_icon.png b/public/social_media_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8a5503078a03309e77951a7b4934c050effc46d4 GIT binary patch literal 3976 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 VpYn3HTW$R}##q@~=KtH9^B+AwLx literal 0 HcmV?d00001 diff --git a/public/social_media_icon_twitter.png b/public/social_media_icon_twitter.png new file mode 100644 index 0000000000000000000000000000000000000000..02c934e95a3c8054b54e3a240f69a3236dff4ed3 GIT binary patch literal 3693 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 ZyPWL$^uHtP>d7(0s)3jhFMH#LFU(8lL~ z`x!=B-{#nkp$&{)<}fJW^zU}BzqyDOVGcKOiUI&wdH!}Fpt4$k7G#PxwJ>H{qvPii z<3P|Kivj>_O{UN*c5%yJ(ZM;@_M#azfw4GWdA^);AY~VrB|)#aOKOXJ(XNHH zFIkc(f@1mf9n4|RSp+VylP5h zE2Ckfvq%+^s<<&0b9_VWK%8uh`UQ#C`TTe2N^u%UP;<*WuI5L1*{EYTW<-uu+he0% zA_v&_QLt87cnuUz3G@K!F8S6!;?`xEvb#U(Q1&!T?;-sDC?b2+ogTZRv5|Fz?q}|^ zYvs>>>;jh}mixj7WkSR)6{)#|*pwK8Qg~l>a61T2*8xffif!#?yKI4lQEz)Q@c=Av z10{<>qRL=x>W`QNxs2RY7PJ8nh9tJ@zTv%>NMfXRvu@qF2d`Ahg3{y$>6I-V3*B$TjXUYlVC1mE#_zz0tf*OoLMO^)XiMPs}sHT zI@@fN#oUxiwGmCZ1bU5KM!Q<8>XhOe(!I=d1qsY3$IDxo_rs8n*)KEd<@35d7q)%EHO6<+*9%2iJdudxzIpUI(+<1w17}ztpM#4$92C``O7D?F3;mRwprU z|5a4=r$@R%>Q-Z72UqVg>UTja6bgKOUaaQw-Sh(BV`dMp%j6uN_3)3xG^7z!?`$M^ zYpp+E{KIXcT-M8}zY6vUBU|Ja_G2Y#*BpY&A82_w{Nxe)19;!YSJrWkRYu+L_x$wsf1|pYaCYtBGAG z$o22v#C%3^aBT=fQEVk8sXyPdIbAT7GB9@}Hyr*UZuC*kGlJx5>#NLWD#DqL_*ll7 zDdmDFK&ct&2CnlBcTs|E5QRw&V;jfV+aMc6m8jtQ^4(A1^i(ON@kL-Gzi6pp6%bwogZj>X zk**e>4QeI{6AlDceN+3XX)-{0euleFL319$YYl~ujf5GkcikkFL|27u2fedT-u0*Q zSP!r!Bxc@bW$_VgvTs(f*%O$F>w4aPwA@WAt%&ZrJCPoPwacElfatwiG}tmeBIG7t z7Q~d2Z@l_=NGn)vJpzx^R0Sl1w*7W<4P&|>DG2$nLj8qx`c8%;x46`3f0(#VdO$O$$euerR`tB+VXRkrJJng)5vAJ#%4=~%h zYe2n0+Rb*n2fq}lS}~T{tgQx2#Z%i^rX*=ngwHJLjV)3bHvNw%#v7(ANaKew= z7VAFBQU55EMH#&lAOgo$HX{=(5P59hWrn?Hx5azMyQFQq0*85mnvo_;j9i+1gHyjO zNfFMf<2a^?LW$MlyLD9BLK}x)=*~)a3>L46UY%kmf_|0sh$Q1VzHVF^6-t$`G7mn> zrF{*|pg&!auPHEEJ`)JMp3_mBQ1d~jx8=z?J%M^af^e%OQ|wKu_>|6k((!C_=^aiSRYtT(s}q&YYi$i6YSQEYPJA zmLBK&Cc{#l@p>nWq=;Ce^4ccODf)Cm@RPjdYAiAP8ysr&QYp`}tiPerD}%YYFNCf~ z>wAN1*wXZ8{pSzOx}TJE&X74?LH)mOZg~5;RoT?`u3hllYsc^LBQhUeA(QSPZS-O7 z97)gL>YGr0ZIdHv#uJ1$Vp>H83OL75qM zH?svIXXb_%`Z!CI^#OfsuIJg0x3s5k-t}j0&I!p6G0FC;V zuMQh4kWg0 zgl(Z;yqPbK=)lcq?X-C%nHjYkBG%%x-cV9~*KwQ&F^eg%`nVTakl2PSDLNx!d!Q9& zu2*^>iD!+zw3S~S(k9^`-cMC{L>QcGTux@rrnZAr7=F>67>I>}MO{9SMJu->Zf0~bhwjJw%?j>MW$b&J-ZIvFNU7d9|bo$_YJ-~6ry6aw*Zf}q{7*)uQSona_aDK3u<~#8|6u9=)kVn^X5Wyl7iySDm;CedvYlql z?_2VFCEKW7ScDMxHxv#nRRmkL(4K>_n5};yy}Fqfk6`!H@&#w5vhwG0o{79%zqbkb bQzobvL?qkdav$vz128qVgtlMx`15}Nuhbo& diff --git a/spec/fixtures/files/social_media_icon.png b/spec/fixtures/files/social_media_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8a5503078a03309e77951a7b4934c050effc46d4 GIT binary patch literal 3976 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 VpYn3HTW$R}##q@~=KtH9^B+AwLx literal 0 HcmV?d00001 From 7b0d3093e5cf643d1e4114182b354f6e39687130 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 18 Jul 2017 12:04:35 +0200 Subject: [PATCH 3/3] Fix social media icon expectation --- spec/features/admin/site_customization/images_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/admin/site_customization/images_spec.rb b/spec/features/admin/site_customization/images_spec.rb index f96882918..6d180fe8e 100644 --- a/spec/features/admin/site_customization/images_spec.rb +++ b/spec/features/admin/site_customization/images_spec.rb @@ -46,14 +46,14 @@ feature "Admin custom images" do click_link "Custom Images" end - within("tr.social-media-icon") do + within("tr.social_media_icon") do attach_file "site_customization_image_image", "spec/fixtures/files/social_media_icon.png" click_button "Update" end expect(page).to have_css("img[src*='social_media_icon.png']") - within("tr.social-media-icon") do + within("tr.social_media_icon") do click_link "Delete" end