cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

More themed uis (#7102)

Browse Source 
* Applies theming to more UIs

* Change log
This commit is contained in:
Karolis
2019-10-05 15:31:30 +03:00
committed by Werner
parent 0abbb9d237
commit c48e02439d
11 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystems/theming.dm
View File

@@ -106,7 +106,7 @@ var/datum/controller/subsystem/theming/SStheming
#endif #endif
/proc/get_html_theme_header(var/themeclass, var/extra_header = "") /proc/get_html_theme_header(var/themeclass, var/extra_header = "")
return {"<html><head><meta http-equiv="X-UA-Compatible" content="IE=edge"><link rel="stylesheet" type="text/css" href="vueui.css">[extra_header]</head><body class="[themeclass]">"} return {"<html><head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><link rel="stylesheet" type="text/css" href="vueui.css">[extra_header]</head><body class="[themeclass]">"}
/proc/get_html_theme_footer() /proc/get_html_theme_footer()
return {"</body></html>"} return {"</body></html>"}

9
code/game/machinery/newscaster.dm
View File

@@ -139,7 +139,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
if(istype(user, /mob/living/carbon/human) || istype(user,/mob/living/silicon) ) if(istype(user, /mob/living/carbon/human) || istype(user,/mob/living/silicon) )
var/mob/living/human_or_robot_user = user var/mob/living/human_or_robot_user = user
var/dat var/dat
dat = text("<HEAD><TITLE>Newscaster</TITLE></HEAD><H3>Newscaster Unit #[src.unit_no]</H3>") dat = text("<H3>Newscaster Unit #[src.unit_no]</H3>")
src.scan_user(human_or_robot_user) //Newscaster scans you src.scan_user(human_or_robot_user) //Newscaster scans you
@@ -397,8 +397,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
dat+="<BLOCKQUOTE style=\"padding:2px 4px;border-left:4px #797979 solid;\"><B>\[[world.time]\] [COMMENT.author]:</B>[COMMENT.message]<BR><A href='?src=\ref[src];censor_comment=1;comment=\ref[COMMENT]>Censor Comment</A></BLOCKQUOTE>" dat+="<BLOCKQUOTE style=\"padding:2px 4px;border-left:4px #797979 solid;\"><B>\[[world.time]\] [COMMENT.author]:</B>[COMMENT.message]<BR><A href='?src=\ref[src];censor_comment=1;comment=\ref[COMMENT]>Censor Comment</A></BLOCKQUOTE>"
dat+="<A href='?src=\ref[src];setScreen=[9]'>Return</A>" dat+="<A href='?src=\ref[src];setScreen=[9]'>Return</A>"
send_theme_resources(human_or_robot_user)
human_or_robot_user << browse(dat, "window=newscaster_main;size=400x600") human_or_robot_user << browse(enable_ui_theme(human_or_robot_user, dat), "window=newscaster_main;size=400x600")
onclose(human_or_robot_user, "newscaster_main") onclose(human_or_robot_user, "newscaster_main")
/obj/machinery/newscaster/Topic(href, href_list) /obj/machinery/newscaster/Topic(href, href_list)
@@ -876,7 +876,8 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob)
dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com"
dat+="<BR><HR><div align='center'>[src.curr_page+1]</div>" dat+="<BR><HR><div align='center'>[src.curr_page+1]</div>"
human_user << browse(dat, "window=newspaper_main;size=300x400") send_theme_resources(src)
human_user << browse(enable_ui_theme(human_user, dat), "window=newspaper_main;size=300x400")
onclose(human_user, "newspaper_main") onclose(human_user, "newspaper_main")
else else
to_chat(user, "The paper is full of intelligible symbols!") to_chat(user, "The paper is full of intelligible symbols!")

16
code/game/machinery/suit_storage_unit.dm
View File

