echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow normal themes to be used with IE >= 10

Browse Source
This commit is contained in:
kytv
2013-05-30 01:39:07 +00:00
parent 3d42946ff5
commit 535c782b7c
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
View File

@ -37,7 +37,7 @@ public class CSSHelper extends HelperBase {
public String getTheme(String userAgent) { public String getTheme(String userAgent) {
String url = BASE_THEME_PATH; String url = BASE_THEME_PATH;
if (userAgent != null && userAgent.contains("MSIE")) { if (userAgent != null && (userAgent.contains("MSIE") && !userAgent.contains("Trident/6"))) {
url += FORCE + "/"; url += FORCE + "/";
} else { } else {
// This is the first thing to use _context on most pages // This is the first thing to use _context on most pages

2
apps/routerconsole/jsp/configui.jsp
View File

@ -36,7 +36,7 @@ input.default {
<input type="hidden" name="action" value="blah" > <input type="hidden" name="action" value="blah" >
<% <%
String userAgent = request.getHeader("User-Agent"); String userAgent = request.getHeader("User-Agent");
if (userAgent == null || !userAgent.contains("MSIE")) { if (userAgent == null || userAgent.contains("Trident/6") || !userAgent.contains("MSIE")) {
%> %>
<jsp:getProperty name="uihelper" property="settings" /> <jsp:getProperty name="uihelper" property="settings" />
<% } else { %> <% } else { %>

3
history.txt
View File

@ -1,3 +1,6 @@
2013-05-30 kytv
* Allow themes to be used in IE >= 10
2013-05-29 zzz 2013-05-29 zzz
* Console: Remove I2PDigestAuthenticator workaround, as Jetty 7.6.11 has the fix * Console: Remove I2PDigestAuthenticator workaround, as Jetty 7.6.11 has the fix
* i2ptunnel: Default to 3 hops (ticket #936) * i2ptunnel: Default to 3 hops (ticket #936)