Force wiki room views into the wiki viewer instead of a read loop

[citadel.git] / webcit / wiki.c

diff --git a/webcit/wiki.c b/webcit/wiki.c
index 34067244f533a9f5091dccacbc4c689632ef749f..79ade49e2066fd1ab0be5ba2aef5bdd06b4b9a09 100644 (file)
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -1,5 +1,21 @@
 /*
  * Functions pertaining to rooms with a wiki view
+ *
+ * Copyright (c) 2009-2011 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "webcit.h"
@@ -85,7 +101,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\">"
@@ -160,9 +176,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"));
@@ -203,7 +217,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)")
@@ -282,10 +296,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")) {