Skip to content
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

feat: Removing session names from modal #3515

Merged
merged 14 commits into from
Dec 26, 2019
Merged

feat: Removing session names from modal #3515

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3cd5b02
enh: Removing session names from modal
kushthedude Sep 8, 2019
62f5bc9
Merge branch 'development' into spe
kushthedude Sep 8, 2019
3818cea
Merge branch 'development' into spe
kushthedude Sep 20, 2019
d5f437f
Merge branch 'development' into spe
kushthedude Oct 16, 2019
0464d67
Merge branch 'development' into spe
kushthedude Oct 17, 2019
0fd71e1
Merge branch 'development' into spe
kushthedude Oct 24, 2019
0a5fdd0
Merge branch 'development' into spe
kushthedude Nov 3, 2019
44ac3e5
Merge branch 'development' into spe
kushthedude Nov 17, 2019
4952002
Merge branch 'development' into spe
kushthedude Nov 17, 2019
7bd2038
Merge branch 'development' into spe
kushthedude Nov 24, 2019
eb6bdbe
Merge branch 'development' into spe
kushthedude Nov 25, 2019
04f8d5a
Merge branch 'development' into spe
kushthedude Dec 25, 2019
ece131a
making the list inline
kushthedude Dec 25, 2019
f5c81b5
Merge branch 'development' into spe
iamareebjamal Dec 26, 2019
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
21 changes: 1 addition & 20 deletions app/templates/components/modals/cfs-proposal-modal.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,9 @@
{{t 'Submit Proposal'}}
</div>
<div class="content">
<h4 class="ui header">{{t 'Existing Sessions'}}</h4>
{{#unless isNewSpeaker}}
{{#unless isNewSession}}
<div class="ui list">
{{#each data.userSession as |session|}}
{{#if session.id}}
{{#link-to 'public.cfs.edit-session' session.id invokeAction=(action 'toggleView')}}
<div class="item">
<i class="right triangle icon"></i>
{{t 'Edit Session - '}}{{session.title}}
</div>
{{/link-to}}
{{/if}}
{{/each}}
</div>
{{/unless}}
{{/unless}}
{{#if isNewSession}}
<p>{{t 'No existing sessions'}}</p>
{{/if}}
<div class="ui hidden divider">
</div>
<div>
{{#if isNewSpeaker}}
{{#link-to 'public.cfs.new-speaker' class='ui teal button' invokeAction=(action 'toggleView')}}
Expand All @@ -41,7 +22,7 @@
{{/if}}
{{#unless isNewSpeaker}}
{{#link-to 'public.cfs.new-session' invokeAction=(action 'toggleView')}}
<button class="ui teal {{if device.isMobile 'tiny'}} button">{{t 'Add Session Details'}}</button>
<button class="ui teal {{if device.isMobile 'tiny'}} button">{{t 'Add New Session'}}</button>
{{/link-to}}
{{/unless}}
</div>
Expand Down
17 changes: 16 additions & 1 deletion app/templates/components/public/call-for-speakers.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,26 @@
<div class="ui divider"></div>
{{sanitize data.speakersCall.announcement}}
<div class="ui hidden divider"></div>
<h3 class="ui header">{{t 'Submitted Sessions'}}</h3>
{{#unless isNewSpeaker}}
{{#unless isNewSession}}
<div class="ui list">
{{#each data.userSession as |session|}}
{{#if session.id}}
<div class="item">
{{#link-to 'public.cfs.edit-session' session.id }}
<a class="ui very tiny basic blue button">{{session.title}}</a>
{{/link-to}}
</div>
{{/if}}
{{/each}}
</div>
{{/unless}}
{{/unless}}
{{#if data.speakersCall.isOpen}}
<button type="submit" class="ui teal submit button" {{action 'openModal'}}>
{{t 'Submit Proposal'}}
</button>
{{/if}}

{{modals/cfs-proposal-modal isOpen=isCfsModalOpen isNewSpeaker=isNewSpeaker isNewSession=isNewSession data=data}}
{{modals/login-signup-modal isOpen=isLoginModalOpen}}