# HG changeset patch
# User dwinter
# Date 1369944041 -7200
# Node ID 741ddaf604b14515efacec8c3110ea04635c1b17
# Parent  11b7f98c7ed167ec1fb587eca5437ddeeeb2251c# Parent  2e2dd6a5ab262af6ef4e0a1e19192fd8183608e7
Merge with 2e2dd6a5ab262af6ef4e0a1e19192fd8183608e7

diff -r 11b7f98c7ed1 -r 741ddaf604b1 MPIWGRoot.py
--- a/MPIWGRoot.py	Thu May 30 22:00:15 2013 +0200
+++ b/MPIWGRoot.py	Thu May 30 22:00:41 2013 +0200
@@ -1,12 +1,10 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from App.ImageFile import ImageFile
-from OFS.Image import Image
 from Globals import package_home
 import string
 import os
 import logging
 from OFS.Folder import Folder
-from AccessControl import ClassSecurityInfo
 import sys
 
 from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
@@ -146,7 +144,7 @@
 
     def getSections(self):
         """returns a list of all sections i.e. top-level MPIWGFolders"""
-        items = self.objectValues(spec='MPIWGFolder')[:]
+        items = self.objectValues(spec='MPIWGFolder')
         items.sort(key=lambda x:getInt(getattr(x, 'weight', '0')))
         return items
 
diff -r 11b7f98c7ed1 -r 741ddaf604b1 SrvTxtUtils.py
--- a/SrvTxtUtils.py	Thu May 30 22:00:15 2013 +0200
+++ b/SrvTxtUtils.py	Thu May 30 22:00:41 2013 +0200
@@ -13,7 +13,7 @@
 
 import xml.etree.ElementTree as ET
 
-srvTxtUtilsVersion = "1.9"
+srvTxtUtilsVersion = "1.9.1"
 
 map_months = {'en': [u"",
                u"January",
@@ -122,15 +122,26 @@
 def getDateString(date=None, lang='en', withYear=True, abbrev=False):
     """Return formatted date string."""
     ds = None
+    if callable(date.day):
+        # callable members
+        day = date.day()
+        month = date.month()
+        year = date.year()
+    else:
+        # data members
+        day = date.day
+        month = date.month
+        year = date.year
+        
     if lang.lower() == 'en':
-        ds = "%s, %s"%(getMonthName(date.month(), lang), date.day())
+        ds = "%s, %s"%(getMonthName(month, lang), day)
         if withYear:
-            ds += " %s"%date.year()
+            ds += " %s"%year
             
     elif lang.lower() == 'de':
-        ds = "%s.%s."%(date.day(), date.month())
+        ds = "%s.%s."%(day, month)
         if withYear:
-            ds += " %s"%date.year()
+            ds += " %s"%year
             
     return ds
         
diff -r 11b7f98c7ed1 -r 741ddaf604b1 css/mpiwg.css
--- a/css/mpiwg.css	Thu May 30 22:00:15 2013 +0200
+++ b/css/mpiwg.css	Thu May 30 22:00:41 2013 +0200
@@ -66,6 +66,11 @@
     padding-left: 23px;
 }
 
+a.disk {
+    background: url(../images/submit.png) center left no-repeat;
+    padding-left: 23px;
+}
+
 h1 {
     color: #3b4186;
     font-size: 20px;
@@ -700,6 +705,26 @@
     border: 0;
 }
 
+div.tool.list {
+    font-size: 14px;
+    color: #887163;
+    background-color: #efeeec;
+}
+
+div.tool.list a {
+    color: #3b4186;
+}
+
+div.tool.list ul {
+    list-style-type: none;
+    padding: 0;
+}
+
+div.tool.list li {
+    padding: 0.5em 0.5em 0.5em 20px;
+    border-bottom: 1px solid white;
+}
+
 /*
  * other boxes
  */
@@ -931,16 +956,34 @@
     border-bottom: 1px solid #dccbae;
 }
 
+table.items td.fatline,
+table.items tr.fatline td {
+    border-bottom: 2px solid #dccbae;
+}
+
 table.items td.topline,
 table.items tr.topline td {
     border-top: 1px solid #dccbae;
 }
 
+table.items td.line h2,
+table.items tr.line td h2,
+table.items td.fatline h2,
+table.items tr.fatline td h2 {
+    /* h2 in td.line has no line */
+    border-bottom: 0;
+}
+
 table.items tr.last_item td {
     /* last_item has no padding-top */
     padding: 0 0 0.5em 0;
 }
 
+table.items td p:first-child {
+    /* first p has no margin-top */
+    margin-top: 0;
+}
+
 table.items h3.fold_head {
     font-size: 12px;
     background-color: #f6f2eb;
@@ -995,7 +1038,8 @@
     font-size: 12px;
 }
 
-ul.items td.key {
+ul.items td.key,
+table.items td.key {
     color: #3b4186;
 }
 
@@ -1192,7 +1236,8 @@
 /*
  * project sidebars
  */
-div.sideblock h2 .proj_state {
+div.sideblock h2 .proj_state,
+div.sideblock h2 .more {
     position: absolute;
     right: 0;
 }
diff -r 11b7f98c7ed1 -r 741ddaf604b1 zpt/project/edit_images.zpt
--- a/zpt/project/edit_images.zpt	Thu May 30 22:00:15 2013 +0200
+++ b/zpt/project/edit_images.zpt	Thu May 30 22:00:41 2013 +0200
@@ -36,8 +36,10 @@
       Images without a caption will not be shown in the project description.
     </p>
     <p>
-      The last image in the list is used as the project thumbnail image (140x87px): <img align="middle" width="140" height="87"
-        tal:attributes="src here/getThumbUrl" />
+      The last image in the list is used as the project thumbnail image:
+      <img align="middle" width="120" height="75"
+        tal:attributes="src here/getThumbUrl" /> <br/>
+      Please provide a thumbnail of 120x75px.
     </p>
 
     <h3>Add an Image</h3>