Skip to content

Commit 121cc55

Browse files
kushthedudeabhinavk96
authored andcommitted
Minor bugs and enhancements in admin area (#3316)
1 parent f53af6e commit 121cc55

File tree

6 files changed

+25
-30
lines changed

6 files changed

+25
-30
lines changed

app/components/forms/admin/settings/billing.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default class extends Component.extend(FormMixin) {
4747
rules : [
4848
{
4949
type : 'empty',
50-
prompt : this.l10n.t('Please enter the country')
50+
prompt : this.l10n.t('Please select the country')
5151
}
5252
]
5353
},

app/controllers/admin/events/list.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
1818
isSortable : true,
1919
headerComponent : 'tables/headers/sort',
2020
cellComponent : 'ui-table/cell/cell-event',
21+
width : 180,
2122
options : {
2223
hasRestorePrivileges: this.hasRestorePrivileges
2324
},
@@ -35,7 +36,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
3536
isSortable : true,
3637
headerComponent : 'tables/headers/sort',
3738
cellComponent : 'ui-table/cell/cell-simple-date',
38-
width : 40,
39+
width : 65,
3940
options : {
4041
dateFormat: 'MMMM DD, YYYY - hh:mm A'
4142
}
@@ -46,7 +47,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
4647
isSortable : true,
4748
headerComponent : 'tables/headers/sort',
4849
cellComponent : 'ui-table/cell/cell-simple-date',
49-
width : 40,
50+
width : 65,
5051
options : {
5152
dateFormat: 'MMMM DD, YYYY - hh:mm A'
5253
}
@@ -56,26 +57,27 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
5657
valuePath : 'state',
5758
isSortable : true,
5859
headerComponent : 'tables/headers/sort',
59-
width : 50
60+
width : 80
6061
},
6162
{
6263
name : 'Roles',
6364
valuePath : 'owner',
6465
extraValuePaths : ['organizers', 'coorganizers', 'trackOrganizers', 'registrars', 'moderators'],
65-
cellComponent : 'ui-table/cell/cell-roles'
66+
cellComponent : 'ui-table/cell/cell-roles',
67+
width : 185
6668
},
6769
{
6870
name : 'Sessions',
6971
valuePath : 'eventStatisticsGeneral',
7072
cellComponent : 'ui-table/cell/cell-sessions',
71-
width : 60
73+
width : 90
7274

7375
},
7476
{
7577
name : 'Speakers',
7678
valuePath : 'eventStatisticsGeneral',
7779
cellComponent : 'ui-table/cell/cell-speakers-dashboard',
78-
width : 60
80+
width : 90
7981
},
8082
{
8183
name : 'Tickets',
@@ -85,14 +87,15 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
8587
{
8688
name : 'Public URL',
8789
valuePath : 'url',
88-
cellComponent : 'ui-table/cell/cell-link'
90+
cellComponent : 'ui-table/cell/cell-link',
91+
width : 220
8992
},
9093
{
9194
name : 'Featured Event',
9295
valuePath : 'id',
9396
extraValuePaths : ['isFeatured'],
9497
cellComponent : 'ui-table/cell/admin/event-is-featured',
95-
width : 40,
98+
width : 80,
9699
actions : {
97100
toggleFeatured: this.toggleFeatured.bind(this)
98101
}

app/controllers/admin/users/list.js

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
1515
valuePath : 'id',
1616
extraValuePaths : ['firstName', 'deletedAt'],
1717
cellComponent : 'ui-table/cell/admin/users/cell-first-name',
18+
width : 155,
1819
options : {
1920
hasRestorePrivileges: this.hasRestorePrivileges
2021
},
@@ -24,47 +25,38 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
2425
openEditModal : this.openEditModal.bind(this),
2526
restoreUser : this.restoreUser.bind(this)
2627
}
27-
2828
},
2929
{
3030
name : 'Email',
31-
valuePath : 'email'
32-
33-
31+
valuePath : 'email',
32+
width : 160
3433
},
3534
{
3635
name : 'Status',
3736
valuePath : 'status',
3837
cellComponent : 'ui-table/cell/admin/users/cell-status'
39-
40-
4138
},
4239
{
4340
name : 'System Roles',
4441
valuePath : 'isSuperAdmin',
4542
extraValuePaths : ['isAdmin', 'isVerified'],
4643
cellComponent : 'ui-table/cell/admin/users/cell-system-roles'
47-
48-
4944
},
5045
{
5146
name : 'Event Roles',
5247
valuePath : 'isSuperAdmin',
48+
width : 260,
5349
extraValuePaths : ['isAdmin', 'isUserOwner', 'ownerEvents',
5450
'isUserOrganizer', 'organizerEvents', 'isUserCoorganizer', 'coorganizerEvents',
5551
'isUserTrackOrganizer', 'trackOrganizerEvents', 'isUserRegistrar', 'registrarEvents',
5652
'isUserModerator', 'moderatorEvents', 'isMarketer', 'marketerEvents', 'isSalesAdmin',
5753
'salesAdminEvents'],
5854
cellComponent: 'ui-table/cell/admin/users/cell-event-roles'
59-
60-
6155
},
6256
{
6357
name : 'User Links',
6458
valuePath : 'id',
6559
cellComponent : 'ui-table/cell/admin/users/cell-user-links'
66-
67-
6860
},
6961
{
7062
name : 'Member Since',

app/controllers/admin/users/view/events/list.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
1717
isSortable : true,
1818
headerComponent : 'tables/headers/sort',
1919
cellComponent : 'ui-table/cell/cell-event',
20+
width : 160,
2021
options : {
2122
hasRestorePrivileges: this.hasRestorePrivileges
2223
},
@@ -40,7 +41,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
4041
{
4142
name : 'Sessions',
4243
valuePath : 'eventStatisticsGeneral',
43-
width : 80,
44+
width : 90,
4445
isSortable : false,
4546
cellComponent : 'ui-table/cell/cell-sessions-dashboard'
4647
},
@@ -62,6 +63,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
6263
name : 'Public URL',
6364
valuePath : 'url',
6465
cellComponent : 'ui-table/cell/cell-link',
66+
width : 240,
6567
isSortable : false
6668
}
6769
];

