loveisgrief/muwire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'csp3' into 'master'

Browse Source 
Fix script line changes from previous MR

See merge request zlatinb/muwire!46
This commit is contained in:
Zlatin Balevsky
2020-05-11 17:02:49 +00:00
parent 7fa6812ee9 179c3438cd
commit c1324c92ba
14 changed files with 25 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webui/src/main/webapp/AboutMe.jsp
View File

@ -19,8 +19,7 @@ Core core = (Core) application.getAttribute("core");
<html>
<head>
<%@include file="css.jsi"%>
<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/sign.js?<%=version%>" type ="text/javascript"></script>
<script src="js/sign.js?<%=version%>" type ="text/javascript"></script>
<script nonce="<%=cspNonce%>" type="text/javascript">
function copyFullId() {
copyToClipboard("full-id")

6
webui/src/main/webapp/AdvancedSharing.jsp
View File

@ -13,10 +13,8 @@ String helptext = Util._t("Use this page to configure advanced settings for each
<html>
<head>
<%@ include file="css.jsi"%>
<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%> type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/advancedSharing.js?<%=version%>" type="text/javascript"></script>
<script type="text/javascript">
<script src="js/advancedSharing.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" type="text/javascript">
openAccordion = 2;
</script>
</head>

6
webui/src/main/webapp/BrowseHost.jsp
View File

@ -22,10 +22,8 @@ if (request.getParameter("currentHost") != null) {
<html>
<head>
<%@ include file="css.jsi"%>
<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/certificates.js?<%=version%> type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%> type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/browse.js?<%=version%>" type="text/javascript"></script>
<script src="js/certificates.js?<%=version%>" type="text/javascript"></script>
<script src="js/browse.js?<%=version%>" type="text/javascript"></script>
<% if (currentBrowse != null) { %>
<script nonce="<%=cspNonce%>" type="text/javascript">

2
webui/src/main/webapp/ConfigurationPage.jsp
View File

@ -27,7 +27,7 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
<html>
<head>
<%@include file="css.jsi"%>
<script type="text/javascript">
<script nonce="<%=cspNonce%>" type="text/javascript">
openAccordion = 2;
</script>
</head>

3
webui/src/main/webapp/Downloads.jsp
View File

@ -18,8 +18,7 @@ String helptext = Util._t("This page shows the files you are currently downloadi
<html>
<head>
<%@include file="css.jsi"%>
<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/download.js?<%=version%>" type="text/javascript"></script>
<script src="js/download.js?<%=version%>" type="text/javascript"></script>
</head>
<body>
<%@include file="header.jsi"%>

6
webui/src/main/webapp/Feeds.jsp
View File

@ -16,10 +16,8 @@ String helptext = Util._t("Every MuWire user can have a file feed to publish sha
<html>
<head>
<%@ include file="css.jsi"%>
<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/certificates.js?<%=version%> type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%> type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/feeds.js?<%=version%>" type="text/javascript"></script>
<script src="js/certificates.js?<%=version%>" type="text/javascript"></script>
<script src="js/feeds.js?<%=version%>" type="text/javascript"></script>
</head>
<body>

4
webui/src/main/webapp/FileDetails.jsp
View File

@ -17,9 +17,7 @@ File file = Util.getFromPathElements(path);
<html>
<head>
<%@ include file="css.jsi"%>
<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%> type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/fileDetails.js?<%=version%>" type="text/javascript"></script>
<script src="js/fileDetails.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" type="text/javascript">
path="<%=path%>"

5
webui/src/main/webapp/Home.jsp
View File

@ -32,8 +32,7 @@
<html>
<head>
<%@include file="css.jsi"%>
<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/certificates.js?<%=version%>" type="text/javascript"></script>
<script src="js/certificates.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" type="text/javascript">
<% if (groupBy.equals("sender")) { %>
var bySender = true;
@ -41,7 +40,7 @@
var bySender = false;
<% } %>
</script>
<script nonce="<%=cspNonce%>" src="js/search.js?<%=version%>" type="text/javascript"></script>
<script src="js/search.js?<%=version%>" type="text/javascript"></script>
<% if (request.getParameter("uuid") != null) {%>
<script nonce="<%=cspNonce%>" type="text/javascript">
uuid="<%=request.getParameter("uuid")%>"

2
webui/src/main/webapp/MuStatus.jsp
View File

@ -17,7 +17,7 @@ String buildNumber = (String)application.getAttribute("buildNumber");
<html>
<head>
<%@ include file="css.jsi"%>
<script nonce="<%=cspNonce%>" src="js/status.js?<%=version%>" type="text/javascript"></script>
<script src="js/status.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" type="text/javascript">
openAccordion = 3;
</script>

6
webui/src/main/webapp/SharedFiles.jsp
View File

@ -19,12 +19,10 @@ if (viewAs == null)
<html>
<head>
<%@ include file="css.jsi"%>
<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%>" type="text/javascript"></script>
<% if (viewAs.equals("tree")) { %>
<script nonce="<%=cspNonce%>" src="js/files.js?<%=version%>" type="text/javascript"></script>
<script src="js/files.js?<%=version%>" type="text/javascript"></script>
<% } else { %>
<script nonce="<%=cspNonce%>" src="js/filesTable.js?<%=version%>" type="text/javascript"></script>
<script src="js/filesTable.js?<%=version%>" type="text/javascript"></script>
<% } %>
</head>

6
webui/src/main/webapp/TrustLists.jsp
View File

@ -11,10 +11,8 @@ String helptext = Util._t("This page shows the trust lists of the users you have
<html>
<head>
<%@ include file="css.jsi"%>
<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/trustLists.js?<%=version%>" type="text/javascript"></script>
<script type="text/javascript">
<script src="js/trustLists.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" type="text/javascript">
openAccordion = 1;
</script>
</head>

6
webui/src/main/webapp/TrustUsers.jsp
View File

@ -12,10 +12,8 @@ String helptext = Util._t("This page shows the users you have marked as Trusted
<html>
<head>
<%@ include file="css.jsi"%>
<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/trustUsers.js?<%=version%>" type="text/javascript"></script>
<script type="text/javascript">
<script src="js/trustUsers.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" type="text/javascript">
openAccordion = 1;
</script>
</head>

3
webui/src/main/webapp/Uploads.jsp
View File

@ -18,8 +18,7 @@ String helptext = Util._t("This page shows the files you are currently uploading
<html>
<head>
<%@include file="css.jsi"%>
<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%>" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" src="js/upload.js?<%=version%>" type="text/javascript"></script>
<script src="js/upload.js?<%=version%>" type="text/javascript"></script>
</head>
<body>
<%@include file="header.jsi"%>

8
webui/src/main/webapp/css.jsi
View File

@ -14,9 +14,11 @@
<link href="i2pbote.css?${version}" rel="stylesheet" type="text/css">
<link href="muwire.css?${version}" rel="stylesheet" type="text/css">
<link rel="icon" type="image/png" href="images/muwire.png" />
<script src="js/conncount.js?${version}" nonce="<%=cspNonce%>" type="text/javascript"></script>
<script src="js/translate.js?${version}" nonce="<%=cspNonce%>" type="text/javascript"></script>
<script src="js/accordion.js?${version}" nonce="<%=cspNonce%>" type="text/javascript"></script>
<script src="js/conncount.js?${version}" type="text/javascript"></script>
<script src="js/translate.js?${version}" type="text/javascript"></script>
<script src="js/accordion.js?${version}" type="text/javascript"></script>
<script src="js/util.js?${version}" type="text/javascript"></script>
<script src="js/tables.js?${version}" type="text/javascript"></script>
<script nonce="<%=cspNonce%>" type="text/javascript">
var jsTranslations = '<%=Util.getJSTranslations()%>';
</script>