Skip to content

Commit 0e6fb2b

Browse files
authored
fix: standard group card height (#8002)
* fix: standard group card height * show banner url, in case thumbnail is not their
1 parent 9487617 commit 0e6fb2b

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

app/components/promoted-group-card.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ get groupClass() {
7878

7979
@computed('group')
8080
get about() {
81-
if (this.group.about?.length > 100) {
82-
return this.group.about.slice(0, 100) + '...';
81+
if (this.group.about?.length > 50) {
82+
return this.group.about.slice(0, 50) + '...';
8383
}
84-
return this.group.about;
84+
return this.group.about ? this.group.about : 'No information given about group.';
8585
}
8686
}

app/templates/components/group-card.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{{#unless this.device.isMobile}}
33
<div class="ui card three wide computer six wide tablet column">
44
<a class="image" href={{href-to 'group-public' @group.id}}>
5-
<Widgets::SafeImage @src={{if @group.thumbnailImageUrl @group.thumbnailImageUrl "/images/group.png"}} />
5+
<Widgets::SafeImage @src={{if @group.thumbnailImageUrl @group.thumbnailImageUrl (if @group.bannerUrl @group.bannerUrl "/images/group.png")}} />
66
</a>
77
</div>
88
{{/unless}}

app/templates/components/orders/event-info.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<br>
2727
<strong>{{t 'From'}}:</strong> {{general-date this.data.event.startsAt 'date-time-long'}}
2828
<br>
29-
<strong>{{t 'To'}}:</strong> {{general-date this.data.event.endsAt 'date-time-long'}}
29+
<strong>{{t 'To'}}:</strong> {{general-date this.data.event.endsAt 'date-time-long'}} ({{this.data.event.timezone}})
3030
{{#if this.data.event.ownerName}}
3131
<br>
3232
<strong>{{t 'Organized By'}}:</strong> {{this.data.event.ownerName}}

app/templates/components/orders/ticket-holder.hbs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,33 +87,33 @@
8787
{{/if}}
8888
{{#if (eq this.data.paymentMode 'cheque')}}
8989
<div class="ui divider"></div>
90-
<h2 class="weight-300">
90+
<h4 class="weight-300">
9191
{{t 'Cheque Details '}}
92-
</h2>
92+
</h4>
9393
<span>
9494
{{this.data.event.chequeDetails}}
9595
</span>
9696
{{else if (eq this.data.paymentMode 'onsite')}}
9797
<div class="ui divider"></div>
98-
<h2 class="weight-300">
98+
<h4 class="weight-300">
9999
{{t 'Onsite Instructions'}}
100-
</h2>
100+
</h4>
101101
<span>
102102
{{this.data.event.onsiteDetails}}
103103
</span>
104104
{{else if (eq this.data.paymentMode 'cheque')}}
105105
<div class="ui divider"></div>
106-
<h2 class="weight-300">
106+
<h4 class="weight-300">
107107
{{t 'Bank Details'}}
108-
</h2>
108+
</h4>
109109
<span>
110110
{{this.data.event.bankDetails}}
111111
</span>
112112
{{else if (eq this.data.paymentMode 'invoice')}}
113113
<div class="ui divider"></div>
114-
<h2 class="weight-300">
114+
<h4 class="weight-300">
115115
{{t 'Invoice Details'}}
116-
</h2>
116+
</h4>
117117
<span>
118118
{{this.data.event.invoiceDetails}}
119119
</span>

app/templates/components/promoted-group-card.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<div class="{{if this.isWide 'event wide ui grid row'}}" style="height: 100%;">
1+
<div class="{{if this.isWide 'event wide ui grid row'}}" style="height: 400px;">
22
<div class="ui card {{this.groupClass}} {{if this.isWide 'h-auto' 'h-full'}}">
33
<a class="image" href={{href-to 'group-public' @group.id}}>
4-
<Widgets::SafeImage @src={{if @group.thumbnailImageUrl @group.thumbnailImageUrl "/images/group.png"}} />
4+
<Widgets::SafeImage @src={{if @group.thumbnailImageUrl @group.thumbnailImageUrl (if @group.bannerUrl @group.bannerUrl "/images/group.png")}} />
55
</a>
66
<span class="main content">
77
<SmartOverflow @class="header">

app/templates/orders/new.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="row">
99
<div class="column">
1010
<div class="ui small gray-text">
11-
{{general-date this.model.order.event.startsAt 'date-time-long'}} - {{general-date this.model.order.event.endsAt 'date-time-long'}}
11+
{{general-date this.model.order.event.startsAt 'date-time-long'}} - {{general-date this.model.order.event.endsAt 'date-time-long'}} ({{this.model.order.event.timezone}})
1212
<br>
1313
{{this.model.order.event.locationName}}
1414
</div>

0 commit comments

Comments
 (0)