fixed some hickups in summary templating

diff --git a/webcit/static/t/summary/hedaer.html b/webcit/static/t/summary/hedaer.html
deleted file mode 100644 (file)
index 254d029..0000000
--- a/webcit/static/t/summary/hedaer.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- begin summary_header.html -->
-<script language="javascript" type="text/javascript">
-  document.onkeydown = CtdlMsgListKeyPress;
-</script>
-<div id="message_list_hdr">
-<table cellspacing=0 style="width:100%%">
-<tr>
-<th class="col1"><?_("Subject")><a href="readfwd?startmsg=1&amp;maxmsgs=9999999&amp;is_summary=1&amp;SortOrder=<?SORT:ORDER("subject")>&amp;SortBy=<?SORT:NEXT("subject")>"><img src="<?SORT:ICON("subject")>" /></a></th>
-<th class="col2"><?_("Sender")><a href="readfwd?startmsg=1&amp;maxmsgs=9999999&amp;is_summary=1&amp;SortOrder=<?SORT:ORDER("sender")>&amp;SortBy=<?SORT:NEXT("sender")>"><img src="<?SORT:ICON("sender")>" /></a></th>
-<th class="col3"><?_("Date")><a href="readfwd?startmsg=1&amp;maxmsgs=9999999&amp;is_summary=1&amp;SortOrder=<?SORT:ORDER("date")>&amp;SortBy=<?SORT:NEXT("date")>"><img border="0" src="<?SORT:ICON("date")>" /></a></th>
-</tr>
-</table>
-</div>
-<div id="message_list">
-<div id="message_list_body">
-<!-- end summary_header.html -->

diff --git a/webcit/static/t/summary/page.html b/webcit/static/t/summary/page.html
index b1e4ea3480b75aeb206e38181b9a6f8acca56d2b..1e8ac8ed6934a74b34e46731b7f4ee64e9dc4e30 100644 (file)
--- a/webcit/static/t/summary/page.html
+++ b/webcit/static/t/summary/page.html
@@ -1,4 +1,4 @@
-<?=("summary_header">
+<?=("summary_header")>
 <div id="banner" class="banner">
   <table border=0><tr>
       <td><img src="static/webcit_icons/essen/32x32/summary.png"></td>
@@ -10,7 +10,7 @@
 </div>
 
 <?--("
-* You guessed it ... we're going to refresh using ajax.
+* You guessed it ... were going to refresh using ajax.
 * In the future we might consider updating individual sections of the summary
 * instead of the whole thing.
 ")>
@@ -36,7 +36,7 @@
          <?_("Messages")>
        </div><div class="boxcontent">  
          <div id="msg_inner">
-           <?SUMMARY:NEWMESSAGES_SELECTION>    new_messages_section();
+           <?SUMMARY:NEWMESSAGES_SELECTION>
       </div></div></div>
     </td>
     <td width=33%>
@@ -45,7 +45,7 @@
          <?_("Tasks")>
        </div><div class="boxcontent">  
          <div id="tasks_inner">        
-           <?SUMMARY:TASKSSECTION)>tasks_section();
+           <?SUMMARY:TASKSSECTION)>
       </div></div></div>
     </td>
     <td width=33%>
@@ -54,7 +54,7 @@
        <?_("Today&nbsp;on&nbsp;your&nbsp;calendar")>
        </div><div class="boxcontent">  
          <div id="calendar_inner">
-           <?SUMMARY:CALENDAR_SECTION)calendar_section();
+           <?SUMMARY:CALENDAR_SECTION)
               </div></div></div>
     </td>
     

diff --git a/webcit/tasks.c b/webcit/tasks.c
index dc3fa2c1327979cd4842d4d39fa659c1bb225c90..a799794c6a8c71e5192309d0ece2ebdb91590b62 100644 (file)
--- a/webcit/tasks.c
+++ b/webcit/tasks.c
@@ -573,7 +573,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum, char* from
 
        /* Go back to wherever we came from */
        if (ibstr("return_to_summary") == 1) {
-               summary();
+               do_template("summary_page");
        }
        else {
                readloop(readfwd, eUseDefault);