Author: reto
Date: Sun Jun 12 20:20:04 2011
New Revision: 1134974
URL: http://svn.apache.org/viewvc?rev=1134974&view=rev
Log:
CLEREZZA-561: Showing FOAF.name instead of username in the top right of pages
Modified:
incubator/clerezza/trunk/parent/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
Modified:
incubator/clerezza/trunk/parent/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java?rev=1134974&r1=1134973&r2=1134974&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java
(original)
+++
incubator/clerezza/trunk/parent/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java
Sun Jun 12 20:20:04 2011
@@ -19,8 +19,11 @@
package org.apache.clerezza.platform.dashboard;
import org.apache.clerezza.platform.security.UserUtil;
+import org.apache.clerezza.platform.security.WebIdBasedPermissionProvider;
import org.apache.clerezza.platform.typerendering.UserContextProvider;
import org.apache.clerezza.platform.usermanager.UserManager;
+import org.apache.clerezza.platform.users.WebIdGraphsService;
+import org.apache.clerezza.platform.users.WebIdInfo;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.UriRef;
@@ -28,6 +31,8 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.ontologies.PERMISSION;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
import org.apache.clerezza.rdf.utils.GraphNode;
+import org.apache.clerezza.rdf.utils.UnionMGraph;
+import org.apache.commons.lang.Validate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
@@ -52,6 +57,9 @@ public class UserLoginNode implements Us
@Reference
protected UserManager userManager;
+ @Reference
+ private WebIdGraphsService webIdGraphsService;
+
@Override
public GraphNode addUserContext(GraphNode node) {
@@ -67,6 +75,11 @@ public class UserLoginNode implements Us
}
});
if (agent != null) {
+ if (agent.getNode() instanceof UriRef) {
+ WebIdInfo webIdInfo =
webIdGraphsService.getWebIdInfo((UriRef)agent.getNode());
+ MGraph userGraph =
webIdInfo.localPublicUserData();
+ agent = new GraphNode(agent.getNode(), new
UnionMGraph(agent.getGraph(), userGraph));
+ }
node.addProperty(PLATFORM.user, agent.getNode());
MGraph userContext = new
SimpleMGraph(agent.getNodeContext());
removeTripleWithProperty(userContext,
PERMISSION.password);
Modified:
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp?rev=1134974&r1=1134973&r2=1134974&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
(original)
+++
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
Sun Jun 12 20:20:04 2011
@@ -16,13 +16,18 @@ resultDocModifier.addScriptReference("/s
</div>
<div id="tx-login">
{
- val username =
(context/platform("user")/platform("userName")*)
- if((username).equals("anonymous")) {
+ val userName =
context/platform("user")/platform("userName")*
+ val displayName = if
((context/platform("user")/FOAF.name).length == 0) {
+ userName
+ } else {
+
context/platform("user")/FOAF.name*
+ }
+ if((userName).equals("anonymous")) {
<span>
<a href="#"
id="tx-login-button">login</a>
</span>
} else {
- <span><a href={"/user/" +
username + "/control-panel"}>{username}</a>|<a href="/logout">logout</a></span>
+ <span><a href={"/user/" +
userName + "/control-panel"}>{displayName}</a>|<a
href="/logout">logout</a></span>
}
}
</div>
