kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #628 from thabaum/dashboard-table-col-size

Browse Source 
Fix Dashboard button/input table col size
This commit is contained in:
Shaun Walker 2020-06-19 17:29:27 -04:00 committed by GitHub
commit 3ac4116a84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Files/Index.razor
View File

@ -28,7 +28,7 @@
</table> </table>
<Pager Items="@_files"> <Pager Items="@_files">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Name</th> <th>Name</th>
<th>Modified</th> <th>Modified</th>
<th>Type</th> <th>Type</th>

8
Oqtane.Client/Modules/Admin/Jobs/Index.razor
View File

@ -15,14 +15,14 @@ else
<Pager Items="@_jobs"> <Pager Items="@_jobs">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Name</th> <th>Name</th>
<th>Status</th> <th>Status</th>
<th>Frequency</th> <th>Frequency</th>
<th>Next Execution</th> <th>Next Execution</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
</Header> </Header>
<Row> <Row>
<td><ActionLink Action="Edit" Parameters="@($"id=" + context.JobId.ToString())" /></td> <td><ActionLink Action="Edit" Parameters="@($"id=" + context.JobId.ToString())" /></td>

2
Oqtane.Client/Modules/Admin/Logs/Index.razor
View File

@ -49,7 +49,7 @@ else
{ {
<Pager Items="@_logs"> <Pager Items="@_logs">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Date</th> <th>Date</th>
<th>Level</th> <th>Level</th>
<th>Feature</th> <th>Feature</th>

2
Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
View File

@ -16,7 +16,7 @@
<Header> <Header>
<th>Name</th> <th>Name</th>
<th>Version</th> <th>Version</th>
<th></th> <th style="width: 1px"></th>
</Header> </Header>
<Row> <Row>
<td>@context.Name</td> <td>@context.Name</td>

6
Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
View File

@ -14,11 +14,11 @@ else
<Pager Items="@_moduleDefinitions"> <Pager Items="@_moduleDefinitions">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Name</th> <th>Name</th>
<th>Version</th> <th>Version</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
</Header> </Header>
<Row> <Row>
<td><ActionLink Action="Edit" Parameters="@($"id=" + context.ModuleDefinitionId.ToString())" /></td> <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ModuleDefinitionId.ToString())" /></td>

4
Oqtane.Client/Modules/Admin/Pages/Index.razor
View File

@ -9,8 +9,8 @@
<Pager Items="@PageState.Pages.Where(item => !item.IsDeleted)"> <Pager Items="@PageState.Pages.Where(item => !item.IsDeleted)">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Name</th> <th>Name</th>
</Header> </Header>
<Row> <Row>

4
Oqtane.Client/Modules/Admin/Profiles/Index.razor
View File

@ -12,8 +12,8 @@ else
<Pager Items="@_profiles"> <Pager Items="@_profiles">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Name</th> <th>Name</th>
</Header> </Header>
<Row> <Row>

8
Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
View File

@ -16,8 +16,8 @@
{ {
<Pager Items="@_pages"> <Pager Items="@_pages">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Name</th> <th>Name</th>
<th>Deleted By</th> <th>Deleted By</th>
<th>Deleted On</th> <th>Deleted On</th>
@ -42,8 +42,8 @@
{ {
<Pager Items="@_modules"> <Pager Items="@_modules">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Page</th> <th>Page</th>
<th>Module</th> <th>Module</th>
<th>Deleted By</th> <th>Deleted By</th>

6
Oqtane.Client/Modules/Admin/Roles/Index.razor
View File

@ -12,9 +12,9 @@ else
<Pager Items="@_roles"> <Pager Items="@_roles">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Name</th> <th>Name</th>
</Header> </Header>
<Row> <Row>

4
Oqtane.Client/Modules/Admin/Sites/Index.razor
View File

@ -14,8 +14,8 @@ else
<Pager Items="@_sites"> <Pager Items="@_sites">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Name</th> <th>Name</th>
</Header> </Header>
<Row> <Row>

4
Oqtane.Client/Modules/Admin/Tenants/Index.razor
View File

@ -11,8 +11,8 @@ else
{ {
<Pager Items="@tenants"> <Pager Items="@tenants">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Name</th> <th>Name</th>
</Header> </Header>
<Row> <Row>

2
Oqtane.Client/Modules/Admin/Themes/Add.razor
View File

@ -16,7 +16,7 @@
<Header> <Header>
<th>Name</th> <th>Name</th>
<th>Version</th> <th>Version</th>
<th></th> <th style="width: 1px;"></th>
</Header> </Header>
<Row> <Row>
<td>@context.Name</td> <td>@context.Name</td>

9
Oqtane.Client/Modules/Admin/Themes/Index.razor
View File

@ -15,10 +15,10 @@ else
<Pager Items="@_themes"> <Pager Items="@_themes">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Name</th> <th scope="col">Name</th>
<th>Version</th> <th scope="col">Version</th>
<th>&nbsp;</th> <th>&nbsp;</th>
</Header> </Header>
<Row> <Row>
@ -37,6 +37,7 @@ else
<button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.ThemeName, context.Version))>Upgrade</button> <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.ThemeName, context.Version))>Upgrade</button>
} }
</td> </td>
<td></td>
</Row> </Row>
</Pager> </Pager>
} }

8
Oqtane.Client/Modules/Admin/UserProfile/Index.razor
View File

