diff --git a/esx_kashacters/html/css/main.css b/esx_kashacters/html/css/main.css index 63f743fc..bd89e616 100644 --- a/esx_kashacters/html/css/main.css +++ b/esx_kashacters/html/css/main.css @@ -63,17 +63,16 @@ p { .character-box { background: rgba(44, 51, 69, 0.6); - color: #fff; padding: 10px; text-align: center; border: 2px solid transparent; border-radius: 2px; margin-top: 15%; - width: 20%; + width: 17.5%; } .character-box:hover { - background-color: rgb(44, 51, 69); + background-color: rgb(34, 31, 39); color: #fff; } @@ -95,6 +94,7 @@ p { .character-info { text-align: left!important; + color: rgb(255, 255, 255); } .character-buttons { diff --git a/esx_kashacters/html/js/app.js b/esx_kashacters/html/js/app.js index 153d2cf1..d323150a 100644 --- a/esx_kashacters/html/js/app.js +++ b/esx_kashacters/html/js/app.js @@ -1,7 +1,7 @@ $(".character-box").hover( function() { $(this).css({ - "background": "rgb(44, 51, 69)", + "background": "rgb(34, 31, 39)", "transition": "200ms", }); }, function() { @@ -12,6 +12,13 @@ $(".character-box").hover( } ); +$(document).ready(() => { + $(".character-info-new").html(translate.new) + $(".btn-delete").html(translate.delete); + $(".modalTitle").html(translate.modalTitle); + $(".modalText").html(translate.modalText); +}); + $(".character-box").click(function () { $(".character-box").removeClass('active-char'); $(this).addClass('active-char'); @@ -25,9 +32,9 @@ $(".character-box").click(function () { $(".character-box").click(function () { if ($(this).attr("data-ischar") === "true") { - $("#play-char").html('PLAY'); + $("#play-char").html(translate.play); } else { - $("#play-char").html('CREATE CHARACTER'); + $("#play-char").html(translate.playNew); } }); @@ -57,7 +64,7 @@ $("#deletechar").click(function () { $.each(data.characters, function (index, char) { if (char.charid !== 0) { var charid = char.identifier.charAt(4); - $('[data-charid=' + charid + ']').html('

'+ char.firstname +'

Name: '+ char.firstname +' '+ char.lastname +'

Work: '+ char.job +' '+ char.job_grade +'

Cash: '+ char.money +'

Bank: '+ char.bank +'

Date of birth: '+ char.dateofbirth +'

Gender: '+ char.sex +'

').attr("data-ischar", "true"); + $('[data-charid=' + charid + ']').html('

'+ char.firstname +'

' + `${translate.name}: ` + '' + char.firstname +' '+ char.lastname +'

' + `${translate.job}: ` + ''+ char.job +' '+ char.job_grade +'

' + `${translate.money}: ` + ' $'+ char.money +'

' + `${translate.bank}: ` + ' $'+ char.bank +'

' + `${translate.dob}: ` + ''+ char.dateofbirth +'

' + `${translate.gender}: ` + ''+ char.sex +'

').attr("data-ischar", "true"); } }); } @@ -68,7 +75,7 @@ $("#deletechar").click(function () { $('.main-container').css({"display":"none"}); $(".character-box").removeClass('active-char'); $("#delete").css({"display":"none"}); - $(".character-box").html('

Create new character

').attr("data-ischar", "false"); + $(".character-box").html('

Empty Slot

' + `${translate.new}` + '

').attr("data-ischar", "false"); }; window.onload = function(e) { window.addEventListener('message', function(event) { diff --git a/esx_kashacters/html/locales/en.js b/esx_kashacters/html/locales/en.js index 7a6acfe2..707c8830 100644 --- a/esx_kashacters/html/locales/en.js +++ b/esx_kashacters/html/locales/en.js @@ -1,12 +1,14 @@ const translate = new Object(); +translate.name = "Name"; translate.job = "Job"; translate.bank = "Bank"; translate.money = "Cash"; translate.gender = "Gender"; translate.dob = "Date of birth"; -translate.new = "Create new character"; +translate.new = ""; translate.delete = "DELETE"; translate.play = "PLAY"; +translate.playNew = "CREATE CHARACTER"; translate.modalTitle = "Are You Sure?"; translate.modalText = "By deleting your account we won't be able to recover it, all properties, cars etc. will be deleted"; \ No newline at end of file diff --git a/esx_kashacters/html/ui.html b/esx_kashacters/html/ui.html index e566692d..8d68656f 100644 --- a/esx_kashacters/html/ui.html +++ b/esx_kashacters/html/ui.html @@ -7,7 +7,9 @@ - + + + @@ -40,7 +42,6 @@

-
@@ -55,9 +56,9 @@