diff --git a/core/async/.editorconfig b/[esx]/async/.editorconfig similarity index 100% rename from core/async/.editorconfig rename to [esx]/async/.editorconfig diff --git a/core/async/LICENSE b/[esx]/async/LICENSE similarity index 100% rename from core/async/LICENSE rename to [esx]/async/LICENSE diff --git a/core/async/README.md b/[esx]/async/README.md similarity index 100% rename from core/async/README.md rename to [esx]/async/README.md diff --git a/core/async/async.lua b/[esx]/async/async.lua similarity index 100% rename from core/async/async.lua rename to [esx]/async/async.lua diff --git a/core/async/fxmanifest.lua b/[esx]/async/fxmanifest.lua similarity index 100% rename from core/async/fxmanifest.lua rename to [esx]/async/fxmanifest.lua diff --git a/core/cron/.editorconfig b/[esx]/cron/.editorconfig similarity index 100% rename from core/cron/.editorconfig rename to [esx]/cron/.editorconfig diff --git a/core/cron/LICENSE b/[esx]/cron/LICENSE similarity index 100% rename from core/cron/LICENSE rename to [esx]/cron/LICENSE diff --git a/core/cron/README.md b/[esx]/cron/README.md similarity index 100% rename from core/cron/README.md rename to [esx]/cron/README.md diff --git a/core/cron/fxmanifest.lua b/[esx]/cron/fxmanifest.lua similarity index 100% rename from core/cron/fxmanifest.lua rename to [esx]/cron/fxmanifest.lua diff --git a/core/cron/server/main.lua b/[esx]/cron/server/main.lua similarity index 100% rename from core/cron/server/main.lua rename to [esx]/cron/server/main.lua diff --git a/core/es_extended/.editorconfig b/[esx]/es_extended/.editorconfig similarity index 100% rename from core/es_extended/.editorconfig rename to [esx]/es_extended/.editorconfig diff --git a/core/es_extended/LICENSE b/[esx]/es_extended/LICENSE similarity index 100% rename from core/es_extended/LICENSE rename to [esx]/es_extended/LICENSE diff --git a/core/es_extended/README.md b/[esx]/es_extended/README.md similarity index 100% rename from core/es_extended/README.md rename to [esx]/es_extended/README.md diff --git a/core/es_extended/client/common.lua b/[esx]/es_extended/client/common.lua similarity index 100% rename from core/es_extended/client/common.lua rename to [esx]/es_extended/client/common.lua diff --git a/core/es_extended/client/entityiter.lua b/[esx]/es_extended/client/entityiter.lua similarity index 100% rename from core/es_extended/client/entityiter.lua rename to [esx]/es_extended/client/entityiter.lua diff --git a/core/es_extended/client/functions.lua b/[esx]/es_extended/client/functions.lua similarity index 100% rename from core/es_extended/client/functions.lua rename to [esx]/es_extended/client/functions.lua diff --git a/core/es_extended/client/main.lua b/[esx]/es_extended/client/main.lua similarity index 100% rename from core/es_extended/client/main.lua rename to [esx]/es_extended/client/main.lua diff --git a/core/es_extended/client/modules/death.lua b/[esx]/es_extended/client/modules/death.lua similarity index 100% rename from core/es_extended/client/modules/death.lua rename to [esx]/es_extended/client/modules/death.lua diff --git a/core/es_extended/client/modules/scaleform.lua b/[esx]/es_extended/client/modules/scaleform.lua similarity index 100% rename from core/es_extended/client/modules/scaleform.lua rename to [esx]/es_extended/client/modules/scaleform.lua diff --git a/core/es_extended/client/modules/streaming.lua b/[esx]/es_extended/client/modules/streaming.lua similarity index 100% rename from core/es_extended/client/modules/streaming.lua rename to [esx]/es_extended/client/modules/streaming.lua diff --git a/core/es_extended/client/wrapper.lua b/[esx]/es_extended/client/wrapper.lua similarity index 100% rename from core/es_extended/client/wrapper.lua rename to [esx]/es_extended/client/wrapper.lua diff --git a/core/es_extended/common/functions.lua b/[esx]/es_extended/common/functions.lua similarity index 100% rename from core/es_extended/common/functions.lua rename to [esx]/es_extended/common/functions.lua diff --git a/core/es_extended/common/modules/math.lua b/[esx]/es_extended/common/modules/math.lua similarity index 100% rename from core/es_extended/common/modules/math.lua rename to [esx]/es_extended/common/modules/math.lua diff --git a/core/es_extended/common/modules/table.lua b/[esx]/es_extended/common/modules/table.lua similarity index 100% rename from core/es_extended/common/modules/table.lua rename to [esx]/es_extended/common/modules/table.lua diff --git a/core/es_extended/config.lua b/[esx]/es_extended/config.lua similarity index 100% rename from core/es_extended/config.lua rename to [esx]/es_extended/config.lua diff --git a/core/es_extended/config.weapons.lua b/[esx]/es_extended/config.weapons.lua similarity index 100% rename from core/es_extended/config.weapons.lua rename to [esx]/es_extended/config.weapons.lua diff --git a/core/es_extended/es_extended.sql b/[esx]/es_extended/es_extended.sql similarity index 100% rename from core/es_extended/es_extended.sql rename to [esx]/es_extended/es_extended.sql diff --git a/core/es_extended/fxmanifest.lua b/[esx]/es_extended/fxmanifest.lua similarity index 100% rename from core/es_extended/fxmanifest.lua rename to [esx]/es_extended/fxmanifest.lua diff --git a/core/es_extended/html/css/app.css b/[esx]/es_extended/html/css/app.css similarity index 100% rename from core/es_extended/html/css/app.css rename to [esx]/es_extended/html/css/app.css diff --git a/core/es_extended/html/fonts/bankgothic.ttf b/[esx]/es_extended/html/fonts/bankgothic.ttf similarity index 100% rename from core/es_extended/html/fonts/bankgothic.ttf rename to [esx]/es_extended/html/fonts/bankgothic.ttf diff --git a/core/es_extended/html/fonts/pdown.ttf b/[esx]/es_extended/html/fonts/pdown.ttf similarity index 100% rename from core/es_extended/html/fonts/pdown.ttf rename to [esx]/es_extended/html/fonts/pdown.ttf diff --git a/core/es_extended/html/img/accounts/bank.png b/[esx]/es_extended/html/img/accounts/bank.png similarity index 100% rename from core/es_extended/html/img/accounts/bank.png rename to [esx]/es_extended/html/img/accounts/bank.png diff --git a/core/es_extended/html/img/accounts/black_money.png b/[esx]/es_extended/html/img/accounts/black_money.png similarity index 100% rename from core/es_extended/html/img/accounts/black_money.png rename to [esx]/es_extended/html/img/accounts/black_money.png diff --git a/core/es_extended/html/img/accounts/money.png b/[esx]/es_extended/html/img/accounts/money.png similarity index 100% rename from core/es_extended/html/img/accounts/money.png rename to [esx]/es_extended/html/img/accounts/money.png diff --git a/core/es_extended/html/js/app.js b/[esx]/es_extended/html/js/app.js similarity index 100% rename from core/es_extended/html/js/app.js rename to [esx]/es_extended/html/js/app.js diff --git a/core/es_extended/html/js/mustache.min.js b/[esx]/es_extended/html/js/mustache.min.js similarity index 100% rename from core/es_extended/html/js/mustache.min.js rename to [esx]/es_extended/html/js/mustache.min.js diff --git a/core/es_extended/html/js/wrapper.js b/[esx]/es_extended/html/js/wrapper.js similarity index 100% rename from core/es_extended/html/js/wrapper.js rename to [esx]/es_extended/html/js/wrapper.js diff --git a/core/es_extended/html/ui.html b/[esx]/es_extended/html/ui.html similarity index 100% rename from core/es_extended/html/ui.html rename to [esx]/es_extended/html/ui.html diff --git a/core/es_extended/imports.lua b/[esx]/es_extended/imports.lua similarity index 100% rename from core/es_extended/imports.lua rename to [esx]/es_extended/imports.lua diff --git a/core/es_extended/locale.js b/[esx]/es_extended/locale.js similarity index 100% rename from core/es_extended/locale.js rename to [esx]/es_extended/locale.js diff --git a/core/es_extended/locale.lua b/[esx]/es_extended/locale.lua similarity index 100% rename from core/es_extended/locale.lua rename to [esx]/es_extended/locale.lua diff --git a/core/es_extended/locales/br.lua b/[esx]/es_extended/locales/br.lua similarity index 100% rename from core/es_extended/locales/br.lua rename to [esx]/es_extended/locales/br.lua diff --git a/core/es_extended/locales/cs.lua b/[esx]/es_extended/locales/cs.lua similarity index 100% rename from core/es_extended/locales/cs.lua rename to [esx]/es_extended/locales/cs.lua diff --git a/core/es_extended/locales/de.lua b/[esx]/es_extended/locales/de.lua similarity index 100% rename from core/es_extended/locales/de.lua rename to [esx]/es_extended/locales/de.lua diff --git a/core/es_extended/locales/en.lua b/[esx]/es_extended/locales/en.lua similarity index 100% rename from core/es_extended/locales/en.lua rename to [esx]/es_extended/locales/en.lua diff --git a/core/es_extended/locales/fi.lua b/[esx]/es_extended/locales/fi.lua similarity index 100% rename from core/es_extended/locales/fi.lua rename to [esx]/es_extended/locales/fi.lua diff --git a/core/es_extended/locales/fr.lua b/[esx]/es_extended/locales/fr.lua similarity index 100% rename from core/es_extended/locales/fr.lua rename to [esx]/es_extended/locales/fr.lua diff --git a/core/es_extended/locales/pl.lua b/[esx]/es_extended/locales/pl.lua similarity index 100% rename from core/es_extended/locales/pl.lua rename to [esx]/es_extended/locales/pl.lua diff --git a/core/es_extended/locales/sc.lua b/[esx]/es_extended/locales/sc.lua similarity index 100% rename from core/es_extended/locales/sc.lua rename to [esx]/es_extended/locales/sc.lua diff --git a/core/es_extended/locales/sv.lua b/[esx]/es_extended/locales/sv.lua similarity index 100% rename from core/es_extended/locales/sv.lua rename to [esx]/es_extended/locales/sv.lua diff --git a/core/es_extended/locales/tc.lua b/[esx]/es_extended/locales/tc.lua similarity index 100% rename from core/es_extended/locales/tc.lua rename to [esx]/es_extended/locales/tc.lua diff --git a/core/es_extended/server/classes/player.lua b/[esx]/es_extended/server/classes/player.lua similarity index 100% rename from core/es_extended/server/classes/player.lua rename to [esx]/es_extended/server/classes/player.lua diff --git a/core/es_extended/server/commands.lua b/[esx]/es_extended/server/commands.lua similarity index 100% rename from core/es_extended/server/commands.lua rename to [esx]/es_extended/server/commands.lua diff --git a/core/es_extended/server/common.lua b/[esx]/es_extended/server/common.lua similarity index 100% rename from core/es_extended/server/common.lua rename to [esx]/es_extended/server/common.lua diff --git a/core/es_extended/server/functions.lua b/[esx]/es_extended/server/functions.lua similarity index 100% rename from core/es_extended/server/functions.lua rename to [esx]/es_extended/server/functions.lua diff --git a/core/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua similarity index 100% rename from core/es_extended/server/main.lua rename to [esx]/es_extended/server/main.lua diff --git a/core/es_extended/server/paycheck.lua b/[esx]/es_extended/server/paycheck.lua similarity index 100% rename from core/es_extended/server/paycheck.lua rename to [esx]/es_extended/server/paycheck.lua diff --git a/core/es_extended/version.json b/[esx]/es_extended/version.json similarity index 100% rename from core/es_extended/version.json rename to [esx]/es_extended/version.json diff --git a/core/esx_identity/.editorconfig b/[esx]/esx_identity/.editorconfig similarity index 100% rename from core/esx_identity/.editorconfig rename to [esx]/esx_identity/.editorconfig diff --git a/core/esx_identity/LICENSE b/[esx]/esx_identity/LICENSE similarity index 100% rename from core/esx_identity/LICENSE rename to [esx]/esx_identity/LICENSE diff --git a/core/esx_identity/README.md b/[esx]/esx_identity/README.md similarity index 100% rename from core/esx_identity/README.md rename to [esx]/esx_identity/README.md diff --git a/core/esx_identity/client/main.lua b/[esx]/esx_identity/client/main.lua similarity index 100% rename from core/esx_identity/client/main.lua rename to [esx]/esx_identity/client/main.lua diff --git a/core/esx_identity/config.lua b/[esx]/esx_identity/config.lua similarity index 100% rename from core/esx_identity/config.lua rename to [esx]/esx_identity/config.lua diff --git a/core/esx_identity/esx_identity.sql b/[esx]/esx_identity/esx_identity.sql similarity index 100% rename from core/esx_identity/esx_identity.sql rename to [esx]/esx_identity/esx_identity.sql diff --git a/core/esx_identity/fxmanifest.lua b/[esx]/esx_identity/fxmanifest.lua similarity index 100% rename from core/esx_identity/fxmanifest.lua rename to [esx]/esx_identity/fxmanifest.lua diff --git a/core/esx_identity/html/css/style.css b/[esx]/esx_identity/html/css/style.css similarity index 100% rename from core/esx_identity/html/css/style.css rename to [esx]/esx_identity/html/css/style.css diff --git a/core/esx_identity/html/img/esx_identity.png b/[esx]/esx_identity/html/img/esx_identity.png similarity index 100% rename from core/esx_identity/html/img/esx_identity.png rename to [esx]/esx_identity/html/img/esx_identity.png diff --git a/core/esx_identity/html/index.html b/[esx]/esx_identity/html/index.html similarity index 100% rename from core/esx_identity/html/index.html rename to [esx]/esx_identity/html/index.html diff --git a/core/esx_identity/html/index_heightslider.html b/[esx]/esx_identity/html/index_heightslider.html similarity index 100% rename from core/esx_identity/html/index_heightslider.html rename to [esx]/esx_identity/html/index_heightslider.html diff --git a/core/esx_identity/html/index_heighttext.html b/[esx]/esx_identity/html/index_heighttext.html similarity index 100% rename from core/esx_identity/html/index_heighttext.html rename to [esx]/esx_identity/html/index_heighttext.html diff --git a/core/esx_identity/html/index_options/index_heightslider.html b/[esx]/esx_identity/html/index_options/index_heightslider.html similarity index 100% rename from core/esx_identity/html/index_options/index_heightslider.html rename to [esx]/esx_identity/html/index_options/index_heightslider.html diff --git a/core/esx_identity/html/index_options/index_heighttext.html b/[esx]/esx_identity/html/index_options/index_heighttext.html similarity index 100% rename from core/esx_identity/html/index_options/index_heighttext.html rename to [esx]/esx_identity/html/index_options/index_heighttext.html diff --git a/core/esx_identity/html/js/script.js b/[esx]/esx_identity/html/js/script.js similarity index 100% rename from core/esx_identity/html/js/script.js rename to [esx]/esx_identity/html/js/script.js diff --git a/core/esx_identity/html/localization/cs_index(outofdate).html b/[esx]/esx_identity/html/localization/cs_index(outofdate).html similarity index 100% rename from core/esx_identity/html/localization/cs_index(outofdate).html rename to [esx]/esx_identity/html/localization/cs_index(outofdate).html diff --git a/core/esx_identity/html/localization/fi_index(outofdate).html b/[esx]/esx_identity/html/localization/fi_index(outofdate).html similarity index 100% rename from core/esx_identity/html/localization/fi_index(outofdate).html rename to [esx]/esx_identity/html/localization/fi_index(outofdate).html diff --git a/core/esx_identity/html/localization/ko_index(outofdate).html b/[esx]/esx_identity/html/localization/ko_index(outofdate).html similarity index 100% rename from core/esx_identity/html/localization/ko_index(outofdate).html rename to [esx]/esx_identity/html/localization/ko_index(outofdate).html diff --git a/core/esx_identity/html/localization/sv_index(outofdate).html b/[esx]/esx_identity/html/localization/sv_index(outofdate).html similarity index 100% rename from core/esx_identity/html/localization/sv_index(outofdate).html rename to [esx]/esx_identity/html/localization/sv_index(outofdate).html diff --git a/core/esx_identity/locales/cs.lua b/[esx]/esx_identity/locales/cs.lua similarity index 100% rename from core/esx_identity/locales/cs.lua rename to [esx]/esx_identity/locales/cs.lua diff --git a/core/esx_identity/locales/en.lua b/[esx]/esx_identity/locales/en.lua similarity index 100% rename from core/esx_identity/locales/en.lua rename to [esx]/esx_identity/locales/en.lua diff --git a/core/esx_identity/locales/es.lua b/[esx]/esx_identity/locales/es.lua similarity index 100% rename from core/esx_identity/locales/es.lua rename to [esx]/esx_identity/locales/es.lua diff --git a/core/esx_identity/locales/fi.lua b/[esx]/esx_identity/locales/fi.lua similarity index 100% rename from core/esx_identity/locales/fi.lua rename to [esx]/esx_identity/locales/fi.lua diff --git a/core/esx_identity/locales/pl.lua b/[esx]/esx_identity/locales/pl.lua similarity index 100% rename from core/esx_identity/locales/pl.lua rename to [esx]/esx_identity/locales/pl.lua diff --git a/core/esx_identity/server/main.lua b/[esx]/esx_identity/server/main.lua similarity index 100% rename from core/esx_identity/server/main.lua rename to [esx]/esx_identity/server/main.lua diff --git a/core/esx_menu_dialog/.editorconfig b/[esx]/esx_menu_default/.editorconfig similarity index 100% rename from core/esx_menu_dialog/.editorconfig rename to [esx]/esx_menu_default/.editorconfig diff --git a/core/esx_menu_default/LICENSE b/[esx]/esx_menu_default/LICENSE similarity index 99% rename from core/esx_menu_default/LICENSE rename to [esx]/esx_menu_default/LICENSE index 4242fdd3..3b39cdcf 100644 --- a/core/esx_menu_default/LICENSE +++ b/[esx]/esx_menu_default/LICENSE @@ -631,11 +631,7 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. -<<<<<<< HEAD - fxserver-es_extended -======= fxserver-esx_menu_default ->>>>>>> esx_menu_default/master Copyright (C) 2015 Jérémie N'gadi This program is free software: you can redistribute it and/or modify @@ -656,11 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: -<<<<<<< HEAD - fxserver-es_extended Copyright (C) 2015 Jérémie N'gadi -======= fxserver-esx_menu_default Copyright (C) 2015 Jérémie N'gadi ->>>>>>> esx_menu_default/master This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_menu_default/README.md b/[esx]/esx_menu_default/README.md new file mode 100644 index 00000000..7a2235e4 --- /dev/null +++ b/[esx]/esx_menu_default/README.md @@ -0,0 +1,2 @@ +# esx_menu_default +ESX Menu Default diff --git a/[esx]/esx_menu_default/client/main.lua b/[esx]/esx_menu_default/client/main.lua new file mode 100644 index 00000000..a8b2f6f8 --- /dev/null +++ b/[esx]/esx_menu_default/client/main.lua @@ -0,0 +1,101 @@ +ESX = nil + +Citizen.CreateThread(function() + while ESX == nil do + Citizen.Wait(5) + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + end + + local GUI, MenuType = {}, 'default' + GUI.Time = 0 + + local openMenu = function(namespace, name, data) + SendNUIMessage({ + action = 'openMenu', + namespace = namespace, + name = name, + data = data + }) + end + + local closeMenu = function(namespace, name) + SendNUIMessage({ + action = 'closeMenu', + namespace = namespace, + name = name, + data = data + }) + end + + ESX.UI.Menu.RegisterType(MenuType, openMenu, closeMenu) + + AddEventHandler('esx_menu_default:message:menu_submit', function(data) + local menu = ESX.UI.Menu.GetOpened(MenuType, data._namespace, data._name) + + if menu.submit ~= nil then + menu.submit(data, menu) + end + end) + + AddEventHandler('esx_menu_default:message:menu_cancel', function(data) + local menu = ESX.UI.Menu.GetOpened(MenuType, data._namespace, data._name) + + if menu.cancel ~= nil then + menu.cancel(data, menu) + end + end) + + AddEventHandler('esx_menu_default:message:menu_change', function(data) + local menu = ESX.UI.Menu.GetOpened(MenuType, data._namespace, data._name) + + for i=1, #data.elements, 1 do + menu.setElement(i, 'value', data.elements[i].value) + + if data.elements[i].selected then + menu.setElement(i, 'selected', true) + else + menu.setElement(i, 'selected', false) + end + end + + if menu.change ~= nil then + menu.change(data, menu) + end + end) + + Citizen.CreateThread(function() + while true do + Citizen.Wait(15) + + if IsControlPressed(0, 18) and IsInputDisabled(0) and (GetGameTimer() - GUI.Time) > 150 then + SendNUIMessage({action = 'controlPressed', control = 'ENTER'}) + GUI.Time = GetGameTimer() + end + + if IsControlPressed(0, 177) and IsInputDisabled(0) and (GetGameTimer() - GUI.Time) > 150 then + SendNUIMessage({action = 'controlPressed', control = 'BACKSPACE'}) + GUI.Time = GetGameTimer() + end + + if IsControlPressed(0, 27) and IsInputDisabled(0) and (GetGameTimer() - GUI.Time) > 200 then + SendNUIMessage({action = 'controlPressed', control = 'TOP'}) + GUI.Time = GetGameTimer() + end + + if IsControlPressed(0, 173) and IsInputDisabled(0) and (GetGameTimer() - GUI.Time) > 200 then + SendNUIMessage({action = 'controlPressed', control = 'DOWN'}) + GUI.Time = GetGameTimer() + end + + if IsControlPressed(0, 174) and IsInputDisabled(0) and (GetGameTimer() - GUI.Time) > 150 then + SendNUIMessage({action = 'controlPressed', control = 'LEFT'}) + GUI.Time = GetGameTimer() + end + + if IsControlPressed(0, 175) and IsInputDisabled(0) and (GetGameTimer() - GUI.Time) > 150 then + SendNUIMessage({action = 'controlPressed', control = 'RIGHT'}) + GUI.Time = GetGameTimer() + end + end + end) +end) diff --git a/[esx]/esx_menu_default/fxmanifest.lua b/[esx]/esx_menu_default/fxmanifest.lua new file mode 100644 index 00000000..ad8b00e9 --- /dev/null +++ b/[esx]/esx_menu_default/fxmanifest.lua @@ -0,0 +1,27 @@ +fx_version 'adamant' + +game 'gta5' + +description 'ESX Menu Default' + +version '1.0.4' + +client_scripts { + '@es_extended/client/wrapper.lua', + 'client/main.lua' +} + +ui_page { + 'html/ui.html' +} + +files { + 'html/ui.html', + 'html/css/app.css', + 'html/js/mustache.min.js', + 'html/js/app.js' +} + +dependencies { + 'es_extended' +} diff --git a/[esx]/esx_menu_default/html/css/app.css b/[esx]/esx_menu_default/html/css/app.css new file mode 100644 index 00000000..b03e1e9b --- /dev/null +++ b/[esx]/esx_menu_default/html/css/app.css @@ -0,0 +1,96 @@ +@font-face { + font-family: bankgothic; + src: url('../fonts/bankgothic.ttf'); +} + +@font-face { + font-family: pcdown; + src: url('../fonts/pdown.ttf'); +} + +.menu { + font-family: 'PT Sans Narrow', sans-serif; + font-size: 22px; + min-width: 400px; + color: #fff; + box-shadow: 0px 0px 50px 0px #000; + position: absolute; +} + +.menu.align-left { + left: 40; + top: 50%; + transform: translate(0, -50%); +} + +.menu.align-top-left { + left: 40; + top: 40; +} + +.menu.align-top { + left: 50%; + top: 40; + transform: translate(-50%, 0); +} + +.menu.align-top-right { + right: 10; + top: 40; +} + +.menu.align-right { + right: 40; + top: 50%; + transform: translate(0, -50%); +} + +.menu.align-bottom-right { + right: 40; + bottom: 40; +} + +.menu.align-bottom { + left: 50%; + bottom: 40; + transform: translate(-50%, 0); +} + +.menu.align-bottom-left { + left: 40; + bottom: 40; +} + +.menu.align-center { + left: 50%; + top: 50%; + transform: translate(-50%, -50%); +} + +.menu .head { + background-color: #4682B4; + text-align: center; + height: 40px; + line-height: 40px; +} + +.menu .menu-items { + max-height: 600px; + overflow-y: auto; +} + +.menu .menu-items .menu-item { + height: 40px; + display: block; + background-color: rgba(40, 40, 40, 1); + line-height: 32px; + color: #ffffff; + padding: 2px; + text-align: center; +} + +.menu .menu-items .menu-item.selected { + background-color: rgba(20, 20, 20, 1); + border-top: 2px solid #e76767; + border-bottom: 2px solid #e76767; +} diff --git a/core/esx_menu_dialog/html/fonts/bankgothic.ttf b/[esx]/esx_menu_default/html/fonts/bankgothic.ttf similarity index 100% rename from core/esx_menu_dialog/html/fonts/bankgothic.ttf rename to [esx]/esx_menu_default/html/fonts/bankgothic.ttf diff --git a/core/esx_menu_dialog/html/fonts/pdown.ttf b/[esx]/esx_menu_default/html/fonts/pdown.ttf similarity index 100% rename from core/esx_menu_dialog/html/fonts/pdown.ttf rename to [esx]/esx_menu_default/html/fonts/pdown.ttf diff --git a/core/esx_menu_default/html/js/app.js b/[esx]/esx_menu_default/html/js/app.js similarity index 79% rename from core/esx_menu_default/html/js/app.js rename to [esx]/esx_menu_default/html/js/app.js index 06d6b778..320fc386 100644 --- a/core/esx_menu_default/html/js/app.js +++ b/[esx]/esx_menu_default/html/js/app.js @@ -1,114 +1,3 @@ -<<<<<<< HEAD -(() => { - - ESX = {}; - ESX.HUDElements = []; - - ESX.setHUDDisplay = function (opacity) { - $('#hud').css('opacity', opacity); - }; - - ESX.insertHUDElement = function (name, index, priority, html, data) { - ESX.HUDElements.push({ - name: name, - index: index, - priority: priority, - html: html, - data: data - }); - - ESX.HUDElements.sort((a, b) => { - return a.index - b.index || b.priority - a.priority; - }); - }; - - ESX.updateHUDElement = function (name, data) { - for (let i = 0; i < ESX.HUDElements.length; i++) { - if (ESX.HUDElements[i].name == name) { - ESX.HUDElements[i].data = data; - } - } - - ESX.refreshHUD(); - }; - - ESX.deleteHUDElement = function (name) { - for (let i = 0; i < ESX.HUDElements.length; i++) { - if (ESX.HUDElements[i].name == name) { - ESX.HUDElements.splice(i, 1); - } - } - - ESX.refreshHUD(); - }; - - ESX.resetHUDElements = function () { - ESX.HUDElements = []; - ESX.refreshHUD(); - }; - - ESX.refreshHUD = function () { - $('#hud').html(''); - - for (let i = 0; i < ESX.HUDElements.length; i++) { - let html = Mustache.render(ESX.HUDElements[i].html, ESX.HUDElements[i].data); - $('#hud').append(html); - } - }; - - ESX.inventoryNotification = function (add, label, count) { - let notif = ''; - - if (add) { - notif += '+'; - } else { - notif += '-'; - } - - if (count) { - notif += count + ' ' + label; - } else { - notif += ' ' + label; - } - - let elem = $('
' + notif + '
'); - $('#inventory_notifications').append(elem); - - $(elem).delay(3000).fadeOut(1000, function () { - elem.remove(); - }); - }; - - window.onData = (data) => { - switch (data.action) { - case 'setHUDDisplay': { - ESX.setHUDDisplay(data.opacity); - break; - } - - case 'insertHUDElement': { - ESX.insertHUDElement(data.name, data.index, data.priority, data.html, data.data); - break; - } - - case 'updateHUDElement': { - ESX.updateHUDElement(data.name, data.data); - break; - } - - case 'deleteHUDElement': { - ESX.deleteHUDElement(data.name); - break; - } - - case 'resetHUDElements': { - ESX.resetHUDElements(); - break; - } - - case 'inventoryNotification': { - ESX.inventoryNotification(data.add, data.item, data.count); -======= (function(){ let MenuTpl = '