boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

added topmenu as defined for search to wiki

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7718 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 14 years ago
parent 229df8b626
commit b04382bc59
2 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File

32
htroot/Wiki.html
Unescape View File

@ -5,15 +5,11 @@
#%env/templates/metas.template%# #%env/templates/metas.template%#
</head> </head>
<body id="Wiki"> <body id="Wiki">
#(display)# #(topmenu)#
#%env/templates/simpleheader.template%#
#%env/templates/submenuPublication.template%#
::
#%env/templates/header.template%#
#%env/templates/submenuPublication.template%#
::
#%env/templates/embeddedheader.template%# #%env/templates/embeddedheader.template%#
#(/display)# ::
#%env/templates/simpleheader.template%#
#(/topmenu)#
#(mode)# #(mode)#
<!-- 0: viewing --> <!-- 0: viewing -->
@ -23,13 +19,13 @@
#[page]# #[page]#
</div> </div>
<p class="PostInfo"> <p class="PostInfo">
last edited by #[author]# | change date #[date]# | <a href="Wiki.html?page=#[pagename]#&amp;display=#[display]#&amp;edit=Edit">Edit</a> #(access)#(only granted to admin)::#(/access)# last edited by #[author]# | change date #[date]# | <a href="Wiki.html?page=#[pagename]#&amp;edit=Edit">Edit</a> #(access)#(only granted to admin)::#(/access)#
</p> </p>
</div> </div>
<p class="Navigation"> <p class="Navigation">
<a href="Wiki.html?display=#[display]#">Start Page</a> - <a href="Wiki.html">Start Page</a> -
<a href="Wiki.html?index=Index&amp;display=#[display]#">Index</a> - <a href="Wiki.html?index=Index">Index</a> -
<a href="Wiki.html?page=#[pagename]#&amp;diff=&amp;display=#[display]#">Versions</a> - <a href="Wiki.html?page=#[pagename]#&amp;diff=">Versions</a> -
</p> </p>
<form method="post" action="Wiki.html"><div> <form method="post" action="Wiki.html"><div>
<label for="access">Grant Write Access to</label> <label for="access">Grant Write Access to</label>
@ -54,7 +50,6 @@
You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Wiki Code</a> here. You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Wiki Code</a> here.
</p> </p>
<input type="hidden" name="page" value="#[pagename]#" /> <input type="hidden" name="page" value="#[pagename]#" />
<input type="hidden" name="display" value="#[display]#" />
<input type="hidden" name="reason" value="edit" /> <input type="hidden" name="reason" value="edit" />
<input type="submit" name="submit" value="Submit" /> <input type="submit" name="submit" value="Submit" />
<input type="submit" name="preview" value="Preview" /> <input type="submit" name="preview" value="Preview" />
@ -97,7 +92,6 @@
You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Wiki Code</a> here. You can use <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Wiki Code</a> here.
</p> </p>
<input type="hidden" name="page" value="#[pagename]#" /> <input type="hidden" name="page" value="#[pagename]#" />
<input type="hidden" name="display" value="#[display]#" />
<input type="hidden" name="reason" value="edit" /> <input type="hidden" name="reason" value="edit" />
<input type="submit" name="submit" value="Submit" /> <input type="submit" name="submit" value="Submit" />
<input type="submit" name="preview" value="Preview" /> <input type="submit" name="preview" value="Preview" />
@ -115,7 +109,7 @@
</tr> </tr>
#{pages}# #{pages}#
<tr class="TableCellLight"> <tr class="TableCellLight">
<td><a href="Wiki.html?page=#[name]#&amp;display=#[display]#">#[subject]#</a></td> <td><a href="Wiki.html?page=#[name]#">#[subject]#</a></td>
<td>#[date]#</td> <td>#[date]#</td>
<td>#[author]#</td> <td>#[author]#</td>
</tr> </tr>
@ -123,7 +117,7 @@
</table> </table>
#(error)#::<p class="error">IO Error reading wiki database: #[message]#</p>#(/error)# #(error)#::<p class="error">IO Error reading wiki database: #[message]#</p>#(/error)#
<p class="Navigation"> <p class="Navigation">
<a href="Wiki.html?display=#[display]#">Start Page</a> <a href="Wiki.html">Start Page</a>
</p> </p>
:: ::
<!-- 4: Diff --> <!-- 4: Diff -->
@ -132,7 +126,6 @@
<form method="get" action="Wiki.html"> <form method="get" action="Wiki.html">
<fieldset><legend>Select versions of page '#[page]#'</legend> <fieldset><legend>Select versions of page '#[page]#'</legend>
<input type="hidden" name="page" value="#[page]#" /> <input type="hidden" name="page" value="#[page]#" />
<input type="hidden" name="display" value="#[display]#" />
<input type="hidden" name="diff" value="" /> <input type="hidden" name="diff" value="" />
<dl> <dl>
<dt><label for="old">Compare version from</label>:</dt> <dt><label for="old">Compare version from</label>:</dt>
@ -195,7 +188,6 @@
<a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Wiki Code</a> here. <a href="WikiHelp.html" onclick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=640,height=480');return false;">Wiki Code</a> here.
</p> </p>
<input type="hidden" name="page" value="#[pagename]#" /> <input type="hidden" name="page" value="#[pagename]#" />
<input type="hidden" name="display" value="#[display]#" />
<input type="hidden" name="reason" value="edit" /> <input type="hidden" name="reason" value="edit" />
<input type="submit" name="submit" value="Submit" /> <input type="submit" name="submit" value="Submit" />
<input type="submit" name="preview" value="Preview" /> <input type="submit" name="preview" value="Preview" />
@ -204,8 +196,8 @@
</form> </form>
#(/versioning)# #(/versioning)#
<p class="Navigation"> <p class="Navigation">
<a href="Wiki.html?display=#[display]#">Start Page</a> - <a href="Wiki.html">Start Page</a> -
<a href="Wiki.html?page=#[page]#&amp;display=#[display]#">Return to #[page]#</a> <a href="Wiki.html?page=#[page]#&amp;">Return to #[page]#</a>
</p> </p>
#(/mode)# #(/mode)#

