Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Show additional interaction elements in footer section on each page, if
activated in ConfigPortal.html. This footer is also visible in augmented browsing proxy mode.
- Loading branch information
Showing
16 changed files
with
271 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
</div> | ||
<!--#include virtual="/interaction_elements/Footer.html" --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
</div> | ||
</div> | ||
<!--#include virtual="/interaction_elements/Footer.html" --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
</div> | ||
<!--#include virtual="/interaction_elements/Footer.html" --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
#(enabled)#:: | ||
<!-- BEGIN Footer.html --> | ||
<style type="text/css"> | ||
|
||
|
||
.SubMenuFooter h3 { | ||
-webkit-border-radius: 5px; | ||
-khtml-border-radius: 5px; | ||
-moz-border-radius: 5px; | ||
border-radius: 5px; | ||
|
||
background-color:#[color]#; | ||
color:white; | ||
} | ||
|
||
a.MenuItemLinkFooter, ul.SubMenuFooter em { | ||
background-color: #[color]#; | ||
color:#[color]#; | ||
} | ||
|
||
a:hover.MenuItemLinkFooter { | ||
background-color:#[color]#; | ||
color:#[color]#; | ||
} | ||
|
||
ul.SubMenuFooter a.MenuItemLinkFooter { | ||
margin-top:0; | ||
} | ||
|
||
a.MenuItemLinkFooter{ | ||
display:block; | ||
text-decoration:none; | ||
margin-top:1px; | ||
margin-bottom:1px; | ||
padding:1px 10px 1px 15px; | ||
font-size:0.9em; | ||
white-space:nowrap; | ||
} | ||
|
||
|
||
|
||
a:hover.MenuItemLinkFooter { | ||
text-decoration:none; | ||
} | ||
|
||
|
||
ul.SubMenuFooter em { | ||
margin-top:0; | ||
} | ||
|
||
|
||
ul.SubMenuFooter em { | ||
display:block; | ||
text-decoration:none; | ||
margin-top:1px; | ||
margin-bottom:1px; | ||
padding:1px 10px 1px 15px; | ||
font-size:0.9em; | ||
} | ||
|
||
ul.SubMenuFooter { | ||
clear:left; | ||
padding:0; | ||
margin:0; | ||
} | ||
|
||
ul.SubMenuFooter li { | ||
list-style:none; | ||
margin:0; | ||
margin-top:1px; | ||
padding:0; | ||
} | ||
|
||
ul.SubMenuFooter li { | ||
float:left; | ||
margin-right:1px; | ||
margin-top:0; | ||
} | ||
|
||
</style> | ||
|
||
<div style="position: fixed; bottom: 0px; width: 100%;"> | ||
<ul class="SubMenuFooter"> | ||
#(userlogonenabled)#::<li style="width:#[ratio]#%;"><!--#include virtual="/currentyacypeer/interaction_elements/Loginstatus_part.html" --></li>#(/userlogonenabled)# | ||
</ul> | ||
</div> | ||
<!-- END Footer.html --> | ||
#(/enabled)# |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
package interaction_elements; | ||
|
||
|
||
import net.yacy.cora.protocol.RequestHeader; | ||
import net.yacy.search.Switchboard; | ||
import de.anomic.server.serverObjects; | ||
import de.anomic.server.serverSwitch; | ||
|
||
public class Footer { | ||
|
||
public static serverObjects respond(final RequestHeader requestHeader, final serverObjects post, final serverSwitch env) { | ||
|
||
final Switchboard sb = (Switchboard) env; | ||
|
||
final serverObjects prop = new serverObjects(); | ||
|
||
prop.put("enabled_color", env.getConfig("color_tableheader", "")); | ||
|
||
int count = 0; | ||
|
||
prop.put("enabled_userlogonenabled", env.getConfigBool("interaction.userlogon.enabled", false) ? "1" : "0"); | ||
if (env.getConfigBool("interaction.userlogon.enabled", false)) count++; | ||
|
||
if (count > 0) { | ||
prop.put("enabled", "1"); | ||
prop.put("enabled_userlogonenabled_ratio", Math.round(100/count)-1); | ||
|
||
} else { | ||
prop.put("enabled", "0"); | ||
} | ||
|
||
|
||
return prop; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
#(enabled)#:: | ||
<!-- Loginbutton_part --> | ||
#(logged-in)# | ||
<a id="logon_trigger" href="" class="MenuItemLinkFooter" style="color: #fff; background-color: #[color]#;" onclick="return false;"><img src="/currentyacypeer/interaction_elements/login_empty.png"> #[username]#</a> | ||
:: | ||
<a id="logon_trigger" href="" class="MenuItemLinkFooter" style="color: #fff; background-color: #[color]#;" onclick="return false;"><img src="/currentyacypeer/interaction_elements/login_user.png"> #[username]#</a> | ||
:: | ||
<a id="logon_trigger" href="" class="MenuItemLinkFooter" style="color: #fff; background-color: #[color]#;" onclick="return false;"><img src="/currentyacypeer/interaction_elements/login_admin.png"> #[username]#</a> | ||
#(/logged-in)# | ||
#(/enabled)# |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
package interaction_elements; | ||
|
||
//ViewLog_p.java | ||
//----------------------- | ||
//part of the AnomicHTTPD caching proxy | ||
//(C) by Michael Peter Christen; mc@yacy.net | ||
//first published on http://www.anomic.de | ||
//Frankfurt, Germany, 2004 | ||
// | ||
//This File is contributed by Alexander Schier | ||
//last major change: 14.12.2004 | ||
// | ||
//This program is free 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 2 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 | ||
|
||
|
||
//You must compile this file with | ||
//javac -classpath .:../classes ViewLog_p.java | ||
//if the shell's current path is HTROOT | ||
|
||
import net.yacy.cora.protocol.HeaderFramework; | ||
import net.yacy.cora.protocol.RequestHeader; | ||
import net.yacy.search.Switchboard; | ||
import de.anomic.data.UserDB; | ||
import de.anomic.server.serverObjects; | ||
import de.anomic.server.serverSwitch; | ||
import de.anomic.server.servletProperties; | ||
|
||
public class Loginstatus_part { | ||
|
||
public static serverObjects respond(final RequestHeader requestHeader, final serverObjects post, final serverSwitch env) { | ||
|
||
final Switchboard sb = (Switchboard) env; | ||
|
||
final servletProperties prop = new servletProperties(); | ||
|
||
prop.put("enabled", env.getConfigBool("interaction.userlogon.enabled", false) ? "1" : "0"); | ||
|
||
prop.put("enabled_color", env.getConfig("color_tableheader", "")); | ||
|
||
prop.put("enabled_logged-in_registrationenabled", env.getConfigBool("interaction.userselfregistration.enabled", false) ? "1" : "0"); | ||
|
||
// | ||
// final String address = sb.peers.mySeed().getPublicAddress(); | ||
|
||
prop.put("enabled_peer", sb.peers.myName()); | ||
|
||
prop.put("enabled_logged-in_returnto", "/index.html"); | ||
|
||
|
||
UserDB.Entry entry=null; | ||
|
||
//default values | ||
prop.put("enabled_logged_in", "0"); | ||
prop.put("enabled_logged-in_limit", "0"); | ||
prop.put("enabled_logged-in_username", "anonymous"); | ||
prop.put("enabled_status", "0"); | ||
//identified via HTTPPassword | ||
entry=sb.userDB.proxyAuth((requestHeader.get(RequestHeader.AUTHORIZATION, "xxxxxx"))); | ||
if(entry != null){ | ||
prop.put("enabled_logged-in_identified-by", "1"); | ||
//try via cookie | ||
}else{ | ||
entry=sb.userDB.cookieAuth(requestHeader.getHeaderCookies()); | ||
prop.put("enabled_logged-in_identified-by", "2"); | ||
//try via ip | ||
if(entry == null){ | ||
entry=sb.userDB.ipAuth((requestHeader.get(HeaderFramework.CONNECTION_PROP_CLIENTIP, "xxxxxx"))); | ||
if(entry != null){ | ||
prop.put("enabled_logged-in_identified-by", "0"); | ||
} | ||
} | ||
} | ||
|
||
//identified via userDB | ||
if(entry != null){ | ||
prop.put("enabled_logged-in", "1"); | ||
prop.put("enabled_logged-in_username", entry.getUserName()); | ||
if(entry.getTimeLimit() > 0){ | ||
prop.put("enabled_logged-in_limit", "1"); | ||
final long limit=entry.getTimeLimit(); | ||
final long used=entry.getTimeUsed(); | ||
prop.put("enabled_logged-in_limit_timelimit", limit); | ||
prop.put("enabled_logged-in_limit_timeused", used); | ||
int percent=0; | ||
if(limit!=0 && used != 0) | ||
percent=(int)((float)used/(float)limit*100); | ||
prop.put("enabled_logged-in_limit_percent", percent/3); | ||
prop.put("enabled_logged-in_limit_percent2", (100-percent)/3); | ||
} | ||
//logged in via static Password | ||
}else if(sb.verifyAuthentication(requestHeader)){ | ||
prop.put("enabled_logged-in", "2"); | ||
prop.put("enabled_logged-in_username", "staticadmin"); | ||
//identified via form-login | ||
//TODO: this does not work for a static admin, yet. | ||
} | ||
|
||
// return rewrite properties | ||
return prop; | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters