From e19ad36a88f7cb7a7e03d71d6d99ce725ed24798 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Mon, 11 Nov 2019 15:19:29 +0530 Subject: [PATCH 1/6] making side menu sticky --- app/templates/components/public/side-menu.hbs | 120 +++++++++--------- 1 file changed, 61 insertions(+), 59 deletions(-) diff --git a/app/templates/components/public/side-menu.hbs b/app/templates/components/public/side-menu.hbs index d162f87cd3e..c3a648646e3 100644 --- a/app/templates/components/public/side-menu.hbs +++ b/app/templates/components/public/side-menu.hbs @@ -1,73 +1,75 @@ {{#if (and (not-eq session.currentRouteName 'public.cfs.new-session') (not-eq session.currentRouteName 'public.cfs.new-speaker') (not-eq session.currentRouteName 'public.cfs.edit-speaker') (not-eq session.currentRouteName 'public.cfs.edit-session'))}} -
- {{#if (eq session.currentRouteName 'public.index')}} - {{#scroll-to href='#info' class='item active'}} - {{t 'Info'}} - {{/scroll-to}} - {{#if event.tickets.length}} - {{#scroll-to href='#tickets' class='item'}} - {{t 'Tickets'}} +
+
+ {{#if (eq session.currentRouteName 'public.index')}} + {{#scroll-to href='#info' class='active item'}} + {{t 'Info'}} {{/scroll-to}} + {{#if event.tickets.length}} + {{#scroll-to href='#tickets' class='item'}} + {{t 'Tickets'}} + {{/scroll-to}} + {{/if}} + {{#if event.speakers.length}} + {{#link-to 'public.speakers' class='item'}} + {{t 'Speakers'}} + {{/link-to}} + {{/if}} + {{else}} + + {{t 'Info'}} + + {{#if event.tickets.length}} + + {{t 'Tickets'}} + + {{/if}} + {{#if event.speakers.length}} + {{#link-to 'public.speakers' class='item'}} + {{t 'Speakers'}} + {{/link-to}} + {{/if}} {{/if}} - {{#if event.speakers.length}} - {{#link-to 'public.speakers' class='item'}} - {{t 'Speakers'}} + {{#if event.sessions.length}} + {{#link-to 'public.sessions' class='item'}} + {{t 'Sessions'}} {{/link-to}} {{/if}} - {{else}} - - {{t 'Info'}} - - {{#if event.tickets.length}} - - {{t 'Tickets'}} - - {{/if}} - {{#if event.speakers.length}} - {{#link-to 'public.speakers' class='item'}} - {{t 'Speakers'}} + {{#if isSchedulePublished}} + {{#link-to 'public.schedule' class='item'}} + {{t 'Schedule'}} {{/link-to}} + {{/if}} + {{#if shouldShowCallforSpeakers }} + {{#link-to 'public.cfs' class='item'}} + {{t 'Call for Speakers'}} + {{/link-to}} + {{/if}} + {{#if event.hasOwnerInfo}} + {{#if (eq session.currentRouteName 'public.index')}} + {{#scroll-to href='#owner' class='item'}} + {{t 'Owner'}} + {{/scroll-to}} + {{else}} + + {{t 'Owner'}} + + {{/if}} {{/if}} - {{/if}} - {{#if event.sessions.length}} - {{#link-to 'public.sessions' class='item'}} - {{t 'Sessions'}} - {{/link-to}} - {{/if}} - {{#if isSchedulePublished}} - {{#link-to 'public.schedule' class='item'}} - {{t 'Schedule'}} - {{/link-to}} - {{/if}} - {{#if shouldShowCallforSpeakers }} - {{#link-to 'public.cfs' class='item'}} - {{t 'Call for Speakers'}} - {{/link-to}} - {{/if}} - {{#if event.hasOwnerInfo}} {{#if (eq session.currentRouteName 'public.index')}} - {{#scroll-to href='#owner' class='item'}} - {{t 'Owner'}} + {{#scroll-to href='#getting-here' class='item'}} + {{t 'Getting here'}} {{/scroll-to}} {{else}} - - {{t 'Owner'}} + + {{t 'Getting here'}} {{/if}} - {{/if}} - {{#if (eq session.currentRouteName 'public.index')}} - {{#scroll-to href='#getting-here' class='item'}} - {{t 'Getting here'}} - {{/scroll-to}} - {{else}} - - {{t 'Getting here'}} - - {{/if}} - {{#if event.codeOfConduct}} - {{#link-to 'public.coc' class='item'}} - {{t 'Code of Conduct'}} - {{/link-to}} - {{/if}} + {{#if event.codeOfConduct}} + {{#link-to 'public.coc' class='item'}} + {{t 'Code of Conduct'}} + {{/link-to}} + {{/if}} +
{{/if}} From 07103eb1480f83e547e2f163b4876a9bcf4e30d8 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Thu, 13 Feb 2020 15:15:12 +0530 Subject: [PATCH 2/6] Update side-menu.hbs --- app/templates/components/public/side-menu.hbs | 97 +++++++------------ 1 file changed, 34 insertions(+), 63 deletions(-) diff --git a/app/templates/components/public/side-menu.hbs b/app/templates/components/public/side-menu.hbs index 09fe6a1aa3b..c8300301991 100644 --- a/app/templates/components/public/side-menu.hbs +++ b/app/templates/components/public/side-menu.hbs @@ -1,34 +1,4 @@ {{#if (and (not-eq session.currentRouteName 'public.cfs.new-session') (not-eq session.currentRouteName 'public.cfs.new-speaker') (not-eq session.currentRouteName 'public.cfs.edit-speaker') (not-eq session.currentRouteName 'public.cfs.edit-session'))}} -
-
- {{#if (eq session.currentRouteName 'public.index')}} - {{#scroll-to href='#info' class='active item'}} - {{t 'Info'}} - {{/scroll-to}} - {{#if event.tickets.length}} - {{#scroll-to href='#tickets' class='item'}} - {{t 'Tickets'}} - {{/scroll-to}} - {{/if}} - {{#if event.speakers.length}} - {{#link-to 'public.speakers' class='item'}} - {{t 'Speakers'}} - {{/link-to}} - {{/if}} - {{else}} - - {{t 'Info'}} - - {{#if event.tickets.length}} - - {{t 'Tickets'}} - - {{/if}} - {{#if event.speakers.length}} - {{#link-to 'public.speakers' class='item'}} - {{t 'Speakers'}} - {{/link-to}} - {{/if}}
{{#if (eq session.currentRouteName 'public.index')}} @@ -39,50 +9,51 @@ {{t 'Tickets'}} {{/if}} - {{#if event.sessions.length}} - {{#link-to 'public.sessions' class='item'}} - {{t 'Sessions'}} + {{#if event.speakers.length}} + {{#link-to 'public.speakers' class='item'}} + {{t 'Speakers'}} {{/link-to}} {{/if}} - {{#if isSchedulePublished}} - {{#link-to 'public.schedule' class='item'}} - {{t 'Schedule'}} - {{/link-to}} - {{/if}} - {{#if shouldShowCallforSpeakers }} - {{#link-to 'public.cfs' class='item'}} - {{t 'Call for Speakers'}} - {{/link-to}} + {{else}} + + {{t 'Info'}} + + {{#if event.tickets.length}} + + {{t 'Tickets'}} + {{/if}} - {{#if event.hasOwnerInfo}} - {{#if (eq session.currentRouteName 'public.index')}} - {{#scroll-to href='#owner' class='item'}} - {{t 'Owner'}} - {{/scroll-to}} - {{else}} - - {{t 'Owner'}} - - {{/if}} + {{#if event.speakers.length}} + {{#link-to 'public.speakers' class='item'}} + {{t 'Speakers'}} + {{/link-to}} {{/if}} + {{/if}} + {{#if event.sessions.length}} + {{#link-to 'public.sessions' class='item'}} + {{t 'Sessions'}} + {{/link-to}} + {{/if}} + {{#if isSchedulePublished}} + {{#link-to 'public.schedule' class='item'}} + {{t 'Schedule'}} + {{/link-to}} + {{/if}} + {{#if shouldShowCallforSpeakers }} + {{#link-to 'public.cfs' class='item'}} + {{t 'Call for Speakers'}} + {{/link-to}} + {{/if}} + {{#if event.hasOwnerInfo}} {{#if (eq session.currentRouteName 'public.index')}} - {{#scroll-to href='#getting-here' class='item'}} - {{t 'Getting here'}} - {{/scroll-to}} {{t 'Owner'}} {{else}} - - {{t 'Getting here'}} + + {{t 'Owner'}} {{/if}} - {{#if event.codeOfConduct}} - {{#link-to 'public.coc' class='item'}} - {{t 'Code of Conduct'}} - {{/link-to}} - {{/if}} -
{{/if}} {{#if (eq session.currentRouteName 'public.index')}} From 7af0994d78ac8e18111fc9395de4d0f170bbe110 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Thu, 13 Feb 2020 15:53:20 +0530 Subject: [PATCH 3/6] remove {{ui-sticky}} and using `position:sticky` in place --- app/templates/public.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/public.hbs b/app/templates/public.hbs index 55cfa5fbb25..807f9697aa9 100644 --- a/app/templates/public.hbs +++ b/app/templates/public.hbs @@ -35,9 +35,9 @@ {{/if}} {{/if}} {{else}} - {{#ui-sticky context='#public-event-content' observeChanges=true}} +
{{public/side-menu event=model}} - {{/ui-sticky}} +
{{/if}}
From a5f4089eb054d6ed2fd824322c2bdc9ac5d6dc05 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Thu, 13 Feb 2020 16:34:23 +0530 Subject: [PATCH 4/6] Update public.scss --- app/styles/pages/public.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/styles/pages/public.scss b/app/styles/pages/public.scss index c1c1bc8404c..4ac575ddc10 100644 --- a/app/styles/pages/public.scss +++ b/app/styles/pages/public.scss @@ -2,3 +2,8 @@ height: 100vh; overflow: hidden !important; } + +.side-menu { + position: sticky; + top: 0; +} From 64afe103c3eff335b4be54bf8ec52377b725f24f Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Thu, 13 Feb 2020 16:35:22 +0530 Subject: [PATCH 5/6] Update public.hbs --- app/templates/public.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/public.hbs b/app/templates/public.hbs index 807f9697aa9..8027c13876f 100644 --- a/app/templates/public.hbs +++ b/app/templates/public.hbs @@ -35,7 +35,7 @@ {{/if}} {{/if}} {{else}} -
+
{{public/side-menu event=model}}
{{/if}} From 2380ce2a4a90ba096bdf2ba5d49ac0be674b4933 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Thu, 13 Feb 2020 23:55:35 +0530 Subject: [PATCH 6/6] setting position top:14px --- app/styles/pages/public.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/pages/public.scss b/app/styles/pages/public.scss index 4ac575ddc10..b0ea1631ae7 100644 --- a/app/styles/pages/public.scss +++ b/app/styles/pages/public.scss @@ -5,5 +5,5 @@ .side-menu { position: sticky; - top: 0; + top: 14px; }