[WebUI] Use actions names as labels

diff --git a/interface/js/app/config.js b/interface/js/app/config.js
index 8b391582b2982326c3b0959945701b63e6e26a71..082806088bd62e3650e520289cf036a5fa8ae6ce 100644 (file)
--- a/interface/js/app/config.js
+++ b/interface/js/app/config.js
@@ -33,27 +33,14 @@ define(["jquery", "codejar", "linenumbers", "prism"],
                     $("#actionsFormField").empty();
                     var items = [];
                     $.each(data[0].data, function (i, item) {
-                        var idx = -1;
-                        var label = null;
-                        if (item.action === "greylist") {
-                            label = "Greylist";
-                            idx = 0;
-                        } else if (item.action === "add header") {
-                            label = "Probably Spam";
-                            idx = 1;
-                        } else if (item.action === "rewrite subject") {
-                            label = "Rewrite subject";
-                            idx = 2;
-                        } else if (item.action === "reject") {
-                            label = "Spam";
-                            idx = 3;
-                        }
+                        var actionsOrder = ["greylist", "add header", "rewrite subject", "reject"];
+                        var idx = actionsOrder.indexOf(item.action);
                         if (idx >= 0) {
                             items.push({
                                 idx: idx,
                                 html:
                                 '<div class="form-group">' +
-                                    '<label class="col-form-label col-md-2 float-left">' + label + "</label>" +
+                                    '<label class="col-form-label col-md-2 float-left">' + item.action + "</label>" +
                                     '<div class="controls slider-controls col-md-10">' +
                                         '<input class="action-scores form-control" data-id="action" type="number" value="' +
                                           item.value + '">' +

diff --git a/interface/js/app/graph.js b/interface/js/app/graph.js
index 624566a8aafc79d711a1c0a8ec70ceac9f12dab0..d2e3c5ac6a0e5cc6cca3aa5135ebfffafc7ef7d5 100644 (file)
--- a/interface/js/app/graph.js
+++ b/interface/js/app/graph.js
@@ -65,22 +65,22 @@ define(["jquery", "d3evolution", "footable"],
             legend: {
                 space: 140,
                 entries: [{
-                    label: "Rejected",
+                    label: "reject",
                     color: "#FF0000"
                 }, {
-                    label: "Temporarily rejected",
+                    label: "soft reject",
                     color: "#BF8040"
                 }, {
-                    label: "Subject rewritten",
+                    label: "rewrite subject",
                     color: "#FF6600"
                 }, {
-                    label: "Probable spam",
+                    label: "add header",
                     color: "#FFAD00"
                 }, {
-                    label: "Greylisted",
+                    label: "greylist",
                     color: "#436EEE"
                 }, {
-                    label: "Clean",
+                    label: "no action",
                     color: "#66CC00"
                 }]
             }

diff --git a/interface/js/app/stats.js b/interface/js/app/stats.js
index 26ac26b44d6d47b4b6832f33fc3d7f6aa2ef32e9..18c3a2c084c1ffd09d8488e9fb85aaa39539239f 100644 (file)
--- a/interface/js/app/stats.js
+++ b/interface/js/app/stats.js
@@ -146,27 +146,27 @@ define(["jquery", "d3pie"],
             var data = creds[checked_server].data.actions;
             var new_data = [{
                 color: "#66CC00",
-                label: "Clean",
+                label: "no action",
                 data: data["no action"],
                 value: data["no action"]
             }, {
                 color: "#BF8040",
-                label: "Temporarily rejected",
+                label: "soft reject",
                 data: data["soft reject"],
                 value: data["soft reject"]
             }, {
                 color: "#FFAD00",
-                label: "Probable spam",
+                label: "add header",
                 data: data["add header"],
                 value: data["add header"]
             }, {
                 color: "#436EEE",
-                label: "Greylisted",
+                label: "greylist",
                 data: data.greylist,
                 value: data.greylist
             }, {
                 color: "#FF0000",
-                label: "Rejected",
+                label: "reject",
                 data: data.reject,
                 value: data.reject
             }];