Mercurial > hg > MPIWGWeb
changeset 109:f8e914a4992d
Merge with bf3dc3a12147050b17dfdb0d9e252acbab7e9773
author | casties |
---|---|
date | Mon, 27 May 2013 23:12:33 +0200 |
parents | 782477730916 (current diff) bf3dc3a12147 (diff) |
children | b554becd8226 |
files | css/mpiwg.css js/mpiwg.js |
diffstat | 3 files changed, 88 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/MPIWGStaff.py Mon May 27 23:12:07 2013 +0200 +++ b/MPIWGStaff.py Mon May 27 23:12:33 2013 +0200 @@ -198,6 +198,72 @@ return [] + def importSortingModeFromOldStaff(self): + """ only used for the migration to the new website """ + ret=[] + for member in self.getMemberList(): + email = member.content.e_mail + un = email.split("@")[0] + + logging.debug(un) + olduser = self.www_neu.members.get(un) + + if not olduser is None: + mode =olduser.getSortingMode() + + + if mode.startswith("year"): + mode="year" + + query="UPDATE personal_www SET publications_mode=%s WHERE key=%s" + + self.executeZSQL(query,[mode,member.getKey()]) + + return ret + + + def importPublishFotoFromOldStaff(self): + """ only used for the migration to the new website """ + ret=[] + for member in self.getMemberList(): + email = member.content.e_mail + un = email.split("@")[0] + + logging.debug(un) + olduser = self.www_neu.members.get(un) + + if not olduser is None: + mode =olduser.getPublishImage() + + + + query="UPDATE personal_www SET image_p=%s WHERE key=%s" + + self.executeZSQL(query,[mode,member.getKey()]) + + return ret + + def showDownloadableFiles(self): + """copy df to the new""" + logging.debug("huh") + ret=[] + + for member in self.getMemberList(onlyCurrent=True): + email = member.content.e_mail + un = email.split("@")[0] + + logging.debug(un) + olduser = self.www_neu.members.get(un) + if olduser is None: + continue; + df = olduser.get('downloadableFiles') + if df is not None: + ret.append(olduser) + + return ret,len(ret) + + + def manage_addMPIWGStaffFolderForm(self): """form for adding the project""" pt=PageTemplateFile('zpt/addMPIWGStaffFolderForm', globals()).__of__(self) @@ -319,7 +385,7 @@ if sortBy == 'priority': query += " ORDER BY priority" - return self.folder.executeZSQL("SELECT oid,* FROM teaching WHERE key_main = %s",[self.content.key]) + return self.folder.executeZSQL(query,[self.content.key]) def getLastUpdateCV(self):
--- a/css/mpiwg.css Mon May 27 23:12:07 2013 +0200 +++ b/css/mpiwg.css Mon May 27 23:12:33 2013 +0200 @@ -3,6 +3,12 @@ * (c) 2013 MPIWG Berlin * Author: Robert Casties */ + + +div.hierlist li.li_project a{ + padding-left:0px; +} + body { margin: 0; font-family: Verdana, Arial, sans-serif;
--- a/js/mpiwg.js Mon May 27 23:12:07 2013 +0200 +++ b/js/mpiwg.js Mon May 27 23:12:33 2013 +0200 @@ -70,6 +70,21 @@ $img.toggle(); } }); + $('.foldable2').each(function () { + var $this = $(this); + var $head = $this.find('.fold_head2'); + var $img = $head.find('img'); + var $body = $this.find('.fold_body2'); + $head.on('click', function () { + $body.slideToggle('fast'); + $img.toggle(); + }).css('cursor', 'pointer'); + if (! $this.hasClass('initially_open')) { + // hide body initially + $body.hide(); + $img.toggle(); + } + }); $('.foldableById').each(function () { var $container = $(this); var io = $container.hasClass('initially_open');