diff --git a/code/artifact.js b/code/artifact.js
index d8c634e8..48ddec8f 100644
--- a/code/artifact.js
+++ b/code/artifact.js
@@ -220,30 +220,46 @@ window.artifact.showArtifactList = function() {
html += '
'+types[type]+'
';
- html += 'Portal | Details |
';
+ html += '';
+ html += 'Portal | Details |
';
+
+ var tableRows = [];
$.each(artifact.portalInfo, function(guid, data) {
if (type in data) {
// this portal has data for this artifact type - add it to the table
- var onclick = 'zoomToAndShowPortal(\''+guid+'\',['+data._entityData.locationE6.latE6/1E6+','+data._entityData.locationE6.lngE6/1E6+'])';
- html += ''+escapeHtmlSpecialChars(data._entityData.portalV2.descriptiveText.TITLE)+' | ';
+ var sortVal = 0;
- html += '';
+ var onclick = 'zoomToAndShowPortal(\''+guid+'\',['+data._entityData.locationE6.latE6/1E6+','+data._entityData.locationE6.lngE6/1E6+'])';
+ var row = ' |
'+escapeHtmlSpecialChars(data._entityData.portalV2.descriptiveText.TITLE)+' | ';
+
+ row += '';
if (data[type].target) {
- html += ''+(data[type].target==TEAM_RES?'Resistance':'Enlightened')+' target ';
+ row += ''+(data[type].target==TEAM_RES?'Resistance':'Enlightened')+' target ';
+ sortVal = 100000+data[type].target;
}
if (data[type].fragments) {
- html += 'Shard: #'+data[type].fragments.join(', #')+' ';
+ row += 'Shard: #'+data[type].fragments.join(', #')+' ';
+ sortVal = Math.min.apply(null, data[type].fragments); // use min shard number at portal as sort key
}
- html += ' |
';
+ row += '';
+ tableRows.push ( [sortVal, row] );
}
});
+ // sort the rows
+ tableRows.sort(function(a,b) {
+ return a[0]-b[0];
+ });
+
+ // and add them to the table
+ html += tableRows.map(function(a){return a[1];}).join('');
+
html += '
';
});
diff --git a/style.css b/style.css
index a04b3086..fe408f59 100644
--- a/style.css
+++ b/style.css
@@ -983,6 +983,15 @@ td + td {
}
+/** artifact dialog *****************/
+table.artifact tr > * {
+ background: rgba(8, 48, 78, 0.9);
+}
+
+table.artifact td.info {
+ min-width: 110px;
+}
+
/* leaflet popups - restyle to match the theme of IITC */
#map .leaflet-popup {