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

resolve conflicts, fix quotes, thanks zzz

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-12-08 13:03:21 +00:00
parent b5d8fcf25b
commit 1325a8dc65
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,8 +11,8 @@ String pagetitle="Browse Host";
<html>
<head>
<%@ include file="css.jsi"%>
<script src="js/util.js"?<%=version%>" type="text/javascript"></script>
<script src="js/browse.js"?<%=version%> type="text/javascript"></script>
<script src="js/util.js?<%=version%>" type="text/javascript"></script>
<script src="js/browse.js?<%=version%>" type="text/javascript"></script>
</head>
<body onload="initConnectionsCount(); initBrowse();">

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

@@ -4,7 +4,7 @@
<%
String pagetitle="Shared Files";
String pagetitle= Util._t("Shared Files");
String viewAs = request.getParameter("viewAs");
if (viewAs == null)
@@ -15,11 +15,11 @@ if (viewAs == null)
<html>
<head>
<%@ include file="css.jsi"%>
<script src="js/util.js"?<%=version%>" type="text/javascript"></script>
<script src="js/util.js?<%=version%>" type="text/javascript"></script>
<% if (viewAs.equals("tree")) { %>
<script src="js/files.js"?<%=version%>" type="text/javascript"></script>
<script src="js/files.js?<%=version%>" type="text/javascript"></script>
<% } else { %>
<script src="js/filesTable.js"?<%=version%> type="text/javascript"></script>
<script src="js/filesTable.js?<%=version%>" type="text/javascript"></script>
<% } %>
</head>
@@ -28,23 +28,23 @@ if (viewAs == null)
<aside>
<div class="menubox-divider"></div>
<div class="menubox">
<h2>Share</h2>
<h2><%=Util._t("Share")%></h2>
<form action="/MuWire/Files" method="post">
<input type="text" name="file">
<input type="hidden" name="action" value="share">
<input type="submit" value="Share">
<input type="submit" value="<%=Util._t("Share")%>">
</form>
<% if (viewAs.equals("tree")) { %>
<a class="menuitem" href="SharedFiles.jsp?viewAs=table">View As Table</a>
<a class="menuitem" href="SharedFiles.jsp?viewAs=table"><%=Util._t("View As Table")%></a>
<% } else { %>
<a class="menuitem" href="SharedFiles.jsp?viewAs=tree">View As Tree</a>
<a class="menuitem" href="SharedFiles.jsp?viewAs=tree"><%=Util._t("View As Tree")%></a>
<% } %>
</div>
<div class="menubox-divider"></div>
<%@include file="sidebar.jsi"%>
</aside>
<section class="main foldermain">
<p>Shared Files <span id="count">0</span></p>
<p><%=Util._t("Shared Files")%> <span id="count">0</span></p>
<p><span id="hashing"></span></p>
<hr/>
<% if (viewAs.equals("tree")) { %>

26
webui/src/main/webapp/sidebar.jsi
View File

@@ -1,29 +1,29 @@
<div class="menubox-divider"></div>
<div class="menubox">
<h2>Status</h2>
<h2><%=Util._t("Status")%></h2>
<div class="menu-icon"></div>
<div class="menu-text">Connections: <span id="connectionsCount">0</span></div>
<div class="menu-text"><%=Util._t("Connections")%>: <span id="connectionsCount">0</span></div>
</div>
<div class="menubox-divider"></div>
<div class="menubox">
<h2>Pages</h2>
<a class="menuitem" href="Downloads.jsp">Downloads</a>
<a class="menuitem" href="Home.jsp">Search</a>
<a class="menuitem" href="SharedFiles.jsp">Shared Files</a>
<a class="menuitem" href="BrowseHost.jsp">Browse</a>
<h2><%=Util._t("Pages")%></h2>
<a class="menuitem" href="Downloads.jsp"><%=Util._t("Downloads")%></a>
<a class="menuitem" href="Home.jsp"><%=Util._t("Search")%></a>
<a class="menuitem" href="SharedFiles.jsp"><%=Util._t("Shared Files")%></a>
<a class="menuitem" href="BrowseHost.jsp">Util._t("Browse")</a>
</div>
<div class="menubox-divider"></div>
<div class="menubox">
<h2>Configuration</h2>
<h2><%=Util._t("Configuration")%></h2>
<a class="menuitem settings" href="settings.jsp">
<div class="menu-icon"></div>
<div class="menu-text">Settings</div>
<div class="menu-text"><%=Util._t("Settings")%></div>
</a>
</div>
<div class="menubox-divider"></div>
<div class="menubox">
<h2>Help</h2>
<a class="menuitem" href="userGuide.jsp">User Guide</a>
<a class="menuitem" href="faq.jsp">FAQ</a>
<a class="menuitem" href="about.jsp">About</a>
<h2><%=Util._t("Help")%></h2>
<a class="menuitem" href="userGuide.jsp"><%=Util._t("User Guide")%></a>
<a class="menuitem" href="faq.jsp"><%=Util._t("FAQ")%></a>
<a class="menuitem" href="about.jsp"><%=Util._t("About")%></a>
</div>