From 35ac4fcc74117524ef8b4ae7ac5e4a877e50d900 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 22 Jan 2021 13:39:20 +0530
Subject: [PATCH 01/11] new project header and navbar design

---
 funnel/static/css/app.css             | 146 +++++++++++-------
 funnel/static/sass/_card.scss         |   2 +-
 funnel/static/sass/_header.scss       |   2 +-
 funnel/static/sass/_project.scss      | 150 +++++++++++++------
 funnel/static/sass/_update.scss       |   4 -
 funnel/templates/macros.html.jinja2   | 203 ++++++++++++++------------
 funnel/templates/project.html.jinja2  |  39 ++++-
 funnel/templates/proposal.html.jinja2 |   2 +-
 8 files changed, 342 insertions(+), 206 deletions(-)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index de44c0878..15d8a2378 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -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,91 @@ a.loginbutton.hidden,
   border-bottom: 1px solid rgba(121, 129, 139, 0.48);
 }
 
+.project-header {
+  display: flex;
+  align-items: center;
+  margin: 0;
+  padding: 0 0 0 16px;
+}
+.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: baseline;
+  justify-content: space-between;
+}
+.register-block .register-block__txt {
+  margin: 0 16px 0 0;
+}
+.register-block .register-block__right {
+  min-width: 155px;
+}
+.register-block .register-block__right__btn {
+  margin-right: 8px;
+}
+
+.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: space-around;
+    align-items: center;
+  }
+  .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 +3625,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;
@@ -3642,11 +3700,11 @@ a.loginbutton.hidden,
 .project-banner .project-details__box--ticketbox {
   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 +3714,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;
   }
@@ -3782,7 +3831,7 @@ a.loginbutton.hidden,
 @media (min-width: 768px) {
   .pinned {
     position: sticky;
-    top: 56px;
+    top: 128px;
     display: block;
   }
 }
@@ -5451,11 +5500,6 @@ body > .proposal-box.ui-draggable {
   }
 }
 @media (min-width: 768px) {
-  .pinned {
-    top: 110px;
-    margin-bottom: -10px;
-  }
-
   .update {
     padding: 32px 16px;
     margin-bottom: 16px;
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/_project.scss b/funnel/static/sass/_project.scss
index 973b78289..f94c502f6 100644
--- a/funnel/static/sass/_project.scss
+++ b/funnel/static/sass/_project.scss
@@ -3,8 +3,100 @@
   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;
+  padding: 0 0 0 $mui-grid-padding;
+  .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: baseline;
+  justify-content: space-between;
+  .register-block__txt {
+    margin: 0 $mui-grid-padding 0 0;
+  }
+
+  .register-block__right {
+    min-width: 155px;
+  }
+  .register-block__right__btn {
+    margin-right: $mui-grid-padding/2;
+  }
+}
+
+.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: space-around;
+      align-items: center;
+      .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: $mui-grid-padding;
+  padding-top: 80px;
 
   .project-banner__profile-details {
     display: flex;
@@ -80,44 +172,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;
@@ -165,14 +229,13 @@
   }
   .project-details__box--ticketbox {
     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 +245,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 {
@@ -322,7 +376,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..2d8cc0294 100644
--- a/funnel/static/sass/_update.scss
+++ b/funnel/static/sass/_update.scss
@@ -54,10 +54,6 @@
 }
 
 @media (min-width: 768px) {
-  .pinned {
-    top: 110px;
-    margin-bottom: -10px;
-  }
   .update {
     padding: $mui-grid-padding-double $mui-grid-padding;
     margin-bottom: $mui-grid-padding;
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index 54575b5bd..5d1278d36 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -59,24 +59,24 @@
   </div>
 {% endmacro %}
 
-{% macro saveprojectform(project, formid='save-form', txt=false) %}
+{% macro saveprojectform(project, formid='save-form') %}
   <form id={{formid}} class="js-save-form" action="{{ project.url_for('save') }}" method="POST">
     {{ current_view.SavedProjectForm().hidden_tag() }}
-    <p class="no-jshidden zero-bottom-margin">
+    <div class="no-jshidden zero-bottom-margin">
       {%- if current_auth.is_anonymous %}
-        <a class="mui--text-light link-icon"  href="{{ url_for('login') }}" data-ga="Login to save project">{{ faicon(icon='bookmark', baseline=true, css_class='mui--text-light') }}{% trans %}Login{% endtrans %} <span class="mui--hidden-xs mui--hidden-sm">{% trans %}to save{% endtrans %}</span></a>
+        <a class="mui--text-light"  href="{{ url_for('login') }}" data-ga="Login to save project">{{ faicon(icon='bookmark', icon_size='title', baseline=true, css_class='mui--text-light') }}</a>
       {%- else %}
         <input type="hidden" name="save" value="">
-        <button type="submit" value="true" class="link-icon mui-btn mui-btn--nostyle animate-btn {% if not project.is_saved_by(current_auth.user) %} animate-btn--show {% endif %}" data-ga="Save this project" onclick="this.form.save.value=this.value" data-cy="bookmark">{% if txt %}<span class="mui--text-light txt">{{ faicon(icon='bookmark', baseline=true, css_class='mui--text-light') }}<span class="mui--hidden-xs mui--hidden-sm">{% trans %}Save this project{% endtrans %}</span><span class="mui--visible-xs-inline mui--visible-sm-inline">{% trans %}Save{% endtrans %}</span>{% endif %}
+        <button type="submit" value="true" class="mui-btn mui-btn--nostyle animate-btn {% if not project.is_saved_by(current_auth.user) %} animate-btn--show {% endif %}" data-ga="Save this project" onclick="this.form.save.value=this.value" data-cy="bookmark">{{ faicon(icon='bookmark', baseline=true, css_class='mui--text-light') }}
         </button>
-        <button type="submit" value="false" class="link-icon mui-btn mui-btn--nostyle animate-btn animate-btn--saved{% if project.is_saved_by(current_auth.user) %} animate-btn--show {% endif %}" data-ga="Unsave this project" onclick="this.form.save.value=this.value" data-cy="bookmarked">{% if txt %}<span class="mui--text-light txt">{{ faicon(icon='bookmark-solid', baseline=true, css_class='bookmarked') }}<span class="mui--hidden-xs mui--hidden-sm">{% trans %}Unsave this project{% endtrans %}</span><span class="mui--visible-xs-inline mui--visible-sm-inline">{% trans %}Unsave{% endtrans %}</span>{% endif %}</button>
+        <button type="submit" value="false" class="mui-btn mui-btn--nostyle animate-btn animate-btn--saved{% if project.is_saved_by(current_auth.user) %} animate-btn--show {% endif %}" data-ga="Unsave this project" onclick="this.form.save.value=this.value" data-cy="bookmarked">{{ faicon(icon='bookmark-solid', baseline=true, css_class='bookmarked') }}</button>
       {%- endif %}
-    </p>
+    </div>
   </form>
 {% endmacro %}
 
-{% macro share_dropdown(url, title) %}
-  <ul class="mui-dropdown__menu mui-dropdown__menu--hg-link" data-cy="share-dropdown">
+{% macro share_dropdown(url, title, css_class='') %}
+  <ul class="mui-dropdown__menu mui-dropdown__menu--right mui-dropdown__menu--hg-link {% if css_class %}{{ css_class }}{%- endif %}" data-cy="share-dropdown">
     <li><a class="mui--text-body2 js-copy-link" href="javascript:void(0)" data-ga="Copy link to share">{{ faicon(icon='copy', baseline=true, css_class='mui--text-light fa-icon--margin') }}{% trans %}Copy link{% endtrans %}<span class="js-copy-url">{{ url}}?utm_campaign=webshare</span></a></li>
     <li><a class="mui--text-body2" href="mailto:?subject={{ title }}&amp;body={{ url }}&amp;utm_campaign=share-email" data-ga="Email">{{ faicon(icon='envelope', baseline=true, css_class='mui--text-light fa-icon--margin') }}{% trans %}Email{% endtrans %}</a></li>
     <li><a class="mui--text-body2" target="_blank" rel="noopener" href="//twitter.com/share?url={{ url }}&amp;via=Hasgeek&amp;text={{ title }}&amp;utm_campaign=share-twitter" data-url="{{ url }}" data-via="Hasgeek" data-text="{{ title }}" data-ga="Tweet">{{ faicon(icon='twitter-square', baseline=true, css_class='mui--text-light fa-icon--margin') }}{% trans %}Twitter{% endtrans %}</a></li>
@@ -86,16 +86,18 @@
 {% endmacro %}
 
 {% macro project_share(project) %}
-  <div class="project-banner__footer">
-    <div class="bookmark">{{ saveprojectform(project, txt=true) }}</div>
+  <div class="project-header">
     <div class="mui-dropdown">
-      <a href="javascript:void(0)" class="link-icon project-links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project"><span class="mui--text-light txt">{{ faicon(icon='share-alt-square', baseline=true, css_class='mui--text-light') }}{% trans %}Share{% endtrans %}</span></a>
+      <a href="javascript:void(0)" class="project-links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project">{{ faicon(icon='share-alt-square', baseline=true, icon_size='title', css_class='mui--text-light') }}</a>
       {{ share_dropdown(project.url_for(_external=true), project.title) }}
     </div>
-    <a href="javascript:void(0)" class="link-icon hg-link-btn mui--hide" data-url="{{ project.url_for(_external=true) }}?utm_campaign=webshare"><span class=" mui--text-light txt">{{ faicon(icon='share-alt', baseline=true, css_class='mui--text-light') }}{% trans %}Share{% endtrans %}</span></a>
+    <a href="javascript:void(0)" class="hg-link-btn mui--hide" data-url="{{ project.url_for(_external=true) }}?utm_campaign=webshare">{{ faicon(icon='share-alt', baseline=true, icon_size='title', css_class='mui--text-light') }}</a>
     {% if project.schedule_state.PUBLISHED %}
-      <a class="link-icon add-calendar" aria-label="Add to calendar" href="{{ project.url_for('subscribe_schedule') }}" rel="modal:open" aria-label="Add to calendar" data-ga="Add to calendar" data-cy="add-to-calendar"><span class="mui--text-light txt">{{ faicon(icon='calendar-plus', baseline=true, css_class='mui--text-light') }}{% trans %}Add to calendar{% endtrans %}</span></a>
+      <a class="add-calendar" href="{{ project.url_for('subscribe_schedule') }}" rel="modal:open" aria-label="Add to calendar" data-ga="Add to calendar" data-cy="add-to-calendar">{{ faicon(icon='calendar-plus', baseline=true, icon_size='title', css_class='mui--text-light') }}</a>
     {% endif %}
+    {%- if project.current_roles.editor or project.current_roles.concierge or project.current_roles.usher -%}
+      <a class="settings" href="{{ project.url_for('settings') }}" data-cy-navbar="settings" data-ga="project settings">{{ faicon(icon='cog', baseline=true, icon_size='title', css_class='mui--text-light') }}</a>
+    {%- endif %}
   </div>
 {% endmacro %}
 
@@ -111,6 +113,73 @@
   {% endif %}
 {% endmacro %}
 
+{% macro registerblock(project, modalid='mob-register-modal') %}
+  <div class="register-block">
+    {% if project.features.tickets()  %}
+      <div class="mui--text-center">
+        <a href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#tickets" class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" id="get-tickets">{% trans %}Get tickets{% endtrans %}</a>
+      </div>
+    {% elif project.features.rsvp() %}
+      {%- if current_auth.is_anonymous %}
+        <p class="register-block__txt mui--text-body2 mui--text-light">{{ project.views.registration_text() }}</p>
+        <a class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin"  href="{{ url_for('login') }}">Login to register</a>
+      {% elif project.features.rsvp_unregistered() -%}
+        <p class="register-block__txt mui--text-body2 mui--text-light">{{ project.views.registration_text() }}</p>
+      {%- elif project.features.rsvp_registered() %}
+        <p class="register-block__txt mui--text-body2 mui--text-light">{{ project.views.registration_text() }}{{ faicon(icon='check-circle-solid', baseline=true, css_class='mui--text-success fa-icon--left-margin') }}</p>
+      {%- endif %}
+      <div {% if not current_auth.is_anonymous and project.features.rsvp_unregistered() -%}class="register-block__right"{%- endif %}>
+        {% if not current_auth.is_anonymous and project.features.rsvp_unregistered() -%}
+          <a class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin register-block__right__btn" href="#{{modalid}}-register-modal" id="register-btn">{% trans %}Register{% endtrans %}</a>
+          <div class="modal reg-modal" id="{{modalid}}-register-modal">
+            <div class="modal__header">
+              <a class="modal__close mui--text-dark" href="javascript:void(0);" data-target="close cancel register modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close">{{ faicon(icon='times', icon_size='title') }}</a>
+              <p class="mui--text-title mui--text-bold mui--text-dark reg-modal__txt">{{ project.title }}</p>
+            </div>
+            <div class="modal__body">
+              <p class="mui--text-body2 reg-modal__txt">{% trans %}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.{% endtrans %}</p>
+              <form action="{{ project.url_for('register') }}" method="post" class="form-inline">
+                {{ csrf_tag() }}
+                <div class="mui--text-right modal__body__btn">
+                  <button class="mui-btn mui-btn--flat mui-btn--primary" type="submit" name="submit" value="yes" data-cy="confirm">{% trans %}Confirm{% endtrans %}</button>
+                </div>
+              </form>
+            </div>
+          </div>
+        {%- endif %}
+        {% if project.features.rsvp_registered() or project.view_for('rsvp_list').is_available() %}
+          <div class="mui-dropdown mui--align-middle">
+            <a href="javascript:void(0)" class="mui--align-middle" data-mui-toggle="dropdown">{{ faicon(icon='ellipsis-v', icon_size='subhead') }}</a>
+            <ul class="mui-dropdown__menu mui-dropdown__menu--right">
+              {% if project.features.rsvp_registered() %}
+                <li><a class="mui--text-body2" href="#{{modalid}}-register-modal" id="register-btn">{% trans %}Cancel registration{% endtrans %}</a></li>
+                <div class="modal reg-modal" id="{{modalid}}-register-modal">
+                  <div class="modal__header">
+                    <a class="modal__close mui--text-dark" href="javascript:void(0);" data-target="close cancel register modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close">{{ faicon(icon='times', icon_size='title') }}</a>
+                    <p class="mui--text-title mui--text-bold mui--text-dark reg-modal__txt">{{ project.title }}</p>
+                  </div>
+                  <div class="modal__body">
+                    <p class="mui--text-subhead reg-modal__txt">{% trans %}Can’t make it?{% endtrans %}</p>
+                    <form action="{{ project.url_for('deregister') }}" method="post" class="form-inline">
+                      {{ csrf_tag() }}
+                      <div class="mui--text-right modal__body__btn">
+                        <button class="mui-btn mui-btn--flat mui-btn--primary" type="submit" name="submit" value="no">{% trans %}Confirm cancellation{% endtrans %}</button>
+                      </div>
+                    </form>
+                  </div>
+                </div>
+              {% endif %}
+              {% if project.view_for('rsvp_list').is_available() %}
+                <li><a class="mui--text-body2" href="{{ project.url_for('rsvp_list') }}" data-cy="see-responses">{% trans %}View participants{% endtrans %}</a></li>
+              {% endif %}
+            </ul>
+          </div>
+        {% endif %}
+      </div>
+    {% endif %}
+  </div>
+{% endmacro %}
+
 {% macro project_header(project, class='', current_page='project', pinned=true) %}
   <div class="mui-container project-banner {% if class %}{{ class }}{% endif %}">
     <div class="grid">
@@ -166,7 +235,6 @@
               </div>
             </div>
           {%- endfor %}
-          {{ project_share(project) }}
         </div>
       {% else %}
         <div class="grid__col-sm-12 grid__col-md-8 project-banner__box">
@@ -186,66 +254,18 @@
               <img class="project-banner__box__image" src="{{ url_for('static', filename='img/default-banner.png') }}"/>
             {% endif %}
           </div>
-          {{ project_share(project) }}
         </div>
       {% endif %}
       <div class="grid__col-md-4 project-details__box {% if project.livestream_urls %}project-details__box--topmargin{% endif %}">
+        <div class="bookmark">{{ saveprojectform(project) }}</div>
         {% if project.schedule_state.PUBLISHED and project.calendar_weeks_full.weeks and project.calendar_weeks_full.weeks|length > 0 %}
           <div aria-label="{{ project.datelocation }}">
             {{ calendarwidget(project.calendar_weeks_full, compact=false) }}
           </div>
         {% endif %}
         <div class="project-details__box--ticketbox">
-          {% if project.features.tickets()  %}
-            <div class="mui--hidden-xs mui--hidden-sm">
-              <a href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#tickets" class="mui-btn mui-btn--raised mui-btn--primary mui--d-block {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" id="get-tickets">{% trans %}Get tickets{% endtrans %}</a>
-            </div>
-          {% elif project.features.rsvp() %}
-            {%- if current_auth.is_anonymous %}
-              <p class="mui--text-body2 mui--text-light">{{ project.views.registration_text() }}</p>
-              <a class="mui-btn mui-btn--raised mui-btn--primary  mui--d-block"  href="{{ url_for('login') }}">Login to register</a>
-            {% elif project.features.rsvp_unregistered() -%}
-              <p class="mui--text-body2 mui--text-light">{{ project.views.registration_text() }}</p>
-              <a class="mui-btn mui-btn--raised mui-btn--primary  mui--d-block" href="#register-modal" id="register-btn">{% trans %}Register{% endtrans %}</a>
-              <div class="modal reg-modal" id="register-modal">
-                <div class="modal__header">
-                  <a class="modal__close mui--text-dark" href="javascript:void(0);" data-target="close cancel register modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close">{{ faicon(icon='times', icon_size='title') }}</a>
-                  <p class="mui--text-title mui--text-bold mui--text-dark reg-modal__txt">{{ project.title }}</p>
-                </div>
-                <div class="modal__body">
-                  <p class="mui--text-body2 reg-modal__txt">{% trans %}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.{% endtrans %}</p>
-                  <form action="{{ project.url_for('register') }}" method="post" class="form-inline">
-                    {{ csrf_tag() }}
-                    <div class="mui--text-right modal__body__btn">
-                      <button class="mui-btn mui-btn--flat mui-btn--primary" type="submit" name="submit" value="yes" data-cy="confirm">{% trans %}Confirm{% endtrans %}</button>
-                    </div>
-                  </form>
-                </div>
-              </div>
-            {%- elif project.features.rsvp_registered() %}
-              <p class="mui--text-body2 mui--text-light">{{ faicon(icon='check', baseline=false, css_class='mui--align-middle mui--text-success check-icon') }}{{ project.views.registration_text() }}</p>
-              <a class="mui-btn mui-btn--raised mui--d-block" href="#register-modal" id="register-btn">{% trans %}Cancel registration{% endtrans %}</a>
-              <div class="modal reg-modal" id="register-modal">
-                <div class="modal__header">
-                  <a class="modal__close mui--text-dark" href="javascript:void(0);" data-target="close cancel register modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close">{{ faicon(icon='times', icon_size='title') }}</a>
-                  <p class="mui--text-title mui--text-bold mui--text-dark reg-modal__txt">{{ project.title }}</p>
-                </div>
-                <div class="modal__body">
-                  <p class="mui--text-subhead reg-modal__txt">{% trans %}Can’t make it?{% endtrans %}</p>
-                  <form action="{{ project.url_for('deregister') }}" method="post" class="form-inline">
-                    {{ csrf_tag() }}
-                    <div class="mui--text-right modal__body__btn">
-                      <button class="mui-btn mui-btn--flat mui-btn--primary" type="submit" name="submit" value="no">{% trans %}Confirm cancellation{% endtrans %}</button>
-                    </div>
-                  </form>
-                </div>
-              </div>
-            {%- endif %}
-            {% if project.view_for('rsvp_list').is_available() %}
-              <a href="{{ project.url_for('rsvp_list') }}" class="mui--d-block mui--text-center" data-cy="see-responses">{% trans %}View participants{% endtrans %}</a>
-            {% endif %}
-          {% elif project.view_for('edit_schedule').is_available() %}
-            <a class="mui-btn mui-btn--raised mui-btn--dark  mui--d-block" href="{{ project.url_for('edit_schedule') }}">{% trans %}Add schedule to enable registrations{% endtrans %}</a>
+          {% if project.view_for('edit_schedule').is_available() %}
+            <a class="mui-btn mui-btn--raised mui-btn--dark  mui--d-block" href="{{ project.url_for('edit_schedule') }}"><span class="mui--hidden-lg">{% trans %}Add schedule to enable registrations{% endtrans %}</span><span class="mui--visible-lg-inline">{% trans %}Add schedule{% endtrans %}</span></a>
           {%- endif %}
           {% if project.cfp_state.OPEN -%}
             <hr class="mui-divider">
@@ -281,36 +301,27 @@
     </div>
   </div>
   <div class="sub-navbar-container sub-navbar-container--sticky mui--bg-accent {% if class %}{{ class }}{% endif %}">
-    <nav class="sub-navbar mui-container" id="page-navbar">
-      <a class="sub-navbar__item mui--text-subhead mui--text-light mui--hidden-xs mui--hidden-sm {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#about" data-cy-navbar="about">{% trans %}About{% endtrans %}</a>
-      {% if project.features.tickets() -%}
-        <div class="sub-navbar__item--wrapper" id="ticket-wrapper"><a href='#tickets' class="open-ticket-widget sub-navbar__item sub-navbar__item--primarybg mui--text-subhead mui--text-light mui--hidden-md mui--hidden-lg mui--hidden-xl" id="ticket-btn" data-cy-navbar="tickets">{% trans %}Get tickets{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a></div>
-      {%- endif %}
-      {%- if project.featured_sessions %}
-        <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#sessions" data-cy-navbar="sessions">{% trans %}Sessions{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-      {%- endif %}
-      {%- if project.hasjob_embed_url.url -%}
-        <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#related-jobs" data-cy-navbar="jobs">{% trans %}Jobs{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-      {%- endif %}
-      {%- if project.primary_venue -%}
-        <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#venue" data-cy-navbar="venue">{% trans %}Venue{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-      {%- endif %}
-      <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'updates' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'updates' -%}{{ project.url_for('updates') }}{%- endif %}" data-cy-navbar="updates">{% trans %}Updates{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-      <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'comments' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'comments' -%}{{ project.url_for('comments') }}{%- endif %}" data-cy-navbar="comments">{% trans %}Comments{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-      {%- if project.has_sessions_with_video %}
-        <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'videos' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'videos' -%}{{ project.url_for('session_videos') }}{%- endif %}" data-cy-navbar="video">{% trans %}Video{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-      {%- endif %}
-      {%- if project.current_roles.editor or not project.cfp_state.NONE -%}
-        <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'submissions' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'submissions' -%}{{ project.url_for('view_proposals') }}{%- endif %}" data-cy-navbar="submissions">{% trans %}Submissions{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-      {%- endif %}
-      {%- if project.schedule_state.PUBLISHED %}
-        <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'schedule' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'schedule' -%}{{ project.url_for('schedule') }}{%- endif %}" data-cy-navbar="schedule">{% trans %}Schedule{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-      {%- endif %}
-      <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'crew' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'crew' -%}{{ project.url_for('crew') }}{%- endif %}" data-cy-navbar="crew">{% trans %}Crew{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-      {%- if project.current_roles.editor or project.current_roles.concierge or project.current_roles.usher -%}
-        <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'settings' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'settings' -%}{{ project.url_for('settings') }}{%- endif %}" data-cy-navbar="settings">{% trans %}Settings{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
-      {%- endif %}
-    </nav>
+    <div class="sub-navbar-container__inner mui-container">
+      <nav class="sub-navbar mui-container" id="page-navbar">
+        <a class="sub-navbar__item mui--text-subhead mui--text-light mui--hidden-xs mui--hidden-sm {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#about" data-cy-navbar="about">{% trans %}About{% endtrans %}</a>
+        {%- if project.hasjob_embed_url.url -%}
+          <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#related-jobs" data-cy-navbar="jobs">{% trans %}Jobs{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+        {%- endif %}
+        <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'updates' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'updates' -%}{{ project.url_for('updates') }}{%- endif %}" data-cy-navbar="updates">{% trans %}Updates{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+        <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'comments' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'comments' -%}{{ project.url_for('comments') }}{%- endif %}" data-cy-navbar="comments">{% trans %}Comments{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+        {%- if project.current_roles.editor or not project.cfp_state.NONE -%}
+          <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'submissions' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'submissions' -%}{{ project.url_for('view_proposals') }}{%- endif %}" data-cy-navbar="submissions">{% trans %}Submissions{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+        {%- endif %}
+        {%- if project.schedule_state.PUBLISHED %}
+          <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'schedule' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'schedule' -%}{{ project.url_for('schedule') }}{%- endif %}" data-cy-navbar="schedule">{% trans %}Schedule{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+        {%- endif %}
+        <a class="sub-navbar__item mui--text-subhead mui--text-light {% if current_page == 'crew' %}sub-navbar__item--active{%- endif %}" href="{%- if current_page != 'crew' -%}{{ project.url_for('crew') }}{%- endif %}" data-cy-navbar="crew">{% trans %}Crew{% endtrans %} <span class="sub-navbar__item__icon mui--pull-right">{{ faicon(icon='chevron-right', icon_size='subhead') }}</span></a>
+      </nav>
+      <div class="desktop-navbar-items">
+        {{ project_share(project) }}
+        {{ registerblock(project, modalid='desktop-register-modal') }}
+      </div>
+    </div>
   </div>
   {% with pinned_update = project.pinned_update %}{%- if pinned_update and pinned %}
   <ul class="mui-list--unstyled pinned  {% if current_page == 'project' %}pinned--about-page{%- endif %}">
