diff --git a/funnel/assets/js/project.js b/funnel/assets/js/project.js index a691a6d1c..1ae41432a 100644 --- a/funnel/assets/js/project.js +++ b/funnel/assets/js/project.js @@ -84,7 +84,7 @@ const Ticketing = { }, initTicketModal() { - $('.open-ticket-widget').click((event) => { + $('.js-open-ticket-widget').click((event) => { event.preventDefault(); this.openTicketModal(); }); diff --git a/funnel/assets/js/util.js b/funnel/assets/js/util.js index 78c6f9de2..4fbf0b71a 100644 --- a/funnel/assets/js/util.js +++ b/funnel/assets/js/util.js @@ -137,7 +137,9 @@ export const Utils = { : $(this).find('.calendar__weekdays__dates--latest'); firstActiveWeek - .find('.calendar__weekdays__dates__date--showtime:first') + .find( + '.calendar__weekdays__dates__date--showtime.calendar__weekdays__dates__date--latest:first' + ) .addClass('calendar__weekdays__dates__date--display'); $(this) @@ -153,7 +155,9 @@ export const Utils = { .find('.calendar__weekdays__dates__date--showtime') .mouseleave(function () { firstActiveWeek - .find('.calendar__weekdays__dates__date--showtime:first') + .find( + '.calendar__weekdays__dates__date--showtime.calendar__weekdays__dates__date--latest:first' + ) .addClass('calendar__weekdays__dates__date--display'); }); @@ -161,7 +165,9 @@ export const Utils = { let nextEventElem = $(this) .find('.calendar__weekdays__dates--upcoming--first') .first() - .find('.calendar__weekdays__dates__date--active') + .find( + '.calendar__weekdays__dates__date--showtime.calendar__weekdays__dates__date--latest' + ) .first(); let eventDate = nextEventElem.data('event-date'); let eventMonth = nextEventElem.data('event-month'); @@ -425,29 +431,6 @@ export const ScrollActiveMenu = { } }); this.activeNavItem = ''; - - if (document.getElementById('ticket-wrapper')) { - const observer = new IntersectionObserver( - (entries) => { - entries.forEach((entry) => { - if ( - !entry.isIntersecting && - entry.intersectionRatio > 0.5 && - entry.boundingClientRect.y < 0 - ) { - $('#ticket-btn').addClass('sub-navbar__item--fixed'); - } else if (entry.isIntersecting && entry.intersectionRatio === 1) { - $('#ticket-btn').removeClass('sub-navbar__item--fixed'); - } - }); - }, - { - rootMargin: '0px', - threshold: 1, - } - ); - observer.observe(document.getElementById('ticket-wrapper')); - } }, handleObserver(entries) { diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css index de44c0878..f5f3078f8 100644 --- a/funnel/static/css/app.css +++ b/funnel/static/css/app.css @@ -938,8 +938,8 @@ a.loginbutton.hidden, } .mui-dropdown__menu--hg-link { - max-width: 105px; - min-width: 105px; + max-width: 125px; + min-width: 125px; z-index: 1003; overflow: hidden; margin-top: 0; @@ -1684,7 +1684,7 @@ a.loginbutton.hidden, position: sticky; top: 50px; order: 1; - z-index: 2; + z-index: 6; } .sub-navbar { @@ -3247,7 +3247,7 @@ a.loginbutton.hidden, .card--upcoming .card__body .card__body__bookmark { position: absolute; right: 16px; - top: 18px; + top: 16px; z-index: 4; line-height: 1; } @@ -3469,8 +3469,97 @@ a.loginbutton.hidden, border-bottom: 1px solid rgba(121, 129, 139, 0.48); } +.project-header { + display: flex; + align-items: center; + margin: 0; +} +.project-header .project-links, +.project-header .hg-link-btn { + padding-right: 16px; +} +.project-header .settings { + padding-left: 16px; +} +.project-header .hg-link-btn.hide { + display: none; +} +.project-header .mui-btn--nostyle + .mui-btn--nostyle { + margin: 0; +} + +.register-block { + display: flex; + align-items: center; + justify-content: space-between; +} +.register-block .register-block__txt { + font-size: 10px; + margin: 0 16px 0 0; +} +.register-block .register-block__right { + text-align: right; +} +.register-block .register-block__right__menu { + margin-left: 8px; +} + +@media (min-width: 360px) { + .register-block .register-block__txt { + font-size: 14px; + } +} +.project-footer { + position: fixed; + width: calc(100% - 32px); + bottom: 0; + padding: 16px; + box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.1); + background-color: #ffffff; + z-index: 1000; +} +.project-footer .mui-dropdown__menu { + top: -66px !important; + border-radius: 16px 16px 0px; +} + +@media (min-width: 768px) { + .project-footer { + display: none; + } +} +.sub-navbar-container__inner .desktop-navbar-items { + display: none; +} + +@media (min-width: 768px) { + .sub-navbar-container__inner { + display: flex; + justify-content: space-between; + align-items: center; + } + .sub-navbar-container__inner .sub-navbar { + max-width: calc(100% - 480px); + margin-left: 0; + } + .sub-navbar-container__inner .desktop-navbar-items { + display: flex; + min-width: 450px; + justify-content: flex-end; + align-items: center; + padding: 0 16px; + } + .sub-navbar-container__inner .desktop-navbar-items .project-header { + margin: 0 16px 0 0; + } +} +@media (min-width: 768px) { + .sub-navbar-container__inner .desktop-navbar-items { + justify-content: flex-end; + } +} .project-banner { - margin-top: 16px; + padding-top: 80px; } .project-banner .project-banner__profile-details { display: flex; @@ -3542,40 +3631,15 @@ a.loginbutton.hidden, margin: 0; display: block; } -.project-banner .project-banner__footer { - display: flex; - align-items: baseline; - margin: 16px 0 0; - padding: 0 16px; -} -.project-banner .project-banner__footer .bookmark { - padding-right: 8px; -} -.project-banner .project-banner__footer .bookmark a { - text-decoration: none !important; -} -.project-banner .project-banner__footer .hg-link-btn.hide { - display: none; -} -.project-banner .project-banner__footer .bookmark .txt, -.project-banner .project-banner__footer .bookmark .login-txt { - position: relative; - top: -2px; -} -.project-banner .project-banner__footer .bookmark .animate-btn { - height: 20px; -} -.project-banner .project-banner__footer .bookmark .animate-btn--animate { - -webkit-animation: none; - animation: none; -} -.project-banner .project-banner__footer .mui-btn--nostyle + .mui-btn--nostyle { - margin: 0; -} .project-banner .project-details__box { margin-top: 16px; position: relative; } +.project-banner .project-details__box .bookmark { + position: absolute; + right: 14px; + z-index: 3; +} .project-banner .project-details__box .card__calendar { padding: 0 16px 10px; margin: 0 0 25px; @@ -3639,14 +3703,15 @@ a.loginbutton.hidden, .project-banner .project-details__box .propose .propose-btn--strike:hover { text-decoration: line-through; } -.project-banner .project-details__box--ticketbox { +.project-banner .project-details__box__content { + min-height: 22px; margin-bottom: 16px; } -.project-banner .project-details__box--ticketbox .check-icon { - margin-right: 8px; -} @media (min-width: 768px) { + .project-banner { + padding-top: 35px; + } .project-banner .project-banner__box { padding: 0 16px; } @@ -3656,15 +3721,6 @@ a.loginbutton.hidden, .project-banner .project-banner__box .project-banner__box__add-btn--second { right: 60px; } - .project-banner .project-banner__footer { - padding: 0; - justify-content: unset; - } - .project-banner .project-banner__footer .bookmark, - .project-banner .project-banner__footer .project-links, - .project-banner .project-banner__footer .hg-link-btn { - padding-right: 24px !important; - } .project-banner .project-details__box .propose .propose__txt { font-size: 14px; } @@ -3718,7 +3774,7 @@ a.loginbutton.hidden, .project-banner .project-details__box--topmargin { margin-top: 42px; } - .project-banner .project-details__box--ticketbox { + .project-banner .project-details__box__content { margin-bottom: 0; } } @@ -3782,7 +3838,7 @@ a.loginbutton.hidden, @media (min-width: 768px) { .pinned { position: sticky; - top: 56px; + top: 128px; display: block; } } @@ -5417,6 +5473,9 @@ body > .proposal-box.ui-draggable { color: #4d5763; position: relative; } +.update .update__heading { + float: left; +} .update .update__action-btn { float: right; } @@ -5451,11 +5510,6 @@ body > .proposal-box.ui-draggable { } } @media (min-width: 768px) { - .pinned { - top: 110px; - margin-bottom: -10px; - } - .update { padding: 32px 16px; margin-bottom: 16px; @@ -5463,9 +5517,6 @@ body > .proposal-box.ui-draggable { border: solid 1px rgba(121, 129, 139, 0.16); background-color: #f9f9f9; } - .update .update__heading { - float: left; - } .update .update__action-btn { position: static; } diff --git a/funnel/static/sass/_card.scss b/funnel/static/sass/_card.scss index a863f3582..e6803c284 100644 --- a/funnel/static/sass/_card.scss +++ b/funnel/static/sass/_card.scss @@ -473,7 +473,7 @@ .card__body__bookmark { position: absolute; right: $mui-grid-padding; - top: 18px; + top: $mui-grid-padding; z-index: 4; line-height: 1; } diff --git a/funnel/static/sass/_header.scss b/funnel/static/sass/_header.scss index 2f9a248f4..ffbcc802a 100644 --- a/funnel/static/sass/_header.scss +++ b/funnel/static/sass/_header.scss @@ -519,7 +519,7 @@ position: sticky; top: 50px; order: 1; - z-index: 2; + z-index: 6; } .sub-navbar { diff --git a/funnel/static/sass/_layout.scss b/funnel/static/sass/_layout.scss index c230af4f2..86ffa1cc9 100644 --- a/funnel/static/sass/_layout.scss +++ b/funnel/static/sass/_layout.scss @@ -1016,8 +1016,8 @@ a.loginbutton.hidden, } .mui-dropdown__menu--hg-link { - max-width: 105px; - min-width: 105px; + max-width: 125px; + min-width: 125px; z-index: 1003; overflow: hidden; margin-top: 0; diff --git a/funnel/static/sass/_project.scss b/funnel/static/sass/_project.scss index 973b78289..93f078bba 100644 --- a/funnel/static/sass/_project.scss +++ b/funnel/static/sass/_project.scss @@ -3,8 +3,109 @@ padding: $mui-grid-padding/2 0; border-bottom: 1px solid rgba(121, 129, 139, 0.48); } + +.project-header { + display: flex; + align-items: center; + margin: 0; + .project-links, + .hg-link-btn { + padding-right: $mui-grid-padding; + } + .settings { + padding-left: $mui-grid-padding; + } + .hg-link-btn.hide { + display: none; + } + .mui-btn--nostyle + .mui-btn--nostyle { + margin: 0; + } +} + +.register-block { + display: flex; + align-items: center; + justify-content: space-between; + .register-block__txt { + font-size: 10px; + margin: 0 $mui-grid-padding 0 0; + } + .register-block__right { + text-align: right; + } + .register-block__right__menu { + margin-left: $mui-grid-padding/2; + } +} + +@media (min-width: 360px) { + .register-block { + .register-block__txt { + font-size: 14px; + } + } +} + +.project-footer { + position: fixed; + width: calc(100% - 32px); + bottom: 0; + padding: 16px; + box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.1); + background-color: #ffffff; + z-index: 1000; + + .mui-dropdown__menu { + top: -66px !important; + border-radius: 16px 16px 0px; + } +} + +@media (min-width: 768px) { + .project-footer { + display: none; + } +} + +.sub-navbar-container__inner { + .desktop-navbar-items { + display: none; + } +} + +@media (min-width: 768px) { + .sub-navbar-container__inner { + display: flex; + justify-content: space-between; + align-items: center; + .sub-navbar { + max-width: calc(100% - 480px); + margin-left: 0; + } + .desktop-navbar-items { + display: flex; + min-width: 450px; + justify-content: flex-end; + align-items: center; + padding: 0 $mui-grid-padding; + .project-header { + margin: 0 $mui-grid-padding 0 0; + } + } + } +} + +@media (min-width: 768px) { + .sub-navbar-container__inner { + .desktop-navbar-items { + justify-content: flex-end; + } + } +} + .project-banner { - margin-top: $mui-grid-padding; + padding-top: 80px; .project-banner__profile-details { display: flex; @@ -80,44 +181,16 @@ } } - .project-banner__footer { - display: flex; - align-items: baseline; - margin: $mui-grid-padding 0 0; - padding: 0 $mui-grid-padding; - - .bookmark { - padding-right: 8px; - a { - text-decoration: none !important; - } - } - .hg-link-btn.hide { - display: none; - } - .bookmark { - .txt, - .login-txt { - position: relative; - top: -2px; - } - .animate-btn { - height: 20px; - } - .animate-btn--animate { - -webkit-animation: none; - animation: none; - } - } - .mui-btn--nostyle + .mui-btn--nostyle { - margin: 0; - } - } - .project-details__box { margin-top: $mui-grid-padding; position: relative; + .bookmark { + position: absolute; + right: 14px; + z-index: 3; + } + .card__calendar { padding: 0 $mui-grid-padding 10px; margin: 0 0 25px; @@ -163,16 +236,16 @@ } } } - .project-details__box--ticketbox { + .project-details__box__content { + min-height: 22px; margin-bottom: $mui-grid-padding; - .check-icon { - margin-right: 8px; - } } } @media (min-width: 768px) { .project-banner { + padding-top: 35px; + .project-banner__box { padding: 0 $mui-grid-padding; .project-banner__box__add-btn { @@ -182,15 +255,6 @@ right: 60px; } } - .project-banner__footer { - padding: 0; - justify-content: unset; - .bookmark, - .project-links, - .hg-link-btn { - padding-right: 24px !important; - } - } .project-details__box { .propose { .propose__txt { @@ -251,7 +315,7 @@ .project-details__box--topmargin { margin-top: 42px; } - .project-details__box--ticketbox { + .project-details__box__content { margin-bottom: 0; } } @@ -322,7 +386,7 @@ @media (min-width: 768px) { .pinned { position: sticky; - top: 56px; + top: 128px; display: block; } } diff --git a/funnel/static/sass/_update.scss b/funnel/static/sass/_update.scss index c85a2fa61..d99bbe6b2 100644 --- a/funnel/static/sass/_update.scss +++ b/funnel/static/sass/_update.scss @@ -8,6 +8,10 @@ color: $mui-text-light; position: relative; + .update__heading { + float: left; + } + .update__action-btn { float: right; } @@ -54,19 +58,12 @@ } @media (min-width: 768px) { - .pinned { - top: 110px; - margin-bottom: -10px; - } .update { padding: $mui-grid-padding-double $mui-grid-padding; margin-bottom: $mui-grid-padding; border-radius: 16px; border: solid 1px rgba(121, 129, 139, 0.16); background-color: $mui-bg-color-accent; - .update__heading { - float: left; - } .update__action-btn { position: static; } diff --git a/funnel/static/translations/hi_IN/messages.json b/funnel/static/translations/hi_IN/messages.json index cbcb2fd7b..04e808a26 100644 --- a/funnel/static/translations/hi_IN/messages.json +++ b/funnel/static/translations/hi_IN/messages.json @@ -1281,16 +1281,21 @@ "Don’t have an account?": [null, "अकाउंट नहीं है?"], "Sign up with email": [null, "ईमेल के ज़रिए साइन अप करें"], "Logging out…": [null, "लॉग आउट हो रहा है…"], - "to save": [null, "सेव करने के लिए"], - "Save this project": [null, "इस प्रोजेक्ट को सेव करें"], - "Unsave this project": [null, "इस प्रोजेक्ट को सेव से हटाएँ"], - "Unsave": [null, "सेव से हटाएँ "], "Copy link": [null, "लिंक कॉपी करें"], "Facebook": [null, "Facebook"], - "Share": [null, "साझा करें"], - "Add to calendar": [null, "कैलेंडर में जोड़ें"], "Update livestream URLs": [null, "लाइवस्ट्रीम URLs को बदलें"], "Update banner image": [null, "बैनर इमेज को बदलें"], + "Tickets available!": [null, ""], + "Get tickets": [null, "टिकट पाएं"], + "Register": [null, "रजिस्टर करें"], + "This will share your name and email address with the project’s crew so they can keep you updated. You can cancel your registration at any time.": [ + null, + "इसे करने से आपके नाम और ईमेल पते को प्रोजेक्ट के दल के सदस्यों के साथ साझा किया जाएगा ताकि आपको इससे जुड़ी जानकारियों से अवगत रख सकें. आप किसी भी समय अपना रजिस्ट्रेशन रद्द कर सकते हैं." + ], + "Cancel registration": [null, "रजिस्ट्रेशन रद्द करें"], + "Can’t make it?": [null, "आप मदद नहीं कर सकते?"], + "Confirm cancellation": [null, "रद्द करने की पुष्टि करें"], + "View participants": [null, "प्रतिभागियों को देखें"], "This project will not be listed as it has no sessions in the schedule": [ null, "इस प्रोजेक्ट को सूचीबद्ध नहीं किया जाएगा क्योंकि इसके समय-सूची में कोई सेशन मौजूद नहीं है" @@ -1302,20 +1307,11 @@ "Edit url": [null, "URL संपादित करें"], "Livestream": [null, "लाइवस्ट्रीम"], "Preview video": [null, "प्रीव्यू वीडियो"], - "Get tickets": [null, "टिकट पाएं"], - "Register": [null, "रजिस्टर करें"], - "This will share your name and email address with the project’s crew so they can keep you updated. You can cancel your registration at any time.": [ - null, - "इसे करने से आपके नाम और ईमेल पते को प्रोजेक्ट के दल के सदस्यों के साथ साझा किया जाएगा ताकि आपको इससे जुड़ी जानकारियों से अवगत रख सकें. आप किसी भी समय अपना रजिस्ट्रेशन रद्द कर सकते हैं." - ], - "Cancel registration": [null, "रजिस्ट्रेशन रद्द करें"], - "Can’t make it?": [null, "आप मदद नहीं कर सकते?"], - "Confirm cancellation": [null, "रद्द करने की पुष्टि करें"], - "View participants": [null, "प्रतिभागियों को देखें"], "Add schedule to enable registrations": [ null, "रजिस्ट्रेशन शुरू करने के लिए समय-सूची जोड़ें" ], + "Add schedule": [null, ""], "Make a submission": [null, "एक सबमिशन भेजें"], "Submissions close at %(date)s": [ null, @@ -1332,12 +1328,10 @@ ], "Add venue": [null, "ईवेंट का स्थान जोड़ें"], "About": [null, "परिचय"], - "Sessions": [null, "सेशन"], "Jobs": [null, "नौकरियां"], "Comments": [null, "कमेंट"], "Submissions": [null, "सबमिशन"], "Schedule": [null, "कार्यक्रम"], - "Settings": [null, "सेटिंग्स"], "This update is for participants only": [ null, "यह जानकारी केवल प्रतिभागियों के लिए है" @@ -1395,6 +1389,7 @@ ], "Joined %(date)s": [null, "%(date)s को जुड़े"], "Admins": [null, "एडमिन"], + "Sessions": [null, "सेशन"], "Projects": [null, "प्रोजेक्ट"], "Tickets": [null, "टिकटें"], "Attend": [null, "हिस्सा लें"], @@ -1486,6 +1481,7 @@ "Edit details": [null, "विवरण संपादित करें"], "Related events": [null, "सम्बंधित ईवेंट"], "View Schedule": [null, "कार्यक्रम देखें"], + "Videos": [null, "वीडियो"], "See all": [null, "सारे देखें"], "Related jobs": [null, "सम्बंधित नौकरियां"], "Update venue": [null, "ईवेंट का स्थान अपडेट करें"], @@ -1567,12 +1563,12 @@ "Select date": [null, "डेट चुनें"], "Select a date to add sessions": [null, "सेशन जोड़ने के लिए डेट चुनें"], "Unscheduled proposals": [null, ""], + "Settings": [null, "सेटिंग्स"], "Revert": [null, "वापस करें"], "Save session": [null, "सेशन सेव करें"], "Subscribe to the schedule": [null, "कार्यक्रम को सूचीपत्र में जोड़ें"], "Download": [null, "डाउनलोड करें"], "Add to Google Calendar": [null, "Google Calendar में जोड़ें"], - "Videos": [null, "वीडियो"], "This session has not been scheduled yet.": [ null, "इस सेशन की समय-सूची अभी नहीं बनाई गई है." @@ -1669,6 +1665,7 @@ "edited %s": [null, ""], "Reply": [null, ""], "Report": [null, ""], + "Share": [null, "साझा करें"], "More": [null, ""], "Show badge": [null, ""], "Show label badge": [null, ""], diff --git a/funnel/templates/js/comments.js.jinja2 b/funnel/templates/js/comments.js.jinja2 index d52b234fb..1b39231f1 100644 --- a/funnel/templates/js/comments.js.jinja2 +++ b/funnel/templates/js/comments.js.jinja2 @@ -78,7 +78,7 @@ {{ gettext('Reply') }} {{ gettext('Report') }}
- {{ gettext('Share') }} + {{ gettext('Share') }}
diff --git a/funnel/templates/js/update.js.jinja2 b/funnel/templates/js/update.js.jinja2 index c67b3dcd1..6fcd40c01 100644 --- a/funnel/templates/js/update.js.jinja2 +++ b/funnel/templates/js/update.js.jinja2 @@ -29,7 +29,7 @@
- +
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2 index 54575b5bd..b59562322 100644 --- a/funnel/templates/macros.html.jinja2 +++ b/funnel/templates/macros.html.jinja2 @@ -43,7 +43,7 @@ {% if event.previous %}{{ faicon(icon='chevron-left', baseline=false, css_class='calendar__weekdays__dates__icon__next') }}{% endif %}

{% for date in week.dates %} -

0 %} data-event-date="{{ date.isoformat }}" {% endif %} data-event-month="{{ week.month }}"> +

0 %} data-event-date="{{ date.isoformat }}" {% endif %} data-event-month="{{ week.month }}"> {{ date.day }} {{ calendar.days[loop.index-1] }} {% if date.day_start_at %}{{ date.day_start_at }} – {{ date.day_end_at }}{% endif %} @@ -59,24 +59,24 @@

{% endmacro %} -{% macro saveprojectform(project, formid='save-form', txt=false) %} +{% macro saveprojectform(project, formid='save-form') %}
{{ current_view.SavedProjectForm().hidden_tag() }} -

+

{%- if current_auth.is_anonymous %} - {{ faicon(icon='bookmark', baseline=true, css_class='mui--text-light') }}{% trans %}Login{% endtrans %} {% trans %}to save{% endtrans %} + {{ faicon(icon='bookmark', icon_size='title', baseline=true, css_class='mui--text-light') }} {%- else %} - - + {%- endif %} -

+
{% endmacro %} -{% macro share_dropdown(url, title) %} -