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

- corrected News menu (wrong headline)

Browse Source 
- changed order, appearance, naming of menues in main menu
- implemented no-main-menu mode for blog and wiki (similar to simple search page)
The YaCy wiki can now be embedded in iframes inside on web pages using the display option:
i.e.
http://localhost:8080/Wiki.html?display=2
http://localhost:8080/Blog.html?display=2

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3803 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 18 years ago
parent 71b0206935
commit 4934c5f4d3
6 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File

8
htroot/Blog.html
Unescape View File

@ -6,7 +6,13 @@
<link rel="alternate" type="application/rss+xml" title="RSS" href="Blog.rss" />
</head>
<body id="Blog">
#%env/templates/header.template%#
#(display)#
#%env/templates/simpleheader.template%#
::
#%env/templates/header.template%#
::
#%env/templates/embeddedheader.template%#
#(/display)#
#(mode)#
<!-- 0: viewing -->
#{entries}#

6
htroot/Blog.java
Unescape View File

@ -82,7 +82,11 @@ public class Blog {
final serverObjects prop = new serverObjects();
blogBoard.entry page = null;
boolean hasRights = switchboard.verifyAuthentication(header, true);
final boolean authenticated = switchboard.adminAuthenticated(header) >= 2;
final int display = ((post == null) || (!authenticated)) ? 0 : post.getInt("display", 0);
prop.put("display", display);
boolean hasRights = switchboard.verifyAuthentication(header, true);
final boolean xml = ((String)header.get(httpHeader.CONNECTION_PROP_PATH)).endsWith(".xml");
final String address = yacyCore.seedDB.mySeed.getPublicAddress();

2
htroot/News.html
Unescape View File

@ -15,7 +15,7 @@
<body id="News">
#%env/templates/header.template%#
<div class="SubMenu">
<h3>Network Menu</h3>
<h3>News Menu</h3>
<ul class="SubMenu">
<li><a href="/News.html" class="MenuItemLink">News&nbsp;Overview</a></li>
<li><a href="/News.html?page=1" class="MenuItemLink">Incoming&nbsp;News</a></li>

8
htroot/Wiki.html
Unescape View File

@ -5,7 +5,13 @@
#%env/templates/metas.template%#
</head>
<body id="Wiki">
#%env/templates/header.template%#
#(display)#
#%env/templates/simpleheader.template%#
::
#%env/templates/header.template%#
::
#%env/templates/embeddedheader.template%#
#(/display)#
#(mode)#
<!-- 0: viewing -->

4
htroot/Wiki.java
Unescape View File

@ -82,6 +82,10 @@ public class Wiki {
post.put("page", "start");
}
final boolean authenticated = switchboard.adminAuthenticated(header) >= 2;
final int display = ((post == null) || (!authenticated)) ? 0 : post.getInt("display", 0);
prop.put("display", display);
String access = switchboard.getConfig("WikiAccess", "admin");
String pagename = post.get("page", "start");
String ip = post.get("CLIENTIP", "127.0.0.1");

13
htroot/env/templates/header.template vendored
Unescape View File

@ -25,8 +25,8 @@
<h3>Monitoring</h3>
<ul class="menu">
<li><a href="/Network.html" accesskey="w" class="MenuItemLink">YaCy Network</a></li>
<li><a href="/WatchCrawler_p.html" class="MenuItemLink lock">Crawler Monitor</a></li>
<li><a href="/IndexMonitor.html" class="MenuItemLink">Web Crawl Results</a></li>
<li><a href="/WatchCrawler_p.html" class="MenuItemLink lock">Crawl Activity</a></li>
<li><a href="/IndexMonitor.html" class="MenuItemLink">Crawl Results</a></li>
<li><a href="/SearchStatistics_p.html" class="MenuItemLink lock">Search Statistics</a></li>
<li><a href="/ViewLog_p.html" class="MenuItemLink lock">Server Log</a></li>
<li><a href="/Connections_p.html" class="MenuItemLink lock">Connections</a></li>
@ -38,11 +38,10 @@
<li class="menugroup" id="menugroupCommunicationPublication">
<h3>Your Web</h3>
<ul class="menu">
<li><a href="/www/" class="MenuItemLink">Home Page Demo</a></li>
<li><a href="/share/" class="MenuItemLink">Your File Share</a></li>
<li><a href="/Wiki.html" class="MenuItemLink">YaCy Wiki</a></li>
<li><a href="/Blog.html" class="MenuItemLink">YaCy Blog</a></li>
<li><a href="/Messages_p.html" class="MenuItemLink lock">Messages <img src="/notifier.gif" alt="New Messages" /></a></li>
<li><a href="/Wiki.html?display=1" class="MenuItemLink">YaCy Wiki</a></li>
<li><a href="/Blog.html?display=1" class="MenuItemLink">YaCy Blog</a></li>
<li><a href="/Messages_p.html" class="MenuItemLink lock">YaCy Messages <img src="/notifier.gif" alt="New Messages" /></a></li>
<li><a href="/share/" class="MenuItemLink">YaCy File Hosting</a></li>
</ul>
</li>
<li class="menugroup" id="menugroupPeerControl">

Write Preview
Loading…
Cancel
Save