From 6ded18b6e26e74f3eea723a90296ec6c7de6f0f3 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 14 Oct 2012 13:26:33 -0500 Subject: [ticket/11103] subsilver2 ucp_prefs_personal.html edits PHPBB3-11103 --- phpBB/styles/subsilver2/template/ucp_prefs_personal.html | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html index bf0e67d68b..7f706eb97c 100644 --- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html +++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html @@ -47,20 +47,6 @@ checked="checked" />{L_YES}   checked="checked" />{L_NO} - - - {L_NOTIFY_METHOD}:
{L_NOTIFY_METHOD_EXPLAIN} - checked="checked" />{L_NOTIFY_METHOD_EMAIL}   checked="checked" />{L_NOTIFY_METHOD_IM}   checked="checked" />{L_NOTIFY_METHOD_BOTH} - - - - {L_NOTIFY_ON_PM}: - checked="checked" />{L_YES}   checked="checked" />{L_NO} - - - {L_POPUP_ON_PM}: - checked="checked" />{L_YES}   checked="checked" />{L_NO} - {L_BOARD_LANGUAGE}: -- cgit v1.2.1 From c1f8c96bd705f7c87826c65947a8292debf0bd4a Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 14 Oct 2012 13:46:15 -0500 Subject: [ticket/11103] subsilver2 overall_header.html PHPBB3-11103 --- .../styles/subsilver2/template/overall_header.html | 26 +++++++++++++++++++--- phpBB/styles/subsilver2/theme/stylesheet.css | 16 +++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 8bedec4c9e..62e251b709 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -5,7 +5,7 @@ {META} -<!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --> +<!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --> @@ -149,12 +149,32 @@ function marklist(id, name, state)
+ + [ {NOTIFICATIONS_COUNT} ] • +
+ + + + + + + +
+ {notifications.AVATAR} + + + {notifications.FORMATTED_TITLE} +
+ {notifications.TIME} +
+
+ * {L_LOGIN_LOGOUT}   * {L_RESTORE_PERMISSIONS}  {L_BOARD_DISABLED} - -  * {PRIVATE_MESSAGE_INFO}, {PRIVATE_MESSAGE_INFO_UNREAD} + +  * {PRIVATE_MESSAGE_INFO}, {PRIVATE_MESSAGE_INFO_UNREAD}  * {L_REGISTER} diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 977e5c20c6..1312d9edd4 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -1141,3 +1141,19 @@ a.imageset { padding-right: 18px; padding-left: 0; } + +#notification_list { + display: none; + position: absolute; + width: 330px; + max-height: 350px; + z-index: 1; + overflow-y: auto; + overflow-x: hidden; + background-color: #FFFFFF; +} + +.notification_list img { + max-width: 50px; + max-height: 50px; +} \ No newline at end of file -- cgit v1.2.1 From 4e3abdb7c556d6151b3bd3a83c203ae86df1a6c5 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 14 Oct 2012 14:28:28 -0500 Subject: [ticket/11103] subsilver2 ucp_notifications.html PHPBB3-11103 --- .../subsilver2/template/ucp_notifications.html | 140 +++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 phpBB/styles/subsilver2/template/ucp_notifications.html (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html new file mode 100644 index 0000000000..ae8d2b2589 --- /dev/null +++ b/phpBB/styles/subsilver2/template/ucp_notifications.html @@ -0,0 +1,140 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{TITLE}
{TITLE_EXPLAIN}
{L_NOTIFICATION_TYPE}{L_NOTIFICATIONS}{notification_methods.NAME}
{notification_types.GROUP_NAME}
+ {notification_types.NAME} +
   {notification_types.EXPLAIN} + 		checked="checked" /> checked="checked" />
+ + {S_HIDDEN_FIELDS} +    + + {S_FORM_TOKEN} +
+ + + + +
+ + + + + +
+ + + + + + +
 {PAGE_NUMBER} [ {TOTAL_COUNT} ] 
