Skip to content

Commit a746289

Browse files
hikalkanhikalkan
committed
Tenants page converted to new theme
1 parent 06217e9 commit a746289

File tree

2 files changed

+108
-83
lines changed

2 files changed

+108
-83
lines changed

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Tenants/Index.cshtml

Lines changed: 66 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
@using Abp.MultiTenancy
1+
@using Abp.Authorization.Users
2+
@using Abp.MultiTenancy
23
@using AbpCompanyName.AbpProjectName.MultiTenancy
34
@using AbpCompanyName.AbpProjectName.Web.Startup
45
@model Abp.Application.Services.Dto.ListResultDto<AbpCompanyName.AbpProjectName.MultiTenancy.Dto.TenantListDto>
@@ -15,31 +16,53 @@
1516
<script src="~/view-resources/Views/Tenants/Index.min.js" asp-append-version="true"></script>
1617
</environment>
1718
}
18-
<div>
19-
<h1>@L("Tenants")</h1>
20-
<div class="row">
21-
<div class="col-md-12">
22-
<button data-toggle="modal" data-target="#TenantCreateModal" class="btn btn-primary pull-right"><i class="fa fa-plus"></i> @L("CreateNewTenant")</button>
23-
<table class="table">
24-
<thead>
25-
<tr>
26-
<th>@L("TenancyName")</th>
27-
<th>@L("Name")</th>
28-
</tr>
29-
</thead>
30-
<tbody>
31-
@foreach (var tenant in Model.Items)
32-
{
19+
20+
<div class="row clearfix">
21+
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
22+
<div class="card">
23+
<div class="header">
24+
<h2>
25+
@L("Tenants")
26+
</h2>
27+
<ul class="header-dropdown m-r--5">
28+
<li class="dropdown">
29+
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
30+
<i class="material-icons">more_vert</i>
31+
</a>
32+
<ul class="dropdown-menu pull-right">
33+
<li><a href="javascript:void(0);" class=" waves-effect waves-block">Action</a></li>
34+
<li><a href="javascript:void(0);" class=" waves-effect waves-block">Another action</a></li>
35+
<li><a href="javascript:void(0);" class=" waves-effect waves-block">Something else here</a></li>
36+
</ul>
37+
</li>
38+
</ul>
39+
</div>
40+
<div class="body table-responsive">
41+
<table class="table">
42+
<thead>
3343
<tr>
34-
<td>@tenant.TenancyName</td>
35-
<td>@tenant.Name</td>
44+
<th>@L("TenancyName")</th>
45+
<th>@L("Name")</th>
3646
</tr>
37-
}
38-
</tbody>
39-
</table>
47+
</thead>
48+
<tbody>
49+
@foreach (var tenant in Model.Items)
50+
{
51+
<tr>
52+
<td>@tenant.TenancyName</td>
53+
<td>@tenant.Name</td>
54+
</tr>
55+
}
56+
</tbody>
57+
</table>
58+
<button type="button" class="btn btn-primary btn-circle waves-effect waves-circle waves-float pull-right" data-toggle="modal" data-target="#TenantCreateModal">
59+
<i class="material-icons">add</i>
60+
</button>
61+
</div>
4062
</div>
4163
</div>
4264
</div>
65+
4366
<div class="modal fade" id="TenantCreateModal" tabindex="-1" role="dialog" aria-labelledby="TenantCreateModalLabel" data-backdrop="static">
4467
<div class="modal-dialog" role="document">
4568
<div class="modal-content">
@@ -50,27 +73,35 @@
5073
</h4>
5174
</div>
5275
<div class="modal-body">
53-
<div class="form-group">
54-
<label>@L("TenancyName")</label>
55-
<input class="form-control" type="text" name="TenancyName" required maxlength="@Tenant.MaxTenancyNameLength" minlength="2">
76+
<div class="form-group form-float">
77+
<div class="form-line">
78+
<input class="form-control" type="text" name="TenancyName" required maxlength="@AbpTenantBase.MaxTenancyNameLength" minlength="2">
79+
<label class="form-label">@L("TenancyName")</label>
80+
</div>
5681
</div>
57-
<div class="form-group">
58-
<label>@L("Name")</label>
59-
<input type="text" name="Name" class="form-control" required maxlength="@Tenant.MaxNameLength">
82+
<div class="form-group form-float">
83+
<div class="form-line">
84+
<input type="text" name="Name" class="form-control" required maxlength="@Tenant.MaxNameLength">
85+
<label class="form-label">@L("Name")</label>
86+
</div>
6087
</div>
61-
<div class="form-group">
62-
<label>@L("DatabaseConnectionString") (@L("Optional"))</label>
63-
<input type="text" name="ConnectionString" class="form-control" maxlength="@AbpTenantBase.MaxConnectionStringLength">
88+
<div class="form-group form-float">
89+
<div class="form-line">
90+
<input type="text" name="ConnectionString" class="form-control" maxlength="@AbpTenantBase.MaxConnectionStringLength">
91+
<label class="form-label">@L("DatabaseConnectionString") (@L("Optional"))</label>
92+
</div>
6493
</div>
65-
<div class="form-group">
66-
<label>@L("AdminEmailAddress")</label>
67-
<input type="email" name="AdminEmailAddress" class="form-control" required maxlength="@AbpCompanyName.AbpProjectName.Authorization.Users.User.MaxEmailAddressLength">
94+
<div class="form-group form-float">
95+
<div class="form-line">
96+
<input type="email" name="AdminEmailAddress" class="form-control" required maxlength="@AbpUserBase.MaxEmailAddressLength">
97+
<label class="form-label">@L("AdminEmailAddress")</label>
98+
</div>
6899
</div>
69100
<p>@L("DefaultPasswordIs", AbpCompanyName.AbpProjectName.Authorization.Users.User.DefaultPassword)</p>
70101
</div>
71102
<div class="modal-footer">
72-
<button type="button" class="btn btn-default" data-dismiss="modal">@L("Cancel")</button>
73-
<button type="submit" class="btn btn-primary blue"><i class="fa fa-save"></i> <span>@L("Save")</span></button>
103+
<button type="button" class="btn btn-default waves-effect" data-dismiss="modal">@L("Cancel")</button>
104+
<button type="submit" class="btn btn-primary waves-effect">@L("Save")</button>
74105
</div>
75106
</form>
76107
</div>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Users/Index.cshtml

