andy/Saxonite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.2.4.1

Browse Source
This commit is contained in:
andy
2022-03-04 18:15:23 +00:00
parent 122056a9da
commit 362aa31e15
68 changed files with 1163 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteCoreWebAdmin/Views/Common/ResultsPaging.cshtml
+1 -1
View File
@@ -1,7 +1,7 @@
@model SaxModel_Admin
@inject SaxLocaliser Localiser
<script src="~/js/sax-resultsPaging.js?@Model.HrefVersion"></script>
<script src="~/js/sax-res-pag.js?@Model.HrefVersion"></script>
<script type="text/javascript">
sax.resultsPaging.msg.pageInfo = '@Localiser.GetJavascriptText("label.page.info","{0}","{1}")';
</script>
SaxoniteCoreWebAdmin/Views/Common/SelectCode.cshtml
+1 -1
View File
@@ -2,7 +2,7 @@
@inject SaxLocaliser Localiser
<link rel="stylesheet" href="~/css/sax-selectCode.css?@Model.HrefVersion" />
<script src="~/js/sax-selectCode.js?@Model.HrefVersion"></script>
<script src="~/js/sax-sel-cod.js?@Model.HrefVersion"></script>
<script type="text/javascript">
</script>
SaxoniteCoreWebAdmin/Views/Common/SelectItem.cshtml
+1 -1
View File
@@ -44,6 +44,6 @@
</div>
</div>
<script src="~/js/sax-selectItem.js?@Model.HrefVersion"></script>
<script src="~/js/sax-sel-itm.js?@Model.HrefVersion"></script>
</div>
SaxoniteCoreWebAdmin/Views/Common/SelectOrganisation.cshtml
+1 -1
View File
@@ -2,7 +2,7 @@
@inject SaxLocaliser Localiser
<link rel="stylesheet" href="~/css/sax-selectOrganisation.css?@Model.HrefVersion" />
<script src="~/js/sax-selectOrganisation.js?@Model.HrefVersion"></script>
<script src="~/js/sax-sel-org.js?@Model.HrefVersion"></script>
<script type="text/javascript">
sax.selectOrganisation.dlgTitleSelectOrganisation = '@Localiser.GetJavascriptText("organisation.caption.select.organisation")';
</script>
SaxoniteCoreWebAdmin/Views/Organisation/Index.cshtml
+79 -63
View File
@@ -8,6 +8,8 @@
<div class="sax-panel Organisations">
<script type="text/javascript">
sax.lbl.refresh = '@(Localiser.GetJavascriptText("label.refresh"))';
sax.lbl.create = '@(Localiser.GetJavascriptText("label.create"))';
sax.lbl.edit = '@(Localiser.GetJavascriptText("label.edit"))';
sax.lbl.activate = '@(Localiser.GetJavascriptText("label.activate"))';
</script>
@@ -21,74 +23,88 @@
@* Filter Panel *@
@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmOrganisationFilter", @class = "sax-form", @onSubmit = "return false;" }))
{
<div class="sax-panel-filter">
@* Header - Page caption, paging controls, actions. *@
<div class="sax-header">
<div class="row">
<div class="col"><div class="sax-caption">@Localiser["organisation.caption.organisations"]</div></div>
<div class="fixed row">
<div class="col">
<partial name="~/Views/Common/ResultsPaging.cshtml" />
</div>
<div class="fixed row">
<div class="sax-action sax-results-refresh"><img src="~/img/action/refresh24.png" alt="@(Localiser["label.refresh"])" title="@(Localiser["label.refresh"])" /></div>
<div class="sax-action sax-item-create"><img src="~/img/action/add24.png" alt="@(Localiser["label.create"])" title="@(Localiser["label.create"])" /></div>
</div>
<div class="sax-panel-filter">
@* Header - Page caption, paging controls, actions. *@
<div class="sax-header">
<div class="row">
<div class="col"><div class="sax-caption">@Localiser["organisation.caption.organisations"]</div></div>
<div class="fixed row">
<div class="col">
<partial name="~/Views/Common/ResultsPaging.cshtml" />
</div>
</div>
</div>
<div class="sax-content">
@* Organisation filter - name etc. *@
<div class="row pb4">
<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.search"]</div>
<div class="col-sm-7">
@Html.TextBoxFor(model => model.Filter.Organisation, new { @id = "", @class = "FilterOrganisation", @maxlength = "32" })
</div>
</div>
@* Organisation Category *@
<div class="row pb4">
<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.category"]</div>
<div class="col-sm-7">
@Html.DropDownListFor(model => model.Filter.OrganisationCategoryCode, Model.AdminOrganisationCategoriesForSelect, Localiser["label.any"], new { @id = "", @class = "FilterOrganisationCategory sax-select" })
</div>
</div>
@* Organisation sport *@
<div class="row pb4">
<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.sport"]</div>
<div class="col-sm-7">
<div class="row">
@Html.HiddenFor(model => model.Filter.OrganisationSportId, new { @id = "", @class = "FilterOrganisationSportId" })
<div class="col"><input type="text" class="FilterOrganisationSportCaption sax-input" readonly="readonly" /> </div>
<div class="fixed row">
<div class="sax-action FilterSportSelect"><img src="~/img/action/search24.png" alt="@(Localiser["label.search"])" title="@(Localiser["label.search"])" /></div>
<div class="sax-action FilterSportClear"><img src="~/img/action/delete24.png" alt="@(Localiser["label.clear"])" title="@(Localiser["label.clear"])" /></div>
</div>
</div>
</div>
</div>
@* Organisation region *@
<div class="row pb4">
<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.region"]</div>
<div class="col-sm-7">
<div class="row">
@Html.HiddenFor(model => model.Filter.OrganisationRegionId, new { @id = "", @class = "FilterOrganisationRegionId" })
<div class="col"><input type="text" class="FilterOrganisationRegionCaption sax-input" readonly="readonly" /> </div>
<div class="fixed row">
<div class="sax-action FilterRegionSelect"><img src="~/img/action/search24.png" alt="@(Localiser["label.search"])" title="@(Localiser["label.search"])" /></div>
<div class="sax-action FilterRegionClear"><img src="~/img/action/delete24.png" alt="@(Localiser["label.clear"])" title="@(Localiser["label.clear"])" /></div>
</div>
</div>
</div>
</div>
@* Organisation Status *@
<div class="row pb4">
<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.status"]</div>
<div class="col-sm-7">
@Html.DropDownListFor(model => model.Filter.OrganisationStatusCategoryCode, Model.OrganisationFilterStatusCategoriesForSelect, new { @id = "", @class = "FilterOrganisationStatusCategory sax-select" })
<div class="fixed">
@* Burger menu *@
<ul class="nav navbar-nav navbar-dark navbar-right sax-burger">
<li class="dropdown-toggle caret-off">
<a href="#" class="dropdown" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="navbar-toggler-icon"></span></a>
<ul class="dropdown-menu dropdown-menu-right sax-dropdown-menu">@* Menu items will be inserted here. *@</ul>
</li>
</ul>
</div>
</div>
</div>
</div>
<div class="sax-content">
@* Organisation filter - name etc. *@
<div class="row pb4">
<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.search"]</div>
<div class="col-sm-7">
@Html.TextBoxFor(model => model.Filter.Organisation, new { @id = "", @class = "FilterOrganisation", @maxlength = "32" })
</div>
</div>
@* Organisation Category *@
<div class="row pb4">
<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.category"]</div>
<div class="col-sm-7">
@Html.DropDownListFor(model => model.Filter.OrganisationCategoryCode, Model.AdminOrganisationCategoriesForSelect, Localiser["label.any"], new { @id = "", @class = "FilterOrganisationCategory sax-select" })
</div>
</div>
@* Organisation sport *@
<div class="row pb4">
<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.sport"]</div>
<div class="col-sm-7">
<div class="row">
@Html.HiddenFor(model => model.Filter.OrganisationSportId, new { @id = "", @class = "FilterOrganisationSportId" })
<div class="col"><input type="text" class="FilterOrganisationSportCaption sax-input" readonly="readonly" /> </div>
<div class="fixed row">
<div class="sax-action FilterSportSelect"><img src="~/img/action/search24.png" alt="@(Localiser["label.search"])" title="@(Localiser["label.search"])" /></div>
<div class="sax-action FilterSportClear"><img src="~/img/action/delete24.png" alt="@(Localiser["label.clear"])" title="@(Localiser["label.clear"])" /></div>
</div>
</div>
</div>
</div>
@* Organisation region *@
<div class="row pb4">
<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.region"]</div>
<div class="col-sm-7">
<div class="row">
@Html.HiddenFor(model => model.Filter.OrganisationRegionId, new { @id = "", @class = "FilterOrganisationRegionId" })
<div class="col"><input type="text" class="FilterOrganisationRegionCaption sax-input" readonly="readonly" /> </div>
<div class="fixed row">
<div class="sax-action FilterRegionSelect"><img src="~/img/action/search24.png" alt="@(Localiser["label.search"])" title="@(Localiser["label.search"])" /></div>
<div class="sax-action FilterRegionClear"><img src="~/img/action/delete24.png" alt="@(Localiser["label.clear"])" title="@(Localiser["label.clear"])" /></div>
</div>
</div>
</div>
</div>
@* Organisation Status *@
<div class="row pb4">
<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.status"]</div>
<div class="col-sm-7">
@Html.DropDownListFor(model => model.Filter.OrganisationStatusCategoryCode, Model.OrganisationFilterStatusCategoriesForSelect, new { @id = "", @class = "FilterOrganisationStatusCategory sax-select" })
</div>
</div>
</div>
@* Filter element templates *@
<div class="sax-panel-item-template">
@* Burger dropdown item template - ul is ignored *@
<ul class="sax-dropdown-menu OrganisationFilter">
<li class="sax-dropdown-item sax-action"><div class="sax-label">XXX</div></li>
</ul>
</div>
</div>
}
</div>
SaxoniteCoreWebAdmin/Views/Region/Index.cshtml
+2 -2
View File
@@ -5,7 +5,7 @@
ViewData["Title"] = "Regions";
}
<div class="">
<div class="sax-panel Regions">
<div class="sax-panel-filter">
@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmRegionFilter", @class = "sax-form", @onSubmit = "return false;" }))
@@ -52,7 +52,7 @@
<div class="row">
<div class="col-sm-4"><div class="RegionTypeDesc"></div></div>
<div class="col-sm-4"><div class="RegionParentName"></div></div>
<div class="col-sm-4 right"><div class="RegionStatusDesc"></div></div>
<div class="col-sm-4 right"><div class="sax-note RegionStatusDesc"></div></div>
</div>
<div class="row">
<div class="col-sm-4"></div>
SaxoniteCoreWebAdmin/Views/Sport/Index.cshtml
+11 -10
View File
@@ -13,12 +13,13 @@
sax.lbl.edit = '@(Localiser.GetJavascriptText("label.edit"))';
</script>
@* Filter Form *@
@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmSportFilter", @class = "sax-form", @onSubmit = "return false;" }))
{
@* Filter Panel *@
<div class="sax-panel-filter">
@* Filter Form *@
@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmSportFilter", @class = "sax-form", @onSubmit = "return false;" }))
{
@* Filter Panel *@
<div class="sax-panel-filter">
@* Header - Page caption, paging controls, actions. *@
<div class="sax-header row">
<div class="col"><div class="sax-caption">@Localiser["sport.caption.sports"]</div></div>
@@ -51,9 +52,8 @@
<li class="sax-dropdown-item sax-action"><div class="sax-label">XXX</div></li>
</ul>
</div>
</div>
}
}
</div>
@* Results Panel *@
<div class="sax-panel-results">
@@ -81,8 +81,8 @@
</div>
<div class="sax-content">
<div class="row">
<div class="col-sm-4"><div class="sax-note SportSpeciality">@Localiser["label.speciality"]:&nbsp;<span class="SportSpecialityLabel"></span></div></div>
<div class="col-sm-4"><div class="sax-note "></div></div>
<div class="col-sm-4"><div class="SportSpeciality">@Localiser["label.speciality"]:&nbsp;<span class="SportSpecialityLabel"></span></div></div>
<div class="col-sm-4"><div class="SportParent">@Localiser["label.parent"]:&nbsp;<span class="SportNameParent"></span></div></div>
<div class="col-sm-4 right"><div class="sax-note StatusDesc"></div></div>
</div>
<div class="row">
@@ -101,6 +101,7 @@
</div>
<partial name="Panel-SportDialog.cshtml" />
<partial name="~/Views/Common/SelectItem.cshtml" />
</div>
SaxoniteCoreWebAdmin/Views/Sport/Panel-SportDialog.cshtml
+28 -2
View File
@@ -7,14 +7,20 @@
<script type="text/javascript">
sax.dlg.title.createSport = '@Localiser.GetJavascriptText("sport.caption.sport.create")';
sax.dlg.title.updateSport = '@Localiser.GetJavascriptText("sport.caption.sport.update")';
sax.dlg.title.selectSport = '@Localiser.GetJavascriptText("sport.caption.sport.select")';
</script>
@* Sport Id form. *@
@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmSportId", @class = "sax-form" }))
{
@Html.HiddenFor(model => model.SportId, new { @class = "SportId" })
}
<div id="dlgSport" class="sax-dialog" title="">
<div class="spacer2"></div>
@* Sport dialog *@
<div id="dlgSport" class="sax-dialog" title="">
<div class="spacer4"></div>
@* Sport form *@
@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmSport", @class = "sax-form", @onSubmit = "return false;" }))
{
@Html.HiddenFor(model => model.SportId, new { @class = "SportId" })
@@ -36,6 +42,26 @@
</div>
</div>
@* Sport Parent *@
<div class="sax-form-control SportParent">
<div class="row">
<div class="col-sm-3">
<div class="sax-label">
<label for="ifSportNameParent"><span>@Localiser["label.parent"]</span></label>
</div>
</div>
<div class="col-sm-9">
<div class="sax-control row">
@Html.HiddenFor(model => model.SportIdParent, new { @id = "ifSportIdParent", @class = "SportIdParent" })
<div class="col"><input type="text" class="SportNameParent sax-input" readonly="readonly" /></div>
<div class="fixed"><div class="sax-action ParentSportClear"><img src="~/img/action/delete24.png" alt="@(Localiser["label.clear"])" title="@(Localiser["label.clear"])" /></div></div>
<div class="fixed"><button type="button" id="pbSelectParentSport" class="sax-button" style="min-width:auto;margin-left:4px;padding:4px 6px">@Localiser["label.select"]</button></div>
</div>
<div class="sax-message"></div>
</div>
</div>
</div>
@* Sport Speciality Label *@
<div class="sax-form-control SportSpecialityLabel">
<div class="row">
SaxoniteCoreWebAdmin/Views/System/Database.cshtml
+6 -4
View File
@@ -60,7 +60,9 @@
<style>
#dlgDbTable tr.sax-heading td
{
color:#808080;
color: #606060;
background-color: #f0f0f0;
border-top: 1px solid #808080;
border-bottom: 1px solid #808080;
}
</style>
@@ -74,14 +76,14 @@
<tr>
<td class="right pt2 pr8">Properties:</td>
<td>
<table class="TableProperties">
<table class="sax-striped TableProperties">
</table>
</td>
</tr>
<tr>
<td class="right pt2 pr8">Columns:</td>
<td>
<table class="TableColumns">
<table class="sax-striped TableColumns">
<tr class="sax-heading">
<td class="right pl8 pr8">Pos</td>
<td class="pl8 pr8">Name</td>
@@ -93,7 +95,7 @@
<tr>
<td class="right pt2 pr8">Indices:</td>
<td>
<table class="TableIndices">
<table class="sax-striped TableIndices">
<tr class="sax-heading">
<td class="pl8 pr8">Name</td>
<td class="center pl8 pr8">Unique</td>