Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv16309

Modified Files:
        index.jsp 
Log Message:
made jsp a bit better digestable


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment


Index: index.jsp
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/index.jsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- index.jsp   3 Jul 2007 11:42:46 -0000       1.20
+++ index.jsp   10 Jul 2008 09:00:17 -0000      1.21
@@ -1,116 +1,62 @@
-<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm" %>
-<[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di" %>
-<[EMAIL PROTECTED] import="org.mmbase.bridge.*,java.util.ArrayList" %>
-
-<mm:content postprocessor="reducespace" expires="0">
-<mm:cloud method="delegate">
-<[EMAIL PROTECTED] file="/shared/setImports.jsp" %>
-
-<mm:import externid="coachmode">false</mm:import>
-
-  <mm:treeinclude page="/cockpit/cockpit_header.jsp" objectlist="$includePath" 
referids="$referids">
-    <mm:param name="extraheader">
-      <title><di:translate key="assessment.assessment_matrix" /></title>
-      <link rel="stylesheet" type="text/css" href="css/assessment.css" />
-    </mm:param>
-  </mm:treeinclude>
-
-  <script language="JavaScript" type="text/javascript">
-    function toggle(number) {
-      if( document.getElementById("toggle_div" + number).style.display=='none' 
){
-        document.getElementById("toggle_div" + number).style.display = '';
-        document.getElementById("toggle_image" + number).src = "<mm:treefile 
page="/assessment/gfx/minus.gif"
-                                  objectlist="$includePath" />";
-      } else {
-        document.getElementById("toggle_div" + number).style.display = 'none';
-        document.getElementById("toggle_image" + number).src = "<mm:treefile 
page="/assessment/gfx/plus.gif"
-                                  objectlist="$includePath" />";
-      }
-    }
-
-    function toggleAll(image,number) {
-      var toggles = number.split(",");
-      if( document.getElementById("toggle_div" + 
toggles[0]).style.display=='none' ){
-        for (i=0;i<toggles.length;i++) {
-          document.getElementById("toggle_div" + toggles[i]).style.display = 
'';
-        }
-        document.getElementById("toggle_image" + image).src = "<mm:treefile 
page="/assessment/gfx/minus.gif"
-                                  objectlist="$includePath" />";
-      } else {
-        for (i=0;i<toggles.length;i++) {
-          document.getElementById("toggle_div" + toggles[i]).style.display = 
'none';
-        }
-        document.getElementById("toggle_image" + image).src = "<mm:treefile 
page="/assessment/gfx/plus.gif"
-                                  objectlist="$includePath" />";
-      }
-    }
-    function doAction(prompt) {
-    var conf;
-    if (prompt && prompt!="") {
-       conf = confirm(prompt);
-    }
-    else
-      conf=true;
-      return conf;
-    }
+<jsp:root
+    xmlns:jsp="http://java.sun.com/JSP/Page";
+    version="2.0">
+
+  <di:html
+      description="bla bla"
+      title_key="assessment.assessment_matrix"
+      type="text/html"
+      xmlns:jsp="http://java.sun.com/JSP/Page";
+      xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+      xmlns:di="http://www.didactor.nl/ditaglib_1.0";
+      component="assessmment" >
+
+    <mm:import externid="coachmode">
+      <di:hasrole role="coach">true</di:hasrole>
+      <di:hasrole role="coach" inverse="true">false</di:hasrole>
+    </mm:import>
+
+    <script type="text/javascript"
+            src="${mm:treelink('/assessment/javascript.js', includePath)}">
+      <jsp:text> </jsp:text>
   </script>
 
   <div class="rows">
+
     <div class="navigationbar">
       <div class="titlebar">
-        <img src="<mm:treefile write="true" page="/gfx/icon_pop.gif" 
objectlist="$includePath" />" 
-            width="25" height="13" border="0" title="<di:translate 
key="assessment.assessment_matrix" />" alt="<di:translate 
key="assessment.assessment_matrix" />" /> <di:translate 
key="assessment.assessment_matrix" />
+          <img src="${mm:treelink('/gfx/icon_pop.gif', includePath)}"
+               width="25" height="13" border="0"
+               title="${di:translate('assessment.assessment_matrix')}"
+               alt="${di:translate('assessment.assessment_matrix')}"
+               /> <di:translate key="assessment.assessment_matrix" />
       </div>           
     </div>
 
-    <div class="folders">
-      <div class="folderHeader">
-      </div>
-      <div class="folderBody">
-      </div>
-    </div>
 
-    <%-- right section --%>
+
+      <!-- right section -->
     <div class="mainContent">
       <div class="contentBody">
-        <mm:node number="$user" notfound="skip">
-          <% boolean isStudent = false;
-             boolean isCoach = false;
-          %>
-          <mm:relatednodes type="roles" path="related,roles">
-            <mm:field name="name" jspvar="dummy" vartype="String">
-              <% if ("student".equals(dummy)) { isStudent = true; }
-                 if ("teacher".equals(dummy)) { isCoach = true; }
-              %>
-            </mm:field>
-          </mm:relatednodes>
-          <% if (isStudent && isCoach) { %>
-               <form name="coachform" action="<mm:treefile 
page="/assessment/index.jsp" objectlist="$includePath"
-                   referids="$referids"/>" method="post">
-                 <select name="coachmode" style="width:300px" 
onChange="coachform.submit();">
-                   <option value="true" <mm:compare referid="coachmode" 
value="true">selected</mm:compare>
-                     ><di:translate key="assessment.overview_students" 
/></option>
-                   <option value="false" <mm:compare referid="coachmode" 
value="false">selected</mm:compare>
-                     ><di:translate key="assessment.personal_assessment" 
/></option>
+          <di:hasrole role="student">
+            <di:hasrole role="coach">
+              <form name="coachform" method="post">
+                <select name="coachmode"
+                        onChange="coachform.submit();">
+                  <mm:option value="true" compare="${coachmode}"><di:translate 
key="assessment.overview_students" /></mm:option>
+                  <mm:option value="false" 
compare="${coachmode}"><di:translate key="assessment.personal_assessment" 
/></mm:option>
                  </select>
                </form>
-               <br/>
-          <% } %>
-          <% if (!isCoach) { %>
-               <mm:import id="coachmode" reset="true">false</mm:import>
-          <% } %>
+            </di:hasrole>
+          </di:hasrole>
           <mm:compare referid="coachmode" value="false">
-            <mm:treeinclude page="/assessment/for_student.jsp" 
objectlist="$includePath" referids="$referids"/>
+            <di:include page="/assessment/for_student.jsp" />
           </mm:compare>
           <mm:compare referid="coachmode" value="true">
-            <mm:treeinclude page="/assessment/for_coach.jsp" 
objectlist="$includePath" referids="$referids">
-              <mm:param name="coachmode">true</mm:param>
-            </mm:treeinclude>
+          <di:include page="/assessment/for_coach.jsp" />
           </mm:compare>
-        </mm:node>
       </div>
     </div>
   </div>
-  <mm:treeinclude page="/cockpit/cockpit_footer.jsp" objectlist="$includePath" 
referids="$referids" />
-</mm:cloud>
-</mm:content>
+  </di:html>
+</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to