aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Continued CEF browser for rank managment

Browse Source
This commit is contained in:
Lennart Kampshoff
2018-09-23 23:11:22 +02:00
parent d9789b7525
commit f162f2323c
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Client/FactionManagement/Ranks/index.html
View File

@@ -8,6 +8,8 @@
<html lang="de" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<script src="../../Dependences/jquery-3.3.1.min.js"></script>
<script src="../../Dependences/jquery.tablednd.0.8.min.js"></script>
<title></title>
</head>
<body>
@@ -16,19 +18,6 @@
<tr><td>some</td><td>entry</td></tr>
</table>
<script src="../../Dependences/jquery-3.3.1.min.js"></script>
<script src="../../Dependences/jquery.tablednd.0.8.min.js"></script>
<script>
$(document).ready(function () {
mp.trigger("onManageFactionRanksLoaded");
});
function loadData(rankData) {
var obj = JSON.parse(rankData);
obj.forEach(function (rank) {
$("table#rank-table").append(rank);
});
}
</script>
<script src="script.js"></script>
</body>
</html>

12
Client/FactionManagement/Ranks/script.js
View File

@@ -1 +1,11 @@

$(document).ready(function () {
mp.trigger("onManageFactionRanksLoaded");
$("table#rank-table").append("<tr><td>neues</td><td>element</td></tr>");
});
function loadData(rankData) {
var obj = JSON.parse(rankData);
obj.forEach(function (rank) {
$("table#rank-table").append(rank);
});
}

5
Client/FactionManagement/main.js
View File

@@ -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;
});

2
Client/Login/main.js
View File

@@ -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);

2
Client/Save/main.js
View File

@@ -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);
});

4
Client/index.js
View File

@@ -5,6 +5,8 @@
*/
require('./Login/main.js');
require('./Save/main.js');
require('./Save/save.js');
//require('./Save/save.js');
require('./FactionManagement/main.js');

2
Server/Commands/Faction.cs
View File

@@ -77,7 +77,7 @@ namespace reallife_gamemode.Server.Commands
using(var context = new DatabaseContext())
{
List<FactionRank> 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);
}
}