@@ -113,7 +113,7 @@
if(!user.IsAdvancedToolUser()) if(!user.IsAdvancedToolUser())
return 0 return 0
if(src.panelopen) //The maintenance panel is open. Time for some shady stuff if(src.panelopen) //The maintenance panel is open. Time for some shady stuff
dat+= "<HEAD><TITLE>Suit storage unit: Maintenance panel</TITLE></HEAD>" dat+= ""
dat+= "<Font color ='black'><B>Maintenance panel controls</B></font><HR>" dat+= "<Font color ='black'><B>Maintenance panel controls</B></font><HR>"
dat+= "<font color ='grey'>The panel is ridden with controls, button and meters, labeled in strange signs and symbols that <BR>you cannot understand. Probably the manufactoring world's language.<BR> Among other things, a few controls catch your eye.<BR><BR></font>" dat+= "<font color ='grey'>The panel is ridden with controls, button and meters, labeled in strange signs and symbols that <BR>you cannot understand. Probably the manufactoring world's language.<BR> Among other things, a few controls catch your eye.<BR><BR></font>"
dat+= text("<font color ='black'>A small dial with a \"ë\" symbol embroidded on it. It's pointing towards a gauge that reads []</font>.<BR> <font color='blue'><A href='?src=\ref[];toggleUV=1'> Turn towards []</A><BR></font>",(src.issuperUV ? "15nm" : "185nm"),src,(src.issuperUV ? "185nm" : "15nm") ) dat+= text("<font color ='black'>A small dial with a \"ë\" symbol embroidded on it. It's pointing towards a gauge that reads []</font>.<BR> <font color='blue'><A href='?src=\ref[];toggleUV=1'> Turn towards []</A><BR></font>",(src.issuperUV ? "15nm" : "185nm"),src,(src.issuperUV ? "185nm" : "15nm") )
@@ -130,7 +130,7 @@
else else
if(!src.isbroken) if(!src.isbroken)
dat+= "<HEAD><TITLE>Suit storage unit</TITLE></HEAD>" dat+= ""
dat+= "<font color='blue'><font size = 4><B>U-Stor-It Suit Storage Unit, model DS1900</B></FONT><BR>" dat+= "<font color='blue'><font size = 4><B>U-Stor-It Suit Storage Unit, model DS1900</B></FONT><BR>"
dat+= "<B>Welcome to the Unit control panel.</B></FONT><HR>" dat+= "<B>Welcome to the Unit control panel.</B></FONT><HR>"
dat+= text("<font color='black'>Helmet storage compartment: <B>[]</B></font><BR>",(src.HELMET ? HELMET.name : "</font><font color ='grey'>No helmet detected.") ) dat+= text("<font color='black'>Helmet storage compartment: <B>[]</B></font><BR>",(src.HELMET ? HELMET.name : "</font><font color ='grey'>No helmet detected.") )
@@ -156,13 +156,14 @@
//user << browse(dat, "window=Suit Storage Unit;size=400x500") //user << browse(dat, "window=Suit Storage Unit;size=400x500")
//onclose(user, "Suit Storage Unit") //onclose(user, "Suit Storage Unit")
else //Ohhhh shit it's dirty or broken! Let's inform the guy. else //Ohhhh shit it's dirty or broken! Let's inform the guy.
dat+= "<HEAD><TITLE>Suit storage unit</TITLE></HEAD>" dat+= ""
dat+= "<font color='maroon'><B>Unit chamber is too contaminated to continue usage. Please call for a qualified individual to perform maintenance.</font></B><BR><BR>" dat+= "<font color='maroon'><B>Unit chamber is too contaminated to continue usage. Please call for a qualified individual to perform maintenance.</font></B><BR><BR>"
dat+= text("<HR><A href='?src=\ref[];mach_close=suit_storage_unit'>Close control panel</A>", user) dat+= text("<HR><A href='?src=\ref[];mach_close=suit_storage_unit'>Close control panel</A>", user)
//user << browse(dat, "window=suit_storage_unit;size=400x500") //user << browse(dat, "window=suit_storage_unit;size=400x500")
//onclose(user, "suit_storage_unit") //onclose(user, "suit_storage_unit")
user << browse(dat, "window=suit_storage_unit;size=400x500") send_theme_resources(user)
user << browse(enable_ui_theme(user, dat), "window=suit_storage_unit;size=400x500")
onclose(user, "suit_storage_unit") onclose(user, "suit_storage_unit")
return return
@@ -841,7 +842,7 @@
usr.set_machine(src) usr.set_machine(src)
var/dat = "<HEAD><TITLE>Suit Cycler Interface</TITLE></HEAD>" var/dat = ""
if(src.active) if(src.active)
dat+= "<br><font color='red'><B>The [model_text ? "[model_text] " : ""]suit cycler is currently in use. Please wait...</b></font>" dat+= "<br><font color='red'><B>The [model_text ? "[model_text] " : ""]suit cycler is currently in use. Please wait...</b></font>"
@@ -867,12 +868,13 @@
dat += "<h2>Customisation</h2>" dat += "<h2>Customisation</h2>"
dat += "<b>Target product:</b> <A href='?src=\ref[src];select_department=1'>[target_department]</a>, <A href='?src=\ref[src];select_species=1'>[target_species]</a>." dat += "<b>Target product:</b> <A href='?src=\ref[src];select_department=1'>[target_department]</a>, <A href='?src=\ref[src];select_species=1'>[target_species]</a>."
dat += "<A href='?src=\ref[src];apply_paintjob=1'><br>\[apply customisation routine\]</a><br><hr>" dat += "<br><A href='?src=\ref[src];apply_paintjob=1'>\[apply customisation routine\]</a><br><hr>"
if(panel_open) if(panel_open)
wires.Interact(user) wires.Interact(user)
user << browse(dat, "window=suit_cycler") send_theme_resources(user)
user << browse(enable_ui_theme(user, dat), "window=suit_cycler")
onclose(user, "suit_cycler") onclose(user, "suit_cycler")
return return

