From f5795e2840701328c40a2c87f412488c7dc04edb Mon Sep 17 00:00:00 2001
From: David Edwards <knossos@gmail.com>
Date: Sun, 12 Oct 2014 13:33:05 +0200
Subject: [PATCH] Fixes to admin tickets. Added some data folders to gitignore.
 Investigate and logs arent necessary in the repo.

---
 .gitignore                                    |  2 +
 code/modules/admin/tickets/admin_ticket.dm    |  2 +-
 .../admin/tickets/admin_ticket_procs.dm       | 43 +++++++++------
 .../admin/tickets/admin_ticket_templates.dm   | 29 ++++++++---
 .../admin/tickets/admin_ticket_topic.dm       | 52 ++++++++-----------
 .../admin/tickets/admin_ticket_verbs.dm       |  2 +-
 data/investigate/gravity.html                 |  2 -
 data/investigate/singulo.html                 |  9 ----
 8 files changed, 77 insertions(+), 64 deletions(-)
 delete mode 100644 data/investigate/gravity.html
 delete mode 100644 data/investigate/singulo.html

diff --git a/.gitignore b/.gitignore
index 09dcb42f12..3cee5052c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@
 *.lk
 *.int
 /data/mode.txt
+/data/logs
+/data/investigate
\ No newline at end of file
diff --git a/code/modules/admin/tickets/admin_ticket.dm b/code/modules/admin/tickets/admin_ticket.dm
index 2af9d474c2..239d597edf 100644
--- a/code/modules/admin/tickets/admin_ticket.dm
+++ b/code/modules/admin/tickets/admin_ticket.dm
@@ -26,7 +26,7 @@
 	// var/msg = "<span class='boldnotice'><font color=red>New ticket created: </font>[key_name(owner, 1)] (<a href='?_src_=holder;adminmoreinfo=\ref[owner.mob]'>?</a>) (<a href='?_src_=holder;adminplayeropts=\ref[owner.mob]'>PP</a>) (<a href='?_src_=vars;Vars=\ref[owner.mob]'>VV</a>) (<a href='?_src_=holder;subtlemessage=\ref[owner.mob]'>SM</a>) (<a href='?_src_=holder;adminplayerobservejump=\ref[owner.mob]'>JMP</a>) (<a href='?_src_=holder;secretsadmin=check_antagonist'>CA</a>) [ai_found ? " (<a href='?_src_=holder;adminchecklaws=\ref[owner.mob]'>CL</a>)" : ""]:</b> [title] <a href='?src=\ref[owner];action=view_admin_ticket;ticket=\ref[src]'>View</a> <a href='?src=\ref[owner];action=monitor_admin_ticket;ticket=\ref[src]'>(Un)Monitor</a> <a href='?src=\ref[owner];action=resolve_admin_ticket;ticket=\ref[src]'>(Un)Resolve</a></span>"
 	var/msg = "<span class='boldnotice'><font color=red>New ticket created: </font>[key_name(owner, 1)]: [title] <b><a href='?src=\ref[owner];action=view_admin_ticket;ticket=\ref[src]'>View</a></b></span>"
 
-	log_file << msg
+	log_file << "<p>[msg]</p>"
 
 	//send this msg to all admins
 	var/admin_number_total = 0		//Total number of admins
diff --git a/code/modules/admin/tickets/admin_ticket_procs.dm b/code/modules/admin/tickets/admin_ticket_procs.dm
index 8d7ca599a6..ebe192c514 100644
--- a/code/modules/admin/tickets/admin_ticket_procs.dm
+++ b/code/modules/admin/tickets/admin_ticket_procs.dm
@@ -10,22 +10,27 @@
 	var/message = "[time] - <b>[calling_user]</b> - [log_message]"
 	log += "[message]"
 
+	world << output(message, "ViewTicketLog[ticket_id].browser:add_message")
+
 	log_file << "<p>[message]</p>"
 
 	var/found = 0
 
 	for(var/M in monitors)