@@ -385,7 +396,7 @@
     <div class="card__body">
       {%- if not current_auth.is_anonymous %}
         {% set save_form_id = save_form_id_prefix + project.uuid_b58 %}
-        <div class="card__body__bookmark {% if not project.calendar_weeks_compact.weeks %} card__body__bookmark--pushup {% endif %}">{{ saveprojectform(project, save_form_id) }}</div>
+        <div class="card__body__bookmark {% if not include_calendar %} card__body__bookmark--pushup {% endif %}">{{ saveprojectform(project, save_form_id) }}</div>
       {% endif %}
       {%- if include_calendar%}
         {% if calendarwidget_compact and project.schedule_state.PUBLISHED and project.calendar_weeks_compact.weeks and project.calendar_weeks_compact.weeks|length > 0 %}
diff --git a/funnel/templates/project.html.jinja2 b/funnel/templates/project.html.jinja2
index 9f7573ef3..6e6b10dbf 100644
--- a/funnel/templates/project.html.jinja2
+++ b/funnel/templates/project.html.jinja2
@@ -2,7 +2,7 @@
 {% set title_suffix = project.title_suffix %}
 {% from "baseframe/forms.html.jinja2" import ajaxform %}
 {% from "baseframe/components.html.jinja2" import faicon %}
-{%- from "macros.html.jinja2" import csrf_tag, project_header, proposal_card %}
+{%- from "macros.html.jinja2" import csrf_tag, project_header, proposal_card, project_share, video_thumbnail, registerblock %}
 {% block title %}{{ project.title }}{% endblock %}
 {% block description %}{{ project.tagline }}{% endblock %}
 {% block twitter_card %}summary_large_image{% endblock %}
@@ -60,13 +60,25 @@
 
 {% block bodytag %}
   {%- if not config['LEGACY'] -%}
-    <body class="mui--bg-primary hg-app project-page">
+    <body class="mui--bg-primary hg-app project-page no-sticky-header">
   {%- else %}
-    <body class="mui--bg-primary">
+    <body class="mui--bg-primary no-sticky-header">
   {%- endif %}
 {% endblock %}
 
-{% block contenthead %}{% endblock %}
+{% block contenthead %}
+  <div class="mui--hidden-md mui--hidden-lg mui--hidden-xl">
+    <div class="mobile-nav mui--z1">
+      <a href="{{ url_for('index') }}" aria-label="{% trans %}Back to the project{% endtrans %}" class="mui--text-dark mobile-nav__icon" data-ga="Back to the project page">{{ faicon(icon='arrow-left', icon_size='title') }}</a>
+      <div class="mui--pull-right mobile-nav__icon">
+        {{ project_share(project) }}
+      </div>
+    </div>
+  </div>
+  <div class="project-footer">
+    {{ registerblock(project) }}
+  </div>
+{% endblock %}
 
 {% block baseheadline %}
   {% if current_auth.user.is_site_editor %}
@@ -195,6 +207,25 @@
       </div>
     </div>
 
+  {% if project.sessions_with_video|length > 0 %}
+    <div class="project-section" id="videos">
+      <div class="mui-container">
+        <div class="grid">
+          <div class="grid__col-xs-12">
+            <h2 class="mui--text-headline project-section__headline mui--text-left">{% trans %}Videos{% endtrans %}</h2>
+          </div>
+        </div>
+        <div class="grid">
+          {% for session in project.sessions_with_video %}
+            <div class="grid__col-xs-12 grid__col-sm-6 grid__col-sm-4">
+              {{ video_thumbnail(session) }}
+            </div>
+          {% endfor %}
+        </div>
+      </div>
+    </div>
+  {%- endif %}
+
   {% if featured_proposals.count() > 0 %}
     <div class="project-section" id="submissions">
       <div class="mui-container">
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 0abc0d055..7a51faf6d 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -24,7 +24,7 @@
   <a href="javascript:void(0)" class="hg-link-btn mui--hide mui--text-title mui-text-light" data-ga="Share dropdown" data-cy="share-project" data-url="{{ proposal.url_for(_external=true) }}?utm_campaign=webshare">{{ faicon(icon='share-alt', icon_size='title', baseline=false, css_class='mui--text-light fa-icon--margin ') }}</a>
   <div class="mui-dropdown">
     <a href="javascript:void(0)" class="project-links mui--text-title mui-text-light" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project">{{ faicon(icon='share-alt-square', icon_size='title', baseline=false, css_class='mui--text-light fa-icon--margin ') }}</a>
-    {{ share_dropdown(proposal.url_for(_external=true), proposal.title) }}
+    {{ share_dropdown(proposal.url_for(_external=true), proposal.title, css_class='mui-dropdown__menu--right') }}
   </div>
   {% if 'edit_proposal' in proposal.permissions(current_auth.user) or proposal.current_roles.project_editor %}
     <div class="mui--d-inlineblock mui-dropdown">

From 756ee9ae93d6ff469609e83469439ebc1d55c47d Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 22 Jan 2021 13:55:50 +0530
Subject: [PATCH 02/11] Add description text for get tickets btn

---
 .../static/translations/hi_IN/messages.json   |  35 +-
 funnel/templates/macros.html.jinja2           |  11 +-
 .../hi_IN/LC_MESSAGES/messages.mo             | Bin 172909 -> 172495 bytes
 .../hi_IN/LC_MESSAGES/messages.po             | 363 +++++++++---------
 funnel/translations/messages.pot              | 344 ++++++++---------
 5 files changed, 364 insertions(+), 389 deletions(-)

diff --git a/funnel/static/translations/hi_IN/messages.json b/funnel/static/translations/hi_IN/messages.json
index 6d0838cdb..5e303f865 100644
--- a/funnel/static/translations/hi_IN/messages.json
+++ b/funnel/static/translations/hi_IN/messages.json
@@ -1277,16 +1277,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,
         "इस प्रोजेक्ट को सूचीबद्ध नहीं किया जाएगा क्योंकि इसके समय-सूची में कोई सेशन मौजूद नहीं है"
@@ -1298,20 +1303,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,
@@ -1328,12 +1324,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,
         "यह जानकारी केवल प्रतिभागियों के लिए है"
@@ -1391,6 +1385,7 @@
       ],
       "Joined %(date)s": [null, "%(date)s को जुड़े"],
       "Admins": [null, "एडमिन"],
+      "Sessions": [null, "सेशन"],
       "Projects": [null, "प्रोजेक्ट"],
       "Tickets": [null, "टिकटें"],
       "Attend": [null, "हिस्सा लें"],
@@ -1482,6 +1477,7 @@
       "Edit details": [null, "विवरण संपादित करें"],
       "Related events": [null, "सम्बंधित ईवेंट"],
       "View Schedule": [null, "कार्यक्रम देखें"],
+      "Videos": [null, "वीडियो"],
       "See all": [null, "सारे देखें"],
       "Related jobs": [null, "सम्बंधित नौकरियां"],
       "Update venue": [null, "ईवेंट का स्थान अपडेट करें"],
@@ -1563,12 +1559,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,
         "इस सेशन की समय-सूची अभी नहीं बनाई गई है."
@@ -1665,6 +1661,7 @@
       "edited %s": [null, ""],
       "Reply": [null, ""],
       "Report": [null, ""],
+      "Share": [null, "साझा करें"],
       "More": [null, ""],
       "Show badge": [null, ""],
       "Show label badge": [null, ""],
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index 5d1278d36..e713a8731 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -86,9 +86,9 @@
 {% endmacro %}
 
 {% macro project_share(project) %}
-  <div class="project-header">
+  <div class="project-header mui--text-title">
     <div class="mui-dropdown">
-      <a href="javascript:void(0)" class="project-links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project">{{ faicon(icon='share-alt-square', baseline=true, icon_size='title', css_class='mui--text-light') }}</a>
+      <a href="javascript:void(0)" class="project-links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project">{{ faicon(icon='share-alt', baseline=true, icon_size='title', css_class='mui--text-light') }}</a>
       {{ share_dropdown(project.url_for(_external=true), project.title) }}
     </div>
     <a href="javascript:void(0)" class="hg-link-btn mui--hide" data-url="{{ project.url_for(_external=true) }}?utm_campaign=webshare">{{ faicon(icon='share-alt', baseline=true, icon_size='title', css_class='mui--text-light') }}</a>
@@ -116,9 +116,8 @@
 {% macro registerblock(project, modalid='mob-register-modal') %}
   <div class="register-block">
     {% if project.features.tickets()  %}
-      <div class="mui--text-center">
-        <a href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#tickets" class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" id="get-tickets">{% trans %}Get tickets{% endtrans %}</a>
-      </div>
+      <p class="register-block__txt mui--d-inlineblock mui--text-body2 mui--text-light">{% trans %}Tickets available!{% endtrans %}</p>
+      <a href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#tickets" class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" id="get-tickets">{% trans %}Get tickets{% endtrans %}</a>
     {% elif project.features.rsvp() %}
       {%- if current_auth.is_anonymous %}
         <p class="register-block__txt mui--text-body2 mui--text-light">{{ project.views.registration_text() }}</p>
@@ -364,7 +363,7 @@
     {%- endif %}
     <a href="javascript:void(0)" class="details__box__control__link mui--text-subhead hg-link-btn mui--hide" data-ga="Share dropdown" data-cy="share-project" data-url="{{ url }}?utm_campaign=webshare">{{ faicon(icon='share-alt', icon_size='subhead') }}</a>
     <div class="mui-dropdown">
-      <a href="javascript:void(0)" class="details__box__control__link mui--text-subhead project-links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project">{{ faicon(icon='share-alt-square', icon_size='subhead') }}</a>
+      <a href="javascript:void(0)" class="details__box__control__link mui--text-subhead project-links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project">{{ faicon(icon='share-alt', icon_size='subhead') }}</a>
       {{ share_dropdown(url, title) }}
     </div>
   {%- endif %}
diff --git a/funnel/translations/hi_IN/LC_MESSAGES/messages.mo b/funnel/translations/hi_IN/LC_MESSAGES/messages.mo
index 1b093a108b1df8c9fd8f157754fce6eaed915ccc..588f7188b8e75548ec9b04831bf21e31b685ec4d 100644
GIT binary patch
delta 19660
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

delta 19835
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

diff --git a/funnel/translations/hi_IN/LC_MESSAGES/messages.po b/funnel/translations/hi_IN/LC_MESSAGES/messages.po
index d1809791c..eb4592ad9 100644
--- a/funnel/translations/hi_IN/LC_MESSAGES/messages.po
+++ b/funnel/translations/hi_IN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: webmaster@hasgeek.com\n"
-"POT-Creation-Date: 2021-01-15 22:01+0530\n"
+"POT-Creation-Date: 2021-01-22 13:54+0530\n"
 "PO-Revision-Date: 2020-12-17 13:47+0530\n"
 "Last-Translator: Ritesh Raj\n"
 "Language: hi\n"
@@ -239,7 +239,7 @@ msgid "Type"
 msgstr "प्रकार"
 
 #: funnel/forms/account.py:388 funnel/templates/layout.html.jinja2:70
-#: funnel/templates/macros.html.jinja2:636
+#: funnel/templates/macros.html.jinja2:652
 msgid "Home"
 msgstr "मुखपृष्ठ"
 
@@ -1031,7 +1031,7 @@ msgstr "लैंडिंग पेज की सामग्रियां"
 msgid "Quotes are not necessary in the location name"
 msgstr "स्थान के नाम में क्वोट लगाना आवश्यक नहीं है"
 
-#: funnel/forms/project.py:90 funnel/templates/project.html.jinja2:69
+#: funnel/forms/project.py:90 funnel/templates/project.html.jinja2:81
 msgid "Feature this project"
 msgstr ""
 
@@ -1141,7 +1141,7 @@ msgstr "लेबल"
 msgid "Content"
 msgstr "विषय सूची"
 
-#: funnel/forms/proposal.py:149 funnel/templates/macros.html.jinja2:262
+#: funnel/forms/proposal.py:149
 msgid "Video"
 msgstr "वीडियो"
 
@@ -1331,8 +1331,7 @@ msgstr "कमरे का RGB रंग. बगैर ‘#’ के दर्
 msgid "Please enter a valid color code"
 msgstr "कृपया एक वैध कलर कोड दर्ज करें"
 
-#: funnel/forms/venue.py:105 funnel/templates/macros.html.jinja2:259
-#: funnel/templates/project.html.jinja2:212
+#: funnel/forms/venue.py:105 funnel/templates/project.html.jinja2:242
 msgid "Venue"
 msgstr "ईवेंट का स्थान"
 
@@ -1462,7 +1461,7 @@ msgid "{user} commented"
 msgstr "{user} ने कमेंट किया"
 
 #: funnel/models/commentvote.py:322 funnel/models/commentvote.py:327
-#: funnel/templates/macros.html.jinja2:265
+#: funnel/templates/macros.html.jinja2:277
 #: funnel/templates/project_membership.html.jinja2:4
 #: funnel/templates/project_membership.html.jinja2:17
 msgid "Crew"
@@ -1488,59 +1487,59 @@ msgstr "संसोधन"
 msgid "Not spam"
 msgstr "गैर स्पैम"
 
-#: funnel/models/notification.py:145
+#: funnel/models/notification.py:146
 msgid "Uncategorized"
 msgstr "अवर्गीकृत"
 
-#: funnel/models/notification.py:146 funnel/templates/account.html.jinja2:5
+#: funnel/models/notification.py:147 funnel/templates/account.html.jinja2:5
 #: funnel/templates/account_saved.html.jinja2:4
 #: funnel/templates/js/badge.js.jinja2:96
 #: funnel/templates/notification_preferences.html.jinja2:5
 msgid "My account"
 msgstr "मेरा अकाउंट"
 
-#: funnel/models/notification.py:148
+#: funnel/models/notification.py:149
 msgid "My subscriptions and billing"
 msgstr "मेरे सदस्यता और बिल"
 
-#: funnel/models/notification.py:152
+#: funnel/models/notification.py:153
 msgid "Projects I am participating in"
 msgstr "मेरे द्वारा भाग लिए प्रोजेक्ट"
 
-#: funnel/models/notification.py:163
+#: funnel/models/notification.py:164
 msgid "Projects I am a crew member in"
 msgstr "प्रोजेक्ट, जिनमें मैं दल का हिस्सा हूं"
 
-#: funnel/models/notification.py:171
+#: funnel/models/notification.py:172
 msgid "Organizations I manage"
 msgstr "मेरे द्वारा प्रबंधित संगठन"
 
-#: funnel/models/notification.py:179
+#: funnel/models/notification.py:180
 msgid "As a website administrator"
 msgstr "वेबसाइट एडमिनिस्ट्रेटर के तौर पर"
 
-#: funnel/models/notification.py:190
+#: funnel/models/notification.py:191
 msgid "Queued"
 msgstr "श्रेणीबद्ध"
 
-#: funnel/models/notification.py:191
+#: funnel/models/notification.py:192
 msgid "Pending"
 msgstr "लंबित"
 
-#: funnel/models/notification.py:192
+#: funnel/models/notification.py:193
 msgid "Delivered"
 msgstr "पहुंचाए हुए"
 
-#: funnel/models/notification.py:193
+#: funnel/models/notification.py:194
 msgid "Failed"
 msgstr "विफल रहे"
 
-#: funnel/models/notification.py:194
+#: funnel/models/notification.py:195
 #: funnel/templates/auth_client.html.jinja2:75
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: funnel/models/notification.py:253
+#: funnel/models/notification.py:254
 msgid "Unspecified notification type"
 msgstr "अनिर्धारित नोटिफिकेशन प्रकार"
 
@@ -1647,11 +1646,11 @@ msgstr "सार्वजनिक"
 msgid "Private"
 msgstr "निजी"
 
-#: funnel/models/profile.py:384 funnel/templates/macros.html.jinja2:590
+#: funnel/models/profile.py:384 funnel/templates/macros.html.jinja2:606
 msgid "Make public"
 msgstr "सार्वजनिक बनाएं"
 
-#: funnel/models/profile.py:389 funnel/templates/macros.html.jinja2:540
+#: funnel/models/profile.py:389 funnel/templates/macros.html.jinja2:556
 msgid "Make private"
 msgstr "निजी बनाएं"
 
@@ -1688,7 +1687,7 @@ msgid "Live"
 msgstr "लाइव"
 
 #: funnel/models/project.py:335 funnel/models/project.py:381
-#: funnel/templates/macros.html.jinja2:459
+#: funnel/templates/macros.html.jinja2:475
 msgid "Upcoming"
 msgstr "आने वाले"
 
@@ -1820,7 +1819,7 @@ msgstr "इस प्रस्ताव को जमा कर दिया ग
 msgid "Send Back to Submitted"
 msgstr "जमा किए पर वापस भेजें"
 
-#: funnel/models/proposal.py:384 funnel/templates/macros.html.jinja2:198
+#: funnel/models/proposal.py:384 funnel/templates/macros.html.jinja2:125
 #: funnel/views/commentvote.py:463 funnel/views/login_session.py:426
 msgid "Confirm"
 msgstr "स्वीकृती दें"
@@ -1969,7 +1968,6 @@ msgstr ""
 #: funnel/static/js/schedules.js:526 funnel/static/js/schedules.js:700
 #: funnel/static/js/schedules.js:720 funnel/static/js/schedules.packed.js:1
 #: funnel/templates/labels.html.jinja2:49
-#: funnel/templates/macros.html.jinja2:58
 #: funnel/templates/schedule_edit.html.jinja2:87
 #: funnel/views/organization.py:196 funnel/views/update.py:153
 #: funnel/views/venue.py:129 funnel/views/venue.py:200
@@ -2085,7 +2083,7 @@ msgstr ""
 "पर ईमेल करें."
 
 #: funnel/templates/about.html.jinja2:2 funnel/templates/about.html.jinja2:13
-#: funnel/templates/macros.html.jinja2:671
+#: funnel/templates/macros.html.jinja2:687
 msgid "About Hasgeek"
 msgstr "Hasgeek का परिचय"
 
@@ -2298,10 +2296,10 @@ msgstr "%(location)s – %(ipaddr)s से अनुमानित"
 #: funnel/templates/img_upload_formlayout.html.jinja2:6
 #: funnel/templates/labels_form.html.jinja2:18
 #: funnel/templates/layout.html.jinja2:124
-#: funnel/templates/macros.html.jinja2:190
-#: funnel/templates/macros.html.jinja2:207
-#: funnel/templates/macros.html.jinja2:528
-#: funnel/templates/macros.html.jinja2:580
+#: funnel/templates/macros.html.jinja2:117
+#: funnel/templates/macros.html.jinja2:138
+#: funnel/templates/macros.html.jinja2:544
+#: funnel/templates/macros.html.jinja2:596
 #: funnel/templates/project_cfp.html.jinja2:8
 #: funnel/templates/proposal_admin_panel.html.jinja2:5
 #: funnel/templates/schedule_edit.html.jinja2:95
@@ -2723,7 +2721,7 @@ msgstr "खोजें"
 
 #: funnel/templates/layout.html.jinja2:80
 #: funnel/templates/layout.html.jinja2:83
-#: funnel/templates/macros.html.jinja2:260
+#: funnel/templates/macros.html.jinja2:273
 #: funnel/templates/notification_feed.html.jinja2:5
 #: funnel/templates/updates.html.jinja2:4
 #: funnel/templates/updates.html.jinja2:17
@@ -2732,12 +2730,11 @@ msgstr "अपडेट"
 
 #: funnel/templates/layout.html.jinja2:81
 #: funnel/templates/layout.html.jinja2:84
-#: funnel/templates/macros.html.jinja2:306
+#: funnel/templates/macros.html.jinja2:322
 msgid "Account"
 msgstr "अकाउंट"
 
 #: funnel/templates/layout.html.jinja2:92
-#: funnel/templates/macros.html.jinja2:56
 #: funnel/templates/signup_form.html.jinja2:26 funnel/views/login.py:205
 msgid "Login"
 msgstr "लॉगिन"
@@ -2758,22 +2755,6 @@ msgstr "ईमेल के ज़रिए साइन अप करें"
 msgid "Logging out…"
 msgstr "लॉग आउट हो रहा है…"
 
-#: funnel/templates/macros.html.jinja2:56
-msgid "to save"
-msgstr "सेव करने के लिए"
-
-#: funnel/templates/macros.html.jinja2:58
-msgid "Save this project"
-msgstr "इस प्रोजेक्ट को सेव करें"
-
-#: funnel/templates/macros.html.jinja2:60
-msgid "Unsave this project"
-msgstr "इस प्रोजेक्ट को सेव से हटाएँ"
-
-#: funnel/templates/macros.html.jinja2:60
-msgid "Unsave"
-msgstr "सेव से हटाएँ "
-
 #: funnel/templates/macros.html.jinja2:67
 msgid "Copy link"
 msgstr "लिंक कॉपी करें"
@@ -2782,16 +2763,6 @@ msgstr "लिंक कॉपी करें"
 msgid "Facebook"
 msgstr "Facebook"
 
-#: funnel/templates/js/comments.js.jinja2:81
-#: funnel/templates/macros.html.jinja2:79
-#: funnel/templates/macros.html.jinja2:82
-msgid "Share"
-msgstr "साझा करें"
-
-#: funnel/templates/macros.html.jinja2:84
-msgid "Add to calendar"
-msgstr "कैलेंडर में जोड़ें"
-
 #: funnel/templates/macros.html.jinja2:91
 msgid "Update livestream URLs"
 msgstr "लाइवस्ट्रीम URLs को बदलें"
