From 2e5106aae1bfe83ad8b2336a6d519da5aabc59d2 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 4 Mar 2014 11:22:55 +0100 Subject: [ticket/12237] Convert yahoo messanger to custom profile field PHPBB3-12237 --- phpBB/styles/subsilver2/template/memberlist_search.html | 3 +-- phpBB/styles/subsilver2/template/memberlist_view.html | 4 ---- phpBB/styles/subsilver2/template/ucp_profile_profile_info.html | 4 ---- phpBB/styles/subsilver2/theme/en/stylesheet.css | 2 +- phpBB/styles/subsilver2/theme/stylesheet.css | 2 +- 5 files changed, 3 insertions(+), 12 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html index 251230b643..bf0bb42b0c 100644 --- a/phpBB/styles/subsilver2/template/memberlist_search.html +++ b/phpBB/styles/subsilver2/template/memberlist_search.html @@ -91,8 +91,7 @@ {L_JOINED}{L_COLON} - {L_YIM}{L_COLON} - +   diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html index 9c84fedd89..1c71de3111 100644 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ b/phpBB/styles/subsilver2/template/memberlist_view.html @@ -118,10 +118,6 @@ {PM_IMG} - - {L_YIM}{L_COLON} - {YIM_IMG}{USER_YIM} - {L_AIM}{L_COLON} {AIM_IMG}{USER_AIM} diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html index 877c9fe1ab..555dcbbe17 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html @@ -16,10 +16,6 @@ {L_UCP_AIM}{L_COLON} - - {L_UCP_YIM}{L_COLON} - - {L_UCP_JABBER}{L_COLON} diff --git a/phpBB/styles/subsilver2/theme/en/stylesheet.css b/phpBB/styles/subsilver2/theme/en/stylesheet.css index 449fe7bec5..e9f24b45d1 100644 --- a/phpBB/styles/subsilver2/theme/en/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/en/stylesheet.css @@ -29,7 +29,7 @@ padding-left: 72px; padding-top: 20px; } -.imageset.icon_contact_yahoo { +.imageset.phpbb_yahoo-icon, .imageset.icon_contact_yahoo { background-image: url("./icon_contact_yahoo.gif"); padding-left: 72px; padding-top: 20px; diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 936625a0cf..6bda3997de 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -1043,7 +1043,7 @@ a.imageset { padding-left: 72px; padding-top: 20px; } -.imageset.icon_contact_yahoo { +.imageset.phpbb_yahoo-icon, .imageset.icon_contact_yahoo { background-image: url("./en/icon_contact_yahoo.gif"); padding-left: 72px; padding-top: 20px; -- cgit v1.2.1 From f2059f52f3f8f430888366b70aa07c534abb35a1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 5 Mar 2014 22:13:22 +0100 Subject: [ticket/12236] Move AOL Instant Messanger field to custom profile field PHPBB3-12236 --- .../styles/subsilver2/template/memberlist_im.html | 24 +++++----------------- .../subsilver2/template/memberlist_search.html | 7 ++----- .../subsilver2/template/memberlist_view.html | 4 ---- .../template/ucp_profile_profile_info.html | 4 ---- phpBB/styles/subsilver2/theme/en/stylesheet.css | 2 +- phpBB/styles/subsilver2/theme/stylesheet.css | 2 +- 6 files changed, 9 insertions(+), 34 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html index 0fcd139ae1..a19229605a 100644 --- a/phpBB/styles/subsilver2/template/memberlist_im.html +++ b/phpBB/styles/subsilver2/template/memberlist_im.html @@ -12,18 +12,9 @@ {L_IM_RECIPIENT}{L_COLON} - {USERNAME} [ {IM_CONTACT} ] {PRESENCE_IMG} + {USERNAME} [ {IM_CONTACT} ] {PRESENCE_IMG} - - -
{L_IM_ADD_CONTACT}
{L_IM_SEND_MESSAGE}

{L_IM_DOWNLOAD_APP} | {L_IM_AIM_EXPRESS} - - -   - - - {L_IM_MESSAGE}{L_COLON} @@ -32,21 +23,16 @@ - - - - - {L_IM_NO_JABBER} - - - - {L_IM_SENT_JABBER} + + + {L_IM_NO_JABBER} + diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html index bf0bb42b0c..6551820471 100644 --- a/phpBB/styles/subsilver2/template/memberlist_search.html +++ b/phpBB/styles/subsilver2/template/memberlist_search.html @@ -78,16 +78,13 @@   - + {L_EMAIL}{L_COLON} -   - - {L_AIM}{L_COLON} - + {L_JOINED}{L_COLON} diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html index 1c71de3111..28f4da4fef 100644 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ b/phpBB/styles/subsilver2/template/memberlist_view.html @@ -118,10 +118,6 @@ {PM_IMG} - - {L_AIM}{L_COLON} - {AIM_IMG}{USER_AIM} - {L_JABBER}{L_COLON} {JABBER_IMG}{USER_JABBER_IMG} diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html index 555dcbbe17..bf0aa8f899 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html @@ -12,10 +12,6 @@ {L_PROFILE_INFO_NOTICE} - - {L_UCP_AIM}{L_COLON} - - {L_UCP_JABBER}{L_COLON} diff --git a/phpBB/styles/subsilver2/theme/en/stylesheet.css b/phpBB/styles/subsilver2/theme/en/stylesheet.css index e9f24b45d1..57f9fce26d 100644 --- a/phpBB/styles/subsilver2/theme/en/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/en/stylesheet.css @@ -1,5 +1,5 @@ /* EN Language Pack */ -.imageset.icon_contact_aim { +.imageset.phpbb_aol-icon, .imageset.icon_contact_aim { background-image: url("./icon_contact_aim.gif"); padding-left: 72px; padding-top: 20px; diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 6bda3997de..11fc91af0c 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -1013,7 +1013,7 @@ a.imageset { /* English images for fallback */ -.imageset.icon_contact_aim { +.imageset.phpbb_aol-icon, .imageset.icon_contact_aim { background-image: url("./en/icon_contact_aim.gif"); padding-left: 72px; padding-top: 20px; -- cgit v1.2.1 From fed3e7c2deac8fca2ce30c5b2608726e5e7c8189 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 5 Mar 2014 22:28:22 +0100 Subject: [ticket/12236] Fix layout of memberlist search PHPBB3-12236 --- .../subsilver2/template/memberlist_search.html | 43 +++++++++------------- 1 file changed, 17 insertions(+), 26 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html index 6551820471..aa6b61fe22 100644 --- a/phpBB/styles/subsilver2/template/memberlist_search.html +++ b/phpBB/styles/subsilver2/template/memberlist_search.html @@ -76,51 +76,42 @@ {L_USERNAME}{L_COLON} -   - - - - {L_EMAIL}{L_COLON} - -   + + {L_EMAIL}{L_COLON} + + +   + - {L_JOINED}{L_COLON} -   + {L_POSTS}{L_COLON} + {L_LAST_ACTIVE}{L_COLON} -   + + {L_POST_IP}{L_COLON} + + +   + - {L_POSTS}{L_COLON} - + {L_GROUP}{L_COLON} + {L_JABBER}{L_COLON} {L_SORT_BY}{L_COLON}   - - {L_POST_IP}{L_COLON} - - - - {L_GROUP}{L_COLON} - -   -   - - - {L_GROUP}{L_COLON} - +   -    -- cgit v1.2.1