Update of /var/cvs/contributions/didactor2/src/core/templates/cockpit
In directory james.mmbase.org:/tmp/cvs-serv6397
Modified Files:
applicationbar.jsp educationbar.jsp footer.jspx
providerbar.jsp
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/templates/cockpit
Index: applicationbar.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/templates/cockpit/applicationbar.jsp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- applicationbar.jsp 3 Jul 2008 15:06:28 -0000 1.40
+++ applicationbar.jsp 28 Aug 2008 15:26:59 -0000 1.41
@@ -7,7 +7,7 @@
<mm:import externid="showlogin"><mm:hasrank
value="anonymous">yes</mm:hasrank></mm:import>
<mm:compare referid="showlogin" value="yes">
<div class="menuItemApplicationMenubar login">
- <mm:import externid="referrer">
+ <mm:import externid="referrer">s
<mm:treefile page="/education/index.jsp" objectlist="$includePath"
referids="$referids" />
</mm:import>
<form method="post" action="${mm:link(referrer)}">
Index: educationbar.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/templates/cockpit/educationbar.jsp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- educationbar.jsp 28 Mar 2008 16:43:53 -0000 1.22
+++ educationbar.jsp 28 Aug 2008 15:26:59 -0000 1.23
@@ -27,8 +27,9 @@
</jsp:scriptlet>
<div class="educationMenubarNav">
+
<mm:present referid="education">
- <mm:node number="$education" notfound="skip">
+ <mm:node number="$education">
<mm:related path="settingrel,components">
<mm:node element="components">
<mm:field jspvar="cname" name="name" write="false"
vartype="String">
@@ -54,6 +55,7 @@
<mm:import id="componentname" reset="true">
<jsp:expression>c.getName()</jsp:expression>
</mm:import>
+
<c:catch var="ex">
<mm:treeinclude page="/$componentname/cockpit/menuitem.jsp"
objectlist="$includePath" referids="$referids">
<mm:param
name="name"><jsp:expression>c.getName()</jsp:expression></mm:param>
Index: footer.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/templates/cockpit/footer.jspx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- footer.jspx 22 Aug 2008 09:02:27 -0000 1.7
+++ footer.jspx 28 Aug 2008 15:26:59 -0000 1.8
@@ -22,10 +22,11 @@
<mm:isnotempty>
<script type="text/javascript"
src="${fn:startsWith(pageContext.request.requestURL,
'http://') ? 'http://www' : 'https://ssl'}.google-analytics.com/ga.js"
- />
+ > </script>
<script type="text/javascript">
- var pageTracker = _gat._getTracker("${_}");
- pageTracker._trackPageview();
+ if (typeof(_gat) != "undefined") {
+ var pageTracker = _gat._getTracker("${_}");
pageTracker._trackPageview();
+ }
</script>
</mm:isnotempty>
</di:getsetting>
Index: providerbar.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/templates/cockpit/providerbar.jsp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- providerbar.jsp 3 Jul 2008 13:55:20 -0000 1.38
+++ providerbar.jsp 28 Aug 2008 15:26:59 -0000 1.39
@@ -19,22 +19,12 @@
<mm:functioncontainer>
<mm:param name="bar">provider</mm:param>
<mm:listfunction name="components">
- <di:menuitem component="${_}" />
+
</mm:listfunction>
</mm:functioncontainer>
</mm:node>
</mm:hasrank>
- <!-- If the user has the rights, then always show the management link.
That allows us to enable/disable components after install on an empty database
-->
- <di:menuitem component="${di:component('education')}" />
-
- <mm:hasrank value="anonymous">
- <div class="provideranonymous">
- <mm:node referid="provider">
- <mm:nodeinfo type="gui" />
- </mm:node>
- </div>
- </mm:hasrank>
</div>
</mm:cloud>
</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
