branding/styles/navbar_top.txt | 9
++++++---
branding/styles/navbar_top_sat.txt | 9
++++++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 8
+++++++-
java/code/webapp/WEB-INF/includes/header.jsp | 5 ++---
web/modules/sniglets/Sniglets/Header.pm | 10
++++++++++
5 files changed, 31 insertions(+), 10 deletions(-)
New commits:
commit 072630c4daec3e5c687f71cd9b5d9a901ff0f415
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Wed Apr 29 15:42:00 2009 -0400
480011 - Added organization to the top header near the username.
diff --git a/branding/styles/navbar_top.txt b/branding/styles/navbar_top.txt
index 4a3f58f..6a36411 100644
--- a/branding/styles/navbar_top.txt
+++ b/branding/styles/navbar_top.txt
@@ -12,10 +12,13 @@ class="navPipe">|</span> <a
href="rhn/">Documentation</a></p>
<div id="utilityAccount">
<rhn-display-login>
<p>
- <span class="label">Logged in:</span> <a
+ <span class="label">User:</span> <a
href="/rhn/account/UserDetails.do">[login]</a><span
-class="navPipe">|</span><a
-href="/rhn/account/UserPreferences.do">Preferences</a><span
+class="navPipe">|</span>
+ <span class="label">Organization:</span> <a
+href="/rhn/admin/multiorg/OrgDetails.do?oid=[oid]">[org]</a><span
+class="navPipe">|</span>
+<a href="/rhn/account/UserPreferences.do">Preferences</a><span
class="navPipe">|</span><a
href="/rhn/Logout.do"><span>Sign Out</span></a>
</p>
diff --git a/branding/styles/navbar_top_sat.txt b/branding/styles/navbar_top_sat.txt
index 7c3d636..4e1e22d 100644
--- a/branding/styles/navbar_top_sat.txt
+++ b/branding/styles/navbar_top_sat.txt
@@ -12,10 +12,13 @@ class="navPipe">|</span> <a
href="/help">Documentation</a></p>
<div id="utilityAccount">
<rhn-display-login>
<p>
- <span class="label">Logged in:</span> <a
+ <span class="label">User:</span> <a
href="/rhn/account/UserDetails.do">[login]</a><span
-class="navPipe">|</span><a
-href="/rhn/account/UserPreferences.do">Preferences</a><span
+class="navPipe">|</span>
+ <span class="label">Organization:</span> <a
+href="/rhn/admin/multiorg/OrgDetails.do?oid=[oid]">[org]</a><span
+class="navPipe">|</span>
+<a href="/rhn/account/UserPreferences.do">Preferences</a><span
class="navPipe">|</span><a
href="/rhn/Logout.do"><span>Sign Out</span></a>
</p>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index bb2f580..16269b2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -1323,7 +1323,13 @@
</context-group>
</trans-unit>
<trans-unit id="header.jsp.loggedin">
-<source>Logged In:</source>
+<source>User:</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">./includes/header.jsp</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="header.jsp.org">
+<source>Organization:</source>
<context-group name="ctx">
<context
context-type="sourcefile">./includes/header.jsp</context>
</context-group>
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp
b/java/code/webapp/WEB-INF/includes/header.jsp
index f2c19c1..2d8e9c0 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -15,9 +15,8 @@
</div>
<div id="utilityAccount">
<p>
- <span class="label"><bean:message
key="header.jsp.loggedin"/></span> <a
href="/rhn/account/UserDetails.do"><c:out escapeXml="true"
value="${requestScope.session.user.login}" /></a><span
class="navPipe">|</span><a
href="/rhn/account/UserPreferences.do"><bean:message
key="header.jsp.preferences"/></a><span
class="navPipe">|</span><html:link
forward="logout"><span><bean:message
key="header.jsp.signout"/></span></html:link>
-
- </p>
+ <span class="label"><bean:message
key="header.jsp.loggedin"/></span> <a
href="/rhn/account/UserDetails.do"><c:out escapeXml="true"
value="${requestScope.session.user.login}" /></a><span
class="navPipe">|</span><span
class="label"><bean:message
key="header.jsp.org"/></span> <a
href="/rhn/admin/multiorg/OrgDetails.do?oid=${requestScope.session.user.org.id}"><c:out
escapeXml="true" value="${requestScope.session.user.org.name}"
/></a><span class="navPipe">|</span><a
href="/rhn/account/UserPreferences.do"><bean:message
key="header.jsp.preferences"/></a><span
class="navPipe">|</span><html:link
forward="logout"><span><bean:message
key="header.jsp.signout"/></span></html:link>
+ </p>
</div>
</div>
</rhn:require>
diff --git a/web/modules/sniglets/Sniglets/Header.pm
b/web/modules/sniglets/Sniglets/Header.pm
index adbeb5a..5f8bce5 100755
--- a/web/modules/sniglets/Sniglets/Header.pm
+++ b/web/modules/sniglets/Sniglets/Header.pm
@@ -18,6 +18,7 @@ use strict;
package Sniglets::Header;
use Data::Dumper;
use PXT::Utils;
+use RHN::Org;
sub register_tags {
my $class = shift;
@@ -31,14 +32,23 @@ sub display_login {
my %params = @_;
my $login = '';
my $custnum = '';
+ my $org = '';
+ my $org_name = '';
+ my $org_id = '';
if ($pxt->user) {
my $body = $params{__block__} || '';
if ($pxt->user()) {
$login = PXT::Utils->escapeHTML($pxt->user->login);
+
+ $org = RHN::Org->lookup(-id => $pxt->user->org->id);
+ $org_name = $org->name;
+ $org_id = $org->id;
}
+ $body =~ s/\[org\]/$org_name/g;
$body =~ s/\[login\]/$login/g;
+ $body =~ s/\[oid\]/$org_id/g;
return $body;
}
else {
Show replies by thread