From d36352ae7c6f1c9b644cfc1e9ad7d869f147ce65 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Fri, 6 Nov 2015 11:27:32 -0800 Subject: [PATCH] HTML5 and CSS3 for NanoUI + Datum Browser --- code/datums/browser.dm | 5 +- .../machinery/telecomms/traffic_control.dm | 2 +- code/modules/client/client procs.dm | 6 +- code/modules/client/preferences.dm | 6 +- code/modules/mob/new_player/new_player.dm | 2 +- code/modules/nano/nanoui.dm | 3 +- nano/css/shared.css | 1 + nano/js/libraries-old.min.js | 1 + nano/js/libraries.min.js | 51 +- nano/js/libraries/jquery-ui.js | 645 +- nano/js/libraries/jquery.js | 8624 +++++++++-------- nano/js/libraries/jquery.timers.js | 142 +- nano/js/nano_utility.js | 8 + 13 files changed, 5202 insertions(+), 4294 deletions(-) create mode 100644 nano/js/libraries-old.min.js diff --git a/code/datums/browser.dm b/code/datums/browser.dm index a36b204a0f3..f2eff643eca 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -74,10 +74,11 @@ if (title_image) title_attributes = "class='uiTitle icon' style='background-image: url([title_image]);'" - return {" + return {" - + + [head_content] diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 9965f502444..6fc03276f9b 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -32,7 +32,7 @@ editingcode = user lasteditor = user - var/dat = {" "} + var/dat = "" dat += "
Telecommunications Traffic Control
" diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 896fac535aa..b1354fa1b2c 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -2,7 +2,7 @@ //SECURITY// //////////// //debugging, uncomment for viewing topic calls -// #define TOPIC_DEBUGGING 1 +//#define TOPIC_DEBUGGING 1 #define TOPIC_SPAM_DELAY 2 //2 ticks is about 2/10ths of a second; it was 4 ticks, but that caused too many clicks to be lost due to lag #define UPLOAD_LIMIT 10485760 //Restricts client uploads to the server to 10MB //Boosted this thing. What's the worst that can happen? @@ -29,6 +29,10 @@ #if defined(TOPIC_DEBUGGING) world << "[src]'s Topic: [href] destined for [hsrc]." + + if(href_list["nano_err"]) //nano throwing errors + world << "## NanoUI Error for [src], Error:" + href_list["nano_err"] + #endif diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 23add6c8b59..df5d91ae14b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -253,7 +253,7 @@ datum/preferences dat += "Secondary Language:
[language]
" dat += "Blood Type: [b_type]
" if(species == "Human") - dat += "Skin Tone: [-s_tone + 35]/220
" + dat += "Skin Tone: [-s_tone + 35]/220
" // dat += "Skin pattern: Adjust
" dat += "
Handicaps
" @@ -358,11 +358,11 @@ datum/preferences hairname = "Frame Color" dat += "
[hairname]
" dat += "Change Color
__
 " - dat += " Style: [h_style]
" + dat += "
Style: [h_style]
" dat += "
Facial
" dat += "Change Color
__
 " - dat += " Style: [f_style]
" + dat += "
Style: [f_style]
" dat += "
Eyes
" dat += "Change Color
__

" diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 9624e8fe53b..221d93383ef 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -31,7 +31,7 @@ else output += "

You are ready (Cancel)

" else - output += "View the Crew Manifest

" + output += "

View the Crew Manifest

" output += "

Join Game!

" output += "

Observe

" diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index dc136e0a861..ca964cc5628 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -357,10 +357,11 @@ nanoui is used to open and update nano browser uis var/url_parameters_json = list2json(list("src" = "\ref[src]")) return {" - + +