# HG changeset patch
# User dwinter
# Date 1393312332 -3600
# Node ID 5584046a6a04fbd6470c6a55c3d38954e81fd38d
# Parent  8fca81581883a572db2acf9010a0139831d325bf# Parent  878de95fb6a2313d9cd132941bde8f341af94616
Merge with 878de95fb6a2313d9cd132941bde8f341af94616

diff -r 878de95fb6a2 -r 5584046a6a04 MPIWGRoot.py
--- a/MPIWGRoot.py	Fri Feb 14 11:53:48 2014 +0100
+++ b/MPIWGRoot.py	Tue Feb 25 08:12:12 2014 +0100
@@ -49,7 +49,7 @@
     # make mpiwg_js refreshable for development
     mpiwg_js.index_html = refreshingImageFileIndexHtml
     # ZMI
-    changeMPIWGRootForm = PageTemplateFile('zpt/root/manage_change')
+    changeMPIWGRootForm = PageTemplateFile('zpt/root/manage_change', globals())
 
 
 
diff -r 878de95fb6a2 -r 5584046a6a04 MPIWGStaff.py
--- a/MPIWGStaff.py	Fri Feb 14 11:53:48 2014 +0100
+++ b/MPIWGStaff.py	Tue Feb 25 08:12:12 2014 +0100
@@ -309,6 +309,33 @@
         return ret+"</body></html>"
 
 
+    def getConeIDsFromDB(self,REQUEST):
+        """holt die cone ids aus personalwww und gibt sie als RDF fuer den cone import zurueck"""
+        
+        qs = "select personal_www.last_name, personal_www.first_name, keys.coneid from personal_www inner join keys on personal_www.key = keys.key_main;"
+        coneIds = self.executeZSQL(qs)
+        
+        ret="""<?xml version="1.0" encoding="UTF-8"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+"""
+        
+        templ="""
+        <rdf:Description rdf:about="%s">
+        <dc:title>%s, %s</dc:title>
+        </rdf:Description>
+        """
+        print coneIds.names()
+        for coneId in coneIds:
+           
+            ret+=templ%(coneId["coneid"],coneId["last_name"],coneId["first_name"])
+            
+        ret+="""
+        </rdf:RDF>
+        """
+        if REQUEST is not None:
+            REQUEST.response.setHeader("Content-type", "text/XML")
+        return ret
+
 def manage_addMPIWGStaffFolderForm(self):
     """form for adding the project"""
     pt=PageTemplateFile('zpt/addMPIWGStaffFolderForm', globals()).__of__(self)
diff -r 878de95fb6a2 -r 5584046a6a04 zpt/staff/edit_publications.zpt
--- a/zpt/staff/edit_publications.zpt	Fri Feb 14 11:53:48 2014 +0100
+++ b/zpt/staff/edit_publications.zpt	Tue Feb 25 08:12:12 2014 +0100
@@ -11,10 +11,10 @@
     <p>
      <input type="radio" name="selectionMode" value="year" 
       tal:attributes="checked python:here.content.publications_mode=='year'" />
-      Show the five most recent publications. (no further action needed)<br/>
+      Show the publications sorted by Date. (no further action needed)<br/>
       <input type="radio" name="selectionMode" value="priority"
         tal:attributes="checked python:here.content.publications_mode=='priority'" />
-      Show selected publications.
+      Show only selected publications by priority.
     </p>
     <p>
       Number of items on profile page: <input name="publications_num" size="2" tal:attributes="value python:here.content.publications_num or 5"/>