Index: WAeUP_SRP/trunk/skins/waeup_default/external_edit_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/external_edit_form.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_default/external_edit_form.pt	(revision 1737)
@@ -1,4 +1,3 @@
-<tal:block define="
-    rendered_main python:context.getContent().render(layout_mode='edit', 
+<metal:defineblock tal:define="rendered_main python:context.getContent().render(layout_mode='edit', 
            cluster=None,
            request=request, 
@@ -9,6 +8,7 @@
            is_allowed context/isSectionOfficer;
            creation python:False;
-           metadata metadata|nothing;"
+           metadata metadata|nothing;
+           template here/slip_template/macros/master;"
     >
   <metal:block use-macro="context/waeup_edit_form/macros/edit_form" />
-</tal:block>
+</metal:defineblock>
Index: WAeUP_SRP/trunk/skins/waeup_default/isStaff.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/isStaff.py	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_default/isStaff.py	(revision 1737)
@@ -22,3 +22,5 @@
        "SectionOfficer" in roles or\
        "ClearanceOfficer" in roles or\
+       "CourseAdviser" in roles or\
+       "CourseAdvisers" in member.getGroups() or\
        "ClearanceOfficers" in member.getGroups()
Index: WAeUP_SRP/trunk/skins/waeup_default/waeup_edit_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/waeup_edit_form.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_default/waeup_edit_form.pt	(revision 1737)
@@ -1,4 +1,3 @@
-<tal:block define="
-    rendered_main python:context.getContent().render(layout_mode='edit', 
+<metal:defineblock tal:define="rendered_main python:context.getContent().render(layout_mode='edit', 
            cluster=None,
            request=request, 
@@ -10,7 +9,8 @@
            is_allowed context/isSectionOfficer;
            metadata metadata|nothing;
+           template here/waeup_content_master/macros/master;
            ">
 <metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
+<metal:block use-macro=template>
   
   <metal:block fill-slot="header">
@@ -95,3 +95,3 @@
 </metal:block>
 </metal:block>
-</tal:block>
+</metal:defineblock>
Index: WAeUP_SRP/trunk/skins/waeup_design/WAeUP_Backoffice/render.css.dtml
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/WAeUP_Backoffice/render.css.dtml	(revision 1737)
+++ WAeUP_SRP/trunk/skins/waeup_design/WAeUP_Backoffice/render.css.dtml	(revision 1737)
@@ -0,0 +1,3 @@
+.portalTabTabStyle ul.cpsskinsMenu li a{background:url(images/waeup_staff_tab_full_2.png) left top no-repeat}
+.colorBarColor{border-color:#B9B9B9;background-color:#B9B9B9;color:#FFFF}
+.colorBarAreaColor{border-color:#B9B9B9;background-color:#FFFFFF;color:#000000}
Index: WAeUP_SRP/trunk/skins/waeup_design/WAeUP_Student/render.css.dtml
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/WAeUP_Student/render.css.dtml	(revision 1737)
+++ WAeUP_SRP/trunk/skins/waeup_design/WAeUP_Student/render.css.dtml	(revision 1737)
@@ -0,0 +1,4 @@
+.portalTabTabStyle ul.cpsskinsMenu li a{background:url(images/waeup_student_tab.png) left top no-repeat}
+.colorBarColor{border-color:#FFCE81;background-color:#FFCE81;color:#000000}
+.colorBarAreaColor{border-color:#FFCE81;background-color:#FFF;color:#000000}
+
Index: WAeUP_SRP/trunk/skins/waeup_design/common.css.dtml
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/common.css.dtml	(revision 1737)
+++ WAeUP_SRP/trunk/skins/waeup_design/common.css.dtml	(revision 1737)
@@ -0,0 +1,89 @@
+<dtml-let base_url="getBaseUrl()">
+
+body, table {
+  font-size: 100%;
+  line-height: normal;
+}
+
+form {
+  margin: 0;
+}
+
+input, button {
+  vertical-align: middle;
+}
+
+div p {
+  margin: 0;
+  padding: 0;
+}
+
+img {
+  border-style: none;
+  vertical-align: middle;
+}
+
+h3, h4, h5, h6 {
+  margin: 0;
+}
+
+/* Misc table elements */
+
+td.centered {
+  text-align: center;
+}
+
+td.additionaltools {
+  color: black;
+  text-align: right;
+}
+
+td.even {
+  color: black;
+  background-color: #e3e0e3;
+  text-align: left;
+}
+
+td.odd {
+  color: black;
+  background-color: #f0f0f0;
+  text-align: left;
+}
+
+.chapo {
+  text-align: justify;
+  padding-bottom: 5px;
+}
+
+/* Forms */
+
+input, select, textarea, button {
+  font: 11px Verdana, Arial, sans-serif !important;
+  color:  Black;
+  background-color: white;
+}
+
+.formmeta {
+  font: 800 12px Arial, sans-serif !important;
+  color: White; 
+  background-color: #6699cc;
+  padding: 5px 10px 1px 5px;
+  text-align:right;
+  vertical-align: top;
+}
+
+.fileview {
+  border: 1px solid #999999;
+  background-color: #f0f0f0;
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+
+.statusmessage {
+  background-color: #e9e9ff;
+  border: 1px dotted #ccc;
+  padding: 10px;
+  font-weight: bold;
+  margin: 10px;
+}
+</dtml-let>
Index: WAeUP_SRP/trunk/skins/waeup_design/common2.css.dtml
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/common2.css.dtml	(revision 1737)
+++ WAeUP_SRP/trunk/skins/waeup_design/common2.css.dtml	(revision 1737)
@@ -0,0 +1,565 @@
+<dtml-let base_url="getBaseUrl()">
+html, body {
+height:100%;
+}
+input, textarea, select, button {
+background-color:white;
+margin:0pt;
+}
+
+input, button {
+padding:3px;
+}
+
+.fileview {
+padding:3px;
+}
+.statusmessage {
+margin-bottom:9px;
+padding:3px;
+}
+input.SearchBox {
+background:white url(http://localhost:8080/cpsskins/cpsskins_images/search_icon.png) no-repeat scroll left center;
+border:1px inset #757575;
+padding:2px 2px 2px 20px;
+}
+div.searchField {
+background:transparent url(http://localhost:8080/cpsskins/cpsskins_images/portlet_search_icon.png) no-repeat scroll left center;
+padding:2px 2px 2px 20px;
+}
+.toggle_icon {
+clear:left;
+float:left;
+padding:2px 0pt 0pt 3px;
+}
+.missing_toggle {
+padding:0pt 0pt 0pt 13px;
+}
+.tree_node {
+padding:0pt 0pt 0pt 8px;
+}
+.tree_leaf {
+padding:0pt 0pt 0pt 22px;
+}
+.action_icon {
+clear:left;
+float:left;
+padding:0pt 6px 0pt 0pt;
+}
+.cpsskinsBox ul.cpsskinsMenu, .cpsskinsBox ul.cpsskinsMenu li {
+display:inline;
+line-height:normal;
+list-style-type:none;
+margin:0px;
+padding:0px;
+}
+.cpsskinsBox ul.cpsskinsMenu li a {
+background-position:left top;
+background-repeat:no-repeat;
+display:block;
+}
+.cpsskinsBox ul.cpsskinsMenu li a.noicon, .cpsskinsBox ul.cpsskinsMenu li.selected a.noicon {
+background-image:none !important;
+padding-left:2px !important;
+}
+.cpsskinsBox ul.cpsskinsMenu li a span.itemDescription {
+display:block;
+font-size:85%;
+}
+
+.cpsskinsTab ul.cpsskinsMenu, .cpsskinsTab ul.cpsskinsMenu li {
+display:inline;
+line-height:normal;
+list-style-type:none;
+margin:0px;
+padding:0px;
+}
+.cpsskinsTab ul.cpsskinsMenu li a {
+background-position:left center;
+background-repeat:no-repeat;
+display:inline;
+}
+.cpsskinsTab ul.cpsskinsMenu span.itemDescription {
+display:none;
+}
+.cpsskinsTab div.xmlExportButtons {
+display:none;
+}
+.cpsskinsBox .buttons {
+display:block;
+padding-bottom:1px;
+padding-right:1px;
+padding-top:1px;
+}
+.cpsskinsBox .buttons a {
+float:right;
+}
+.cpsskinsTabs {
+float:left;
+line-height:normal;
+text-align:left;
+width:100%;
+}
+.cpsskinsTabs ul {
+list-style-image:none;
+list-style-position:outside;
+list-style-type:none;
+margin:0pt;
+padding:0pt;
+}
+.cpsskinsTabs li {
+float:left;
+margin:0pt;
+padding:0pt;
+position:relative;
+}
+.cpsskinsTabs a {
+display:block;
+float:left;
+margin-left:0pt !important;
+text-decoration:none;
+}
+.cpsskinsTabs a {
+float:none;
+}
+.cpsskinsTabs ul.cpsskinsMenu span.itemDescription {
+display:none;
+}
+.cpsskinsTabs div.xmlExportButtons {
+display:none;
+}
+.cpsskinsTabs li ul {
+display:none;
+left:0pt;
+position:absolute;
+}
+.cpsskinsTabs li > ul {
+left:auto;
+top:auto;
+}
+.cpsskinsTabs li:hover ul, .cpsskinsTabs li.over ul {
+display:block;
+}
+.cpsskinsBoxCorners .rbtop div {
+left:-2px;
+position:relative;
+width:100%;
+}
+.cpsskinsBoxCorners .rbtop {
+position:relative;
+right:-1px;
+top:-1px;
+width:100%;
+}
+.cpsskinsBoxCorners .rbbot div {
+left:-2px;
+position:relative;
+width:100%;
+}
+.cpsskinsBoxCorners .rbbot {
+bottom:-1px;
+position:relative;
+right:-1px;
+width:100%;
+}
+.hidden {
+display:none;
+}
+.cpsskinsHBox {
+margin:3px;
+}
+.cpsskinsHBox ul.cpsskinsMenu, .cpsskinsHBox ul.cpsskinsMenu li {
+display:inline;
+line-height:normal;
+list-style-type:none;
+padding:3px 0pt 2px;
+}
+* html .cpsskinsHBox ul.cpsskinsMenu {
+padding:0px;
+}
+* html .cpsskinsHBox ul.cpsskinsMenu li {
+padding:0px;
+}
+.cpsskinsHBox ul.cpsskinsMenu li a {
+background-position:left top;
+background-repeat:no-repeat;
+display:inline;
+margin-left:0pt !important;
+}
+.cpsskinsHBox ul.cpsskinsMenu span.itemDescription {
+display:none;
+}
+.cpsskinsHBox div.xmlExportButtons {
+display:none;
+}
+
+.portalTabTabStyle ul.cpsskinsMenu li {
+margin:0pt 2px 0pt 0pt;
+}
+.portalTabTabStyle ul.cpsskinsMenu li a {
+padding:3px 2px;
+}
+
+.fontShapeaverage {
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:12px !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+}
+.fontShapeaverage p {
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:100% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+padding:5px 10px 0px 0px;
+}
+.fontShapeaverage small {
+}
+
+.fontShapeaverage h2, .fontShapeaverage .h2 {
+border-style:none;
+border-width:0px;
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:150% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+margin:10px 0px 5px;
+padding:0px;
+}
+
+.fontShapeaverage h3, .fontShapeaverage .h3 {
+border-style:none;
+border-width:0px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:125% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+
+.fontShapeaverage a, .fontShapeaverage a div, .fontShapeaverage a span {
+text-decoration:none;
+}
+.fontShapeaverage a:visited, .fontShapeaverage a:visited div, .fontShapeaverage a:visited span {
+text-decoration:none;
+}
+.fontShapeaverage a:active, .fontShapeaverage a:active div, .fontShapeaverage a:active span {
+text-decoration:underline overline;
+}
+.fontShapeaverage a:hover, .fontShapeaverage a:hover div, .fontShapeaverage a:hover span {
+text-decoration:underline;
+}
+
+
+.fontColordefaultfontcolors h3, .fontColordefaultfontcolors .h3 {
+border-color:#666666;
+color:#666666;
+}
+
+.fontColordefaultfontcolors a, .fontColordefaultfontcolors a div, .fontColordefaultfontcolors a span {
+color:#0066CC;
+}
+.fontColordefaultfontcolors a:visited, .fontColordefaultfontcolors a:visited div, .fontColordefaultfontcolors a:visited span {
+color:#003399;
+}
+.fontColordefaultfontcolors a:active, .fontColordefaultfontcolors a:active div, .fontColordefaultfontcolors a:active span {
+color:blue;
+}
+.fontColordefaultfontcolors a:hover, .fontColordefaultfontcolors a:hover div, .fontColordefaultfontcolors a:hover span {
+color:#0066CC;
+}
+
+.boxShapenavbox .title {
+border-style:none;
+border-width:0px;
+display:inline;
+font-family:arial,sans-serif,Verdana,Helvetica;
+font-size:12px;
+font-size-adjust:none;
+font-stretch:normal;
+font-style:normal;
+font-variant:normal;
+font-weight:bold;
+line-height:normal;
+padding:0px;
+}
+.boxShapenavbox .body {
+border-style:solid;
+border-width:0px;
+padding:10px 0pt 0pt;
+}
+.boxShapenavbox .body ul.cpsskinsMenu li a {
+border-style:none;
+border-width:0px;
+margin:1px 3px;
+padding:1px 0px 1px 21px;
+}
+.boxShapenavbox .body ul.cpsskinsMenu li.selected a {
+border-style:solid;
+border-width:0px;
+margin:0px 3px;
+padding:1px 0px 1px 21px;
+}
+.boxColornavbox .title {
+background-color:transparent;
+border-color:transparent;
+color:#666666;
+}
+.boxColornavbox .title a {
+color:#666666;
+}
+.boxColornavbox .body {
+background-color:transparent;
+border-color:transparent;
+}
+.boxColornavbox .body ul.cpsskinsMenu li a {
+border-color:transparent;
+}
+.boxColornavbox .body ul.cpsskinsMenu li.selected a {
+border-color:transparent;
+}
+.boxColornavbox .body ul.cpsskinsMenu li a {
+background-color:transparent;
+}
+.boxColornavbox .body ul.cpsskinsMenu li a:hover, .boxColornavbox .body ul.cpsskinsMenu li.selected a {
+background-color:#F1F2F3;
+}
+
+.colorfontcolorgray {
+background-color:transparent;
+border-color:transparent;
+color:#666666;
+}
+.fontColordefaultnovisitedlinks h1, .fontColordefaultnovisitedlinks .h1 {
+border-color:#666666;
+color:Black;
+}
+.fontColordefaultnovisitedlinks h2, .fontColordefaultnovisitedlinks .h2 {
+border-color:#666666;
+color:Black;
+}
+.fontColordefaultnovisitedlinks h3, .fontColordefaultnovisitedlinks .h3 {
+border-color:#666666;
+color:Black;
+}
+.fontColordefaultnovisitedlinks h4, .fontColordefaultnovisitedlinks .h4, .fontColordefaultnovisitedlinks h5, .fontColordefaultnovisitedlinks .h5, .fontColordefaultnovisitedlinks h6, .fontColordefaultnovisitedlinks .h6 {
+border-color:#666666;
+color:Black;
+}
+.fontColordefaultnovisitedlinks a, .fontColordefaultnovisitedlinks a div, .fontColordefaultnovisitedlinks a span {
+color:#0066CC;
+}
+.fontColordefaultnovisitedlinks a:visited, .fontColordefaultnovisitedlinks a:visited div, .fontColordefaultnovisitedlinks a:visited span {
+color:#0066CC;
+}
+.fontColordefaultnovisitedlinks a:active, .fontColordefaultnovisitedlinks a:active div, .fontColordefaultnovisitedlinks a:active span {
+color:blue;
+}
+.fontColordefaultnovisitedlinks a:hover, .fontColordefaultnovisitedlinks a:hover div, .fontColordefaultnovisitedlinks a:hover span {
+color:#0066CC;
+}
+
+.portalTabPortalTabStyleuseractions ul.cpsskinsMenu li {
+margin:0pt 5px 0pt 0pt;
+}
+.portalTabPortalTabStyleuseractions ul.cpsskinsMenu li a {
+padding:1px 0px;
+}
+
+.shapeAreaShape5 {
+border-style:solid;
+border-width:0px 1px 1px 0px;
+text-transform:none;
+}
+.shapeAreaShape {
+border-style:solid;
+border-width:1px;
+text-transform:none;
+}
+.shapeAreaShape9 {
+border-style:solid;
+border-width:1px 0px 0px 1px;
+text-transform:none;
+}
+
+.fontColornavigation h1, .fontColornavigation .h1 {
+border-color:#666666;
+color:Black;
+}
+.fontColornavigation h2, .fontColornavigation .h2 {
+border-color:#666666;
+color:Black;
+}
+.fontColornavigation h3, .fontColornavigation .h3 {
+border-color:#666666;
+color:Black;
+}
+.fontColornavigation h4, .fontColornavigation .h4, .fontColornavigation h5, .fontColornavigation .h5, .fontColornavigation h6, .fontColornavigation .h6 {
+border-color:#666666;
+color:Black;
+}
+.fontColornavigation a, .fontColornavigation a div, .fontColornavigation a span {
+color:black;
+}
+.fontColornavigation a:visited, .fontColornavigation a:visited div, .fontColornavigation a:visited span {
+color:black;
+}
+.fontColornavigation a:active, .fontColornavigation a:active div, .fontColornavigation a:active span {
+color:black;
+}
+.fontColornavigation a:hover, .fontColornavigation a:hover div, .fontColornavigation a:hover span {
+color:black;
+}
+.fontShapenavigation {
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:12px !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+}
+.fontShapenavigation p {
+font-family:Arial,Verdana,Helvetica,sans-serif !important;
+font-size:100% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+}
+
+.fontShapenavigation h3, .fontShapenavigation .h3 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:120% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+
+.fontShapenavigation a, .fontShapenavigation a div, .fontShapenavigation a span {
+text-decoration:none;
+}
+.fontShapenavigation a:visited, .fontShapenavigation a:visited div, .fontShapenavigation a:visited span {
+text-decoration:none;
+}
+.fontShapenavigation a:active, .fontShapenavigation a:active div, .fontShapenavigation a:active span {
+text-decoration:none;
+}
+.fontShapenavigation a:hover, .fontShapenavigation a:hover div, .fontShapenavigation a:hover span {
+text-decoration:underline;
+}
+
+.fontShapeTitleindex {
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:13px !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+}
+.fontShapeTitleindex p {
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:100% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+padding:0em;
+}
+.fontShapeTitleindex h1, .fontShapeTitleindex .h1 {
+border-style:none;
+border-width:0px;
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:150% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+margin:0px;
+padding:0px;
+}
+.fontShapeTitleindex h2, .fontShapeTitleindex .h2 {
+border-style:none;
+border-width:0pt;
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:150% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+.fontShapeTitleindex h3, .fontShapeTitleindex .h3 {
+border-style:none;
+border-width:0pt;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:125% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+.fontShapeTitleindex h4, .fontShapeTitleindex .h4, .fontShapeTitleindex h5, .fontShapeTitleindex .h5, .fontShapeTitleindex h6, .fontShapeTitleindex .h6 {
+border-style:none;
+border-width:0pt;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:100% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.4em 0em 0em;
+}
+.fontShapeTitleindex a, .fontShapeTitleindex a div, .fontShapeTitleindex a span {
+text-decoration:none;
+}
+.fontShapeTitleindex a:visited, .fontShapeTitleindex a:visited div, .fontShapeTitleindex a:visited span {
+text-decoration:none;
+}
+.fontShapeTitleindex a:active, .fontShapeTitleindex a:active div, .fontShapeTitleindex a:active span {
+text-decoration:underline overline;
+}
+.fontShapeTitleindex a:hover, .fontShapeTitleindex a:hover div, .fontShapeTitleindex a:hover span {
+text-decoration:underline;
+}
+
+
+</dtml-let>
Index: WAeUP_SRP/trunk/skins/waeup_design/common2.css.dtml_backup
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/common2.css.dtml_backup	(revision 1737)
+++ WAeUP_SRP/trunk/skins/waeup_design/common2.css.dtml_backup	(revision 1737)
@@ -0,0 +1,1257 @@
+<dtml-let base_url="getBaseUrl()">
+html, body {
+height:100%;
+}
+input, textarea, select, button {
+background-color:white;
+margin:0pt;
+}
+input {
+border:1px inset #757575;
+}
+input, button {
+padding:3px;
+}
+input[type="radio"], input[type="checkbox"] {
+border:medium none;
+}
+.fileview {
+padding:3px;
+}
+.statusmessage {
+margin-bottom:9px;
+padding:3px;
+}
+input.SearchBox {
+background:white url(http://localhost:8080/cpsskins/cpsskins_images/search_icon.png) no-repeat scroll left center;
+border:1px inset #757575;
+padding:2px 2px 2px 20px;
+}
+div.searchField {
+background:transparent url(http://localhost:8080/cpsskins/cpsskins_images/portlet_search_icon.png) no-repeat scroll left center;
+padding:2px 2px 2px 20px;
+}
+.toggle_icon {
+clear:left;
+float:left;
+padding:2px 0pt 0pt 3px;
+}
+.missing_toggle {
+padding:0pt 0pt 0pt 13px;
+}
+.tree_node {
+padding:0pt 0pt 0pt 8px;
+}
+.tree_leaf {
+padding:0pt 0pt 0pt 22px;
+}
+.action_icon {
+clear:left;
+float:left;
+padding:0pt 6px 0pt 0pt;
+}
+.cpsskinsBox ul.cpsskinsMenu, .cpsskinsBox ul.cpsskinsMenu li {
+display:inline;
+line-height:normal;
+list-style-type:none;
+margin:0px;
+padding:0px;
+}
+.cpsskinsBox ul.cpsskinsMenu li a {
+background-position:left top;
+background-repeat:no-repeat;
+display:block;
+}
+.cpsskinsBox ul.cpsskinsMenu li a.noicon, .cpsskinsBox ul.cpsskinsMenu li.selected a.noicon {
+background-image:none !important;
+padding-left:2px !important;
+}
+.cpsskinsBox ul.cpsskinsMenu li a span.itemDescription {
+display:block;
+font-size:85%;
+}
+div.xmlExportButtons {
+padding-top:1em;
+text-align:right;
+}
+div.xmlExportButtons a {
+background:#FF6600 none repeat scroll 0%;
+border:0.1em outset #FF6600;
+color:#FFFFFF !important;
+font-family:'Lucida Grande',Arial,Helvetica,sans-serif !important;
+font-size:70% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+margin:0pt 0.1em;
+padding:0pt 0.3em;
+text-decoration:none;
+}
+.cpsskinsTab ul.cpsskinsMenu, .cpsskinsTab ul.cpsskinsMenu li {
+display:inline;
+line-height:normal;
+list-style-type:none;
+margin:0px;
+padding:0px;
+}
+.cpsskinsTab ul.cpsskinsMenu li a {
+background-position:left center;
+background-repeat:no-repeat;
+display:inline;
+}
+.cpsskinsTab ul.cpsskinsMenu span.itemDescription {
+display:none;
+}
+.cpsskinsTab div.xmlExportButtons {
+display:none;
+}
+.cpsskinsBox .buttons {
+display:block;
+padding-bottom:1px;
+padding-right:1px;
+padding-top:1px;
+}
+.cpsskinsBox .buttons a {
+float:right;
+}
+.cpsskinsTabs {
+float:left;
+line-height:normal;
+text-align:left;
+width:100%;
+}
+.cpsskinsTabs ul {
+list-style-image:none;
+list-style-position:outside;
+list-style-type:none;
+margin:0pt;
+padding:0pt;
+}
+.cpsskinsTabs li {
+float:left;
+margin:0pt;
+padding:0pt;
+position:relative;
+}
+.cpsskinsTabs a {
+display:block;
+float:left;
+margin-left:0pt !important;
+text-decoration:none;
+}
+.cpsskinsTabs a {
+float:none;
+}
+.cpsskinsTabs ul.cpsskinsMenu span.itemDescription {
+display:none;
+}
+.cpsskinsTabs div.xmlExportButtons {
+display:none;
+}
+.cpsskinsTabs li ul {
+display:none;
+left:0pt;
+position:absolute;
+}
+.cpsskinsTabs li > ul {
+left:auto;
+top:auto;
+}
+.cpsskinsTabs li:hover ul, .cpsskinsTabs li.over ul {
+display:block;
+}
+.cpsskinsBoxCorners .rbtop div {
+left:-2px;
+position:relative;
+width:100%;
+}
+.cpsskinsBoxCorners .rbtop {
+position:relative;
+right:-1px;
+top:-1px;
+width:100%;
+}
+.cpsskinsBoxCorners .rbbot div {
+left:-2px;
+position:relative;
+width:100%;
+}
+.cpsskinsBoxCorners .rbbot {
+bottom:-1px;
+position:relative;
+right:-1px;
+width:100%;
+}
+.hidden {
+display:none;
+}
+.cpsskinsHBox {
+margin:3px;
+}
+.cpsskinsHBox ul.cpsskinsMenu, .cpsskinsHBox ul.cpsskinsMenu li {
+display:inline;
+line-height:normal;
+list-style-type:none;
+padding:3px 0pt 2px;
+}
+* html .cpsskinsHBox ul.cpsskinsMenu {
+padding:0px;
+}
+* html .cpsskinsHBox ul.cpsskinsMenu li {
+padding:0px;
+}
+.cpsskinsHBox ul.cpsskinsMenu li a {
+background-position:left top;
+background-repeat:no-repeat;
+display:inline;
+margin-left:0pt !important;
+}
+.cpsskinsHBox ul.cpsskinsMenu span.itemDescription {
+display:none;
+}
+.cpsskinsHBox div.xmlExportButtons {
+display:none;
+}
+
+.colorHeadersideleft {
+background-color:#FFCA31;
+background-image:url(<dtml-var base_url>backgrounds/header_side_left.png);
+background-position:right top;
+background-repeat:repeat-y;
+border-color:transparent;
+color:#000000;
+}
+.colorHeadersideright {
+background-color:#FFCA31;
+background-image:url(<dtml-var base_url>backgrounds/header_side_right.png);
+background-position:left top;
+background-repeat:repeat-y;
+border-color:transparent;
+color:#000000;
+}
+.colorMainsideleft {
+background-color:gray;
+background-image:url(<dtml-var base_url>backgrounds/main_side_left.png);
+background-position:right top;
+background-repeat:repeat-y;
+border-color:transparent;
+color:#000000;
+}
+.colorMainsideright {
+background-color:gray;
+background-image:url(<dtml-var base_url>backgrounds/main_side_right.png);
+background-repeat:repeat-y;
+border-color:transparent;
+color:#000000;
+}
+.colorHeadercandybarbackground {
+background-color:#FF9900;
+background-image:url(<dtml-var base_url>backgrounds/header_background.png);
+background-repeat:repeat-x;
+color:#000000;
+}
+.portalTabTabStyle ul.cpsskinsMenu li {
+margin:0pt 2px 0pt 0pt;
+}
+.portalTabTabStyle ul.cpsskinsMenu li a {
+padding:3px 2px;
+}
+
+.colorFootergradient {
+background-color:#E7E7E7;
+background-image:url(<dtml-var base_url>backgrounds/footer_gradient.png);
+background-position:left bottom;
+background-repeat:repeat-x;
+border-color:transparent;
+color:#000000;
+}
+.colorgraye7 {
+background-color:#E7E7E7;
+background-repeat:repeat;
+border-color:transparent;
+color:#000000;
+}
+.fontShapeaverage {
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:12px !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+}
+.fontShapeaverage p {
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:100% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+padding:5px 10px 0px 0px;
+}
+.fontShapeaverage small {
+}
+.fontShapeaverage h1, .fontShapeaverage .h1 {
+border-style:none;
+border-width:0px;
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:185% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+margin:0px;
+padding:0px;
+}
+.fontShapeaverage h2, .fontShapeaverage .h2 {
+border-style:none;
+border-width:0px;
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:150% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+margin:10px 0px 5px;
+padding:0px;
+}
+.fontShapeaverage h3, .fontShapeaverage .h3 {
+border-style:none;
+border-width:0px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:125% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+.fontShapeaverage h4, .fontShapeaverage .h4, .fontShapeaverage h5, .fontShapeaverage .h5, .fontShapeaverage h6, .fontShapeaverage .h6 {
+border-style:none;
+border-width:0pt;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:100% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+margin:10px 0px 5px;
+padding:0px;
+}
+.fontShapeaverage a, .fontShapeaverage a div, .fontShapeaverage a span {
+text-decoration:none;
+}
+.fontShapeaverage a:visited, .fontShapeaverage a:visited div, .fontShapeaverage a:visited span {
+text-decoration:none;
+}
+.fontShapeaverage a:active, .fontShapeaverage a:active div, .fontShapeaverage a:active span {
+text-decoration:underline overline;
+}
+.fontShapeaverage a:hover, .fontShapeaverage a:hover div, .fontShapeaverage a:hover span {
+text-decoration:underline;
+}
+.fontShapemini {
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:10px !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+}
+.fontShapemini p {
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:100% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+padding:0em;
+}
+.fontShapemini h1, .fontShapemini .h1 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:150% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+padding:0.8em 0em 0em;
+}
+.fontShapemini h2, .fontShapemini .h2 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:125% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+.fontShapemini h3, .fontShapemini .h3 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:120% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+.fontShapemini h4, .fontShapemini .h4, .fontShapemini h5, .fontShapemini .h5, .fontShapemini h6, .fontShapemini .h6 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:115% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.4em 0em 0em;
+}
+.fontShapemini a, .fontShapemini a div, .fontShapemini a span {
+text-decoration:none;
+}
+.fontShapemini a:visited, .fontShapemini a:visited div, .fontShapemini a:visited span {
+text-decoration:none;
+}
+.fontShapemini a:active, .fontShapemini a:active div, .fontShapemini a:active span {
+text-decoration:underline overline;
+}
+.fontShapemini a:hover, .fontShapemini a:hover div, .fontShapemini a:hover span {
+text-decoration:underline;
+}
+.colorNavboxstyle {
+background-color:#FFFFFF;
+background-image:url(<dtml-var base_url>backgrounds/whitemaintop.png);
+background-position:left bottom;
+background-repeat:no-repeat;
+border-color:transparent;
+color:#000000;
+}
+.boxShapeextraleftboxes .title {
+border-style:none;
+border-width:0pt;
+display:inline;
+font-family:arial,sans-serif,Verdana,Helvetica;
+font-size:12px;
+font-size-adjust:none;
+font-stretch:normal;
+font-style:normal;
+font-variant:normal;
+font-weight:bold;
+line-height:normal;
+padding:30px 10px 5px 5px;
+}
+.boxShapeextraleftboxes .body {
+border-style:none none solid;
+border-width:1px;
+padding:5px 5px 10px;
+}
+.boxShapeextraleftboxes .body ul.cpsskinsMenu li a {
+border-style:none;
+border-width:0pt;
+margin:0pt;
+padding:2px;
+}
+.boxShapeextraleftboxes .body ul.cpsskinsMenu li.selected a {
+border-style:none;
+border-width:0pt;
+margin:0pt;
+padding:0px;
+}
+.boxColorextraleftboxes .title {
+background-color:transparent;
+border-color:transparent;
+color:#666666;
+}
+.boxColorextraleftboxes .title a {
+color:#666666;
+}
+.boxColorextraleftboxes .body {
+background-color:transparent;
+border-color:#BCBCBC;
+}
+.boxColorextraleftboxes .body ul.cpsskinsMenu li a {
+border-color:transparent;
+}
+.boxColorextraleftboxes .body ul.cpsskinsMenu li.selected a {
+border-color:transparent;
+}
+.boxColorextraleftboxes .body ul.cpsskinsMenu li a {
+background-color:transparent;
+}
+.boxColorextraleftboxes .body ul.cpsskinsMenu li a:hover, .boxColorextraleftboxes .body ul.cpsskinsMenu li.selected a {
+background-color:transparent;
+}
+.boxColorextraleftboxes .body ul.cpsskinsMenu li a {
+background-image:url(<dtml-var base_url>images/blakbullet.png);
+padding-left:20px !important;
+}
+.boxColorextraleftboxes .body ul.cpsskinsMenu li.selected a {
+background-image:url(<dtml-var base_url>images/blakbullet.png);
+padding-left:20px !important;
+}
+.fontColordefaultfontcolors h1, .fontColordefaultfontcolors .h1 {
+border-color:#666666;
+color:#4E4E4E;
+}
+.fontColordefaultfontcolors h2, .fontColordefaultfontcolors .h2 {
+border-color:#666666;
+color:#525252;
+}
+.fontColordefaultfontcolors h3, .fontColordefaultfontcolors .h3 {
+border-color:#666666;
+color:#666666;
+}
+.fontColordefaultfontcolors h4, .fontColordefaultfontcolors .h4, .fontColordefaultfontcolors h5, .fontColordefaultfontcolors .h5, .fontColordefaultfontcolors h6, .fontColordefaultfontcolors .h6 {
+border-color:#666666;
+color:Black;
+}
+.fontColordefaultfontcolors a, .fontColordefaultfontcolors a div, .fontColordefaultfontcolors a span {
+color:#0066CC;
+}
+.fontColordefaultfontcolors a:visited, .fontColordefaultfontcolors a:visited div, .fontColordefaultfontcolors a:visited span {
+color:#003399;
+}
+.fontColordefaultfontcolors a:active, .fontColordefaultfontcolors a:active div, .fontColordefaultfontcolors a:active span {
+color:blue;
+}
+.fontColordefaultfontcolors a:hover, .fontColordefaultfontcolors a:hover div, .fontColordefaultfontcolors a:hover span {
+color:#0066CC;
+}
+.colorAreaColormain {
+background-color:#E7E7E7;
+background-image:url(<dtml-var base_url>backgrounds/whitemaintop.png);
+background-position:left top;
+background-repeat:repeat-x;
+border-color:#BCBCBC;
+color:#333333;
+}
+.colormainlittlecorner {
+background-color:#E7E7E7;
+background-image:url(<dtml-var base_url>backgrounds/little_main_corner_e7_20px.png);
+background-position:left top;
+background-repeat:no-repeat;
+border-color:transparent;
+color:#666666;
+}
+.colormainleftborder {
+background-color:white;
+background-image:url(<dtml-var base_url>backgrounds/bc_pixel.png);
+background-position:left top;
+background-repeat:repeat-y;
+border-color:#BCBCBC;
+color:#000000;
+}
+.colormaintopcorner {
+background-color:#FFFFFF;
+background-image:url(<dtml-var base_url>backgrounds/main_top_corner.png);
+background-position:left top;
+background-repeat:no-repeat;
+border-color:transparent;
+color:#333333;
+}
+.boxShapeobjectactions .title {
+border-style:none solid none none;
+border-width:1px;
+display:inline;
+font-family:arial,sans-serif;
+font-size:12px;
+font-size-adjust:none;
+font-stretch:normal;
+font-style:normal;
+font-variant:normal;
+font-weight:normal;
+line-height:normal;
+padding:0pt;
+}
+.boxShapeobjectactions .body {
+border-style:none;
+border-width:1px;
+padding:0px;
+}
+.boxShapeobjectactions .body ul.cpsskinsMenu li a {
+border-style:none;
+border-width:0px;
+padding:5px;
+}
+.boxShapeobjectactions .body ul.cpsskinsMenu li.selected a {
+border-style:none solid;
+border-width:1px;
+padding:5px;
+}
+.boxColorobjectactions .title {
+background-color:#D0D0D0;
+border-color:#999999;
+color:Black;
+}
+.boxColorobjectactions .title a {
+color:Black;
+}
+.boxColorobjectactions .body {
+background-color:transparent;
+border-color:#BCBCBC;
+}
+.boxColorobjectactions .body ul.cpsskinsMenu li a {
+border-color:transparent;
+}
+.boxColorobjectactions .body ul.cpsskinsMenu li.selected a {
+border-color:transparent;
+}
+.boxColorobjectactions .body ul.cpsskinsMenu li a {
+background-color:transparent;
+}
+.boxColorobjectactions .body ul.cpsskinsMenu li a:hover, .boxColorobjectactions .body ul.cpsskinsMenu li.selected a {
+background-color:#F1F2F3;
+}
+.boxShapenavbox .title {
+border-style:none;
+border-width:0px;
+display:inline;
+font-family:arial,sans-serif,Verdana,Helvetica;
+font-size:12px;
+font-size-adjust:none;
+font-stretch:normal;
+font-style:normal;
+font-variant:normal;
+font-weight:bold;
+line-height:normal;
+padding:0px;
+}
+.boxShapenavbox .body {
+border-style:solid;
+border-width:0px;
+padding:10px 0pt 0pt;
+}
+.boxShapenavbox .body ul.cpsskinsMenu li a {
+border-style:none;
+border-width:0px;
+margin:1px 3px;
+padding:1px 0px 1px 21px;
+}
+.boxShapenavbox .body ul.cpsskinsMenu li.selected a {
+border-style:solid;
+border-width:0px;
+margin:0px 3px;
+padding:1px 0px 1px 21px;
+}
+.boxColornavbox .title {
+background-color:transparent;
+border-color:transparent;
+color:#666666;
+}
+.boxColornavbox .title a {
+color:#666666;
+}
+.boxColornavbox .body {
+background-color:transparent;
+border-color:transparent;
+}
+.boxColornavbox .body ul.cpsskinsMenu li a {
+border-color:transparent;
+}
+.boxColornavbox .body ul.cpsskinsMenu li.selected a {
+border-color:transparent;
+}
+.boxColornavbox .body ul.cpsskinsMenu li a {
+background-color:transparent;
+}
+.boxColornavbox .body ul.cpsskinsMenu li a:hover, .boxColornavbox .body ul.cpsskinsMenu li.selected a {
+background-color:#F1F2F3;
+}
+.fontColormini h1, .fontColormini .h1 {
+border-color:#666666;
+color:Black;
+}
+.fontColormini h2, .fontColormini .h2 {
+border-color:#666666;
+color:Black;
+}
+.fontColormini h3, .fontColormini .h3 {
+border-color:#666666;
+color:Black;
+}
+.fontColormini h4, .fontColormini .h4, .fontColormini h5, .fontColormini .h5, .fontColormini h6, .fontColormini .h6 {
+border-color:#666666;
+color:Black;
+}
+.fontColormini a, .fontColormini a div, .fontColormini a span {
+color:#0066CC;
+}
+.fontColormini a:visited, .fontColormini a:visited div, .fontColormini a:visited span {
+color:#003399;
+}
+.fontColormini a:active, .fontColormini a:active div, .fontColormini a:active span {
+color:blue;
+}
+.fontColormini a:hover, .fontColormini a:hover div, .fontColormini a:hover span {
+color:#0066CC;
+}
+.colorfontcolorgray {
+background-color:transparent;
+border-color:transparent;
+color:#666666;
+}
+.fontColordefaultnovisitedlinks h1, .fontColordefaultnovisitedlinks .h1 {
+border-color:#666666;
+color:Black;
+}
+.fontColordefaultnovisitedlinks h2, .fontColordefaultnovisitedlinks .h2 {
+border-color:#666666;
+color:Black;
+}
+.fontColordefaultnovisitedlinks h3, .fontColordefaultnovisitedlinks .h3 {
+border-color:#666666;
+color:Black;
+}
+.fontColordefaultnovisitedlinks h4, .fontColordefaultnovisitedlinks .h4, .fontColordefaultnovisitedlinks h5, .fontColordefaultnovisitedlinks .h5, .fontColordefaultnovisitedlinks h6, .fontColordefaultnovisitedlinks .h6 {
+border-color:#666666;
+color:Black;
+}
+.fontColordefaultnovisitedlinks a, .fontColordefaultnovisitedlinks a div, .fontColordefaultnovisitedlinks a span {
+color:#0066CC;
+}
+.fontColordefaultnovisitedlinks a:visited, .fontColordefaultnovisitedlinks a:visited div, .fontColordefaultnovisitedlinks a:visited span {
+color:#0066CC;
+}
+.fontColordefaultnovisitedlinks a:active, .fontColordefaultnovisitedlinks a:active div, .fontColordefaultnovisitedlinks a:active span {
+color:blue;
+}
+.fontColordefaultnovisitedlinks a:hover, .fontColordefaultnovisitedlinks a:hover div, .fontColordefaultnovisitedlinks a:hover span {
+color:#0066CC;
+}
+.fontShapeactions {
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:9px !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+}
+.fontShapeactions p {
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:100% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+padding:0em;
+}
+.fontShapeactions h1, .fontShapeactions .h1 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:150% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+padding:0.8em 0em 0em;
+}
+.fontShapeactions h2, .fontShapeactions .h2 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:125% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+.fontShapeactions h3, .fontShapeactions .h3 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:120% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+.fontShapeactions h4, .fontShapeactions .h4, .fontShapeactions h5, .fontShapeactions .h5, .fontShapeactions h6, .fontShapeactions .h6 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:115% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.4em 0em 0em;
+}
+.fontShapeactions a, .fontShapeactions a div, .fontShapeactions a span {
+text-decoration:none;
+}
+.fontShapeactions a:visited, .fontShapeactions a:visited div, .fontShapeactions a:visited span {
+text-decoration:none;
+}
+.fontShapeactions a:active, .fontShapeactions a:active div, .fontShapeactions a:active span {
+text-decoration:underline;
+}
+.fontShapeactions a:hover, .fontShapeactions a:hover div, .fontShapeactions a:hover span {
+text-decoration:none;
+}
+.boxCornerRoundedBoxCorners {
+background-color:white;
+border:1px solid #BCBCBC;
+}
+.boxCornerRoundedBoxCorners .rbtop div {
+background:transparent url(<dtml-var base_url>backgrounds/corner1.png) no-repeat scroll left top;
+height:9px;
+}
+.boxCornerRoundedBoxCorners .rbtop {
+background:transparent url(<dtml-var base_url>backgrounds/corner2.png) no-repeat scroll right top;
+height:9px;
+}
+.boxCornerRoundedBoxCorners .rbbot div {
+background:transparent url(<dtml-var base_url>backgrounds/corner4.png) no-repeat scroll left bottom;
+height:9px;
+}
+.boxCornerRoundedBoxCorners .rbbot {
+background:transparent url(<dtml-var base_url>backgrounds/corner3.png) no-repeat scroll right bottom;
+height:9px;
+}
+.portalTabPortalTabStyleuseractions ul.cpsskinsMenu li {
+margin:0pt 5px 0pt 0pt;
+}
+.portalTabPortalTabStyleuseractions ul.cpsskinsMenu li a {
+padding:1px 0px;
+}
+.colortitlebackground {
+background-color:#1F4485;
+background-image:url(<dtml-var base_url>backgrounds/cps_athens.png);
+background-position:left top;
+background-repeat:no-repeat;
+border-color:transparent;
+color:#000000;
+}
+.boxCornerhalfRoundedBox {
+background-color:#FFFFFF;
+border:1px solid #BCBCBC;
+}
+.boxCornerhalfRoundedBox .rbtop div {
+background:transparent url(<dtml-var base_url>backgrounds/scorner1.png) no-repeat scroll left top;
+height:9px;
+}
+.boxCornerhalfRoundedBox .rbtop {
+background:transparent url(<dtml-var base_url>backgrounds/scorner2.png) no-repeat scroll right top;
+height:9px;
+}
+.boxCornerhalfRoundedBox .rbbot div {
+background:transparent url(<dtml-var base_url>backgrounds/corner4.png) no-repeat scroll left bottom;
+height:9px;
+}
+.boxCornerhalfRoundedBox .rbbot {
+background:transparent url(<dtml-var base_url>backgrounds/corner3.png) no-repeat scroll right bottom;
+height:9px;
+}
+.fontShapeTitleindex {
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:13px !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+}
+.fontShapeTitleindex p {
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:100% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+padding:0em;
+}
+.fontShapeTitleindex h1, .fontShapeTitleindex .h1 {
+border-style:none;
+border-width:0px;
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:150% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+margin:0px;
+padding:0px;
+}
+.fontShapeTitleindex h2, .fontShapeTitleindex .h2 {
+border-style:none;
+border-width:0pt;
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:150% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+.fontShapeTitleindex h3, .fontShapeTitleindex .h3 {
+border-style:none;
+border-width:0pt;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:125% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+.fontShapeTitleindex h4, .fontShapeTitleindex .h4, .fontShapeTitleindex h5, .fontShapeTitleindex .h5, .fontShapeTitleindex h6, .fontShapeTitleindex .h6 {
+border-style:none;
+border-width:0pt;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:100% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.4em 0em 0em;
+}
+.fontShapeTitleindex a, .fontShapeTitleindex a div, .fontShapeTitleindex a span {
+text-decoration:none;
+}
+.fontShapeTitleindex a:visited, .fontShapeTitleindex a:visited div, .fontShapeTitleindex a:visited span {
+text-decoration:none;
+}
+.fontShapeTitleindex a:active, .fontShapeTitleindex a:active div, .fontShapeTitleindex a:active span {
+text-decoration:underline overline;
+}
+.fontShapeTitleindex a:hover, .fontShapeTitleindex a:hover div, .fontShapeTitleindex a:hover span {
+text-decoration:underline;
+}
+.fontColortitleindex h1, .fontColortitleindex .h1 {
+border-color:#666666;
+color:#003399;
+}
+.fontColortitleindex h2, .fontColortitleindex .h2 {
+border-color:#666666;
+color:#454545;
+}
+.fontColortitleindex h3, .fontColortitleindex .h3 {
+border-color:#666666;
+color:#666666;
+}
+.fontColortitleindex h4, .fontColortitleindex .h4, .fontColortitleindex h5, .fontColortitleindex .h5, .fontColortitleindex h6, .fontColortitleindex .h6 {
+border-color:#666666;
+color:Black;
+}
+.fontColortitleindex a, .fontColortitleindex a div, .fontColortitleindex a span {
+color:#0066CC;
+}
+.fontColortitleindex a:visited, .fontColortitleindex a:visited div, .fontColortitleindex a:visited span {
+color:#003399;
+}
+.fontColortitleindex a:active, .fontColortitleindex a:active div, .fontColortitleindex a:active span {
+color:blue;
+}
+.fontColortitleindex a:hover, .fontColortitleindex a:hover div, .fontColortitleindex a:hover span {
+color:#0066CC;
+}
+.boxShapeLatestbox .title {
+border-style:none;
+border-width:0px;
+display:inline;
+font-family:arial,sans-serif;
+font-size:175%;
+font-size-adjust:none;
+font-stretch:normal;
+font-style:normal;
+font-variant:normal;
+font-weight:bold;
+line-height:normal;
+padding:0px 5px 0px 10px;
+}
+.boxShapeLatestbox .body {
+border-style:none;
+border-width:0px;
+padding:10px;
+}
+.boxShapeLatestbox .body ul.cpsskinsMenu li a {
+border-style:none;
+border-width:1px;
+margin:2px;
+padding:2px;
+}
+.boxShapeLatestbox .body ul.cpsskinsMenu li.selected a {
+border-style:none;
+border-width:0px;
+margin:2px;
+padding:2px;
+}
+.boxColortitleindex .title {
+background-color:#FFFFFF;
+border-color:transparent;
+color:#003399;
+}
+.boxColortitleindex .title a {
+color:#003399;
+}
+.boxColortitleindex .body {
+background-color:#FFFFFF;
+border-color:#999999;
+}
+.boxColortitleindex .body ul.cpsskinsMenu li a {
+border-color:#FFFFFF;
+}
+.boxColortitleindex .body ul.cpsskinsMenu li.selected a {
+border-color:transparent;
+}
+.boxColortitleindex .body ul.cpsskinsMenu li a {
+background-color:#FFFFFF;
+}
+.boxColortitleindex .body ul.cpsskinsMenu li a:hover, .boxColortitleindex .body ul.cpsskinsMenu li.selected a {
+background-color:#E7E7E7;
+}
+.boxColortitleindex .body ul.cpsskinsMenu li a {
+background-image:url(<dtml-var base_url>images/blakbullet.png);
+padding-left:20px !important;
+}
+.boxColortitleindex .body ul.cpsskinsMenu li.selected a {
+background-image:url(<dtml-var base_url>images/blakbullet.png);
+padding-left:20px !important;
+}
+.shapeAreaShape1 {
+border-style:solid;
+border-width:1px 0pt 0pt;
+text-transform:none;
+}
+.shapeAreaShape2 {
+border-style:solid;
+border-width:0pt 1px 0pt 0pt;
+text-transform:none;
+}
+.shapeAreaShape3 {
+border-style:solid;
+border-width:0pt 0pt 1px;
+text-transform:none;
+}
+.shapeAreaShape4 {
+border-style:solid;
+border-width:0pt 0pt 0pt 1px;
+text-transform:none;
+}
+.shapeAreaShape5 {
+border-style:solid;
+border-width:0px 1px 1px 0px;
+text-transform:none;
+}
+.colorAreaColor {
+background-color:#FFFFFF;
+background-repeat:repeat;
+border-color:#CBD3D7;
+color:#000000;
+}
+.colorUnibenColor {
+background-color:#D6ACE8;
+border-color:#8900CD;
+color:#000000;
+}
+.shapeAreaShape6 {
+border-style:solid;
+border-width:1px 1px 1px 0px;
+text-transform:none;
+}
+.colorWAeUPColor {
+background-color:#CBD3D7;
+border-color:#CBD3D7;
+color:#000000;
+}
+.shapeAreaShape7 {
+border-style:solid;
+border-width:0px 1px 1px;
+text-transform:none;
+}
+.shapeAreaShape8 {
+border-style:solid;
+border-width:1px 1px 0px;
+text-transform:none;
+}
+.shapeAreaShape {
+border-style:solid;
+border-width:1px;
+text-transform:none;
+}
+.shapeAreaShape9 {
+border-style:solid;
+border-width:1px 0px 0px 1px;
+text-transform:none;
+}
+.shapeAreaShape10 {
+border-style:solid;
+border-width:1px;
+text-transform:none;
+}
+.colorSciAfrColor {
+background-color:#840000;
+border-color:#CCCCCC;
+color:#000000;
+}
+
+.fontColornavigation h1, .fontColornavigation .h1 {
+border-color:#666666;
+color:Black;
+}
+.fontColornavigation h2, .fontColornavigation .h2 {
+border-color:#666666;
+color:Black;
+}
+.fontColornavigation h3, .fontColornavigation .h3 {
+border-color:#666666;
+color:Black;
+}
+.fontColornavigation h4, .fontColornavigation .h4, .fontColornavigation h5, .fontColornavigation .h5, .fontColornavigation h6, .fontColornavigation .h6 {
+border-color:#666666;
+color:Black;
+}
+.fontColornavigation a, .fontColornavigation a div, .fontColornavigation a span {
+color:black;
+}
+.fontColornavigation a:visited, .fontColornavigation a:visited div, .fontColornavigation a:visited span {
+color:black;
+}
+.fontColornavigation a:active, .fontColornavigation a:active div, .fontColornavigation a:active span {
+color:black;
+}
+.fontColornavigation a:hover, .fontColornavigation a:hover div, .fontColornavigation a:hover span {
+color:black;
+}
+.fontShapenavigation {
+font-family:Arial,sans-serif,Verdana,Helvetica !important;
+font-size:12px !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+}
+.fontShapenavigation p {
+font-family:Arial,Verdana,Helvetica,sans-serif !important;
+font-size:100% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+}
+.fontShapenavigation h1, .fontShapenavigation .h1 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:150% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:normal !important;
+line-height:normal !important;
+padding:0.8em 0em 0em;
+}
+.fontShapenavigation h2, .fontShapenavigation .h2 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:125% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+.fontShapenavigation h3, .fontShapenavigation .h3 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:120% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.6em 0em 0em;
+}
+.fontShapenavigation h4, .fontShapenavigation .h4, .fontShapenavigation h5, .fontShapenavigation .h5, .fontShapenavigation h6, .fontShapenavigation .h6 {
+border-style:none;
+border-width:1px;
+font-family:Verdana,Arial,Helvetica,sans-serif !important;
+font-size:115% !important;
+font-size-adjust:none !important;
+font-stretch:normal !important;
+font-style:normal !important;
+font-variant:normal !important;
+font-weight:bold !important;
+line-height:normal !important;
+padding:0.4em 0em 0em;
+}
+.fontShapenavigation a, .fontShapenavigation a div, .fontShapenavigation a span {
+text-decoration:none;
+}
+.fontShapenavigation a:visited, .fontShapenavigation a:visited div, .fontShapenavigation a:visited span {
+text-decoration:none;
+}
+.fontShapenavigation a:active, .fontShapenavigation a:active div, .fontShapenavigation a:active span {
+text-decoration:none;
+}
+.fontShapenavigation a:hover, .fontShapenavigation a:hover div, .fontShapenavigation a:hover span {
+text-decoration:underline;
+}
+</dtml-let>
Index: WAeUP_SRP/trunk/skins/waeup_design/folder_view.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/folder_view.py	(revision 1737)
+++ WAeUP_SRP/trunk/skins/waeup_design/folder_view.py	(revision 1737)
@@ -0,0 +1,24 @@
+##parameters=b_start=0
+##
+from ZTUtils import Batch
+from ZTUtils import LazyFilter
+
+options = {}
+
+options['has_local'] = 'local_pt' in context.objectIds()
+
+key, reverse = context.getDefaultSorting()
+items = context.contentValues()
+items = sequence.sort( items, ((key, 'cmp', reverse and 'desc' or 'asc'),) )
+items = LazyFilter(items, skip='View')
+batch_obj = Batch(items, 25, b_start, orphan=0)
+listItemInfos = context.getBatchItemInfos(batch_obj)
+try:
+    target = context.getActionInfo('object/view')['url']
+except:
+    target = ''
+
+navigation = context.getBatchNavigation(batch_obj, target)
+options['batch'] = { 'listItemInfos': listItemInfos,
+                     'navigation': navigation }
+return context.index_html_template(**options)
Index: WAeUP_SRP/trunk/skins/waeup_design/get_waeup_skin.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/get_waeup_skin.py	(revision 1737)
+++ WAeUP_SRP/trunk/skins/waeup_design/get_waeup_skin.py	(revision 1737)
@@ -0,0 +1,13 @@
+# Return the right theme in context:
+
+request = container.REQUEST
+RESPONSE =  request.RESPONSE
+
+# Return a string identifying this script.
+mtool = context.portal_membership
+member = mtool.getAuthenticatedMember()
+roles = member.getRoles()
+if 'Student' in roles or mtool.isAnonymousUser():
+     return 'WAeUP_Student'
+return 'WAeUP_Backoffice'
+
Index: WAeUP_SRP/trunk/skins/waeup_design/header_lib_header.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/header_lib_header.pt	(revision 1737)
+++ WAeUP_SRP/trunk/skins/waeup_design/header_lib_header.pt	(revision 1737)
@@ -0,0 +1,42 @@
+<!-- a header_lib macro -->
+<!-- $Id: header_lib_header.pt 31116 2005-12-30 10:56:31Z lregebro $ -->
+
+<!--
+Here is the CSS loading logic:
+- default.css follows the CSS2 spec.
+- msie.css is used and read *only* by MSIE. This is the place to put instructions
+  to correct the rendering problems specific to MSIE.
+- custom.css is loaded if it exists.
+-->
+
+<metal:block define-macro="header" tal:define="charset string:ISO-8859-15">
+  <tal:block define="dummy python:request.RESPONSE.setHeader('Content-Type',
+    'text/html;; charset=%s' % charset)"/>
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-15"/>
+  <meta name="generator" content="West African eUniversity Project www.waeup.org"/>
+  <title tal:content="expanded_title|here/expanded_title">WAeUP Default</title>
+  <metal:block define-slot="base"></metal:block>
+  <link rel="stylesheet" type="text/css" media="all"
+    tal:attributes="href string:${base_url}default.css" />
+  <link tal:condition="btool|nothing" rel="stylesheet" type="text/css"
+    media="all" tal:attributes="href string:${base_url}boxes.css" />
+  <tal:block replace="structure string:&lt;!--[if IE]&gt;" /><link
+    rel="stylesheet" type="text/css"
+    tal:attributes="href string:${base_url}msie.css" /><tal:block
+    replace="structure string:&lt;![endif]--&gt;" />
+  <link rel="stylesheet" type="text/css" media="print"
+    tal:attributes="href string:${base_url}default_print.css"/>
+  <meta http-equiv="imagetoolbar" content="no" />
+  <metal:block define-slot="head_slot"></metal:block>
+  <metal:block define-slot="style_slot"></metal:block>
+  <link rel="stylesheet" type="text/css" media="all"
+    tal:condition="exists: here/custom.css"
+    tal:attributes="href string:${base_url}custom.css;"/>
+  <link rel="stylesheet" type="text/css" media="all"
+    tal:define="custom_css here/getCPSCustomCSS|nothing"
+    tal:condition="custom_css"
+    tal:attributes="href string:${base_url}${custom_css}"/>
+  <metal:block define-slot="javascript_head_slot"></metal:block>
+  <script type="text/javascript"
+    tal:attributes="src string:${base_url}functions.js"></script>
+</metal:block>
Index: WAeUP_SRP/trunk/skins/waeup_design/index_html_template.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/index_html_template.pt	(revision 1737)
+++ WAeUP_SRP/trunk/skins/waeup_design/index_html_template.pt	(revision 1737)
@@ -0,0 +1,39 @@
+<html metal:use-macro="context/main_template/macros/master">
+<body>
+
+<metal:slot metal:fill-slot="header" i18n:domain="cmf_default">
+  <div tal:condition="not: options/has_local">
+<metal:macro metal:use-macro="context/index_html_utils/macros/index_header" />
+  </div>
+  <div tal:condition="options/has_local">
+    <div metal:use-macro="context/local_pt/macros/header | default">
+      'local_pt' header goes here.
+    </div>
+  </div>
+</metal:slot>
+
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
+  tal:define="batch options/batch">
+
+  <div id="content_well"
+       style="float: left; top: 0; width: 78%;">
+    <div tal:condition="not: options/has_local">
+
+<metal:macro metal:use-macro="context/batch_widgets/macros/listing" />
+<metal:macro metal:use-macro="context/batch_widgets/macros/navigation" />
+
+    </div>
+    <div tal:condition="options/has_local">
+      <div metal:use-macro="context/local_pt/macros/body | default">
+        'local_pt' body goes here.
+      </div>
+    </div>
+  </div>
+  <div id="right_sidebar"
+       style="width: 20%">
+
+  </div>
+</metal:slot>
+
+</body>
+</html>
Index: WAeUP_SRP/trunk/skins/waeup_design/main_template.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/main_template.pt	(revision 1737)
+++ WAeUP_SRP/trunk/skins/waeup_design/main_template.pt	(revision 1737)
@@ -0,0 +1,222 @@
+<metal:block define-macro="master"
+  tal:define="showthirdcol showthirdcol|python:1;
+  emptybody emptybody|request/emptybody|nothing;
+  mtool here/portal_membership;
+  can_raise python:mtool.assertViewable(here);
+  utool nocall:here/portal_url;
+  atool here/portal_actions;
+  ttool here/portal_trees;
+  wtool here/portal_workflow;
+  ptool here/portal_cpsportlets;
+  context_url python:here.getContextUrl(utool=utool);
+  here_url here/absolute_url;
+  base_url here/getBaseUrl;
+  member mtool/getAuthenticatedMember;
+  isAnon mtool/isAnonymousUser;
+  isHomeless python:isAnon or member.getProperty('homeless', 0);
+  isHomeless python:(isHomeless == '0' and [0] or [isHomeless])[0];
+  actions python:atool.listFilteredActionsFor(here);
+  wf_state python:wtool.getInfoFor(here,'review_state','');
+  uname python: isAnon and 'Guest' or member.getUserName();
+  checkPerm nocall: mtool/checkPermission;
+  cpsmcat nocall:here/translation_service;
+  locale here/translation_service/getSelectedLanguage;
+  in_ws here/isInWorkspace;
+  waeup_skin here/get_waeup_skin;
+  student_theme python:test(waeup_skin == 'WAeUP_Student',1,0);
+  navigation_slot python:test(student_theme,'student_navigation_slot','navigation_slot');
+  object_tabs python:test(student_theme,'student_object_tabs','staff_object_tabs');
+  
+  ">
+  <metal:block define-slot="doctype"><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+  </metal:block>
+  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+        lang="en">
+    <head>
+      <metal:block use-macro="here/header_lib_header/macros/header|here/header_lib/macros/header">
+        <metal:block fill-slot="base">
+          <metal:block define-slot="base">
+            <base href=""
+                  tal:attributes="href string:${here_url}/" />
+          </metal:block>
+        </metal:block>
+        <metal:block fill-slot="head_slot">
+          <metal:block define-slot="head_slot" />
+        </metal:block>
+        <metal:block fill-slot="style_slot">
+          <link rel="stylesheet" type="text/css" media="all"
+                tal:attributes="href string:${base_url}common.css" />
+          <link rel="stylesheet" type="text/css" media="all"
+                tal:attributes="href string:${base_url}${waeup_skin}/render.css" />
+          <link rel="stylesheet" type="text/css" media="all"
+                tal:attributes="href string:${base_url}common2.css" />                
+          <metal:block define-slot="style_slot" />
+        </metal:block>
+        <metal:block fill-slot="javascript_head_slot">
+          <metal:block define-slot="javascript_head_slot" />
+        </metal:block>
+      </metal:block>
+      <link rel="icon"
+            href="icons/ng.png"
+            tal:attributes="href string:${base_url}icons/ng.png"
+            type="image/png" />
+      <link rel="shortcut icon"
+            href="icons/ng.png"
+            tal:attributes="href string:${base_url}icons/ng.png"
+            type="image/png" />
+    </head>
+    <body tal:condition="emptybody"
+          style="margin: 0px;"
+          tal:attributes="onload here/getOnLoad|string:setFocus();">
+      <metal:block define-slot="body" />
+      <metal:block define-slot="main" />
+    </body>
+    
+    <body tal:condition="not:emptybody"
+          style="margin: 0px;"
+          tal:attributes="onload here/getOnLoad|string:setFocus();">
+      <div>
+        <a href="http://uniben.waeup.org/accessibility"
+           accesskey="0"></a>
+        <a href="http://uniben.waeup.org/" accesskey="1"></a>
+        <a href="#content" accesskey="2"></a>
+        <a href="#menu" accesskey="3"></a>
+        <a href="http://uniben.waeup.org/advanced_search_form"
+           accesskey="4"></a>
+        <a href="http://uniben.waeup.org/" accesskey="7"></a>
+      </div>
+      
+      
+      <table summary="Logo Block"
+             style="margin-left: auto; margin-right: auto; width: 100%;"
+             class="shapeNoBorder colorTransparent" cellpadding="0"
+             cellspacing="0">
+        <tbody>
+          <tr>
+            <td style="width: 20px;" valign="top"></td>
+            <td valign="top" style="width: 80px; padding: 0.5em; text-align: right;">
+              <img tal:attributes="src string:${base_url}images/uniben_mark.jpg"  alt="Logo"
+                       height="84" width="82" />
+            </td>
+            <td style="padding: 2em 0em 0em 0em; text-align: left;" valign="top">
+              <img tal:attributes="src string:${base_url}images/uniben_logo.gif" 
+                       alt="Logo" height="51" width="234" />
+            </td>
+            <td style="width: 20px;" valign="top"></td>
+          </tr>
+        </tbody>
+      </table>
+
+      <table summary="Navigation Block"
+             style="margin-left: auto; margin-right: auto; width: 100%;"
+             class="shapeNoBorder colorTransparent" cellpadding="0"
+             cellspacing="0">
+        <tbody>
+          <tr>
+            <td style="width: 20px;" valign="top"></td>
+            <td style="" valign="top">
+              <div id="navigation_slot" 
+                       style="padding: 0em 0em 1px; text-align: right;"
+                       class="fontColornavigation fontShapenavigation portalTabTabStyle cpsskinsHBox body">
+                 <tal:block repeat="portlet python:ptool.getPortlets(context=context, slot=navigation_slot)"
+                  tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet, boxedit=None)" />
+              </div>
+            </td>
+            <td style="width: 20px;" valign="top"></td>
+          </tr>
+        </tbody>
+      </table>
+      
+      
+      <table summary="Main Table Block 1"
+           style="margin-left: auto; margin-right: auto; width: 100%;"
+           cellpadding="0" cellspacing="0">
+      <tbody>
+        <tr>
+          <td style="width: 20px;" valign="top"></td>
+          <td style="width: 150px;text-align: center;"
+              valign="top">
+            <div id="portal_session" style="padding: 0.4em 0.4em 0.4em 0.3em;"
+                 class="colorBarAreaColor fontColordefaultnovisitedlinks fontShapeaverage shapeAreaShape9">
+                    <tal:block repeat="portlet python:ptool.getPortlets(context=context, slot='portal_session')"
+                               tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet, boxedit=None)" />
+            </div>
+          </td>
+          <td style="text-align: left; padding: 0.2em 0.2em 0em;" class="colorBarColor" valign="top">
+            <div id="object_tabs" class="fontColornavigation fontShapeaverage cpsskinsHBox body">
+                <tal:block repeat="portlet python:ptool.getPortlets(context=context, slot=object_tabs)"
+                           tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet, boxedit=None)" />
+            </div>
+          </td>
+          <td tal:condition="not:student_theme"
+              class="colorBarColor" valign="top" style="text-align: right;padding: 0.2em 0.2em 0em; width: 280px;">
+            <div id="status_slot" class="fontColordefaultfontcolors fontShapeaverage cpsskinsHBox body">
+                <tal:block repeat="portlet python:ptool.getPortlets(context=context, slot='status_slot')"
+                           tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet, boxedit=None)" />
+            </div>
+          </td>
+          <td style="width: 20px;"
+              valign="top"></td>
+        </tr>
+      </tbody>
+    </table>
+  
+  
+  
+    <table summary="Main Table Block 2"
+             style="margin-left: auto; margin-right: auto; width: 100%;"
+             class="" cellpadding="0" cellspacing="0">
+      <tbody>
+        <tr>
+          <td style="width: 20px;" valign="top"></td>
+          <td style="width: 150px;text-align: left;"
+              class="colorBarColor fontColornavigation fontShapeaverage boxShapenavbox cpsskinsBox" valign="top">
+            <div id="staff_actions_slot" class="body" style="padding: 1.5em 0.5em 1.5em 0.5em;">
+              <tal:block tal:condition="not:student_theme" repeat="portlet python:ptool.getPortlets(context=context, slot='staff_actions_slot')"
+                         tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet, boxedit=None)" />
+              <tal:block tal:condition="not:student_theme" repeat="portlet python:ptool.getPortlets(context=context, slot='global_actions_slot')"
+                         tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet, boxedit=None)" />
+              <tal:block tal:condition="student_theme" repeat="portlet python:ptool.getPortlets(context=context, slot='student_actions_slot')"
+                         tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet, boxedit=None)" />
+              <span tal:condition="student_theme">
+
+
+              <div style="padding: 0em;">
+                <tal:block repeat="portlet python:ptool.getPortlets(context=context, slot='student_workflow')"
+                             tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet, boxedit=None)" />
+              </div>
+
+              </span>                         
+            </div>
+          </td>
+          <td style="" class="shapeAreaShape5 colorBarAreaColor" valign="top">
+            <div style="padding: 0.5em; text-align: left;" class="fontColordefaultfontcolors fontShapeaverage">
+                    <metal:block define-slot="header" />
+                    <metal:block define-slot="main" />
+                    <metal:block define-slot="sub" />
+            </div>
+          </td>
+          <td style="width: 20px;" valign="top"></td>
+        </tr>
+      </tbody>
+    </table>
+    
+    
+    <table summary="Copyright Info Block"
+             style="margin-left: auto; margin-right: auto; width: 100%;"
+             cellspacing="0">
+        <tbody>
+          <tr>
+            <td style="width: 20px;" valign="top"></td>
+            <td style="padding: 0.2em; text-align: right;" valign="top">
+              <div class="fontColordefaultfontcolors fontShapeaverage">
+              Copyright WAeUP Group 2007</div>
+            </td>
+            <td style="width: 20px;" valign="top"></td>
+          </tr>
+        </tbody>
+    </table>
+    </body>
+  </html>
+</metal:block>
Index: WAeUP_SRP/trunk/skins/waeup_design/slip_template.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/slip_template.pt	(revision 1737)
+++ WAeUP_SRP/trunk/skins/waeup_design/slip_template.pt	(revision 1737)
@@ -0,0 +1,118 @@
+<metal:block define-macro="master"
+  tal:define="showthirdcol showthirdcol|python:1;
+  emptybody emptybody|request/emptybody|nothing;
+  mtool here/portal_membership;
+  can_raise python:mtool.assertViewable(here);
+  utool nocall:here/portal_url;
+  atool here/portal_actions;
+  ttool here/portal_trees;
+  wtool here/portal_workflow;
+  ptool here/portal_cpsportlets;
+  context_url python:here.getContextUrl(utool=utool);
+  here_url here/absolute_url;
+  base_url here/getBaseUrl;
+  member mtool/getAuthenticatedMember;
+  isAnon mtool/isAnonymousUser;
+  isHomeless python:isAnon or member.getProperty('homeless', 0);
+  isHomeless python:(isHomeless == '0' and [0] or [isHomeless])[0];
+  actions python:atool.listFilteredActionsFor(here);
+  wf_state python:wtool.getInfoFor(here,'review_state','');
+  uname python: isAnon and 'Guest' or member.getUserName();
+  checkPerm nocall: mtool/checkPermission;
+  cpsmcat nocall:here/translation_service;
+  locale here/translation_service/getSelectedLanguage;
+  in_ws here/isInWorkspace;
+  waeup_skin here/get_waeup_skin;
+  ">
+  <metal:block define-slot="doctype"><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+  </metal:block>
+  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+        lang="en">
+    <head>
+      <metal:block use-macro="here/header_lib_header/macros/header|here/header_lib/macros/header">
+        <metal:block fill-slot="base">
+          <metal:block define-slot="base">
+            <base href=""
+                  tal:attributes="href string:${here_url}/" />
+          </metal:block>
+        </metal:block>
+        <metal:block fill-slot="head_slot">
+          <metal:block define-slot="head_slot" />
+        </metal:block>
+        <metal:block fill-slot="style_slot">
+          <link rel="stylesheet" type="text/css" media="all"
+                tal:attributes="href string:${base_url}common.css" />
+          <link rel="stylesheet" type="text/css" media="all"
+                tal:attributes="href string:${base_url}${waeup_skin}render.css" />
+          <link rel="stylesheet" type="text/css" media="all"
+                tal:attributes="href string:${base_url}common2.css" />    
+          <metal:block define-slot="style_slot" />
+        </metal:block>
+        <metal:block fill-slot="javascript_head_slot">
+          <metal:block define-slot="javascript_head_slot" />
+        </metal:block>
+      </metal:block>
+      <link rel="icon"
+            href="http://uniben.waeup.org/portal_themes/WAeUP_Student/icons/ng.png"
+            type="image/png" />
+      <link rel="shortcut icon"
+            href="http://uniben.waeup.org/portal_themes/WAeUP_Student/icons/ng.png"
+            type="image/png" />
+      <!-- CSS1 -->
+    </head>
+    <body tal:condition="emptybody"
+          style="margin: 0px;"
+          tal:attributes="onload here/getOnLoad|string:setFocus();">
+      <metal:block define-slot="body" />
+      <metal:block define-slot="main" />
+    </body>
+    <body tal:condition="not:emptybody"
+          style="margin: 0px;"
+          tal:attributes="onload here/getOnLoad|string:setFocus();">
+    <div>
+      <a href="http://uniben.waeup.org/accessibility" accesskey="0"></a>
+      <a href="http://uniben.waeup.org/" accesskey="1"></a>
+      <a href="#content" accesskey="2"></a>
+      <a href="#menu" accesskey="3"></a>
+      <a href="http://uniben.waeup.org/advanced_search_form"
+         accesskey="4"></a>
+      <a href="http://uniben.waeup.org/" accesskey="7"></a>
+    </div>
+    
+    <table summary="Logo Block"
+           style="margin-left: auto; margin-right: auto; width: 100%;"
+           class="shapeNoBorder colorTransparent" cellpadding="0"
+           cellspacing="0">
+      <tbody>
+        <tr>
+          <td style="width: 20px;" valign="top"></td>
+          <td valign="top" style="width: 80px; padding: 0.5em; text-align: right;">
+            <img tal:attributes="src string:${base_url}images/uniben_mark.jpg"  alt="Logo"
+                     height="84" width="82" />
+          </td>
+          <td style="padding: 2em 0em 0em 0em; text-align: left;" valign="top">
+            <img tal:attributes="src string:${base_url}images/uniben_logo.gif" 
+                     alt="Logo" height="51" width="234" />
+          </td>
+          <td style="width: 20px;" valign="top"></td>
+        </tr>
+      </tbody>
+    </table>
+      
+    <table summary="Main Block" cellpadding="0" cellspacing="0" 
+           style="margin-left:auto;margin-right:auto;width:100%;">
+      <tr>
+        <td valign="top" style="width:700px">
+          <div style="padding:2em; text-align: left;" 
+               class="fontColordefaultfontcolors fontShapeTitleindex shapeAreaShape">
+                  <metal:block define-slot="header" />
+                  <metal:block define-slot="main" />
+                  <metal:block define-slot="sub" />
+          </div>
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>
+</metal:block>
Index: WAeUP_SRP/trunk/skins/waeup_design/widget_portlet_actions.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/widget_portlet_actions.pt	(revision 1737)
+++ WAeUP_SRP/trunk/skins/waeup_design/widget_portlet_actions.pt	(revision 1737)
@@ -0,0 +1,26 @@
+<tal:block define="ds options/datastructure;
+                   categories ds/categories;
+                   actions_order ds/actions_order|python:[];
+                   context nocall:options/context_obj|here;
+                   show_icons ds/show_icons|python:1;
+                   show_icons python: int(show_icons);
+                   actionitems python: here.getActionsItems(context, categories, actions_order);
+                   base_url here/getBaseUrl"
+                   condition="actionitems">
+    <ul class="cpsskinsMenu">
+      <li tal:repeat="action actionitems"><a
+       tal:define="icon_tag action/icon_tag"
+       tal:attributes="href action/url;
+                       class python:show_icons and icon_tag and 'noicon' or None">
+         <tal:block condition="python:show_icons and icon_tag"
+           content="structure icon_tag"/>
+         <tal:block condition="python:show_icons and not icon_tag">
+           <img tal:attributes="src
+             string:${base_url}images/noicon.png;
+             alt action/title" />
+         </tal:block>
+         <tal:block i18n:translate="" content="action/title" />
+       </a>
+       </li>
+    </ul>
+</tal:block>
Index: WAeUP_SRP/trunk/skins/waeup_epayment/payment_receipt.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_epayment/payment_receipt.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_epayment/payment_receipt.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
     <metal:main fill-slot="main"
                 tal:define="info context/getStudentBaseInfo;
Index: WAeUP_SRP/trunk/skins/waeup_student/accommodation_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/accommodation_slip.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/accommodation_slip.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
     <metal:main fill-slot="main"
                 tal:define="info_acco context/getAccommodationInfo;
Index: WAeUP_SRP/trunk/skins/waeup_student/admission_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/admission_slip.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/admission_slip.pt	(revision 1737)
@@ -4,5 +4,5 @@
   </span>
 <metal:block tal:condition="info"> 
-  <metal:body use-macro="here/main_template/macros/master">
+  <metal:body use-macro="here/slip_template/macros/master">
     <metal:main fill-slot="main">
     <span tal:condition="not: info">
Index: WAeUP_SRP/trunk/skins/waeup_student/application_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/application_slip.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/application_slip.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
     <metal:main fill-slot="main"
                 tal:define="info context/getApplicationInfo">
Index: WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt	(revision 1737)
@@ -1,15 +1,15 @@
-<metal:block define-macro="clearance_edit_form">
- <metal:block use-macro="here/waeup_content_master/macros/master">
-  <metal:header fill-slot="header"
-           tal:define="
-               is_student context/isStudent;
-               is_staff context/isStaff;
-               is_so context/isSectionOfficer;
-               info context/getClearanceInfo;">
-    <metal:block use-macro="here/clearance_edit_lib/macros/header" />
-  </metal:header>
+<metal:definetemplate tal:define="template here/main_template/macros/master">
+<metal:definemacro define-macro="clearance_edit_form">
+<metal:usemacro use-macro=template>
+
   <metal:main fill-slot="main"
            tal:define="
-               info context/getClearanceInfo;
+               info context/getClearanceInfo;">
+               
+      <metal:block tal:condition="not: info">
+        <span tal:content="here/illegal_view" />
+      </metal:block>
+      <metal:block tal:condition="info">
+      <metal:block tal:define="               
                is_so context/isSectionOfficer;
                is_staff context/isStaff;
@@ -28,4 +28,29 @@
                form_action string:clearance_edit;
                creation python:False;">
+
+    <!--  Administration -->
+    <tal:block condition="python: not(is_staff or is_so or is_student)">
+      <metal:block use-macro="here/error_not_found/macros/not_found" />
+    </tal:block>
+    <tal:block condition="is_staff">
+      <h3> 
+        <span tal:condition="info">
+          <span tal:content="info/student/Title" />:
+        </span>
+        <span tal:content="here/title_or_id" />
+      </h3>
+      <br />    
+    </tal:block>
+    <!-- Student -->
+    <tal:block condition="python: is_student">
+      <a href=""
+         tal:attributes="href string:${here/academicsParent}">
+        <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
+        Up one level
+      </a>
+      <h3>Fill Your Clearance/Eligibility Form!</h3>
+      <br />    
+    </tal:block>
+
                
     <form action="ACTION" method="post" id="editForm"
@@ -47,5 +72,9 @@
         ajax feedback
       </div>
+    </metal:block>
+    </metal:block>          
   </metal:main>
- </metal:block>
-</metal:block>
+
+</metal:usemacro> 
+</metal:definemacro>
+</metal:definetemplate>
Index: WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_lib.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_lib.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_lib.pt	(revision 1737)
@@ -1,30 +1,5 @@
 <!--  clearance_edit_lib -->
 <!-- $Id$ -->
-<!--  header -->
-<metal:block define-macro="header">
-  <!--  Administration -->
-  <tal:block condition="python: not(is_staff or is_so or is_student)">
-    <metal:block use-macro="here/error_not_found/macros/not_found" />
-  </tal:block>
-  <tal:block condition="is_staff">
-    <h3> 
-      <span tal:condition="info">
-        <span tal:content="info/student/Title" />:
-      </span>
-      <span tal:content="here/title_or_id" />
-    </h3>
-    <br />    
-  </tal:block>
-  <!-- Student -->
-  <tal:block condition="python: is_student">
-    <a href=""
-       tal:attributes="href string:${here/academicsParent}">
-      <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
-      Up one level
-    </a>
-    <h3>Fill Your Clearance/Eligibility Form!</h3>
-    <br />    
-  </tal:block>
-</metal:block>
+
 <!--  buttons -->
 <metal:block define-macro="buttons">
Index: WAeUP_SRP/trunk/skins/waeup_student/clearance_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/clearance_slip.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/clearance_slip.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
     <metal:main fill-slot="main"
                  tal:define="info context/getClearanceInfo">
@@ -5,5 +5,5 @@
         <span tal:content="here/illegal_view" />
       </span>
-      <span tal:condition="info">
+      <span tal:omit-tag=""  tal:condition="info">
       <div style="text-align: right" tal:condition="info/penalty"> 
       <strong>Late Clearance!</strong></div>
@@ -26,5 +26,6 @@
           <td tal:content="sc/study_course" />
         </tr>
-        <span tal:define="f_id sc/faculty;
+        <span  tal:omit-tag="" 
+               tal:define="f_id sc/faculty;
                         d_id sc/department;
                         f_title context/academics/?f_id/Title|string:Faculty not yet in Prospectus;
Index: WAeUP_SRP/trunk/skins/waeup_student/contact_student_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/contact_student_form.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/contact_student_form.pt	(revision 1737)
@@ -1,4 +1,5 @@
+<metal:definetemplate tal:define="template here/waeup_content_master/macros/master">
 <metal:block define-macro="contact_student_form">
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro=template>
     <metal:main fill-slot="main"
                 tal:define="member python:context.portal_membership.getAuthenticatedMember();
@@ -80,2 +81,3 @@
 </metal:body>
 </metal:block>
+</metal:definetemplate>
Index: WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
     <metal:main fill-slot="main"
                 tal:define="info context/getStudyLevelInfo;
Index: WAeUP_SRP/trunk/skins/waeup_student/entry_results_anon_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/entry_results_anon_slip.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/entry_results_anon_slip.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
     <metal:main fill-slot="main"
                 tal:define="pume python:context.portal_pumeresults(jamb_reg_no=request.get('nr'))[0]">
Index: WAeUP_SRP/trunk/skins/waeup_student/external_clearance_edit_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/external_clearance_edit_form.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/external_clearance_edit_form.pt	(revision 1737)
@@ -1,1 +1,5 @@
-<metal:block use-macro="here/clearance_edit_form/macros/clearance_edit_form" />
+<metal:definetemplate tal:define="template here/slip_template/macros/master">
+  <metal:block use-macro="here/clearance_edit_form/macros/clearance_edit_form" />
+</metal:definetemplate>
+  
+
Index: WAeUP_SRP/trunk/skins/waeup_student/external_contact_student_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/external_contact_student_form.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/external_contact_student_form.pt	(revision 1737)
@@ -1,1 +1,3 @@
-<metal:block use-macro="here/contact_student_form/macros/contact_student_form" />
+<metal:definetemplate tal:define="template here/slip_template/macros/master">
+  <metal:block use-macro="here/contact_student_form/macros/contact_student_form" />
+</metal:definetemplate>
Index: WAeUP_SRP/trunk/skins/waeup_student/external_study_level_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/external_study_level_view.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/external_study_level_view.pt	(revision 1737)
@@ -1,4 +1,4 @@
 <metal:html>
-  <metal:body use-macro="here/waeup_content_master/macros/master">
+  <metal:body use-macro="here/slip_template/macros/master">
     <metal:block fill-slot="header" 
                  tal:define="global info context/getStudyLevelInfo;
Index: WAeUP_SRP/trunk/skins/waeup_student/inter_faculty_transfer_1.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/inter_faculty_transfer_1.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/inter_faculty_transfer_1.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
   <metal:main fill-slot="main"
               tal:define="info context/getTransferInfo">
Index: WAeUP_SRP/trunk/skins/waeup_student/inter_faculty_transfer_2.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/inter_faculty_transfer_2.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/inter_faculty_transfer_2.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
   <metal:main fill-slot="main"
               tal:define="info context/getTransferInfo">
Index: WAeUP_SRP/trunk/skins/waeup_student/inter_faculty_transfer_3.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/inter_faculty_transfer_3.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/inter_faculty_transfer_3.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
   <metal:main fill-slot="main"
               tal:define="info context/getTransferInfo">
Index: WAeUP_SRP/trunk/skins/waeup_student/intra_faculty_transfer_1.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/intra_faculty_transfer_1.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/intra_faculty_transfer_1.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
   <metal:main fill-slot="main"
               tal:define="info context/getTransferInfo">
Index: WAeUP_SRP/trunk/skins/waeup_student/intra_faculty_transfer_2.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/intra_faculty_transfer_2.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/intra_faculty_transfer_2.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
   <metal:main fill-slot="main"
               tal:define="info context/getTransferInfo">
Index: WAeUP_SRP/trunk/skins/waeup_student/intra_faculty_transfer_3.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/intra_faculty_transfer_3.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/intra_faculty_transfer_3.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
   <metal:main fill-slot="main"
               tal:define="info context/getTransferInfo">
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_clearance_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_clearance_view.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/layout_clearance_view.pt	(revision 1737)
@@ -7,10 +7,10 @@
                                  >
   <table>
-    <span tal:repeat="row layout/rows">
-        <span tal:repeat="cell row">
-          <span tal:condition="python:cell['widget_rendered'] 
+    <span tal:omit-tag=""  tal:repeat="row layout/rows">
+        <span  tal:omit-tag="" tal:repeat="cell row">
+          <span tal:omit-tag="" tal:condition="python:cell['widget_rendered'] 
                                and not cell['widget_rendered'] in ('None','-',)
                                or cell['widget_id'] == 'birth_certificate'">
-          <span tal:define="widget cell/widget"
+          <span tal:omit-tag=""  tal:define="widget cell/widget"
                 tal:condition="python:cell['widget_id'] not in fields_not_displayed">
             <div tal:omit-tag=""
@@ -22,5 +22,5 @@
             <tr>                         
             <tal:block condition="widget/label">
-            <td width="180px" valign="top" nowrap>
+            <td width="180px" valign="top">
               <span i18n:translate="" tal:condition="widget/is_i18n">
                   <span tal:content="widget/label" />:</span>
Index: WAeUP_SRP/trunk/skins/waeup_student/personal_edit_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/personal_edit_form.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/personal_edit_form.pt	(revision 1737)
@@ -1,17 +1,12 @@
-<metal:body use-macro="here/waeup_content_master/macros/master">
-    <metal:block fill-slot="header"
-                  tal:define="info context/getPersonalInfo">
-      <a href=""
-         tal:attributes="href string:${here/academicsParent}">
-        <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
-        Up one level
-      </a>
-      <h3>Update Your Personal Data!</h3>
-      <br />
-    </metal:block>  
-  
+<metal:body use-macro="here/main_template/macros/master">
+
+
     <metal:main fill-slot="main"
-                  tal:define="info context/getPersonalInfo;
-                              rendered_main python:info['per_doc'].render(
+                  tal:define="info context/getPersonalInfo;">
+      <metal:block tal:condition="not: info">
+        <span tal:content="here/illegal_view" />
+      </metal:block>
+      <metal:block tal:condition="info">
+      <metal:block tal:define="rendered_main python:info['per_doc'].render(
                               layout_mode='edit',
                               schema_id = 'student_personal',
@@ -23,4 +18,12 @@
            metadata nothing;
             ">
+    <a href=""
+       tal:attributes="href string:${here/academicsParent}">
+      <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
+      Up one level
+    </a>
+    <h3>Update Your Personal Data!</h3>
+    <br />            
+            
     <form action="ACTION" method="post" id="editForm"
           enctype="multipart/form-data" class="workflow"
@@ -37,4 +40,6 @@
              id="cpsdocument_edit_button"/>
     </form>
+    </metal:block>
+    </metal:block>    
     </metal:main>
 </metal:body>
Index: WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt	(revision 1737)
@@ -2,4 +2,11 @@
            info item/getStudentWorkflowInfo;"
            condition="context/isStudent">       
+
+           
+<table>           
+<tr><td style="padding: 1em 0em 0.2em 0em;">
+   <strong>Registration Status:</strong>
+</td></tr>
+</table>
 
 <table class="registration" tal:condition="not:info/cr">
Index: WAeUP_SRP/trunk/skins/waeup_student/pume_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/pume_slip.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/pume_slip.pt	(revision 1737)
@@ -1,4 +1,4 @@
 <metal:html tal:define="info context/getStudentInfo"> 
-  <metal:body use-macro="here/main_template/macros/master">
+  <metal:body use-macro="here/slip_template/macros/master">
     <metal:main fill-slot="main">
       <span tal:condition="not: info">
Index: WAeUP_SRP/trunk/skins/waeup_student/session_results_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/session_results_slip.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/session_results_slip.pt	(revision 1737)
@@ -1,3 +1,3 @@
-<metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/slip_template/macros/master">
     <metal:main fill-slot="main"
                 tal:define="info context/getSessionResults">
Index: WAeUP_SRP/trunk/skins/waeup_student/start_clearance.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/start_clearance.py	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/start_clearance.py	(revision 1737)
@@ -84,5 +84,5 @@
 dc['clr_ac_date'] = current
 dc['entry_date'] = current
-dc['entry_session'] = "2006/2007"
+#dc['entry_session'] = "2006/2007"
 wf.doActionFor(info['app'],'close')
 info['clear_doc'].edit(mapping = dc)
Index: WAeUP_SRP/trunk/skins/waeup_student/student_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_view.pt	(revision 1736)
+++ WAeUP_SRP/trunk/skins/waeup_student/student_view.pt	(revision 1737)
@@ -1,14 +1,14 @@
 <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main" 
-           tal:define="info context/getStudentFolderInfo;
-                is_so info/is_sectionofficer|nothing;
-                is_staff info/is_staff|nothing;
-                is_student info/is_student">
-      <span tal:condition="not: info">
+           tal:define="info context/getStudentFolderInfo;">
+      <metal:block tal:condition="not: info">
         <span tal:content="here/illegal_view" />
-      </span>
-      <span tal:condition="info"
-            tal:define="review_state info/review_state;
-                        rows python: info['items']">
+      </metal:block>
+      <metal:block tal:condition="info">
+      <metal:block tal:define="review_state info/review_state;
+                        rows python: info['items'];
+                        is_so info/is_sectionofficer|nothing;
+                        is_staff info/is_staff|nothing;
+                        is_student info/is_student">
 
       <a href="" tal:condition="is_staff"
@@ -103,5 +103,6 @@
     </table>
         
-    </span>
+    </metal:block>
+    </metal:block>
     </metal:main>
 </metal:body>