+ +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + +
+ + + + +
{L_NOTIFICATIONS_MARK_ALL_READ}
+
{L_NOTIFICATIONS}{L_MARK_READ}
+ {notification_list.AVATAR} + + + {notification_list.FORMATTED_TITLE} +
+ {notification_list.TIME} + 		+ +
+ + {S_HIDDEN_FIELDS} +    + + {S_FORM_TOKEN} +
+
+ +
+ + + + + +
+ + + + +
+ +
+
+
+ +
+ + -- cgit v1.2.1 From 077c526f156ccf752ece0c99d88de968ea933fbb Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 14 Oct 2012 14:30:05 -0500 Subject: [ticket/11103] ss2 - do not include footer bar if no pagination PHPBB3-11103 --- .../subsilver2/template/ucp_notifications.html | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html index ae8d2b2589..054e9a62b9 100644 --- a/phpBB/styles/subsilver2/template/ucp_notifications.html +++ b/phpBB/styles/subsilver2/template/ucp_notifications.html @@ -117,19 +117,21 @@
- - - - -
- + +
- -
- + + + + + +
+ +
-
+
+ -- cgit v1.2.1 From a2d6e40f1b7e359b0be87452a01eb3e46b4694e8 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Mon, 15 Oct 2012 09:27:01 -0500 Subject: [ticket/11103] If no avatar, do not display an empty box in subsilver2 PHPBB3-11103 --- phpBB/styles/subsilver2/template/overall_header.html | 12 ++++++++---- phpBB/styles/subsilver2/template/ucp_notifications.html | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 62e251b709..e41095ad38 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -155,10 +155,14 @@ function marklist(id, name, state) - - + - - + + + + + + + -- cgit v1.2.1 From d8510356d6a0f838017ae94bec1a5ed8254432da Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 18 Nov 2012 20:47:29 +0100 Subject: [feature/avatars] Add subsilver2 support This implementation might not be perfect though. PHPBB3-10018 --- phpBB/styles/subsilver2/template/avatars.js | 15 +++++ .../template/ucp_avatar_options_gravatar.html | 13 ++++ .../template/ucp_avatar_options_local.html | 29 +++++++++ .../template/ucp_avatar_options_remote.html | 10 +++ .../template/ucp_avatar_options_upload.html | 12 ++++ .../subsilver2/template/ucp_profile_avatar.html | 76 +++++++--------------- 6 files changed, 101 insertions(+), 54 deletions(-) create mode 100644 phpBB/styles/subsilver2/template/avatars.js create mode 100644 phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html create mode 100644 phpBB/styles/subsilver2/template/ucp_avatar_options_local.html create mode 100644 phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html create mode 100644 phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/avatars.js b/phpBB/styles/subsilver2/template/avatars.js new file mode 100644 index 0000000000..a9b2cc5722 --- /dev/null +++ b/phpBB/styles/subsilver2/template/avatars.js @@ -0,0 +1,15 @@ +(function($) { // Avoid conflicts with other libraries + +"use strict"; + +function avatar_simplify() { + $('.[class^="av_option_"]').hide(); + + var selected = $('#avatar_driver').val(); + $('.av_option_' + selected).show(); +} + +avatar_simplify(); +$('#avatar_driver').bind('change', avatar_simplify); + +})(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html new file mode 100644 index 0000000000..9bf8a3fc39 --- /dev/null +++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html @@ -0,0 +1,13 @@ +
- {notifications.AVATAR} - + + + {notifications.AVATAR} + + + + {notifications.FORMATTED_TITLE}
diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html index 054e9a62b9..7c3a516521 100644 --- a/phpBB/styles/subsilver2/template/ucp_notifications.html +++ b/phpBB/styles/subsilver2/template/ucp_notifications.html @@ -89,10 +89,14 @@
- {notification_list.AVATAR} - + + + {notification_list.AVATAR} + + + + {notification_list.FORMATTED_TITLE}
-- cgit v1.2.1 From c8b66a26ef4f6ac2a71980c75a13356dcda72dd6 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Tue, 16 Oct 2012 10:51:07 -0500 Subject: [ticket/11103] Mark read link if notification has no URL to view it Other style stuff PHPBB3-11103 --- phpBB/styles/subsilver2/template/overall_header.html | 13 ++++++++----- phpBB/styles/subsilver2/template/ucp_notifications.html | 10 +++++----- 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index e41095ad38..560f6a32b3 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -154,19 +154,22 @@ function marklist(id, name, state)
- + - - diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html index 7c3a516521..a2dc90c9f3 100644 --- a/phpBB/styles/subsilver2/template/ucp_notifications.html +++ b/phpBB/styles/subsilver2/template/ucp_notifications.html @@ -88,22 +88,22 @@ - + - -- cgit v1.2.1 From a080af4b05603dadf12adc171508db9c16dd73a4 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Tue, 16 Oct 2012 17:28:45 -0500 Subject: [ticket/11103] Add title/view all link to subsilver2 PHPBB3-11103 --- .../styles/subsilver2/template/overall_header.html | 54 +++++++++++++--------- phpBB/styles/subsilver2/theme/stylesheet.css | 36 +++++++++++++-- 2 files changed, 64 insertions(+), 26 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 560f6a32b3..069c39aaae 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -152,28 +152,40 @@ function marklist(id, name, state) [ {NOTIFICATIONS_COUNT} ] •
-
+ {notifications.AVATAR} + - + - + {notifications.FORMATTED_TITLE}
{notifications.TIME} + +
{L_MARK_READ} +
{L_MARK_READ}
+ {notification_list.AVATAR} - + - + {notification_list.FORMATTED_TITLE}
{notification_list.TIME} 		- +
- - - - - + + +
- {notifications.AVATAR} - - - - - - {notifications.FORMATTED_TITLE} -
- {notifications.TIME} - -
{L_MARK_READ} +
+ {L_NOTIFICATIONS} +
+ +
+ + + + + + - - -
+ {notifications.AVATAR} + + + -
+
+ + {notifications.FORMATTED_TITLE} + +
{notifications.TIME} + +
{L_MARK_READ} + +
+
+
+ +
+ {L_SEE_ALL} +
* {L_LOGIN_LOGOUT}  diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 1312d9edd4..b41860d130 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -181,7 +181,7 @@ p.datetime { p.searchbar { padding: 2px 0; white-space: nowrap; -} +} p.searchbarreg { margin: 0; @@ -464,7 +464,7 @@ textarea { background-color: #FAFAFA; color: #333333; font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 1.3em; + font-size: 1.3em; line-height: 1.4em; font-weight: normal; border: 1px solid #A9B8C2; @@ -1145,15 +1145,41 @@ a.imageset { #notification_list { display: none; position: absolute; - width: 330px; - max-height: 350px; + width: 310px; z-index: 1; +} + +#notification_list .notification_scroll { + max-height: 350px; overflow-y: auto; overflow-x: hidden; - background-color: #FFFFFF; +} + +#notification_list .notification_title { + width: 240px; +} + +#notification_list .header { + width: 298px; + padding: 5px; + font-weight: bold; + border: 1px solid #A9B8C2; + border-bottom: 0; +} + +#notification_list .footer { + width: 300px; + text-align: center; + font-size: 1.2em; + border: 1px solid #A9B8C2; + border-top: 0; } .notification_list img { max-width: 50px; max-height: 50px; +} + +#notification_list .footer > a { + display: block; } \ No newline at end of file -- cgit v1.2.1 From 3557b391154286d1cb18a6e6f88925758247860d Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Tue, 16 Oct 2012 17:31:48 -0500 Subject: [ticket/11103] Hide notifications flyout on a click outside of the list. PHPBB3-11103 --- phpBB/styles/subsilver2/template/overall_footer.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index 24c6f8105c..210159732e 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -12,5 +12,19 @@ {SCRIPTS} + + -- cgit v1.2.1 From 0d098ae5e5768e6ceb21a65f350f521ebe3c1908 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Tue, 16 Oct 2012 18:14:06 -0500 Subject: [ticket/11103] Return false to prevent appending # to the URL PHPBB3-11103 --- phpBB/styles/subsilver2/template/overall_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 069c39aaae..aec754c444 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -150,7 +150,7 @@ function marklist(id, name, state)
- [ {NOTIFICATIONS_COUNT} ] • + [ {NOTIFICATIONS_COUNT} ] •
{L_NOTIFICATIONS} -- cgit v1.2.1 From 2c06c2bd3646585a5b02e6269be655287352a667 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Thu, 18 Oct 2012 19:20:54 -0500 Subject: [ticket/11103] Declare $ for jQuery, check for instance of, newlines at eof PHPBB3-11103 --- phpBB/styles/subsilver2/template/overall_footer.html | 4 ++++ phpBB/styles/subsilver2/theme/stylesheet.css | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index 210159732e..11989feca6 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -15,6 +15,8 @@ diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index b41860d130..c411edd367 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -1182,4 +1182,4 @@ a.imageset { #notification_list .footer > a { display: block; -} \ No newline at end of file +} -- cgit v1.2.1 From a93067eb4196454c147ea516733182abd1612e84 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Fri, 19 Oct 2012 16:00:37 -0500 Subject: [ticket/11103] Create common.js for subsilver2, move added JS code there PHPBB3-11103 --- phpBB/styles/subsilver2/template/common.js | 18 ++++++++++++++++++ phpBB/styles/subsilver2/template/overall_footer.html | 19 +------------------ phpBB/styles/subsilver2/template/overall_header.html | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 phpBB/styles/subsilver2/template/common.js (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/common.js b/phpBB/styles/subsilver2/template/common.js new file mode 100644 index 0000000000..c9e6221e2e --- /dev/null +++ b/phpBB/styles/subsilver2/template/common.js @@ -0,0 +1,18 @@ +(function($) { // Avoid conflicts with other libraries + +"use strict"; + +// Toggle notification list +$('#notification_list_button').click(function(e) { + $('#notification_list').toggle(); + e.preventDefault(); +}); +$(document).click(function(e) { + var target = e.target; + + if (!$(target).is('#notification_list') && !$(target).is('#notification_list_button') && !$(target).parents().is('#notification_list')) { + $('#notification_list').hide(); + } +}); + +})(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index 11989feca6..8cc5591478 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -10,25 +10,8 @@ + {SCRIPTS} - - diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index aec754c444..a48828bb3a 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -150,7 +150,7 @@ function marklist(id, name, state)
- [ {NOTIFICATIONS_COUNT} ] • + [ {NOTIFICATIONS_COUNT} ] •
{L_NOTIFICATIONS} -- cgit v1.2.1 From 4874226b6e41df64959761ff53a61cfa190cabf1 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sat, 20 Oct 2012 22:11:41 -0500 Subject: [ticket/11103] Re-add notify method to the UCP preferences I've noticed that this is used in other areas still in phpBB, so it should not be removed. PHPBB3-11103 --- phpBB/styles/subsilver2/template/ucp_prefs_personal.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html index 7f706eb97c..37e5390ae3 100644 --- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html +++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html @@ -47,6 +47,12 @@
checked="checked" />{L_YES}   checked="checked" />{L_NO}
{L_NOTIFY_METHOD}:
{L_NOTIFY_METHOD_EXPLAIN}		 checked="checked" />{L_NOTIFY_METHOD_EMAIL}   checked="checked" />{L_NOTIFY_METHOD_IM}   checked="checked" />{L_NOTIFY_METHOD_BOTH}
{L_BOARD_LANGUAGE}:
+ + + + + + + + +
{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}
{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}
{L_GRAVATAR_AVATAR_SIZE}{L_COLON}
{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}		 + {L_PIXEL} ×  + {L_PIXEL} +
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html new file mode 100644 index 0000000000..37ac864b27 --- /dev/null +++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html @@ -0,0 +1,29 @@ + + + + + + + +
{L_AVATAR_CATEGORY}{L_COLON}   +
+ + + + + + + + + + + + + +
{av_local_col.av_local_col.AVATAR_NAME}
+
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html new file mode 100644 index 0000000000..8fe7201953 --- /dev/null +++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html @@ -0,0 +1,10 @@ + + + + + + + + + +
{L_LINK_REMOTE_AVATAR}{L_COLON}
{L_LINK_REMOTE_AVATAR_EXPLAIN}
{L_LINK_REMOTE_SIZE}{L_COLON}
{L_LINK_REMOTE_SIZE_EXPLAIN}		 {L_PIXEL} × {L_PIXEL}
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html new file mode 100644 index 0000000000..e76abc0433 --- /dev/null +++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html @@ -0,0 +1,12 @@ + + + + + + + + + + + +
{L_UPLOAD_AVATAR_FILE}{L_COLON}
{L_UPLOAD_AVATAR_URL}{L_COLON}
{L_UPLOAD_AVATAR_URL_EXPLAIN}
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html index 160f8a2399..f8129e60e6 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html @@ -21,61 +21,27 @@ {L_AVATAR_FEATURES_DISABLED} - - - {L_UPLOAD_AVATAR_FILE}{L_COLON} - - - - - - {L_UPLOAD_AVATAR_URL}{L_COLON}
{L_UPLOAD_AVATAR_URL_EXPLAIN} - - - - - - {L_LINK_REMOTE_AVATAR}{L_COLON}
{L_LINK_REMOTE_AVATAR_EXPLAIN} - - - - {L_LINK_REMOTE_SIZE}{L_COLON}
{L_LINK_REMOTE_SIZE_EXPLAIN} - {L_PIXEL} × {L_PIXEL} - - - - - {L_AVATAR_GALLERY}{L_COLON} - {L_DISPLAY_GALLERY} - - - - - - {L_AVATAR_GALLERY} - - - {L_AVATAR_CATEGORY}{L_COLON}   - - - - - - - - - - - - - - - - -
{avatar_row.avatar_column.AVATAR_NAME}
- + + {L_AVATAR_SELECT} - + + {L_AVATAR_TYPE}{L_COLON} + + + + + + {avatar_drivers.L_EXPLAIN} + + + {avatar_drivers.OUTPUT} + + @@ -84,4 +50,6 @@ + + -- cgit v1.2.1 From 7521c077a9c0b3201dffcbe33114d9da715eb9e0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 18 Nov 2012 23:16:37 +0100 Subject: [feature/avatars] Miscellaenous template fixes PHPBB3-10018 --- phpBB/styles/subsilver2/template/ucp_avatar_options_local.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html index 37ac864b27..352052f9f4 100644 --- a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html +++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html @@ -22,6 +22,10 @@ + + + {L_NO_AVATAR_CATEGORY} + -- cgit v1.2.1 From 5289dc52a322f760b6a2108f5fed1b4ff365e1d4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 22 Nov 2012 00:00:45 +0100 Subject: [feature/avatars] Add support for modularized avatars to ucp groups This seems to be the last component where the new avatars system was still missing. PHPBB3-10018 --- .../subsilver2/template/ucp_groups_manage.html | 91 +++++++--------------- .../subsilver2/template/ucp_profile_avatar.html | 4 +- 2 files changed, 31 insertions(+), 64 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html index 12319c9e4e..e15335f4e1 100644 --- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html +++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html @@ -60,74 +60,43 @@
{L_AVATAR_EXPLAIN} - {AVATAR_IMAGE}

 {L_DELETE_AVATAR} + {AVATAR_IMAGE}

 {L_DELETE_AVATAR} - - - - - - - - - -
{L_UPLOAD_AVATAR_URL_EXPLAIN} - - - - - -
{L_LINK_REMOTE_AVATAR_EXPLAIN} - - - -
{L_LINK_REMOTE_SIZE_EXPLAIN} - px X px - - - - - - - - - - - - {L_AVATAR_GALLERY} - - - -   - - - - - - - - - - - - - - - - -
{avatar_row.avatar_column.AVATAR_NAME}
- - - - - + + + {L_AVATAR_FEATURES_DISABLED} + + + + {L_AVATAR_SELECT} + + + {L_AVATAR_TYPE}{L_COLON} + + + + + + {avatar_drivers.L_EXPLAIN} + + + {avatar_drivers.OUTPUT} + + -   + {S_HIDDEN_FIELDS}  + +

{L_GROUP_MEMBERS}

diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html index f8129e60e6..4e65b37e3c 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html @@ -12,7 +12,7 @@ {L_CURRENT_IMAGE}{L_COLON}
{L_AVATAR_EXPLAIN}
- {AVATAR}

 {L_DELETE_AVATAR} + {AVATAR}

 {L_DELETE_AVATAR} @@ -43,11 +43,9 @@ - {S_HIDDEN_FIELDS}   - -- cgit v1.2.1 From ce44e3908eef5166e5e3e43d2642c5372379b6a6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 25 Nov 2012 00:54:34 +0100 Subject: [feature/avatars] Remove unnecessary abbreviations PHPBB3-10018 --- phpBB/styles/subsilver2/template/avatars.js | 4 ++-- .../template/ucp_avatar_options_gravatar.html | 6 ++--- .../template/ucp_avatar_options_local.html | 26 +++++++++++----------- .../template/ucp_avatar_options_remote.html | 4 ++-- .../template/ucp_avatar_options_upload.html | 4 ++-- .../subsilver2/template/ucp_groups_manage.html | 6 ++--- .../subsilver2/template/ucp_profile_avatar.html | 6 ++--- 7 files changed, 28 insertions(+), 28 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/avatars.js b/phpBB/styles/subsilver2/template/avatars.js index a9b2cc5722..df6aad178a 100644 --- a/phpBB/styles/subsilver2/template/avatars.js +++ b/phpBB/styles/subsilver2/template/avatars.js @@ -3,10 +3,10 @@ "use strict"; function avatar_simplify() { - $('.[class^="av_option_"]').hide(); + $('.[class^="avatar_option_"]').hide(); var selected = $('#avatar_driver').val(); - $('.av_option_' + selected).show(); + $('.avatar_option_' + selected).show(); } avatar_simplify(); diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html index 9bf8a3fc39..b8840e0aab 100644 --- a/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html +++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html @@ -1,13 +1,13 @@ - +
{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}
{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}
{L_GRAVATAR_AVATAR_SIZE}{L_COLON}
{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}		 - {L_PIXEL} ×  - {L_PIXEL} + {L_PIXEL} ×  + {L_PIXEL}
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html index 352052f9f4..f4273192ad 100644 --- a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html +++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html @@ -1,32 +1,32 @@ - diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html index 8fe7201953..50ebb9b93d 100644 --- a/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html +++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html @@ -1,10 +1,10 @@
{L_AVATAR_CATEGORY}{L_COLON} {L_AVATAR_CATEGORY}{L_COLON}   + + + +  
- + - - - + + + - - - + + + - +
{av_local_col.av_local_col.AVATAR_NAME}{avatar_local_col.avatar_local_col.AVATAR_NAME}
{L_NO_AVATAR_CATEGORY}
- + - +
{L_LINK_REMOTE_AVATAR}{L_COLON}
{L_LINK_REMOTE_AVATAR_EXPLAIN}
{L_LINK_REMOTE_SIZE}{L_COLON}
{L_LINK_REMOTE_SIZE_EXPLAIN}		 {L_PIXEL} × {L_PIXEL} {L_PIXEL} × {L_PIXEL}
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html index e76abc0433..6b813baeaa 100644 --- a/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html +++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html @@ -1,12 +1,12 @@ - + - +
{L_UPLOAD_AVATAR_FILE}{L_COLON}
{L_UPLOAD_AVATAR_URL}{L_COLON}
{L_UPLOAD_AVATAR_URL_EXPLAIN}
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html index e15335f4e1..8064e1e6e9 100644 --- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html +++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html @@ -60,7 +60,7 @@
{L_AVATAR_EXPLAIN} - {AVATAR_IMAGE}

 {L_DELETE_AVATAR} + {AVATAR_IMAGE}

 {L_DELETE_AVATAR} @@ -81,10 +81,10 @@ - + {avatar_drivers.L_EXPLAIN} - + {avatar_drivers.OUTPUT} diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html index 4e65b37e3c..4c7458e940 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html @@ -12,7 +12,7 @@ {L_CURRENT_IMAGE}{L_COLON}
{L_AVATAR_EXPLAIN}
- {AVATAR}

 {L_DELETE_AVATAR} + {AVATAR}

 {L_DELETE_AVATAR} @@ -35,10 +35,10 @@ - + {avatar_drivers.L_EXPLAIN} - + {avatar_drivers.OUTPUT} -- cgit v1.2.1 From b42ca792fd7765eb415536c49b77c53c0897367e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 4 Dec 2012 00:49:37 +0100 Subject: [feature/avatars] Minor variable naming fixes PHPBB3-10018 --- phpBB/styles/subsilver2/template/avatars.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/avatars.js b/phpBB/styles/subsilver2/template/avatars.js index df6aad178a..733056a32d 100644 --- a/phpBB/styles/subsilver2/template/avatars.js +++ b/phpBB/styles/subsilver2/template/avatars.js @@ -2,14 +2,14 @@ "use strict"; -function avatar_simplify() { +function avatar_hide() { $('.[class^="avatar_option_"]').hide(); var selected = $('#avatar_driver').val(); $('.avatar_option_' + selected).show(); } -avatar_simplify(); -$('#avatar_driver').bind('change', avatar_simplify); +avatar_hide(); +$('#avatar_driver').bind('change', avatar_hide); })(jQuery); // Avoid conflicts with other libraries -- cgit v1.2.1 From 4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 4 Jan 2013 10:25:08 +0100 Subject: [feature/avatars] Inform user of no available local avatars Rather than showing the user an empty drop-down list for the local avatar categories, inform him/her that there are currently no (local) avatars available. PHPBB3-10018 --- phpBB/styles/subsilver2/template/ucp_avatar_options_local.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html index f4273192ad..87e5608fec 100644 --- a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html +++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html @@ -1,4 +1,5 @@ +
{L_AVATAR_CATEGORY}{L_COLON}
+ + + {L_NO_AVATARS} + + -- cgit v1.2.1 From a342e47038dc62cc824efe688e574a1a7dbb0ac8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 4 Jan 2013 18:13:49 +0100 Subject: [feature/avatars] Change avatar javascript to conform to new coding guidelines PHPBB3-10018 --- phpBB/styles/subsilver2/template/avatars.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/avatars.js b/phpBB/styles/subsilver2/template/avatars.js index 733056a32d..146aca94d3 100644 --- a/phpBB/styles/subsilver2/template/avatars.js +++ b/phpBB/styles/subsilver2/template/avatars.js @@ -2,14 +2,14 @@ "use strict"; -function avatar_hide() { +function avatarHide() { $('.[class^="avatar_option_"]').hide(); var selected = $('#avatar_driver').val(); $('.avatar_option_' + selected).show(); } -avatar_hide(); -$('#avatar_driver').bind('change', avatar_hide); +avatarHide(); +$('#avatar_driver').bind('change', avatarHide); })(jQuery); // Avoid conflicts with other libraries -- cgit v1.2.1 From 918053e4781425f368261db3b55efbb6abad160d Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 27 Dec 2012 22:35:55 -0800 Subject: [ticket/11103] Fix notifications link to handle non-JS fallback PHPBB3-11103 --- phpBB/styles/subsilver2/template/overall_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index e516a78e45..c8ddf2bcd3 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -150,7 +150,7 @@ function marklist(id, name, state) - [ {NOTIFICATIONS_COUNT} ] • + [ {NOTIFICATIONS_COUNT} ] •
{L_NOTIFICATIONS} -- cgit v1.2.1 From 44fcec520f785d18d3cd3b19e26db977f23b844c Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 27 Dec 2012 22:37:39 -0800 Subject: [ticket/11103] CSS fixes to address text inside notifications drop down. PHPBB3-11103 --- phpBB/styles/subsilver2/theme/stylesheet.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index c411edd367..0f8f9f0367 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -1156,7 +1156,7 @@ a.imageset { } #notification_list .notification_title { - width: 240px; + padding: 5px; } #notification_list .header { -- cgit v1.2.1 From 1994fadb6fcdfd780fb14b9b458d0810541c8a69 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Tue, 12 Feb 2013 11:25:54 +0530 Subject: [ticket/11303] use S_TZ_PRESELECT in subsilver PHPBB3-11303 --- phpBB/styles/subsilver2/template/timezone_option.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html index 7fa310b1bc..71c5cf8a30 100644 --- a/phpBB/styles/subsilver2/template/timezone_option.html +++ b/phpBB/styles/subsilver2/template/timezone_option.html @@ -7,7 +7,7 @@ {S_TZ_DATE_OPTIONS}
- +
{S_HIDDEN_FIELDS} -    - + {S_FORM_TOKEN} @@ -141,6 +140,10 @@ + +
{L_MARK_ALL} :: {L_UNMARK_ALL}
+ + -- cgit v1.2.1 From 216dc824867df3d680fbad994796454999e3b100 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 14 Feb 2013 10:55:30 -0800 Subject: [ticket/11103] Remove title attribute from notification link PHPBB3-11103 --- phpBB/styles/subsilver2/template/overall_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index c7ae77ff9f..4e8ba99358 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -153,7 +153,7 @@ function marklist(id, name, state) - [ {NOTIFICATIONS_COUNT} ] • + [ {NOTIFICATIONS_COUNT} ] •
{L_NOTIFICATIONS} -- cgit v1.2.1 From 93619c0a4b523878b57055f3574bd59fc789b390 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 14 Feb 2013 11:00:11 -0800 Subject: [ticket/11103] Update styling of subsilver2 notification modal PHPBB3-11103 --- phpBB/styles/subsilver2/template/overall_header.html | 2 +- phpBB/styles/subsilver2/theme/stylesheet.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 4e8ba99358..c3039257aa 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -175,7 +175,7 @@ function marklist(id, name, state) {notifications.FORMATTED_TITLE} -
{notifications.TIME} +
» {notifications.TIME}
{L_MARK_READ} diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 0f8f9f0367..36389c53ac 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -1147,6 +1147,7 @@ a.imageset { position: absolute; width: 310px; z-index: 1; + box-shadow: 3px 3px 5px darkgray; } #notification_list .notification_scroll { -- cgit v1.2.1 From fdc9ad76ce592e4675c103f4aa34f72010b5d9ae Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 14 Feb 2013 11:01:15 -0800 Subject: [ticket/11103] Update styling of UCP Notifications in subsilver2 PHPBB3-11103 --- phpBB/styles/subsilver2/template/ucp_notifications.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html index c1ca795234..5b98a9d815 100644 --- a/phpBB/styles/subsilver2/template/ucp_notifications.html +++ b/phpBB/styles/subsilver2/template/ucp_notifications.html @@ -97,10 +97,12 @@ + - {notification_list.FORMATTED_TITLE} + {notification_list.FORMATTED_TITLE}
{notification_list.TIME} + -- cgit v1.2.1 From cdc766c90f800af01e7d21b3d7bf3d017479cf73 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Fri, 15 Feb 2013 15:41:34 -0600 Subject: [ticket/11103] Restore new/unread messages info/link in header PHPBB3-11103 --- phpBB/styles/subsilver2/template/overall_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index c7ae77ff9f..071b588fe5 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -196,7 +196,7 @@ function marklist(id, name, state)  {L_BOARD_DISABLED} -  * {PRIVATE_MESSAGE_INFO}, {PRIVATE_MESSAGE_INFO_UNREAD} +  * {PRIVATE_MESSAGE_INFO}, {PRIVATE_MESSAGE_INFO_UNREAD}  * {L_REGISTER} -- cgit v1.2.1 From 7ad577a86afa379d67812ed184b7a59a32c64e9e Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Fri, 15 Feb 2013 16:02:33 -0600 Subject: [ticket/11103] Add Notification Settings link in flyout menu PHPBB3-11103 --- phpBB/styles/subsilver2/template/overall_header.html | 1 + phpBB/styles/subsilver2/theme/stylesheet.css | 6 ++++++ 2 files changed, 7 insertions(+) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 071b588fe5..0a2c5aed96 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -157,6 +157,7 @@ function marklist(id, name, state)
{L_NOTIFICATIONS} + {L_SETTINGS}
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 0f8f9f0367..a78a84ab63 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -1167,6 +1167,12 @@ a.imageset { border-bottom: 0; } +#notification_list > .header > .header_settings { + float: right; + font-weight: normal; + text-transform: none; +} + #notification_list .footer { width: 300px; text-align: center; -- cgit v1.2.1 From b05da5ec0e95ddb5bc645e661987ba0a7bb49573 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 15 Feb 2013 14:38:36 -0800 Subject: [ticket/11103] HTML encode double arrow character PHPBB3-11103 --- phpBB/styles/subsilver2/template/overall_header.html | 2 +- phpBB/styles/subsilver2/template/ucp_notifications.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index c3039257aa..8c167c959f 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -175,7 +175,7 @@ function marklist(id, name, state) {notifications.FORMATTED_TITLE} -
» {notifications.TIME} +
» {notifications.TIME}
{L_MARK_READ} diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html index 5b98a9d815..1a1fda4c17 100644 --- a/phpBB/styles/subsilver2/template/ucp_notifications.html +++ b/phpBB/styles/subsilver2/template/ucp_notifications.html @@ -101,7 +101,7 @@ {notification_list.FORMATTED_TITLE}
- {notification_list.TIME} + » {notification_list.TIME} -- cgit v1.2.1 From d2295b3d1f191710916b12980e13c97419ecf0ae Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Fri, 15 Feb 2013 19:27:09 -0600 Subject: [ticket/11103] Restore new/unread messages info/link in header (properly) PHPBB3-11103 --- phpBB/styles/subsilver2/template/overall_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 0a2c5aed96..6ea9ba1442 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -196,7 +196,7 @@ function marklist(id, name, state)  * {L_RESTORE_PERMISSIONS}  {L_BOARD_DISABLED} - +  * {PRIVATE_MESSAGE_INFO}, {PRIVATE_MESSAGE_INFO_UNREAD}  * {L_REGISTER} -- cgit v1.2.1 From f60540d31f89bfd1ee8aabb2ce85fe3cd7dfe829 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Sun, 17 Feb 2013 12:53:14 +0530 Subject: [ticket/11303] rename attribute to timezone-preselect PHPBB3-11303 --- phpBB/styles/subsilver2/template/timezone.js | 2 +- phpBB/styles/subsilver2/template/timezone_option.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/styles/subsilver2') diff --git a/phpBB/styles/subsilver2/template/timezone.js b/phpBB/styles/subsilver2/template/timezone.js index af8206d12d..5e81a0bfdf 100644 --- a/phpBB/styles/subsilver2/template/timezone.js +++ b/phpBB/styles/subsilver2/template/timezone.js @@ -13,7 +13,7 @@ $(document).ready( ); $(document).ready( - phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('data-is-registration') == 'true') + phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') == 'true') ); })(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html index 71c5cf8a30..26ba2388c9 100644 --- a/phpBB/styles/subsilver2/template/timezone_option.html +++ b/phpBB/styles/subsilver2/template/timezone_option.html @@ -7,7 +7,7 @@ {S_TZ_DATE_OPTIONS}
- +