app/templates/admin/users/view/events.hbs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,5 @@
1717
{{/tabbed-navigation}}
1818
</div>
1919
</div>
20-
<div class="ui segment">
21-
{{outlet}}
22-
</div>
20+
{{outlet}}
2321
</div>

app/templates/components/forms/admin/settings/billing.hbs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
{{t 'Invoice Contact'}}
3131
</h3>
3232
<div class="field">
33-
<label for="adminBillingContactName">{{t 'Contact Name'}}</label>
33+
<label class="required" for="adminBillingContactName">{{t 'Contact Name'}}</label>
3434
{{input type='text' id='adminBillingContactName' value=model.adminBillingContactName}}
3535
</div>
3636
<div class="field">
37-
<label for="adminBillingPhone">{{t 'Phone'}}</label>
37+
<label class="required" for="adminBillingPhone">{{t 'Phone'}}</label>
3838
{{input type='text' id='adminBillingPhone' value=model.adminBillingPhone}}
3939
</div>
4040
<div class="field">
@@ -45,7 +45,7 @@
4545
<label class="required">{{t 'Country'}}</label>
4646
{{#ui-dropdown class='search selection' selected=model.adminBillingCountry forceSelection=false
4747
fullTextSearch=true}}
48-
{{input type='hidden' id='country' value=model.adminBillingCountry}}
48+
{{input type='hidden' id='adminBillingCountry' value=model.adminBillingCountry}}
4949
<i class="dropdown icon"></i>
5050
<div class="default text">{{t 'Select country'}}</div>
5151
<div class="menu">
@@ -59,11 +59,11 @@
5959
{{/ui-dropdown}}
6060
</div>
6161
<div class="field">
62-
<label for="adminBillingTaxInfo">{{t 'Tax ID'}}</label>
62+
<label class="required" for="adminBillingTaxInfo">{{t 'Tax ID'}}</label>
6363
{{input type='text' id='adminBillingTaxInfo' value=model.adminBillingTaxInfo}}
6464
</div>
6565
<div class="field">
66-
<label for="adminCompany">{{t 'Company'}}</label>
66+
<label class="required" for="adminCompany">{{t 'Company'}}</label>
6767
{{input type='text' id='adminCompany' value=model.adminCompany}}
6868
</div>
6969
<div class="field">

0 commit comments

Comments
 (0)