diff --git a/formspecs.lua b/formspecs.lua
index e07bfc0..008fbde 100644
--- a/formspecs.lua
+++ b/formspecs.lua
@@ -10,6 +10,7 @@ modEUrn.FormSpecs = {
.."box[2.05,1.50;7.75,5.00;#001100CC]"
.."button[2.15,1.65;7.55,1;btnPresElection;"..modEUrn.translate("PRESIDENTIAL ELECTION").."]"
--.."button[2.15,2.65;7.55,1;btnElectoralCourt;"..modEUrn.translate("ELECTORAL COURT").."]"
+ .."style_type[button_exit;bgimg=;bgimg_pressed=;border=;bgcolor=red]"
.."button_exit[2.15,3.65;7.55,1;;"..modEUrn.translate("EXIT").."]"
minetest.sound_play("sfx_eurn_button", {to_player=playername, max_hear_distance=5.0,})
minetest.show_formspec(playername, "frmEUrnMain", myFormSpec)
@@ -22,7 +23,8 @@ modEUrn.FormSpecs = {
.."background[0,-8;16,16;text_eurn_front.png]"
.."box[2.05,1.50;7.75,5.00;#001100CC]"
.."button[2.15,1.65;7.55,1;btnPresCandidates;"..modEUrn.translate("PRESIDENTIAL CANDIDATES").."]"
- --.."button[2.15,2.65;7.55,1;btnPresElect;"..modEUrn.translate("PRESIDENT ELECT").."]"
+ .."button[2.15,2.65;7.55,1;btnPresElect;"..modEUrn.translate("PRESIDENT ELECT").."]"
+ .."style[btnBack;bgimg=;bgimg_pressed=;border=;bgcolor=red]"
.."button[2.15,3.65;7.55,1;btnBack;"..modEUrn.translate("BACK").."]"
minetest.sound_play("sfx_eurn_button", {to_player=playername, max_hear_distance=5.0,})
minetest.show_formspec(playername, "frmEUrnPresElection", myFormSpec)
@@ -52,14 +54,15 @@ modEUrn.FormSpecs = {
.."size[16,8,false]"
.."background[0,-8;16,16;text_eurn_front.png]"
.."box[-0.5,-0.5;16.5,8.5;#00110088]"
+ .."style[lstCands;bgcolor=red]"
+ .."style_type[textlist;bgcolor=red]"
.."textlist[0.5,0.5;3,7;lstCands;"..candList..";"..selected..";true]"
if selected >= 1 then
local Campaign = modEUrn.getPresCandCampaign(candidatename)
local body = [[
-
-
+
%s
%s
@@ -88,6 +91,55 @@ modEUrn.FormSpecs = {
.."button[12.85,6.75;2.55,1;btnBack;"..modEUrn.translate("BACK").."]"
minetest.sound_play("sfx_eurn_button", {to_player=playername, max_hear_distance=5.0,})
minetest.show_formspec(playername, "frmEUrnPresCands", myFormSpec)
+ end,
+ showFormPresElect = function(playername)
+ local body = ""
+ local presidentname = modEUrn.getPresidentName()
+ if presidentname~="" then
+ body = [[
+
+
+ %s
+ %s
+
+ ]]
+ body = body:format(
+ presidentname:upper(),
+ modEUrn.translate("PRESIDENT ELECT")
+ )
+ else
+ body = [[
+
+
+ %s
+
+ %s
+
+ ]]
+ body = body:format(
+ modEUrn.translate("E-URN"),
+ modEUrn.translate("No presidential candidate has yet been elected!")
+ )
+ end
+ local myFormSpec = ""
+ myFormSpec = myFormSpec
+ .."formspec_version[6]"
+ .."size[16,8,false]"
+ .."background[0,-8;16,16;text_eurn_front.png]"
+ .."box[2.05,1.50;7.75,5.00;#001100CC]"
+ .."hypertext[2.15,1.50;7.55,4.00;htmPanel;"
+ --..minetest.formspec_escape("")
+ ..""
+ ..""
+ ..""
+ ..""
+ ..""
+ ..minetest.formspec_escape(body)
+ .."]" -- Fim de hypertext[]
+ .."style[btnBack;bgimg=;bgimg_pressed=;border=;bgcolor=red]"
+ .."button[2.15,5.50;7.55,1;btnBack;"..modEUrn.translate("BACK").."]"
+ minetest.sound_play("sfx_eurn_button", {to_player=playername, max_hear_distance=5.0,})
+ minetest.show_formspec(playername, "frmEUrnPresElect", myFormSpec)
end,
showFormRegCampaign = function(playername, political_campaign)
local Campaign = modEUrn.getPresCandCampaign(playername)
@@ -190,6 +242,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
elseif type(formname)=="string" and formname == "frmEUrnPresElection" then
if type(fields.btnPresCandidates) ~= "nil" then
modEUrn.FormSpecs.showFormPresCands(playername, nil)
+ elseif type(fields.btnPresElect) ~= "nil" then
+ modEUrn.FormSpecs.showFormPresElect(playername)
elseif type(fields.btnBack) ~= "nil" then
modEUrn.FormSpecs.showFormMain(playername)
end
@@ -234,6 +288,10 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
elseif type(fields.btnBack) ~= "nil" then
modEUrn.FormSpecs.showFormPresElection(playername)
end
+ elseif type(formname)=="string" and formname == "frmEUrnPresElect" then
+ if type(fields.btnBack) ~= "nil" then
+ modEUrn.FormSpecs.showFormPresElection(playername)
+ end
elseif type(formname)=="string" and formname == "frmEUrnRegCampaign" then
if type(fields.txtCampaign)~= "nil" and type(fields.btnSave) ~= "nil" then
--modEUrn.debug("modEUrn.doPresidentCandidate(playername='"..playername.."', playername='"..playername.."', fields.txtCampaign="..dump(fields.txtCampaign)..")")