* Fixed a bug that was causing the initial visit to a Wiki room to fetch the page...

* Wiki page lists, including search results, are now lists of links to those pages.

diff --git a/webcit/messages.c b/webcit/messages.c
index 53b5b9eb6b15c57d70f540767da4f8066b85cd84..f3314a72685fe04c1012142e07db6e178b74984d 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -773,7 +773,7 @@ void readloop(long oper)
                WCC->wc_view = VIEW_MAILBOX;
        }
 
-       if (WCC->wc_view == VIEW_WIKI) {
+       if ((oper == do_search) && (WCC->wc_view == VIEW_WIKI)) {
                display_wiki_pagelist();
                return;
        }

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 8763be3e185f13f3dd946ed0029f64fde6d1faa4..fecd91ed2cc91eac51c55ddc1efe111495dc0b86 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -50,7 +50,7 @@ body {
        font-weight: 400;
 }
 
-#iconbar_container, .boxcontent,.service form div,table.altern .odd, #message_list, .message_content, #roomlist_div,.editednode,.mailbox_summary, .auth_validate, .event_background, .calendar_background, .calendar_view_background, .graphics_background, .messages_background, .paging_background, .preferences_background, .roomops_background, .sieve_background, .siteconfig_background, .smtpqueue_background, .tabs_background, .useredit_background, .userlist_background, .wiki_history_background .downloads_background, .vcard_edit_background, div.auto_complete, div.auto_complete ul, #summary_view {
+#iconbar_container, .boxcontent,.service form div,table.altern .odd, #message_list, .message_content, #roomlist_div,.editednode,.mailbox_summary, .auth_validate, .event_background, .calendar_background, .calendar_view_background, .graphics_background, .messages_background, .paging_background, .preferences_background, .roomops_background, .sieve_background, .siteconfig_background, .smtpqueue_background, .tabs_background, .useredit_background, .userlist_background, .wiki_history_background, .wiki_pagelist_background, .downloads_background, .vcard_edit_background, div.auto_complete, div.auto_complete ul, #summary_view {
        background-color: #FFF;
        color: #000;
 }

diff --git a/webcit/wiki.c b/webcit/wiki.c
index 71f052efee3d64e29b97045752563a11ca8f5379..c4292f6091db8d1012b13bcfa0212930e69dffef 100644 (file)
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -285,7 +285,7 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
                StrBuf *pagetitle = NewStrBuf();
 
                wc_printf("<div class=\"fix_scrollbar_bug\">"
-                       "<table class=\"wiki_history_background\">"     /* FIXME make its own class */
+                       "<table class=\"wiki_pagelist_background\">"
                );
 
                wc_printf("<th>%s</th>", _("Page title"));
@@ -295,9 +295,11 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
 
                        if (!bmstrcasestr((char *)ChrPtr(pagetitle), "_HISTORY_")) {    /* no history pages */
                                wc_printf("<tr bgcolor=\"%s\">", ((row%2) ? "#FFFFFF" : "#DDDDDD"));
-                               wc_printf("<td>");
-                               escputs(ChrPtr(pagetitle));             /* FIXME make it linkable */
-                               wc_printf("</td>");
+                               wc_printf("<td><a href=\"wiki?page=");
+                               urlescputs(ChrPtr(pagetitle));
+                               wc_printf("\">");
+                               escputs(ChrPtr(pagetitle));
+                               wc_printf("</a></td>");
                                wc_printf("</tr>\n");
                                ++row;
                        }