Merge branch 'issue-36-ui-part' into 'staging'

More work on Issue #36. forgot to include the client-side work last time

See merge request !36

src/client/ui/templates/inventory/inventory.js

@@ -282,14 +282,16 @@ define([
 				}
 			}
 
-			if ((!item.quest) && (!item.eq)) {
-				if ((window.player.stash.active) && (!item.noSalvage))
-					config.push(menuItems.stash);
+			if (!item.eq) {
+				if (!item.quest) {
+					if ((window.player.stash.active) && (!item.noSalvage))
+						config.push(menuItems.stash);
 
-				config.push(menuItems.drop);
+					config.push(menuItems.drop);
 
-				if ((!item.material) && (!item.noSalvage))
-					config.push(menuItems.salvage);
+					if ((!item.material) && (!item.noSalvage))
+						config.push(menuItems.salvage);
+				}
 
 				config.push(menuItems.destroy);
 			}