templatize the summary (half baked)

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 3319547a63eff22be5fc6d2fb8cee021cfca0644..769cd23340de585cae83e909316e057a94f34081 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -1535,3 +1535,10 @@ int calendar_RenderView_or_Tail(SharedMessageStatus *Stat,
        DeleteHash(&WC->disp_cal_items);
        return 0;
 }
+
+void 
+InitModule_CALENDAR_VIEW
+(void)
+{
+       WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX);
+}

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index f4db522900a38203e64297925e1586a61dcd12a8..6e2bdb98929bd237f03c655119ce242cad9cf6ff 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -599,6 +599,14 @@ void tmplput_serv_ip(StrBuf *Target, WCTemplputParams *TP)
        StrBufAppendPrintf(Target, "%d", WC->ctdl_pid);
 }
 
+void tmplput_serv_admin(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       if (WCC->serv_info == NULL)
+               return;
+       StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_sysadm, 0);
+}
+
 void tmplput_serv_nodename(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
@@ -778,6 +786,7 @@ InitModule_SERVFUNC
        RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level, NULL, CTX_NONE);
        RegisterNamespace("SERV:BBS_CITY", 0, 1, tmplput_serv_bbs_city, NULL, CTX_NONE);
        RegisterNamespace("SERV:MESG", 1, 2, tmplput_mesg, NULL, CTX_NONE);
+       RegisterNamespace("SERV:ADMIN", 1, 2, tmplput_serv_admin, NULL, CTX_NONE);
 }
 
 

diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index 0ba06be5cf9d68ca5d0b36b1bb48306ec15b5425..d6e568a3ef2576fee573db7a3ccbc773e6d94a00 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="summary" title="<?_("Your summary page")>">
+                                       <a class="ib_button_link" href="do_template?template=summary_page" title="<?_("Your summary page")>">
                                                <span><?_("Summary")></span>
                                        </a>
                                </li>

diff --git a/webcit/summary.c b/webcit/summary.c
index 582ce2b243ed7f2ed4c8752d0bea9cd266dc515a..1c37a0f15c775b5ab75dc380c00f552e4d5f8d0e 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -36,10 +36,25 @@ void output_date(void) {
        wc_printf("%s", buf);
 }
 
+void tmplput_output_date(StrBuf *Target, WCTemplputParams *TP)
+{
+       struct tm tm;
+       time_t now;
+       char buf[128];
+       size_t n;
+
+       time(&now);
+       localtime_r(&now, &tm);
+
+       n = wc_strftime(buf, 32, "%A, %x", &tm);
+       StrBufAppendBufPlain(Target, buf, n, 0);
+}
+
+
 /*
  * New messages section
  */