@@ -2800,42 +2771,19 @@ msgstr "लाइवस्ट्रीम URLs को बदलें"
 msgid "Update banner image"
 msgstr "बैनर इमेज को बदलें"
 
-#: funnel/templates/macros.html.jinja2:106 funnel/views/session.py:213
-msgid "This project will not be listed as it has no sessions in the schedule"
+#: funnel/templates/macros.html.jinja2:104
+msgid "Tickets available!"
 msgstr ""
-"इस प्रोजेक्ट को सूचीबद्ध नहीं किया जाएगा क्योंकि इसके समय-सूची में कोई "
-"सेशन मौजूद नहीं है"
-
-#: funnel/templates/macros.html.jinja2:111
-msgid "This project is currently not published"
-msgstr "इस प्रोजेक्ट को फिलहाल प्रकाशित नहीं किया गया है"
-
-#: funnel/templates/macros.html.jinja2:126
-msgid "Edit url"
-msgstr "URL संपादित करें"
-
-#: funnel/templates/macros.html.jinja2:135
-#: funnel/templates/macros.html.jinja2:365
-#: funnel/templates/macros.html.jinja2:390
-msgid "Livestream"
-msgstr "लाइवस्ट्रीम"
-
-#: funnel/templates/macros.html.jinja2:145
-#: funnel/templates/macros.html.jinja2:161
-#: funnel/templates/macros.html.jinja2:285
-msgid "Preview video"
-msgstr "प्रीव्यू वीडियो"
 
-#: funnel/templates/macros.html.jinja2:180
-#: funnel/templates/macros.html.jinja2:256
+#: funnel/templates/macros.html.jinja2:105
 msgid "Get tickets"
 msgstr "टिकट पाएं"
 
-#: funnel/templates/macros.html.jinja2:187
+#: funnel/templates/macros.html.jinja2:114
 msgid "Register"
 msgstr "रजिस्टर करें"
 
-#: funnel/templates/macros.html.jinja2:194
+#: funnel/templates/macros.html.jinja2:121
 msgid ""
 "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."
@@ -2844,77 +2792,101 @@ msgstr ""
 "साझा किया जाएगा ताकि आपको इससे जुड़ी जानकारियों से अवगत रख सकें. आप किसी "
 "भी समय अपना रजिस्ट्रेशन रद्द कर सकते हैं."
 
-#: funnel/templates/macros.html.jinja2:204
+#: funnel/templates/macros.html.jinja2:135
 msgid "Cancel registration"
 msgstr "रजिस्ट्रेशन रद्द करें"
 
-#: funnel/templates/macros.html.jinja2:211
+#: funnel/templates/macros.html.jinja2:142
 msgid "Can’t make it?"
 msgstr "आप मदद नहीं कर सकते?"
 
-#: funnel/templates/macros.html.jinja2:215
+#: funnel/templates/macros.html.jinja2:146
 msgid "Confirm cancellation"
 msgstr "रद्द करने की पुष्टि करें"
 
-#: funnel/templates/macros.html.jinja2:221
+#: funnel/templates/macros.html.jinja2:153
 #: funnel/templates/project_rsvp_list.html.jinja2:3
 #: funnel/templates/settings.html.jinja2:116
 msgid "View participants"
 msgstr "प्रतिभागियों को देखें"
 
-#: funnel/templates/macros.html.jinja2:224
+#: funnel/templates/macros.html.jinja2:168 funnel/views/session.py:213
+msgid "This project will not be listed as it has no sessions in the schedule"
+msgstr ""
+"इस प्रोजेक्ट को सूचीबद्ध नहीं किया जाएगा क्योंकि इसके समय-सूची में कोई "
+"सेशन मौजूद नहीं है"
+
+#: funnel/templates/macros.html.jinja2:173
+msgid "This project is currently not published"
+msgstr "इस प्रोजेक्ट को फिलहाल प्रकाशित नहीं किया गया है"
+
+#: funnel/templates/macros.html.jinja2:188
+msgid "Edit url"
+msgstr "URL संपादित करें"
+
+#: funnel/templates/macros.html.jinja2:197
+#: funnel/templates/macros.html.jinja2:381
+#: funnel/templates/macros.html.jinja2:406
+msgid "Livestream"
+msgstr "लाइवस्ट्रीम"
+
+#: funnel/templates/macros.html.jinja2:207
+#: funnel/templates/macros.html.jinja2:222
+#: funnel/templates/macros.html.jinja2:301
+msgid "Preview video"
+msgstr "प्रीव्यू वीडियो"
+
+#: funnel/templates/macros.html.jinja2:240
 msgid "Add schedule to enable registrations"
 msgstr "रजिस्ट्रेशन शुरू करने के लिए समय-सूची जोड़ें"
 
-#: funnel/templates/macros.html.jinja2:228
-#: funnel/templates/macros.html.jinja2:242
-#: funnel/templates/macros.html.jinja2:663
+#: funnel/templates/macros.html.jinja2:240
+msgid "Add schedule"
+msgstr ""
+
+#: funnel/templates/macros.html.jinja2:244
+#: funnel/templates/macros.html.jinja2:258
+#: funnel/templates/macros.html.jinja2:679
 #: funnel/templates/proposals.html.jinja2:44
 #: funnel/templates/proposals.html.jinja2:48 funnel/views/proposal.py:158
 msgid "Make a submission"
 msgstr "एक सबमिशन भेजें"
 
-#: funnel/templates/macros.html.jinja2:229
-#: funnel/templates/macros.html.jinja2:346
+#: funnel/templates/macros.html.jinja2:245
+#: funnel/templates/macros.html.jinja2:362
 #: funnel/templates/proposals.html.jinja2:45
 #, python-format
 msgid "Submissions close at %(date)s"
 msgstr "सबमिशन जमा करने की सुविधा %(date)s को बंद हो जाएगी"
 
-#: funnel/templates/macros.html.jinja2:236
+#: funnel/templates/macros.html.jinja2:252
 msgid "Open submissions"
 msgstr "सबमिशन को खोलें"
 
-#: funnel/templates/macros.html.jinja2:237
+#: funnel/templates/macros.html.jinja2:253
 msgid "Add submission guidelines"
 msgstr "सबमिशन की दिशा-निर्देश और समय-सूची जोड़ें"
 
-#: funnel/templates/macros.html.jinja2:243
+#: funnel/templates/macros.html.jinja2:259
 #: funnel/templates/proposals.html.jinja2:49
 msgid "Submissions are closed for this project"
 msgstr "इस प्रोजेक्ट के लिए प्रस्ताव जमा करने की सुविधा बंद की जा चुकी है"
 
-#: funnel/templates/macros.html.jinja2:247
-#: funnel/templates/project.html.jinja2:230
+#: funnel/templates/macros.html.jinja2:263
+#: funnel/templates/project.html.jinja2:260
 #: funnel/templates/venues.html.jinja2:37 funnel/views/venue.py:52
 msgid "Add venue"
 msgstr "ईवेंट का स्थान जोड़ें"
 
-#: funnel/templates/macros.html.jinja2:254
+#: funnel/templates/macros.html.jinja2:271
 msgid "About"
 msgstr "परिचय"
 
-#: funnel/templates/macros.html.jinja2:257
-#: funnel/templates/macros.html.jinja2:639
-#: funnel/templates/project.html.jinja2:125 funnel/views/search.py:173
-msgid "Sessions"
-msgstr "सेशन"
-
-#: funnel/templates/macros.html.jinja2:258
+#: funnel/templates/macros.html.jinja2:272
 msgid "Jobs"
 msgstr "नौकरियां"
 
-#: funnel/templates/macros.html.jinja2:261
+#: funnel/templates/macros.html.jinja2:274
 #: funnel/templates/project_comments.html.jinja2:4
 #: funnel/templates/project_comments.html.jinja2:20
 #: funnel/templates/proposal.html.jinja2:204 funnel/views/search.py:270
@@ -2922,128 +2894,121 @@ msgstr "नौकरियां"
 msgid "Comments"
 msgstr "कमेंट"
 
-#: funnel/templates/macros.html.jinja2:263
-#: funnel/templates/macros.html.jinja2:641
-#: funnel/templates/project.html.jinja2:186
+#: funnel/templates/macros.html.jinja2:275
+#: funnel/templates/macros.html.jinja2:657
+#: funnel/templates/project.html.jinja2:216
 #: funnel/templates/proposals.html.jinja2:4
 #: funnel/templates/proposals.html.jinja2:17
 #: funnel/templates/user_profile_proposals.html.jinja2:10
 msgid "Submissions"
 msgstr "सबमिशन"
 
-#: funnel/templates/macros.html.jinja2:264
-#: funnel/templates/macros.html.jinja2:391
+#: funnel/templates/macros.html.jinja2:276
+#: funnel/templates/macros.html.jinja2:407
 #: funnel/templates/schedule.html.jinja2:5
 #: funnel/templates/schedule.html.jinja2:70
 #: funnel/templates/schedule_edit.html.jinja2:4
 msgid "Schedule"
 msgstr "कार्यक्रम"
 
-#: funnel/templates/macros.html.jinja2:266
-#: funnel/templates/schedule_edit.html.jinja2:51
-#: funnel/templates/settings.html.jinja2:4
-#: funnel/templates/settings.html.jinja2:16
-msgid "Settings"
-msgstr "सेटिंग्स"
-
 #: funnel/templates/js/update.js.jinja2:65
-#: funnel/templates/macros.html.jinja2:273
+#: funnel/templates/macros.html.jinja2:289
 msgid "This update is for participants only"
 msgstr "यह जानकारी केवल प्रतिभागियों के लिए है"
 
-#: funnel/templates/macros.html.jinja2:291
+#: funnel/templates/macros.html.jinja2:307
 msgid "Edit submission video"
 msgstr "सबमिशन से जुड़ा वीडियो संपादित करें"
 
-#: funnel/templates/macros.html.jinja2:293
+#: funnel/templates/macros.html.jinja2:309
 #: funnel/templates/proposal.html.jinja2:50
 msgid "Edit session video"
 msgstr "सेशन का वीडियो संपादित करें"
 
-#: funnel/templates/macros.html.jinja2:307
+#: funnel/templates/macros.html.jinja2:323
 msgid "Notifications"
 msgstr "नोटिफिकेशन"
 
-#: funnel/templates/macros.html.jinja2:308
+#: funnel/templates/macros.html.jinja2:324
 msgid "My saves"
 msgstr "मेरी सेव किये गए प्रोजेक्ट"
 
-#: funnel/templates/macros.html.jinja2:309
+#: funnel/templates/macros.html.jinja2:325
 #: funnel/templates/scan_contact.html.jinja2:4
 msgid "Scan badge"
 msgstr "बैज स्कैन करें"
 
-#: funnel/templates/macros.html.jinja2:310
+#: funnel/templates/macros.html.jinja2:326
 msgid "Contacts"
 msgstr "कॉन्टैक्ट"
 
-#: funnel/templates/macros.html.jinja2:363
+#: funnel/templates/macros.html.jinja2:379
 msgid "Live schedule"
 msgstr "लाइव कार्यक्रम"
 
-#: funnel/templates/macros.html.jinja2:367
+#: funnel/templates/macros.html.jinja2:383
 msgid "Livestream and schedule"
 msgstr "लाइवस्ट्रीम और कार्यक्रम"
 
-#: funnel/templates/macros.html.jinja2:387
+#: funnel/templates/macros.html.jinja2:403
 #, python-format
 msgid "Session starts at %(session)s"
 msgstr "सेशन %(session)s शुरू होगा"
 
-#: funnel/templates/macros.html.jinja2:390
+#: funnel/templates/macros.html.jinja2:406
 msgid "Watch livestream"
 msgstr "लाइवस्ट्रीम देखें"
 
-#: funnel/templates/macros.html.jinja2:407
+#: funnel/templates/macros.html.jinja2:423
 msgid "Spotlight"
 msgstr "झलकियां"
 
-#: funnel/templates/macros.html.jinja2:479
+#: funnel/templates/macros.html.jinja2:495
 msgid "Accepting submissions"
 msgstr "सब्मिशन स्वीकार कर रहे हैं"
 
-#: funnel/templates/macros.html.jinja2:491
+#: funnel/templates/macros.html.jinja2:507
 #: funnel/templates/profile.html.jinja2:96
 msgid "Show more"
 msgstr "और दिखाएं"
 
-#: funnel/templates/macros.html.jinja2:505
+#: funnel/templates/macros.html.jinja2:521
 msgid "All projects"
 msgstr "सभी प्रोजेक्ट"
 
-#: funnel/templates/macros.html.jinja2:522
+#: funnel/templates/macros.html.jinja2:538
 msgid "Manage admins"
 msgstr "एडमिंस को प्रबंधित करें"
 
-#: funnel/templates/macros.html.jinja2:522
+#: funnel/templates/macros.html.jinja2:538
 msgid "View admins"
 msgstr "एडमिंस को देखें"
 
-#: funnel/templates/macros.html.jinja2:523
+#: funnel/templates/macros.html.jinja2:539
 msgid "Edit this profile"
 msgstr "इस प्रोफाइल को संपादित करें"
 
-#: funnel/templates/macros.html.jinja2:523
+#: funnel/templates/macros.html.jinja2:539
 msgid "Make profile private"
 msgstr "प्रोफाइल को निजी बनाएं"
 
-#: funnel/templates/macros.html.jinja2:529
+#: funnel/templates/macros.html.jinja2:545
 msgid "Make this profile private?"
 msgstr "वाकई इस प्रोफाइल को निजी बनाना चाहते हैं?"
 
-#: funnel/templates/macros.html.jinja2:533
+#: funnel/templates/macros.html.jinja2:549
 msgid "Your profile will not be visible to anyone other than you"
 msgstr "आपका प्रोफाइल आपके अलावा किसी और को नहीं दिखाई देगा"
 
-#: funnel/templates/macros.html.jinja2:534
+#: funnel/templates/macros.html.jinja2:550
 msgid "It will not be listed in search results"
 msgstr "यह खोज परिणामों में भी दिखाई नहीं देगा"
 
-#: funnel/templates/macros.html.jinja2:535
+#: funnel/templates/macros.html.jinja2:551
 msgid "You cannot host projects from this profile"
 msgstr "आप इस प्रोफाइल से प्रोजेक्ट होस्ट नहीं कर सकते"
 
-#: funnel/templates/macros.html.jinja2:536
+#: funnel/templates/macros.html.jinja2:552
 msgid ""
 "Any existing projects will become inaccessible until the profile is "
 "public again"
@@ -3051,93 +3016,98 @@ msgstr ""
 "जब तक कि इस प्रोफाइल को दोबारा से सार्वजनिक नहीं बनाया जाता तब तक कोई भी "
 "मौजूदा प्रोजेक्ट इसके द्वारा एक्सेस नहीं किया जा सकता"
 
-#: funnel/templates/macros.html.jinja2:559
+#: funnel/templates/macros.html.jinja2:575
 msgid "Add cover photo url"
 msgstr "कवर फोटो का URL जोड़ें"
 
-#: funnel/templates/macros.html.jinja2:559
+#: funnel/templates/macros.html.jinja2:575
 msgid "Add cover photo"
 msgstr "कवर फोटो जोड़ें"
 
-#: funnel/templates/macros.html.jinja2:575
-#: funnel/templates/macros.html.jinja2:622
+#: funnel/templates/macros.html.jinja2:591
+#: funnel/templates/macros.html.jinja2:638
 #: funnel/templates/profile.html.jinja2:83
 msgid "New project"
 msgstr "नया प्रोजेक्ट"
 
-#: funnel/templates/macros.html.jinja2:577
-#: funnel/templates/macros.html.jinja2:624
+#: funnel/templates/macros.html.jinja2:593
+#: funnel/templates/macros.html.jinja2:640
 msgid "Make profile public"
 msgstr "प्रोफाइल को सार्वजनिक बनाएं"
 
-#: funnel/templates/macros.html.jinja2:581
+#: funnel/templates/macros.html.jinja2:597
 msgid "Make this profile public?"
 msgstr "इस प्रोफाइल को सार्वजनिक बनाएं?"
 
-#: funnel/templates/macros.html.jinja2:585
+#: funnel/templates/macros.html.jinja2:601
 msgid "Your profile will be visible to anyone visiting the page"
 msgstr "आपका प्रोफाइल इस पेज पर आने वाले सभी व्यक्तियों को दिखाई देगा"
 
-#: funnel/templates/macros.html.jinja2:586
+#: funnel/templates/macros.html.jinja2:602
 msgid "Your profile will be listed in search results"
 msgstr "आपका प्रोफाइल खोज प्राणिमों में दिखाई देगा"
 
-#: funnel/templates/macros.html.jinja2:614
+#: funnel/templates/macros.html.jinja2:630
 #, python-format
 msgid "Joined %(date)s"
 msgstr "%(date)s को जुड़े"
 
-#: funnel/templates/macros.html.jinja2:637
+#: funnel/templates/macros.html.jinja2:653
 #: funnel/templates/organization_membership.html.jinja2:15
 msgid "Admins"
 msgstr "एडमिन"
 
-#: funnel/templates/macros.html.jinja2:640
+#: funnel/templates/macros.html.jinja2:655
+#: funnel/templates/project.html.jinja2:137 funnel/views/search.py:173
+msgid "Sessions"
+msgstr "सेशन"
+
+#: funnel/templates/macros.html.jinja2:656
 #: funnel/templates/user_profile_projects.html.jinja2:10
 #: funnel/views/search.py:76
 msgid "Projects"
 msgstr "प्रोजेक्ट"
 
-#: funnel/templates/macros.html.jinja2:657
-#: funnel/templates/project.html.jinja2:90
+#: funnel/templates/macros.html.jinja2:673
+#: funnel/templates/project.html.jinja2:102
 #: funnel/templates/project_admin.html.jinja2:39
 msgid "Tickets"
 msgstr "टिकटें"
 
-#: funnel/templates/macros.html.jinja2:659
+#: funnel/templates/macros.html.jinja2:675
 msgid "Attend"
 msgstr "हिस्सा लें"
 
-#: funnel/templates/macros.html.jinja2:672
+#: funnel/templates/macros.html.jinja2:688
 msgid "Team &amp; careers"
 msgstr "टीम &amp; करियर"
 
-#: funnel/templates/macros.html.jinja2:673
+#: funnel/templates/macros.html.jinja2:689
 msgid "Contact"
 msgstr "संपर्क"
 
-#: funnel/templates/macros.html.jinja2:674
+#: funnel/templates/macros.html.jinja2:690
 #: funnel/templates/policy.html.jinja2:14
 msgid "Site policies"
 msgstr "साइट नीतियां"
 
-#: funnel/templates/macros.html.jinja2:705
+#: funnel/templates/macros.html.jinja2:721
 msgid "Outstation speaker"
 msgstr "दूसरे शहर से आने वाले स्पीकर"
 
-#: funnel/templates/macros.html.jinja2:706
+#: funnel/templates/macros.html.jinja2:722
 msgid "(proposing)"
 msgstr "(प्रस्तुत कर रहे हैं)"
 
-#: funnel/templates/macros.html.jinja2:720
+#: funnel/templates/macros.html.jinja2:734
 msgid "This proposal has a preview video"
 msgstr "इस प्रस्ताव के साथ एक प्रीव्यू वीडियो मौजूद है"
 
-#: funnel/templates/macros.html.jinja2:725
+#: funnel/templates/macros.html.jinja2:739
 msgid "This proposal has slides"
 msgstr "इस प्रस्ताव में स्लाइड मौजूद है"
 
-#: funnel/templates/macros.html.jinja2:740
+#: funnel/templates/macros.html.jinja2:754
 msgid "(No sessions have been submitted)"
 msgstr "(सेशन की कोई जानकारी नहीं दी गई है)"
 
@@ -3152,7 +3122,7 @@ msgstr "आपको %(project)s में आमंत्रित किया
 
 #: funnel/templates/meta_refresh.html.jinja2:6
 #: funnel/templates/meta_refresh.html.jinja2:28
-#: funnel/templates/project.html.jinja2:224
+#: funnel/templates/project.html.jinja2:254
 #: funnel/templates/redirect.html.jinja2:1
 msgid "Loading…"
 msgstr "लोडिंग…"
@@ -3296,7 +3266,8 @@ msgstr "लिखें, दूसरे से जुड़ें और प्
 msgid "Unscheduled projects"
 msgstr "अनिर्धारित प्रोजेक्ट"
 
-#: funnel/templates/project.html.jinja2:90
+#: funnel/templates/project.html.jinja2:62
+#: funnel/templates/project.html.jinja2:102
 #: funnel/templates/project_comments.html.jinja2:20
 #: funnel/templates/project_membership.html.jinja2:17
 #: funnel/templates/proposal.html.jinja2:72
@@ -3308,27 +3279,33 @@ msgstr "अनिर्धारित प्रोजेक्ट"
 msgid "Back to the project"
 msgstr "प्रोजेक्ट पर वापस जाएं"
 
-#: funnel/templates/project.html.jinja2:100
+#: funnel/templates/project.html.jinja2:112
 msgid "Edit details"
 msgstr "विवरण संपादित करें"
 
-#: funnel/templates/project.html.jinja2:103
+#: funnel/templates/project.html.jinja2:115
 msgid "Related events"
 msgstr "सम्बंधित ईवेंट"
 
-#: funnel/templates/project.html.jinja2:174
+#: funnel/templates/project.html.jinja2:186
 msgid "View Schedule"
 msgstr "कार्यक्रम देखें"
 
-#: funnel/templates/project.html.jinja2:195
+#: funnel/templates/project.html.jinja2:198
+#: funnel/templates/session_videos.html.jinja2:3
+#: funnel/templates/session_videos.html.jinja2:16
+msgid "Videos"
+msgstr "वीडियो"
+
+#: funnel/templates/project.html.jinja2:225
 msgid "See all"
 msgstr "सारे देखें"
 
-#: funnel/templates/project.html.jinja2:204
+#: funnel/templates/project.html.jinja2:234
 msgid "Related jobs"
 msgstr "सम्बंधित नौकरियां"
 
-#: funnel/templates/project.html.jinja2:214
+#: funnel/templates/project.html.jinja2:244
 msgid "Update venue"
 msgstr "ईवेंट का स्थान अपडेट करें"
 
@@ -3526,6 +3503,12 @@ msgstr "सेशन जोड़ने के लिए डेट चुने
 msgid "Unscheduled proposals"
 msgstr ""
 
+#: funnel/templates/schedule_edit.html.jinja2:51
+#: funnel/templates/settings.html.jinja2:4
+#: funnel/templates/settings.html.jinja2:16
+msgid "Settings"
+msgstr "सेटिंग्स"
+
 #: funnel/templates/schedule_edit.html.jinja2:88
 msgid "Revert"
 msgstr "वापस करें"
@@ -3546,11 +3529,6 @@ msgstr "डाउनलोड करें"
 msgid "Add to Google Calendar"
 msgstr "Google Calendar में जोड़ें"
 
-#: funnel/templates/session_videos.html.jinja2:3
-#: funnel/templates/session_videos.html.jinja2:16
-msgid "Videos"
-msgstr "वीडियो"
-
 #: funnel/templates/session_view_popup.html.jinja2:14
 msgid "This session has not been scheduled yet."
 msgstr "इस सेशन की समय-सूची अभी नहीं बनाई गई है."
@@ -3801,6 +3779,10 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
+#: funnel/templates/js/comments.js.jinja2:81
+msgid "Share"
+msgstr "साझा करें"
+
 #: funnel/templates/js/comments.js.jinja2:86
 msgid "More"
 msgstr ""