@ -32,7 +32,7 @@ else
<label for="Name" class="control-label">Password: </label> <label for="Name" class="control-label">Password: </label>
</td> </td>
<td> <td>
<input type="password" class="form-control" @bind="@password" /> <input type="password" class="form-control" @bind="@password" autocomplete="new-password" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -40,7 +40,7 @@ else
<label for="Name" class="control-label">Confirm Password: </label> <label for="Name" class="control-label">Confirm Password: </label>
</td> </td>
<td> <td>
<input type="password" class="form-control" @bind="@confirm" /> <input type="password" class="form-control" @bind="@confirm" autocomplete="new-password" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -111,8 +111,8 @@ else
{ {
<Pager Items="@notifications"> <Pager Items="@notifications">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>From</th> <th>From</th>
<th>Subject</th> <th>Subject</th>
<th>Received</th> <th>Received</th>

8
Oqtane.Client/Modules/Admin/UserProfile/View.razor
View File

@ -33,7 +33,7 @@
<td> <td>
<input class="form-control" @bind="@subject" readonly /> <input class="form-control" @bind="@subject" readonly />
</td> </td>
} }
@if (title == "To") @if (title == "To")
{ {
<td> <td>
@ -51,7 +51,7 @@
<input class="form-control" @bind="@createdon" readonly /> <input class="form-control" @bind="@createdon" readonly />
</td> </td>
</tr> </tr>
} }
@if (title == "From") @if (title == "From")
{ {
<tr> <tr>
@ -62,7 +62,7 @@
<textarea class="form-control" @bind="@body" rows="5" readonly /> <textarea class="form-control" @bind="@body" rows="5" readonly />
</td> </td>
</tr> </tr>
} }
@if (title == "To") @if (title == "To")
{ {
<tr> <tr>
@ -73,7 +73,7 @@
<textarea class="form-control" @bind="@body" rows="5" /> <textarea class="form-control" @bind="@body" rows="5" />
</td> </td>
</tr> </tr>
} }
</table> </table>

6
Oqtane.Client/Modules/Admin/Users/Index.razor
View File

@ -20,9 +20,9 @@ else
<Pager Items="@userroles"> <Pager Items="@userroles">
<Header> <Header>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>Name</th> <th>Name</th>
</Header> </Header>
<Row> <Row>

19
Oqtane.Client/Modules/Controls/PermissionGrid.razor
View File

@ -10,10 +10,10 @@
<table class="table" style="width: 50%; min-width: 250px;"> <table class="table" style="width: 50%; min-width: 250px;">
<tbody> <tbody>
<tr> <tr>
<th>Role</th> <th scope="col">Role</th>
@foreach (PermissionString permission in _permissions) @foreach (PermissionString permission in _permissions)
{ {
<th style="text-align: center;">@permission.PermissionName</th> <th style="text-align: center; width: 1px;">@permission.PermissionName</th>
} }
</tr> </tr>
@foreach (Role role in _roles) @foreach (Role role in _roles)
@ -36,10 +36,10 @@
<table class="table" style="width: 50%; min-width: 250px;"> <table class="table" style="width: 50%; min-width: 250px;">
<thead> <thead>
<tr> <tr>
<th>User</th> <th scope="col">User</th>
@foreach (PermissionString permission in _permissions) @foreach (PermissionString permission in _permissions)
{ {
<th style="text-align: center;">@permission.PermissionName</th> <th style="text-align: center; width: 1px;">@permission.PermissionName</th>
} }
</tr> </tr>
</thead> </thead>
@ -48,11 +48,11 @@
{ {
string userid = "[" + user.UserId.ToString() + "]"; string userid = "[" + user.UserId.ToString() + "]";
<tr> <tr>
<td>@user.DisplayName</td> <td >@user.DisplayName</td>
@foreach (PermissionString permission in _permissions) @foreach (PermissionString permission in _permissions)
{ {
var p = permission; var p = permission;
<td style="text-align: center;"> <td style="text-align: center; width: 1px;">
<TriStateCheckBox Value=@GetPermissionValue(p.Permissions, userid) Disabled=false OnChange="@(e => PermissionChanged(e, p.PermissionName, userid))" /> <TriStateCheckBox Value=@GetPermissionValue(p.Permissions, userid) Disabled=false OnChange="@(e => PermissionChanged(e, p.PermissionName, userid))" />
</td> </td>
} }
@ -64,9 +64,10 @@
<table class="table" style="width: 50%; min-width: 250px;"> <table class="table" style="width: 50%; min-width: 250px;">
<tbody> <tbody>
<tr> <tr>
<td style="text-align: right;"><label for="Username" class="control-label">User: </label></td> <td class="input-group">
<td><input type="text" name="Username" class="form-control" placeholder="Enter Username" @bind="@_username" /></td> <input type="text" name="Username" class="form-control" placeholder="Enter Username" @bind="@_username" />
<td style="text-align: left;"><button type="button" class="btn btn-primary" @onclick="AddUser">Add</button></td> <button type="button" class="btn btn-primary" @onclick="AddUser">Add</button>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

2
Oqtane.Server/appsettings.json
View File

@ -2,7 +2,7 @@
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "" "DefaultConnection": ""
}, },
"Runtime" : "Server", "Runtime": "Server",
"Installation": { "Installation": {
"DefaultAlias": "", "DefaultAlias": "",
"HostPassword": "", "HostPassword": "",