From 0a2ed5491b495160db0a0350256977a9c66b78c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Tue, 18 Sep 2018 14:01:25 +0200 Subject: [PATCH] Add configurable link/icon for english subpages --- .../Configuration/TypoScript/constants.txt | 2 ++ .../Configuration/TypoScript/setup.txt | 1 + .../Resources/Private/Assets/images/gb.png | Bin 0 -> 3465 bytes .../Private/Assets/images/gb_col.png | Bin 0 -> 4472 bytes .../Resources/Private/Assets/js/_images.js | 2 ++ .../Private/Assets/scss/remix/_area-nav.scss | 2 +- .../Assets/scss/remix/_contactnav.scss | 33 ++++++++++++++---- .../Private/Partials/ContactBar.html | 6 ++++ 8 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/gb.png create mode 100644 web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/gb_col.png diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt index 4fba3b1e..927e1082 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt @@ -47,6 +47,8 @@ plugin.tx_eptheme { watchlistPageUid = # cat=eptheme/200/270; type=string; label=Skipass info page UID skipassPageUid = + # cat=eptheme/200/280; type=string; label=English page UID + englishPageUid = # cat=eptheme/400/100; type=string; label=Phone number general phoneNumber = 0221 - 272 276 0 diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt index 413897e5..5b52d5cf 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt @@ -84,6 +84,7 @@ plugin.tx_eptheme { ratingPageUid = {$plugin.tx_eptheme.settings.ratingPageUid} watchlistPageUid = {$plugin.tx_eptheme.settings.watchlistPageUid} skipassPageUid = {$plugin.tx_eptheme.settings.skipassPageUid} + englishPageUid = {$plugin.tx_eptheme.settings.englishPageUid} } view { templateRootPaths.0 = EXT:ep_theme/Resources/Private/Templates diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/gb.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/gb.png new file mode 100644 index 0000000000000000000000000000000000000000..8bc7b3c5ce9008648972b1804157a56ef0a41a86 GIT binary patch literal 3465 zcmai1c{r478y{Ih_N~b}rYu=z!wi#k#!QrPgtA1L880(2W{jCLGg6$<$x=j=Iz%{} zk|l&Fg(M+ONohNkE!wR~;(ML1&UgO!uJ3!U>wUKC{@wTe-1qNU-ZUTYt;&kJiVz4y z+0(<_7i=BD&s=^DSX)01-B)x+;SZvN#|bROlk)Q0Y+s4@LtbnK4fAk5{h4Va#wRcz_)RMd1(u z2Gb*+3;4x*`_tp2=nmm<7iXBG5DzL~0X!;9$cm1M!wa3@f9b`8{ncqC9QKz8FUkr2 zZ>It&J}@Gi3&89USZg}k76rpOAkbKptsUA5hC!imNR%BCg|$YZ@hE#d1`YdO;Gi{b zcm&?po&4PvIC6qBcsvdsi4+I~2!RcP&5cB&9UL5xC=3#Vu?8iq<3uq$s?a(nZsQLP z?m!%!%jEEw>=@XpMk_dtOmLkg)JBpQK2vRJF@`b#>F z=L`JDjsGeg=P%*_NM9h1&F9j=d_-*g0S06DzYVPlg5KcW*>pY&h~as}$BtvLIWQt|HCy&D3YE@`S)E%A?{{wjF7sy~oXlmjV1LC2&-{lE z_HH;dmO#eZ5bWH+3g=*BPbOmBQT7B|dwT-b7XBR*{*N{PUknm7j$BRVKa%@n3S`V` z_iw6#gTKiR#DEOvf>e%h{wfcFC@OfmyZH;B^qmgy(hh>&a_eeXAE<}*SF=3{+!QPC z{}{SMla8!yg=S2(uN9&0bwan>c6nUXJkcP~+CpQS|JfUP! zUuGx$&ij@v&Q8)LJDa&Q_T`wr)D2J zD1Ge>)WKNX?lf)v#l@2OD}s-K7q{mjM!GUeZ*}+eDap%+xwpp8(P*^e$B$##e=ZH* zJOU@BU&N_Zw9buHW@Nt!lI&cwc~02R$K`My#*H-j6cZe;9{73^ouP*-v}J1eIPagg zGB$2c&B&+%JvwISl=Mq+)$XR4!HPkn5A%z2Z#7J|!CEt0s%A|omFb?xmZJvuCX#3i z^Y5QFNhCgj>-F`Qrbf1=CP}I_M~K0}PkK&R>S3dy+S(?)?RvkzXyLz2(=@BAuQ$e9 zDBPPHX%zon)bNK?p_X5Qt1~nNjEGyZT$;y~pWn9}_=;WIUBCU5uH8Pz_}SFh*ZpU% z@ZatV58rfuM!DbX6skDtQ8lRha>5tPeh$76Ys0Ga?xH3&81YUt%zb#i|I^EMUZJB% zLp3`m=Z4l%V=F7A2tCHkn?cLeH6>~jZNErw-n`iW&pWrL6(1)Si^uy;$4w2B+_&PQ zwMhKMc=4T0wPqn@MzL;Fck*!sk)TtMBZUthJV;)vS|azf7Wq;Pix@Atb<%pbgxPlr zE%@+^s+L6rQh$*sY48#SO{H6p(Mq8R-6I+Jf@{etEdlDy>Ul578M>6ym|qQIr31BK zJxOhCZJ7pJI&>PuMy+b=9WF{tDZiZ^o_T%O7{9JvQAO(FO>*s{{xe%jZL=Z)U<%eB z*toJd7bO%5-#=*>7#J{eIoKBv%Ggz&LhroVIi_%63Mg_(toHk({}OXxasGWT{AnXA zStIKZdaUQfNZ->Y_T8x-{6ziF?}JODAJ-xGUJI$E-F$T;B}LW9a54rYm7FkB>Ew&+ zi7s$>3F(MVAJt{z!FfNkA@1TV6DXy@Roe37ljLgE^3>3rm##5ukRMADtBcX99b(9?J*5t3(4N6yrYU%3{A!m(%wz7lY79o{C$w(F!gl*QlDoz#XW3<+dWtaG^C3hj1n7f4{%)5ewt zsm`tpy_-)@B0_`Lj2;_2n_KnXW=&XX>hl)99wuBq-OzzM`eyLL#a|CrrYk?W#7xe~ zo}5Vba+Q5loHJBSIIy%Z1xXm`QWirdl~WF1uD0sP*gG?R=k3F)3*ORhf_FnwzK%A% zqYEO`CqenFYm*-1P&+O2lagfwAGXyem&m7+U`Baqfp8r&`otuI5O6>Bi>!YyUjL+6V+Nx+d+;KqdZy^iS&RMD zi%fODs>xQTp>-4mh6RCD)}&KWs4s7RszPRQXVnK-L4S1XyQXc!JLw#Qw24ygoj~tNk%f&X)Pr){ z+`NCY=j;(Z-Be$rB*fraOtyZ`yKTQw#p#j0Dz_E+qvo7UBNuO#jg$5#vU7D)R1Dxy zZR_Am316lcGkRWl*xcErSFHTS=Wd}>a&q#VtLw76hSzVVWUu=~yKVQ{1I~|DnP*k* z*pV~U82#9H*df_7_O`#LLXo40pennT2|MrTU|}*3o|&GX+xq>Rn-7t<`*oA}SXT-4 z#^D_^6Qxpx!+BSKg4G1p!c!o9(XJKV8{mZ9&8d=i26}qEsQZcMYt$xig6&}O@{*A~ zzI&fa7JS3_gs?om1T~@*myYYvf4)@cGU|xif*JL~DOyEng>#+Azbxcz5hbYe z#82C4NnTo}vv9;t^g*8#MP9KCy|drmd48kk-nwuFLXuR1teNJQ=mYx6#+LjxvFti? zk$vC3!HV0^9>4hRM^xF-tD+fGz!F$Gx1-c!@lj=vv{~XaRGLYxP6-TcRz1R-2dR~- zbt(5-*gCWP?Ce_3tB%pp@Y(XZT;CptJf9}vbXrgSKl)ZqsY_QvW?EU>*=ZLRAJZo>80KX%VR4sBYE$z+2h3ntJ|)E1 z{uJ5sQ1HGC6I(2yG#+&K_a7z&s%w~T+Ju7UpT@Bb@zDCnyVxMTxyj{kUpHTp(N67V z1lBSK%Fk>O&`LY3)A|~{KAGOhN-Hq*AKi3553Tx!!51avg2$1X!n?X>%BL*-&!Kn| zKEym|hI{Q!Ay;fbRq!b<>5fU)Rky zCN#8GH(KKhK6;1k{|gl!us}4U-z0n;z?pbs|`e z>3bzg4=tCDEd7*}w%E8L(|r?B5;uN1*b%1!c>o~fk`Bqmy3LNrsvB<^Kl%)H==O0B z;iQ_Yhp%6h)CIVI<`q%PeJr0w@G?%-(47)^tZY0wa^aP9XUa94_R)3B> MN#5?&gfQ{H0C2SOd;kCd literal 0 HcmV?d00001 diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/gb_col.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/gb_col.png new file mode 100644 index 0000000000000000000000000000000000000000..aedceaf791f3825814f98eb80fed950a7c1e48c5 GIT binary patch literal 4472 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 literal 0 HcmV?d00001 diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js index fbf46c9f..193967ab 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js @@ -8,7 +8,9 @@ require('../images/at.png'); require('../images/ch.png'); require('../images/de.png'); require('../images/fr.png'); +require('../images/gb.png'); require('../images/badge_skipass.png'); +require('../images/polygon.jpg'); require('../images/icons/tx_eptheme_gridelements_half_and_two_quarters.png'); require('../images/icons/tx_eptheme_gridelements_halves.png'); diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_area-nav.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_area-nav.scss index 95b89e59..1bd558be 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_area-nav.scss +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_area-nav.scss @@ -1,7 +1,7 @@ .area-nav { width: 100%; height: $area-nav-height; - background: #006db6 url(../images/polygon.jpg) no-repeat top center; + background: #006db6 url(../../images/polygon.jpg) no-repeat top center; background-size: cover; @include mq($from: desktop) { position: fixed; diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_contactnav.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_contactnav.scss index 941085ff..37d9e5a7 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_contactnav.scss +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_contactnav.scss @@ -55,10 +55,15 @@ span{ font-size: 22px; + display: inline-block; @include mq($from: mobile-landscape) { width: 37px; + height: 100%; float: left; padding: 7px 8px; + display: flex; + align-items: center; + justify-content: center; } } @@ -79,8 +84,11 @@ } @include mq($from: mobile-landscape) { - &.phone { + &.english { top: 0; + } + &.phone { + top: 44px; width: 190px; right: -150px; div { @@ -89,7 +97,7 @@ } &.whatsapp{ - top: 44px; + top: 88px; width: 350px; right: -310px; div{ @@ -98,18 +106,18 @@ } &.facebook { - top: 88px; + top: 132px; } &.instagram { - top: 132px + top: 176px } &.youtube { - top: 176px; + top: 220px; } &.watchlist { - top: 220px; + top: 264px; } &:hover{ right: 0; @@ -126,5 +134,18 @@ .bg-yellow{ background-color: #FECB00; } + .bg-blue{ + background-color: #006db6; + } } +.ep-contactnav__icon { + display: block; + height: 22px; + width: auto; + + @include mq($from: mobile-landscape) { + width: 22px; + height: auto; + } +} diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/ContactBar.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/ContactBar.html index 9d54871a..bb53e895 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/ContactBar.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/ContactBar.html @@ -24,4 +24,10 @@
Youtube
+ + + +
English
+
+