Merge pull request #10247 from Kelenius/ofJanicartAndLabels

Of janicart and labels

code/game/objects/structures/janicart.dm

@@ -83,22 +83,23 @@
 
 
 /obj/structure/janitorialcart/attack_hand(mob/user)
-	user.set_machine(src)
+	ui_interact(user)
-	var/dat
+	return
-	if(mybag)
-		dat += "<a href='?src=\ref[src];garbage=1'>[mybag.name]</a><br>"
-	if(mymop)
-		dat += "<a href='?src=\ref[src];mop=1'>[mymop.name]</a><br>"
-	if(myspray)
-		dat += "<a href='?src=\ref[src];spray=1'>[myspray.name]</a><br>"
-	if(myreplacer)
-		dat += "<a href='?src=\ref[src];replacer=1'>[myreplacer.name]</a><br>"
-	if(signs)
-		dat += "<a href='?src=\ref[src];sign=1'>[signs] sign\s</a><br>"
-	var/datum/browser/popup = new(user, "janicart", name, 240, 160)
-	popup.set_content(dat)
-	popup.open()
 
+/obj/structure/janitorialcart/ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	var/data[0]
+	data["name"] = capitalize(name)
+	data["bag"] = mybag ? capitalize(mybag.name) : null
+	data["mop"] = mymop ? capitalize(mymop.name) : null
+	data["spray"] = myspray ? capitalize(myspray.name) : null
+	data["replacer"] = myreplacer ? capitalize(myreplacer.name) : null
+	data["signs"] = signs ? "[signs] sign\s" : null
+
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "janitorcart.tmpl", "Janitorial cart", 240, 160)
+		ui.set_initial_data(data)
+		ui.open()
 
 /obj/structure/janitorialcart/Topic(href, href_list)
 	if(!in_range(src, usr))
@@ -106,36 +107,39 @@
 	if(!isliving(usr))
 		return
 	var/mob/living/user = usr
-	if(href_list["garbage"])
+	
-		if(mybag)
+	if(href_list["take"])
-			user.put_in_hands(mybag)
+		switch(href_list["take"])
-			user << "<span class='notice'>You take [mybag] from [src].</span>"
+			if("garbage")
-			mybag = null
+				if(mybag)
-	if(href_list["mop"])
+					user.put_in_hands(mybag)
-		if(mymop)
+					user << "<span class='notice'>You take [mybag] from [src].</span>"
-			user.put_in_hands(mymop)
+					mybag = null
-			user << "<span class='notice'>You take [mymop] from [src].</span>"
+			if("mop")
-			mymop = null
+				if(mymop)
-	if(href_list["spray"])
+					user.put_in_hands(mymop)
-		if(myspray)
+					user << "<span class='notice'>You take [mymop] from [src].</span>"
-			user.put_in_hands(myspray)
+					mymop = null
-			user << "<span class='notice'>You take [myspray] from [src].</span>"
+			if("spray")
-			myspray = null
+				if(myspray)
-	if(href_list["replacer"])
+					user.put_in_hands(myspray)
-		if(myreplacer)
+					user << "<span class='notice'>You take [myspray] from [src].</span>"
-			user.put_in_hands(myreplacer)
+					myspray = null
-			user << "<span class='notice'>You take [myreplacer] from [src].</span>"
+			if("replacer")
-			myreplacer = null
+				if(myreplacer)
-	if(href_list["sign"])
+					user.put_in_hands(myreplacer)
-		if(signs)
+					user << "<span class='notice'>You take [myreplacer] from [src].</span>"
-			var/obj/item/weapon/caution/Sign = locate() in src
+					myreplacer = null
-			if(Sign)
+			if("sign")
-				user.put_in_hands(Sign)
+				if(signs)
-				user << "<span class='notice'>You take \a [Sign] from [src].</span>"
+					var/obj/item/weapon/caution/Sign = locate() in src
-				signs--
+					if(Sign)
-			else
+						user.put_in_hands(Sign)
-				warning("[src] signs ([signs]) didn't match contents")
+						user << "<span class='notice'>You take \a [Sign] from [src].</span>"
-				signs = 0
+						signs--
+					else
+						warning("[src] signs ([signs]) didn't match contents")
+						signs = 0
 
 	update_icon()
 	updateUsrDialog()

nano/templates/janitorcart.tmpl

@@ -0,0 +1,30 @@
+<div>
+	<div>
+		{{:data.name}}
+	</div>
+	{{if data.bag}}
+		<div>
+			{{:helper.link(data.bag, '', { 'take' : 'garbage' })}}
+		</div>
+	{{/if}}
+	{{if data.mop}}
+		<div>
+			{{:helper.link(data.mop, '', { 'take' : 'mop' })}}
+		</div>
+	{{/if}}
+	{{if data.spray}}
+		<div>
+			{{:helper.link(data.spray, '', { 'take' : 'spray' })}}
+		</div>
+	{{/if}}
+	{{if data.replacer}}
+		<div>
+			{{:helper.link(data.replacer, '', { 'take' : 'replacer' })}}
+		</div>
+	{{/if}}
+	{{if data.signs}}
+		<div>
+			{{:helper.link(data.signs, '', { 'take' : 'sign' })}}
+		</div>
+	{{/if}}
+</div>