21
htroot/Wiki.java
Unescape View File

@ -69,9 +69,7 @@ public class Wiki {
post.put("page", "start"); post.put("page", "start");
} }
final boolean authenticated = sb.adminAuthenticated(header) >= 2; prop.put("topmenu", sb.getConfigBool("publicTopmenu", true) ? 1 : 0);
final int display = ((post == null) || (!authenticated)) ? 0 : post.getInt("display", 0);
prop.put("display", display);
String access = sb.getConfig("WikiAccess", "admin"); String access = sb.getConfig("WikiAccess", "admin");
final String pagename = get(post, "page", "start"); final String pagename = get(post, "page", "start");
@ -125,11 +123,9 @@ public class Wiki {
} }
page = newEntry; page = newEntry;
prop.putHTML("LOCATION", "/Wiki.html?page=" + pagename); prop.putHTML("LOCATION", "/Wiki.html?page=" + pagename);
prop.put("LOCATION", prop.get("LOCATION") + "&display=" + display); prop.put("LOCATION", prop.get("LOCATION"));
} }
prop.put("mode_display", display);
if (post != null && post.containsKey("edit")) { if (post != null && post.containsKey("edit")) {
if ((access.equals("admin") && (!sb.verifyAuthentication(header, true)))) { if ((access.equals("admin") && (!sb.verifyAuthentication(header, true)))) {
// check access right for admin // check access right for admin
@ -140,16 +136,13 @@ public class Wiki {
prop.put("mode", "1"); //edit prop.put("mode", "1"); //edit
prop.putHTML("mode_author", author); prop.putHTML("mode_author", author);
prop.putHTML("mode_page-code", UTF8.String(page.page())); prop.putHTML("mode_page-code", UTF8.String(page.page()));
prop.putHTML("mode_pagename", pagename); prop.putHTML("mode_pagename", pagename); }
prop.put("mode_display", display);
}
//contributed by [MN] //contributed by [MN]
else if (post != null && post.containsKey("preview")) { else if (post != null && post.containsKey("preview")) {
// preview the page // preview the page
prop.put("mode", "2");//preview prop.put("mode", "2");//preview
prop.putHTML("mode_pagename", pagename); prop.putHTML("mode_pagename", pagename);
prop.put("mode_display", display);
prop.putHTML("mode_author", author); prop.putHTML("mode_author", author);
prop.put("mode_date", dateString(new Date())); prop.put("mode_date", dateString(new Date()));
prop.putWiki(sb.peers.mySeed().getClusterAddress(), "mode_page", post.get("content", "")); prop.putWiki(sb.peers.mySeed().getClusterAddress(), "mode_page", post.get("content", ""));
@ -178,15 +171,11 @@ public class Wiki {
prop.putHTML("mode_error_message", e.getMessage()); prop.putHTML("mode_error_message", e.getMessage());
} }
prop.putHTML("mode_pagename", pagename); prop.putHTML("mode_pagename", pagename);
prop.put("mode_display", display); } else if (post != null && post.containsKey("diff")) {
}
else if (post != null && post.containsKey("diff")) {
// Diff // Diff
prop.put("mode", "4"); prop.put("mode", "4");
prop.putHTML("mode_page", pagename); prop.putHTML("mode_page", pagename);
prop.putHTML("mode_error_page", pagename); prop.putHTML("mode_error_page", pagename);
prop.put("mode_error_display", display);
try { try {
final Iterator<byte[]> it = sb.wikiDB.keysBkp(true); final Iterator<byte[]> it = sb.wikiDB.keysBkp(true);
@ -244,7 +233,6 @@ public class Wiki {
} else if (post.containsKey("viewold") && oentry != null) { } else if (post.containsKey("viewold") && oentry != null) {
prop.put("mode_versioning", "2"); prop.put("mode_versioning", "2");
prop.putHTML("mode_versioning_pagename", pagename); prop.putHTML("mode_versioning_pagename", pagename);
prop.put("mode_versioning_display", display);
prop.putHTML("mode_versioning_author", oentry.author()); prop.putHTML("mode_versioning_author", oentry.author());
prop.put("mode_versioning_date", dateString(oentry.date())); prop.put("mode_versioning_date", dateString(oentry.date()));
prop.putWiki(sb.peers.mySeed().getClusterAddress(), "mode_versioning_page", oentry.page()); prop.putWiki(sb.peers.mySeed().getClusterAddress(), "mode_versioning_page", oentry.page());
@ -260,7 +248,6 @@ public class Wiki {
// show page // show page
prop.put("mode", "0"); //viewing prop.put("mode", "0"); //viewing
prop.putHTML("mode_pagename", pagename); prop.putHTML("mode_pagename", pagename);
prop.put("mode_display", display);
prop.putHTML("mode_author", page.author()); prop.putHTML("mode_author", page.author());
prop.put("mode_date", dateString(page.date())); prop.put("mode_date", dateString(page.date()));
prop.putWiki(sb.peers.mySeed().getClusterAddress(), "mode_page", page.page()); prop.putWiki(sb.peers.mySeed().getClusterAddress(), "mode_page", page.page());

Write Preview
Loading…
Cancel
Save