Index: /WAeUP_SRP/base/skins/waeup_design/common.css.dtml
===================================================================
--- /WAeUP_SRP/base/skins/waeup_design/common.css.dtml	(revision 2248)
+++ /WAeUP_SRP/base/skins/waeup_design/common.css.dtml	(revision 2249)
@@ -107,13 +107,5 @@
 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;
Index: /WAeUP_SRP/base/skins/waeup_design/default.css.dtml
===================================================================
--- /WAeUP_SRP/base/skins/waeup_design/default.css.dtml	(revision 2249)
+++ /WAeUP_SRP/base/skins/waeup_design/default.css.dtml	(revision 2249)
@@ -0,0 +1,1069 @@
+<dtml-comment>
+CSS directives conforming to the CSS 2.1 spec.
+Those CSS directives are suppported by user agents such as Mozilla/Firefox, MSIE6, MSIE5.x, etc.
+$Id: default.css.dtml 47552 2006-07-28 17:33:14Z gracinet $
+</dtml-comment>
+
+<dtml-let last_modified="_.DateTime()-14" expires="_.DateTime()+1" >
+<dtml-call "REQUEST.RESPONSE.setHeader( 'Content-Type', 'text/css' )">
+<dtml-call "REQUEST.RESPONSE.setHeader( 'Last-Modified', last_modified.toZone('GMT').rfc822() )">
+<dtml-call "REQUEST.RESPONSE.setHeader( 'Cache-Control', 'max-age=36000, must-revalidate' )">
+<dtml-call "REQUEST.RESPONSE.setHeader( 'Expires', expires.toZone('GMT').rfc822() )" >
+</dtml-let>
+
+<dtml-with stylesheet_properties>
+
+<dtml-comment>
+BASIC ELEMENTS ------------------------------
+</dtml-comment>
+
+body {
+  font: <dtml-var mainFont>;
+  background: <dtml-var mainBackground>;
+  color: <dtml-var mainFontColor>;
+  margin: 0;
+  padding: 0;
+}
+
+body .popup {
+  font: <dtml-var mainFont>;
+}
+
+a {
+  text-decoration: none;
+  color: <dtml-var mainLinkColor>;
+  background-color: transparent;
+}
+
+a.strong {
+  font-weight: bold;
+}
+
+img {
+  border: 0;
+  vertical-align: middle;
+}
+
+p {
+  margin: 0.5em 0 1em 0;
+  line-height: 133%;
+}
+p a {
+  text-decoration: underline;
+}
+p a:visited {
+  color: <dtml-var contentLinkVisitedColor>;
+  background-color: transparent;
+}
+p a:active {
+  color: <dtml-var contentLinkActiveColor>;
+  background-color: transparent;
+}
+a:hover {
+  text-decoration: none;
+}
+p img {
+  border: <dtml-var contentImageBorder>;
+  margin: 0;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  color: <dtml-var headingFontColor>;
+  background-color: transparent;
+  font: <dtml-var headingFont>;
+  font-weight: bold;
+  margin: 0;
+  padding-top: 0.5em;
+}
+h1 {
+  font-size: <dtml-var headingSize1>;
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+}
+h2 {
+  font-size: <dtml-var headingSize2>;
+  margin-bottom: 1em;
+}
+h3 {
+  font-size: <dtml-var headingSize3>;
+}
+h4 {
+  font-size: <dtml-var headingSize4>;
+}
+h5 {
+  font-size: <dtml-var headingSize5>;
+}
+h6 {
+  font-size: <dtml-var headingSize6>;
+}
+
+ol, ul {
+  padding: 0;
+  margin: 0;
+  line-height: 133%;
+}
+ul a, ol a {
+  text-decoration: underline;
+}
+
+dt {
+  font-weight: bold;
+  margin: 0.5em 0em 0.5em 0em;
+}
+dt a {
+  text-decoration: none;
+}
+
+dd {
+  line-height: 133%;
+  margin-bottom: 1em;
+}
+
+legend {
+  background: <dtml-var mainBackground>;
+  padding: 0.5em 0em 0.5em 0em;
+}
+
+textarea {
+  color: <dtml-var mainFontColor>;
+  background-color: white;
+  font: <dtml-var inputFont>;
+}
+input {
+  font: <dtml-var inputFont>;
+  color: <dtml-var mainFontColor>;
+  background-color: white;
+  vertical-align: middle;
+}
+select {
+  font: <dtml-var inputFont>;
+  vertical-align: top;
+}
+abbr, acronym, .explain {
+  color: <dtml-var mainFontColor>;
+  background-color: transparent;
+}
+q, blockquote {
+  font-style: italic;
+  font-size: 100%;
+}
+code {
+  font-size: 100%;
+  color: <dtml-var mainFontColor>;
+  background-color: <dtml-var preBackground>;
+}
+pre {
+  font-size: 100%;
+  padding: 1em;
+  border: <dtml-var preBorder>;
+  color: <dtml-var mainFontColor>;
+  background-color: <dtml-var preBackground>;
+  overflow: auto;
+}
+
+<dtml-comment>
+Classes ------------------------------
+</dtml-comment>
+
+#idioma p {
+  margin-top: 0;
+}
+
+.logo {
+  margin: <dtml-var logoMargin>;
+  padding: <dtml-var logoPadding>;
+}
+
+.note {
+  font-size: smaller;
+}
+
+.even {
+  background-color: <dtml-var boxEvenBackground>;
+}
+
+.odd {
+  background-color: <dtml-var boxOddBackground>;
+}
+
+.pending {
+  font-weight: bold;
+  color: #ffa500;
+}
+
+.work {
+  font-weight: bold;
+  color: blue;
+}
+
+.draft {
+  font-weight: bold;
+  color: #5555ff;
+}
+
+.published {
+  font-weight: bold;
+  color: #22a522;
+}
+
+.deferred {
+  font-weight: bold;
+  color: #ff6600;
+}
+
+.expired {
+  font-weight: bold;
+  color: #ff0033;
+}
+
+.locked {
+  border: 1px solid #ff6600;
+  color: #ff6600;
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+
+.url {
+  color: <dtml-var urlFontColor>
+}
+
+input.standalone, button.standalone {
+  background: <dtml-var standaloneButtonBackground>;
+  background-image: none;
+  color: <dtml-var standaloneButtonFontColor>;
+  border: <dtml-var standaloneButtonBorder>;
+}
+
+input.context {
+  background: <dtml-var contextButtonBackground>;
+  background-image: none;
+  color: <dtml-var contextButtonFontColor>;
+}
+
+input.destructive {
+  background: <dtml-var destructiveButtonBackground>;
+  background-image: none;
+  color: <dtml-var destructiveButtonFontColor>;
+}
+
+button {
+  font: <dtml-var inputFont>;
+  background: <dtml-var standaloneButtonBackground>;
+  color: <dtml-var standaloneButtonFontColor>;
+  background-image: none;
+  vertical-align: middle;
+}
+
+<dtml-comment>
+DIVs ------------------------------
+</dtml-comment>
+
+div.batchLayout {
+  text-align: right;
+  background-color: <dtml-var boxEvenBackground>;
+}
+
+div.pageNavigationLayout {
+  text-align: center;
+  background-color: <dtml-var boxEvenBackground>;
+}
+
+.contact {
+  text-align: center;
+  margin: 0;
+  padding: 1px 0px 1px 0px;
+}
+
+div.message {
+  background: <dtml-var messageBackground>;
+  color: <dtml-var mainFontColor>;
+  font: <dtml-var messageFont>;
+  margin: 1em 0;
+  padding: 0.5em 1em;
+  vertical-align: middle;
+}
+
+div.message a {
+  background: <dtml-var messageBackground>;
+  color: <dtml-var mainFontColor>;
+  text-decoration: underline;
+}
+
+div.description {
+  font: <dtml-var descriptionFont>;
+  display: block;
+  margin-bottom: 0.5em;
+  line-height: 133%;
+}
+
+div.documentActions {
+  float: right;
+  margin-top: 1em;
+}
+
+div.documentActions li {
+  display: inline;
+}
+
+div.searchBox {
+  float: right;
+  text-align: right;
+  padding: <dtml-var searchPadding>;
+  margin: <dtml-var searchMargin>;
+  clear: right;
+  background-color: transparent;
+  color: <dtml-var searchFontColor>;
+  text-transform: <dtml-var textTransform>;
+  width: 40%;
+}
+
+div.headerActions {
+  float: right;
+  text-align: right;
+  margin-top: 1em;
+  margin-right: 1em;
+  margin-bottom: 4px;
+}
+
+div.headerActions li {
+  display: inline;
+}
+
+div.pathBar {
+  padding: 1px 1em 1px 1em;
+  text-transform: <dtml-var textTransform>;
+}
+
+div.row {
+  clear: both;
+}
+
+div.label {
+  font-weight: bold;
+}
+
+div.field {
+  padding: 0px 0px 0px 0px;
+  text-align: left;
+}
+
+span.legend {
+  font-weight: bold;
+}
+
+div.popupImg {
+  padding: 10px;
+  text-align: center;
+}
+
+.hidden {
+  display: none;
+}
+
+.hiddenItem {
+  background-color: <dtml-var boxEvenBackground>;
+}
+
+<dtml-comment>
+Documents language selection
+</dtml-comment>
+
+span.selectedLang {
+  background: #003a6b;
+  color: #ffffff;
+  font-weight: bold;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+}
+a.availableLang {
+  text-decoration: underline;
+}
+a.availableLang:hover {
+  text-decoration: none;
+}
+
+<dtml-comment>
+Accessibility statement and usage
+</dtml-comment>
+
+div.accesskeys, div.accesskeysUsage {
+  border: 1px solid #999999;
+  background-color: #dddddd;
+  padding: 1em;
+  margin: 0.5em 0 2em 0;
+}
+
+<dtml-comment>
+Contact info and conformance statement
+</dtml-comment>
+
+.contactInfo li {
+  display: inline;
+  margin: 1em;
+}
+
+.conformanceStatement {
+  text-align: center;
+}
+
+.conformanceStatement li {
+  display: inline;
+}
+
+.conformanceStatement img {
+  margin: 1em;
+}
+
+<dtml-comment>
+CMF Calendar
+</dtml-comment>
+
+.CalendarArrow {
+  font-weight: bold;
+  text-decoration: none;
+  color: #000000;
+}
+
+.CalendarTitle {
+  font-weight: bold;
+  text-decoration: none;
+  text-align: center;
+  color: #000000;
+}
+
+p.help {
+  font-style: italic;
+}
+
+table.calendar td {
+  white-space: nowrap;
+  background-color: white;
+  width: 1.5em;
+}
+
+table.calendar a {
+  text-decoration: none;
+  color: black;
+}
+
+table.calendar td.event {
+  background-color: <dtml-var boxEvenBackground>;
+  text-decoration: none;
+}
+
+table.calendar td.todayevent {
+  background-color: <dtml-var boxEvenBackground>;
+}
+
+table.calendar td.weekdays {
+  background-color: <dtml-var boxEvenBackground>;
+}
+
+table.calendar th {
+  background-color: <dtml-var boxEvenBackground>;
+  white-space: nowrap;
+}
+
+table.localRoleForm th {
+  text-align: left;
+}
+
+span.highlightedSearchTerm {
+  background-color: #ffff00;
+}
+
+span.searchFor {
+  font-weight: bold;
+}
+
+/* hack for IE6 bugs */
+/* Hides from IE5-mac \*/
+* html .group {height: 1%}
+* html div.box {height: 1%}
+* html div.box .content {height: 1%}
+* html div.document {height: 1%}
+/* End hide from IE-mac */
+
+.netscape4 {
+  display: none;
+}
+
+table {
+  font-size: 100%;
+}
+
+hr {
+  height: 1px;
+  color: <dtml-var mainTabBorderColorSelected>;
+  background-color: transparent;
+}
+
+h1, h2 {
+  border-bottom: 1px solid <dtml-var mainTabBorderColor>;
+}
+
+form {
+  border: none;
+}
+
+textarea {
+  border: <dtml-var inputBorder>;
+  padding: 0.1em;
+}
+input {
+  border: <dtml-var inputBorder>;
+  margin-bottom: 1px; /* IE bug fix */
+  padding: 0.1em;
+}
+select {
+  font: <dtml-var inputFont>;
+  border: <dtml-var inputBorder>;
+  vertical-align: top;
+}
+
+abbr, acronym, .explain {
+  border-bottom: 1px dotted <dtml-var mainFontColor>;
+  cursor: help;
+}
+
+ol, ul {
+  padding-left: 3em;
+  margin: 0px;
+}
+
+.content li, #content li {
+  padding: 0em 0em 0.4em 0em;
+}
+
+ul.fileChoice {
+  padding-left: 0;
+  list-style-type: None;
+}
+
+button {
+  background: <dtml-var buttonBackground>;
+  border: <dtml-var buttonBorder>;
+  margin: 0.2em;
+  padding: 0.1em;
+  font: <dtml-var inputFont>;
+}
+
+button:hover {
+  background: <dtml-var buttonBackgroundHover>;
+}
+
+input.standalone, button.standalone {
+  background: <dtml-var standaloneButtonBackground>;
+  cursor: pointer;
+  font: <dtml-var inputFont>;
+  font-weight: <dtml-var buttonWeight>;
+  padding: <dtml-var standaloneButtonPadding>;
+  text-transform: <dtml-var textTransform>;
+}
+
+input.standalone:hover, button.standalone:hover {
+  background: <dtml-var standaloneButtonBackgroundHover>;
+}
+
+input.context {
+  background: <dtml-var contextButtonBackground>;
+  cursor: pointer;
+  font: <dtml-var inputFont>;
+  font-weight: <dtml-var buttonWeight>;
+  padding: <dtml-var contextButtonPadding>;
+  text-transform: <dtml-var textTransform>;
+  border: <dtml-var contextButtonBorder>;
+}
+
+input.context:hover {
+  background: <dtml-var contextButtonBackgroundHover>;
+}
+
+input.destructive {
+  background: <dtml-var destructiveButtonBackground>;
+  border: <dtml-var destructiveButtonBorder>;
+  cursor: pointer;
+  font: <dtml-var inputFont>;
+  font-weight: <dtml-var buttonWeight>;
+  padding: <dtml-var destructiveButtonPadding>;
+  text-transform: <dtml-var textTransform>;
+}
+
+input.destructive:hover {
+  background: <dtml-var destructiveButtonBackgroundHover>;
+  border: <dtml-var destructiveButtonBorderHover>;
+}
+
+input.noborder {
+  background: transparent;
+  border: <dtml-var noBorder>;
+  margin: 0;
+}
+
+input.searchButton {
+  font-size: 100% ! important;
+  margin-bottom: 1px ! important;
+}
+
+input.moveUp {
+  background: <dtml-var moveUpButtonBackground>;
+}
+input.moveDown {
+  background: <dtml-var moveDownButtonBackground>;
+}
+input.moveTop {
+  background: <dtml-var moveTopButtonBackground>;
+}
+input.moveBottom {
+  background: <dtml-var moveBottomButtonBackground>;
+}
+
+<dtml-comment>
+Forms ------------------------------
+</dtml-comment>
+
+form {
+  margin: 0px;
+}
+
+form.workflow {
+  padding:0px 0px 10px 0px;
+}
+
+form.workflow dl {
+  font-weight: bold;
+}
+
+form.workflow dd {
+  margin-left: 0px;
+}
+
+<dtml-comment>
+Generic table definitions
+</dtml-comment>
+
+table.columns td.left {
+  background: <dtml-var columnsLeftBackground>;
+}
+table.columns td.right {
+  background: <dtml-var columnsRightBackground>;
+}
+
+table.listing {
+  width: 100%;
+}
+
+table.listing caption {
+  font-weight: bold;
+}
+
+table.listing td {
+  padding: 0.4em;
+}
+
+table.listing thead tr th {
+  text-align: center;
+}
+
+table.listing thead td {
+  background-color: <dtml-var listingHeaderBackground>;
+  color: <dtml-var listingHeaderColor>;
+  text-align: center;
+  font-weight: bold;
+}
+
+table.listing tbody td {
+  background-color: <dtml-var listingCellBackground>;
+  color: <dtml-var listingCellColor>;
+}
+
+table.listing tbody tr.odd td {
+  background-color: <dtml-var listingCellOddBackground>;
+  color: <dtml-var listingCellOddColor>;
+}
+
+table.listing tbody tr.even td {
+  background-color: <dtml-var listingCellEvenBackground>;
+  color: <dtml-var listingCellEvenColor>;
+}
+
+table.listing .action {
+  font-weight: bold;
+  text-align: left;
+}
+
+<dtml-comment>
+Specific table definitions
+</dtml-comment>
+
+form#loginForm {
+  padding-top:20px;
+  padding-bottom:20px;
+  width: 30em;
+}
+table#login th {
+  width: 12em;
+}
+
+table#portalConfiguration th {
+  width: 18em;
+  padding-bottom: 1em;
+}
+table#portalConfiguration td {
+  width: 18em;
+  padding-bottom: 1em;
+}
+
+table#subscriptions td {
+  text-align: center;
+}
+
+table#subscriptions .action {
+  text-align: left;
+}
+
+table.localRolesAssignment {
+  width: 100%;
+  padding: 0;
+  margin: 0.4em;
+  margin-bottom: 2em;
+  border: 0.1em solid black;
+}
+
+table.localRolesAssignment td.assignedRole {
+  text-align: center;
+}
+
+table.localRolesAssignment td.inheritedRole {
+  text-align: center;
+  background: <dtml-var inheritedRole>;
+}
+
+span.inheritedRole {
+  background: <dtml-var inheritedRole>;
+}
+
+table.localRolesAssignment td.inheritedBlockedRole {
+  text-align: center;
+  background: <dtml-var inheritedBlockedRole>;
+}
+
+span.inheritedBlockedRole {
+  background: <dtml-var inheritedBlockedRole>;
+}
+
+<dtml-comment>
+DIVs ------------------------------
+</dtml-comment>
+
+div.top {
+  background: <dtml-var topBackground>;
+  margin: <dtml-var topMargin>;
+  padding: <dtml-var topPadding>;
+  width: 100%;
+}
+
+.contact {
+  background: <dtml-var footerBackground>;
+  border-top: <dtml-var footerBorder>;
+  border-bottom: <dtml-var footerBorder>;
+  width: 100%;
+}
+
+div.document {
+  font: <dtml-var contentFont>;
+  background: <dtml-var contentBackground>;
+}
+
+div.message {
+  border: <dtml-var messageBorder>;
+}
+
+div.pathBar {
+  border-bottom-color: <dtml-var mainTabBorderColorSelected>;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+}
+
+div.row {
+  margin: 0em 0em 0.5em 0em;
+  position:relative;
+}
+
+div.label {
+  font-weight: bold;
+  display: inline;
+}
+
+.required {
+  padding-right: 0.5em;
+  background: <dtml-var requiredField>;
+}
+
+.error {
+  background: <dtml-var messageBackground>;
+  border: <dtml-var messageBorder>;
+  padding: 1em;
+  margin: 0em;
+}
+
+div.field {
+  margin-top: 0.2em;
+}
+
+span.legend {
+  background: <dtml-var contentBackground>;
+  font-size: <dtml-var legendFontSize>;
+  padding: 0.5em 0em 0.5em 0em;
+  position : relative;
+  top: -0.8em;
+  left: 0;
+}
+
+<dtml-comment>
+The "group" class is used to group together the HTML fields of a form.
+</dtml-comment>
+.group {
+  margin: 0em;
+  padding:10px 0px 20px 0px;
+}
+
+.comment_box {
+  border: 1px solid #bcbcbc;
+  margin: 1em 0 1em 1em;
+  padding: 5px 10px 10px 20px;
+}
+
+.user_roles {
+  margin: 1em 0 1em 0;
+  padding: 0.7em 0em 0.7em 0em;
+}
+
+.header_roles {
+  font-weight: bold;
+  background: #b1acb2;
+}
+
+.assign_roles {
+  padding-top: 0.7em;
+}
+
+table.calendar {
+  border: <dtml-var boxBorder>;
+  text-align: right;
+}
+
+table.calendar a:hover {
+  text-decoration: none;
+}
+
+table.calendar th {
+  border: none;
+  font-weight: bold;
+  text-align: center;
+}
+
+table.calendar td {
+  width: 1.5em;
+}
+
+table.calendar td.weekdays {
+  border: <dtml-var boxBorder>;
+  border-style: solid none;
+  text-align: center;
+}
+
+table.calendar td.event {
+  font-weight: bold;
+}
+
+table.calendar td.todayevent {
+  border: <dtml-var boxHighlight>;
+  font-weight: bold;
+}
+
+table.calendar td.todaynoevent {
+  border-collapse: collapse;
+  border: <dtml-var boxHighlight>;
+}
+
+<dtml-comment>
+Tooltips
+</dtml-comment>
+
+.tooltipControl {
+  color: #000000;
+  background: #ffffe1;
+  border: 1px solid #000000;
+
+  margin-left: 1em;
+}
+
+.tooltipControl:hover {
+  background: #ffffb8;
+}
+
+.tooltipArea {
+  color: #000000;
+  background: #ffffe1;
+  border: 1px solid #000000;
+  padding: 0.8em;
+  font-weight: normal;
+  font-size: 80%;
+  text-align: left;
+
+  position: inherit;
+  left: -15em;
+  top: 1.5em;
+  width: 20em;
+
+  visibility: hidden;
+  display: none;
+  z-index: 1000;
+}
+
+<dtml-comment>
+XXX: CPSMailBoxer definitions that should not be here but in a dedicated file
+</dtml-comment>
+
+div.mailboxerNoArchive {
+  border-top: solid;
+  border-width: 1px;
+}
+
+td.mailboxerMonth {
+  background-color: <dtml-var boxEvenBackground>;
+  text-align: center;
+}
+
+<dtml-comment>
+Books
+</dtml-comment>
+
+div.bookSummary {
+  width: 100%;
+  border: 1px solid black;
+  padding: 0.5em;
+}
+
+div.bookSummaryNav {
+  text-align: center;
+  width: 100%;
+  background-color: <dtml-var boxEvenBackground>;
+}
+
+li.summaryEntries {
+  margin: 0.5em;
+}
+
+div.bookPageHeader {
+  border-bottom: 1px solid black;
+}
+
+div.bookPageNavigation {
+}
+
+div.bookPageInfo {
+  float: right;
+}
+
+<dtml-comment>
+Hide stuff by id and make it available in source
+</dtml-comment>
+
+#bylineFolder {
+  clear: both;
+  text-align: left;
+}
+
+#byline {
+  clear: both;
+  text-align: right;
+  margin-top: 2em;
+}
+
+<dtml-comment>
+javascript use for block toggle
+</dtml-comment>
+
+div.hidden {
+  visibility: hidden;
+  display: none;
+}
+
+div.visible {
+  visibility: visible;
+  display: block;
+}
+
+<dtml-comment>
+Advanced search form
+</dtml-comment>
+
+#advancedSearchForm {
+  font-size: 90%;
+}
+
+#advancedSearchZCText {
+  text-align: right;
+}
+
+p.advancedSearchButton {
+  text-align: right;
+}
+
+#advancedSearchForm fieldset {
+  border: none;
+  border-left: <dtml-var boxBorder>;
+  border-bottom: <dtml-var boxBorder>;
+  padding: 0.5em 0em 0.5em 0em;
+  margin: 0.5em;
+}
+
+span.advancedSearchColumn {
+  padding-left: 1em;
+  float:left;
+  width:12em;
+}
+
+div.drophover {
+  border-bottom: 3px solid black;
+}
+
+div.drophover-in {
+  background: #ffe68f;
+  border: 1px solid black;
+}
+
+#ajax_psm {
+  background: #ffac0b;
+  color: white;
+  padding: 8px;
+  border: 1px solid black;
+  float: right;
+  font-weight: bold;
+  position: absolute;
+  <dtml-if "isUserAgentGecko(REQUEST)">
+  -moz-border-radius: 4px;
+  </dtml-if>
+}
+
+div.draggable:hover {
+  background: #efefef;
+}
+
+div.more_block {
+  padding-left: 10px;
+}
+
+div.batchLayout, div.pageNavigationLayout {
+  color: #666666;
+  margin: 0px 2px 0px 2px;
+  padding: 3px 20px 3px 0px;
+}
+
+table.folderButtons {
+  padding-top: 1.2em;
+}
+
+</dtml-with>
Index: /WAeUP_SRP/base/skins/waeup_design/default_print.css.dtml
===================================================================
--- /WAeUP_SRP/base/skins/waeup_design/default_print.css.dtml	(revision 2249)
+++ /WAeUP_SRP/base/skins/waeup_design/default_print.css.dtml	(revision 2249)
@@ -0,0 +1,72 @@
+<dtml-comment>
+Nuxeo print CSS
+$Id: default_print.css.dtml 32245 2006-01-25 18:30:53Z sfermigier $
+
+This is heavily based on the Plone css by Alexander Limi and alistapart.com
+</dtml-comment>
+
+<dtml-let last_modified="_.DateTime()-14"
+      expires="_.DateTime()+7" >
+<dtml-call "REQUEST.RESPONSE.setHeader( 'Content-Type', 'text/css' )">
+<dtml-call "REQUEST.RESPONSE.setHeader( 'Last-Modified', last_modified.toZone('GMT').rfc822() )">
+<dtml-call "REQUEST.RESPONSE.setHeader( 'Cache-Control', 'max-age=36000, must-revalidate' )">
+<dtml-call "REQUEST.RESPONSE.setHeader( 'Expires', expires.toZone('GMT').rfc822() )" >
+</dtml-let>
+
+body {
+  background: White;
+  color: Black;
+  margin: 0;
+  padding: 0;
+}
+
+.netscape4,
+.tabs,
+.personalBar,
+td.left,
+td.right,
+td.workspace,
+div.documentActions,
+div.message,
+div.hidden,
+div.headerActions,
+div.searchBox,
+.footer,
+.help,
+.legend,
+.rssExport,
+.doNotPrint {
+  display: none;
+}
+
+ul {
+  list-style-image: none;
+}
+
+.editableDocument,
+.document,
+div.description,
+.group {
+  background: transparent;
+  border: none;
+  padding: 0;
+  margin: 0;
+}
+
+table.listing,
+table.listing td {
+  border: 1pt solid black;
+  border-collapse: collapse;
+}
+
+a:link, a:visited {
+  background: transparent;
+  text-decoration: none;
+}
+
+td.eventHeader {
+  border: 1px solid black;
+}
+td.eventBody {
+  border: 1px dotted black;
+}
Index: /WAeUP_SRP/base/skins/waeup_design/stylesheet_properties.props
===================================================================
--- /WAeUP_SRP/base/skins/waeup_design/stylesheet_properties.props	(revision 2248)
+++ /WAeUP_SRP/base/skins/waeup_design/stylesheet_properties.props	(revision 2249)
@@ -0,0 +1,159 @@
+# TODO: I want comments in this file!
+
+plone_skin:string=Nuxeo CPS Default
+
+mainFont:string=70% Arial, sans-serif, Verdana, Helvetica
+mainBackground:string=#ffffff
+mainFontColor:string=black
+mainLinkColor:string=#436976
+mainTabBorderColor:string=#838183
+mainTabBorderColorSelected:string=#838183
+mainTabBackground:string=#003a6b
+mainTabBackgroundNotSelected:string=#9cb2cd
+# FIXME: remove since it is not used ?
+#mainTabBackdrop:string=transparent
+mainTabFontWeight:string=normal
+mainTabFontColor:string=white
+mainTabFontColorSelected:string=white
+
+headingFont:string=100% Arial, sans-serif, Verdana, Helvetica
+headingFontColor:string=black
+headingSize1:string=140%
+headingSize2:string=130%
+headingSize3:string=120%
+headingSize4:string=110%
+headingSize5:string=105%
+headingSize6:string=100%
+
+descriptionFont:string=100% Arial, sans-serif, Verdana, Helvetica
+
+contentFont:string=120% Arial, sans-serif, Verdana, Helvetica
+contentBackground:string=White
+contentImageBorder:string=0
+contentLinkActiveColor:string=Red
+contentLinkVisitedColor:string=Purple
+# FIXME: remove since it is not used ?
+#contentTabBorder:string=1px solid #74ae0b
+contentTabBackground:string=#cde2a7
+contentTabBackgroundNotSelected:string=transparent
+contentTabBackdrop:string=transparent
+contentTabFontWeight:string=normal
+contentTabFontColor:string=#578308
+contentTabFontColorSelected:string=#578308
+
+preBorder:string=0px none
+preBackground:string=#eeeeee
+
+messageFont:string=normal 110% Arial, sans-serif, Verdana, Helvetica
+messageBackground:string=#ffca31
+messageBorder:string=2px solid #333333
+
+textTransform:string=none
+noBorder:string=none
+groupBorder:string=0px none transparent
+requiredField:string=url(required.png) right no-repeat
+
+inputFont:string=100% Arial, sans-serif, Verdana, Helvetica
+inputBorder:string=1px inset #757575
+# FIXME: not used
+#inputBackground:string=#f7f9fa
+
+buttonBackground:string=#ffffff 4px 4px no-repeat
+buttonBackgroundHover:string=#e7e7e7 url(buttonbg_bc.png) bottom left repeat-x
+buttonBorder:string=1px outset #757575
+
+contextButtonBackground:string=#ffffff url(buttonbg_e7.png) bottom left repeat-x
+contextButtonBackgroundHover:string=#e7e7e7 url(buttonbg_bc.png) bottom left repeat-x
+contextButtonPadding:string=2px 5px 2px 5px
+contextButtonFontColor:string=#454545
+contextButtonBorder:string=1px outset #999999
+
+standaloneButtonBackground:string=#ffffff url(buttonbg_e7.png) bottom left repeat-x
+standaloneButtonBackgroundHover:string=#e7e7e7 url(buttonbg_bc.png) bottom left repeat-x
+standaloneButtonPadding:string=2px 5px 2px 5px
+standaloneButtonFontColor:string=#454545
+standaloneButtonBorder:string=1px outset #999999
+
+destructiveButtonBackground:string=#ffffff url(buttonbg_e7.png) bottom left repeat-x
+destructiveButtonBackgroundHover:string=#e7e7e7 url(buttonbg_bc.png) bottom left repeat-x
+destructiveButtonPadding:string=2px 5px 2px 5px;
+destructiveButtonBorder:string=1px outset #757575;
+destructiveButtonBorderHover:string=1px solid #ff0000
+destructiveButtonFontColor:string=#454545
+
+moveUpButtonBackground:string=white url(buttonbg_e7.png) bottom left repeat-x
+moveDownButtonBackground:string=white url(buttonbg_e7.png) bottom left repeat-x
+moveTopButtonBackground:string=white url(buttonbg_e7.png) bottom left repeat-x
+moveBottomButtonBackground:string=white url(buttonbg_e7.png) bottom left repeat-x
+
+buttonWeight:string=normal
+
+boxBorder:string=0px solid #838183
+boxHeaderBackground:string=#003a6b
+boxHeaderFontColor:string=white
+# FIXME: Not used
+#boxLinkBackground:string=transparent
+#boxLinkColor:string=#436976
+boxEvenBackground:string=#eeeeee
+boxOddBackground:string=white
+boxHighlight:string=2px solid #ffa500
+
+# FIXME: Not used
+#listingBorder:string=1px solid #838183
+#listingHeaderBackground:string=#003a6b
+#listingHeaderFontColor:string=black
+#listingLinkHover:string=underline
+
+topBackground:string=#ffffff
+topMargin:string=0
+topPadding:string=0
+
+logoMargin:string=0.2em 0em 0.3em 1em
+logoPadding:string=0
+
+searchMargin:string=0
+searchPadding:string=0
+searchFontColor:string=black
+
+footerBackground:string=#eeeeee
+footerBorder:string=1px solid #003a6b
+
+columnsLeftBackground:string=#9cb2cd
+columnsRightBackground:string=#eeeeee url('rightcol_bg.png') repeat-y
+
+columnsLeftBackgroundNS4:string=#9cb2cd
+columnsRightBackgroundNS4:string=#eeeeee
+
+workspaceBackground:string=#cde2a7
+workspaceBackgroundSelected:string=#297b28
+urlFontColor:string=#666666
+
+legendFontSize:string=80%
+
+# Layout properties used to display listing type tables (this layout is used for
+# history and subscriptions tables).
+listingHeaderBackground:string=#003a6b
+listingHeaderColor:string=white
+listingCellBackground:string=#eeeeee
+listingCellColor:string=black
+listingCellOddBackground:string=#ffffff
+listingCellOddColor:string=black
+listingCellEvenBackground:string=#eeeeee
+listingCellEvenColor:string=black
+
+# Layout properties used to display RSS/Syndication logos (those logos
+# typically appear in each box).
+rssBorder:string=0.1em outset #ff6600
+rssBackground:string=#ff6600
+rssColor:string=#ffffff
+rssFont:string=bold 70% 'Lucida Grande', Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif
+
+# Layout properties used to display Atom/Syndication logos (those logos
+# typically appear in each box).
+atomBorder:string=0.1em outset #ff6600
+atomBackground:string=#ff6600
+atomColor:string=#ffffff
+atomFont:string=bold 70% 'Lucida Grande', Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif
+
+inheritedRole:string=#ffff99
+inheritedBlockedRole:string=#ff9999
Index: /WAeUP_SRP/base/skins/waeup_epayment/getPaymentsFolderInfo.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_epayment/getPaymentsFolderInfo.py	(revision 2248)
+++ /WAeUP_SRP/base/skins/waeup_epayment/getPaymentsFolderInfo.py	(revision 2249)
@@ -56,8 +56,15 @@
 online_payment = False
 sc_payment = False