@@ -6834,3 +6816,18 @@ msgstr "{project} में अपडेट: {update} {url}"
 
 #~ msgid "Talks"
 #~ msgstr "टॉक"
+
+#~ msgid "to save"
+#~ msgstr "सेव करने के लिए"
+
+#~ msgid "Save this project"
+#~ msgstr "इस प्रोजेक्ट को सेव करें"
+
+#~ msgid "Unsave this project"
+#~ msgstr "इस प्रोजेक्ट को सेव से हटाएँ"
+
+#~ msgid "Unsave"
+#~ msgstr "सेव से हटाएँ "
+
+#~ msgid "Add to calendar"
+#~ msgstr "कैलेंडर में जोड़ें"
diff --git a/funnel/translations/messages.pot b/funnel/translations/messages.pot
index b8ab41ad0..9d1da5783 100644
--- a/funnel/translations/messages.pot
+++ b/funnel/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-15 22:01+0530\n"
+"POT-Creation-Date: 2021-01-22 13:54+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -228,7 +228,7 @@ msgid "Type"
 msgstr ""
 
 #: funnel/forms/account.py:388 funnel/templates/layout.html.jinja2:70
-#: funnel/templates/macros.html.jinja2:636
+#: funnel/templates/macros.html.jinja2:652
 msgid "Home"
 msgstr ""
 
@@ -976,7 +976,7 @@ msgstr ""
 msgid "Quotes are not necessary in the location name"
 msgstr ""
 
-#: funnel/forms/project.py:90 funnel/templates/project.html.jinja2:69
+#: funnel/forms/project.py:90 funnel/templates/project.html.jinja2:81
 msgid "Feature this project"
 msgstr ""
 
@@ -1080,7 +1080,7 @@ msgstr ""
 msgid "Content"
 msgstr ""
 
-#: funnel/forms/proposal.py:149 funnel/templates/macros.html.jinja2:262
+#: funnel/forms/proposal.py:149
 msgid "Video"
 msgstr ""
 
@@ -1268,8 +1268,7 @@ msgstr ""
 msgid "Please enter a valid color code"
 msgstr ""
 
-#: funnel/forms/venue.py:105 funnel/templates/macros.html.jinja2:259
-#: funnel/templates/project.html.jinja2:212
+#: funnel/forms/venue.py:105 funnel/templates/project.html.jinja2:242
 msgid "Venue"
 msgstr ""
 
@@ -1395,7 +1394,7 @@ msgid "{user} commented"
 msgstr ""
 
 #: funnel/models/commentvote.py:322 funnel/models/commentvote.py:327
-#: funnel/templates/macros.html.jinja2:265
+#: funnel/templates/macros.html.jinja2:277
 #: funnel/templates/project_membership.html.jinja2:4
 #: funnel/templates/project_membership.html.jinja2:17
 msgid "Crew"
@@ -1421,59 +1420,59 @@ msgstr ""
 msgid "Not spam"
 msgstr ""
 
-#: funnel/models/notification.py:145
+#: funnel/models/notification.py:146
 msgid "Uncategorized"
 msgstr ""
 
-#: funnel/models/notification.py:146 funnel/templates/account.html.jinja2:5
+#: funnel/models/notification.py:147 funnel/templates/account.html.jinja2:5
 #: funnel/templates/account_saved.html.jinja2:4
 #: funnel/templates/js/badge.js.jinja2:96
 #: funnel/templates/notification_preferences.html.jinja2:5
 msgid "My account"
 msgstr ""
 
-#: funnel/models/notification.py:148
+#: funnel/models/notification.py:149
 msgid "My subscriptions and billing"
 msgstr ""
 
-#: funnel/models/notification.py:152
+#: funnel/models/notification.py:153
 msgid "Projects I am participating in"
 msgstr ""
 
-#: funnel/models/notification.py:163
+#: funnel/models/notification.py:164
 msgid "Projects I am a crew member in"
 msgstr ""
 
-#: funnel/models/notification.py:171
+#: funnel/models/notification.py:172
 msgid "Organizations I manage"
 msgstr ""
 
-#: funnel/models/notification.py:179
+#: funnel/models/notification.py:180
 msgid "As a website administrator"
 msgstr ""
 
-#: funnel/models/notification.py:190
+#: funnel/models/notification.py:191
 msgid "Queued"
 msgstr ""
 
-#: funnel/models/notification.py:191
+#: funnel/models/notification.py:192
 msgid "Pending"
 msgstr ""
 
-#: funnel/models/notification.py:192
+#: funnel/models/notification.py:193
 msgid "Delivered"
 msgstr ""
 
-#: funnel/models/notification.py:193
+#: funnel/models/notification.py:194
 msgid "Failed"
 msgstr ""
 
-#: funnel/models/notification.py:194
+#: funnel/models/notification.py:195
 #: funnel/templates/auth_client.html.jinja2:75
 msgid "Unknown"
 msgstr ""
 
-#: funnel/models/notification.py:253
+#: funnel/models/notification.py:254
 msgid "Unspecified notification type"
 msgstr ""
 
@@ -1580,11 +1579,11 @@ msgstr ""
 msgid "Private"
 msgstr ""
 
-#: funnel/models/profile.py:384 funnel/templates/macros.html.jinja2:590
+#: funnel/models/profile.py:384 funnel/templates/macros.html.jinja2:606
 msgid "Make public"
 msgstr ""
 
-#: funnel/models/profile.py:389 funnel/templates/macros.html.jinja2:540
+#: funnel/models/profile.py:389 funnel/templates/macros.html.jinja2:556
 msgid "Make private"
 msgstr ""
 
@@ -1621,7 +1620,7 @@ msgid "Live"
 msgstr ""
 
 #: funnel/models/project.py:335 funnel/models/project.py:381
-#: funnel/templates/macros.html.jinja2:459
+#: funnel/templates/macros.html.jinja2:475
 msgid "Upcoming"
 msgstr ""
 
@@ -1753,7 +1752,7 @@ msgstr ""
 msgid "Send Back to Submitted"
 msgstr ""
 
-#: funnel/models/proposal.py:384 funnel/templates/macros.html.jinja2:198
+#: funnel/models/proposal.py:384 funnel/templates/macros.html.jinja2:125
 #: funnel/views/commentvote.py:463 funnel/views/login_session.py:426
 msgid "Confirm"
 msgstr ""
@@ -1902,7 +1901,6 @@ msgstr ""
 #: funnel/static/js/schedules.js:526 funnel/static/js/schedules.js:700
 #: funnel/static/js/schedules.js:720 funnel/static/js/schedules.packed.js:1
 #: funnel/templates/labels.html.jinja2:49
-#: funnel/templates/macros.html.jinja2:58
 #: funnel/templates/schedule_edit.html.jinja2:87
 #: funnel/views/organization.py:196 funnel/views/update.py:153
 #: funnel/views/venue.py:129 funnel/views/venue.py:200
@@ -2013,7 +2011,7 @@ msgid ""
 msgstr ""
 
 #: funnel/templates/about.html.jinja2:2 funnel/templates/about.html.jinja2:13
-#: funnel/templates/macros.html.jinja2:671
+#: funnel/templates/macros.html.jinja2:687
 msgid "About Hasgeek"
 msgstr ""
 
@@ -2210,10 +2208,10 @@ msgstr ""
 #: funnel/templates/img_upload_formlayout.html.jinja2:6
 #: funnel/templates/labels_form.html.jinja2:18
 #: funnel/templates/layout.html.jinja2:124
-#: funnel/templates/macros.html.jinja2:190
-#: funnel/templates/macros.html.jinja2:207
-#: funnel/templates/macros.html.jinja2:528
-#: funnel/templates/macros.html.jinja2:580
+#: funnel/templates/macros.html.jinja2:117
+#: funnel/templates/macros.html.jinja2:138
+#: funnel/templates/macros.html.jinja2:544
+#: funnel/templates/macros.html.jinja2:596
 #: funnel/templates/project_cfp.html.jinja2:8
 #: funnel/templates/proposal_admin_panel.html.jinja2:5
 #: funnel/templates/schedule_edit.html.jinja2:95
@@ -2610,7 +2608,7 @@ msgstr ""
 
 #: funnel/templates/layout.html.jinja2:80
 #: funnel/templates/layout.html.jinja2:83
-#: funnel/templates/macros.html.jinja2:260
+#: funnel/templates/macros.html.jinja2:273
 #: funnel/templates/notification_feed.html.jinja2:5
 #: funnel/templates/updates.html.jinja2:4
 #: funnel/templates/updates.html.jinja2:17
@@ -2619,12 +2617,11 @@ msgstr ""
 
 #: funnel/templates/layout.html.jinja2:81
 #: funnel/templates/layout.html.jinja2:84
-#: funnel/templates/macros.html.jinja2:306
+#: funnel/templates/macros.html.jinja2:322
 msgid "Account"
 msgstr ""
 
 #: funnel/templates/layout.html.jinja2:92
-#: funnel/templates/macros.html.jinja2:56
 #: funnel/templates/signup_form.html.jinja2:26 funnel/views/login.py:205
 msgid "Login"
 msgstr ""
@@ -2645,22 +2642,6 @@ msgstr ""
 msgid "Logging out…"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:56
-msgid "to save"
-msgstr ""
-
-#: funnel/templates/macros.html.jinja2:58
-msgid "Save this project"
-msgstr ""
-
-#: funnel/templates/macros.html.jinja2:60
-msgid "Unsave this project"
-msgstr ""
-
-#: funnel/templates/macros.html.jinja2:60
-msgid "Unsave"
-msgstr ""
-
 #: funnel/templates/macros.html.jinja2:67
 msgid "Copy link"
 msgstr ""
@@ -2669,16 +2650,6 @@ msgstr ""
 msgid "Facebook"
 msgstr ""
 
-#: funnel/templates/js/comments.js.jinja2:81
-#: funnel/templates/macros.html.jinja2:79
-#: funnel/templates/macros.html.jinja2:82
-msgid "Share"
-msgstr ""
-
-#: funnel/templates/macros.html.jinja2:84
-msgid "Add to calendar"
-msgstr ""
-
 #: funnel/templates/macros.html.jinja2:91
 msgid "Update livestream URLs"
 msgstr ""
@@ -2687,116 +2658,117 @@ msgstr ""
 msgid "Update banner image"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:106 funnel/views/session.py:213
-msgid "This project will not be listed as it has no sessions in the schedule"
-msgstr ""
-
-#: funnel/templates/macros.html.jinja2:111
-msgid "This project is currently not published"
-msgstr ""
-
-#: funnel/templates/macros.html.jinja2:126
-msgid "Edit url"
-msgstr ""
-
-#: funnel/templates/macros.html.jinja2:135
-#: funnel/templates/macros.html.jinja2:365
-#: funnel/templates/macros.html.jinja2:390
-msgid "Livestream"
-msgstr ""
-
-#: funnel/templates/macros.html.jinja2:145
-#: funnel/templates/macros.html.jinja2:161
-#: funnel/templates/macros.html.jinja2:285
-msgid "Preview video"
+#: funnel/templates/macros.html.jinja2:104
+msgid "Tickets available!"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:180
-#: funnel/templates/macros.html.jinja2:256
+#: funnel/templates/macros.html.jinja2:105
 msgid "Get tickets"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:187
+#: funnel/templates/macros.html.jinja2:114
 msgid "Register"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:194
+#: funnel/templates/macros.html.jinja2:121
 msgid ""
 "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."
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:204
+#: funnel/templates/macros.html.jinja2:135
 msgid "Cancel registration"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:211
+#: funnel/templates/macros.html.jinja2:142
 msgid "Can’t make it?"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:215
+#: funnel/templates/macros.html.jinja2:146
 msgid "Confirm cancellation"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:221
+#: funnel/templates/macros.html.jinja2:153
 #: funnel/templates/project_rsvp_list.html.jinja2:3
 #: funnel/templates/settings.html.jinja2:116
 msgid "View participants"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:224
+#: funnel/templates/macros.html.jinja2:168 funnel/views/session.py:213
+msgid "This project will not be listed as it has no sessions in the schedule"
+msgstr ""
+
+#: funnel/templates/macros.html.jinja2:173
+msgid "This project is currently not published"
+msgstr ""
+
+#: funnel/templates/macros.html.jinja2:188
+msgid "Edit url"
+msgstr ""
+
+#: funnel/templates/macros.html.jinja2:197
+#: funnel/templates/macros.html.jinja2:381
+#: funnel/templates/macros.html.jinja2:406
+msgid "Livestream"
+msgstr ""
+
+#: funnel/templates/macros.html.jinja2:207
+#: funnel/templates/macros.html.jinja2:222
+#: funnel/templates/macros.html.jinja2:301
+msgid "Preview video"
+msgstr ""
+
+#: funnel/templates/macros.html.jinja2:240
 msgid "Add schedule to enable registrations"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:228
-#: funnel/templates/macros.html.jinja2:242
-#: funnel/templates/macros.html.jinja2:663
+#: funnel/templates/macros.html.jinja2:240
+msgid "Add schedule"
+msgstr ""
+
+#: funnel/templates/macros.html.jinja2:244
+#: funnel/templates/macros.html.jinja2:258
+#: funnel/templates/macros.html.jinja2:679
 #: funnel/templates/proposals.html.jinja2:44
 #: funnel/templates/proposals.html.jinja2:48 funnel/views/proposal.py:158
 msgid "Make a submission"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:229
-#: funnel/templates/macros.html.jinja2:346
+#: funnel/templates/macros.html.jinja2:245
+#: funnel/templates/macros.html.jinja2:362
 #: funnel/templates/proposals.html.jinja2:45
 #, python-format
 msgid "Submissions close at %(date)s"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:236
+#: funnel/templates/macros.html.jinja2:252
 msgid "Open submissions"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:237
+#: funnel/templates/macros.html.jinja2:253
 msgid "Add submission guidelines"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:243
+#: funnel/templates/macros.html.jinja2:259
 #: funnel/templates/proposals.html.jinja2:49
 msgid "Submissions are closed for this project"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:247
-#: funnel/templates/project.html.jinja2:230
+#: funnel/templates/macros.html.jinja2:263
+#: funnel/templates/project.html.jinja2:260
 #: funnel/templates/venues.html.jinja2:37 funnel/views/venue.py:52
 msgid "Add venue"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:254
+#: funnel/templates/macros.html.jinja2:271
 msgid "About"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:257
-#: funnel/templates/macros.html.jinja2:639
-#: funnel/templates/project.html.jinja2:125 funnel/views/search.py:173
-msgid "Sessions"
-msgstr ""
-
-#: funnel/templates/macros.html.jinja2:258
+#: funnel/templates/macros.html.jinja2:272
 msgid "Jobs"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:261
+#: funnel/templates/macros.html.jinja2:274
 #: funnel/templates/project_comments.html.jinja2:4
 #: funnel/templates/project_comments.html.jinja2:20
 #: funnel/templates/proposal.html.jinja2:204 funnel/views/search.py:270
@@ -2804,220 +2776,218 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:263
-#: funnel/templates/macros.html.jinja2:641
-#: funnel/templates/project.html.jinja2:186
+#: funnel/templates/macros.html.jinja2:275
+#: funnel/templates/macros.html.jinja2:657
+#: funnel/templates/project.html.jinja2:216
 #: funnel/templates/proposals.html.jinja2:4
 #: funnel/templates/proposals.html.jinja2:17
 #: funnel/templates/user_profile_proposals.html.jinja2:10
 msgid "Submissions"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:264
-#: funnel/templates/macros.html.jinja2:391
+#: funnel/templates/macros.html.jinja2:276
+#: funnel/templates/macros.html.jinja2:407
 #: funnel/templates/schedule.html.jinja2:5
 #: funnel/templates/schedule.html.jinja2:70
 #: funnel/templates/schedule_edit.html.jinja2:4
 msgid "Schedule"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:266
-#: funnel/templates/schedule_edit.html.jinja2:51
-#: funnel/templates/settings.html.jinja2:4
-#: funnel/templates/settings.html.jinja2:16
-msgid "Settings"
-msgstr ""
-
 #: funnel/templates/js/update.js.jinja2:65
-#: funnel/templates/macros.html.jinja2:273
+#: funnel/templates/macros.html.jinja2:289
 msgid "This update is for participants only"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:291
+#: funnel/templates/macros.html.jinja2:307
 msgid "Edit submission video"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:293
+#: funnel/templates/macros.html.jinja2:309
 #: funnel/templates/proposal.html.jinja2:50
 msgid "Edit session video"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:307
+#: funnel/templates/macros.html.jinja2:323
 msgid "Notifications"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:308
+#: funnel/templates/macros.html.jinja2:324
 msgid "My saves"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:309
+#: funnel/templates/macros.html.jinja2:325
 #: funnel/templates/scan_contact.html.jinja2:4
 msgid "Scan badge"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:310
+#: funnel/templates/macros.html.jinja2:326
 msgid "Contacts"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:363
+#: funnel/templates/macros.html.jinja2:379
 msgid "Live schedule"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:367
+#: funnel/templates/macros.html.jinja2:383
 msgid "Livestream and schedule"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:387
+#: funnel/templates/macros.html.jinja2:403
 #, python-format
 msgid "Session starts at %(session)s"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:390
+#: funnel/templates/macros.html.jinja2:406
 msgid "Watch livestream"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:407
+#: funnel/templates/macros.html.jinja2:423
 msgid "Spotlight"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:479
+#: funnel/templates/macros.html.jinja2:495
 msgid "Accepting submissions"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:491
+#: funnel/templates/macros.html.jinja2:507
 #: funnel/templates/profile.html.jinja2:96
 msgid "Show more"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:505
+#: funnel/templates/macros.html.jinja2:521
 msgid "All projects"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:522
+#: funnel/templates/macros.html.jinja2:538
 msgid "Manage admins"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:522
+#: funnel/templates/macros.html.jinja2:538
 msgid "View admins"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:523
+#: funnel/templates/macros.html.jinja2:539
 msgid "Edit this profile"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:523
+#: funnel/templates/macros.html.jinja2:539
 msgid "Make profile private"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:529
+#: funnel/templates/macros.html.jinja2:545
 msgid "Make this profile private?"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:533
+#: funnel/templates/macros.html.jinja2:549
 msgid "Your profile will not be visible to anyone other than you"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:534
+#: funnel/templates/macros.html.jinja2:550
 msgid "It will not be listed in search results"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:535
+#: funnel/templates/macros.html.jinja2:551
 msgid "You cannot host projects from this profile"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:536
+#: funnel/templates/macros.html.jinja2:552
 msgid ""
 "Any existing projects will become inaccessible until the profile is "
 "public again"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:559
+#: funnel/templates/macros.html.jinja2:575
 msgid "Add cover photo url"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:559
+#: funnel/templates/macros.html.jinja2:575
 msgid "Add cover photo"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:575
-#: funnel/templates/macros.html.jinja2:622
+#: funnel/templates/macros.html.jinja2:591
+#: funnel/templates/macros.html.jinja2:638
 #: funnel/templates/profile.html.jinja2:83
 msgid "New project"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:577
-#: funnel/templates/macros.html.jinja2:624
+#: funnel/templates/macros.html.jinja2:593
+#: funnel/templates/macros.html.jinja2:640
 msgid "Make profile public"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:581
+#: funnel/templates/macros.html.jinja2:597
 msgid "Make this profile public?"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:585
+#: funnel/templates/macros.html.jinja2:601
 msgid "Your profile will be visible to anyone visiting the page"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:586
+#: funnel/templates/macros.html.jinja2:602
 msgid "Your profile will be listed in search results"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:614
+#: funnel/templates/macros.html.jinja2:630
 #, python-format
 msgid "Joined %(date)s"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:637
+#: funnel/templates/macros.html.jinja2:653
 #: funnel/templates/organization_membership.html.jinja2:15
 msgid "Admins"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:640
+#: funnel/templates/macros.html.jinja2:655
+#: funnel/templates/project.html.jinja2:137 funnel/views/search.py:173
+msgid "Sessions"
+msgstr ""
+
+#: funnel/templates/macros.html.jinja2:656
 #: funnel/templates/user_profile_projects.html.jinja2:10
 #: funnel/views/search.py:76
 msgid "Projects"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:657
-#: funnel/templates/project.html.jinja2:90
+#: funnel/templates/macros.html.jinja2:673
+#: funnel/templates/project.html.jinja2:102
 #: funnel/templates/project_admin.html.jinja2:39
 msgid "Tickets"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:659
+#: funnel/templates/macros.html.jinja2:675
 msgid "Attend"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:672
+#: funnel/templates/macros.html.jinja2:688
 msgid "Team &amp; careers"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:673
+#: funnel/templates/macros.html.jinja2:689
 msgid "Contact"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:674
+#: funnel/templates/macros.html.jinja2:690
 #: funnel/templates/policy.html.jinja2:14
 msgid "Site policies"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:705
+#: funnel/templates/macros.html.jinja2:721
 msgid "Outstation speaker"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:706
+#: funnel/templates/macros.html.jinja2:722
 msgid "(proposing)"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:720
+#: funnel/templates/macros.html.jinja2:734
 msgid "This proposal has a preview video"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:725
+#: funnel/templates/macros.html.jinja2:739
 msgid "This proposal has slides"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:740
+#: funnel/templates/macros.html.jinja2:754
 msgid "(No sessions have been submitted)"
 msgstr ""
 
@@ -3032,7 +3002,7 @@ msgstr ""
 
 #: funnel/templates/meta_refresh.html.jinja2:6
 #: funnel/templates/meta_refresh.html.jinja2:28
-#: funnel/templates/project.html.jinja2:224
+#: funnel/templates/project.html.jinja2:254
 #: funnel/templates/redirect.html.jinja2:1
 msgid "Loading…"
 msgstr ""
@@ -3166,7 +3136,8 @@ msgstr ""
 msgid "Unscheduled projects"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:90
+#: funnel/templates/project.html.jinja2:62
+#: funnel/templates/project.html.jinja2:102
 #: funnel/templates/project_comments.html.jinja2:20
 #: funnel/templates/project_membership.html.jinja2:17
 #: funnel/templates/proposal.html.jinja2:72
@@ -3178,27 +3149,33 @@ msgstr ""
 msgid "Back to the project"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:100
+#: funnel/templates/project.html.jinja2:112
 msgid "Edit details"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:103
+#: funnel/templates/project.html.jinja2:115
 msgid "Related events"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:174
+#: funnel/templates/project.html.jinja2:186
 msgid "View Schedule"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:195
+#: funnel/templates/project.html.jinja2:198
+#: funnel/templates/session_videos.html.jinja2:3
+#: funnel/templates/session_videos.html.jinja2:16
+msgid "Videos"
+msgstr ""
+
+#: funnel/templates/project.html.jinja2:225
 msgid "See all"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:204
+#: funnel/templates/project.html.jinja2:234
 msgid "Related jobs"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:214
+#: funnel/templates/project.html.jinja2:244
 msgid "Update venue"
 msgstr ""
 
@@ -3394,6 +3371,12 @@ msgstr ""
 msgid "Unscheduled proposals"
 msgstr ""
 
+#: funnel/templates/schedule_edit.html.jinja2:51
+#: funnel/templates/settings.html.jinja2:4
+#: funnel/templates/settings.html.jinja2:16
+msgid "Settings"
+msgstr ""
+
 #: funnel/templates/schedule_edit.html.jinja2:88
 msgid "Revert"
 msgstr ""
@@ -3414,11 +3397,6 @@ msgstr ""
 msgid "Add to Google Calendar"
 msgstr ""
 
