A16.2 b7 Update

Update for A16.2(b7)
7DaysToMod · Aug 5, 2017 · 3e4d829 · 3e4d829
1 parent 0c5ea14
commit 3e4d829
Show file tree

Hide file tree

Showing 25 changed files with 401 additions and 0 deletions.
diff --git a/7dtmlib/7DTMLib.dll b/7dtmlib/7DTMLib.dll
diff --git a/7dtmlib/7DTMLib.pdb b/7dtmlib/7DTMLib.pdb
diff --git a/7dtmlib/html/tpl_expermgroup.html b/7dtmlib/html/tpl_expermgroup.html
@@ -0,0 +1,36 @@
+<div class="row">
+	<div class="col-md-12">&nbsp;</div>
+</div>
+<div class="row">
+	<div class="col-md-12">
+		<h2>ExPerm Group Settings</h2>
+		<div class="col-md-12">&nbsp;</div>
+		<form method="POST" action="/settings/experm/group">
+			<div class="form-group">
+			    <label for="group_name">Name</label>
+			    <input type="text" class="form-control" id="group_name" name="group_name" placeholder="Group Name" value="{group_name}"/>
+			</div>
+			<div class="form-group">
+			    <label for="group_name">Admin Level</label>
+			    <input type="text" class="form-control" id="admin_level" name="admin_level" placeholder="Admin Level" value="{admin_level}"/>
+			</div>
+			<button type="submit" class="btn btn-primary">Save</button>
+		</form>
+		<form method="POST" action="/settings/experm/group/addnode">
+			<h2>Group Permissions</h2>
+			<table class="table table-striped">
+			<tr>
+				<th>Permission Node</th>
+				<th>Allowed</th>
+				<th>&nbsp;</th>
+			</tr>
+			{group_permissions}
+			<tr>
+				<td><input type="text" name="node" id="node" /></td>
+				<td><input type="checkbox" name="allowed" id="allowed"/></td>
+				<td><input type="hidden" name="group" id="perm_group" value="{group_name}"/><button type="submit" class="btn btn-primary">Add</button</td>
+			</tr>
+			</table>
+		</form>
+	</div>
+</div>
diff --git a/7dtmlib/html/tpl_expermgrouplist.html b/7dtmlib/html/tpl_expermgrouplist.html
@@ -0,0 +1,8 @@
+<table class="table table-striped">
+	<tr>
+		<th>Name</th>
+		<th>Admin Level</th>
+		<th>&nbsp;</th>
+	</tr>
+	{group_list_items}
+</table>
diff --git a/7dtmlib/html/tpl_expermgrouplistitem.html b/7dtmlib/html/tpl_expermgrouplistitem.html
@@ -0,0 +1,5 @@
+<tr>
+	<td>{group_name}</td>
+	<td>{admin_level}</td>
+	<td>{tools}</td>
+</tr>
diff --git a/7dtmlib/html/tpl_expermgroupremovenode.html b/7dtmlib/html/tpl_expermgroupremovenode.html
@@ -0,0 +1,17 @@
+<div class="row">
+	<div class="col-md-12">&nbsp;</div>
+</div>
+<div class="row">
+	<div class="col-md-12">
+		<h2>ExPerm Group - Remove Node</h2>
+		<div class="col-md-12">&nbsp;</div>
+		<form method="POST" action="/settings/experm/group/removenode">
+			<div class="form-group">
+				Are you sure you want remove the Security Node  "{node_name}" for the group "{group_name}"?
+			    <input type="hidden" name="group" id="group" value="{group_name}"/>
+			    <input type="hidden" name="node" id="node" value="{node_name}"/>
+			</div>
+			<button type="submit" class="btn btn-danger">Delete</button> <button type="button" class="btn btn-primary" onClick="document.location.href='/settings/experm/group?group={group_name}';">Cancel</button>
+		</form>
+	</div>
+</div>
diff --git a/7dtmlib/html/tpl_expermnodelist.html b/7dtmlib/html/tpl_expermnodelist.html
@@ -0,0 +1,3 @@
+<div class="col-md-12">
+	{node_list_items}
+</div>
diff --git a/7dtmlib/html/tpl_expermnodelistitem.html b/7dtmlib/html/tpl_expermnodelistitem.html
@@ -0,0 +1,3 @@
+<div class="col-md-12">
+	{node_name}
+</div>
diff --git a/7dtmlib/html/tpl_expermpermissionentry.html b/7dtmlib/html/tpl_expermpermissionentry.html
@@ -0,0 +1,5 @@
+<tr>
+	<td>{node_name}</td>
+	<td>{allowed}</td>
+	<td>{tools}</td>
+</tr>
diff --git a/7dtmlib/html/tpl_expermsettings.html b/7dtmlib/html/tpl_expermsettings.html
@@ -0,0 +1,8 @@
+<div class="col-md-12">
+	<h3>ExPerm Groups</h3>
+	{experm_groups_list}
+	<h3>Experm Users</h3>
+	{experm_users_list}
+	<h3>Permission Nodes</h3>
+	{experm_nodes_list}
+</div>
diff --git a/7dtmlib/html/tpl_expermuser.html b/7dtmlib/html/tpl_expermuser.html
@@ -0,0 +1,45 @@
+<div class="row">
+	<div class="col-md-12">&nbsp;</div>
+</div>
+<div class="row">
+	<div class="col-md-12">
+		<h2>ExPerm User Settings</h2>
+		<div class="col-md-12">&nbsp;</div>
+		<form method="POST" action="/settings/experm/user">
+			<div class="form-group">
+			    <label for="steam_id">Steam ID</label>
+			    <input type="text" class="form-control" id="steam_id_display" name="steam_id_display" value="{steam_id}" disabled/>
+			    <input type="hidden" class="form-control" id="steam_id" name="steam_id" value="{steam_id}" />
+			</div>
+			<div class="form-group">
+			    <label for="display_name_display">Display Name</label>
+			    <input type="text" class="form-control" id="display_name_display" name="display_name_display" value="{display_name}" disabled/>
+
+			</div>
+			<div class="form-group">
+			    <label for="experm_group">Group</label>
+			    <select name="experm_group" id="experm_group">
+			    	{experm_groups_options}
+			    </select>
+			</div>
+
+			<button type="submit" class="btn btn-primary">Save</button>
+		</form>
+		<form method="POST" action="/settings/experm/user/addnode">
+			<h2>User Permissions</h2>
+			<table class="table table-striped">
+			<tr>
+				<th>Permission Node</th>
+				<th>Allowed</th>
+				<th>&nbsp;</th>
+			</tr>
+			{user_permissions}
+			<tr>
+				<td><input type="text" name="node" id="node" /></td>
+				<td><input type="checkbox" name="allowed" id="allowed"/></td>
+				<td><input type="hidden" name="steam_id" id="perm_group" value="{steam_id}"/><button type="submit" class="btn btn-primary">Add</button</td>
+			</tr>
+			</table>
+		</form>
+	</div>
+</div>
diff --git a/7dtmlib/html/tpl_expermuserlist.html b/7dtmlib/html/tpl_expermuserlist.html
@@ -0,0 +1,10 @@
+<table class="table table-striped">
+	<tr>
+		<th>Steam ID</th>
+		<th>Display Name</th>
+		<th>ExPerm Group</th>
+		<th>Admin Level</th>
+		<th>&nbsp;</th>
+	</tr>
+	{user_list_items}
+</table>
diff --git a/7dtmlib/html/tpl_expermuserlistitem.html b/7dtmlib/html/tpl_expermuserlistitem.html
@@ -0,0 +1,7 @@
+<tr>
+	<td>{steam_id}</td>
+	<td>{display_name}</td>
+	<td>{group_name}</td>
+	<td>{admin_level}</td>
+	<td>{tools}</td>
+</tr>
diff --git a/7dtmlib/html/tpl_expermuserremovenode.html b/7dtmlib/html/tpl_expermuserremovenode.html
@@ -0,0 +1,17 @@
+<div class="row">
+	<div class="col-md-12">&nbsp;</div>
+</div>
+<div class="row">
+	<div class="col-md-12">
+		<h2>ExPerm Group - Remove Node</h2>
+		<div class="col-md-12">&nbsp;</div>
+		<form method="POST" action="/settings/experm/user/removenode">
+			<div class="form-group">
+				Are you sure you want remove the Security Node  "{node_name}" for the user "{display_name}"?
+			    <input type="hidden" name="steam_id" id="steam_id" value="{steam_id}"/>
+			    <input type="hidden" name="node" id="node" value="{node_name}"/>
+			</div>
+			<button type="submit" class="btn btn-danger">Delete</button> <button type="button" class="btn btn-primary" onClick="document.location.href='/settings/experm/group?group={group_name}';">Cancel</button>
+		</form>
+	</div>
+</div>
diff --git a/7dtmlib/html/tpl_loginform.html b/7dtmlib/html/tpl_loginform.html
@@ -0,0 +1,17 @@
+<div class="row">
+	<div class="col-md-12">&nbsp;</div>
+</div>
+<div class="row">
+	<div class="col-md-6 offset-md-3">
+		<h2>User Login</h2>
+		<br/>
+		<form method="POST" action="/login">
+			<div class="form-group row">
+			    <label class="col-md-3" for="password">Password</label>
+			    <input type="password" class="form-control col-md-6" id="password" name="password" placeholder="Password"/>
+			    <button type="submit" class="btn btn-primary col-md-2 offset-md-1">Login</button>
+			</div>
+		</form>
+	</div>
+</div>
+{steam_button}
diff --git a/7dtmlib/html/tpl_main.html b/7dtmlib/html/tpl_main.html
@@ -0,0 +1,33 @@
+<html>
+	<head>
+		<title>{title}</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+		<link rel="stylesheet" href="https://v4-alpha.getbootstrap.com/dist/css/bootstrap.min.css"/>
+		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"/>
+		<style>
+			body {
+			  padding-top: 5rem;
+			}
+			.starter-template {
+			  padding: 3rem 1.5rem;
+			  text-align: center;
+			}
+		</style>
+
+		<script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
+	    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
+	    <script src="https://v4-alpha.getbootstrap.com/dist/js/bootstrap.min.js"></script>
+	</head>
+	<body>
+	    <div class="container">
+	      {menu}
+
+	      <div class="row">
+	      	<div class="col-md-12">&nbsp;</div>
+	      </div>
+	      {content}
+
+	    </div><!-- /.container -->
+
+	</body>
+</html>
diff --git a/7dtmlib/html/tpl_menu.html b/7dtmlib/html/tpl_menu.html
@@ -0,0 +1,12 @@
+<nav class="navbar navbar-light bg-faded rounded navbar-toggleable-md">
+  <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navBar" aria-controls="navBar" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+  <a class="navbar-brand" href="/">7 Days To Die</a>
+
+  <div class="collapse navbar-collapse" id="navBar">
+    <ul class="navbar-nav mr-auto">
+      {items}
+    </ul>
+  </div>
+</nav>
diff --git a/7dtmlib/html/tpl_menuitem.html b/7dtmlib/html/tpl_menuitem.html
@@ -0,0 +1,3 @@
+<li class="nav-item">
+<a class="nav-link" href="{path}">{title}</a>
+</li>
diff --git a/7dtmlib/html/tpl_onlineplayerlist.html b/7dtmlib/html/tpl_onlineplayerlist.html
@@ -0,0 +1,19 @@
+<div class="row">
+	<div class="col-md-12">&nbsp;</div>
+</div>
+<div class="row">
+	<div class="col-md-12">
+		<h2>Online Players</h2>
+		<div class="col-md-12">&nbsp;</div>
+		<table class="table table-striped">
+			<tr>
+				<th>SteamID</th>
+				<th>Display Name</th>
+				<th>Group</th>
+				<th>Admin Level</th>
+				<th>&nbsp;</th>
+			</tr>
+			{player_list}
+		</table>
+	</div>
+</div>
diff --git a/7dtmlib/html/tpl_onlineplayerlistitem.html b/7dtmlib/html/tpl_onlineplayerlistitem.html
@@ -0,0 +1,7 @@
+<tr>
+	<td>{steam_id}</td>
+	<td>{display_name}</td>
+	<td><a href="/settings/experm/group?group={experm_group}">{experm_group}</a></td>
+	<td>{admin_level}</td>
+	<td>{tools}</td>
+</tr>
diff --git a/7dtmlib/html/tpl_settingsform.html b/7dtmlib/html/tpl_settingsform.html
@@ -0,0 +1,86 @@
+<div class="row">
+	<div class="col-md-12">&nbsp;</div>
+</div>
+<div class="row">
+	<div class="col-md-12">
+		<h2>7dtmlib Settings</h2>
+		<div class="col-md-12">&nbsp;</div>
+		<form method="POST" action="/settings/">
+			<div class="form-group">
+			    <label for="tickrate">Tick Rate</label>
+			    <input type="text" class="form-control" id="tickrate" name="tickrate" placeholder="Tick Rate" value="{tickrate}"/>
+			    <p id="tickrateHelpBlock" class="form-text text-muted">
+				  The tick rate is the number of ticks between 7dtmlib firing the OnLibTick event.
+				</p>
+			</div>
+			<div class="jumbotron" style="padding:1rem;1rem;">
+				<div class="form-group">
+				    <label class="form-check-label">
+					    <input class="form-check-input" type="checkbox" value="" name="chatcommands_enabled" id="chatcommands_enabled">
+					    Enable Chat Commands
+					</label>
+				</div>
+			</div>
+			<div class="jumbotron" style="padding:1rem;1rem;">
+				<div class="form-group">
+				    <label class="form-check-label">
+					    <input class="form-check-input" type="checkbox" value="" name="webconsole_enabled" id="webconsole_enabled" onChange="onWebConsoleEnabledChange();">
+					    Enable Web Control Panel
+					</label>
+				</div>
+				<div class="form-group WebConsoleField">
+				    <label for="client_id">Port</label>
+				    <input type="text" class="form-control" id="webconsole_port" name="webconsole_port" placeholder="Port" value="{webconsole_port}"/>
+				</div>
+			</div>
+			<div class="jumbotron" style="padding:1rem;1rem;">
+				<div class="form-group">
+				    <label class="form-check-label">
+					    <input class="form-check-input" type="checkbox" value="" name="overridegamepref" id="overridegamepref" onChange="onGamePrefsOverrideChange();">
+					    Enable GamePrefs Override
+					</label>
+				</div>
+				<div class="form-group GamePrefField">
+				    <label for="client_id">World Type</label>
+				    <select class="form-control" id="world_type" name="world_type">
+				      <option value="navezgane">Navezgane</option>
+				      <option value="random gen">Random Gen</option>
+				    </select>
+				</div>
+				<div class="form-group GamePrefField">
+				    <label for="client_id">World Name</label>
+				    <input type="text" class="form-control" id="world_name" name="world_name" placeholder="World Name" value="{world_name}"/>
+				</div>
+			</div>
+			<button type="submit" class="btn btn-primary">Save</button>
+		</form>
+	</div>
+</div>
+<script language="javascript">
+	function onWebConsoleEnabledChange(){
+		if($("#webconsole_enabled").is(":checked")){
+			$(".WebConsoleField").show();
+		}else{
+			$(".WebConsoleField").hide();
+		}
+	}
+
+	function onGamePrefsOverrideChange(){
+		if($("#overridegamepref").is(":checked")){
+			$(".GamePrefField").show();
+		}else{
+			$(".GamePrefField").hide();
+		}
+	}
+
+	$(document).ready(function(){
+		$("#chatcommands_enabled").prop('checked', {chatcommands_enabled});
+		$("#overridegamepref").prop('checked', {overridegameprefs});
+		$("#webconsole_enabled").prop('checked', {webconsole_enabled});
+		$("#world_type").val("{world_type}");
+
+		onGamePrefsOverrideChange();
+		onWebConsoleEnabledChange();
+	});
+
+</script>