Author: mir
Date: Wed Feb 10 11:58:30 2010
New Revision: 908460
URL: http://svn.apache.org/viewvc?rev=908460&view=rev
Log:
CLEREZZA-87: modified globalmenu-naked.ssp
Modified:
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/
(props changed)
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp
Propchange:
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 10 11:58:30 2010
@@ -1,3 +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/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style:905960-907340
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style:905960-908448
Modified:
incubator/clerezza/issues/CLEREZZA-87/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/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp?rev=908460&r1=908459&r2=908460&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
(original)
+++
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
Wed Feb 10 11:58:30 2010
@@ -14,14 +14,17 @@
</div>
- <div
id="tx-login"><span>{context/platform("user")/platform("userName")*}:
+ <div id="tx-login">
{if((context/platform("user")/platform("userName")*).equals("anonymous")) {
- <a href="#"
id="tx-login-button">login</a>
+ <span>
+ <a href="#"
id="tx-login-button">login</a>
+ </span>
} else {
- <a href="/logout">logout</a>
+
<span>{context/platform("user")/platform("userName")*}
+ <a
href="/logout">logout</a>
+ </span>
}
- }
- </span>
+ }
</div>
<div id="tx-logo"><a href=""></a></div>
@@ -30,20 +33,20 @@
<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>
}
</ol>
</div>
Modified:
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp?rev=908460&r1=908459&r2=908460&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp
(original)
+++
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp
Wed Feb 10 11:58:30 2010
@@ -1,15 +1,10 @@
resultDocModifier.addStyleSheet("/style/style.css");
-resultDocModifier.addStyleSheet("/yui/container/assets/container-core.css");
resultDocModifier.addScriptReference("/jquery/jquery-1.3.2.min.js");
resultDocModifier.addScriptReference("/jquery/jquery.menu.js");
resultDocModifier.addScriptReference("/jquery/jquery.panel.js");
resultDocModifier.addScriptReference("/style/scripts/panel.js");
resultDocModifier.addScriptReference("/scripts/modification-status.js");
resultDocModifier.addScriptReference("/scripts/status-message.js");
-/*resultDocModifier.addScriptReference("/yui/yahoo-dom-event/yahoo-dom-event.js");
-resultDocModifier.addScriptReference("/yui/element/element-min.js");
-resultDocModifier.addScriptReference("/yui/container/container-min.js");*/
-resultDocModifier.addScriptReference("/scripts/alert-message.js");
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
<title></title>
