cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Port NanoUI styles to LESS

Browse Source
This commit is contained in:
Bjorn Neergaard
2015-12-15 13:08:27 -06:00
parent a0c54eba97
commit 8fdfa08e58
50 changed files with 1312 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/debug.dm
+3
View File
@@ -791,3 +791,6 @@ var/global/list/g_fancy_list_of_types = null
// Clear the user's cache so they get resent.
usr.client.cache = list()
// Send the assets.
assets.send(usr.client)
code/modules/client/asset_cache.dm
+5 -1
View File
@@ -227,6 +227,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
/datum/asset/nanoui
var/list/common = list()
var/list/uncommon = list()
var/list/common_dirs = list(
"nano/styles/",
@@ -252,9 +253,12 @@ You can set verify to TRUE if you want send() to sleep until the client has the
for(var/filename in filenames)
if(copytext(filename, length(filename)) != "/") // Ignore directories.
if(fexists(path + filename))
register_asset(filename, fcopy_rsc(path + filename))
uncommon[filename] = fcopy_rsc(path + filename)
register_asset(filename, uncommon[filename])
/datum/asset/nanoui/send(client, uncommon)
if(isnull(uncommon))
uncommon = src.uncommon
if(!islist(uncommon))
uncommon = list(uncommon)
code/modules/nano/nanoui.dm
+46 -28
View File
@@ -9,6 +9,10 @@
* modified by neersighted
**/
// Debug Things
#define USE_MIN 0
#define USE_LESS 0
/**
* NanoUI datum:
*
@@ -93,13 +97,13 @@
* Add the assets required by all NanoUIs.
**/
/datum/nanoui/proc/add_common_assets()
add_script("nanoui.js")
add_script("nanoui.util.js")
add_script("nanoui.template.js")
add_script("nanoui.helpers.js")
add_script("nanoui.handlers.js")
add_script("nanoui")
add_script("nanoui.util")
add_script("nanoui.template")
add_script("nanoui.helpers")
add_script("nanoui.handlers")
add_stylesheet("nanoui.css")
add_stylesheet("nanoui")
/**
* private
@@ -209,13 +213,14 @@
/**
* public
*
* Add a stylesheet to the NanoUI.
* Add a template to the NanoUI.
* This must be called before the NanoUI is opened.
*
* required file string The path of the stylesheet file to add.
* required key string The key used to reference this file in the frontend.
* required file string The path of the template file to add.
**/
/datum/nanoui/proc/add_stylesheet(file)
stylesheets.Add(file)
/datum/nanoui/proc/add_template(key, file)
templates[key] = "[file].dot"
/**
* public
@@ -226,25 +231,27 @@
* required file string The path of the script file to add.
**/
/datum/nanoui/proc/add_script(file)
scripts.Add(file)
scripts.Add("[file].js")
/**
* public
*
* Add a template to the NanoUI.
* Add a stylesheet to the NanoUI.
* This must be called before the NanoUI is opened.
*
* required key string The key used to reference this file in the frontend.
* required file string The path of the template file to add.
* required file string The path of the stylesheet file to add.
**/
/datum/nanoui/proc/add_template(key, filename)
templates[key] = filename
/datum/nanoui/proc/add_stylesheet(file)
if(USE_LESS)
stylesheets.Add("[file].less")
else
stylesheets.Add("[file].css")
/**
* public
*
* Set the layout for this NanoUI.
* This loads two files during get_html(): 'layout_[layout].dot' and 'layout_[layout].css'.
* This loads custom layout styles and templates for this NanoUI.
*
* required layout_key string The new layout key.
**/
@@ -290,8 +297,18 @@
**/
/datum/nanoui/proc/get_html()
// Add files based on the layout key.
add_template("layout", "layout_[layout].dot")
add_stylesheet("layout_[layout].css")
add_template("layout", "layout_[layout]")
add_stylesheet("layout_[layout]")
// Some string hacks for .less/.min.js.
var/less = ""
var/less_html = ""
var/min = ""
if(USE_LESS)
less = "/less"
less_html = "<script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/less.js/2.5.3/less.[min]js'></script>"
if(USE_MIN)
min = "min."
// Generate <script> and <link> tags.
var/script_html = ""
@@ -299,7 +316,7 @@
script_html += "<script type='text/javascript' src='[script]'></script>"
var/stylesheet_html = ""
for (var/stylesheet in stylesheets)
stylesheet_html += "<link rel='stylesheet' type='text/css' href='[stylesheet]' />"
stylesheet_html += "<link rel='stylesheet[less]' type='text/css' href='[stylesheet]' />"
// Generate template JSON.
var/template_data_json = "{}"
@@ -326,20 +343,21 @@
}
};
</script>
<link rel='stylesheet' type='text/css' href='https://cdnjs.cloudflare.com/ajax/libs/normalize/3.0.3/normalize.[min]css' />
<link rel='stylesheet' type='text/css' href='https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.[min]css' />
[stylesheet_html]
<!--\[if IE 8]>
<script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.[min]js'></script>
<script type='text/javascript' src='https//cdnjs.cloudflare.com/ajax/libs/ie8/0.2.6/ie8.js'></script>
<!\[endif]-->
<script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/dom4/1.5.2/dom4.js'></script>
<script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.3.1/es5-shim.min.js'></script>
<script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/json3/3.3.2/json3.min.js'></script>
<script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js'></script>
<script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.3.1/es5-shim.[min]js'></script>
<script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/json3/3.3.2/json3.[min]js'></script>
<script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/eddy/0.7.0/eddy.dom.js'></script>
<script type='text/javascript' src='https://cdn.rawgit.com/Mikhus/jsurl/master/url.min.js'></script>
<script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/dot/1.0.3/doT.min.js'></script>
<script type='text/javascript' src='https://cdn.rawgit.com/Mikhus/jsurl/master/url.[min]js'></script>
<script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/dot/1.0.3/doT.[min]js'></script>
[less_html]
[script_html]
<link rel='stylesheet' type='text/css' href='https://cdnjs.cloudflare.com/ajax/libs/normalize/3.0.3/normalize.min.css' />
<link rel='stylesheet' type='text/css' href='https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css' />
[stylesheet_html]
</head>
<body id='body' data-template-data='[template_data_json]' data-initial-data='[initial_data_json]' data-url-parameters='[url_parameters_json]'>
<div id='layout'></div>
code/modules/power/apc.dm
+1 -1
View File
@@ -631,7 +631,7 @@
/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, force_open = 0)
ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
ui = new(user, src, ui_key, "apc.dot", name, 550, 550)
ui = new(user, src, ui_key, "apc", name, 550, 550)
ui.open()
/obj/machinery/power/apc/get_ui_data(mob/user)
code/modules/power/smes.dm
+1 -1
View File
@@ -327,7 +327,7 @@
/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
ui = new(user, src, ui_key, "smes.dot", name, 500, 400)
ui = new(user, src, ui_key, "smes", name, 500, 400)
ui.open()
/obj/machinery/power/smes/get_ui_data()
code/modules/power/solar.dm
+1 -1
View File
@@ -372,7 +372,7 @@
/obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
ui = new(user, src, ui_key, "solar_control.dot", name, 490, 395)
ui = new(user, src, ui_key, "solar_control", name, 490, 395)
ui.open()
/obj/machinery/power/solar_control/get_ui_data()
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+1 -1
View File
@@ -87,7 +87,7 @@
/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
ui = new(user, src, ui_key, "chem_dispenser.dot", name, 500, 650)
ui = new(user, src, ui_key, "chem_dispenser", name, 500, 650)
ui.open()
/obj/machinery/chem_dispenser/get_ui_data()
code/modules/reagents/chemistry/machinery/chem_heater.dm
+1 -1
View File
@@ -106,7 +106,7 @@
/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
ui = new(user, src, ui_key, "chem_heater.dot", name, 350, 400)
ui = new(user, src, ui_key, "chem_heater", name, 350, 400)
ui.open()
/obj/machinery/chem_heater/get_ui_data()