-#: funnel/templates/session_videos.html.jinja2:3
-#: funnel/templates/session_videos.html.jinja2:16
-msgid "Videos"
-msgstr ""
-
 #: funnel/templates/session_view_popup.html.jinja2:14
 msgid "This session has not been scheduled yet."
 msgstr ""
@@ -3665,6 +3643,10 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
+#: funnel/templates/js/comments.js.jinja2:81
+msgid "Share"
+msgstr ""
+
 #: funnel/templates/js/comments.js.jinja2:86
 msgid "More"
 msgstr ""

From d72d8494d5d38ed12b44406b3d8171e3677778f5 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 22 Jan 2021 14:08:27 +0530
Subject: [PATCH 03/11] Styling fixes

---
 funnel/static/css/app.css            |  5 +++--
 funnel/static/sass/_project.scss     |  5 +++--
 funnel/templates/macros.html.jinja2  | 16 +++++++++-------
 funnel/templates/project.html.jinja2 |  8 +++++---
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 15d8a2378..cdc1a3064 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -3697,7 +3697,8 @@ 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;
 }
 
@@ -3767,7 +3768,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;
   }
 }
diff --git a/funnel/static/sass/_project.scss b/funnel/static/sass/_project.scss
index f94c502f6..0774259df 100644
--- a/funnel/static/sass/_project.scss
+++ b/funnel/static/sass/_project.scss
@@ -227,7 +227,8 @@
       }
     }
   }
-  .project-details__box--ticketbox {
+  .project-details__box__content {
+    min-height: 22px;
     margin-bottom: $mui-grid-padding;
   }
 }
@@ -305,7 +306,7 @@
     .project-details__box--topmargin {
       margin-top: 42px;
     }
-    .project-details__box--ticketbox {
+    .project-details__box__content {
       margin-bottom: 0;
     }
   }
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index e713a8731..2680d0e84 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -256,13 +256,15 @@
         </div>
       {% endif %}
       <div class="grid__col-md-4 project-details__box {% if project.livestream_urls %}project-details__box--topmargin{% endif %}">
-        <div class="bookmark">{{ saveprojectform(project) }}</div>
-        {% if project.schedule_state.PUBLISHED and project.calendar_weeks_full.weeks and project.calendar_weeks_full.weeks|length > 0 %}
-          <div aria-label="{{ project.datelocation }}">
-            {{ calendarwidget(project.calendar_weeks_full, compact=false) }}
-          </div>
-        {% endif %}
-        <div class="project-details__box--ticketbox">
+        <div class="project-details__box__content">
+          <div class="bookmark">{{ saveprojectform(project) }}</div>
+          {% if project.schedule_state.PUBLISHED and project.calendar_weeks_full.weeks and project.calendar_weeks_full.weeks|length > 0 %}
+            <div aria-label="{{ project.datelocation }}">
+              {{ calendarwidget(project.calendar_weeks_full, compact=false) }}
+            </div>
+          {% endif %}
+        </div>
+        <div class="project-details__box__content">
           {% if project.view_for('edit_schedule').is_available() %}
             <a class="mui-btn mui-btn--raised mui-btn--dark  mui--d-block" href="{{ project.url_for('edit_schedule') }}"><span class="mui--hidden-lg">{% trans %}Add schedule to enable registrations{% endtrans %}</span><span class="mui--visible-lg-inline">{% trans %}Add schedule{% endtrans %}</span></a>
           {%- endif %}
diff --git a/funnel/templates/project.html.jinja2 b/funnel/templates/project.html.jinja2
index 6e6b10dbf..47795b0f2 100644
--- a/funnel/templates/project.html.jinja2
+++ b/funnel/templates/project.html.jinja2
@@ -75,9 +75,11 @@
       </div>
     </div>
   </div>
-  <div class="project-footer">
-    {{ registerblock(project) }}
-  </div>
+  {% if project.features.tickets() or project.features.rsvp() %}
+    <div class="project-footer">
+      {{ registerblock(project) }}
+    </div>
+  {% endif %}
 {% endblock %}
 
 {% block baseheadline %}

From 7f477b63531e1f328f027bcfea5e81086969faea Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 22 Jan 2021 15:58:07 +0530
Subject: [PATCH 04/11] CSS fixes

---
 funnel/static/css/app.css           | 7 ++++---
 funnel/static/sass/_project.scss    | 9 +++++----
 funnel/templates/macros.html.jinja2 | 4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index cdc1a3064..c89292d8c 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -3473,7 +3473,6 @@ a.loginbutton.hidden,
   display: flex;
   align-items: center;
   margin: 0;
-  padding: 0 0 0 16px;
 }
 .project-header .project-links,
 .project-header .hg-link-btn {
@@ -3499,9 +3498,10 @@ a.loginbutton.hidden,
 }
 .register-block .register-block__right {
   min-width: 155px;
+  text-align: right;
 }
