Added goto button to page footers.
diff --git a/src/fniki/freenet/filter/WikiContentFilter.java b/src/fniki/freenet/filter/WikiContentFilter.java
--- a/src/fniki/freenet/filter/WikiContentFilter.java
+++ b/src/fniki/freenet/filter/WikiContentFilter.java
@@ -116,6 +116,7 @@ class WikiContentFilter implements Conte
*/
public String processForm(String method, String action) throws CommentException {
if (!(action.startsWith(mContainerPrefix) || action.startsWith(mFproxyPrefix))) {
+ System.err.println("action: " + action);
System.err.println("processForm: REJECTED URI");
filterTripped();
return null;
diff --git a/src/fniki/freenet/plugin/Fniki.java b/src/fniki/freenet/plugin/Fniki.java
--- a/src/fniki/freenet/plugin/Fniki.java
+++ b/src/fniki/freenet/plugin/Fniki.java
@@ -127,7 +127,7 @@ public class Fniki implements FredPlugin
}
if (!mParamTable.containsKey("action")) {
- System.err.println("Forced default action to view");
+ //System.err.println("Forced default action to view");
mParamTable.put("action", "view");
}
diff --git a/src/fniki/standalone/FnikiContextHandler.java b/src/fniki/standalone/FnikiContextHandler.java
--- a/src/fniki/standalone/FnikiContextHandler.java
+++ b/src/fniki/standalone/FnikiContextHandler.java
@@ -97,7 +97,7 @@ public class FnikiContextHandler impleme
}
if (!mParamTable.containsKey("action")) {
- System.err.println("Forced default action to view");
+ //System.err.println("Forced default action to view");
mParamTable.put("action", "view");
}
diff --git a/src/fniki/wiki/HtmlUtils.java b/src/fniki/wiki/HtmlUtils.java
--- a/src/fniki/wiki/HtmlUtils.java
+++ b/src/fniki/wiki/HtmlUtils.java
@@ -147,4 +147,13 @@ public class HtmlUtils {
public static String getVersionLink(String prefix, String name, String uri) {
return getVersionLink(prefix, name, uri, "finished");
}
+
+ public static String gotoPageFormHtml(String basePath, String defaultPage) {
+ final String fmt =
+ "<form method=\"get\" action=\"%s\" accept-charset=\"UTF-8\"> \n" +
+ " <input type=submit value=\"Goto or Create Page\"> \n" +
+ " <input type=\"text\" name=\"title\" value=\"%s\"/> \n" +
+ "</form> \n";
+ return String.format(fmt, makeHref(basePath), defaultPage);
+ }
}
\ No newline at end of file
diff --git a/src/fniki/wiki/WikiApp.java b/src/fniki/wiki/WikiApp.java
--- a/src/fniki/wiki/WikiApp.java
+++ b/src/fniki/wiki/WikiApp.java
@@ -386,6 +386,14 @@ public class WikiApp implements ChildCon
return mFormPassword;
} else if (keyName.equals("default_wikitext")) {
return getDefaultWikiText();
+ } else if (keyName.equals("wikiname")) {
+ if (mArchiveManager.getBissName() != null) {
+ return mArchiveManager.getBissName();
+ }
+ } else if (keyName.equals("fms_group")) {
+ if (mArchiveManager.getFmsGroup() != null) {
+ return mArchiveManager.getFmsGroup();
+ }
}
return defaultValue;
diff --git a/src/fniki/wiki/child/AsyncTaskContainer.java b/src/fniki/wiki/child/AsyncTaskContainer.java
--- a/src/fniki/wiki/child/AsyncTaskContainer.java
+++ b/src/fniki/wiki/child/AsyncTaskContainer.java
@@ -81,9 +81,6 @@ public abstract class AsyncTaskContainer
// DCI: use a single form? Really ugly.
protected void addButtonsHtml(WikiContext context, PrintWriter writer,
String confirmTitle, String cancelTitle) {
-
- System.err.println("addButtonsHtml -- context.getPath(): " + context.getPath());
-
if (confirmTitle != null) {
writer.println(buttonHtml(context.makeLink("/" + context.getPath()), confirmTitle, "confirm"));
}
diff --git a/src/fniki/wiki/child/LoadingVersionList.java b/src/fniki/wiki/child/LoadingVersionList.java
--- a/src/fniki/wiki/child/LoadingVersionList.java
+++ b/src/fniki/wiki/child/LoadingVersionList.java
@@ -117,6 +117,10 @@ public class LoadingVersionList extends
body.println("</head><body>\n");
body.println("<h3>" + escapeHTML(title) + "</h3>");
+ body.println(String.format("wikiname:%s<br>FMS group:%s<p>",
+ escapeHTML(context.getString("wikiname", "NOT_SET")),
+ escapeHTML(context.getString("fms_group", "NOT_SET"))));
+
if (showBuffer) {
body.println(getListHtml());
body.println("<hr>");
diff --git a/src/fniki/wiki/child/WikiContainer.java b/src/fniki/wiki/child/WikiContainer.java
--- a/src/fniki/wiki/child/WikiContainer.java
+++ b/src/fniki/wiki/child/WikiContainer.java
@@ -109,9 +109,9 @@ public class WikiContainer implements Ch
if (context.getStorage().hasPage(name)) {
context.getStorage().deletePage(name);
}
- // DCI: apply uniform style! add link to default page!
- String html = "<html><head><title>Delete Page</title></head><body>Deleted Page</body></html>";
- return html;
+
+ // LATER: do better.
+ return getPageHtml(context, name);
}
private String handleRevert(WikiContext context, String name) throws ChildContainerException, IOException {
@@ -211,10 +211,16 @@ public class WikiContainer implements Ch
buffer.append(" change history for this version. <br>");
buffer.append(makeLocalLink(context, "fniki/getversions", "confirm", "Discover"));
- buffer.append(" other recent version.<br>");
+ buffer.append(String.format(" other recent version of this wiki (wikiname: [%s], FMS group: [%s])<br>",
+ escapeHTML(context.getString("wikiname", "NOT_SET")),
+ escapeHTML(context.getString("fms_group", "NOT_SET"))));
buffer.append(makeLocalLink(context, "fniki/config", "view", "View"));
- buffer.append(" configuration.<br>");
+ buffer.append(" configuration.<p/>\n");
+
+ buffer.append(gotoPageFormHtml(context.makeLink("/" + name),
+ context.getString("default_page", "Front_Page")));
+
buffer.append("</body></html>");
}