-		M << "\"[log_message]\" added to <a href='?src=\ref[calling_user];action=view_admin_ticket;ticket=\ref[src]'>ticket</a> by [calling_user]"
+		if(owner == M || calling_user == handling_admin)
+			break
+
+		M << "<span class='boldnotice'>\"[log_message]\" added to <a href='?src=\ref[calling_user];action=view_admin_ticket;ticket=\ref[src]'>ticket</a> by [calling_user]</span>"
 		if(M == calling_user)
 			found = 1
 
-	if(handling_admin)
-		handling_admin << "\"[log_message]\" added to <a href='?src=\ref[calling_user];action=view_admin_ticket;ticket=\ref[src]'>ticket</a> by [calling_user]"
+	if(handling_admin != calling_user)
+		handling_admin << "<span class='boldnotice'>\"[log_message]\" added to <a href='?src=\ref[calling_user];action=view_admin_ticket;ticket=\ref[src]'>ticket</a> by [calling_user]</span>"
 
-	if(owner && calling_user != owner)
-		calling_user << "\"[log_message]\" added to <a href='?src=\ref[calling_user];action=view_admin_ticket;ticket=\ref[src]'>your ticket</a> by [calling_user]"
-	else if(!found)
-		calling_user << "<a href='?src=\ref[calling_user];action=view_admin_ticket;ticket=\ref[src]'>Your reply</a> has been noted "
+	owner << "<span class='boldnotice'>\"[log_message]\" added to <a href='?src=\ref[calling_user];action=view_admin_ticket;ticket=\ref[src]'>your ticket</a> by [calling_user]</span>"
+
+	if(!found && calling_user != owner)
+		calling_user << "<span class='boldnotice'><a href='?src=\ref[calling_user];action=view_admin_ticket;ticket=\ref[src]'>Your reply</a> has been noted.</span>"
 
 /datum/admin_ticket/proc/toggle_monitor(calling_user as mob)
 	var/found = 0
@@ -36,16 +41,16 @@
 	if(!found)
 		log_file << "<p>[calling_user] is now monitoring this ticket.</p>"
 		monitors += calling_user
-		calling_user << "You are now monitoring this ticket"
+		calling_user << "<span class='boldnotice'>You are now monitoring this ticket</span>"
 		if(owner)
-			owner << "[calling_user] is now monitoring your ticket"
+			owner << "<span class='boldnotice'>[calling_user] is now monitoring your ticket</span>"
 		return 1
 	else
 		log_file << "<p>[calling_user] is no longer monitoring this ticket.</p>"
 		monitors -= calling_user
-		calling_user << "You are no longer monitoring this ticket"
+		calling_user << "<span class='boldnotice'>You are no longer monitoring this ticket</span>"
 		if(owner)
-			owner << "[calling_user] is no longer monitoring your ticket"
+			owner << "<span class='boldnotice'>[calling_user] is no longer monitoring your ticket</span>"
 		return 0
 
 /datum/admin_ticket/proc/view_log(mob/calling_user as mob)
@@ -54,11 +59,12 @@
 
 	var/content = ""
 	content += "<p class='control-bar'>[reply_link] [refresh_link]</p>"
-	content += "<p class='info-bar'>Primary Admin: <span id='primary-admin'>[handling_admin != null ? key_name(handling_admin, 1) : "Unassigned"]</span></p>"
+	content += "<p class='title-bar'>[title]</p>"
+	content += "<p class='info-bar'>Primary Admin: <span id='primary-admin'>[handling_admin != null ? (usr.client.holder ? key_name(handling_admin, 1) : "[handling_admin]") : "Unassigned"]</span></p>"
 
 	content += "<p id='monitors' class='[monitors.len > 0 ? "shown" : "hidden"]'>Monitors:"
 	for(var/M in monitors)
-		content += " [M]"
+		content += " <span class='monitor'>[M]</span>"
 	content += "</p>"
 
 	content += "<p class='resolved-bar [resolved ? "resolved" : "unresolved"]' id='resolved'>[resolved ? "Is resolved" : "Is not resolved"]</p>"