-void new_messages_section(void) {
+void new_messages_section(StrBuf *Target, WCTemplputParams *TP) {
        char buf[SIZ];
        char room[SIZ];
        int i;
@@ -76,7 +91,7 @@ void new_messages_section(void) {
 /*
  * Task list section
  */
-void tasks_section(void) {
+void tasks_section(StrBuf *Target, WCTemplputParams *TP) {
        int num_msgs = 0;
        HashPos *at;
        const char *HashKey;
@@ -123,7 +138,7 @@ void tasks_section(void) {
 /*
  * Calendar section
  */
-void calendar_section(void) {
+void calendar_section(StrBuf *Target, WCTemplputParams *TP) {
        char cmd[SIZ];
        int num_msgs = 0;
        HashPos *at;
@@ -172,171 +187,13 @@ void calendar_section(void) {
        __calendar_Cleanup(&v);
 }
 
-/*
- * Server info section (fluff, really)
- */
-void server_info_section(void) {
-       char message[512];
-       wcsession *WCC = WC;
-
-       snprintf(message, sizeof message,
-               _("You are connected to %s, running %s with %s, server build %s and located in %s.  Your system administrator is %s."),
-                ChrPtr(WCC->serv_info->serv_humannode),
-                ChrPtr(WCC->serv_info->serv_software),
-                PACKAGE_STRING,
-                ChrPtr(WCC->serv_info->serv_svn_revision),
-                ChrPtr(WCC->serv_info->serv_bbs_city),
-                ChrPtr(WCC->serv_info->serv_sysadm));
-       escputs(message);
-}
-
-/*
- * Now let's do three columns of crap.  All portals and all groupware
- * clients seem to want to do three columns, so we'll do three
- * columns too.  Conformity is not inherently a virtue, but there are
- * a lot of really shallow people out there, and even though they're
- * not people I consider worthwhile, I still want them to use WebCit.
- */
-void summary_inner_div(void) {
-
-       wc_printf("<table width=\"98%%\" cellspacing=\"3\" cellpadding=\"0\">");
-       wc_printf("<tr valign=top>");
-
-       /*
-        * Column One
-        */
-       wc_printf("<td width=\"33%%\">");
-       wc_printf("<div class=\"box\">");
-       wc_printf("<div class=\"boxlabel\">");
-       wc_printf(_("Messages"));
-       wc_printf("</div><div class=\"boxcontent\">");
-       wc_printf("<div id=\"msg_inner\">");
-       new_messages_section();
-       wc_printf("</div></div></div>");
-       wc_printf("</td>");
-
-       /*
-        * Column Two
-        */
-       wc_printf("<td width=\"33%%\">");
-       wc_printf("<div class=\"box\">");
-       wc_printf("<div class=\"boxlabel\">");
-       wc_printf(_("Tasks"));
-       wc_printf("</div><div class=\"boxcontent\">");
-       wc_printf("<div id=\"tasks_inner\">");
-       tasks_section();
-       wc_printf("</div></div></div>");
-       wc_printf("</td>");
-
-       /*
-        * Column Three
-        */
-       wc_printf("<td width=\"33%%\">");
-       wc_printf("<div class=\"box\">");
-       wc_printf("<div class=\"boxlabel\">");
-       wc_printf(_("Today&nbsp;on&nbsp;your&nbsp;calendar"));
-       wc_printf("</div><div class=\"boxcontent\">");
-       wc_printf("<div id=\"calendar_inner\">");
-       calendar_section();
-       wc_printf("</div></div></div>");
-       wc_printf("</td>");
-
-       wc_printf("</tr><tr valign=top>");
-
-       /*
-        * Row Two - Column One
-        */
-       wc_printf("<td colspan=2>");
-       wc_printf("<div class=\"box\">");
-       wc_printf("<div class=\"boxlabel\">");
-       wc_printf(_("Who's&nbsp;online&nbsp;now"));
-       wc_printf("</div><div class=\"boxcontent\">");
-       wc_printf("<div id=\"who_inner\">");
-       do_template("who_summary");
-       wc_printf("</div></div></div>");
-       wc_printf("</td>");
-
-       /*
-        * Row Two - Column Two
-        */
-       wc_printf("<td width=\"33%%\">");
-       wc_printf("<div class=\"box\">");
-       wc_printf("<div class=\"boxlabel\">");
-       wc_printf(_("About&nbsp;this&nbsp;server"));
-       wc_printf("</div><div class=\"boxcontent\">");
-       wc_printf("<div id=\"info_inner\">");
-       server_info_section();
-       wc_printf("</div></div></div>");
-       wc_printf("</td>");
-
-
-       /*
-        * End of columns
-        */
-       wc_printf("</tr></table>");
-}
-
-
-/*
- * Display this user's summary page
- */
-void summary(void) {
-       char title[256];
-
-       output_headers(1, 1, 2, 0, 0, 0);
-       wc_printf("<div id=\"banner\" class=\"banner\">\n");
-       wc_printf("<table border=0><tr>");
-        wc_printf("<td><img src=\"static/webcit_icons/essen/32x32/summary.png\" alt=\"\"></td>");
-        wc_printf("<td><h1>");
-        snprintf(title, sizeof title, _("Summary page for %s"),
-               ( (WC->logged_in) ?  ChrPtr(WC->wc_fullname) : ChrPtr(WC->serv_info->serv_humannode))
-       );
-        escputs(title);
-        wc_printf("</h1><h2>");
-        output_date();
-        wc_printf("</h2></td></tr></table>");
-       wc_printf("<div id=\"actiondiv\">");
-       wc_printf("<ul class=\"room_actions\">\n");
-       wc_printf("<li class=\"start_page\">");
-       offer_start_page(NULL, &NoCtx);
-        wc_printf("</li></ul>");
-        wc_printf("</div>");   /* actiondiv */
-        wc_printf("</div>");   /* banner */
-
-       /*
-        * You guessed it ... we're going to refresh using ajax.
-        * In the future we might consider updating individual sections of the summary
-        * instead of the whole thing.
-        */
-       wc_printf("<div id=\"content\" class=\"service\">\n");
-       summary_inner_div();
-       wc_printf("</div>\n");
-
-       wc_printf(
-               "<script type=\"text/javascript\">                                      "
-               " new Ajax.PeriodicalUpdater('msg_inner', 'new_messages_html',          "
-               "                            { method: 'get', frequency: 60 }  );       "
-               " new Ajax.PeriodicalUpdater('tasks_inner', 'tasks_inner_html',         "
-               "                            { method: 'get', frequency: 120 }  );      "
-               " new Ajax.PeriodicalUpdater('calendar_inner', 'calendar_inner_html',           "
-               "                            { method: 'get', frequency: 90 }  );       "
-               " new Ajax.PeriodicalUpdater('do_template', 'template=who_summary',     "
-               "                            { method: 'get', frequency: 30 }  );       "
-               "</script>                                                              \n"
-       );
-
-       wDumpContent(1);
-}
-
 void 
 InitModule_SUMMARY
 (void)
 {
-       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);
-       WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX);
-       WebcitAddUrlHandler(HKEY("summary"), "", 0, summary, 0);
-       WebcitAddUrlHandler(HKEY("summary_inner_div"), "", 0, summary_inner_div, AJAX);
+       RegisterNamespace("TIME:NOW", 0, 0, tmplput_output_date, NULL, CTX_NONE);
+       RegisterNamespace("SUMMARY:NEWMESSAGES_SELECTION", 0, 0, new_messages_section, NULL, CTX_NONE);
+       RegisterNamespace("SUMMARY:TASKSSECTION", 0, 0, tasks_section, NULL, CTX_NONE);
+       RegisterNamespace("SUMMARY:CALENDAR_SECTION", 0, 0, calendar_section, NULL, CTX_NONE);
 }
 

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 117f8fdf9e0c2147ae00704398395ef77f3e7b01..ac44ac1fd35ac2ffbb73d42f9ff2fbe6eeeced6a 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -961,6 +961,12 @@ void tmplput_csslocal(StrBuf *Target, WCTemplputParams *TP)
                        csslocal, 0);
 }
 
+void tmplput_packagestring(StrBuf *Target, WCTemplputParams *TP)
+{
+       StrBufAppendBufPlain(Target, 
+                            HKEY(PACKAGE_STRING), 0);
+}
+
 extern char static_local_dir[PATH_MAX];
 
 
@@ -986,6 +992,7 @@ InitModule_WEBCIT
        RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, NULL, CTX_NONE);
        RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, NULL, CTX_NONE);
        RegisterNamespace("URL:DISPLAYNAME", 0, 1, tmplput_HANDLER_DISPLAYNAME, NULL, CTX_NONE);
+       RegisterNamespace("PACKAGESTRING", 0, 1, tmplput_packagestring, NULL, CTX_NONE);
 
        
        snprintf(dir, SIZ, "%s/webcit.css", static_local_dir);