sendnrw/gaseous-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.7.3 into main (#331)

Browse Source
This commit is contained in:
Michael Green
2024-04-15 14:38:17 +10:00
committed by GitHub
parent 7e8679151b
commit 080a823cda
16 changed files with 527 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
gaseous-server/wwwroot/pages/dialogs/librarynew.html
View File

@@ -1,34 +1,30 @@
<div style="padding-top: 5px;">
<strong>New Library</strong>
</div>
<table style="width: 98%; margin-top: 15px; margin-bottom: 15px;">
<tr>
<th style="width: 20%;">Name</th>
<td style="width: 80%;"><input type="text" id="newlibrary_name" style="width: 98%;" /></td>
</tr>
<tr>
<th>Default Platform</th>
<td><select id="newlibrary_defaultplatform" style="width: 100%;"></select></td>
</tr>
<tr>
<th>Path</th>
<td><input type="text" id="newlibrary_path" style="width: 98%;" /></td>
</tr>
</table>
<div style="width: 300px;">
<table style="width: 98%; margin-top: 15px; margin-bottom: 15px;">
<tr>
<th>Name</th>
<td><input type="text" id="newlibrary_name" style="width: 95%;" /></td>
</tr>
<tr>
<th>Default Platform</th>
<td><select id="newlibrary_defaultplatform" style="width: 100%;"></select></td>
</tr>
<tr>
<th>Path</th>
<td><input type="text" id="newlibrary_path" style="width: 95%;" /></td>
</tr>
</table>
<div style="width: 100%; text-align: right;">
<div style="display: inline-block; margin-right: 20px;">
<button value="OK" onclick="newLibrary();">OK</button>
</div>
<div style="display: inline-block;">
<button value="Cancel" onclick="closeSubDialog();">Cancel</button>
</div>
<div style="width: 100%; text-align: right; margin-top: 160px;">
<div style="display: inline-block; margin-right: 20px;">
<button value="OK" onclick="newLibrary();">OK</button>
</div>
<div style="display: inline-block;">
<button value="Cancel" onclick="closeDialog();">Cancel</button>
</div>
</div>
<script type="text/javascript">
document.getElementById('modal-heading').innerHTML = "New Library";
$('#newlibrary_defaultplatform').select2({
minimumInputLength: 3,
ajax: {

15
gaseous-server/wwwroot/pages/dialogs/rominfo.html
View File

@@ -78,7 +78,7 @@
<td style="width: 75%;"><select id="properties_fixgame" style="width: 100%;"></select></td>
</tr>
<tr>
<td colspan="2" style="text-align: right;"><button id="properties_fixsave" value="Save Match" onclick="SaveFixedGame();">Save Match</button></td>
<td colspan="2" style="text-align: right;"><button id="properties_fixclear" value="Clear Match" onclick="ClearFixedGame();">Clear Match</button><button id="properties_fixsave" value="Save Match" onclick="SaveFixedGame();">Save Match</button></td>
</tr>
</table>
</div>
@@ -252,6 +252,7 @@
var fixplatform = $('#properties_fixplatform').select2('data');
var fixgame = $('#properties_fixgame').select2('data');
document.getElementById('properties_fixclear').setAttribute("disabled", "disabled");
document.getElementById('properties_fixsave').setAttribute("disabled", "disabled");
ajaxCall('/api/v1.1/Games/' + gameId + '/roms/' + modalVariables + '?NewPlatformId=' + fixplatform[0].id + '&NewGameId=' + fixgame[0].id, 'PATCH', function (result) {
@@ -259,6 +260,18 @@
});
}
function ClearFixedGame() {
var fixplatform = 0;
var fixgame = 0;
document.getElementById('properties_fixclear').setAttribute("disabled", "disabled");
document.getElementById('properties_fixsave').setAttribute("disabled", "disabled");
ajaxCall('/api/v1.1/Games/' + gameId + '/roms/' + modalVariables + '?NewPlatformId=' + fixplatform + '&NewGameId=' + fixgame, 'PATCH', function (result) {
window.location.reload();
});
}
function BuildAttributesTable(attributes, sourceName) {
var aTable = document.createElement('table');
aTable.style.width = '100%';

3
gaseous-server/wwwroot/pages/dialogs/userprofile.html
View File

@@ -220,7 +220,8 @@
SetPreference_Batch(model);
if (getQueryString('page', 'string') == 'home' || getQueryString('page', 'string') == undefined) {
executeFilter1_1(1);
setCookie('games_library_last_page', 1);
location.reload();
}
closeDialog();