Skip to content

Commit

Permalink
added topmenu as defined for search to wiki
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7718 6c8d7289-2bf4-0310-a012-ef5d649a1542
  • Loading branch information
orbiter committed May 14, 2011
1 parent 229df8b commit b04382b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 39 deletions.
34 changes: 13 additions & 21 deletions htroot/Wiki.html
View file
Expand Up @@ -5,16 +5,12 @@
#%env/templates/metas.template%#
</head>
<body id="Wiki">
#(display)#
#%env/templates/simpleheader.template%#
#%env/templates/submenuPublication.template%#
::
#%env/templates/header.template%#
#%env/templates/submenuPublication.template%#
::
#(topmenu)#
#%env/templates/embeddedheader.template%#
#(/display)#

::
#%env/templates/simpleheader.template%#
#(/topmenu)#

#(mode)#
<!-- 0: viewing -->
<div class="Post">
Expand All @@ -23,13 +19,13 @@ <h2 class="PostSubject">YaCyWiki page: #[pagename]#</h2>
#[page]#
</div>
<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>
</div>
<p class="Navigation">
<a href="Wiki.html?display=#[display]#">Start Page</a> -
<a href="Wiki.html?index=Index&amp;display=#[display]#">Index</a> -
<a href="Wiki.html?page=#[pagename]#&amp;diff=&amp;display=#[display]#">Versions</a> -
<a href="Wiki.html">Start Page</a> -
<a href="Wiki.html?index=Index">Index</a> -
<a href="Wiki.html?page=#[pagename]#&amp;diff=">Versions</a> -
</p>
<form method="post" action="Wiki.html"><div>
<label for="access">Grant Write Access to</label>
Expand All @@ -54,7 +50,6 @@ <h2>Edit</h2>
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>
<input type="hidden" name="page" value="#[pagename]#" />
<input type="hidden" name="display" value="#[display]#" />
<input type="hidden" name="reason" value="edit" />
<input type="submit" name="submit" value="Submit" />
<input type="submit" name="preview" value="Preview" />
Expand Down Expand Up @@ -97,7 +92,6 @@ <h2>Edit</h2>
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>
<input type="hidden" name="page" value="#[pagename]#" />
<input type="hidden" name="display" value="#[display]#" />
<input type="hidden" name="reason" value="edit" />
<input type="submit" name="submit" value="Submit" />
<input type="submit" name="preview" value="Preview" />
Expand All @@ -115,15 +109,15 @@ <h2>Index</h2>
</tr>
#{pages}#
<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>#[author]#</td>
</tr>
#{/pages}#
</table>
#(error)#::<p class="error">IO Error reading wiki database: #[message]#</p>#(/error)#
<p class="Navigation">
<a href="Wiki.html?display=#[display]#">Start Page</a>
<a href="Wiki.html">Start Page</a>
</p>
::
<!-- 4: Diff -->
Expand All @@ -132,7 +126,6 @@ <h2>Versions</h2>
<form method="get" action="Wiki.html">
<fieldset><legend>Select versions of page '#[page]#'</legend>
<input type="hidden" name="page" value="#[page]#" />
<input type="hidden" name="display" value="#[display]#" />
<input type="hidden" name="diff" value="" />
<dl>
<dt><label for="old">Compare version from</label>:</dt>
Expand Down Expand Up @@ -195,7 +188,6 @@ <h2>Edit</h2>
<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>
<input type="hidden" name="page" value="#[pagename]#" />
<input type="hidden" name="display" value="#[display]#" />
<input type="hidden" name="reason" value="edit" />
<input type="submit" name="submit" value="Submit" />
<input type="submit" name="preview" value="Preview" />
Expand All @@ -204,8 +196,8 @@ <h2>Edit</h2>
</form>
#(/versioning)#
<p class="Navigation">
<a href="Wiki.html?display=#[display]#">Start Page</a> -
<a href="Wiki.html?page=#[page]#&amp;display=#[display]#">Return to #[page]#</a>
<a href="Wiki.html">Start Page</a> -
<a href="Wiki.html?page=#[page]#&amp;">Return to #[page]#</a>
</p>
#(/mode)#

Expand Down
23 changes: 5 additions & 18 deletions htroot/Wiki.java
View file
Expand Up @@ -69,9 +69,7 @@ public static serverObjects respond(final RequestHeader header, serverObjects po
post.put("page", "start");
}

final boolean authenticated = sb.adminAuthenticated(header) >= 2;
final int display = ((post == null) || (!authenticated)) ? 0 : post.getInt("display", 0);
prop.put("display", display);
prop.put("topmenu", sb.getConfigBool("publicTopmenu", true) ? 1 : 0);

String access = sb.getConfig("WikiAccess", "admin");
final String pagename = get(post, "page", "start");
Expand Down Expand Up @@ -125,11 +123,9 @@ public static serverObjects respond(final RequestHeader header, serverObjects po
}
page = newEntry;
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 ((access.equals("admin") && (!sb.verifyAuthentication(header, true)))) {
// check access right for admin
Expand All @@ -140,16 +136,13 @@ public static serverObjects respond(final RequestHeader header, serverObjects po
prop.put("mode", "1"); //edit
prop.putHTML("mode_author", author);
prop.putHTML("mode_page-code", UTF8.String(page.page()));
prop.putHTML("mode_pagename", pagename);
prop.put("mode_display", display);
}
prop.putHTML("mode_pagename", pagename); }

//contributed by [MN]
else if (post != null && post.containsKey("preview")) {
// preview the page
prop.put("mode", "2");//preview
prop.putHTML("mode_pagename", pagename);
prop.put("mode_display", display);
prop.putHTML("mode_author", author);
prop.put("mode_date", dateString(new Date()));
prop.putWiki(sb.peers.mySeed().getClusterAddress(), "mode_page", post.get("content", ""));
Expand Down Expand Up @@ -178,15 +171,11 @@ else if (post != null && post.containsKey("index")) {
prop.putHTML("mode_error_message", e.getMessage());
}
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
prop.put("mode", "4");
prop.putHTML("mode_page", pagename);
prop.putHTML("mode_error_page", pagename);
prop.put("mode_error_display", display);

try {
final Iterator<byte[]> it = sb.wikiDB.keysBkp(true);
Expand Down Expand Up @@ -244,7 +233,6 @@ else if (post != null && post.containsKey("diff")) {
} else if (post.containsKey("viewold") && oentry != null) {
prop.put("mode_versioning", "2");
prop.putHTML("mode_versioning_pagename", pagename);
prop.put("mode_versioning_display", display);
prop.putHTML("mode_versioning_author", oentry.author());
prop.put("mode_versioning_date", dateString(oentry.date()));
prop.putWiki(sb.peers.mySeed().getClusterAddress(), "mode_versioning_page", oentry.page());
Expand All @@ -260,7 +248,6 @@ else if (post != null && post.containsKey("diff")) {
// show page
prop.put("mode", "0"); //viewing
prop.putHTML("mode_pagename", pagename);
prop.put("mode_display", display);
prop.putHTML("mode_author", page.author());
prop.put("mode_date", dateString(page.date()));
prop.putWiki(sb.peers.mySeed().getClusterAddress(), "mode_page", page.page());
Expand Down

0 comments on commit b04382b

Please sign in to comment.