-.register-block .register-block__right__btn {
-  margin-right: 8px;
+.register-block .register-block__right__menu {
+  margin-left: 8px;
 }
 
 .project-footer {
@@ -3542,6 +3542,7 @@ a.loginbutton.hidden,
     min-width: 450px;
     justify-content: space-around;
     align-items: center;
+    padding-right: 16px;
   }
   .sub-navbar-container__inner .desktop-navbar-items .project-header {
     margin: 0 16px 0 0;
diff --git a/funnel/static/sass/_project.scss b/funnel/static/sass/_project.scss
index 0774259df..ff16a5306 100644
--- a/funnel/static/sass/_project.scss
+++ b/funnel/static/sass/_project.scss
@@ -8,7 +8,6 @@
   display: flex;
   align-items: center;
   margin: 0;
-  padding: 0 0 0 $mui-grid-padding;
   .project-links,
   .hg-link-btn {
     padding-right: $mui-grid-padding;
@@ -33,9 +32,10 @@
 
   .register-block__right {
     min-width: 155px;
+    text-align: right;
   }
-  .register-block__right__btn {
-    margin-right: $mui-grid-padding/2;
+  .register-block__right__menu {
+    margin-left: $mui-grid-padding/2;
   }
 }
 
@@ -80,8 +80,9 @@
       min-width: 450px;
       justify-content: space-around;
       align-items: center;
+      padding-right: $mui-grid-padding;
       .project-header {
-        margin: 0 16px 0 0;
+        margin: 0 $mui-grid-padding 0 0;
       }
     }
   }
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index 2680d0e84..4a19c25c1 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -121,7 +121,7 @@
     {% elif project.features.rsvp() %}
       {%- if current_auth.is_anonymous %}
         <p class="register-block__txt mui--text-body2 mui--text-light">{{ project.views.registration_text() }}</p>
-        <a class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin"  href="{{ url_for('login') }}">Login to register</a>
+        <a class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin"  href="{{ url_for('login') }}">Register</a>
       {% elif project.features.rsvp_unregistered() -%}
         <p class="register-block__txt mui--text-body2 mui--text-light">{{ project.views.registration_text() }}</p>
       {%- elif project.features.rsvp_registered() %}
@@ -147,7 +147,7 @@
           </div>
         {%- endif %}
         {% if project.features.rsvp_registered() or project.view_for('rsvp_list').is_available() %}
-          <div class="mui-dropdown mui--align-middle">
+          <div class="mui-dropdown mui--align-middle register-block__right__menu">
             <a href="javascript:void(0)" class="mui--align-middle" data-mui-toggle="dropdown">{{ faicon(icon='ellipsis-v', icon_size='subhead') }}</a>
             <ul class="mui-dropdown__menu mui-dropdown__menu--right">
               {% if project.features.rsvp_registered() %}

From e64f8fa811dd6807f71edf79372e0e059a73bc7a Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Wed, 27 Jan 2021 15:31:23 +0530
Subject: [PATCH 05/11] Registration text changes

---
 funnel/assets/js/project.js          |  2 +-
 funnel/assets/js/util.js             | 23 -----------------------
 funnel/static/css/app.css            | 17 +++++++++++------
 funnel/static/sass/_layout.scss      |  4 ++--
 funnel/static/sass/_project.scss     | 13 +++++++++----
 funnel/templates/macros.html.jinja2  | 20 +++++++++++++-------
 funnel/templates/project.html.jinja2 |  2 +-
 7 files changed, 37 insertions(+), 44 deletions(-)

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..0536c8af1 100644
--- a/funnel/assets/js/util.js
+++ b/funnel/assets/js/util.js
@@ -425,29 +425,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 c89292d8c..b345bd409 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;
@@ -3490,14 +3490,19 @@ a.loginbutton.hidden,
 
 .register-block {
   display: flex;
-  align-items: baseline;
+  align-items: center;
   justify-content: space-between;
 }
 .register-block .register-block__txt {
   margin: 0 16px 0 0;
 }
+.register-block .register-block__txt--small {
+  max-width: calc(100% - 140px);
+}
+.register-block .register-block__txt--smaller {
+  max-width: calc(100% - 170px);
+}
 .register-block .register-block__right {
-  min-width: 155px;
   text-align: right;
 }
 .register-block .register-block__right__menu {
@@ -3540,9 +3545,9 @@ a.loginbutton.hidden,
   .sub-navbar-container__inner .desktop-navbar-items {
     display: flex;
     min-width: 450px;
-    justify-content: space-around;
+    justify-content: flex-end;
     align-items: center;
-    padding-right: 16px;
+    padding: 0 16px;
   }
   .sub-navbar-container__inner .desktop-navbar-items .project-header {
     margin: 0 16px 0 0;
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 ff16a5306..8d302f092 100644
--- a/funnel/static/sass/_project.scss
+++ b/funnel/static/sass/_project.scss
@@ -24,14 +24,19 @@
 }
 .register-block {
   display: flex;
-  align-items: baseline;
+  align-items: center;
   justify-content: space-between;
   .register-block__txt {
     margin: 0 $mui-grid-padding 0 0;
   }
+  .register-block__txt--small {
+    max-width: calc(100% - 140px);
+  }
+  .register-block__txt--smaller {
+    max-width: calc(100% - 170px);
+  }
 
   .register-block__right {
-    min-width: 155px;
     text-align: right;
   }
   .register-block__right__menu {
@@ -78,9 +83,9 @@
     .desktop-navbar-items {
       display: flex;
       min-width: 450px;
-      justify-content: space-around;
+      justify-content: flex-end;
       align-items: center;
-      padding-right: $mui-grid-padding;
+      padding: 0 $mui-grid-padding;
       .project-header {
         margin: 0 $mui-grid-padding 0 0;
       }
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index 4a19c25c1..5481b5304 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -113,21 +113,27 @@
   {% endif %}
 {% endmacro %}
 
-{% macro registerblock(project, modalid='mob-register-modal') %}
+{% macro registerblock(project, modalid='mobile') %}
   <div class="register-block">
     {% if project.features.tickets()  %}
       <p class="register-block__txt mui--d-inlineblock mui--text-body2 mui--text-light">{% trans %}Tickets available!{% endtrans %}</p>
-      <a href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#tickets" class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" id="get-tickets">{% trans %}Get tickets{% endtrans %}</a>
+      <a href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#tickets" class="{%- if modalid != 'mobile' -%}js-open-ticket-widget{%- endif %} mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" id="get-tickets">{% trans %}Get tickets{% endtrans %}</a>
     {% elif project.features.rsvp() %}
       {%- if current_auth.is_anonymous %}
-        <p class="register-block__txt mui--text-body2 mui--text-light">{{ project.views.registration_text() }}</p>
+        <div class="register-block__txt register-block__txt--small">
+          <p class="mui--text-body2 mui--text-light zero-bottom-margin">{{ project.views.registration_text() }}</p>
+        </div>
         <a class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin"  href="{{ url_for('login') }}">Register</a>
       {% elif project.features.rsvp_unregistered() -%}
-        <p class="register-block__txt mui--text-body2 mui--text-light">{{ project.views.registration_text() }}</p>
+        <div class="register-block__txt register-block__txt--small {% if project.features.rsvp_registered() or project.view_for('rsvp_list').is_available() %} register-block__txt--smaller{%- endif %}">
+          <p class="mui--text-body2 mui--text-light zero-bottom-margin">{{ project.views.registration_text() }}</p>
+        </div>
       {%- elif project.features.rsvp_registered() %}
-        <p class="register-block__txt mui--text-body2 mui--text-light">{{ project.views.registration_text() }}{{ faicon(icon='check-circle-solid', baseline=true, css_class='mui--text-success fa-icon--left-margin') }}</p>
+        <div class="register-block__txt">
+          <p class="mui--text-body2 mui--text-light zero-bottom-margin">{{ project.views.registration_text() }}{{ faicon(icon='check-circle-solid', icon_size='caption', baseline=true, css_class='mui--text-success fa-icon--left-margin') }}</p>
+        </div>
       {%- endif %}
-      <div {% if not current_auth.is_anonymous and project.features.rsvp_unregistered() -%}class="register-block__right"{%- endif %}>
+      <div>
         {% if not current_auth.is_anonymous and project.features.rsvp_unregistered() -%}
           <a class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin register-block__right__btn" href="#{{modalid}}-register-modal" id="register-btn">{% trans %}Register{% endtrans %}</a>
           <div class="modal reg-modal" id="{{modalid}}-register-modal">
@@ -320,7 +326,7 @@
       </nav>
       <div class="desktop-navbar-items">
         {{ project_share(project) }}
-        {{ registerblock(project, modalid='desktop-register-modal') }}
+        {{ registerblock(project, modalid='desktop') }}
       </div>
     </div>
   </div>
diff --git a/funnel/templates/project.html.jinja2 b/funnel/templates/project.html.jinja2
index 47795b0f2..01cb0dfb5 100644
--- a/funnel/templates/project.html.jinja2
+++ b/funnel/templates/project.html.jinja2
@@ -111,7 +111,7 @@
             <div class="about__participate">
               <div class="mui--hidden-md mui--hidden-lg mui--hidden-xl about__participate__back-nav">
                 <div class="mobile-nav mui--z1">
-                  <a href="{{ project.url_for() }}" aria-label="{% trans %}Back to the project{% endtrans %}" class="mui--text-dark mobile-nav__icon" id="close-ticket-widget"data-ga="Back to the project page">{{ faicon(icon='arrow-left', icon_size='title') }}</a><span class="mui--text-dark mobile-nav__headline">{% trans %}Tickets{% endtrans %}</span>
+                  <a href="{{ project.url_for() }}" aria-label="{% trans %}Back to the project{% endtrans %}" class="mui--text-dark mobile-nav__icon" id="close-ticket-widget" data-ga="Back to the project page">{{ faicon(icon='arrow-left', icon_size='title') }}</a><span class="mui--text-dark mobile-nav__headline">{% trans %}Tickets{% endtrans %}</span>
                 </div>
               </div>
               <div id="tickets">

From a32e60f986d13c3ef419c8cb0412fbfa6666b0dc Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Wed, 27 Jan 2021 17:17:19 +0530
Subject: [PATCH 06/11] Translation files

---
 .../static/translations/hi_IN/baseframe.json  |  77 +++---
 .../hi_IN/LC_MESSAGES/messages.mo             | Bin 172495 -> 172495 bytes
 .../hi_IN/LC_MESSAGES/messages.po             | 220 +++++++++---------
 funnel/translations/messages.pot              | 220 +++++++++---------
 4 files changed, 266 insertions(+), 251 deletions(-)

diff --git a/funnel/static/translations/hi_IN/baseframe.json b/funnel/static/translations/hi_IN/baseframe.json
index 1c6a02710..886a7d50b 100644
--- a/funnel/static/translations/hi_IN/baseframe.json
+++ b/funnel/static/translations/hi_IN/baseframe.json
@@ -27,10 +27,19 @@
       "Value not in LabeledEnum": [null, ""],
       "Invalid Choice: could not coerce": [null, ""],
       "Not a valid choice": [null, "यह मान्य विकल्प नहीं हैं"],
-      "Field value must be a dictionary": [null, ""],
+      "Field value must be a dictionary": [
+        null,
+        "फील्ड वैल्यू एक डिक्शनरी होनी चाहिए"
+      ],
       "Invalid JSON: {0!r}": [null, "अमान्य JSON: {0!r}"],
-      "The JSON root must be a hash object": [null, ""],
-      "This form has already been submitted": [null, ""],
+      "The JSON root must be a hash object": [
+        null,
+        "JSON का रूट हैश ऑब्जेक्ट होना चाहिए"
+      ],
+      "This form has already been submitted": [
+        null,
+        "ये फॉर्म पहले ही जमा किया जा चुका है"
+      ],
       "This {attr} is already in use": [
         null,
         "यह {attr} पहले से इस्तेमाल में हैं"
@@ -58,7 +67,7 @@
       "This must be lesser than {other_label}": [null, ""],
       "This must be lesser than or equal to {other_label}": [null, ""],
       "This must not be the same as {other_label}": [null, ""],
-      "This is not a valid emoji": [null, ""],
+      "This is not a valid emoji": [null, "यह मान्य इमोजी नहीं है"],
       "This domain is not a public email domain": [
         null,
         "यह डोमेन सार्वजनिक ईमेल डोमेन नहीं है"
@@ -79,15 +88,21 @@
         null,
         "“{text}” से लिंक किया गया URL “{url}” या तो मान्य नहीं है या फिर इस वक्त पहुँचा नहीं जा सकता"
       ],
-      "This URL’s protocol is not allowed": [null, ""],
-      "This URL’s domain is not allowed": [null, ""],
+      "This URL’s protocol is not allowed": [
+        null,
+        "इस URL के प्रोटोकॉल अस्वीकृत है"
+      ],
+      "This URL’s domain is not allowed": [null, "इस URL के डोमेन अस्वीकृत है"],
       ", ": [null, ""],
-      "Email address identified": [null, ""],
+      "Email address identified": [null, "ईमेल पता पहचाना गया"],
       "This name contains unsupported characters. It should have letters, numbers and non-terminal hyphens only": [
         null,
-        ""
+        "इस नाम में असमर्थित पात्र हैं। इसमें केवल पत्र, संख्या और हाइफेन होने चाहिए"
+      ],
+      "Valid latitude and longitude expected": [
+        null,
+        "मान्य अक्षांश और देशांतर की जरूरत है"
       ],
-      "Valid latitude and longitude expected": [null, ""],
       "Latitude must be within ± 90 degrees": [
         null,
         "अक्षांश ± 90 डिग्री के अंदर होना चाहिए"
@@ -96,50 +111,50 @@
         null,
         "देशांतर ± 180 डिग्री के अंदर होना चाहिए"
       ],
-      "The server was temporarily unreachable. Try again": [null, ""],
+      "The server was temporarily unreachable. Try again": [
+        null,
+        "सर्वर थोड़ी देर के लिए पहुँच से बाहर था. फिर से कोशिश करें"
+      ],
       "Latitude": [null, "अक्षांश"],
       "Longitude": [null, "देशांतर"],
       "Image URL": [null, "इमेज URL"],
-      "Bad Request": [null, ""],
-      "This request was malformed and could not be processed.": [null, ""],
-      "Access denied": [null, ""],
-      "You do not have access to that page.": [null, ""],
-      "Not Found": [null, "नहीं मिल पाया"],
+      "Bad Request": [null, "अमान्य रिक्वेस्ट"],
+      "This request was malformed and could not be processed.": [
+        null,
+        "यह रिक्वेस्ट विकृत होने के कारण प्रोसेस नहीं हो पायी"
+      ],
+      "Access denied": [null, "पहुँच निषेध"],
+      "You do not have access to that page.": [
+        null,
+        "आपके पास उस पेज को खोलने की पहुंच नहीं है."
+      ],
+      "Not Found": [null, "नहीं मिला"],
       "The page you were looking for does not exist.": [
         null,
         "जिस पेज की आप तलाश कर रहे थे वह मौजूद नहीं है."
       ],
       "Unprocessable Entity": [null, ""],
-      "Too Many Requests": [null, ""],
+      "Too Many Requests": [null, "बहुत अधिक अनुरोध"],
       "You have exceeded the rate limit and must try after some time.": [
         null,
-        ""
+        "आपने दर सीमा पार कर दी है और आपको थोड़ी देर बाद कोशिश करनी होगी."
       ],
       "Internal Server Error": [null, "आंतरिक सर्वर त्रुटि"],
       "Something broke inside. A report has been sent to the server’s administrator. Our apologies for the inconvenience.": [
         null,
         ""
       ],
-      "This form has timed out. Please submit again to confirm": [null, ""],
+      "This form has timed out. Please submit again to confirm": [
+        null,
+        "इस फॉर्म को जमा करने का समय खत्म हो चुका है. पुष्टि के लिए कृपयाफिर से जमा करें"
+      ],
       "Please review the indicated issues": [
         null,
         "कृपया चिन्हांकित किये गए गलतियों का आलोच करें"
       ],
       "Loading…": [null, "लोडिंग…"],
       "Select or upload image": [null, "इमेज को चुने या फिर अपलोड करें"],
-      "Close": [null, "बंद करें"],
-      "URL": [null, "URL"],
-      "Emoji": [null, ""],
-      "Content": [null, ""],
-      "Webmail Domain": [null, ""],
-      "Not Webmail Domain": [null, ""],
-      "First": [null, ""],
-      "Second": [null, ""],
-      "Third": [null, ""],
-      "Position": [null, ""],
-      "Position Without Default": [null, ""],
-      "Name": [null, ""],
-      "Title": [null, ""]
+      "Close": [null, "बंद करें"]
     }
   }
 }
diff --git a/funnel/translations/hi_IN/LC_MESSAGES/messages.mo b/funnel/translations/hi_IN/LC_MESSAGES/messages.mo
index 588f7188b8e75548ec9b04831bf21e31b685ec4d..ff4a4da76b5459230e6dc0686503e34f7365e3b6 100644
GIT binary patch
delta 26
icmX?qnCtvut_`Ih+07LU&8-a0nrl98uldLrya52Ay$j9&

delta 26
icmX?qnCtvut_`Ih*^Lwojjc>gnrl98uldLrya52AQ47Za

diff --git a/funnel/translations/hi_IN/LC_MESSAGES/messages.po b/funnel/translations/hi_IN/LC_MESSAGES/messages.po
index eb4592ad9..620ac9abc 100644
--- a/funnel/translations/hi_IN/LC_MESSAGES/messages.po
+++ b/funnel/translations/hi_IN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: webmaster@hasgeek.com\n"
-"POT-Creation-Date: 2021-01-22 13:54+0530\n"
+"POT-Creation-Date: 2021-01-27 17:16+0530\n"
 "PO-Revision-Date: 2020-12-17 13:47+0530\n"
 "Last-Translator: Ritesh Raj\n"
 "Language: hi\n"
@@ -73,7 +73,7 @@ msgstr ""
 msgid "Link copied"
 msgstr ""
 
-#: funnel/assets/js/util.js:523
+#: funnel/assets/js/util.js:500
 msgid "Project added to Account > My saves"
 msgstr ""
 
@@ -239,7 +239,7 @@ msgid "Type"
 msgstr "प्रकार"
 
 #: funnel/forms/account.py:388 funnel/templates/layout.html.jinja2:70
-#: funnel/templates/macros.html.jinja2:652
+#: funnel/templates/macros.html.jinja2:660
 msgid "Home"
 msgstr "मुखपृष्ठ"
 
@@ -1031,7 +1031,7 @@ msgstr "लैंडिंग पेज की सामग्रियां"
 msgid "Quotes are not necessary in the location name"
 msgstr "स्थान के नाम में क्वोट लगाना आवश्यक नहीं है"
 
-#: funnel/forms/project.py:90 funnel/templates/project.html.jinja2:81
+#: funnel/forms/project.py:90 funnel/templates/project.html.jinja2:83
 msgid "Feature this project"
 msgstr ""
 
@@ -1331,7 +1331,7 @@ msgstr "कमरे का RGB रंग. बगैर ‘#’ के दर्
 msgid "Please enter a valid color code"
 msgstr "कृपया एक वैध कलर कोड दर्ज करें"
 
-#: funnel/forms/venue.py:105 funnel/templates/project.html.jinja2:242
+#: funnel/forms/venue.py:105 funnel/templates/project.html.jinja2:244
 msgid "Venue"
 msgstr "ईवेंट का स्थान"
 
@@ -1461,7 +1461,7 @@ msgid "{user} commented"
 msgstr "{user} ने कमेंट किया"
 
 #: funnel/models/commentvote.py:322 funnel/models/commentvote.py:327
-#: funnel/templates/macros.html.jinja2:277
+#: funnel/templates/macros.html.jinja2:285
 #: funnel/templates/project_membership.html.jinja2:4
 #: funnel/templates/project_membership.html.jinja2:17
 msgid "Crew"
@@ -1646,11 +1646,11 @@ msgstr "सार्वजनिक"
 msgid "Private"
 msgstr "निजी"
 
-#: funnel/models/profile.py:384 funnel/templates/macros.html.jinja2:606
+#: funnel/models/profile.py:384 funnel/templates/macros.html.jinja2:614
 msgid "Make public"
 msgstr "सार्वजनिक बनाएं"
 
-#: funnel/models/profile.py:389 funnel/templates/macros.html.jinja2:556
+#: funnel/models/profile.py:389 funnel/templates/macros.html.jinja2:564
 msgid "Make private"
 msgstr "निजी बनाएं"
 
@@ -1687,7 +1687,7 @@ msgid "Live"
 msgstr "लाइव"
 
 #: funnel/models/project.py:335 funnel/models/project.py:381
-#: funnel/templates/macros.html.jinja2:475
+#: funnel/templates/macros.html.jinja2:483
 msgid "Upcoming"
 msgstr "आने वाले"
 
@@ -1819,7 +1819,7 @@ msgstr "इस प्रस्ताव को जमा कर दिया ग
 msgid "Send Back to Submitted"
 msgstr "जमा किए पर वापस भेजें"
 
-#: funnel/models/proposal.py:384 funnel/templates/macros.html.jinja2:125
+#: funnel/models/proposal.py:384 funnel/templates/macros.html.jinja2:131
 #: funnel/views/commentvote.py:463 funnel/views/login_session.py:426
 msgid "Confirm"
 msgstr "स्वीकृती दें"
@@ -2083,7 +2083,7 @@ msgstr ""
 "पर ईमेल करें."
 
 #: funnel/templates/about.html.jinja2:2 funnel/templates/about.html.jinja2:13
-#: funnel/templates/macros.html.jinja2:687
+#: funnel/templates/macros.html.jinja2:695
 msgid "About Hasgeek"
 msgstr "Hasgeek का परिचय"
 
@@ -2296,10 +2296,10 @@ msgstr "%(location)s – %(ipaddr)s से अनुमानित"
 #: funnel/templates/img_upload_formlayout.html.jinja2:6
 #: funnel/templates/labels_form.html.jinja2:18
 #: funnel/templates/layout.html.jinja2:124
-#: funnel/templates/macros.html.jinja2:117
-#: funnel/templates/macros.html.jinja2:138
-#: funnel/templates/macros.html.jinja2:544
-#: funnel/templates/macros.html.jinja2:596
+#: funnel/templates/macros.html.jinja2:123
+#: funnel/templates/macros.html.jinja2:144
+#: funnel/templates/macros.html.jinja2:552
+#: funnel/templates/macros.html.jinja2:604
 #: funnel/templates/project_cfp.html.jinja2:8
 #: funnel/templates/proposal_admin_panel.html.jinja2:5
 #: funnel/templates/schedule_edit.html.jinja2:95
@@ -2721,7 +2721,7 @@ msgstr "खोजें"
 
 #: funnel/templates/layout.html.jinja2:80
 #: funnel/templates/layout.html.jinja2:83
-#: funnel/templates/macros.html.jinja2:273
+#: funnel/templates/macros.html.jinja2:281
 #: funnel/templates/notification_feed.html.jinja2:5
 #: funnel/templates/updates.html.jinja2:4
 #: funnel/templates/updates.html.jinja2:17
@@ -2730,7 +2730,7 @@ msgstr "अपडेट"
 
 #: funnel/templates/layout.html.jinja2:81
 #: funnel/templates/layout.html.jinja2:84
-#: funnel/templates/macros.html.jinja2:322
+#: funnel/templates/macros.html.jinja2:330
 msgid "Account"
 msgstr "अकाउंट"
 
@@ -2779,11 +2779,11 @@ msgstr ""
 msgid "Get tickets"
 msgstr "टिकट पाएं"
 
-#: funnel/templates/macros.html.jinja2:114
+#: funnel/templates/macros.html.jinja2:120
 msgid "Register"
 msgstr "रजिस्टर करें"
 
-#: funnel/templates/macros.html.jinja2:121
+#: funnel/templates/macros.html.jinja2:127
 msgid ""
 "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."
@@ -2792,101 +2792,101 @@ msgstr ""
 "साझा किया जाएगा ताकि आपको इससे जुड़ी जानकारियों से अवगत रख सकें. आप किसी "
 "भी समय अपना रजिस्ट्रेशन रद्द कर सकते हैं."
 
-#: funnel/templates/macros.html.jinja2:135
+#: funnel/templates/macros.html.jinja2:141
 msgid "Cancel registration"
 msgstr "रजिस्ट्रेशन रद्द करें"
 
-#: funnel/templates/macros.html.jinja2:142
+#: funnel/templates/macros.html.jinja2:148
 msgid "Can’t make it?"
 msgstr "आप मदद नहीं कर सकते?"
 
-#: funnel/templates/macros.html.jinja2:146
+#: funnel/templates/macros.html.jinja2:152
 msgid "Confirm cancellation"
 msgstr "रद्द करने की पुष्टि करें"
 
-#: funnel/templates/macros.html.jinja2:153
+#: funnel/templates/macros.html.jinja2:159
 #: funnel/templates/project_rsvp_list.html.jinja2:3
 #: funnel/templates/settings.html.jinja2:116
 msgid "View participants"
 msgstr "प्रतिभागियों को देखें"
 
-#: funnel/templates/macros.html.jinja2:168 funnel/views/session.py:213
+#: funnel/templates/macros.html.jinja2:174 funnel/views/session.py:213
 msgid "This project will not be listed as it has no sessions in the schedule"
 msgstr ""
 "इस प्रोजेक्ट को सूचीबद्ध नहीं किया जाएगा क्योंकि इसके समय-सूची में कोई "
 "सेशन मौजूद नहीं है"
 
-#: funnel/templates/macros.html.jinja2:173
+#: funnel/templates/macros.html.jinja2:179
 msgid "This project is currently not published"
 msgstr "इस प्रोजेक्ट को फिलहाल प्रकाशित नहीं किया गया है"
 
-#: funnel/templates/macros.html.jinja2:188
+#: funnel/templates/macros.html.jinja2:194
 msgid "Edit url"
 msgstr "URL संपादित करें"
 
-#: funnel/templates/macros.html.jinja2:197
-#: funnel/templates/macros.html.jinja2:381
-#: funnel/templates/macros.html.jinja2:406
+#: funnel/templates/macros.html.jinja2:203
+#: funnel/templates/macros.html.jinja2:389
+#: funnel/templates/macros.html.jinja2:414
 msgid "Livestream"
 msgstr "लाइवस्ट्रीम"
 
-#: funnel/templates/macros.html.jinja2:207
-#: funnel/templates/macros.html.jinja2:222
-#: funnel/templates/macros.html.jinja2:301
+#: funnel/templates/macros.html.jinja2:213
+#: funnel/templates/macros.html.jinja2:228
+#: funnel/templates/macros.html.jinja2:309
 msgid "Preview video"
 msgstr "प्रीव्यू वीडियो"
 
-#: funnel/templates/macros.html.jinja2:240
+#: funnel/templates/macros.html.jinja2:248
 msgid "Add schedule to enable registrations"
 msgstr "रजिस्ट्रेशन शुरू करने के लिए समय-सूची जोड़ें"
 
-#: funnel/templates/macros.html.jinja2:240
+#: funnel/templates/macros.html.jinja2:248
 msgid "Add schedule"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:244
-#: funnel/templates/macros.html.jinja2:258
-#: funnel/templates/macros.html.jinja2:679
+#: funnel/templates/macros.html.jinja2:252
+#: funnel/templates/macros.html.jinja2:266
+#: funnel/templates/macros.html.jinja2:687
 #: funnel/templates/proposals.html.jinja2:44
 #: funnel/templates/proposals.html.jinja2:48 funnel/views/proposal.py:158
 msgid "Make a submission"
 msgstr "एक सबमिशन भेजें"
 
-#: funnel/templates/macros.html.jinja2:245
-#: funnel/templates/macros.html.jinja2:362
+#: funnel/templates/macros.html.jinja2:253
+#: funnel/templates/macros.html.jinja2:370
 #: funnel/templates/proposals.html.jinja2:45
 #, python-format
 msgid "Submissions close at %(date)s"
 msgstr "सबमिशन जमा करने की सुविधा %(date)s को बंद हो जाएगी"
 
-#: funnel/templates/macros.html.jinja2:252
+#: funnel/templates/macros.html.jinja2:260
 msgid "Open submissions"
 msgstr "सबमिशन को खोलें"
 
-#: funnel/templates/macros.html.jinja2:253
+#: funnel/templates/macros.html.jinja2:261
 msgid "Add submission guidelines"
 msgstr "सबमिशन की दिशा-निर्देश और समय-सूची जोड़ें"
 
-#: funnel/templates/macros.html.jinja2:259
+#: funnel/templates/macros.html.jinja2:267
 #: funnel/templates/proposals.html.jinja2:49
 msgid "Submissions are closed for this project"
 msgstr "इस प्रोजेक्ट के लिए प्रस्ताव जमा करने की सुविधा बंद की जा चुकी है"
 
-#: funnel/templates/macros.html.jinja2:263
-#: funnel/templates/project.html.jinja2:260
+#: funnel/templates/macros.html.jinja2:271
+#: funnel/templates/project.html.jinja2:262
 #: funnel/templates/venues.html.jinja2:37 funnel/views/venue.py:52
 msgid "Add venue"
 msgstr "ईवेंट का स्थान जोड़ें"
 
-#: funnel/templates/macros.html.jinja2:271
+#: funnel/templates/macros.html.jinja2:279
 msgid "About"
 msgstr "परिचय"
 
-#: funnel/templates/macros.html.jinja2:272
+#: funnel/templates/macros.html.jinja2:280
 msgid "Jobs"
 msgstr "नौकरियां"
 
-#: funnel/templates/macros.html.jinja2:274
+#: funnel/templates/macros.html.jinja2:282
 #: funnel/templates/project_comments.html.jinja2:4
 #: funnel/templates/project_comments.html.jinja2:20
 #: funnel/templates/proposal.html.jinja2:204 funnel/views/search.py:270
@@ -2894,17 +2894,17 @@ msgstr "नौकरियां"
 msgid "Comments"
 msgstr "कमेंट"
 
-#: funnel/templates/macros.html.jinja2:275
-#: funnel/templates/macros.html.jinja2:657
-#: funnel/templates/project.html.jinja2:216
+#: funnel/templates/macros.html.jinja2:283
+#: funnel/templates/macros.html.jinja2:665
+#: funnel/templates/project.html.jinja2:218
 #: funnel/templates/proposals.html.jinja2:4
 #: funnel/templates/proposals.html.jinja2:17
 #: funnel/templates/user_profile_proposals.html.jinja2:10
 msgid "Submissions"
 msgstr "सबमिशन"
 
-#: funnel/templates/macros.html.jinja2:276
-#: funnel/templates/macros.html.jinja2:407
+#: funnel/templates/macros.html.jinja2:284
+#: funnel/templates/macros.html.jinja2:415
 #: funnel/templates/schedule.html.jinja2:5
 #: funnel/templates/schedule.html.jinja2:70
 #: funnel/templates/schedule_edit.html.jinja2:4
@@ -2912,103 +2912,103 @@ msgid "Schedule"
 msgstr "कार्यक्रम"
 
 #: funnel/templates/js/update.js.jinja2:65
-#: funnel/templates/macros.html.jinja2:289
+#: funnel/templates/macros.html.jinja2:297
 msgid "This update is for participants only"
 msgstr "यह जानकारी केवल प्रतिभागियों के लिए है"
 
-#: funnel/templates/macros.html.jinja2:307
+#: funnel/templates/macros.html.jinja2:315
 msgid "Edit submission video"
 msgstr "सबमिशन से जुड़ा वीडियो संपादित करें"
 
-#: funnel/templates/macros.html.jinja2:309
+#: funnel/templates/macros.html.jinja2:317
 #: funnel/templates/proposal.html.jinja2:50
 msgid "Edit session video"
 msgstr "सेशन का वीडियो संपादित करें"
 
-#: funnel/templates/macros.html.jinja2:323
+#: funnel/templates/macros.html.jinja2:331
 msgid "Notifications"
 msgstr "नोटिफिकेशन"
 
-#: funnel/templates/macros.html.jinja2:324
+#: funnel/templates/macros.html.jinja2:332
 msgid "My saves"
 msgstr "मेरी सेव किये गए प्रोजेक्ट"
 
-#: funnel/templates/macros.html.jinja2:325
+#: funnel/templates/macros.html.jinja2:333
 #: funnel/templates/scan_contact.html.jinja2:4
 msgid "Scan badge"
 msgstr "बैज स्कैन करें"
 
-#: funnel/templates/macros.html.jinja2:326
+#: funnel/templates/macros.html.jinja2:334
 msgid "Contacts"
 msgstr "कॉन्टैक्ट"
 
-#: funnel/templates/macros.html.jinja2:379
+#: funnel/templates/macros.html.jinja2:387
 msgid "Live schedule"
 msgstr "लाइव कार्यक्रम"
 
-#: funnel/templates/macros.html.jinja2:383
+#: funnel/templates/macros.html.jinja2:391
 msgid "Livestream and schedule"
 msgstr "लाइवस्ट्रीम और कार्यक्रम"
 
-#: funnel/templates/macros.html.jinja2:403
+#: funnel/templates/macros.html.jinja2:411
 #, python-format
 msgid "Session starts at %(session)s"
 msgstr "सेशन %(session)s शुरू होगा"
 
-#: funnel/templates/macros.html.jinja2:406
+#: funnel/templates/macros.html.jinja2:414
 msgid "Watch livestream"
 msgstr "लाइवस्ट्रीम देखें"
 
-#: funnel/templates/macros.html.jinja2:423
+#: funnel/templates/macros.html.jinja2:431
 msgid "Spotlight"
 msgstr "झलकियां"
 
-#: funnel/templates/macros.html.jinja2:495
+#: funnel/templates/macros.html.jinja2:503
 msgid "Accepting submissions"
 msgstr "सब्मिशन स्वीकार कर रहे हैं"
 
-#: funnel/templates/macros.html.jinja2:507
+#: funnel/templates/macros.html.jinja2:515
 #: funnel/templates/profile.html.jinja2:96
 msgid "Show more"
 msgstr "और दिखाएं"
 
-#: funnel/templates/macros.html.jinja2:521
+#: funnel/templates/macros.html.jinja2:529
 msgid "All projects"
 msgstr "सभी प्रोजेक्ट"
 
-#: funnel/templates/macros.html.jinja2:538
+#: funnel/templates/macros.html.jinja2:546
 msgid "Manage admins"
 msgstr "एडमिंस को प्रबंधित करें"
 
-#: funnel/templates/macros.html.jinja2:538
+#: funnel/templates/macros.html.jinja2:546
 msgid "View admins"
 msgstr "एडमिंस को देखें"
 
-#: funnel/templates/macros.html.jinja2:539
+#: funnel/templates/macros.html.jinja2:547
 msgid "Edit this profile"
 msgstr "इस प्रोफाइल को संपादित करें"
 
-#: funnel/templates/macros.html.jinja2:539
+#: funnel/templates/macros.html.jinja2:547
 msgid "Make profile private"
 msgstr "प्रोफाइल को निजी बनाएं"
 
-#: funnel/templates/macros.html.jinja2:545
+#: funnel/templates/macros.html.jinja2:553
 msgid "Make this profile private?"
 msgstr "वाकई इस प्रोफाइल को निजी बनाना चाहते हैं?"
 
-#: funnel/templates/macros.html.jinja2:549
+#: funnel/templates/macros.html.jinja2:557
 msgid "Your profile will not be visible to anyone other than you"
 msgstr "आपका प्रोफाइल आपके अलावा किसी और को नहीं दिखाई देगा"
 
-#: funnel/templates/macros.html.jinja2:550
+#: funnel/templates/macros.html.jinja2:558
 msgid "It will not be listed in search results"
 msgstr "यह खोज परिणामों में भी दिखाई नहीं देगा"
 
-#: funnel/templates/macros.html.jinja2:551
+#: funnel/templates/macros.html.jinja2:559
 msgid "You cannot host projects from this profile"
 msgstr "आप इस प्रोफाइल से प्रोजेक्ट होस्ट नहीं कर सकते"
 
-#: funnel/templates/macros.html.jinja2:552
+#: funnel/templates/macros.html.jinja2:560
 msgid ""
 "Any existing projects will become inaccessible until the profile is "
 "public again"
@@ -3016,98 +3016,98 @@ msgstr ""
 "जब तक कि इस प्रोफाइल को दोबारा से सार्वजनिक नहीं बनाया जाता तब तक कोई भी "
 "मौजूदा प्रोजेक्ट इसके द्वारा एक्सेस नहीं किया जा सकता"
 
-#: funnel/templates/macros.html.jinja2:575
+#: funnel/templates/macros.html.jinja2:583
 msgid "Add cover photo url"
 msgstr "कवर फोटो का URL जोड़ें"
 
-#: funnel/templates/macros.html.jinja2:575
+#: funnel/templates/macros.html.jinja2:583
 msgid "Add cover photo"
 msgstr "कवर फोटो जोड़ें"
 
-#: funnel/templates/macros.html.jinja2:591
-#: funnel/templates/macros.html.jinja2:638
+#: funnel/templates/macros.html.jinja2:599
+#: funnel/templates/macros.html.jinja2:646
 #: funnel/templates/profile.html.jinja2:83
 msgid "New project"
 msgstr "नया प्रोजेक्ट"
 
-#: funnel/templates/macros.html.jinja2:593
-#: funnel/templates/macros.html.jinja2:640
+#: funnel/templates/macros.html.jinja2:601
+#: funnel/templates/macros.html.jinja2:648
 msgid "Make profile public"
 msgstr "प्रोफाइल को सार्वजनिक बनाएं"
 
-#: funnel/templates/macros.html.jinja2:597
+#: funnel/templates/macros.html.jinja2:605
 msgid "Make this profile public?"
 msgstr "इस प्रोफाइल को सार्वजनिक बनाएं?"
 
-#: funnel/templates/macros.html.jinja2:601
+#: funnel/templates/macros.html.jinja2:609
 msgid "Your profile will be visible to anyone visiting the page"
 msgstr "आपका प्रोफाइल इस पेज पर आने वाले सभी व्यक्तियों को दिखाई देगा"
 
-#: funnel/templates/macros.html.jinja2:602
+#: funnel/templates/macros.html.jinja2:610
 msgid "Your profile will be listed in search results"
 msgstr "आपका प्रोफाइल खोज प्राणिमों में दिखाई देगा"
 
-#: funnel/templates/macros.html.jinja2:630
+#: funnel/templates/macros.html.jinja2:638
 #, python-format
 msgid "Joined %(date)s"
 msgstr "%(date)s को जुड़े"
 
-#: funnel/templates/macros.html.jinja2:653
+#: funnel/templates/macros.html.jinja2:661
 #: funnel/templates/organization_membership.html.jinja2:15
 msgid "Admins"
 msgstr "एडमिन"
 
-#: funnel/templates/macros.html.jinja2:655
-#: funnel/templates/project.html.jinja2:137 funnel/views/search.py:173
+#: funnel/templates/macros.html.jinja2:663
+#: funnel/templates/project.html.jinja2:139 funnel/views/search.py:173
 msgid "Sessions"
 msgstr "सेशन"
 
-#: funnel/templates/macros.html.jinja2:656
+#: funnel/templates/macros.html.jinja2:664
 #: funnel/templates/user_profile_projects.html.jinja2:10
 #: funnel/views/search.py:76
 msgid "Projects"
 msgstr "प्रोजेक्ट"
 
-#: funnel/templates/macros.html.jinja2:673
-#: funnel/templates/project.html.jinja2:102
+#: funnel/templates/macros.html.jinja2:681
+#: funnel/templates/project.html.jinja2:104
 #: funnel/templates/project_admin.html.jinja2:39
 msgid "Tickets"
 msgstr "टिकटें"
 
-#: funnel/templates/macros.html.jinja2:675
+#: funnel/templates/macros.html.jinja2:683
 msgid "Attend"
 msgstr "हिस्सा लें"
 
-#: funnel/templates/macros.html.jinja2:688
+#: funnel/templates/macros.html.jinja2:696
 msgid "Team &amp; careers"
 msgstr "टीम &amp; करियर"
 
-#: funnel/templates/macros.html.jinja2:689
+#: funnel/templates/macros.html.jinja2:697
 msgid "Contact"
 msgstr "संपर्क"
 
-#: funnel/templates/macros.html.jinja2:690
+#: funnel/templates/macros.html.jinja2:698
 #: funnel/templates/policy.html.jinja2:14
 msgid "Site policies"
 msgstr "साइट नीतियां"
 
-#: funnel/templates/macros.html.jinja2:721
+#: funnel/templates/macros.html.jinja2:729
 msgid "Outstation speaker"
 msgstr "दूसरे शहर से आने वाले स्पीकर"
 
-#: funnel/templates/macros.html.jinja2:722
+#: funnel/templates/macros.html.jinja2:730
 msgid "(proposing)"
 msgstr "(प्रस्तुत कर रहे हैं)"
 
-#: funnel/templates/macros.html.jinja2:734
+#: funnel/templates/macros.html.jinja2:742
 msgid "This proposal has a preview video"
 msgstr "इस प्रस्ताव के साथ एक प्रीव्यू वीडियो मौजूद है"
 
-#: funnel/templates/macros.html.jinja2:739
+#: funnel/templates/macros.html.jinja2:747
 msgid "This proposal has slides"
 msgstr "इस प्रस्ताव में स्लाइड मौजूद है"
 
-#: funnel/templates/macros.html.jinja2:754
+#: funnel/templates/macros.html.jinja2:762
 msgid "(No sessions have been submitted)"
 msgstr "(सेशन की कोई जानकारी नहीं दी गई है)"
 
@@ -3122,7 +3122,7 @@ msgstr "आपको %(project)s में आमंत्रित किया
 
 #: funnel/templates/meta_refresh.html.jinja2:6
 #: funnel/templates/meta_refresh.html.jinja2:28
-#: funnel/templates/project.html.jinja2:254
+#: funnel/templates/project.html.jinja2:256
 #: funnel/templates/redirect.html.jinja2:1
 msgid "Loading…"
 msgstr "लोडिंग…"
@@ -3267,7 +3267,7 @@ msgid "Unscheduled projects"
 msgstr "अनिर्धारित प्रोजेक्ट"
 
 #: funnel/templates/project.html.jinja2:62
-#: funnel/templates/project.html.jinja2:102
+#: funnel/templates/project.html.jinja2:104
 #: funnel/templates/project_comments.html.jinja2:20
 #: funnel/templates/project_membership.html.jinja2:17
 #: funnel/templates/proposal.html.jinja2:72
@@ -3279,33 +3279,33 @@ msgstr "अनिर्धारित प्रोजेक्ट"
 msgid "Back to the project"
 msgstr "प्रोजेक्ट पर वापस जाएं"
 
-#: funnel/templates/project.html.jinja2:112
+#: funnel/templates/project.html.jinja2:114
 msgid "Edit details"
 msgstr "विवरण संपादित करें"
 
-#: funnel/templates/project.html.jinja2:115
+#: funnel/templates/project.html.jinja2:117
 msgid "Related events"
 msgstr "सम्बंधित ईवेंट"
 
-#: funnel/templates/project.html.jinja2:186
+#: funnel/templates/project.html.jinja2:188
 msgid "View Schedule"
 msgstr "कार्यक्रम देखें"
 
-#: funnel/templates/project.html.jinja2:198
+#: funnel/templates/project.html.jinja2:200
 #: funnel/templates/session_videos.html.jinja2:3
 #: funnel/templates/session_videos.html.jinja2:16
 msgid "Videos"
 msgstr "वीडियो"
 
-#: funnel/templates/project.html.jinja2:225
+#: funnel/templates/project.html.jinja2:227
 msgid "See all"
 msgstr "सारे देखें"
 
-#: funnel/templates/project.html.jinja2:234
+#: funnel/templates/project.html.jinja2:236
 msgid "Related jobs"
 msgstr "सम्बंधित नौकरियां"
 
-#: funnel/templates/project.html.jinja2:244
+#: funnel/templates/project.html.jinja2:246
 msgid "Update venue"
 msgstr "ईवेंट का स्थान अपडेट करें"
 
diff --git a/funnel/translations/messages.pot b/funnel/translations/messages.pot
index 9d1da5783..421615225 100644
--- a/funnel/translations/messages.pot
+++ b/funnel/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-22 13:54+0530\n"
+"POT-Creation-Date: 2021-01-27 17:16+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -72,7 +72,7 @@ msgstr ""
 msgid "Link copied"
 msgstr ""
 
-#: funnel/assets/js/util.js:523
+#: funnel/assets/js/util.js:500
 msgid "Project added to Account > My saves"
 msgstr ""
 
@@ -228,7 +228,7 @@ msgid "Type"
 msgstr ""
 
 #: funnel/forms/account.py:388 funnel/templates/layout.html.jinja2:70
-#: funnel/templates/macros.html.jinja2:652
+#: funnel/templates/macros.html.jinja2:660
 msgid "Home"
 msgstr ""
 
@@ -976,7 +976,7 @@ msgstr ""
 msgid "Quotes are not necessary in the location name"
 msgstr ""
 
-#: funnel/forms/project.py:90 funnel/templates/project.html.jinja2:81
+#: funnel/forms/project.py:90 funnel/templates/project.html.jinja2:83
 msgid "Feature this project"
 msgstr ""
 
@@ -1268,7 +1268,7 @@ msgstr ""
 msgid "Please enter a valid color code"
 msgstr ""
 
-#: funnel/forms/venue.py:105 funnel/templates/project.html.jinja2:242
+#: funnel/forms/venue.py:105 funnel/templates/project.html.jinja2:244
 msgid "Venue"
 msgstr ""
 
@@ -1394,7 +1394,7 @@ msgid "{user} commented"
 msgstr ""
 
 #: funnel/models/commentvote.py:322 funnel/models/commentvote.py:327
-#: funnel/templates/macros.html.jinja2:277
+#: funnel/templates/macros.html.jinja2:285
 #: funnel/templates/project_membership.html.jinja2:4
 #: funnel/templates/project_membership.html.jinja2:17
 msgid "Crew"
@@ -1579,11 +1579,11 @@ msgstr ""
 msgid "Private"
 msgstr ""
 
-#: funnel/models/profile.py:384 funnel/templates/macros.html.jinja2:606
+#: funnel/models/profile.py:384 funnel/templates/macros.html.jinja2:614
 msgid "Make public"
 msgstr ""
 
-#: funnel/models/profile.py:389 funnel/templates/macros.html.jinja2:556
+#: funnel/models/profile.py:389 funnel/templates/macros.html.jinja2:564
 msgid "Make private"
 msgstr ""
 
@@ -1620,7 +1620,7 @@ msgid "Live"
 msgstr ""
 
 #: funnel/models/project.py:335 funnel/models/project.py:381
-#: funnel/templates/macros.html.jinja2:475
+#: funnel/templates/macros.html.jinja2:483
 msgid "Upcoming"
 msgstr ""
 
@@ -1752,7 +1752,7 @@ msgstr ""
 msgid "Send Back to Submitted"
 msgstr ""
 
-#: funnel/models/proposal.py:384 funnel/templates/macros.html.jinja2:125
+#: funnel/models/proposal.py:384 funnel/templates/macros.html.jinja2:131
 #: funnel/views/commentvote.py:463 funnel/views/login_session.py:426
 msgid "Confirm"
 msgstr ""
@@ -2011,7 +2011,7 @@ msgid ""
 msgstr ""
 
 #: funnel/templates/about.html.jinja2:2 funnel/templates/about.html.jinja2:13
-#: funnel/templates/macros.html.jinja2:687
+#: funnel/templates/macros.html.jinja2:695
 msgid "About Hasgeek"
 msgstr ""
 
@@ -2208,10 +2208,10 @@ msgstr ""
 #: funnel/templates/img_upload_formlayout.html.jinja2:6
 #: funnel/templates/labels_form.html.jinja2:18
 #: funnel/templates/layout.html.jinja2:124
-#: funnel/templates/macros.html.jinja2:117
-#: funnel/templates/macros.html.jinja2:138
-#: funnel/templates/macros.html.jinja2:544
-#: funnel/templates/macros.html.jinja2:596
+#: funnel/templates/macros.html.jinja2:123
+#: funnel/templates/macros.html.jinja2:144
+#: funnel/templates/macros.html.jinja2:552
+#: funnel/templates/macros.html.jinja2:604
 #: funnel/templates/project_cfp.html.jinja2:8
 #: funnel/templates/proposal_admin_panel.html.jinja2:5
 #: funnel/templates/schedule_edit.html.jinja2:95
@@ -2608,7 +2608,7 @@ msgstr ""
 
 #: funnel/templates/layout.html.jinja2:80
 #: funnel/templates/layout.html.jinja2:83
-#: funnel/templates/macros.html.jinja2:273
+#: funnel/templates/macros.html.jinja2:281
 #: funnel/templates/notification_feed.html.jinja2:5
 #: funnel/templates/updates.html.jinja2:4
 #: funnel/templates/updates.html.jinja2:17
@@ -2617,7 +2617,7 @@ msgstr ""
 
 #: funnel/templates/layout.html.jinja2:81
 #: funnel/templates/layout.html.jinja2:84
-#: funnel/templates/macros.html.jinja2:322
+#: funnel/templates/macros.html.jinja2:330
 msgid "Account"
 msgstr ""
 
@@ -2666,109 +2666,109 @@ msgstr ""
 msgid "Get tickets"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:114
+#: funnel/templates/macros.html.jinja2:120
 msgid "Register"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:121
+#: funnel/templates/macros.html.jinja2:127
 msgid ""
 "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."
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:135
+#: funnel/templates/macros.html.jinja2:141
 msgid "Cancel registration"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:142
+#: funnel/templates/macros.html.jinja2:148
 msgid "Can’t make it?"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:146
+#: funnel/templates/macros.html.jinja2:152
 msgid "Confirm cancellation"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:153
+#: funnel/templates/macros.html.jinja2:159
 #: funnel/templates/project_rsvp_list.html.jinja2:3
 #: funnel/templates/settings.html.jinja2:116
 msgid "View participants"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:168 funnel/views/session.py:213
+#: funnel/templates/macros.html.jinja2:174 funnel/views/session.py:213
 msgid "This project will not be listed as it has no sessions in the schedule"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:173
+#: funnel/templates/macros.html.jinja2:179
 msgid "This project is currently not published"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:188
+#: funnel/templates/macros.html.jinja2:194
 msgid "Edit url"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:197
-#: funnel/templates/macros.html.jinja2:381
-#: funnel/templates/macros.html.jinja2:406
+#: funnel/templates/macros.html.jinja2:203
+#: funnel/templates/macros.html.jinja2:389
+#: funnel/templates/macros.html.jinja2:414
 msgid "Livestream"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:207
-#: funnel/templates/macros.html.jinja2:222
-#: funnel/templates/macros.html.jinja2:301
+#: funnel/templates/macros.html.jinja2:213
+#: funnel/templates/macros.html.jinja2:228
+#: funnel/templates/macros.html.jinja2:309
 msgid "Preview video"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:240
+#: funnel/templates/macros.html.jinja2:248
 msgid "Add schedule to enable registrations"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:240
+#: funnel/templates/macros.html.jinja2:248
 msgid "Add schedule"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:244
-#: funnel/templates/macros.html.jinja2:258
-#: funnel/templates/macros.html.jinja2:679
+#: funnel/templates/macros.html.jinja2:252
+#: funnel/templates/macros.html.jinja2:266
+#: funnel/templates/macros.html.jinja2:687
 #: funnel/templates/proposals.html.jinja2:44
 #: funnel/templates/proposals.html.jinja2:48 funnel/views/proposal.py:158
 msgid "Make a submission"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:245
-#: funnel/templates/macros.html.jinja2:362
+#: funnel/templates/macros.html.jinja2:253
+#: funnel/templates/macros.html.jinja2:370
 #: funnel/templates/proposals.html.jinja2:45
 #, python-format
 msgid "Submissions close at %(date)s"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:252
+#: funnel/templates/macros.html.jinja2:260
 msgid "Open submissions"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:253
+#: funnel/templates/macros.html.jinja2:261
 msgid "Add submission guidelines"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:259
+#: funnel/templates/macros.html.jinja2:267
 #: funnel/templates/proposals.html.jinja2:49
 msgid "Submissions are closed for this project"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:263
-#: funnel/templates/project.html.jinja2:260
+#: funnel/templates/macros.html.jinja2:271
+#: funnel/templates/project.html.jinja2:262
 #: funnel/templates/venues.html.jinja2:37 funnel/views/venue.py:52
 msgid "Add venue"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:271
+#: funnel/templates/macros.html.jinja2:279
 msgid "About"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:272
+#: funnel/templates/macros.html.jinja2:280
 msgid "Jobs"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:274
+#: funnel/templates/macros.html.jinja2:282
 #: funnel/templates/project_comments.html.jinja2:4
 #: funnel/templates/project_comments.html.jinja2:20
 #: funnel/templates/proposal.html.jinja2:204 funnel/views/search.py:270
@@ -2776,17 +2776,17 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:275
-#: funnel/templates/macros.html.jinja2:657
-#: funnel/templates/project.html.jinja2:216
+#: funnel/templates/macros.html.jinja2:283
+#: funnel/templates/macros.html.jinja2:665
+#: funnel/templates/project.html.jinja2:218
 #: funnel/templates/proposals.html.jinja2:4
 #: funnel/templates/proposals.html.jinja2:17
 #: funnel/templates/user_profile_proposals.html.jinja2:10
 msgid "Submissions"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:276
-#: funnel/templates/macros.html.jinja2:407
+#: funnel/templates/macros.html.jinja2:284
+#: funnel/templates/macros.html.jinja2:415
 #: funnel/templates/schedule.html.jinja2:5
 #: funnel/templates/schedule.html.jinja2:70
 #: funnel/templates/schedule_edit.html.jinja2:4
@@ -2794,200 +2794,200 @@ msgid "Schedule"
 msgstr ""
 
 #: funnel/templates/js/update.js.jinja2:65
-#: funnel/templates/macros.html.jinja2:289
+#: funnel/templates/macros.html.jinja2:297
 msgid "This update is for participants only"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:307
+#: funnel/templates/macros.html.jinja2:315
 msgid "Edit submission video"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:309
+#: funnel/templates/macros.html.jinja2:317
 #: funnel/templates/proposal.html.jinja2:50
 msgid "Edit session video"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:323
+#: funnel/templates/macros.html.jinja2:331
 msgid "Notifications"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:324
+#: funnel/templates/macros.html.jinja2:332
 msgid "My saves"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:325
+#: funnel/templates/macros.html.jinja2:333
 #: funnel/templates/scan_contact.html.jinja2:4
 msgid "Scan badge"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:326
+#: funnel/templates/macros.html.jinja2:334
 msgid "Contacts"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:379
+#: funnel/templates/macros.html.jinja2:387
 msgid "Live schedule"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:383
+#: funnel/templates/macros.html.jinja2:391
 msgid "Livestream and schedule"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:403
+#: funnel/templates/macros.html.jinja2:411
 #, python-format
 msgid "Session starts at %(session)s"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:406
+#: funnel/templates/macros.html.jinja2:414
 msgid "Watch livestream"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:423
+#: funnel/templates/macros.html.jinja2:431
 msgid "Spotlight"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:495
+#: funnel/templates/macros.html.jinja2:503
 msgid "Accepting submissions"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:507
+#: funnel/templates/macros.html.jinja2:515
 #: funnel/templates/profile.html.jinja2:96
 msgid "Show more"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:521
+#: funnel/templates/macros.html.jinja2:529
 msgid "All projects"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:538
+#: funnel/templates/macros.html.jinja2:546
 msgid "Manage admins"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:538
+#: funnel/templates/macros.html.jinja2:546
 msgid "View admins"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:539
+#: funnel/templates/macros.html.jinja2:547
 msgid "Edit this profile"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:539
+#: funnel/templates/macros.html.jinja2:547
 msgid "Make profile private"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:545
+#: funnel/templates/macros.html.jinja2:553
 msgid "Make this profile private?"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:549
+#: funnel/templates/macros.html.jinja2:557
 msgid "Your profile will not be visible to anyone other than you"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:550
+#: funnel/templates/macros.html.jinja2:558
 msgid "It will not be listed in search results"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:551
+#: funnel/templates/macros.html.jinja2:559
 msgid "You cannot host projects from this profile"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:552
+#: funnel/templates/macros.html.jinja2:560
 msgid ""
 "Any existing projects will become inaccessible until the profile is "
 "public again"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:575
+#: funnel/templates/macros.html.jinja2:583
 msgid "Add cover photo url"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:575
+#: funnel/templates/macros.html.jinja2:583
 msgid "Add cover photo"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:591
-#: funnel/templates/macros.html.jinja2:638
+#: funnel/templates/macros.html.jinja2:599
+#: funnel/templates/macros.html.jinja2:646
 #: funnel/templates/profile.html.jinja2:83
 msgid "New project"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:593
-#: funnel/templates/macros.html.jinja2:640
+#: funnel/templates/macros.html.jinja2:601
+#: funnel/templates/macros.html.jinja2:648
 msgid "Make profile public"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:597
+#: funnel/templates/macros.html.jinja2:605
 msgid "Make this profile public?"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:601
+#: funnel/templates/macros.html.jinja2:609
 msgid "Your profile will be visible to anyone visiting the page"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:602
+#: funnel/templates/macros.html.jinja2:610
 msgid "Your profile will be listed in search results"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:630
+#: funnel/templates/macros.html.jinja2:638
 #, python-format
 msgid "Joined %(date)s"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:653
+#: funnel/templates/macros.html.jinja2:661
 #: funnel/templates/organization_membership.html.jinja2:15
 msgid "Admins"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:655
-#: funnel/templates/project.html.jinja2:137 funnel/views/search.py:173
+#: funnel/templates/macros.html.jinja2:663
+#: funnel/templates/project.html.jinja2:139 funnel/views/search.py:173
 msgid "Sessions"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:656
+#: funnel/templates/macros.html.jinja2:664
 #: funnel/templates/user_profile_projects.html.jinja2:10
 #: funnel/views/search.py:76
 msgid "Projects"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:673
-#: funnel/templates/project.html.jinja2:102
+#: funnel/templates/macros.html.jinja2:681
+#: funnel/templates/project.html.jinja2:104
 #: funnel/templates/project_admin.html.jinja2:39
 msgid "Tickets"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:675
+#: funnel/templates/macros.html.jinja2:683
 msgid "Attend"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:688
+#: funnel/templates/macros.html.jinja2:696
 msgid "Team &amp; careers"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:689
+#: funnel/templates/macros.html.jinja2:697
 msgid "Contact"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:690
+#: funnel/templates/macros.html.jinja2:698
 #: funnel/templates/policy.html.jinja2:14
 msgid "Site policies"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:721
+#: funnel/templates/macros.html.jinja2:729
 msgid "Outstation speaker"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:722
+#: funnel/templates/macros.html.jinja2:730
 msgid "(proposing)"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:734
+#: funnel/templates/macros.html.jinja2:742
 msgid "This proposal has a preview video"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:739
+#: funnel/templates/macros.html.jinja2:747
 msgid "This proposal has slides"
 msgstr ""
 
-#: funnel/templates/macros.html.jinja2:754
+#: funnel/templates/macros.html.jinja2:762
 msgid "(No sessions have been submitted)"
 msgstr ""
 
@@ -3002,7 +3002,7 @@ msgstr ""
 
 #: funnel/templates/meta_refresh.html.jinja2:6
 #: funnel/templates/meta_refresh.html.jinja2:28
-#: funnel/templates/project.html.jinja2:254
+#: funnel/templates/project.html.jinja2:256
 #: funnel/templates/redirect.html.jinja2:1
 msgid "Loading…"
 msgstr ""
@@ -3137,7 +3137,7 @@ msgid "Unscheduled projects"
 msgstr ""
 
 #: funnel/templates/project.html.jinja2:62
-#: funnel/templates/project.html.jinja2:102
+#: funnel/templates/project.html.jinja2:104
 #: funnel/templates/project_comments.html.jinja2:20
 #: funnel/templates/project_membership.html.jinja2:17
 #: funnel/templates/proposal.html.jinja2:72
@@ -3149,33 +3149,33 @@ msgstr ""
 msgid "Back to the project"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:112
+#: funnel/templates/project.html.jinja2:114
 msgid "Edit details"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:115
+#: funnel/templates/project.html.jinja2:117
 msgid "Related events"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:186
+#: funnel/templates/project.html.jinja2:188
 msgid "View Schedule"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:198
+#: funnel/templates/project.html.jinja2:200
 #: funnel/templates/session_videos.html.jinja2:3
 #: funnel/templates/session_videos.html.jinja2:16
 msgid "Videos"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:225
+#: funnel/templates/project.html.jinja2:227
 msgid "See all"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:234
+#: funnel/templates/project.html.jinja2:236
 msgid "Related jobs"
 msgstr ""
 
-#: funnel/templates/project.html.jinja2:244
+#: funnel/templates/project.html.jinja2:246
 msgid "Update venue"
 msgstr ""
 

From 7ad94350c927aa872ef66ae36c70d7f91147cede Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 29 Jan 2021 12:14:40 +0530
Subject: [PATCH 07/11] Add the js class for opening ticket widget

---
 funnel/templates/macros.html.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index 5481b5304..75c68fdac 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -117,7 +117,7 @@
   <div class="register-block">
     {% if project.features.tickets()  %}
       <p class="register-block__txt mui--d-inlineblock mui--text-body2 mui--text-light">{% trans %}Tickets available!{% endtrans %}</p>
-      <a href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#tickets" class="{%- if modalid != 'mobile' -%}js-open-ticket-widget{%- endif %} mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin {% if current_page == 'project' %}js-smooth-scroll js-samepage{%- endif %}" id="get-tickets">{% trans %}Get tickets{% endtrans %}</a>
+      <a href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#tickets" class="{%- if modalid == 'mobile' -%}js-open-ticket-widget{%- endif %} mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin {% if current_page == 'project' and modalid != 'mobile' %}js-smooth-scroll js-samepage{%- endif %}" id="get-tickets">{% trans %}Get tickets{% endtrans %}</a>
     {% elif project.features.rsvp() %}
       {%- if current_auth.is_anonymous %}
         <div class="register-block__txt register-block__txt--small">

From acd276627525b787c9f014d2498bbe466b436172 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 29 Jan 2021 15:40:53 +0530
Subject: [PATCH 08/11] Change the registration text

---
 funnel/static/css/app.css              | 12 ++++++------
 funnel/static/sass/_project.scss       | 17 ++++++++++-------
 funnel/templates/js/comments.js.jinja2 |  2 +-
 funnel/templates/js/update.js.jinja2   |  2 +-
 funnel/templates/macros.html.jinja2    | 22 ++++++++--------------
 funnel/templates/project.html.jinja2   |  2 +-
 funnel/templates/proposal.html.jinja2  |  2 +-
 funnel/views/project.py                | 20 ++++++++++----------
 8 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index b345bd409..8c12e3522 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -3494,14 +3494,9 @@ a.loginbutton.hidden,
   justify-content: space-between;
 }
 .register-block .register-block__txt {
+  font-size: 10px;
   margin: 0 16px 0 0;
 }
-.register-block .register-block__txt--small {
-  max-width: calc(100% - 140px);
-}
-.register-block .register-block__txt--smaller {
-  max-width: calc(100% - 170px);
-}
 .register-block .register-block__right {
   text-align: right;
 }
@@ -3509,6 +3504,11 @@ a.loginbutton.hidden,
   margin-left: 8px;
 }
 
+@media (min-width: 360px) {
+  .register-block .register-block__txt {
+    font-size: 14px;
+  }
+}
 .project-footer {
   position: fixed;
   width: calc(100% - 32px);
diff --git a/funnel/static/sass/_project.scss b/funnel/static/sass/_project.scss
index 8d302f092..93f078bba 100644
--- a/funnel/static/sass/_project.scss
+++ b/funnel/static/sass/_project.scss
@@ -22,20 +22,15 @@
     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__txt--small {
-    max-width: calc(100% - 140px);
-  }
-  .register-block__txt--smaller {
-    max-width: calc(100% - 170px);
-  }
-
   .register-block__right {
     text-align: right;
   }
@@ -44,6 +39,14 @@
   }
 }
 
