projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ec63636)
Reworked the summary page to flow through the main header/footer logic. NOTE: you...
authorArt Cancro <ajc@uncensored.citadel.org>
Thu, 15 Mar 2012 21:17:17 +0000 (17:17 -0400)
committerArt Cancro <ajc@uncensored.citadel.org>
Thu, 15 Mar 2012 21:17:17 +0000 (17:17 -0400)
webcit/event.c patch | blob | history
webcit/static/t/iconbar.html patch | blob | history
webcit/static/t/summary/header.html [deleted file] patch | blob | history
webcit/static/t/summary/page.html patch | blob | history
webcit/static/t/summary/trailer.html [deleted file] patch | blob | history
webcit/static/t/trailing.html patch | blob | history
webcit/summary.c patch | blob | history
webcit/tasks.c patch | blob | history
webcit/webcit.h patch | blob | history

diff --git a/webcit/event.c b/webcit/event.c
index 756a8a250dcd7b2617974c138a85fdb67ba83f1b..8bb658e8c1a8b4714eb0e0d62649ea0011ea2236 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -1213,7 +1213,7 @@ STARTOVER:        for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
        /* If this was a save or delete, go back to the calendar or summary view. */
        if (!havebstr("check_button")) {
                if (!strcasecmp(bstr("calview"), "summary")) {
-                       do_template("summary_page");
+                       display_summary_page();
                }
                else {
                        readloop(readfwd, eUseDefault);
diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index d6e568a3ef2576fee573db7a3ccbc773e6d94a00..0ba06be5cf9d68ca5d0b36b1bb48306ec15b5425 100644 (file)
--- a/webcit/static/t/iconbar.html
+++ b/webcit/static/t/iconbar.html
@@ -9,7 +9,7 @@
                <div id="iconbar_menu">
                        <ul id="button">
                                <li id="ib_summary" class="ib_button">
-                                       <a class="ib_button_link" href="do_template?template=summary_page" title="<?_("Your summary page")>">
+                                       <a class="ib_button_link" href="summary" title="<?_("Your summary page")>">
                                                <span><?_("Summary")></span>
                                        </a>
                                </li>
diff --git a/webcit/static/t/summary/header.html b/webcit/static/t/summary/header.html
deleted file mode 100644 (file)
index a0659fd..0000000
--- a/webcit/static/t/summary/header.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-       <head>
-               <title><?CURRENT_ROOM> - <?SERV:HUMANNODE></title>
-               <meta name="MSSmartTagsPreventParsing" content="TRUE">
-               <meta name="keywords" content="groupware messaging collaboration">
-               <link href="static/styles/webcit.css" rel="stylesheet" type="text/css">
-               <link href="static/styles/datepicker.css" rel="stylesheet" type="text/css">
-               <link href="do_template?template=iconbar_user" rel="stylesheet" type="text/css">
-               <link href="static/styles/iconbaricns.css" rel="<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "", "alternate ")>stylesheet" type="text/css" id="style_iconbar_icns" title="Default iconbar">
-               <link href="static/styles/iconbarpiconly.css" rel="<?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_displayas", "","alternate ")>stylesheet" type="text/css" id="style_iconbar_piconly" title="Iconbar without text">
-               <?CSSLOCAL> 
-
-               <script type="text/javascript" src="static/prototype.js"></script> 
-               <script type="text/javascript" src="static/scriptaculous.js"></script> 
-               <script type="text/javascript" src="static/datepicker-dev.js"></script>
-               <script type="text/javascript" src="static/wcpref.js"></script>
-               <script type="text/javascript" src="static/table.js"></script>
-               <script type="text/javascript" src="static/wclib.js"></script>
-               <script type="text/javascript" src="static/authmethods.js"></script>
-               <script type="text/javascript" src="static/roomops.js"></script>
-               <script type="text/javascript" src="static/ctdldragdrop.js"></script>
-               <script type="text/javascript" src="static/modal.js"></script>
-       </head>
-<body>
-<div id="is_logged_in" style="display:none"><?%("COND:LOGGEDIN", 1, 1, 1, "no", "yes")></div>
-<?ICONBAR>
-<div id="global">
-
-<?=("paging_anchor")>
-
-<!--("end head.html")-->
-
-<!-- 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 01a77d77573a9ad829901b74f3d7faeabebd3605..bd03ad4aaa70e3225bb41f029b4dd358a9fdd304 100644 (file)
--- a/webcit/static/t/summary/page.html
+++ b/webcit/static/t/summary/page.html
@@ -1,14 +1,9 @@
-<?=("summary_header")>
-<div id="banner" class="banner">
-  <table border=0><tr>
-      <td><img src="static/webcit_icons/essen/32x32/summary.png"></td>
-      <td><h1><?_("Summary page for ")><??("COND:LOGGEDIN", 1)><?CURRENT_USER("X")><??("X", 1)><?!("COND:LOGGEDIN", 2)><?SERV:HUMANNODE("X")><??("X", 2)></h1><h2><?TIME:NOW></h2></td></tr></table>
-  <div id="actiondiv">
-    <ul class="room_actions">
-      <li class="start_page"><?OFFERSTARTPAGE></li></ul>
-  </div>
+<div id="room_banner_override" style="display:none">
+<table border=0><tr>
+<td><img src="static/webcit_icons/essen/32x32/summary.png"></td>
+<td><h1><?_("Summary page for ")><??("COND:LOGGEDIN", 1)><?CURRENT_USER("X")><??("X", 1)><?!("COND:LOGGEDIN", 2)><?SERV:HUMANNODE("X")><??("X", 2)></h1><h2><?TIME:NOW></h2></td>
+</tr></table>
 </div>
-
 <?--("
 * You guessed it ... were going to refresh using ajax.
 * In the future we might consider updating individual sections of the summary
@@ -84,4 +79,3 @@
  new Ajax.PeriodicalUpdater('do_template', 'template=who_summary',
                             { method: 'get', frequency: 30 }  );
 </script>
-<?=("summary_trailer")>
diff --git a/webcit/static/t/summary/trailer.html b/webcit/static/t/summary/trailer.html
deleted file mode 100644 (file)
index 1739ed1..0000000
--- a/webcit/static/t/summary/trailer.html
+++ /dev/null
@@ -1,14 +0,0 @@
-</div>
-</div>
-<div id="resize_msglist" onMouseDown="CtdlResizeMsgListMouseDown(event)">
-<hr>
-</div>
-<div id="preview_pane">
-<!-- start trailing.html -->
-               <noscript><div id="noscript_warning">
-                       <?_("WARNING: You have JavaScript disabled in your web browser.  Many functions of this system will not work properly.")>
-               </div></noscript>
-               <script type="text/javascript"><?TRAILING_JAVASCRIPT></script>
-</div>
-       </body>
-</html>
diff --git a/webcit/static/t/trailing.html b/webcit/static/t/trailing.html
index c18a0d6e9d093f7345843967736d0376153cd3c0..e15fc9b8cda78b377f21043c95aac76c3925c376 100644 (file)
--- a/webcit/static/t/trailing.html
+++ b/webcit/static/t/trailing.html
@@ -14,6 +14,11 @@
 <noscript><div id="noscript_warning">
        <?_("WARNING: You have JavaScript disabled in your web browser.  Many functions of this system will not work properly.")>
        </div></noscript>
-       <script type="text/javascript"><?TRAILING_JAVASCRIPT></script>
+       <script type="text/javascript">
+               <?TRAILING_JAVASCRIPT>
+               if ( $("room_banner_override") && $("room_banner") ) {
+                       $("room_banner").innerHTML = $("room_banner_override").innerHTML;
+               }
+       </script>
 </body>
 </html>
diff --git a/webcit/summary.c b/webcit/summary.c
index acdf2cdc44b723404a6f25641e3f7dfa59184615..332971ff4da03f95313cac243ea79c40b707a7d4 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -197,6 +197,18 @@ void tmplput_calendar_section(StrBuf *Target, WCTemplputParams *TP) {
        calendar_section();
 }
 
+
+/*
+ * summary page
+ */
+void display_summary_page(void)
+{
+       output_headers(1, 1, 1, 0, 0, 0); 
+       do_template("summary_page");
+       wDumpContent(1);
+}
+
+
 void 
 InitModule_SUMMARY
 (void)
@@ -206,6 +218,7 @@ InitModule_SUMMARY
        RegisterNamespace("SUMMARY:TASKSSECTION", 0, 0, tmplput_tasks_section, NULL, CTX_NONE);
        RegisterNamespace("SUMMARY:CALENDAR_SECTION", 0, 0, tmplput_calendar_section, NULL, CTX_NONE);
 
+       WebcitAddUrlHandler(HKEY("summary"), "", 0, display_summary_page, ANONYMOUS);
        WebcitAddUrlHandler(HKEY("new_messages_html"), "", 0, new_messages_section, AJAX);
        WebcitAddUrlHandler(HKEY("tasks_inner_html"), "", 0, tasks_section, AJAX);
        WebcitAddUrlHandler(HKEY("calendar_inner_html"), "", 0, calendar_section, AJAX);
diff --git a/webcit/tasks.c b/webcit/tasks.c
index adf758378e08cd549c26993ec61d1ba1be3770f6..79c8ec851c84f4f08bf09a057018a1e2ddac9f5d 100644 (file)
--- a/webcit/tasks.c
+++ b/webcit/tasks.c
@@ -570,7 +570,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) {
-               do_template("summary_page");
+               display_summary_page();
        }
        else {
                readloop(readfwd, eUseDefault);
diff --git a/webcit/webcit.h b/webcit/webcit.h
index e713e75bbfb4b0bc62db459339fd082678bdac01..62f9ba204e2c9395423c9e520855d3bbab02d6c8 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -819,3 +819,4 @@ struct bltr {
 
 struct bltr blogview_learn_thread_references(long msgnum);
 void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP);
+void display_summary_page(void);
Citadel server, clients, utilities