You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by mi...@apache.org on 2010/02/10 16:35:12 UTC
svn commit: r908539 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style:
./ src/main/resources/org/apache/clerezza/web/resources/style/
src/main/resources/org/apache/clerezza/web/resources/style/staticweb/s...
Author: mir
Date: Wed Feb 10 15:35:11 2010
New Revision: 908539
URL: http://svn.apache.org/viewvc?rev=908539&view=rev
Log:
CLEREZZA-87: Menu has now logout button only if a user is logged in
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/scripts/login.js
- copied unchanged from r908526, incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/scripts/login.js
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/ (props changed)
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
Propchange: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 10 15:35:11 2010
@@ -1,2 +1,3 @@
/incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.web.resources.style:894321-894392
/incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style:900408-902859
+/incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style:905960-908526
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp?rev=908539&r1=908538&r2=908539&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp Wed Feb 10 15:35:11 2010
@@ -1,5 +1,9 @@
def menu(s: Any) = new UriRef("http://clerezza.org/2009/11/global-menu#"+s)
def rdfs(s: Any) = new UriRef("http://www.w3.org/2000/01/rdf-schema#"+s)
+def platform(s: Any) = new UriRef("http://clerezza.org/2009/08/platform#"+s)
+
+resultDocModifier.addScriptReference("/style/scripts/login.js");
+
<div id="tx-system">
<div id="tx-globalsearch">
<form action="/globalsearch">
@@ -10,7 +14,18 @@
</div>
- <div id="tx-login"></div>
+ <div id="tx-login">
+ {if((context/platform("user")/platform("userName")*).equals("anonymous")) {
+ <span>
+ <a href="#" id="tx-login-button">login</a>
+ </span>
+ } else {
+ <span>{context/platform("user")/platform("userName")*}
+ <a href="/logout">logout</a>
+ </span>
+ }
+ }
+ </div>
<div id="tx-logo"><a href=""></a></div>
@@ -18,22 +33,21 @@
<ol>
{for (menuItem <- res/menu("globalMenu")!!) yield
<li><a href=
- {
+ {
if ((menuItem/menu("path")).length > 0) {
menuItem/menu("path")*
} else {""}
- }>{(menuItem/rdfs("label")*)}</a>
- <ol>
+ }>{(menuItem/rdfs("label")*)}</a>
+ <ol>
{
if ((menuItem/menu("children")).length > 0) {
for (childMenuItem <- menuItem/menu("children")!!) yield
<li><a href={childMenuItem/menu("path")*}>{childMenuItem/rdfs("label")*}</a></li>
} else {}
}
- </ol>
- </li>
+ </ol>
+ </li>
}
- <li><a href="/logout">Logout</a></li>
</ol>
</div>
</div>
\ No newline at end of file