@@ -100,8 +106,15 @@
 				content += "<p class='user-info-bar'>Location: [location]</p>"
 
 	content += "<div id='messages'>"
-	for(var/line in log)
-		content += "<p class='message-bar'>[line]</p>"
+
+
+	var/i = 0
+	for(i = log.len; i > 0; i--)
+		content += "<p class='message-bar'>[log[i]]</p>"
+
+	/*for(var/line in log)
+		content += "<p class='message-bar'>[line]</p>"*/
+
 	content += "</div>"
 	content += "<p class='control-bar'>[reply_link] [refresh_link]</p>"
 	content += "<br /></div></body></html>"
diff --git a/code/modules/admin/tickets/admin_ticket_templates.dm b/code/modules/admin/tickets/admin_ticket_templates.dm
index 4e450e28b0..3ce6802569 100644
--- a/code/modules/admin/tickets/admin_ticket_templates.dm
+++ b/code/modules/admin/tickets/admin_ticket_templates.dm
@@ -67,6 +67,13 @@
 					font-size: 12px;
 				}
 
+				.monitor {
+					background-color: #202020;
+					border: solid 1px #404040;
+					margin: 2px;
+					padding: 2px
+				}
+
 				.notice {
 					background: url(uiNoticeBackground.jpg) 0 0 repeat;
 					color: #15345A;
@@ -88,7 +95,7 @@
 
 				.info-bar {
 					margin: 4px;
-					padding: 4px
+					padding: 4px;
 				}
 
 				.emboldened {
@@ -102,32 +109,42 @@
 					padding: 2px 2px 2px 4px;
 				}
 
+				.title-bar {
+					background-color: #202020;
+					border: solid 1px #404040;
+					margin: 4px;
+					padding: 4px;
+					text-align: center;
+					font-size: 15px;
+					font-weight: bold;
+				}
+
 				.control-bar {
 					background-color: #202020;
 					border: solid 1px #404040;
 					margin: 4px;
-					padding: 4px
+					padding: 4px;
 				}
 
 				.resolved-bar {
 					background-color: #202020;
 					border: solid 1px #404040;
 					margin: 4px;
-					padding: 4px
+					padding: 4px;
 				}
 
 				.user-bar {
 					background-color: #202020;
 					border: solid 1px #404040;
 					margin: 4px;
-					padding: 4px
+					padding: 4px;
 				}
 
 				.ticket-bar {
 					background-color: #202020;
 					border: solid 1px #404040;
 					margin: 4px;
-					padding: 4px
+					padding: 4px;
 				}
 
 				.large-font {
@@ -177,7 +194,7 @@
 				<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 				<script type='text/javascript'>
 					function add_message(message) {
-						$('#messages').append('<p class=\"message-bar\" style=\"display: none;\">'+message+'</p>');
+						$('#messages').prepend('<p class=\"message-bar\" style=\"display: none;\">'+message+'</p>');
 
 						$('.message-bar').fadeIn();
 					}
diff --git a/code/modules/admin/tickets/admin_ticket_topic.dm b/code/modules/admin/tickets/admin_ticket_topic.dm
index 0de428da12..d6620a2018 100644
--- a/code/modules/admin/tickets/admin_ticket_topic.dm
+++ b/code/modules/admin/tickets/admin_ticket_topic.dm
@@ -1,81 +1,73 @@
 
 /client/Topic(href, href_list[])
 	..()
-	var/mob/M = locate(href_list["src"])
+	//var/mob/M = locate(href_list["src"])
 	var/client/C = usr.client
 
 	if(href_list["action"] == "view_admin_ticket")
 		var/datum/admin_ticket/T = locate(href_list["ticket"])
 		// Close ticket list when opening ticket
 		//src << browse(null, "window=ViewTickets;size=700x500")
-		T.view_log(M)
+		T.view_log(C)
 	else if(href_list["action"] == "reply_to_ticket")
-		var/time = time2text(world.timeofday, "hh:mm")
+		//var/time = time2text(world.timeofday, "hh:mm")
 		var/datum/admin_ticket/T = locate(href_list["ticket"])
 
 		if(T.resolved && !holder)
-			usr << "This ticket is marked as resolved. You may not add any more information to it."
+			usr << "<span class='boldnotice'>This ticket is marked as resolved. You may not add any more information to it.</span>"
 			return
 
 		if(T.handling_admin && src != T.handling_admin && src != T.owner)
-			usr << "You are not the owner or primary admin of this ticket. You may not reply to it."
+			usr << "<span class='boldnotice'>You are not the owner or primary admin of this ticket. You may not reply to it.</span>"
 			return
 
 		var/logtext = input("Please enter your reply:")
 
 		if(holder && !T.handling_admin)
-			if(src != T.owner)
+			if(usr != T.owner)
 				T.handling_admin = src
 				T.add_log("[T.handling_admin] has been assigned to this ticket as primary admin.");
-				usr << output("[key_name(T.handling_admin, 1)]", "ViewTicketLog[T.ticket_id].browser:handling_user")
-				T.owner << output("[key_name(T.handling_admin, 1)]", "ViewTicketLog[T.ticket_id].browser:handling_user")
-
-		usr << output("[time] - <b>[M]</b> - [logtext]", "ViewTicketLog[T.ticket_id].browser:add_message")
-		if(src != T.owner)
-			T.owner << output("[time] - <b>[M]</b> - [logtext]", "ViewTicketLog[T.ticket_id].browser:add_message")
+				world << output("[T.handling_admin]", "ViewTicketLog[T.ticket_id].browser:handling_user")
 
 		if(logtext)
-			T.add_log(M, logtext)
+			T.add_log(C, logtext)
 	else if(href_list["action"] == "monitor_admin_ticket")
+		if(!holder)
+			return
+
 		var/datum/admin_ticket/T = locate(href_list["ticket"])
-		T.toggle_monitor(M)
+		T.toggle_monitor(C)
 
 		var/monitors_text = ""
 		if(T.monitors.len > 0)
 			monitors_text += "Monitors:"
 			for(var/MO in T.monitors)
-				monitors_text += " [MO]"
+				monitors_text += " <span class='monitor'>[MO]</span>"
 
-		usr << output("[monitors_text] ", "ViewTicketLog[T.ticket_id].browser:set_monitors")
-		if(src != T.owner)
-			T.owner << output("[monitors_text] ", "ViewTicketLog[T.ticket_id].browser:set_monitors")
+		world << output("[monitors_text] ", "ViewTicketLog[T.ticket_id].browser:set_monitors")
 	else if(href_list["action"] == "administer_admin_ticket")
 		var/datum/admin_ticket/T = locate(href_list["ticket"])
-		T.handling_admin = M
+		T.handling_admin = C
 		T.log_file << "<p>[T.handling_admin] has been assigned to this ticket as primary admin.</p>"
 		T.add_log("[T.handling_admin] has been assigned to this ticket as primary admin.");
-		usr << output("[key_name(src, 1)]", "ViewTicketLog[T.ticket_id].browser:handling_user")
-		if(src != T.owner)
-			T.owner << output("[key_name(src, 1)]", "ViewTicketLog[T.ticket_id].browser:handling_user")
+		world << output("[src != null ? "[src]" : "Unassigned"]", "ViewTicketLog[T.ticket_id].browser:handling_user")
 	else if(href_list["action"] == "resolve_admin_ticket")
 		var/datum/admin_ticket/T = locate(href_list["ticket"])
 		T.resolved = !T.resolved
 		if(T.resolved)
 			T.log_file << "<p>Ticket marked as resolved by [src].</p>"
-			T.owner << "Your ticket has been marked as resolved."
+			T.owner << "<span class='boldnotice'>Your ticket has been marked as resolved.</span>"
 			for(var/O in T.monitors)
-				O << "\"[T.title]\" was marked as resolved."
+				O << "<span class='boldnotice'>\"[T.title]\" was marked as resolved.</span>"
 		else
 			T.log_file << "<p>Ticket marked as unresolved by [src].</p>"
-			T.owner << "Your ticket has been marked as unresolved."
+			T.owner << "<span class='boldnotice'>Your ticket has been marked as unresolved.</span>"
 			for(var/O in T.monitors)
-				O << "\"[T.title]\" was marked as unresolved."
-		usr << output("[T.resolved]", "ViewTicketLog[T.ticket_id].browser:set_resolved")
-		if(src != T.owner)
-			T.owner << output("[T.resolved]", "ViewTicketLog[T.ticket_id].browser:set_resolved")
+				O << "<span class='boldnotice'>\"[T.title]\" was marked as unresolved.</span>"
+		world << output("[T.resolved]", "ViewTicketLog[T.ticket_id].browser:set_resolved")
 	else if(href_list["action"] == "refresh_admin_ticket")
 		var/datum/admin_ticket/T = locate(href_list["ticket"])
-		T.view_log(M)
+		T.view_log(C)
 	else if(href_list["action"] == "get_admin_ticket_json")
 		var/datum/admin_ticket/T = locate(href_list["ticket"])
 		world << "get_admin_ticket_json [T.title]"
diff --git a/code/modules/admin/tickets/admin_ticket_verbs.dm b/code/modules/admin/tickets/admin_ticket_verbs.dm
index 40dbe1b9db..f96a8907a5 100644
--- a/code/modules/admin/tickets/admin_ticket_verbs.dm
+++ b/code/modules/admin/tickets/admin_ticket_verbs.dm
@@ -21,7 +21,7 @@
 		tickets_list.Add(T)
 	else
 		var/time = time2text(world.timeofday, "hh:mm")
-		usr << output("[time] - <b>[found_ticket.owner]</b> - [ticket_title]", "ViewTicketLog[found_ticket.ticket_id].browser:add_message")
+		//usr << output("[time] - <b>[found_ticket.owner]</b> - [ticket_title]", "ViewTicketLog[found_ticket.ticket_id].browser:add_message")
 		if(src != found_ticket.owner)
 			found_ticket.owner << output("[time] - <b>[found_ticket.owner]</b> - [ticket_title]", "ViewTicketLog[found_ticket.ticket_id].browser:add_message")
 		found_ticket.add_log(src, ticket_title)
diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html
deleted file mode 100644
index 5df3210695..0000000000
--- a/data/investigate/gravity.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<small>11:32 [0x2002fdd] (89,76,1)</small> || the gravitational generator has regained power.<br>
-<small>11:32 [0x2002fdd] (89,76,1)</small> || the gravitational generator is now charging.<br>
diff --git a/data/investigate/singulo.html b/data/investigate/singulo.html
deleted file mode 100644
index 8a30b7f409..0000000000
--- a/data/investigate/singulo.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<small>11:33 [0x200341d] (71,82,1)</small> || the power storage unit lost power and turned <font color='red'>off</font><br>
-<small>11:33 [0x2003be5] (196,91,1)</small> || the power storage unit lost power and turned <font color='red'>off</font><br>
-<small>11:33 [0x200705a] (162,148,1)</small> || the power storage unit lost power and turned <font color='red'>off</font><br>
-<small>11:33 [0x20072f5] (180,151,1)</small> || the power storage unit lost power and turned <font color='red'>off</font><br>
-<small>11:33 [0x2007309] (186,151,1)</small> || the power storage unit lost power and turned <font color='red'>off</font><br>
-<small>11:33 [0x2007335] (65,152,1)</small> || the power storage unit lost power and turned <font color='red'>off</font><br>
-<small>11:46 [0x2003382] (108,81,1)</small> || the power storage unit lost power and turned <font color='red'>off</font><br>
-<small>11:46 [0x2003377] (107,81,1)</small> || the power storage unit lost power and turned <font color='red'>off</font><br>
-<small>11:52 [0x200336c] (106,81,1)</small> || the power storage unit lost power and turned <font color='red'>off</font><br>