Mercurial > hg > MPIWGWeb

changeset 237:45ef92d6aa8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ignore state of current_work_p.
author casties
date Wed, 08 Jan 2014 14:24:36 +0100
parents c90c8333ca8f
children 5f5d7f07c1bd 8fca81581883
files MPIWGStaff.py zpt/staff/edit_shortEntry.zpt zpt/www/common_template.zpt
diffstat 3 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/MPIWGStaff.py	Wed Jan 08 10:36:16 2014 +0100
+++ b/MPIWGStaff.py	Wed Jan 08 14:24:36 2014 +0100
@@ -1023,7 +1023,7 @@
             ret+=found.interest+'<br/>'
         if founds:
             ret+='</p>\n'
-        if (self.content.current_work_p == 'yes') and self.content.current_work:
+        if self.content.current_work:
             ret+="<h3>Current work</h3>"
             ret+='<p>'+self.content.current_work+'</p>\n'
         if (self.content.cv_p == 'yes') and self.content.cv:
--- a/zpt/staff/edit_shortEntry.zpt	Wed Jan 08 10:36:16 2014 +0100
+++ b/zpt/staff/edit_shortEntry.zpt	Wed Jan 08 14:24:36 2014 +0100
@@ -17,13 +17,13 @@
       <table>
         <tr>
           <th />
-          <th>Show</th>
+          <!-- <th>Show</th> -->
         </tr>
         <tr>
           <td><input tal:attributes="name string:current_work; value here/content/current_work" size="80" />
           </td>
-          <td tal:define="name string:current_work_p; value here/content/current_work_p;"><span
-            metal:use-macro="here/common_template/macros/yesno_input_radio" /></td>
+          <!-- <td tal:define="name string:current_work_p; value here/content/current_work_p;"><span
+            metal:use-macro="here/common_template/macros/yesno_input_radio" /></td> -->
         </tr>
       </table>
       <p>
--- a/zpt/www/common_template.zpt	Wed Jan 08 10:36:16 2014 +0100
+++ b/zpt/www/common_template.zpt	Wed Jan 08 14:24:36 2014 +0100
@@ -108,10 +108,9 @@
     <td><span tal:replace="python:here.replaceNotEmpty('%s ',member.content.titles_new)" /> (<span
       tal:replace="python:here.replaceNotEmpty('%s, ',member.content.status)" /> <span
       tal:replace="python:here.replaceNotEmpty('%s',member.content.date_stay_at_mpiwg)" /><span
-      tal:replace="python:here.replaceNotEmpty(', funded by the %s',member.content.funded_by)" />)<tal:x
-        condition="python:member.content.current_work_p=='yes'"><i 
+      tal:replace="python:here.replaceNotEmpty(', funded by the %s',member.content.funded_by)" />)<i 
         tal:content="python:here.replaceNotEmpty(': %s',member.content.current_work)" />
-      </tal:x> <tal:block tal:condition="python:member.content.e_mail_p=='yes'">
+      <tal:block tal:condition="python:member.content.e_mail_p=='yes'">
         <br />
         <a class="email" tal:attributes="href python:'mailto:'+member.content.e_mail" tal:content="member/content/e_mail">[FMP-field:
           e_mail]</a>