3
code/game/objects/items/weapons/storage/secure.dm
View File

@@ -90,7 +90,8 @@
if (!src.locked) if (!src.locked)
message = "*****" message = "*****"
dat += text("<HR>\n>[]<BR>\n<A href='?src=\ref[];type=1'>1</A>-<A href='?src=\ref[];type=2'>2</A>-<A href='?src=\ref[];type=3'>3</A><BR>\n<A href='?src=\ref[];type=4'>4</A>-<A href='?src=\ref[];type=5'>5</A>-<A href='?src=\ref[];type=6'>6</A><BR>\n<A href='?src=\ref[];type=7'>7</A>-<A href='?src=\ref[];type=8'>8</A>-<A href='?src=\ref[];type=9'>9</A><BR>\n<A href='?src=\ref[];type=R'>R</A>-<A href='?src=\ref[];type=0'>0</A>-<A href='?src=\ref[];type=E'>E</A><BR>\n</TT>", message, src, src, src, src, src, src, src, src, src, src, src, src) dat += text("<HR>\n>[]<BR>\n<A href='?src=\ref[];type=1'>1</A>-<A href='?src=\ref[];type=2'>2</A>-<A href='?src=\ref[];type=3'>3</A><BR>\n<A href='?src=\ref[];type=4'>4</A>-<A href='?src=\ref[];type=5'>5</A>-<A href='?src=\ref[];type=6'>6</A><BR>\n<A href='?src=\ref[];type=7'>7</A>-<A href='?src=\ref[];type=8'>8</A>-<A href='?src=\ref[];type=9'>9</A><BR>\n<A href='?src=\ref[];type=R'>R</A>-<A href='?src=\ref[];type=0'>0</A>-<A href='?src=\ref[];type=E'>E</A><BR>\n</TT>", message, src, src, src, src, src, src, src, src, src, src, src, src)
user << browse(dat, "window=caselock;size=300x280") send_theme_resources(user)
user << browse(enable_ui_theme(user, dat), "window=caselock;size=300x280")
Topic(href, href_list) Topic(href, href_list)
..() ..()

5
code/modules/admin/admin.dm
View File

@@ -332,7 +332,7 @@ proc/admin_notice(var/message, var/rights)
if (!admincaster_signature) if (!admincaster_signature)
update_newscaster_sig() update_newscaster_sig()
var/dat var/dat
dat = "<HEAD><TITLE>Admin Newscaster</TITLE></HEAD><H3>Admin Newscaster Unit</H3>" dat = "<H3>Admin Newscaster Unit</H3>"
switch(admincaster_screen) switch(admincaster_screen)
if(0) if(0)
@@ -573,7 +573,8 @@ proc/admin_notice(var/message, var/rights)
else else
dat+="Please report this on GitHub, along with what you did to make this appear." dat+="Please report this on GitHub, along with what you did to make this appear."
usr << browse(dat, "window=admincaster_main;size=400x600") send_theme_resources(usr)
usr << browse(enable_ui_theme(usr, dat), "window=admincaster_main;size=400x600")
onclose(usr, "admincaster_main") onclose(usr, "admincaster_main")

