diff --git a/webui/src/main/java/com/muwire/webui/TrustServlet.java b/webui/src/main/java/com/muwire/webui/TrustServlet.java index 18424a67..f7edd766 100644 --- a/webui/src/main/java/com/muwire/webui/TrustServlet.java +++ b/webui/src/main/java/com/muwire/webui/TrustServlet.java @@ -356,7 +356,8 @@ public class TrustServlet extends HttpServlet { private static final ColumnComparators 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); } diff --git a/webui/src/main/java/com/muwire/webui/Util.java b/webui/src/main/java/com/muwire/webui/Util.java index 88a7f871..166dd05f 100644 --- a/webui/src/main/java/com/muwire/webui/Util.java +++ b/webui/src/main/java/com/muwire/webui/Util.java @@ -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"), diff --git a/webui/src/main/js/trustLists.js b/webui/src/main/js/trustLists.js index e6cb4e7f..d5554ac4 100644 --- a/webui/src/main/js/trustLists.js +++ b/webui/src/main/js/trustLists.js @@ -43,7 +43,8 @@ class Persona { var mapping = new Map() var userHtml = this.user + "
" + this.getTrustActions().join(" ") + "
" - 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()) diff --git a/webui/src/main/webapp/TrustLists.jsp b/webui/src/main/webapp/TrustLists.jsp index 9ff06fcd..0ce2ab66 100644 --- a/webui/src/main/webapp/TrustLists.jsp +++ b/webui/src/main/webapp/TrustLists.jsp @@ -30,7 +30,6 @@ String pagetitle=Util._t("Trust Lists");
-
TrustedDistrusted