weaponplanner, list: improve formatting

web/js/common.js

@@ -202,3 +202,21 @@ function update_weapon_autocomplete(weapon_selector, predicate_fn, change_fn) {
        }
     });
 }
+
+
+function set_sharpness_titles(weapon_data) {
+    if (weapon_data["sharpness"]) {
+        weapon_data["sharpness_title"] =
+              weapon_data["sharpness"].join(",");
+        weapon_data["sharpness_plus_title"] =
+              weapon_data["sharpness_plus"].join(",");
+        weapon_data["sharpness_all_title"] =
+          weapon_data["sharpness_title"] + " ("
+          + weapon_data["sharpness_plus_title"] + ")";
+    } else {
+        // gunner weapons have no sharpness
+        weapon_data["sharpness_title"] = "";
+        weapon_data["sharpness_plus_title"] = "";
+        weapon_data["sharpness_all_title"] = "";
+    }
+}

web/templates/weaponrow.ejs

@@ -31,6 +31,7 @@
 <td><%= Array(num_slots + 1).join("o")
      %><%= Array(3 - num_slots + 1).join("-") %></td>
 <td>
+<% if (sharpness) { %>
 <div class="sharpness-bar" title="<%= sharpness_all_title %>">
 <span style="width:<%= sharpness[0] %>px" class="red"></span>
 <span style="width:<%= sharpness[1] %>px" class="orange"></span>
@@ -49,6 +50,7 @@
 <span style="width:<%= sharpness_plus[5] %>px" class="white"></span>
 <span style="width:<%= sharpness_plus[6] %>px" class="purple"></span>
 </div>
+<% } %>
 </td>
 <td><%= defense ? "+" + defense + " Def" : "" %></td>
 <td><%= phial %></td>

web/templates/weaponstats.ejs

@@ -27,13 +27,9 @@
   <% } %>
 <% } %>
 </td>
-<td style="text-align:right"><% if (defense) { %>+<%= defense %> Def<% } %></td>
-</tr>
-</table>
-<table>
-<tr>
 <td>
-<div class="sharpness-bar" title="<%= sharpness_title %>">
+<% if (sharpness) { %>
+<div class="sharpness-bar" title="<%= sharpness_all_title %>">
 <span style="width:<%= sharpness[0] %>px" class="red"></span>
 <span style="width:<%= sharpness[1] %>px" class="orange"></span>
 <span style="width:<%= sharpness[2] %>px" class="yellow"></span>
@@ -42,7 +38,7 @@
 <span style="width:<%= sharpness[5] %>px" class="white"></span>
 <span style="width:<%= sharpness[6] %>px" class="purple"></span>
 </div>
-<div class="sharpness-bar" title="<%= sharpness_plus_title %>">
+<div class="sharpness-bar" title="<%= sharpness_all_title %>">
 <span style="width:<%= sharpness_plus[0] %>px" class="red"></span>
 <span style="width:<%= sharpness_plus[1] %>px" class="orange"></span>
 <span style="width:<%= sharpness_plus[2] %>px" class="yellow"></span>
@@ -51,9 +47,9 @@
 <span style="width:<%= sharpness_plus[5] %>px" class="white"></span>
 <span style="width:<%= sharpness_plus[6] %>px" class="purple"></span>
 </div>
+<% } %>
 </td>
-<td><%= sharpness_title %></td>
+<td style="text-align:right"><% if (defense) { %>+<%= defense %> Def<% } %></td>
-<td>(<%= sharpness_plus_title %>)</td>
 </tr>
 </table>
 <% if (children.length) { %>

web/weaponlist.html

@@ -212,20 +212,7 @@
                                                 + "', failed component match");
                                     return;
                               }
-                              if (data["sharpness"]) {
+                              set_sharpness_titles(data);
-                                  data["sharpness_title"] = 
-                                        data["sharpness"].join(",");
-                                  data["sharpness_plus_title"] =
-                                        data["sharpness_plus"].join(",");
-                                  data["sharpness_all_title"] =
-                                    data["sharpness_title"] + " ("
-                                    + data["sharpness_plus_title"] + ")";
-                              } else {
-                                  // gunner weapons have no sharpness
-                                  data["sharpness_title"] = "";
-                                  data["sharpness_plus_title"] = "";
-                                  data["sharpness_all_title"] = "";
-                              }
                               data["wtype_short"] =
                                         WEAPON_TYPE_ABBR[data["wtype"]];
                               data["ELEMENT_ABBR"] = ELEMENT_ABBR;

web/weaponplanner.html

@@ -178,8 +178,7 @@
         $("#weapon_stats").html("");
         $.getJSON(DATA_PATH + "weapon/" + weapon_id + ".json",
                   function(data) {
-                      data["sharpness_title"] = data["sharpness"].join(",");
+                      set_sharpness_titles(data);
-                      data["sharpness_plus_title"] = data["sharpness_plus"].join(",");
                       var html = template_stats.render(data);
                       $("#weapon_stats").html(html);
                   });