Revert "Revert "Removed the "fix_scrollbarbug" div and all references to it.""

[citadel.git] / webcit / wiki.c

diff --git a/webcit/wiki.c b/webcit/wiki.c
index 71f052efee3d64e29b97045752563a11ca8f5379..c5bb3086c7ba8c76db3e9c7fe9b086a63d262f26 100644 (file)
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Functions pertaining to rooms with a wiki view
  */
 
@@ -46,19 +44,19 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev
        if (StrLength(roomname) > 0) {
 
                /* If we're not in the correct room, try going there. */
-               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) {
+               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
                        gotoroom(roomname);
                }
        
                /* If we're still not in the correct room, it doesn't exist. */
-               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) {
+               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
                        wc_printf(_("There is no room called '%s'."), ChrPtr(roomname));
                        return;
                }
 
        }
 
-       if (WC->wc_view != VIEW_WIKI) {
+       if (WC->CurRoom.view != VIEW_WIKI) {
                wc_printf(_("'%s' is not a Wiki room."), ChrPtr(roomname));
                return;
        }
@@ -139,12 +137,12 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
        if (StrLength(roomname) > 0) {
 
                /* If we're not in the correct room, try going there. */
-               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) {
+               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
                        gotoroom(roomname);
                }
        
                /* If we're still not in the correct room, it doesn't exist. */
-               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) {
+               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
                        wc_printf(_("There is no room called '%s'."), ChrPtr(roomname));
                        return;
                }
@@ -162,9 +160,7 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
                StrBuf *author = NewStrBuf();
                StrBuf *node = NewStrBuf();
 
-               wc_printf("<div class=\"fix_scrollbar_bug\">"
-                       "<table class=\"wiki_history_background\">"
-               );
+               wc_printf("<table class=\"wiki_history_background\">");
 
                wc_printf("<th>%s</th>", _("Date"));
                wc_printf("<th>%s</th>", _("Author"));
@@ -261,12 +257,12 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
        roomname = sbstr("room");
        if (StrLength(roomname) > 0) {
                /* If we're not in the correct room, try going there. */
-               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) {
+               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
                        gotoroom(roomname);
                }
        
                /* If we're still not in the correct room, it doesn't exist. */
-               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) {
+               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
                        wc_printf(_("There is no room called '%s'."), ChrPtr(roomname));
                        return;
                }
@@ -284,10 +280,7 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
        if (GetServerStatus(Buf, NULL) == 1) {
                StrBuf *pagetitle = NewStrBuf();
 
-               wc_printf("<div class=\"fix_scrollbar_bug\">"
-                       "<table class=\"wiki_history_background\">"     /* FIXME make its own class */
-               );
-
+               wc_printf("<table class=\"wiki_pagelist_background\">");
                wc_printf("<th>%s</th>", _("Page title"));
 
                while(StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
@@ -295,9 +288,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;
                        }
@@ -325,11 +320,35 @@ int wiki_Cleanup(void **ViewSpecific)
 {
        char pagename[5];
        safestrncpy(pagename, "home", sizeof pagename);
-       display_wiki_page_backend(WC->wc_roomname, pagename, "", 0);
+       display_wiki_page_backend(WC->CurRoom.name, pagename, "", 0);
        wDumpContent(1);
        return 0;
 }
 
+
+
+
+
+
+int ConditionalHaveWikiPage(StrBuf *Target, WCTemplputParams *TP)
+{
+       const char *page;
+       const char *pch;
+       long len;
+
+       page = BSTR("page");
+       GetTemplateTokenString(Target, TP, 2, &pch, &len);
+       return strcasecmp(page, pch) == 0;
+}
+int ConditionalHavewikiType(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       const char *pch;
+       long len;
+
+       GetTemplateTokenString(Target, TP, 1, &pch, &len);
+       return bmstrcasestr((char *)ChrPtr(WCC->Hdr->HR.ReqLine), pch) != NULL;
+}
 void 
 InitModule_WIKI
 (void)
@@ -340,6 +359,7 @@ InitModule_WIKI
                NULL,
                NULL,
                NULL,
+               NULL,
                wiki_Cleanup
        );
 
@@ -348,4 +368,6 @@ InitModule_WIKI
        WebcitAddUrlHandler(HKEY("wiki_pagelist"), "", 0, display_wiki_pagelist, 0);
        RegisterNamespace("WIKI:DISPLAYHISTORY", 0, 0, tmplput_display_wiki_history, NULL, CTX_NONE);
        RegisterNamespace("WIKI:DISPLAYPAGELIST", 0, 0, tmplput_display_wiki_pagelist, NULL, CTX_NONE);
+       RegisterConditional(HKEY("COND:WIKI:PAGE"), 1, ConditionalHaveWikiPage, CTX_NONE);
+       RegisterConditional(HKEY("COND:WIKI:TYPE"), 1, ConditionalHavewikiType, CTX_NONE);
 }