From 2995ef77fb5070a0392e2105a553d1dd18113096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20N=C3=A4gler?= <typo3@naegler.net> Date: Thu, 27 Nov 2014 21:24:52 +0100 Subject: [PATCH] [TASK] Replace legend.png with CSS/HTML Replace legend.png from Access module with a CSS/HTML replacement. follow up for #63245 Resolves: #63245 Releases: master Change-Id: I64575469ab03e4278d4c26c1427c8c14e1e60d7e Reviewed-on: http://review.typo3.org/34713 Reviewed-by: Frans Saris <franssaris@gmail.com> Tested-by: Frans Saris <franssaris@gmail.com> Reviewed-by: Benjamin Mack <benni@typo3.org> Tested-by: Benjamin Mack <benni@typo3.org> --- typo3/gfx/legend.gif | Bin 1352 -> 0 bytes .../Private/Templates/Permission/Index.html | 57 +++++++++++++++--- .../beuser/Resources/Public/Css/style.css | 53 ++++++++++++++++ .../beuser/Resources/Public/Images/legend.png | Bin 3528 -> 0 bytes 4 files changed, 100 insertions(+), 10 deletions(-) delete mode 100644 typo3/gfx/legend.gif mode change 100644 => 100755 typo3/sysext/beuser/Resources/Public/Css/style.css delete mode 100644 typo3/sysext/beuser/Resources/Public/Images/legend.png diff --git a/typo3/gfx/legend.gif b/typo3/gfx/legend.gif deleted file mode 100644 index c27a7c90561658e5a733ae18cad8c1fefa018ebe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1352 zcmV-O1-JS~Nk%w1VOju70QCR>NUAUYr<8@sc5k;>{z@hPnu|J)HkQkV|1}u(xvl^I z|Nn+%tJa$TW=7`q<Ige?YsO5s;IGr|&Hp(d|8iCP;@!8^wX@r&|HiuiSTDlmxqQ22 zD|{%f+@hb>lmAsb*h3`elY;+VJ#@lh|4}YepF;oW<NstgbjWD?Apvj0Vg5lLgTQV7 zSvH!`i~o3G;OyY>`S1UaZU1*se9CVBSx{WQJdwPQ|87_RFC70!HRmu2<vtm@y1D=W z0RR90A^8LW002J#EC2ui09pV`06+%+z@KnPEE<o<q;kpp^`6jZ@91k<uh`~vSRHPQ z-K=<g-G;kgVpzE*yP48Bwb@42-(}%hnC8;|cw=ckVSRdlOLs<!ZgEm`OpI!XY<WL> zP7V+U5i}^DC^Qi)01hS%4Kgh!8LcF$D;1iYo}i+nrl_i{uCNuSsjICSuPw1|76vRA z2OAp)7aJTFLJ2zrFCP;VIyfs22|~%s&Ck)()z{hE-QVFq*4WzI-r#}v`1fXnM2467 z0I@iV0x3~IfM449ljP?hJ~Is$QcA+mp_7463Ra3VF;JgE8Yy-R>G4nzi5ycJREY;b z2O2bDD3Gb(z<>=MI1pGsf&hX4016ZoK#(H`jvX#x%A{!%r%s+efeIyR^cvKkL5CJS zYO$+Ve|)GA8cVjU*|TWVs$EMqY(uwTyvl`Z1m)bWV4aW@%eJrIzjXfvHo5Yyn7np3 z8qR`v?;<*XBdev$Z?NFPiWloel2|0m#f=|-wgXvmTDM(5ipK1jbxF>S<BpC^CbVqV zwBNGnI~YxF!kJqKR}xwRgb^M(bnr01h6W-S8jzT=V8ILm888qrj$Ao&=g_57w~k%= zkm%E^U(fyqf(H*MRLEDML4gAo9t<>?F(U)e0ROEZLIVW22j6`3*@vHg{Q0K<fDZ~t z;C}u67vO*dkm14r7mP6ff&db1H~@zw+%VJv6HJ9b0SXwELI@jn_+f}6l4v3VD5}V! ziy@qt;!rELh{KC`z;J^B9B^R34KNr{K?oo`@Bj!QRA7XWNGi#slTb=YrIkfI8Re8! zYG!65N#u1VLX&v0=3ImH^V^%20M{9vXkOCRX1C$_21XgJ=4YNq+&L&?TvWzqn}^mW znxTR=>ZWdx_9-c9dsfQmrF;N7XGL_{wyAKOCZwpQx|RCqrz63+YNVvi=Bgg2vMQ@w zfT9W<sfLM~YOJ`;`j)Pj4R=>Umk|r<vH|TgmSxP|I_hh~+8V5-9(f9@wZ{ILCbzuK zDG;sCF8V9Dz&=F(u4>q#>n?1vDcfqh+rq0SyVJf)@4j_u`-1}=KwyIn5HR3?5hesc zfe0-$5P%6r04y-U1|zI6!wy4SM8XR<{BR%=*uaSg0tnzi1OfmMfe;uBD8mdQoG^n7 zBCPOE$Rn40a>^_J&~hp;%S^M)EV~@^%r(C=Mh7Z%^2vM}h*H7<0lbpIgFOMY(~2Do z;B<WQMIFJ^Rm*U7)mUv^K-p(!t$^BO*zghx5lE1r0xqz?00$&2&<a*UZ8HG{NL}Db z-FN4`ci(?YRe<1x@6>o!kna$;3od-f)QAThU_b^q5XfQyqa*Oa2O!vhx#mIHG(hK{ zhfcugrJoLE0_dU(RXgfrH~_#h8`L=BIWSbP0tqi{LzPkA$ntwM!gDB1@y91W!SeM~ zU_A257sdPoV3Lu{)C@3iKnds!kpK@Vd{9FTAEaQ<5aS<E{`u)w!@m3Q%da#%`+Hyf K=0}Dg0028U3VFx? diff --git a/typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html b/typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html index 124c2193aef2..641c1f513069 100644 --- a/typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html +++ b/typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html @@ -83,16 +83,53 @@ <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" />:</h3> <div class="legend"> - <div class="pull-left"> - <f:image src="{f:uri.resource(path:'Images/legend.png')}" alt="" /> - </div> - <small> - <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /><br/> - <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /><br/> - <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /><br/> - <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /><br/> - <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" /> - </small> + <table> + <tr> + <td nowrap="nowrap" class="edge"><span><span></span></span></td> + <td nowrap="nowrap" class="hr"><span></span></td> + <td nowrap="nowrap" class="hr"><span></span></td> + <td nowrap="nowrap" class="hr"><span></span></td> + <td nowrap="nowrap" class="hr"><span></span></td> + <td nowrap="nowrap"><span class="number">1</span></td> + <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /></td> + </tr> + <tr> + <td nowrap="nowrap" class="vr"><span></span></td> + <td nowrap="nowrap" class="edge"><span><span></span></span></td> + <td nowrap="nowrap" class="hr"><span></span></td> + <td nowrap="nowrap" class="hr"><span></span></td> + <td nowrap="nowrap" class="hr"><span></span></td> + <td nowrap="nowrap"><span class="number">2</span></td> + <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /></td> + </tr> + <tr> + <td nowrap="nowrap" class="vr"><span></span></td> + <td nowrap="nowrap" class="vr"><span></span></td> + <td nowrap="nowrap" class="edge"><span><span></span></span></td> + <td nowrap="nowrap" class="hr"><span></span></td> + <td nowrap="nowrap" class="hr"><span></span></td> + <td nowrap="nowrap"><span class="number">3</span></td> + <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /></td> + </tr> + <tr> + <td nowrap="nowrap" class="vr"><span></span></td> + <td nowrap="nowrap" class="vr"><span></span></td> + <td nowrap="nowrap" class="vr"><span></span></td> + <td nowrap="nowrap" class="edge"><span><span></span></span></td> + <td nowrap="nowrap" class="hr"><span></span></td> + <td nowrap="nowrap"><span class="number">4</span></td> + <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /></td> + </tr> + <tr> + <td nowrap="nowrap"><bu:spriteManagerIcon iconName="status-status-permission-granted" /></td> + <td nowrap="nowrap"><bu:spriteManagerIcon iconName="status-status-permission-denied" /></td> + <td nowrap="nowrap"><bu:spriteManagerIcon iconName="status-status-permission-granted" /></td> + <td nowrap="nowrap"><bu:spriteManagerIcon iconName="status-status-permission-denied" /></td> + <td nowrap="nowrap"><bu:spriteManagerIcon iconName="status-status-permission-denied" /></td> + <td nowrap="nowrap"><span class="number">5</span></td> + <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" /></td> + </tr> + </table> </div> <p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p> <p> diff --git a/typo3/sysext/beuser/Resources/Public/Css/style.css b/typo3/sysext/beuser/Resources/Public/Css/style.css old mode 100644 new mode 100755 index f7502b1b55c3..3f090d4a04d3 --- a/typo3/sysext/beuser/Resources/Public/Css/style.css +++ b/typo3/sysext/beuser/Resources/Public/Css/style.css @@ -27,3 +27,56 @@ div.collapsibleSection { background-color: #ededed; border-top: 1px solid #cdcdc .legend .pull-left { margin-right: 0.5em; } + +.legend td { + overflow:hidden; +} + +.legend span.t3-icon { + margin-right: 0; +} + +.number { + border: 1px solid #000000; + border-radius: 2px; + width: 16px; + height: 16px; + display: inline-block; + text-align: center; + margin-right: 5px; + margin-left: 10px; + line-height: 14px; + font-weight: bold; +} + +.edge span { + width: 1px; + height: 10px; + background: #000000; + display: block; + margin-top: 8px; + margin-left: 6px; +} +.edge span span { + width: 10px; + height: 1px; + background: #000000; + display: block; + margin-left: 1px; +} +.hr span { + width: 20px; + height: 1px; + background: #000000; + display: block; + margin-top: -1px; + margin-left: -4px; +} +.vr span { + width: 1px; + height: 20px; + background: #000000; + margin-top: -2px; + margin-left: 6px; + display: block; +} diff --git a/typo3/sysext/beuser/Resources/Public/Images/legend.png b/typo3/sysext/beuser/Resources/Public/Images/legend.png deleted file mode 100644 index ecc784c0b125e0ddf0050c086e8ab744ecd7d059..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3528 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 KgmMc~?0*2`=NS3` -- GitLab