+@media (min-width: 360px) {
+  .register-block {
+    .register-block__txt {
+      font-size: 14px;
+    }
+  }
+}
+
 .project-footer {
   position: fixed;
   width: calc(100% - 32px);
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 @@
                 <a href="javascript:void(0)" class="link-icon mui--text-light link comment__body__links" data-cy="reply" v-if="isuserloggedin"  @click="activateSubForm($event, COMMENTACTIONS.REPLY, 'reply-comment-textarea-' + comment.uuid_b58)"><faicon :icon="'comment-alt'" :baseline=false></faicon><span class="mui--hidden-xs mui--hidden-sm">{{ gettext('Reply') }}</span></a>
                 <a href="javascript:void(0)" class="link-icon mui--text-light link comment__body__links" data-cy="report-spam" v-if="isuserloggedin" @click="activateSubForm($event, COMMENTACTIONS.REPORTSPAM)"><faicon :icon="'flag-alt'":baseline=false></faicon><span class="mui--hidden-xs mui--hidden-sm">{{ gettext('Report') }}</span></a>
                 <div class="mui-dropdown">
-                  <a href="javascript:void(0)" class="link-icon project-links mui--text-light link comment__body__links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project"><faicon :icon="'share-alt-square'" :baseline=false :css_class="'fa5-icon--aligntop'"></faicon><span class="mui--hidden-xs mui--hidden-sm">{{ gettext('Share') }}</span></a>
+                  <a href="javascript:void(0)" class="link-icon project-links mui--text-light link comment__body__links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project"><faicon :icon="'share-alt'" :baseline=false :css_class="'fa5-icon--aligntop'"></faicon><span class="mui--hidden-xs mui--hidden-sm">{{ gettext('Share') }}</span></a>
                   <sharedropdown :url='comment.urls.view' :title='comment.title'></sharedropdown>
                 </div>
                 <a href="javascript:void(0)" class="link-icon mui--text-light hg-link-btn mui--hide link comment__body__links" :data-title="comment.title" :data-url="comment.absolute_url + '?utm_campaign=webshare'" :data-text=comment.message.text><faicon :icon="'share-alt'" :baseline=false :css_class="'fa5-icon--aligntop'"></faicon></a>
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 @@
           </div>
           <div class="update__action-btn">
             <div class="mui-dropdown">
-              <a href="javascript:void(0)" class="mui--text-subhead mui--text-light project-links link-icon" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project"><faicon :icon="'share-alt-square'" :icon_size="'subhead'" :baseline=true></faicon></a>
+              <a href="javascript:void(0)" class="mui--text-subhead mui--text-light project-links link-icon" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project"><faicon :icon="'share-alt'" :icon_size="'subhead'" :baseline=true></faicon></a>
               <sharedropdown :url='update.urls.view' :title='update.title'></sharedropdown>
             </div>
             <a href="javascript:void(0)" class="mui--text-light hg-link-btn mui--hide link-icon" :data-title="update.title" :data-url="update.urls.view + '?utm_campaign=webshare'"><faicon :icon="'share-alt'" :icon_size="'caption'" :baseline=true></faicon></a>
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index 75c68fdac..c09fedcc6 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -86,7 +86,7 @@
 {% endmacro %}
 
 {% macro project_share(project) %}
-  <div class="project-header mui--text-title">
+  <div class="project-header">
     <div class="mui-dropdown">
       <a href="javascript:void(0)" class="project-links" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project">{{ faicon(icon='share-alt', baseline=true, icon_size='title', css_class='mui--text-light') }}</a>
       {{ share_dropdown(project.url_for(_external=true), project.title) }}
@@ -116,22 +116,16 @@
 {% macro registerblock(project, modalid='mobile') %}
   <div class="register-block">
     {% if project.features.tickets()  %}
-      <p class="register-block__txt mui--d-inlineblock mui--text-body2 mui--text-light">{% trans %}Tickets available!{% endtrans %}</p>
-      <a href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#tickets" class="{%- if modalid == 'mobile' -%}js-open-ticket-widget{%- endif %} mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin {% if current_page == 'project' and modalid != 'mobile' %}js-smooth-scroll js-samepage{%- endif %}" id="get-tickets">{% trans %}Get tickets{% endtrans %}</a>
+      <p class="register-block__txt mui--d-inlineblock mui--text-light">{% trans %}Tickets available!{% endtrans %}</p>
+      <a href="{%- if current_page != 'project' -%}{{ project.url_for() }}{%- endif %}#tickets" class="{%- if modalid == 'mobile' -%}js-open-ticket-widget{%- endif %} mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin {% if current_page == 'project' and modalid != 'mobile' %}js-smooth-scroll js-samepage{%- endif %}">{% trans %}Get tickets{% endtrans %}</a>
     {% elif project.features.rsvp() %}
       {%- if current_auth.is_anonymous %}
-        <div class="register-block__txt register-block__txt--small">
-          <p class="mui--text-body2 mui--text-light zero-bottom-margin">{{ project.views.registration_text() }}</p>
-        </div>
+        <p class="register-block__txt mui--text-light zero-bottom-margin">{{ project.views.registration_text() }}</p>
         <a class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin"  href="{{ url_for('login') }}">Register</a>
       {% elif project.features.rsvp_unregistered() -%}
-        <div class="register-block__txt register-block__txt--small {% if project.features.rsvp_registered() or project.view_for('rsvp_list').is_available() %} register-block__txt--smaller{%- endif %}">
-          <p class="mui--text-body2 mui--text-light zero-bottom-margin">{{ project.views.registration_text() }}</p>
-        </div>
+        <p class="register-block__txt mui--text-light zero-bottom-margin">{{ project.views.registration_text() }}</p>
       {%- elif project.features.rsvp_registered() %}
-        <div class="register-block__txt">
-          <p class="mui--text-body2 mui--text-light zero-bottom-margin">{{ project.views.registration_text() }}{{ faicon(icon='check-circle-solid', icon_size='caption', baseline=true, css_class='mui--text-success fa-icon--left-margin') }}</p>
-        </div>
+        <p class="register-block__txt mui--text-light zero-bottom-margin">{{ project.views.registration_text() }}{{ faicon(icon='check-circle-solid', icon_size='caption', baseline=true, css_class='mui--text-success fa-icon--left-margin') }}</p>
       {%- endif %}
       <div>
         {% if not current_auth.is_anonymous and project.features.rsvp_unregistered() -%}
@@ -221,7 +215,7 @@
           <ul class="mui-tabs__bar project-banner__box" role="tablist">
             {%- for stream in project.livestream_urls %}
               <li role="presentation" {%- if loop.first %} class="mui--is-active"{% endif %}>
-                <a role="tab" data-mui-toggle="tab" data-mui-controls="pane-justified-{{ loop.index }}">{% trans %}Livestream{% endtrans %} {{loop.index}}</a>
+                <a role="tab" data-mui-toggle="tab" data-mui-controls="pane-justified-{{ loop.index }}">{% trans %}Livestream{% endtrans %}{%- if not loop.first %} {{loop.index}}{% endif %}</a>
               </li>
             {%- endfor %}
           </ul>
@@ -272,7 +266,7 @@
         </div>
         <div class="project-details__box__content">
           {% if project.view_for('edit_schedule').is_available() %}
-            <a class="mui-btn mui-btn--raised mui-btn--dark  mui--d-block" href="{{ project.url_for('edit_schedule') }}"><span class="mui--hidden-lg">{% trans %}Add schedule to enable registrations{% endtrans %}</span><span class="mui--visible-lg-inline">{% trans %}Add schedule{% endtrans %}</span></a>
+            <a class="mui-btn mui-btn--raised mui-btn--dark  mui--d-block" href="{{ project.url_for('edit_schedule') }}"><span class="mui--hidden-xs mui--hidden-sm mui--hidden-lg">{% trans %}Add schedule to enable registrations{% endtrans %}</span><span class="mui--visible-xs-inline mui--visible-sm-inline mui--visible-lg-inline">{% trans %}Add schedule{% endtrans %}</span></a>
           {%- endif %}
           {% if project.cfp_state.OPEN -%}
             <hr class="mui-divider">
diff --git a/funnel/templates/project.html.jinja2 b/funnel/templates/project.html.jinja2
index 01cb0dfb5..72d5faaa9 100644
--- a/funnel/templates/project.html.jinja2
+++ b/funnel/templates/project.html.jinja2
@@ -69,7 +69,7 @@
 {% block contenthead %}
   <div class="mui--hidden-md mui--hidden-lg mui--hidden-xl">
     <div class="mobile-nav mui--z1">
-      <a href="{{ url_for('index') }}" aria-label="{% trans %}Back to the project{% endtrans %}" class="mui--text-dark mobile-nav__icon" data-ga="Back to the project page">{{ faicon(icon='arrow-left', icon_size='title') }}</a>
+      <a href="{{ url_for('index') }}" aria-label="{% trans %}Back to the project{% endtrans %}" class="mui--text-dark mobile-nav__icon" data-ga="Back to the project page">{{ faicon(icon='arrow-left', icon_size='title', css_class="mui--align-middle") }}</a>
       <div class="mui--pull-right mobile-nav__icon">
         {{ project_share(project) }}
       </div>
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index 7a51faf6d..e6e4eccbd 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -23,7 +23,7 @@
 {% macro share_widget(formid='desktop') %}
   <a href="javascript:void(0)" class="hg-link-btn mui--hide mui--text-title mui-text-light" data-ga="Share dropdown" data-cy="share-project" data-url="{{ proposal.url_for(_external=true) }}?utm_campaign=webshare">{{ faicon(icon='share-alt', icon_size='title', baseline=false, css_class='mui--text-light fa-icon--margin ') }}</a>
   <div class="mui-dropdown">
-    <a href="javascript:void(0)" class="project-links mui--text-title mui-text-light" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project">{{ faicon(icon='share-alt-square', icon_size='title', baseline=false, css_class='mui--text-light fa-icon--margin ') }}</a>
+    <a href="javascript:void(0)" class="project-links mui--text-title mui-text-light" data-mui-toggle="dropdown" data-ga="Share dropdown" data-cy="share-project">{{ faicon(icon='share-alt', icon_size='title', baseline=false, css_class='mui--text-light fa-icon--margin ') }}</a>
     {{ share_dropdown(proposal.url_for(_external=true), proposal.title, css_class='mui-dropdown__menu--right') }}
   </div>
   {% if 'edit_proposal' in proposal.permissions(current_auth.user) or proposal.current_roles.project_editor %}
diff --git a/funnel/views/project.py b/funnel/views/project.py
index 1a3b9bce7..011d92f14 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -71,41 +71,41 @@
 
 registration_count_messages = [
     CountWords(_("Be the first to register!"), None),
-    CountWords(_("One registration so far. Be the second?"), _("You have registered")),
+    CountWords(_("One registration so far"), _("You have registered")),
     CountWords(
-        _("Two registrations so far. Be the third?"),
+        _("Two registrations so far"),
         _("You and one other have registered"),
     ),
     CountWords(
-        _("Three registrations so far. Be the fourth?"),
+        _("Three registrations so far"),
         _("You and two others have registered"),
     ),
     CountWords(
-        _("Four registrations so far. Be the next one?"),
+        _("Four registrations so far"),
         _("You and three others have registered"),
     ),
     CountWords(
-        _("Five registrations so far. Be the next one?"),
+        _("Five registrations so far"),
         _("You and four others have registered"),
     ),
     CountWords(
-        _("Six registrations so far. Be the next one?"),
+        _("Six registrations so far"),
         _("You and five others have registered"),
     ),
     CountWords(
-        _("Seven registrations so far. Be the next one?"),
+        _("Seven registrations so far"),
         _("You and six others have registered"),
     ),
     CountWords(
-        _("Eight registrations so far. Be the next one?"),
+        _("Eight registrations so far?"),
         _("You and seven others have registered"),
     ),
     CountWords(
-        _("Nine registrations so far. Be the next one?"),
+        _("Nine registrations so far"),
         _("You and eight others have registered"),
     ),
     CountWords(
-        _("Ten registrations so far. Be the next one?"),
+        _("Ten registrations so far"),
         _("You and nine others have registered"),
     ),
 ]

From f697f2025f3f083a523e3a2ac7d0cbe4bb574ca6 Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 29 Jan 2021 15:49:48 +0530
Subject: [PATCH 09/11] Fix registration txt

---
 funnel/views/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/views/project.py b/funnel/views/project.py
index 011d92f14..8d8e719c2 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -121,7 +121,7 @@ def get_registration_text(count, registered=False):
         if registered:
             return _("You and {num} others have registered").format(num=count - 1)
         else:
-            return _("{num} registrations so far. Be the next one?").format(num=count)
+            return _("{num} registrations so far").format(num=count)
 
 
 def project_data(project):

From 56259fe4355fa2afdb19c98225cf1b2efebeb8db Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Fri, 29 Jan 2021 16:04:49 +0530
Subject: [PATCH 10/11] Show the time of the next event on the calendar widget

---
 funnel/assets/js/util.js            | 12 +++++++++---
 funnel/templates/macros.html.jinja2 |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/funnel/assets/js/util.js b/funnel/assets/js/util.js
index 0536c8af1..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');
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index c09fedcc6..a8ac151e0 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 %}
             </p>
             {% for date in week.dates %}
