From: Art Cancro <ajc@citadel.org>
Date: Wed, 11 Nov 2009 17:58:35 +0000 (+0000)
Subject: * Fixed a bug that was causing the initial visit to a Wiki room to fetch the page... 
X-Git-Tag: v7.86~622
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=45951b2999c8c09c27ffbc700ec88e3455aabc7d

* Fixed a bug that was causing the initial visit to a Wiki room to fetch the page list instead of the home 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 53b5b9eb6..f3314a726 100644
--- 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 8763be3e1..fecd91ed2 100644
--- 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 71f052efe..c4292f609 100644
--- 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;
 			}