-if review_state == 'cleared_and_validated' or (parttime and review_state == 'returning'):
+
+#if review_state == 'cleared_and_validated' or (parttime and review_state == 'returning'):
+#    online_payment = True
+#elif fulltime and review_state == 'returning':
+#    sc_payment = True
+
+if review_state == 'cleared_and_validated':
     online_payment = True
-elif fulltime and review_state == 'returning':
+elif review_state == 'returning':
     sc_payment = True
+
 info['online_payment'] = online_payment
 info['sc_payment'] = sc_payment
Index: /WAeUP_SRP/base/skins/waeup_student/search_students.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_student/search_students.py	(revision 2248)
+++ /WAeUP_SRP/base/skins/waeup_student/search_students.py	(revision 2249)
@@ -14,8 +14,8 @@
 import logging
 logger = logging.getLogger('Skins.search_students')
-from DateTime import DateTime
+#from DateTime import DateTime
 #
 #with_timer = True
-with_timer = False
+#with_timer = False
 #
 request = REQUEST
@@ -203,7 +203,4 @@
 
 if only_review or with_review or co_view:
-    if with_timer:
-        start = DateTime().timeTime()
-        logger.info('"%s","start 100"' % member)
     query = Eq('review_state',state)
     review_res = aq_portal(query)
