Mercurial > hg > MPIWGWeb

changeset 218:0babf6e0a454

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
omit talks section if calendar is empty.
author casties
date Wed, 16 Oct 2013 15:44:16 +0200
parents 2598210ada7a
children 5ffb9e7167b6 95e0087b9e19
files zpt/staff/edit_talks.zpt zpt/staff/member_index_html.zpt
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/zpt/staff/edit_talks.zpt	Mon Oct 07 19:45:23 2013 +0200
+++ b/zpt/staff/edit_talks.zpt	Wed Oct 16 15:44:16 2013 +0200
@@ -61,11 +61,14 @@
 
   <h3>Automatic talk events from calendar server</h3>
   <p>
-  Calendar URL: <input name="ics_url" tal:attributes="value cal/url | nothing" size="80"/> <br/>
-  (public iCalendar ICS calendar format). 
+  Calendar URL: <input name="ics_url" tal:attributes="value cal/url | nothing" size="80"/>
   </p>
   <p>
-  Remove URL to enter talks manually.
+  URL has to link to publicly accessible calendar in iCalendar format.<br/> 
+  (e.g. https://sogo.mpiwg-berlin.mpg.de/SOGo/dav/public/mpiwg-calendar/Calendar/A5B-52288800-1-2F304600.ics)
+  </p>
+  <p tal:condition="cal">
+  Remove the calendar URL to enter talks manually.
   </p>
   
   <p>
--- a/zpt/staff/member_index_html.zpt	Mon Oct 07 19:45:23 2013 +0200
+++ b/zpt/staff/member_index_html.zpt	Wed Oct 16 15:44:16 2013 +0200
@@ -75,7 +75,7 @@
     <!-- Talks -->
     <tal:block tal:define="calendar member/getTalksCal">
       <tal:block tal:condition="calendar">
-        <tal:block tal:define="talks python:calendar.getNext(6)">
+        <tal:block tal:define="talks python:calendar.getNext(6)" tal:condition="talks">
         
           <h2 class="line">Talks and presentations</h2>