Performed a bunch of markup fixes suggested by validator.w3.org

[citadel.git] / webcit / wiki.c

diff --git a/webcit/wiki.c b/webcit/wiki.c
index 2b0ba7f888eb905a6d5e19a63e8a7f928d86748b..ff4a45a27f522d28096e3b1175d498e1f46d9c8c 100644 (file)
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Functions pertaining to rooms with a wiki view
  */
 
@@ -87,7 +85,7 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev
                return;
        }
 
-       wc_printf("<br /><br />"
+       wc_printf("<br><br>"
                "<div align=\"center\">"
                "<table border=\"0\" bgcolor=\"#ffffff\" cellpadding=\"10\">"
                "<tr><td align=\"center\">"
@@ -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"));
@@ -205,7 +201,7 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
                                        ChrPtr(rev_uuid),
                                        _("(show)")
                                );
-                               wc_printf("<td><a href=\"wiki?page=%s?rev=%s?revert=1\">%s</a></td>",
+                               wc_printf("<td><a href=\"javascript:GetLoggedInFirst(encodeURIComponent('wiki?page=%s?rev=%s?revert=1'))\">%s</a></td>",
                                        bstr("page"),
                                        ChrPtr(rev_uuid),
                                        _("(revert)")
@@ -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_pagelist_background\">"
-               );
-
+               wc_printf("<table class=\"wiki_pagelist_background\">");
                wc_printf("<th>%s</th>", _("Page title"));
 
                while(StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
@@ -332,6 +325,30 @@ int wiki_Cleanup(void **ViewSpecific)
        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)
@@ -351,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);
 }