diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/region.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/region.js index 6fb31ec0..054483d2 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/region.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/region.js @@ -1,12 +1,18 @@ var minisrv_service_file = true; var timezone = "-0000"; +var zip = ""; if (session_data.isRegistered()) { timezone = session_data.getSessionData("timezone") || timezone; + zip = session_data.getSessionData("zipcode") || zip; if (request_headers.query.timezone) { timezone = request_headers.query.timezone; session_data.setSessionData("timezone", timezone); } + if (request_headers.query.zip) { + zip = request_headers.query.zip; + session_data.setSessionData("zipcode", zip); + } } strf = strftime.timezone(timezone) @@ -94,11 +100,11 @@ html += `

-

+ Zip Code Entry

Zip Code: - +

diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/setup.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/setup.js index b21d1d28..4706a652 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/setup.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/setup.js @@ -8,6 +8,40 @@ var notImplementedAlert = new clientShowAlert({ 'noback': true, }).getURL(); + +var settings = [ + ["wtv-setup:/mail", "Mail Signature"], + ["wtv-setup:/edit-password", "Edit Password"], + ["wtv-setup:/accounts", "Account & Users"], + ["wtv-setup:/text", "Text Size"], + ["wtv-setup:/sound", "Background Music"], + [notImplementedAlert, "Printing"], + ["wtv-setup:/keyboard", "On-Screen Keyboard"], + ["wtv-setup:/screen", "Screen"], + ["wtv-setup:/messenger", "MSN Messenger"], + ["wtv-setup:/phone", "Dialing"], + ["wtv-setup:/region", "Timezone & Region"], + ["wtv-setup:/tweaks", "Tweaks"] +] + +function removeSettingByUrl(url) { + for (let i = settings.length - 1; i >= 0; i--) { + if (settings[i][0] === url) { + settings.splice(i, 1); + } + } +} + +if (minisrv_config.config.hide_incomplete_features) { + removeSettingByUrl(notImplementedAlert); +} + +/* We need to fix most webtv viewers for this, since they spoof a build that doesn't support messenger? +if (!session_data.hasCap("client-can-use-messenger")) { + removeSettingByUrl("wtv-setup:/messenger"); +} +*/ + headers = `200 OK Connection: Keep-Alive wtv-expire-all: wtv- @@ -50,7 +84,7 @@ Settings - + @@ -59,112 +93,32 @@ Settings
- + Settings for ${session_data.getSessionData("subscriber_username") || "You"}
- - - - - - - - - - - - - +
  + + +
 `; -
-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  -MailSignature and more
  -PasswordChange your password
  -TelevisionOptions for your TV
  -Text sizeMake text bigger or smaller
  -MusicPlay background songs
  -PrintingChange how you print
  -KeyboardChoose an on-screen keyboard
  -Extra UsersAdd, change, or remove users
  -MessengerConfigure Messenger
  -DialingConnecting to WebTV
  -Region SettingsChange timezone and zip code
  -Tweaksminisrv specific settings
- - -
- -
- -    -
-		 -
- - +for (i = 0; i < settings.length; i += 2) { + console.log(settings); + data += `
+
${(settings[i][0] != "") ? `€ ${settings[i][1]}` : `  `} + +` + if (i + 1 < settings.length) { + data += (settings[i + 1][0] != "") ? `€ ${settings[i + 1][1]}` : `  ` + } else { + // require even number of settings + data += "  " + } +} +data += `
+ + `; \ No newline at end of file diff --git a/zefie_wtvp_minisrv/package-lock.json b/zefie_wtvp_minisrv/package-lock.json index 4d8eb18c..8ff89542 100644 --- a/zefie_wtvp_minisrv/package-lock.json +++ b/zefie_wtvp_minisrv/package-lock.json @@ -1,12 +1,12 @@ { "name": "zefie_wtvp_minisrv", - "version": "0.9.61-pre", + "version": "0.9.63-pre", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "zefie_wtvp_minisrv", - "version": "0.9.61-pre", + "version": "0.9.63-pre", "license": "GPL3", "dependencies": { "adm-zip": "^0.5.12",