# HG changeset patch
# User casties
# Date 1369155005 -7200
# Node ID f4ac675b2031025e865b653c63af6d92ac8bdc01
# Parent 84fa3f62ed85c0650e4f31b84410d195cdcb97fc
more members pages.
diff -r 84fa3f62ed85 -r f4ac675b2031 MPIWGRoot.py
--- a/MPIWGRoot.py Tue May 21 17:07:48 2013 +0200
+++ b/MPIWGRoot.py Tue May 21 18:50:05 2013 +0200
@@ -137,7 +137,7 @@
subsecs = sec.objectItems(spec=self.nav_meta_types)
subsecs = [s for s in subsecs if s[1].title != ""]
- subsecs.sort(key=lambda x:int(getattr(x[1],'weight','0')))
+ subsecs.sort(key=lambda x:getInt(getattr(x[1], 'weight', '0')))
return subsecs
# compatibility
@@ -147,7 +147,7 @@
def getSections(self):
"""returns a list of all sections i.e. top-level MPIWGFolders"""
items = self.objectValues(spec='MPIWGFolder')[:]
- items.sort(key=lambda x:int(x.weight))
+ items.sort(key=lambda x:getInt(getattr(x, 'weight', '0')))
return items
diff -r 84fa3f62ed85 -r f4ac675b2031 MPIWGStaff.py
--- a/MPIWGStaff.py Tue May 21 17:07:48 2013 +0200
+++ b/MPIWGStaff.py Tue May 21 18:50:05 2013 +0200
@@ -220,7 +220,9 @@
# templates
mainEditFile=PageTemplateFile('zpt/staff/edit_main', globals())
-
+ talks_full_html = PageTemplateFile('zpt/staff/talks_full_html', globals())
+ teaching_full_html = PageTemplateFile('zpt/staff/teaching_full_html', globals())
+
def __init__(self, folder, dbresult):
"""constructor: takes parent MPIWGStaffFolder and content (DB row)"""
@@ -297,13 +299,27 @@
getUrl = MPIWGHelper.getUrl
- def getTalks(self):
- return self.folder.executeZSQL("SELECT oid,* FROM talks WHERE key_main = %s",[self.content.key])
- #return self.folder.ZSQLInlineSearch(_table='talks',key_main=self.content.key)
+ def getTalks(self, published=True, sortBy='priority'):
+ """Return the list of talks"""
+ query = "SELECT oid,* FROM talks WHERE key_main = %s"
+ if published:
+ query += " and published = 'yes'"
+
+ if sortBy == 'priority':
+ query += " order by priority"
+
+ return self.folder.executeZSQL(query, [self.content.key])
-
- def getTeaching(self):
- return self.folder.executeZSQL("SELECT oid,* FROM teaching WHERE key_main = %s",[self.content.key])
+ def getTeaching(self, published=True, sortBy='priority'):
+ """Return the list of teaching activities"""
+ query = "SELECT oid,* FROM teaching WHERE key_main = %s"
+ if published:
+ query += " AND published = 'yes'"
+
+ if sortBy == 'priority':
+ query += " ORDER BY priority"
+
+ return self.folder.executeZSQL("SELECT oid,* FROM teaching WHERE key_main = %s",[self.content.key])
def getLastUpdateCV(self):
@@ -668,13 +684,10 @@
return {}
- def publicationsFull(self,REQUEST):
+ def publications_full_html(self, REQUEST):
"""show publication"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/staff/pubman','show_publications.zpt')).__of__(self)
+ pt=PageTemplateFile('zpt/staff/pubman/show_publications.zpt', globals()).__of__(self)
return pt(member=self.content)
-
-
-
def addPublicationsFromPubman(self,REQUEST):
@@ -776,7 +789,7 @@
def getSelectedPublications(self):
"""hole publications aus der datenbank"""
- query="select * from pubmanbiblio where lower(key_main) = lower(%s) order by priority DESC"
+ query="select * from pubmanbiblio where lower(key_main) = lower(%s) order by priority ASC"
return self.executeZSQL(query,[self.getKey()])
diff -r 84fa3f62ed85 -r f4ac675b2031 css/mpiwg.css
--- a/css/mpiwg.css Tue May 21 17:07:48 2013 +0200
+++ b/css/mpiwg.css Tue May 21 18:50:05 2013 +0200
@@ -106,6 +106,14 @@
line-height: 1.5;
}
+ul.plain {
+ list-style-type: none;
+ padding-left: 0.5em;
+}
+ul.plain > li {
+ margin-top: 0.5em;
+}
+
ul.inline {
display: inline;
padding: 0;
@@ -828,6 +836,9 @@
table.items td:last-child {
padding-right: 0;
}
+table.items.shorter td {
+ padding: 0.5em 0.5em 0.5em 0;
+}
table.items th {
font-family: Georgia, Times, serif;
diff -r 84fa3f62ed85 -r f4ac675b2031 zpt/project/project_index_html.zpt
--- a/zpt/project/project_index_html.zpt Tue May 21 17:07:48 2013 +0200
+++ b/zpt/project/project_index_html.zpt Tue May 21 18:50:05 2013 +0200
@@ -33,12 +33,11 @@
History of Scientific Objectivity, 18th-19th Cs
diff -r 84fa3f62ed85 -r f4ac675b2031 zpt/staff/edit_talks.zpt
--- a/zpt/staff/edit_talks.zpt Tue May 21 17:07:48 2013 +0200
+++ b/zpt/staff/edit_talks.zpt Tue May 21 18:50:05 2013 +0200
@@ -8,7 +8,7 @@