-              <p class="calendar__weekdays__dates__date {% if date.count > 0 %}calendar__weekdays__dates__date--active {% elif date.isoformat == calendar.today %} calendar__weekdays__dates__date--today{% endif %} {% if date.day_start_at %} calendar__weekdays__dates__date--showtime{% endif %} calendar__weekdays__dates__date--{{ loop.index }}" {% if date.count > 0 %} data-event-date="{{ date.isoformat }}" {% endif %} data-event-month="{{ week.month }}">
+              <p class="calendar__weekdays__dates__date {% if date.count > 0 %}calendar__weekdays__dates__date--active {% elif date.isoformat == calendar.today %} calendar__weekdays__dates__date--today{% endif %} {% if date.day_start_at %} calendar__weekdays__dates__date--showtime{% endif %} {% if date.isoformat >= calendar.today %} calendar__weekdays__dates__date--latest{% endif %} calendar__weekdays__dates__date--{{ loop.index }}" {% if date.count > 0 %} data-event-date="{{ date.isoformat }}" {% endif %} data-event-month="{{ week.month }}">
                 <span class="calendar__weekdays__dates__date__day">{{ date.day }}</span>
                 <span class="calendar__weekdays__dates__date__name">{{ calendar.days[loop.index-1] }}</span>
                 {% if date.day_start_at %}<span class="calendar__weekdays__dates__time">{{ date.day_start_at }} – {{ date.day_end_at }}</span>{% endif %}

From e15f8f9ad0512d3f8ad8b7b2bb2e5e65af96eeec Mon Sep 17 00:00:00 2001
From: Vidya Ramakrishnan <vidya@hasgeek.in>
Date: Mon, 1 Feb 2021 11:14:12 +0530
Subject: [PATCH 11/11] Use project.current_roles.crew

---
 funnel/static/css/app.css           |   6 +-
 funnel/static/sass/_update.scss     |   7 +-
 funnel/templates/macros.html.jinja2 | 100 ++++++++++++++--------------
 3 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 8c12e3522..f5f3078f8 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -5473,6 +5473,9 @@ body > .proposal-box.ui-draggable {
   color: #4d5763;
   position: relative;
 }
+.update .update__heading {
+  float: left;
+}
 .update .update__action-btn {
   float: right;
 }
@@ -5514,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/_update.scss b/funnel/static/sass/_update.scss
index 2d8cc0294..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;
   }
@@ -60,9 +64,6 @@
     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/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index a8ac151e0..b59562322 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -64,7 +64,7 @@
     {{ current_view.SavedProjectForm().hidden_tag() }}
     <div class="no-jshidden zero-bottom-margin">
       {%- if current_auth.is_anonymous %}
-        <a class="mui--text-light"  href="{{ url_for('login') }}" data-ga="Login to save project">{{ faicon(icon='bookmark', icon_size='title', baseline=true, css_class='mui--text-light') }}</a>
+        <a class="mui--text-light"  href="{{ url_for('login', next=request.path) }}" data-ga="Login to save project">{{ faicon(icon='bookmark', icon_size='title', baseline=true, css_class='mui--text-light') }}</a>
       {%- else %}
         <input type="hidden" name="save" value="">
         <button type="submit" value="true" class="mui-btn mui-btn--nostyle animate-btn {% if not project.is_saved_by(current_auth.user) %} animate-btn--show {% endif %}" data-ga="Save this project" onclick="this.form.save.value=this.value" data-cy="bookmark">{{ faicon(icon='bookmark', baseline=true, css_class='mui--text-light') }}
@@ -95,7 +95,7 @@
     {% if project.schedule_state.PUBLISHED %}
       <a class="add-calendar" href="{{ project.url_for('subscribe_schedule') }}" rel="modal:open" aria-label="Add to calendar" data-ga="Add to calendar" data-cy="add-to-calendar">{{ faicon(icon='calendar-plus', baseline=true, icon_size='title', css_class='mui--text-light') }}</a>
     {% endif %}
-    {%- if project.current_roles.editor or project.current_roles.concierge or project.current_roles.usher -%}
+    {%- if project.current_roles.crew -%}
       <a class="settings" href="{{ project.url_for('settings') }}" data-cy-navbar="settings" data-ga="project settings">{{ faicon(icon='cog', baseline=true, icon_size='title', css_class='mui--text-light') }}</a>
     {%- endif %}
   </div>
@@ -121,60 +121,62 @@
     {% elif project.features.rsvp() %}
       {%- if current_auth.is_anonymous %}
         <p class="register-block__txt mui--text-light zero-bottom-margin">{{ project.views.registration_text() }}</p>
-        <a class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin"  href="{{ url_for('login') }}">Register</a>
+        <a class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin"  href="{{ url_for('login', next=request.path) }}">Register</a>
       {% elif project.features.rsvp_unregistered() -%}
         <p class="register-block__txt mui--text-light zero-bottom-margin">{{ project.views.registration_text() }}</p>
       {%- elif project.features.rsvp_registered() %}
         <p class="register-block__txt mui--text-light zero-bottom-margin">{{ project.views.registration_text() }}{{ faicon(icon='check-circle-solid', icon_size='caption', baseline=true, css_class='mui--text-success fa-icon--left-margin') }}</p>
       {%- endif %}
-      <div>
-        {% if not current_auth.is_anonymous and project.features.rsvp_unregistered() -%}
-          <a class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin register-block__right__btn" href="#{{modalid}}-register-modal" id="register-btn">{% trans %}Register{% endtrans %}</a>
-          <div class="modal reg-modal" id="{{modalid}}-register-modal">
-            <div class="modal__header">
-              <a class="modal__close mui--text-dark" href="javascript:void(0);" data-target="close cancel register modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close">{{ faicon(icon='times', icon_size='title') }}</a>
-              <p class="mui--text-title mui--text-bold mui--text-dark reg-modal__txt">{{ project.title }}</p>
-            </div>
-            <div class="modal__body">
-              <p class="mui--text-body2 reg-modal__txt">{% trans %}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.{% endtrans %}</p>
-              <form action="{{ project.url_for('register') }}" method="post" class="form-inline">
-                {{ csrf_tag() }}
-                <div class="mui--text-right modal__body__btn">
-                  <button class="mui-btn mui-btn--flat mui-btn--primary" type="submit" name="submit" value="yes" data-cy="confirm">{% trans %}Confirm{% endtrans %}</button>
-                </div>
-              </form>
-            </div>
-          </div>
-        {%- endif %}
-        {% if project.features.rsvp_registered() or project.view_for('rsvp_list').is_available() %}
-          <div class="mui-dropdown mui--align-middle register-block__right__menu">
-            <a href="javascript:void(0)" class="mui--align-middle" data-mui-toggle="dropdown">{{ faicon(icon='ellipsis-v', icon_size='subhead') }}</a>
-            <ul class="mui-dropdown__menu mui-dropdown__menu--right">
-              {% if project.features.rsvp_registered() %}
-                <li><a class="mui--text-body2" href="#{{modalid}}-register-modal" id="register-btn">{% trans %}Cancel registration{% endtrans %}</a></li>
-                <div class="modal reg-modal" id="{{modalid}}-register-modal">
-                  <div class="modal__header">
-                    <a class="modal__close mui--text-dark" href="javascript:void(0);" data-target="close cancel register modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close">{{ faicon(icon='times', icon_size='title') }}</a>
-                    <p class="mui--text-title mui--text-bold mui--text-dark reg-modal__txt">{{ project.title }}</p>
+      {% if not current_auth.is_anonymous %}
+        <div>
+          {% if not current_auth.is_anonymous and project.features.rsvp_unregistered() -%}
+            <a class="mui-btn mui-btn--raised mui-btn--primary zero-top-margin zero-bottom-margin register-block__right__btn" href="#{{modalid}}-register-modal" id="register-btn">{% trans %}Register{% endtrans %}</a>
+            <div class="modal reg-modal" id="{{modalid}}-register-modal">
+              <div class="modal__header">
+                <a class="modal__close mui--text-dark" href="javascript:void(0);" data-target="close cancel register modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close">{{ faicon(icon='times', icon_size='title') }}</a>
+                <p class="mui--text-title mui--text-bold mui--text-dark reg-modal__txt">{{ project.title }}</p>
+              </div>
+              <div class="modal__body">
+                <p class="mui--text-body2 reg-modal__txt">{% trans %}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.{% endtrans %}</p>
+                <form action="{{ project.url_for('register') }}" method="post" class="form-inline">
+                  {{ csrf_tag() }}
+                  <div class="mui--text-right modal__body__btn">
+                    <button class="mui-btn mui-btn--flat mui-btn--primary" type="submit" name="submit" value="yes" data-cy="confirm">{% trans %}Confirm{% endtrans %}</button>
                   </div>
-                  <div class="modal__body">
-                    <p class="mui--text-subhead reg-modal__txt">{% trans %}Can’t make it?{% endtrans %}</p>
-                    <form action="{{ project.url_for('deregister') }}" method="post" class="form-inline">
-                      {{ csrf_tag() }}
-                      <div class="mui--text-right modal__body__btn">
-                        <button class="mui-btn mui-btn--flat mui-btn--primary" type="submit" name="submit" value="no">{% trans %}Confirm cancellation{% endtrans %}</button>
-                      </div>
-                    </form>
+                </form>
+              </div>
+            </div>
+          {%- endif %}
+          {% if project.features.rsvp_registered() or project.view_for('rsvp_list').is_available() %}
+            <div class="mui-dropdown mui--align-middle register-block__right__menu">
+              <a href="javascript:void(0)" class="mui--align-middle" data-mui-toggle="dropdown">{{ faicon(icon='ellipsis-v', icon_size='subhead') }}</a>
+              <ul class="mui-dropdown__menu mui-dropdown__menu--right">
+                {% if project.features.rsvp_registered() %}
+                  <li><a class="mui--text-body2" href="#{{modalid}}-register-modal" id="register-btn">{% trans %}Cancel registration{% endtrans %}</a></li>
+                  <div class="modal reg-modal" id="{{modalid}}-register-modal">
+                    <div class="modal__header">
+                      <a class="modal__close mui--text-dark" href="javascript:void(0);" data-target="close cancel register modal" aria-label="{% trans %}Close{% endtrans %}" rel="modal:close">{{ faicon(icon='times', icon_size='title') }}</a>
+                      <p class="mui--text-title mui--text-bold mui--text-dark reg-modal__txt">{{ project.title }}</p>
+                    </div>
+                    <div class="modal__body">
+                      <p class="mui--text-subhead reg-modal__txt">{% trans %}Can’t make it?{% endtrans %}</p>
+                      <form action="{{ project.url_for('deregister') }}" method="post" class="form-inline">
+                        {{ csrf_tag() }}
+                        <div class="mui--text-right modal__body__btn">
+                          <button class="mui-btn mui-btn--flat mui-btn--primary" type="submit" name="submit" value="no">{% trans %}Confirm cancellation{% endtrans %}</button>
+                        </div>
+                      </form>
+                    </div>
                   </div>
-                </div>
-              {% endif %}
-              {% if project.view_for('rsvp_list').is_available() %}
-                <li><a class="mui--text-body2" href="{{ project.url_for('rsvp_list') }}" data-cy="see-responses">{% trans %}View participants{% endtrans %}</a></li>
-              {% endif %}
-            </ul>
-          </div>
-        {% endif %}
-      </div>
+                {% endif %}
+                {% if project.view_for('rsvp_list').is_available() %}
+                  <li><a class="mui--text-body2" href="{{ project.url_for('rsvp_list') }}" data-cy="see-responses">{% trans %}View participants{% endtrans %}</a></li>
+                {% endif %}
+              </ul>
+            </div>
+          {% endif %}
+        </div>
+      {%- endif %}
     {% endif %}
   </div>
 {% endmacro %}