6
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -654,7 +654,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.species_preview = "Human" pref.species_preview = "Human"
var/datum/species/current_species = all_species[pref.species_preview] var/datum/species/current_species = all_species[pref.species_preview]
var/list/dat = list( var/list/dat = list(
"<body>",
"<center><h2>[current_species.name] \[<a href='?src=\ref[src];show_species=1'>change</a>\]</h2></center><hr/>", "<center><h2>[current_species.name] \[<a href='?src=\ref[src];show_species=1'>change</a>\]</h2></center><hr/>",
"<table padding='8px'>", "<table padding='8px'>",
"<tr>", "<tr>",
@@ -710,9 +709,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
dat += "<font color='red'><b>You cannot play as this species.</br><small>This species is not available for play as a station race.</small></b></font></br>" dat += "<font color='red'><b>You cannot play as this species.</br><small>This species is not available for play as a station race.</small></b></font></br>"
if(!restricted || check_rights(R_ADMIN, 0)) if(!restricted || check_rights(R_ADMIN, 0))
dat += "\[<a href='?src=\ref[src];set_species=[html_encode(pref.species_preview)]'>select</a>\]" dat += "\[<a href='?src=\ref[src];set_species=[html_encode(pref.species_preview)]'>select</a>\]"
dat += "</center></body>" dat += "</center>"
user << browse(dat.Join(), "window=species;size=700x400") send_theme_resources(user)
user << browse(enable_ui_theme(user, dat.Join()), "window=species;size=700x400")
/*/datum/category_item/player_setup_item/general/body/proc/reset_limbs() /*/datum/category_item/player_setup_item/general/body/proc/reset_limbs()

3
code/modules/economy/ATM.dm
View File

@@ -219,7 +219,8 @@ log transactions
dat += "<input type='submit' value='Submit'><br>" dat += "<input type='submit' value='Submit'><br>"
dat += "</form>" dat += "</form>"
user << browse(dat,"window=atm;size=550x650") send_theme_resources(user)
user << browse(enable_ui_theme(user, dat),"window=atm;size=550x650")
else else
user << browse(null,"window=atm") user << browse(null,"window=atm")

8
code/modules/mob/abstract/new_player/new_player.dm
View File

@@ -364,7 +364,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
/mob/abstract/new_player/proc/LateChoices() /mob/abstract/new_player/proc/LateChoices()
var/name = client.prefs.real_name var/name = client.prefs.real_name
var/dat = "<html><body><center>" var/dat = "<center>"
dat += "<b>Welcome, [name].<br></b>" dat += "<b>Welcome, [name].<br></b>"
dat += "Round Duration: [get_round_duration_formatted()]<br>" dat += "Round Duration: [get_round_duration_formatted()]<br>"
@@ -388,7 +388,8 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
dat += "<a href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title] ([job.current_positions]) (Active: [active])</a><br>" dat += "<a href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title] ([job.current_positions]) (Active: [active])</a><br>"
dat += "</center>" dat += "</center>"
src << browse(dat, "window=latechoices;size=300x640;can_close=1") send_theme_resources(src)
src << browse(enable_ui_theme(src, dat), "window=latechoices;size=300x640;can_close=1")
/mob/abstract/new_player/proc/create_character() /mob/abstract/new_player/proc/create_character()
@@ -461,7 +462,8 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
dat += "<h4>Show Crew Manifest</h4>" dat += "<h4>Show Crew Manifest</h4>"
dat += SSrecords.get_manifest(OOC = 1) dat += SSrecords.get_manifest(OOC = 1)
src << browse(dat, "window=manifest;size=370x420;can_close=1") send_theme_resources(src)
src << browse(enable_ui_theme(src, dat), "window=manifest;size=370x420;can_close=1")
/mob/abstract/new_player/Move() /mob/abstract/new_player/Move()
return 0 return 0

4
code/modules/mob/abstract/new_player/poll.dm
View File

@@ -31,8 +31,8 @@
i++ i++
output += "</table>" output += "</table>"
send_theme_resources(src)
src << browse(output,"window=playerpolllist;size=500x300") src << browse(enable_ui_theme(src, output),"window=playerpolllist;size=500x300")
/mob/abstract/new_player/proc/show_poll_link(var/pollid = -1) /mob/abstract/new_player/proc/show_poll_link(var/pollid = -1)
if(pollid == -1) return if(pollid == -1) return

5
code/modules/security levels/keycard authentication.dm
View File

@@ -71,11 +71,12 @@
dat += "<li><A href='?src=\ref[src];triggerevent=Grant Emergency Maintenance Access'>Grant Emergency Maintenance Access</A></li>" dat += "<li><A href='?src=\ref[src];triggerevent=Grant Emergency Maintenance Access'>Grant Emergency Maintenance Access</A></li>"
dat += "<li><A href='?src=\ref[src];triggerevent=Revoke Emergency Maintenance Access'>Revoke Emergency Maintenance Access</A></li>" dat += "<li><A href='?src=\ref[src];triggerevent=Revoke Emergency Maintenance Access'>Revoke Emergency Maintenance Access</A></li>"
dat += "</ul>" dat += "</ul>"
user << browse(dat, "window=keycard_auth;size=500x250")
if(screen == 2) if(screen == 2)
dat += "Please swipe your card to authorize the following event: <b>[event]</b>" dat += "Please swipe your card to authorize the following event: <b>[event]</b>"
dat += "<p><A href='?src=\ref[src];reset=1'>Back</A>" dat += "<p><A href='?src=\ref[src];reset=1'>Back</A>"
user << browse(dat, "window=keycard_auth;size=500x250")
send_theme_resources(user)
user << browse(enable_ui_theme(user, dat), "window=keycard_auth;size=500x350")
return return

4
html/changelogs/more theming.yml Normal file
View File

@@ -0,0 +1,4 @@
author: Karolis2011
delete-after: True
changes:
- rscadd: "Added theme support to multiple UIs."