Lines changed: 42 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -14,57 +14,51 @@
1414
<script src="~/view-resources/Views/Users/Index.min.js" asp-append-version="true"></script>
1515
</environment>
1616
}
17-
<div>
18-
<div class="block-header">
19-
20-
</div>
21-
22-
<div class="row clearfix">
23-
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
24-
<div class="card">
25-
<div class="header">
26-
<h2>
27-
@L("Users")
28-
</h2>
29-
<ul class="header-dropdown m-r--5">
30-
<li class="dropdown">
31-
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
32-
<i class="material-icons">more_vert</i>
33-
</a>
34-
<ul class="dropdown-menu pull-right">
35-
<li><a href="javascript:void(0);" class=" waves-effect waves-block">Action</a></li>
36-
<li><a href="javascript:void(0);" class=" waves-effect waves-block">Another action</a></li>
37-
<li><a href="javascript:void(0);" class=" waves-effect waves-block">Something else here</a></li>
38-
</ul>
39-
</li>
40-
</ul>
41-
</div>
42-
<div class="body table-responsive">
43-
<table class="table">
44-
<thead>
17+
<div class="row clearfix">
18+
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
19+
<div class="card">
20+
<div class="header">
21+
<h2>
22+
@L("Users")
23+
</h2>
24+
<ul class="header-dropdown m-r--5">
25+
<li class="dropdown">
26+
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
27+
<i class="material-icons">more_vert</i>
28+
</a>
29+
<ul class="dropdown-menu pull-right">
30+
<li><a href="javascript:void(0);" class=" waves-effect waves-block">Action</a></li>
31+
<li><a href="javascript:void(0);" class=" waves-effect waves-block">Another action</a></li>
32+
<li><a href="javascript:void(0);" class=" waves-effect waves-block">Something else here</a></li>
33+
</ul>
34+
</li>
35+
</ul>
36+
</div>
37+
<div class="body table-responsive">
38+
<table class="table">
39+
<thead>
40+
<tr>
41+
<th>@L("UserName")</th>
42+
<th>@L("FullName")</th>
43+
<th>@L("EmailAddress")</th>
44+
<th>@L("IsActive")</th>
45+
</tr>
46+
</thead>
47+
<tbody>
48+
@foreach (var user in Model.Items)
49+
{
4550
<tr>
46-
<th>@L("UserName")</th>
47-
<th>@L("FullName")</th>
48-
<th>@L("EmailAddress")</th>
49-
<th>@L("IsActive")</th>
51+
<td>@user.UserName</td>
52+
<td>@user.FullName</td>
53+
<td>@user.EmailAddress</td>
54+
<td>@L(user.IsActive ? "Yes" : "No")</td>
5055
</tr>
51-
</thead>
52-
<tbody>
53-
@foreach (var user in Model.Items)
54-
{
55-
<tr>
56-
<td>@user.UserName</td>
57-
<td>@user.FullName</td>
58-
<td>@user.EmailAddress</td>
59-
<td>@L(user.IsActive ? "Yes" : "No")</td>
60-
</tr>
6156
}
62-
</tbody>
63-
</table>
64-
<button type="button" class="btn btn-primary btn-circle waves-effect waves-circle waves-float pull-right" data-toggle="modal" data-target="#UserCreateModal">
65-
<i class="material-icons">add</i>
66-
</button>
67-
</div>
57+
</tbody>
58+
</table>
59+
<button type="button" class="btn btn-primary btn-circle waves-effect waves-circle waves-float pull-right" data-toggle="modal" data-target="#UserCreateModal">
60+
<i class="material-icons">add</i>
61+
</button>
6862
</div>
6963
</div>
7064
</div>

0 commit comments

Comments
 (0)