@@ -211,51 +208,20 @@
     logger.info('%s searches for students in review_state %s' % (member,state))
 
-    if with_timer:
-        end = DateTime().timeTime()
-        logger.info('"%s","searchtime","%6.2f"' % (member,end-start))
 if co_view:
     only_review = False
     with_review = True
-    if with_timer:
-        start = DateTime().timeTime()
-        logger.info('"%s","start 200"' % member)
     query = In('faculty',faculties) | In('department',departments)
     res = aq_students(query)
-    if with_timer:
-        end = DateTime().timeTime()
-        logger.info('"%s","searchtime","%6.2f"' % (member,end-start))
-    start = DateTime().timeTime()
     search_set = [r.id for r in res]
-    if with_timer:
-        end = DateTime().timeTime()
-        logger.info('"%s","searchtime","%6.2f"' % (member,end-start))
 elif ca_view:
     only_review = False
     with_review = True
-    if with_timer:
-        start = DateTime().timeTime()
-        logger.info('"%s","start 200"' % member)
     courses = [cl.split('/')[0] for cl in certificate_level]
     levels = [cl.split('/')[1] for cl in certificate_level]
     query = In('course',courses) & In('level',levels)
     res = aq_students(query)
-    if with_timer:
-        end = DateTime().timeTime()
-        logger.info('"%s","searchtime","%6.2f"' % (member,end-start))
-        start = DateTime().timeTime()
     search_set = [r.id for r in res]
-    if with_timer:
-        end = DateTime().timeTime()
-        logger.info('"%s","searchtime","%6.2f"' % (member,end-start))
-if with_timer:
-    logger.info('"%s","start 300"' % member)
-    start = DateTime().timeTime()
 if review_res:
     review_set = [r.getId for r in review_res]
-if with_timer:
-    end = DateTime().timeTime()
-    logger.info('"%s","searchtime","%6.2f"' % (member,end-start))
-    logger.info('"%s","start 400"' % member)
-    start = DateTime().timeTime()
 if only_review:
     all = review_set
@@ -267,12 +233,6 @@
 else:
     all = search_set
-if with_timer:
-    end = DateTime().timeTime()
-    logger.info('"%s","searchtime","%6.2f"' % (member,end-start))
 items = all[:500]
 students = []
-if with_timer:
-    logger.info('"%s","start 500"' % member)
-    start = DateTime().timeTime()
 if items:
     for item in items:
@@ -288,8 +248,4 @@
         else:
             students.append(info)
-    if with_timer:
-        end = DateTime().timeTime()
-        logger.info('"%s","searchtime","%6.2f"' % (member,end-start))
-
     return context.search_students_form(rendered = rend,
                              psm = "",
