Index: WAeUP_SRP/trunk/skins/waeup_design/common.css.dtml
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/common.css.dtml	(revision 1783)
+++ WAeUP_SRP/trunk/skins/waeup_design/common.css.dtml	(revision 1785)
@@ -87,3 +87,566 @@
   margin: 10px;
 }
+
+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
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/common2.css.dtml	(revision 1783)
+++ 	(revision )
@@ -1,565 +1,0 @@
-<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/folder_view.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/folder_view.py	(revision 1783)
+++ 	(revision )
@@ -1,24 +1,0 @@
-##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/folder_view.py_not_used
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/folder_view.py_not_used	(revision 1785)
+++ WAeUP_SRP/trunk/skins/waeup_design/folder_view.py_not_used	(revision 1785)
@@ -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/index_html.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/index_html.py	(revision 1785)
+++ WAeUP_SRP/trunk/skins/waeup_design/index_html.py	(revision 1785)
@@ -0,0 +1,25 @@
+## Script (Python) "index_html"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=batch=None
+##title=
+##
+# $Id: index_html.py 901 2006-11-20 07:33:16Z henrik $
+"""
+return the correct index_html
+"""
+
+request = context.REQUEST
+redirect = request.RESPONSE.redirect
+pm = context.portal_membership
+
+if pm.isAnonymousUser():
+    return redirect("%s/srp_anonymous_view" % request.get('URL1'))
+elif context.isStudent():
+    return redirect("%s/srp_anonymous_view" % context.absolute_url())
+else:
+	return redirect("%s/srp_view" % context.absolute_url())
+
Index: WAeUP_SRP/trunk/skins/waeup_design/index_html_template.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/index_html_template.pt	(revision 1783)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<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/index_html_template.pt_not_used
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/index_html_template.pt_not_used	(revision 1785)
+++ WAeUP_SRP/trunk/skins/waeup_design/index_html_template.pt_not_used	(revision 1785)
@@ -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 1783)
+++ WAeUP_SRP/trunk/skins/waeup_design/main_template.pt	(revision 1785)
@@ -50,6 +50,4 @@
           <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>
Index: WAeUP_SRP/trunk/skins/waeup_design/slip_template.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_design/slip_template.pt	(revision 1783)
+++ WAeUP_SRP/trunk/skins/waeup_design/slip_template.pt	(revision 1785)
@@ -44,6 +44,4 @@
           <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}common2.css" />    
           <metal:block define-slot="style_slot" />
         </metal:block>
