diff --git a/Client/FactionManagement/Ranks/index.html b/Client/FactionManagement/Ranks/index.html index 9c89cc00..a8b59abe 100644 --- a/Client/FactionManagement/Ranks/index.html +++ b/Client/FactionManagement/Ranks/index.html @@ -8,6 +8,8 @@ + + @@ -16,19 +18,6 @@ someentry - - - + \ No newline at end of file diff --git a/Client/FactionManagement/Ranks/script.js b/Client/FactionManagement/Ranks/script.js index e02abfc9..07c1cedf 100644 --- a/Client/FactionManagement/Ranks/script.js +++ b/Client/FactionManagement/Ranks/script.js @@ -1 +1,11 @@ - +$(document).ready(function () { + mp.trigger("onManageFactionRanksLoaded"); + $("table#rank-table").append("neueselement"); +}); + +function loadData(rankData) { + var obj = JSON.parse(rankData); + obj.forEach(function (rank) { + $("table#rank-table").append(rank); + }); +} \ No newline at end of file diff --git a/Client/FactionManagement/main.js b/Client/FactionManagement/main.js index cea64481..0315ad90 100644 --- a/Client/FactionManagement/main.js +++ b/Client/FactionManagement/main.js @@ -9,10 +9,9 @@ var rankData = null; mp.events.add('manageFactionRanks', (ranks) => { if (manageBrowser !== null) return; - manageBrowser = mp.browsers.new('package://FactionManagement/Ranks/index.html'); + manageBrowser = mp.browsers.new('package://Client/FactionManagement/Ranks/index.html'); mp.gui.cursor.show(true, true); - //mp.gui.chat.activate(false); - mp.gui.chat.push(ranks); + mp.gui.chat.activate(false); rankData = ranks; }); diff --git a/Client/Login/main.js b/Client/Login/main.js index ee786ad7..6a52a71c 100644 --- a/Client/Login/main.js +++ b/Client/Login/main.js @@ -5,7 +5,7 @@ */ var loginBrowser; -loginBrowser = mp.browsers.new('package://Login/login.html'); +loginBrowser = mp.browsers.new('package://Client/Login/login.html'); mp.gui.chat.activate(false); mp.gui.cursor.show(true, true); mp.game.ui.displayHud(false); diff --git a/Client/Save/main.js b/Client/Save/main.js index b40e649f..9d86dc7d 100644 --- a/Client/Save/main.js +++ b/Client/Save/main.js @@ -7,7 +7,7 @@ var saveBrowser; mp.events.add('saveBlip', () => { - saveBrowser = mp.browsers.new('package://Save/save.html'); + saveBrowser = mp.browsers.new('package://Client/Save/save.html'); mp.gui.chat.activate(false); mp.gui.cursor.show(true, true); }); diff --git a/Client/index.js b/Client/index.js index c3f70391..ef7e9ff8 100644 --- a/Client/index.js +++ b/Client/index.js @@ -5,6 +5,8 @@ */ require('./Login/main.js'); + require('./Save/main.js'); -require('./Save/save.js'); +//require('./Save/save.js'); + require('./FactionManagement/main.js'); \ No newline at end of file diff --git a/Server/Commands/Faction.cs b/Server/Commands/Faction.cs index 9e287495..67561c10 100644 --- a/Server/Commands/Faction.cs +++ b/Server/Commands/Faction.cs @@ -77,7 +77,7 @@ namespace reallife_gamemode.Server.Commands using(var context = new DatabaseContext()) { List factionRanks = context.FactionRanks.ToList().FindAll(r => r.FactionId == f.Id); - string json = JsonConvert.SerializeObject(factionRanks, Formatting.Indented); + string json = JsonConvert.SerializeObject(factionRanks, Formatting.None); player.TriggerEvent("manageFactionRanks", json); } }