Index: WAeUP_SRP/trunk/profiles/default/layouts/layout.xsl
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/layout.xsl	(revision 1398)
+++ WAeUP_SRP/trunk/profiles/default/layouts/layout.xsl	(revision 1403)
@@ -4,33 +4,103 @@
   <xsl:template match="/">
     <html>
+      <head>
+        <title>
+          <xsl:value-of select="object/name"/>
+        </title>
+        <link rel="stylesheet" type="text/css" media="all"
+              href="../xsl.css" />      
+      </head>
       <body>
         <xsl:for-each select="object">
-          <div>
-            <xsl:value-of select="@name"/>
-          </div>
+          <h1><xsl:value-of select="@name"/></h1>
         </xsl:for-each>
+        <h1>Layout</h1>
+        <table>
+          <xsl:for-each select="object/table/row">
+            <xsl:variable name="color">
+              <xsl:choose>
+                <xsl:when test="position() mod 2 = 0">
+                  <xsl:text>#ffffff</xsl:text>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:text>#eeeeee</xsl:text>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <tr style="background-color:{$color}">
+              <xsl:for-each select="cell">
+              <td>
+                <xsl:value-of select="@name"/>
+              </td>
+              </xsl:for-each>
+            </tr>
+          </xsl:for-each>
+        </table>
         <h1>Properties</h1>
-        <xsl:for-each select="object/property">
-          Property :
-          <div>
-            <xsl:value-of select="@name"/>:						<xsl:value-of select="text()"/>
-          </div>
-        </xsl:for-each>
+        <table>
+          <xsl:for-each select="object/property">
+            <xsl:variable name="color">
+              <xsl:choose>
+                <xsl:when test="position() mod 2 = 0">
+                  <xsl:text>#ffffff</xsl:text>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:text>#eeeeee</xsl:text>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <tr style="background-color:{$color}">
+              <td>
+                <xsl:value-of select="@name"/>
+              </td>
+              <td>
+                <xsl:value-of select="text()"/>
+              </td>
+            </tr>
+          </xsl:for-each>
+        </table>
         <h1>Widgets</h1>
-        <xsl:for-each select="object/widget">
-          <div>Widget: <xsl:value-of select="@name"/>
-            Type:<xsl:value-of select="@meta_type"/>
-          </div>
-          <div>Properties:</div>
-          <xsl:for-each select="property">
-            <div>
-              <xsl:value-of select="@name"/>: <xsl:value-of select="text()"/>
-            </div>
-            <div>
-              <xsl:value-of select="element"/>
-            </div>
-            <br/>
+        <table>
+          <xsl:for-each select="object/widget">
+            <xsl:variable name="color">
+              <xsl:choose>
+                <xsl:when test="position() mod 2 = 0">
+                  <xsl:text>#ffffff</xsl:text>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:text>#eeeeee</xsl:text>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <tr style="background-color:{$color}">
+              <th>
+                <xsl:value-of select="@name"/>
+              </th>
+              <td colspan="2">
+                <xsl:value-of select="@meta_type"/>
+              </td>
+            </tr>
+            <tr style="background-color:{$color}">
+              <th colspan="3">
+                Properties:
+              </th>
+            </tr>
+            <xsl:for-each select="property">
+              <tr style="background-color:{$color}">
+                <th>
+                  <xsl:value-of select="@name"/>
+                </th>
+                <td>
+                  <xsl:value-of select="text()"/>
+                </td>
+                <td>
+                  <xsl:for-each select="element">
+                    <xsl:value-of select="@value"/>
+                  </xsl:for-each>
+                </td>
+              </tr>
+            </xsl:for-each>
           </xsl:for-each>
-        </xsl:for-each>
+        </table>
       </body>
     </html>
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_study_course.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_study_course.xml	(revision 1398)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_study_course.xml	(revision 1403)
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="layout.xsl"?>
 <object name="student_study_course" meta_type="CPS Layout">
  <property name="layout_create_method"></property>
@@ -7,16 +8,4 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
- <widget name="title" meta_type="String Widget">
-  <property name="title">Certificate</property>
-  <property name="fields">
-   <element value="title"/>
-  </property>
-  <property name="is_required">False</property>
-  <property name="label">Certificate</property>
-  <property name="label_edit">Certificate</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
  <widget name="study_course" meta_type="StudyCourse Widget">
   <property name="title">Certificate Code</property>
@@ -31,8 +20,38 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
+ <widget name="current_level" meta_type="String Widget">
+  <property name="title">Current Studylevel</property>
+  <property name="fields">
+   <element value="current_level"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Current Studylevel</property>
+  <property name="label_edit">Current Studylevel</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="current_verdict" meta_type="String Widget">
+  <property name="title">Current Verdict</property>
+  <property name="fields">
+   <element value="current_verdict"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Current Verdict</property>
+  <property name="label_edit">Current Verdict</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <table>
   <row>
    <cell name="study_course"/>
   </row>
+  <row>
+   <cell name="current_verdict"/>
+  </row>
+  <row>
+   <cell name="current_level"/>
+  </row>
  </table>
 </object>
