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

get rid of static headers in trust list view

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-12-16 04:58:40 +00:00
parent 58137d11d1
commit 982a93a04b
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webui/src/main/java/com/muwire/webui/TrustServlet.java
View File

@ -356,7 +356,8 @@ public class TrustServlet extends HttpServlet {
private static final ColumnComparators<TrustListEntry> TRUST_LIST_ENTRY_COMPARATORS = new ColumnComparators<>();
static {
TRUST_LIST_ENTRY_COMPARATORS.add("User", TRUST_LIST_ENTRY_BY_USER);
TRUST_LIST_ENTRY_COMPARATORS.add("Trusted User", TRUST_LIST_ENTRY_BY_USER);
TRUST_LIST_ENTRY_COMPARATORS.add("Distrusted User", TRUST_LIST_ENTRY_BY_USER);
TRUST_LIST_ENTRY_COMPARATORS.add("Reason", TRUST_LIST_ENTRY_BY_REASON);
TRUST_LIST_ENTRY_COMPARATORS.add("Your Trust", TRUST_LIST_ENTRY_BY_STATUS);
}

2
webui/src/main/java/com/muwire/webui/Util.java
View File

@ -45,6 +45,7 @@ public class Util {
_x("Details for {0}"),
_x("Directory for downloaded files"),
_x("Directory for incomplete files"),
_x("Distrusted User"),
_x("Done Pieces"),
_x("Down"),
_x("Download"),
@ -108,6 +109,7 @@ public class Util {
_x("Total upload slots (-1 means unlimited)"),
_x("Trust"),
_x("Trust list update frequency (hours)"),
_x("Trusted User"),
_x("Unshare"),
_x("Unsubscribe"),
_x("Upload"),

7
webui/src/main/js/trustLists.js
View File

@ -43,7 +43,8 @@ class Persona {
var mapping = new Map()
var userHtml = this.user + "<div>" + this.getTrustActions().join(" ") + "</div>"
mapping.set("User", userHtml)
mapping.set("Trusted User", userHtml)
mapping.set("Distrusted User", userHtml)
mapping.set("Reason", this.reason)
mapping.set("Your Trust", this.status)
@ -231,7 +232,7 @@ function displayTrustedList(user) {
else if (trustedSortOrder == "ascending")
newOrder = "descending"
var table = new Table(["User", "Reason", "Your Trust"], "sortTrustedList", trustedSortKey, newOrder, null)
var table = new Table(["Trusted User", "Reason", "Your Trust"], "sortTrustedList", trustedSortKey, newOrder, null)
var i
for(i = 0; i < trusted.length; i++) {
table.addRow(trusted[i].getMapping())
@ -263,7 +264,7 @@ function displayDistrustedList(user) {
else if (distrustedSortOrder == "ascending")
newOrder = "descending"
var table = new Table(["User", "Reason", "Your Trust"], "sortDistrustedList", distrustedSortKey, newOrder, null)
var table = new Table(["Distrusted User", "Reason", "Your Trust"], "sortDistrustedList", distrustedSortKey, newOrder, null)
var i
for(i = 0; i < distrusted.length; i++) {
table.addRow(distrusted[i].getMapping())

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

@ -30,7 +30,6 @@ String pagetitle=Util._t("Trust Lists");
<hr/>
<center><div id="currentList"></div></center>
<table>
<thead><tr><th>Trusted</th><th>Distrusted</th></tr></thead>
<tbody>
<tr>
<td><div id="table-wrapper"><div id="table-scroll"><div id="trusted"></div></div></div></td>