Skip to content

fix: Move and simplify "Event Types" #5651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 17, 2020
Merged

fix: Move and simplify "Event Types" #5651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7f30de0
Moved Event Types up
Nov 15, 2020
93539a4
Merge branch 'development' into Move-event-types-5014
Nov 15, 2020
75f6d78
Styled Power Select
Nov 17, 2020
d3931fe
Merge branch 'development' into Move-event-types-5014
Nov 17, 2020
97431a3
Styled Power Select-1
Nov 17, 2020
c202f47
Styled Power Select-2
Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/styles/vars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
$page-top-margin: 14px;
$event-lead-image-height: 500px;
$event-lead-image-height-minimum: 300px;

$ember-power-select-border-color: rgba(34, 36, 38, .15) !default;
$ember-power-select-line-height: 2.642857143em !default;
$ember-power-select-highlighted-background: rgba(0, 0, 0, .05) !default;
$ember-power-select-highlighted-color: rgba(0, 0, 0, .95) !default;
70 changes: 34 additions & 36 deletions app/templates/components/forms/wizard/basic-details-step.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,40 @@
@id="name"
@value={{this.data.event.name}} />
</div>
<div class="three fields">
<div class="field">
<PowerSelect
@selected={{this.data.event.type}}
@allowClear={{true}}
@options={{this.data.types}}
@placeholder={{t 'Select Event Type'}}
@onChange={{action (mut this.data.event.type)}} as |type|>
{{type.name}}
</PowerSelect>
</div>
<br/>
<div class="field">
<PowerSelect
@selected={{this.data.event.topic}}
@allowClear={{true}}
@options={{this.data.topics}}
@placeholder={{t 'Select Event Topic'}}
@onChange={{action (mut this.data.event.topic)}} as |topic|>
{{topic.name}}
</PowerSelect>
</div>
<div class="field">
<PowerSelect
@selected={{this.data.event.subTopic}}
@allowClear={{true}}
@options={{this.subTopics}}
@placeholder={{t 'Select Event Sub-Topic'}}
@onChange={{action (mut this.data.event.subTopic)}} as |subTopic|>
{{subTopic.name}}
</PowerSelect>
</div>
</div>
<br>
<div class="ui secondary pointing menu">
{{#each this.locationMenuItems as |item|}}
<a role="button" href="#" class="{{if (eq item this.selectedLocationType) 'active'}} item" onclick={{action (mut this.selectedLocationType) item}}>
Expand Down Expand Up @@ -586,42 +620,6 @@
</div>
</div>
{{/if}}
<div class="ui section divider"></div>
<div class="field">
<label>{{t 'Event Type'}}</label>
<PowerSelect
@selected={{this.data.event.type}}
@allowClear={{true}}
@options={{this.data.types}}
@placeholder={{t 'Select Event Type'}}
@onChange={{action (mut this.data.event.type)}} as |type|>
{{type.name}}
</PowerSelect>
</div>
<div class="field">
<label>{{t 'Event Topic'}}</label>
<PowerSelect
@selected={{this.data.event.topic}}
@allowClear={{true}}
@options={{this.data.topics}}
@placeholder={{t 'Select Event Topic'}}
@onChange={{action (mut this.data.event.topic)}} as |topic|>
{{topic.name}}
</PowerSelect>
</div>
<div class="field">
<label>{{t 'Event Sub-topic'}}</label>
<PowerSelect
@selected={{this.data.event.subTopic}}
@allowClear={{true}}
@options={{this.subTopics}}
@placeholder={{t 'Select Event Sub-Topic'}}
@onChange={{action (mut this.data.event.subTopic)}} as |subTopic|>
{{subTopic.name}}
</PowerSelect>
</div>
<br>

</form>

<Modals::TaxInfoModal
Expand Down