aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-10-16 19:32:28 -0700
committerCesar G <prototech91@gmail.com>2014-10-16 19:32:28 -0700
commitb22650d3236e98ac4f3cb79167f54fe508112238 (patch)
tree71cbb22734f596d14866f26829b11eca0b082c45 /phpBB/styles
parent1dbc5fc092dbd210dd4e9195b6e02da6f049ff01 (diff)
parent39e51e559980d239a08a59e789a1165cc2bbcfff (diff)
downloadforums-b22650d3236e98ac4f3cb79167f54fe508112238.tar
forums-b22650d3236e98ac4f3cb79167f54fe508112238.tar.gz
forums-b22650d3236e98ac4f3cb79167f54fe508112238.tar.bz2
forums-b22650d3236e98ac4f3cb79167f54fe508112238.tar.xz
forums-b22650d3236e98ac4f3cb79167f54fe508112238.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12796] Use dedicated lang vars [ticket/12796] Use &amp; in path [ticket/12796] Add view own profile to UCP (and vice versa)
Diffstat (limited to 'phpBB/styles')
-rw-r--r--phpBB/styles/prosilver/template/memberlist_view.html1
-rw-r--r--phpBB/styles/prosilver/template/ucp_profile_profile_info.html2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index eb151af8df..5d8e6ec8a8 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -20,6 +20,7 @@
<dt>{L_USERNAME}{L_COLON}</dt>
<dd>
<!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span>
+ <!-- IF U_EDIT_SELF --> [ <a href="{U_EDIT_SELF}">{L_EDIT_PROFILE}</a> ]<!-- ENDIF -->
<!-- IF U_USER_ADMIN --> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF -->
<!-- IF U_USER_BAN --> [ <a href="{U_USER_BAN}">{L_USER_BAN}</a> ]<!-- ENDIF -->
<!-- IF U_SWITCH_PERMISSIONS --> [ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
index 986bc92298..e8e2aedc14 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
@@ -2,7 +2,7 @@
<form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
-<h2>{L_TITLE}</h2>
+<h2>{L_TITLE} <span class="small">[ <a href="{U_USER_PROFILE}" title="{L_VIEW_PROFILE}">{L_VIEW_PROFILE}</a> ]</span></h2>
<div class="panel">
<div class="inner">