diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 34f2c4b6ec..cc32e7ba26 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -515,6 +515,34 @@ overall_header_page_body_before
* Since: 3.1.0-b3
* Purpose: Add content after the page-header, but before the page-body
+overall_header_profile_list_after
+===
+* Locations:
+ + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add links to the bottom of the profile drop-down menu in the page-header
+
+overall_header_profile_list_before
+===
+* Locations:
+ + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add links to the top of the profile drop-down menu in the page-header
+
+overall_header_quick_links_after
+===
+* Locations:
+ + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add links to the bottom of the quick-links drop-down menu in the header
+
+overall_header_quick_links_before
+===
+* Locations:
+ + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add links to the top of the quick-links drop-down menu in the header
+
posting_editor_buttons_after
===
* Locations:
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 32acb0c9ff..108f6d5d26 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4881,6 +4881,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'PRIVATE_MESSAGE_COUNT' => (!empty($user->data['user_unread_privmsg'])) ? $user->data['user_unread_privmsg'] : 0,
'CURRENT_USER_AVATAR' => phpbb_get_user_avatar($user->data),
+ 'CURRENT_USERNAME_CLEAN' => get_username_string('no_profile', $user->data['user_id'], $user->data['username'], $user->data['user_colour']),
'CURRENT_USERNAME_FULL' => get_username_string('full', $user->data['user_id'], $user->data['username'], $user->data['user_colour']),
'UNREAD_NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '',
'NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b9eb0fd11d..4d958b33f0 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -64,7 +64,7 @@ $lang = array_merge($lang, array(
'ACCOUNT_DEACTIVATED' => 'Your account has been manually deactivated and is only able to be reactivated by an administrator.',
'ACCOUNT_NOT_ACTIVATED' => 'Your account has not been activated yet.',
'ACP' => 'Administration Control Panel',
- 'ACP_SHORT' => 'Administer',
+ 'ACP_SHORT' => 'ACP',
'ACTIVE' => 'active',
'ACTIVE_ERROR' => 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.',
'ADMINISTRATOR' => 'Administrator',
@@ -393,7 +393,7 @@ $lang = array_merge($lang, array(
'MB' => 'MB',
'MIB' => 'MiB',
'MCP' => 'Moderator Control Panel',
- 'MCP_SHORT' => 'Moderate',
+ 'MCP_SHORT' => 'MCP',
'MEMBERLIST' => 'Members',
'MEMBERLIST_EXPLAIN' => 'View complete list of members',
'MERGE' => 'Merge',
@@ -594,6 +594,8 @@ $lang = array_merge($lang, array(
'PRIVATE_MESSAGING' => 'Private messaging',
'PROFILE' => 'User Control Panel',
+ 'QUICK_LINKS' => 'Quick links',
+
'RANK' => 'Rank',
'READING_FORUM' => 'Viewing topics in %s',
'READING_GLOBAL_ANNOUNCE' => 'Reading global announcement',
@@ -660,15 +662,15 @@ $lang = array_merge($lang, array(
'SEARCH_ADV_EXPLAIN' => 'View the advanced search options',
'SEARCH_KEYWORDS' => 'Search for keywords',
'SEARCHING_FORUMS' => 'Searching forums',
- 'SEARCH_ACTIVE_TOPICS' => 'View active topics',
+ 'SEARCH_ACTIVE_TOPICS' => 'Active topics',
'SEARCH_FOR' => 'Search for',
'SEARCH_FORUM' => 'Search this forum…',
- 'SEARCH_NEW' => 'View new posts',
+ 'SEARCH_NEW' => 'New posts',
'SEARCH_POSTS_BY' => 'Search posts by',
- 'SEARCH_SELF' => 'View your posts',
+ 'SEARCH_SELF' => 'Your posts',
'SEARCH_TOPIC' => 'Search this topic…',
- 'SEARCH_UNANSWERED' => 'View unanswered posts',
- 'SEARCH_UNREAD' => 'View unread posts',
+ 'SEARCH_UNANSWERED' => 'Unanswered posts',
+ 'SEARCH_UNREAD' => 'Unread posts',
'SEARCH_USER_POSTS' => 'Search user’s posts',
'SECONDS' => 'Seconds',
'SEE_ALL' => 'See All',
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index ea2b815e77..b19149477b 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -673,19 +673,23 @@ function parse_document(container)
var $this = $(this),
$body = $('body'),
filterSkip = '.breadcrumbs, [data-skip-responsive]',
- filterLast = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .edit-icon, .quote-icon',
+ filterLast = '.pagination, .icon-acp, .icon-mcp, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .edit-icon, .quote-icon',
+ persist = $this.attr('id') == 'nav-main',
allLinks = $this.children(),
links = allLinks.not(filterSkip),
html = '
',
filterLastList = links.filter(filterLast);
- if (links.is('.rightside'))
- {
- links.filter('.rightside:first').before(html);
- }
- else
- {
- $this.append(html);
+ if (!persist) {
+ if (links.is('.rightside'))
+ {
+ links.filter('.rightside:first').before(html);
+ $this.children('.responsive-menu').addClass('rightside');
+ }
+ else
+ {
+ $this.append(html);
+ }
}
var item = $this.children('.responsive-menu'),
@@ -706,7 +710,7 @@ function parse_document(container)
responsive = false;
$this.removeClass('responsive');
links.css('display', '');
- item.css('display', 'none');
+ if (!persist) item.css('display', 'none');
}
if (compact) {
@@ -752,9 +756,16 @@ function parse_document(container)
if (!copied) {
var clone = links.clone(true);
clone.filter('.rightside').each(function() {
+ if (persist) this.addClass('clone');
menu.prepend(this);
});
- menu.prepend(clone.not('.rightside'));
+
+ if (persist) {
+ menu.prepend(clone.not('.rightside').addClass('clone'));
+ } else {
+ menu.prepend(clone.not('.rightside'));
+ }
+
menu.find('li.leftside, li.rightside').removeClass('leftside rightside');
menu.find('.inputbox').parents('li:first').css('white-space', 'normal');
@@ -771,7 +782,7 @@ function parse_document(container)
item.css('display', '');
$this.addClass('responsive');
- // Try to not hide filtered items
+ // Try to not hide filtered items #TODO: this does not work!
if (filterLastList.length) {
links.not(filterLast).css('display', 'none');
@@ -787,10 +798,14 @@ function parse_document(container)
}
}
+ // If even responsive isn't enough, use both responsive and compact at same time
+ compact = true;
+ $this.addClass('compact');
+
links.css('display', 'none');
}
- phpbb.registerDropdown(item.find('a.responsive-menu-link'), item.find('.dropdown'));
+ if (!persist) phpbb.registerDropdown(item.find('a.responsive-menu-link'), item.find('.dropdown'));
check();
$(window).resize(check);
diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index f9c5b4cf20..ce2886111e 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -1,23 +1,13 @@
-{LAST_VISIT_DATE}{CURRENT_TIME}
-{CURRENT_TIME}
[ {L_ACP} | {L_MCP} ]
+{LAST_VISIT_DATE}{CURRENT_TIME}
+{CURRENT_TIME}
-
+
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index e2259e8712..2f811d9103 100644
--- a/phpBB/styles/prosilver/template/navbar_footer.html
+++ b/phpBB/styles/prosilver/template/navbar_footer.html
@@ -10,13 +10,25 @@
{S_WATCH_FORUM_TITLE}
+
{S_TIMEZONE}
- {L_DELETE_COOKIES}
+ {L_DELETE_COOKIES}
- {L_THE_TEAM}
- {L_CONTACT_US}
+
+
+
+ {L_THE_TEAM}
+
+
+
+ {L_MEMBERLIST}
+
+
+
+ {L_CONTACT_US}
+
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index 67a3b553fd..a48d16e466 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -1,68 +1,107 @@
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index c44e830b9c..aae5b64963 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -1,5 +1,5 @@
-
[ {L_ACP} | {L_MCP} ]
+
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 38836f3ee4..aee038acbc 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -1,5 +1,5 @@
-
[ {L_ACP} | {L_MCP} ]
+
{FORUM_DESC}
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 2e9253928e..5176ca87df 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -62,12 +62,12 @@
.rtl ul.linklist li {
float: right;
margin-right: 0;
- margin-left: 5px;
+ margin-left: 7px;
}
.rtl ul.linklist li.rightside, .rtl p.rightside {
float: left;
- margin-right: 5px;
+ margin-right: 7px;
margin-left: 0;
text-align: left;
}
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 4b7532ab8a..2d1401cc31 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -106,7 +106,7 @@ table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even) {
----------------------------------------*/
ul.navlinks {
- border-bottom-color: #FFFFFF;
+ border-top-color: #FFFFFF;
}
/* Table styles
@@ -369,6 +369,10 @@ a.arrow-right:hover {
color: #368AD2;
}
+a.icon-dropdown:after {
+ background-image: url("./images/icon_dropdown.png");
+}
+
/*
--------------------------------------------------------------
@@ -696,22 +700,34 @@ Colours and backgrounds for buttons.css
---------------------------------------- */
.icon-faq { background-image: url("./images/icon_faq.gif"); }
.icon-members { background-image: url("./images/icon_members.gif"); }
+.icon-team { background-image: url("./images/icon_team.gif"); }
+.icon-cookies { background-image: url("./images/icon_cookies.gif"); }
.icon-home { background-image: url("./images/icon_home.gif"); }
+.icon-acp { background-image: url("./images/icon_acp.gif"); }
+.icon-mcp { background-image: url("./images/icon_mcp.gif"); }
.icon-ucp { background-image: url("./images/icon_ucp.gif"); }
+.icon-profile { background-image: url("./images/icon_profile.gif"); }
.icon-register { background-image: url("./images/icon_register.gif"); }
+.icon-quick-links { background-image: url("./images/icon_quick_links.gif"); }
.icon-logout { background-image: url("./images/icon_logout.gif"); }
.icon-bookmark { background-image: url("./images/icon_bookmark.gif"); }
.icon-bump { background-image: url("./images/icon_bump.gif"); }
.icon-subscribe { background-image: url("./images/icon_subscribe.gif"); }
.icon-unsubscribe { background-image: url("./images/icon_unsubscribe.gif"); }
.icon-pages { background-image: url("./images/icon_pages.gif"); }
-.icon-search, .responsive-search a { background-image: url("./images/icon_search.gif"); }
.icon-notification { background-image: url("./images/icon_notification.gif"); }
.icon-pm { background-image: url("./images/icon_pm.gif"); }
.icon-download { background-image: url("./images/icon_download.gif"); }
.icon-mark { background-image: url("./images/icon_mark.gif"); }
.icon-sendemail { background-image: url("./images/icon_sendemail.gif"); }
.icon-print { background-image: url("./images/icon_print.gif"); }
+.icon-search, .responsive-search a { background-image: url("./images/icon_search.gif"); }
+.icon-search-advanced { background-image: url("./images/icon_search_adv.gif"); }
+.icon-search-self { background-image: url("./images/icon_topic_latest.gif"); }
+.icon-search-unanswered { background-image: url("./images/icon_post_target.gif"); }
+.icon-search-unread { background-image: url("./images/subforum_unread.gif"); }
+.icon-search-new { background-image: url("./images/subforum_unread.gif"); }
+.icon-search-active { background-image: url("./images/subforum_read.gif"); }
/* Profile & navigation icons */
.contact-icon { background-image: url("./images/icons_contact.png"); }
@@ -1184,6 +1200,10 @@ ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist
border-color: #DCDCDC;
}
+.dropdown li.separator {
+ border-color: #DCDCDC;
+}
+
/* Notifications
---------------------------------------- */
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index a52f5e494d..67add8b90e 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -261,7 +261,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
}
.navbar {
- padding: 5px 10px 5px 10px;
+ padding: 3px 10px;
border-radius: 7px;
}
@@ -307,6 +307,10 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
/* Horizontal lists
----------------------------------------*/
+.navbar ul.linklist {
+ padding: 2px 0;
+}
+
ul.linklist {
display: block;
margin: 0;
@@ -327,7 +331,7 @@ ul.linklist li {
list-style-type: none;
float: left;
width: auto;
- margin-right: 5px;
+ margin-right: 7px;
font-size: 1.1em;
line-height: 2.2em;
padding-top: 1px;
@@ -336,15 +340,12 @@ ul.linklist li {
ul.linklist li.rightside, p.rightside {
float: right;
margin-right: 0;
- margin-left: 5px;
+ margin-left: 7px;
text-align: right;
}
ul.navlinks {
- padding-bottom: 1px;
- margin-bottom: 1px;
- border-bottom: 1px solid transparent;
- font-weight: bold;
+ border-top: 1px solid transparent;
}
ul.leftside {
@@ -372,7 +373,7 @@ ul.linklist li.responsive-menu a.responsive-menu-link {
font-size: 16px;
position: relative;
width: 16px;
- line-height: 16.5px;
+ line-height: 20px;
text-decoration: none;
}
@@ -403,10 +404,6 @@ li.responsive-menu.dropdown-left .dropdown {
right: -6px;
}
-li.responsive-menu .dropdown .dropdown-contents {
- padding: 0 5px;
-}
-
ul.linklist .dropdown-down .dropdown {
top: 22px;
}
@@ -417,10 +414,10 @@ ul.linklist .dropdown-up .dropdown {
ul.linklist .dropdown li {
clear: both;
+ margin: 0;
+ padding: 4px 4px 4px 0;
}
-
-
/* Bulletin icons for list items
----------------------------------------*/
ul.linklist.bulletin li:before {
@@ -444,9 +441,13 @@ ul.linklist.bulletin li.no-bulletin:before {
}
/* Avatar in overall_header.html */
+.header-avatar:hover {
+ text-decoration: none;
+}
+
.header-avatar img {
margin-bottom: 2px;
- max-height: 25px;
+ max-height: 20px;
vertical-align: middle;
width: auto;
}
@@ -556,14 +557,14 @@ ul.linklist.bulletin li.no-bulletin:before {
padding: 5px;
position: relative;
min-width: 40px;
- max-height: 200px;
+ max-height: 300px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.dropdown li {
- border-bottom: 1px dotted transparent;
+ border-top: 1px dotted transparent;
float: none !important;
line-height: normal !important;
font-size: 1em !important;
@@ -575,8 +576,8 @@ ul.linklist.bulletin li.no-bulletin:before {
text-align: left;
}
-.dropdown li:last-child, .dropdown li li {
- border-bottom: 0;
+.dropdown li:first-child, .dropdown li.separator + li, .dropdown li li {
+ border-top: 0;
}
.dropdown li li:first-child {
@@ -600,10 +601,33 @@ ul.linklist.bulletin li.no-bulletin:before {
display: none !important;
}
+.dropdown li.separator {
+ border-top: 1px solid transparent;
+}
+
+.dropdown li.separator, ul.linklist .dropdown li.separator {
+ margin: 3px 0;
+ padding: 0;
+}
+
+.dropdown li.separator:first-child, .dropdown li.separator:last-child {
+ display: none !important;
+}
+
+.dropdown .clone + li.separator {
+ display: none;
+}
+
+.responsive .dropdown .clone + li.separator {
+ display: inherit;
+}
+
+
/* Responsive breadcrumbs
----------------------------------------*/
.breadcrumbs .crumb {
float: left;
+ font-weight: bold;
word-wrap: normal;
}
@@ -1233,6 +1257,30 @@ form > p.post-notice strong {
display: block;
}
+/* Main navigation specific list items
+----------------------------------------*/
+
+#quick-links {
+ margin: 0 7px 0 0;
+}
+
+#quick-links a.responsive-menu-link {
+ display: block;
+ font-size: inherit;
+ line-height: inherit;
+ margin: 0;
+ width: auto;
+}
+
+#quick-links a.responsive-menu-link:before {
+ font-size: 16px;
+ line-height: 16.5px;
+}
+
+.compact #quick-links a.responsive-menu-link {
+ font-size: 0;
+}
+
.compact .icon-notification > a > span, .compact .icon-pm > a > span {
display: none;
}
@@ -1252,3 +1300,11 @@ form > p.post-notice strong {
.dropdown-page-jump input.tiny {
width: 50px;
}
+
+.dropdown .clone {
+ display: none;
+}
+
+.responsive .dropdown .clone {
+ display: inherit;
+}
diff --git a/phpBB/styles/prosilver/theme/images/icon_acp.gif b/phpBB/styles/prosilver/theme/images/icon_acp.gif
new file mode 100644
index 0000000000..5d3efb45a9
Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/icon_acp.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/icon_cookies.gif b/phpBB/styles/prosilver/theme/images/icon_cookies.gif
new file mode 100644
index 0000000000..f4d45281f6
Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/icon_cookies.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/icon_dropdown.png b/phpBB/styles/prosilver/theme/images/icon_dropdown.png
new file mode 100644
index 0000000000..d471eef450
Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/icon_dropdown.png differ
diff --git a/phpBB/styles/prosilver/theme/images/icon_mcp.gif b/phpBB/styles/prosilver/theme/images/icon_mcp.gif
new file mode 100644
index 0000000000..ec243ef821
Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/icon_mcp.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/icon_profile.gif b/phpBB/styles/prosilver/theme/images/icon_profile.gif
new file mode 100644
index 0000000000..a0ec098460
Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/icon_profile.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/icon_team.gif b/phpBB/styles/prosilver/theme/images/icon_team.gif
new file mode 100644
index 0000000000..613158257b
Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/icon_team.gif differ
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 89639dde02..0ed0a5d139 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -75,6 +75,22 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
width: 40px;
}
+/* Dropdown links (inline) */
+a.icon-dropdown:after {
+ background-position: 0 0;
+ background-repeat: no-repeat;
+ content: '';
+ display: inline-block;
+ float: right;
+ height: 8px;
+ width: 11px;
+ margin: 9px 0 0 2px;
+}
+
+a.icon-dropdown:hover:after, .dropdown-visible a.icon-dropdown:after {
+ background-position: 0 -22px;
+}
+
/* Links for forum/topic lists */
a.forumtitle {
font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif;
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index e27a2292b3..cea7656d7f 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -73,7 +73,7 @@ body {
.responsive-search a {
display: block;
width: 16px;
- height: 18px;
+ height: 22px;
text-indent: 99px;
overflow: hidden;
background-position: 50% 50%;