Changeset 2249

Timestamp:

17 Sep 2007, 06:49:57 (17 years ago)

Author:

Henrik Bettermann

Message:

revert payment of returning part-time students to scratch card

some stylesheet clean-up

Location:

WAeUP_SRP/base/skins

Files:

• waeup_design/common.css.dtml (modified) (1 diff)
• waeup_design/default.css.dtml (added)
• waeup_design/default_print.css.dtml (added)
• waeup_design/stylesheet_properties.props (modified) (1 diff)
• waeup_epayment/getPaymentsFolderInfo.py (modified) (1 diff)
• waeup_student/search_students.py (modified) (5 diffs)

WAeUP_SRP/base/skins/waeup_design/common.css.dtml

@@ -107 +107 @@
 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;

WAeUP_SRP/base/skins/waeup_design/stylesheet_properties.props

@@ +1 @@
+# 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

WAeUP_SRP/base/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -56 +56 @@
 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

WAeUP_SRP/base/skins/waeup_student/search_students.py

@@ -14 +14 @@
 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 +203 @@
 
 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 +208 @@
     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 +233 @@
 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 +248 @@
         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 = "",