From eae37267a5dd88233af8c8d93b1f9c8d80dc4757 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Thu, 20 Mar 2014 02:33:19 -0700 Subject: [PATCH 01/11] [ticket/12265] Simplify contact icon design and move to dropdown. PHPBB3-12265 --- phpBB/language/en/common.php | 1 + phpBB/language/en/memberlist.php | 1 - .../template/ucp_pm_viewmessage.html | 63 +++++++++++++----- .../prosilver/template/viewtopic_body.html | 62 ++++++++++++----- phpBB/styles/prosilver/theme/buttons.css | 55 +++++++++++---- phpBB/styles/prosilver/theme/colours.css | 23 +++---- phpBB/styles/prosilver/theme/content.css | 4 ++ .../styles/prosilver/theme/en/stylesheet.css | 6 -- .../theme/images/icon_contact_aim.gif | Bin 546 -> 0 bytes .../theme/images/icon_contact_email.gif | Bin 523 -> 0 bytes .../theme/images/icon_contact_icq.gif | Bin 562 -> 0 bytes .../theme/images/icon_contact_jabber.gif | Bin 1014 -> 0 bytes .../theme/images/icon_contact_msnm.gif | Bin 1466 -> 0 bytes .../theme/images/icon_contact_www.gif | Bin 590 -> 0 bytes .../theme/images/icon_contact_yahoo.gif | Bin 541 -> 0 bytes .../prosilver/theme/images/icons_contact.png | Bin 0 -> 8507 bytes 16 files changed, 149 insertions(+), 66 deletions(-) delete mode 100644 phpBB/styles/prosilver/theme/images/icon_contact_aim.gif delete mode 100644 phpBB/styles/prosilver/theme/images/icon_contact_email.gif delete mode 100644 phpBB/styles/prosilver/theme/images/icon_contact_icq.gif delete mode 100644 phpBB/styles/prosilver/theme/images/icon_contact_jabber.gif delete mode 100644 phpBB/styles/prosilver/theme/images/icon_contact_msnm.gif delete mode 100644 phpBB/styles/prosilver/theme/images/icon_contact_www.gif delete mode 100644 phpBB/styles/prosilver/theme/images/icon_contact_yahoo.gif create mode 100644 phpBB/styles/prosilver/theme/images/icons_contact.png diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 677b228cc6..0bbc731e13 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -167,6 +167,7 @@ $lang = array_merge($lang, array( 'CONGRATULATIONS' => 'Congratulations to', 'CONNECTION_FAILED' => 'Connection failed.', 'CONNECTION_SUCCESS' => 'Connection was successful!', + 'CONTACT_USER' => 'Contact', 'COOKIES_DELETED' => 'All board cookies successfully deleted.', 'CURRENT_TIME' => 'It is currently %s', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 95efe35b7d..f92286a092 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -47,7 +47,6 @@ $lang = array_merge($lang, array( 'BEFORE' => 'Before', 'CC_EMAIL' => 'Send a copy of this email to yourself.', - 'CONTACT_USER' => 'Contact', 'DEST_LANG' => 'Language', 'DEST_LANG_EXPLAIN' => 'Select an appropriate language (if available) for the recipient of this message.', diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index f14e4708e7..efc45e1af8 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -35,24 +35,55 @@ -
- -
+ {% set DIV_CNT = CELL_BREAK[CONTACT_CNT] %}{% set DIV_CNT = 4 %} + +
+ {L_CONTACT_USER}{L_COLON} +
+ Trigger + +
+
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 4e3561c4a2..b528fc18a5 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -143,26 +143,54 @@ - - + + {% set CELL_BREAK = {1: 1, 2: 1, 3: 2, 4: 2, 5: 3, 6: 3, 7: 4, 8: 4, 9: 5, 10: 5, 11: 4, 12: 4, 13: 5, 14: 5, 16: 4} %} + {% set CONTACT_CNT = 0 %} + {% set CNT = 0 %} + {% set CONTACT_CNT = CONTACT_CNT + 1 %} + {% set CONTACT_CNT = CONTACT_CNT + 1 %} + {% set CONTACT_CNT = CONTACT_CNT + 1 %} + + {% set CONTACT_CNT = CONTACT_CNT + 1 %} + + {% set DIV_CNT = CELL_BREAK[CONTACT_CNT] %}{% set DIV_CNT = 4 %} +
- + {L_CONTACT_USER}{L_COLON} +
+ Trigger + +
- diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 93c325e416..7f271ee648 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -235,20 +235,49 @@ ul.profile-icons.responsive a.responsive-menu-link:before { max-width: 40%; } +.contact-icons.dropdown-contents { + min-width: 0; + padding: 0; +} + +.contact-icon { + background-repeat: no-repeat; + display: block; + height: 16px; + width: 16px; +} +.contact-icons a { + border-bottom: 1px dotted; + border-right: 1px dotted; + display: block; + float: left; + padding: 8px; +} + +.contact-icons div:last-child a { + border-bottom: none; +} + +.contact-icons .last-cell { + border-right: none; +} + + /* Profile & navigation icons */ -.email-icon, .email-icon a { background: none top left no-repeat; } -.aim-icon, .aim-icon a { background: none top left no-repeat; } -.phpbb_aol-icon, .phpbb_aol-icon a { background: none top left no-repeat; } -.yahoo-icon, .yahoo-icon a { background: none top left no-repeat; } -.phpbb_yahoo-icon, .phpbb_yahoo-icon a { background: none top left no-repeat; } -.web-icon, .web-icon a { background: none top left no-repeat; } -.phpbb_website-icon, .phpbb_website-icon a { background: none top left no-repeat; } -.msnm-icon, .msnm-icon a { background: none top left no-repeat; } -.phpbb_wlm-icon, .phpbb_wlm-icon a { background: none top left no-repeat; } -.icq-icon, .icq-icon a { background: none top left no-repeat; } -.phpbb_icq-icon, .phpbb_icq-icon a { background: none top left no-repeat; } -.jabber-icon, .jabber-icon a { background: none top left no-repeat; } -.pm-icon, .pm-icon a { background: none top left no-repeat; } +.pm-icon { background-position: 0 0; } +.email-icon { background-position: -21px 0; } +.jabber-icon { background-position: -82px 0; } +.phpbb_icq-icon { background-position: -61px 0 ; } +.phpbb_wlm-icon { background-position: -182px 0; } +.phpbb_aol-icon { background-position: -245px 0; } +.phpbb_website-icon { background-position: -40px 0; } +.phpbb_youtube-icon { background-position: -98px 0; } +.phpbb_facebook-icon { background-position: -119px 0; } +.phpbb_google_plus-icon { background-position: -140px 0; } +.phpbb_skype-icon { background-position: -161px 0; } +.phpbb_twitter-icon { background-position: -203px 0; } +.phpbb_yahoo-icon { background-position: -224px 0; } + .quote-icon, .quote-icon a { background: none top left no-repeat; } /* Moderator icons */ diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 5f6ca4929c..bf47546b22 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -718,6 +718,14 @@ a.sendemail { background-image: url("images/buttons.png"); } +.contact-icons a { + border-color: #DCDCDC; +} + +.contact-icons a:hover { + background-color: #F2F6F9; +} + /* Icon images ---------------------------------------- */ .icon-faq { background-image: url("./images/icon_faq.gif"); } @@ -738,19 +746,8 @@ a.sendemail { .icon-mark { background-image: url("./images/icon_mark.gif"); } /* Profile & navigation icons */ -.email-icon, .email-icon a { background-image: url("./images/icon_contact_email.gif"); } -.phpbb_aol-icon, .phpbb_aol-icon a { background-image: url("./images/icon_contact_aim.gif"); } -.aim-icon, .aim-icon a { background-image: url("./images/icon_contact_aim.gif"); } -.yahoo-icon, .yahoo-icon a { background-image: url("./images/icon_contact_yahoo.gif"); } -.phpbb_yahoo-icon, .phpbb_yahoo-icon a { background-image: url("./images/icon_contact_yahoo.gif"); } -.web-icon, .web-icon a { background-image: url("./images/icon_contact_www.gif"); } -.phpbb_website-icon, .phpbb_website-icon a { background-image: url("./images/icon_contact_www.gif"); } -.msnm-icon, .msnm-icon a { background-image: url("./images/icon_contact_msnm.gif"); } -.phpbb_wlm-icon, .phpbb_wlm-icon a { background-image: url("./images/icon_contact_msnm.gif"); } -.icq-icon, .icq-icon a { background-image: url("./images/icon_contact_icq.gif"); } -.phpbb_icq-icon, .phpbb_icq-icon a { background-image: url("./images/icon_contact_icq.gif"); } -.jabber-icon, .jabber-icon a { background-image: url("./images/icon_contact_jabber.gif"); } -.pm-icon, .pm-icon a { background-image: url("./en/icon_contact_pm.gif"); } +.contact-icon { background-image: url("./images/icons_contact.png"); } + .quote-icon, .quote-icon a { background-image: url("./en/icon_post_quote.gif"); } ul.profile-icons.responsive a.responsive-menu-link { background-image: url("./images/icon_post_menu.png"); } diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index d27fb81fee..6d39e675ce 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -731,6 +731,10 @@ fieldset.polls dd div { height: auto !important; } +dd.profile-contact { + overflow: visible; +} + .online { background-image: none; background-position: 100% 0; diff --git a/phpBB/styles/prosilver/theme/en/stylesheet.css b/phpBB/styles/prosilver/theme/en/stylesheet.css index 82b7df0830..d8ca2558e5 100644 --- a/phpBB/styles/prosilver/theme/en/stylesheet.css +++ b/phpBB/styles/prosilver/theme/en/stylesheet.css @@ -7,16 +7,10 @@ ul.profile-icons li.edit-icon { width: 42px; height: 20px; } .online { background-image: url("./icon_user_online.gif"); } /* Icon images */ -.pm-icon, .pm-icon a { background-image: url("./icon_contact_pm.gif"); } .quote-icon, .quote-icon a { background-image: url("./icon_post_quote.gif"); } .edit-icon, .edit-icon a { background-image: url("./icon_post_edit.gif"); } /* EN Language Pack */ -.imageset.icon_contact_pm { - background-image: url("./icon_contact_pm.gif"); - padding-left: 28px; - padding-top: 20px; -} .imageset.icon_post_edit { background-image: url("./icon_post_edit.gif"); padding-left: 42px; diff --git a/phpBB/styles/prosilver/theme/images/icon_contact_aim.gif b/phpBB/styles/prosilver/theme/images/icon_contact_aim.gif deleted file mode 100644 index be039fcde28e1e6b73245800200bbdbb38a44e61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 546 zcmV+-0^R*bNk%w1VH5x;0K@&dJrZBht~$$j8Iv z?dT>Mgf2$7LAPp2T)}J9taDLjE)coTTulE2#$>-4;Bv|JY1b- zjisce2vDC%2T=hJxDT%#0S0iP4LotVx*ZJ-9R>jb2*(`{0mjG9($o;s4G-AV+uhzB zA}8V{A0Hm)=;`X{=I0t7@A2^S^6nb<_z)Ih4fy!>{va&a03bkx4*uSGP{6REg#;TM zH~=uAA;WVP8CFQ(fB}OH6)j@SXaNBRj~gPNWIP9hNaWZB?agN+wFcFgdnXoGXuDrkuKF#`q+03u8~N6dl%suutN(12h{o&a}^eF;E2+L*tZeFEC5`A1Aq$?5pZw}6oA|?=Y()D kAU3Xq$yp~;5ONO3i+!B`0ua#>Wt9O%FoWp)zr|@(9F5Gw70gh2@YEZ6}QQNy| zjd(`S&(F5Dw*UYCA^8LW0018VEC2ui02BZy000I5;Ma|0X_Deat!(R3*Z9uvSlxK8 zsAqqdynuYEx=>1_XN-5Lsyh0zr6p26`h9W^`);mrDi%dk_%-b!=ac1`rUFiF1s2 ztO5s{ryZsN2DP@gwE(6g5xu^@z`i36#Kp$P#Ul^P%+1cs$_Uca)YS+N9U>>&B_AIi z;Njxq;olw;=;`X~6X6o?@bU8S;1UTDartHYaSjO*;O-sZkbxk<3o!2pGn6*5Sa`O=~W z3_uMiKmZPb0-Y>1xV-2xC5LAe=qA6D-iXZiQX|r{Wc^zZ_tIJECAg;ldIXFi@<3!jZv8B1@he8QhM`I*QVu NLDU?%&*ee@06Y2#?CJmj diff --git a/phpBB/styles/prosilver/theme/images/icon_contact_icq.gif b/phpBB/styles/prosilver/theme/images/icon_contact_icq.gif deleted file mode 100644 index 48a09373ebb2fdf4404a8de6db6b8616ea895d0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 562 zcmV-20?qwLNk%w1VH5x;0K@o z`-GjnyTs1{OalP_007zm0I2~62nOHZ+u7OH>+9+90m1+fPhw6h%-7#AJI2nHSk1DkZT2=O+%Q2vg9scV zK!6Zo!oqzXE=q{t;DJO34jNq0r%;|k421-*KyVPD0mugYCS1TM5JSrd92>ZNsB^%C ze=!3*c!^VDgrO`o0OgQ@BS@AOEF676k;6}U+&0{dV4*^VqBsp*z}i8=fCvBpMDXgg zV+0Cg31XOlRxMbUFEb33OCdl}2M}E1eBhD7UPBou^c_kOZ~y@TD8P^>NkRs^6bTbh z3}b@4ED|Uj4e7zJWYC|pNcQU?vEn66`Nk%w1VH5x;0OkMy?D6*6N zrFfvJcd@*5mzsBri+8-bbg8FulahD4wREK(cIkG*Voj>#>4;nHUIDz+s``w>O{!7O8ed-+s9wQzOUHV(#y)lcbx z;osZZ*weg}vXWf2mSMf8gwMaE|FcEjqe|AbhRU>)&!}|cAh3*m6%V!v0|U4V9xIEZ91_9|2zvpzyE@CUi_Oml0Mob) zG1rV76vC(m1i2AN;)@{}<_rnB3LWe{qdp!N5EH`%4I+5BmoEf|3J4b*aKORC2Py3s z9kIY7M2sCESRj$|3LiE`Ot@b;0D$89Hy| zbg8k�V0t!>oXj)yWDlXW+O|{v?HS5;DAyZc_dF@#J!Z$SCo=wTl*FvWi)uga{k$ z%7x4TKg0|kDokX>#0pDHaYh|!%#qs-G~l2{4o3hHL|8$r;6oBbaM6YuUZi2e7jbOy z5)dndwL%pw6j((bONekn6ezR+gJ@Nh=*J2`fT9EyO01B>9wMM11{F;(0R#|N9Z3aK z6?#pf!;dPc-~t#*_|O89e)yneC`n8K#11NmAjJ`2@X&*nS1qBYno58{r5G{90D}@r ktVtK0bSB~E9Zb03LKsQlxq}~8U4<1`h=yh8AAtY>J2fv0)c^nh diff --git a/phpBB/styles/prosilver/theme/images/icon_contact_msnm.gif b/phpBB/styles/prosilver/theme/images/icon_contact_msnm.gif deleted file mode 100644 index e25469c3a547aaaeebfc0a3823ec365171295357..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1466 zcmV;r1x5NtNk%w1VH5x;0QUd@00030|NrFU-{a!l&(F`x%Eq>~wqAs=Vv4p{e57WK zw{4TXbDG9%khpuJ&Ul{4f~nMLg{6I-#FM$>hpNzSh^2Fkr@`L-p0?1KuExvb{?zFI zX_CBekh6D}xS`1JsLuAKzuAeNw3e;Jm#e^(q_tUssEoGUldZ&@wal~4<)*mFtGUMH z^8Z_ry=aW9e4@dZyV|wc_=~2!p0UBd)#s_U!MVZ6D{-hwiMeB|;8&K#YNO3!jI5Ne z!^PwK%G>DB;OswyvrUr2U!l=pn80L~x=wVDgum#2xZjz_=%?2Bs=dm%$kVgE#Bs9R zY>}wO-tA?p)o!uaY_8Ic$m^4~%Z;$Zx#Rn=(&ewr+{@C|(AC&umaxX^{kq%irNPh3 zz+I^dnQJa0*-`v#M)?=Y|oU)?V z-q@+htK8q*+1%Nk&zp?Zht%WKY`$S|plVQ$MvcjYc*tpXv}$CRTZYDZkk)^a#e}Tn zox1a@ztOsIwp@nOaH#2(qT-Op(ZtZ@$%w~lx$2&((30NZ+~()yu+Mkh_NeFR<>2An z)##Ps;@#HXvFrG&;^ooA&w1tMkK*Fp@9*sE>*(p}=Huhw;o;xc*VW0%$Lr{v@#u)= z<=eZoeCOGQ)ys?S?dQF;iR0O;+uGIF*3s3}&(P1x%*)2)gVd|=HK4i+}qgK*3;J2((v!??Ca^^-`&5yy~M=Cy}iA< zy1KWwxBvhDA^8LW00930EC2ui02BZy000R80RIsfNU)$mf&z;TSje!U!vVzxKAh-K zBE>B#Vz8)4prIc-br5m+(Ez%^5w5GCWw&;l{#SvLxP$)Tfc5FKJ+0Xt6B`n;JpFd_ZtQLSe%MA_dBG=S>?t zJt#y0qQV1(2bdNP{FO-0nKpdxm~gN}Mu-$4Fl@PWOC^{*SLi^Y4FW=f1{Ai)>Wy=u zfMLT1EdcSsfr%p)ZmDkW&$e%PF9UqK6k=R6)cGx4bybeA{dj4JxFll8PsQAc4daJ6I4- zklW0s&6Kuu;)y4y%+f;+E|{>zIND%S&wSEE6Amw#d=g3~l~}<;5k@p|OEl-O!;b;b zn4^v_yVL^9D2!mS#~w250L?k?*x8Rc=q!WFF~}g(%OPIufyD_)P=d}n;ux?`I_kut z$tkeV(#taCY@);vNu0q>IM8^Py3RYVfO3i{uRtP)F3T|Uh#5R26Hcf8G@}kJoUFo1 zDv;=~1Rs_tcJ2F&A4JeG_yN-C2`F~=NJ2+@Tg&sd9XIN=Bo&pp5ZqsR_% z#6d+4IB)e# U@y8$wV2lCs-Dh%r{{#d8JNsN~L;wH) diff --git a/phpBB/styles/prosilver/theme/images/icon_contact_www.gif b/phpBB/styles/prosilver/theme/images/icon_contact_www.gif deleted file mode 100644 index 83cee9728d7cd0cad1ad53b0148266c353d614a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 590 zcmV-U0{ zs(6#OOk8o0sL6zmoZsvFey7=2Y=>ujmy5XUt} z;^E%U&(F5Dw*UYCA^8LW0018VEC2ui02BZy000I5;Ma|0X_8{bVc6QTZk&zWS|0|r zNK{g&Hd>8SpgfL`L13`3427H=GPzVLJT>8=VLVV25y@cekZ3p~RUy%M5F`?XVkt>T z9J5X)(?}>16cP~;0t{hr3}|`=4G4k}3KTj50}+M{c^L)?2@47cfRYUgf(#5ABN`SB zeVz#h1r4#Kn5i9|opK2itYD_6sTvLo#GVR$zNTiu7I1QKWtP7e8W+LQg0#OC)Fspo zmeRir+|?u27wH=kzXJ>s7U|aK^70!M`0@4g`~CeRB2J(~XX3*L4+s+~T$u3SLJJ!9 zNbF#N;RX*IHl%9+fq(!ApgLT*coE|U3mrJiN}4bsfJ*`eMwZN&lFLdZE&~u~(4l0! z4hkSpfG~j)fSd#n9JqkcLWTqg5EKOfK!5<30HP{5&@{sW0$?EspsHkmRRjV!Ak<($ zfz>erCUhJFU;tGNYukeLhyVgnv{vil^}zNMSOEke6kA|*?BFv|_X(tiZ!NvRtGU;)K)SaiYtgY)SPufswNo%@OdAx|A z$7qhg!_L;O#LwX1+vVlq+}zmN+11t6(aOrl?Ck2$&&tov$>QPM($USky0*EvwB+O8 z85D+M%XN+*5XWYrY(TV#v>NgShm#9NM4_aR z6YNf8zh}S|2?`W*2n%_9d{t=*4tsQRBNCF69d|I2bPp1dladp65t0}R3ly6j5*Voy z9)ODt9it5q7$X?B6@E-f2@Den3#qoZ7#0!~$SV{N9SXA*BNfuq)Ya1?7TMa{+}haP z;M*M{C*>s{A0F!K?CtC69vboU^7ZuW8u|MB{QBw{00Rmf7*O4W2yWbTAXv~t1Ooyh z3V=u;7O_nhGN{8qfWU!>1_)#bFrcJK0ul_GR*>{DBnOfpAsXOdaKZ!(5LyO!FhIb8 z0xciZv?(C~!~+8i{KU}n08J0uDnuY4@qiNuJqbYANDPAtnGIk(IAFko19hGD0Qh)d z0t5*c1{}z6K^-3m0ANlW5CB<8FzVbmSZkng;R8Db44|;pL&66E)D@Uq00V^q1szPH diff --git a/phpBB/styles/prosilver/theme/images/icons_contact.png b/phpBB/styles/prosilver/theme/images/icons_contact.png new file mode 100644 index 0000000000000000000000000000000000000000..f84abd36a5f8a25c190bba0e45b8550f52b077da GIT binary patch literal 8507 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 literal 0 HcmV?d00001 From df8832455d48a8dd741c5d62f62071562b6615b4 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Tue, 8 Apr 2014 04:48:57 -0700 Subject: [PATCH 02/11] [ticket/12265] Remove ugly logic. PHPBB3-12265 --- .../template/ucp_pm_viewmessage.html | 24 ++----------------- .../prosilver/template/viewtopic_body.html | 23 ++---------------- phpBB/styles/prosilver/theme/buttons.css | 12 ++++++---- 3 files changed, 12 insertions(+), 47 deletions(-) diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index efc45e1af8..6cc70c4225 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -35,18 +35,6 @@ - {% set CELL_BREAK = {1: 1, 2: 1, 3: 2, 4: 2, 5: 3, 6: 3, 7: 4, 8: 4, 9: 5, 10: 5, 11: 4, 12: 4, 13: 5, 14: 5, 16: 4} %} - {% set CONTACT_CNT = 0 %} - {% set CNT = 0 %} - {% set CONTACT_CNT = CONTACT_CNT + 1 %} - {% set CONTACT_CNT = CONTACT_CNT + 1 %} - {% set CONTACT_CNT = CONTACT_CNT + 1 %} - - - {% set CONTACT_CNT = CONTACT_CNT + 1 %} - - {% set DIV_CNT = CELL_BREAK[CONTACT_CNT] %}{% set DIV_CNT = 4 %} -
{L_CONTACT_USER}{L_COLON}
@@ -54,32 +42,24 @@
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index b528fc18a5..d9e800d1e6 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -144,17 +144,6 @@ - {% set CELL_BREAK = {1: 1, 2: 1, 3: 2, 4: 2, 5: 3, 6: 3, 7: 4, 8: 4, 9: 5, 10: 5, 11: 4, 12: 4, 13: 5, 14: 5, 16: 4} %} - {% set CONTACT_CNT = 0 %} - {% set CNT = 0 %} - {% set CONTACT_CNT = CONTACT_CNT + 1 %} - {% set CONTACT_CNT = CONTACT_CNT + 1 %} - {% set CONTACT_CNT = CONTACT_CNT + 1 %} - - {% set CONTACT_CNT = CONTACT_CNT + 1 %} - - {% set DIV_CNT = CELL_BREAK[CONTACT_CNT] %}{% set DIV_CNT = 4 %} -
{L_CONTACT_USER}{L_COLON}
@@ -162,30 +151,22 @@
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 7f271ee648..b17903c958 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -254,12 +254,16 @@ ul.profile-icons.responsive a.responsive-menu-link:before { padding: 8px; } -.contact-icons div:last-child a { - border-bottom: none; +.contact-icons a:nth-child(4) { + border-right: none; } -.contact-icons .last-cell { - border-right: none; +.contact-icons a:nth-child(5) { + clear: left; +} + +.contact-icons div:last-child a { + border-bottom: none; } From ec145419eddce662e0afe050f14f0f690ecf40e2 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Thu, 10 Apr 2014 05:18:57 -0700 Subject: [PATCH 03/11] [ticket/12265] Fix issue with dropdown being restricted by the width of parent PHPBB3-12265 --- phpBB/assets/javascript/core.js | 12 ++++++++++-- phpBB/styles/prosilver/theme/common.css | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index ac866f7c78..759d4f3229 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -917,9 +917,10 @@ phpbb.toggleDropdown = function() { // Check dimensions when showing dropdown // !visible because variable shows state of dropdown before it was toggled if (!visible) { + var windowWidth = $(window).width(); + options.dropdown.find('.dropdown-contents').each(function() { - var $this = $(this), - windowWidth = $(window).width(); + var $this = $(this); $this.css({ marginLeft: 0, @@ -937,6 +938,13 @@ phpbb.toggleDropdown = function() { $this.css('margin-left', (windowWidth - offset - width - 2) + 'px'); } }); + var freeSpace = parent.offset().left - 4; + + if (direction == 'left') { + options.dropdown.css('margin-left', '-' + freeSpace + 'px'); + } else { + options.dropdown.css('margin-right', '-' + (windowWidth + freeSpace) + 'px'); + } } // Prevent event propagation diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 298d310ab1..8f32decd19 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -470,6 +470,7 @@ ul.linklist.bulletin li.no-bulletin:before { border: 1px solid transparent; border-radius: 5px; padding: 9px 0 0; + margin-right: -500px; } .dropdown-container.topic-tools { @@ -485,6 +486,8 @@ ul.linklist.bulletin li.no-bulletin:before { .dropdown-left .dropdown, .nojs .rightside .dropdown { left: auto; right: 0; + margin-left: -500px; + margin-right: 0; } .dropdown-button-control .dropdown { From 11dd010f84044d8533a5eff387c2b57f62b4298f Mon Sep 17 00:00:00 2001 From: Cesar G Date: Thu, 10 Apr 2014 05:58:20 -0700 Subject: [PATCH 04/11] [ticket/12265] Add contact icon and remove border from last row & cells. PHPBB3-12265 --- .../template/ucp_pm_viewmessage.html | 47 +++++++++++------- .../prosilver/template/viewtopic_body.html | 43 +++++++++------- phpBB/styles/prosilver/theme/buttons.css | 6 +-- phpBB/styles/prosilver/theme/content.css | 9 ++++ .../prosilver/theme/images/icon_contact.png | Bin 0 -> 340 bytes phpBB/styles/prosilver/theme/imageset.css | 11 ++-- 6 files changed, 70 insertions(+), 46 deletions(-) create mode 100644 phpBB/styles/prosilver/theme/images/icon_contact.png diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 6cc70c4225..2b170bc45b 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -35,31 +35,40 @@ +
{L_CONTACT_USER}{L_COLON} -
- Trigger +
+
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index d9e800d1e6..cf66c5b34c 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -144,29 +144,38 @@ +
{L_CONTACT_USER}{L_COLON} -
- Trigger +
+
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index b17903c958..4a243392ee 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -254,14 +254,10 @@ ul.profile-icons.responsive a.responsive-menu-link:before { padding: 8px; } -.contact-icons a:nth-child(4) { +.contact-icons .last-cell { border-right: none; } -.contact-icons a:nth-child(5) { - clear: left; -} - .contact-icons div:last-child a { border-bottom: none; } diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 6d39e675ce..998b139262 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -735,6 +735,15 @@ dd.profile-contact { overflow: visible; } +.profile-contact .dropdown-container { + display: inline-block; + width: 30px; +} + +.profile-contact .icon_contact { + vertical-align: middle; +} + .online { background-image: none; background-position: 100% 0; diff --git a/phpBB/styles/prosilver/theme/images/icon_contact.png b/phpBB/styles/prosilver/theme/images/icon_contact.png new file mode 100644 index 0000000000000000000000000000000000000000..04e4d9ad17661fd41a5fb216b62128269f545015 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~e!3HF=pW8M9Db50q$YKTtZeb8+WSBKa0w~Cm z?&#~tz_78e=6B#^AYUQbBgmJ5p-Pp3p`n?9;pcxK{gQ#9)PRBERRRNp)eHs(@%%~g zN8NyGPkFjHhE&{2nzJ`=yDc;G;Sz;wDGIzX?2mjJ7?K!;wAXySqVhzg#q-kN7e}Md zE}ovZmVrY-O<{J*Sp|lx%8UXIK0G2!4GfEJFklc&k{`ajeEnS|yX93Smw>~9k_kmG z{`96gLc#{UO5v)gX_#~JPU`9X3SONtYh1B2ne|NrGz^A=xw zZ^#_9`%G!b563@~!{61g1kKZI)H^=$DkF=4AM*s>#-h6ov-}sXX5=tni27}MGN#ju Q6X+`jPgg&ebxsLQ0QSyyp8x;= literal 0 HcmV?d00001 diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css index e6d306c7fd..6bc345889e 100644 --- a/phpBB/styles/prosilver/theme/imageset.css +++ b/phpBB/styles/prosilver/theme/imageset.css @@ -356,13 +356,14 @@ span.imageset { padding-top: 20px; } +.imageset.icon_contact { + background-image: url("./images/icon_contact.png"); + padding-left: 16px; + padding-top: 12px; +} + /* English images for fallback */ -.imageset.icon_contact_pm { - background-image: url("./en/icon_contact_pm.gif"); - padding-left: 28px; - padding-top: 20px; -} .imageset.icon_post_edit { background-image: url("./en/icon_post_edit.gif"); padding-left: 42px; From b9f9c33199773b1ef51a0e20a044a320e1c029ea Mon Sep 17 00:00:00 2001 From: Cesar G Date: Fri, 11 Apr 2014 10:19:25 -0700 Subject: [PATCH 05/11] [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera. PHPBB3-12265 --- phpBB/styles/prosilver/theme/buttons.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 4a243392ee..b5c44d00de 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -262,6 +262,10 @@ ul.profile-icons.responsive a.responsive-menu-link:before { border-bottom: none; } +.contact-icons div { + clear: left; +} + /* Profile & navigation icons */ .pm-icon { background-position: 0 0; } From 89532ebbbe03245c186084780e49bdaf0b4a79ea Mon Sep 17 00:00:00 2001 From: Cesar G Date: Fri, 11 Apr 2014 10:40:49 -0700 Subject: [PATCH 06/11] [ticket/12265] Adjust alignment of AIM and Jabber icons. PHPBB3-12265 --- phpBB/styles/prosilver/theme/buttons.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index b5c44d00de..e523daf55b 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -270,10 +270,10 @@ ul.profile-icons.responsive a.responsive-menu-link:before { /* Profile & navigation icons */ .pm-icon { background-position: 0 0; } .email-icon { background-position: -21px 0; } -.jabber-icon { background-position: -82px 0; } +.jabber-icon { background-position: -80px 0; } .phpbb_icq-icon { background-position: -61px 0 ; } .phpbb_wlm-icon { background-position: -182px 0; } -.phpbb_aol-icon { background-position: -245px 0; } +.phpbb_aol-icon { background-position: -244px 0; } .phpbb_website-icon { background-position: -40px 0; } .phpbb_youtube-icon { background-position: -98px 0; } .phpbb_facebook-icon { background-position: -119px 0; } From ed45981a50ccc3a5b2108b8abfb2dcf66a44dea8 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Sat, 12 Apr 2014 03:44:05 -0700 Subject: [PATCH 07/11] [ticket/12265] Fix modulo logic. PHPBB3-12265 --- phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 2 +- phpBB/styles/prosilver/template/viewtopic_body.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 2b170bc45b..cf4364c9ff 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -60,7 +60,7 @@ -
+
class="last-cell" href="{custom_fields.PROFILE_FIELD_CONTACT}{U_POST_AUTHOR}" title="{custom_fields.PROFILE_FIELD_NAME}"> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index cf66c5b34c..cfccafbe26 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -168,7 +168,7 @@ -
+
class="last-cell" href="{postrow.custom_fields.PROFILE_FIELD_CONTACT}{postrow.U_POST_AUTHOR}" title="{postrow.custom_fields.PROFILE_FIELD_NAME}"> From 161b610a947f9de814aad228a2e62719c2096746 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Sat, 12 Apr 2014 03:55:44 -0700 Subject: [PATCH 08/11] [ticket/12265] Break the icons that aren't in loop in case extensions add more PHPBB3-12265 --- phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 6 ++++++ phpBB/styles/prosilver/template/viewtopic_body.html | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index cf4364c9ff..35a9e41c92 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -47,15 +47,21 @@ + + + diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index cfccafbe26..efdf5e9993 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -155,15 +155,21 @@
+ + + From 975c5655f0e9b65b7de3f2b832f1ef660a473832 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Tue, 15 Apr 2014 08:55:39 -0700 Subject: [PATCH 09/11] [ticket/12265] Define a loop for contact icons. PHPBB3-12265 --- phpBB/includes/ucp/ucp_pm_viewmessage.php | 51 ++++++++++++++++++- .../template/ucp_pm_viewmessage.html | 45 +++++----------- .../prosilver/template/viewtopic_body.html | 42 +++++---------- phpBB/viewtopic.php | 45 +++++++++++++++- 4 files changed, 117 insertions(+), 66 deletions(-) diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 03064a31d3..1cdb87ebf0 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -177,6 +177,18 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) } } + $u_pm = $u_jabber = ''; + + if ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) + { + $u_pm = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $author_id); + } + + if ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) + { + $u_jabber = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $author_id); + } + $msg_data = array( 'MESSAGE_AUTHOR_FULL' => get_username_string('full', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), 'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), @@ -208,8 +220,8 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'EDITED_MESSAGE' => $l_edited_by, 'MESSAGE_ID' => $message_row['msg_id'], - 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $author_id) : '', - 'U_JABBER' => ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $author_id) : '', + 'U_PM' => $u_pm, + 'U_JABBER' => $u_jabber, 'U_DELETE' => ($auth->acl_get('u_pm_delete')) ? "$url&mode=compose&action=delete&f=$folder_id&p=" . $message_row['msg_id'] : '', 'U_EMAIL' => $user_info['email'], @@ -255,6 +267,32 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) $template->assign_vars($msg_data); + $contact_fields = array( + array( + 'ID' => 'pm', + 'NAME' => $user->lang['PRIVATE_MESSAGE'], + 'U_CONTACT' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $author_id) + ), + array( + 'ID' => 'email', + 'NAME' => $user->lang['SEND_EMAIL'], + 'U_CONTACT' => $user_info['email'], + ), + array( + 'ID' => 'jabber', + 'NAME' => $user->lang['JABBER'], + 'U_CONTACT' => $u_jabber, + ), + ); + + foreach ($contact_fields as $field) + { + if ($field['U_CONTACT']) + { + $template->assign_block_vars('contact', $field); + } + } + // Display the custom profile fields if (!empty($cp_row['row'])) { @@ -263,6 +301,15 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) foreach ($cp_row['blockrow'] as $cp_block_row) { $template->assign_block_vars('custom_fields', $cp_block_row); + + if ($cp_block_row['S_PROFILE_CONTACT']) + { + $template->assign_block_vars('contact', array( + 'ID' => $cp_block_row['PROFILE_FIELD_IDENT'], + 'NAME' => $cp_block_row['PROFILE_FIELD_NAME'], + 'U_CONTACT' => $cp_block_row['PROFILE_FIELD_CONTACT'], + )); + } } } diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 35a9e41c92..627b5aa6ed 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -34,8 +34,7 @@ - - +
{L_CONTACT_USER}{L_COLON}
@@ -43,39 +42,19 @@
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index efdf5e9993..5069a406a3 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -143,8 +143,7 @@ - - +
{L_CONTACT_USER}{L_COLON}
@@ -152,36 +151,19 @@
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 1a74ad3e38..5d7314635e 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1586,6 +1586,14 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) !$row['post_edit_locked'] ))); + $u_pm = ''; + + if (($poster_id != ANONYMOUS && $config['allow_privmsg'] && $auth->acl_get('u_sendpm') + && ($user_cache[$poster_id]['allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')))) + { + $u_pm = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&action=quotepost&p=' . $row['post_id']); + } + // $post_row = array( 'POST_AUTHOR_FULL' => ($poster_id != ANONYMOUS) ? $user_cache[$poster_id]['author_full'] : get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), @@ -1625,7 +1633,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'U_DELETE' => ($delete_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&f=$forum_id&p={$row['post_id']}") : '', 'U_SEARCH' => $user_cache[$poster_id]['search'], - 'U_PM' => ($poster_id != ANONYMOUS && $config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_cache[$poster_id]['allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&action=quotepost&p=' . $row['post_id']) : '', + 'U_PM' => $u_pm, 'U_EMAIL' => $user_cache[$poster_id]['email'], 'U_JABBER' => $user_cache[$poster_id]['jabber'], @@ -1695,11 +1703,46 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) // Dump vars into template $template->assign_block_vars('postrow', $post_row); + $contact_fields = array( + array( + 'ID' => 'pm', + 'NAME' => $user->lang['PRIVATE_MESSAGES'], + 'U_CONTACT' => $u_pm, + ), + array( + 'ID' => 'email', + 'NAME' => $user->lang['SEND_EMAIL'], + 'U_CONTACT' => $user_cache[$poster_id]['email'], + ), + array( + 'ID' => 'jabber', + 'NAME' => $user->lang['JABBER'], + 'U_CONTACT' => $user_cache[$poster_id]['jabber'], + ), + ); + + foreach ($contact_fields as $field) + { + if ($field['U_CONTACT']) + { + $template->assign_block_vars('postrow.contact', $field); + } + } + if (!empty($cp_row['blockrow'])) { foreach ($cp_row['blockrow'] as $field_data) { $template->assign_block_vars('postrow.custom_fields', $field_data); + + if ($field_data['S_PROFILE_CONTACT']) + { + $template->assign_block_vars('postrow.contact', array( + 'ID' => $field_data['PROFILE_FIELD_IDENT'], + 'NAME' => $field_data['PROFILE_FIELD_NAME'], + 'U_CONTACT' => $field_data['PROFILE_FIELD_CONTACT'], + )); + } } } From 05dec34917a057a4f28894869e5d3872d0ea1f3b Mon Sep 17 00:00:00 2001 From: Cesar G Date: Tue, 15 Apr 2014 09:00:14 -0700 Subject: [PATCH 10/11] [ticket/12265] Ensure that dropdown is always at the very left of the container PHPBB3-12265 --- phpBB/styles/prosilver/theme/content.css | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 998b139262..dc6ab9aef3 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -737,6 +737,7 @@ dd.profile-contact { .profile-contact .dropdown-container { display: inline-block; + text-align: left; width: 30px; } From ed4b72d1f2e1cc96ebec845f9af97db406065c6b Mon Sep 17 00:00:00 2001 From: Cesar G Date: Tue, 15 Apr 2014 09:15:52 -0700 Subject: [PATCH 11/11] [ticket/12265] Actually use $u_pm. PHPBB3-12265 --- phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 1cdb87ebf0..44d067b5fc 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -271,7 +271,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) array( 'ID' => 'pm', 'NAME' => $user->lang['PRIVATE_MESSAGE'], - 'U_CONTACT' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $author_id) + 'U_CONTACT' => $u_pm, ), array( 'ID' => 'email',