conference_main/static/conference_main/styles/_schedule.sass

@@ -69,6 +69,11 @@
 $col-time-width: 8%
 
 .schedule-container
+  &.status-proposed
+    a.event
+      pointer-events: none
+    .event-favorite
+      display: none
   .event-speakers
     +margin(1, y)
 

conference_main/templates/conference_main/2020la/la_base_with_sidebar.pug

@@ -6,7 +6,7 @@
 		.col-md-3
 			| {% block sidebar %}
 			.card
-				div(aria-orientation="vertical", class="flex-column mb-4 nav nav-pills", role="tablist")
+				nav(aria-orientation="vertical", class="flex-column mb-4 nav nav-pills", role="tablist")
 					a.nav-pills-item(class="{% if 'profile' in request.path %}active{% endif %}")(href="{% url 'profile_update' %}")
 						i.i-user
 						| Profile

conference_main/templates/conference_main/base.pug

@@ -11,7 +11,7 @@ script.
 
 | {% block header %}
 | {% block jumbotron %}
-| {% include "conference_main/components/hero.pug" with show_logo=True show_date=True show_location=True show_gradient=True show_overlay=True %}
+| {% include "conference_main/components/hero.pug" with show_logo=True show_date=True show_location=True show_overlay=True %}
 | {% endblock jumbotron %}
 | {% endblock header %}
 

conference_main/templates/conference_main/base_with_sidebar.pug

@@ -5,7 +5,7 @@
 	.row
 		.col-md-3.mb-3
 			| {% block sidebar %}
-			div(aria-orientation="vertical", class="flex-column mb-4 nav nav-pills", role="tablist")
+			nav(aria-orientation="vertical", class="flex-column mb-4 nav nav-pills", role="tablist")
 				a.nav-pills-item(class="{% if 'profile' in request.path %}active{% endif %}")(href="{% url 'profile_update' %}")
 					i.i-user
 					| Profile

conference_main/templates/conference_main/presentations/schedule_horizontal.pug

@@ -13,7 +13,7 @@
 | {% include "conference_main/components/schedule_header_notice.pug" %}
 | {% include "conference_main/components/location_style.pug" %}
 
-.schedule-container.horizontal
+.schedule-container.horizontal(class="{% if not user.is_staff %}status-{{ edition.schedule_status }}{% endif %}")
   .schedule-filters-container
     .btn-row
       a.btn(href="{% url 'schedule' edition_path=edition.path %}?display=vertical")

conference_main/templates/conference_main/presentations/schedule_vertical.pug

@@ -134,7 +134,7 @@
     span {{ day.date | date:'l' }}
   | {% endfor %}
 
-.schedule-container
+.schedule-container(class="{% if not user.is_staff %}status-{{ edition.schedule_status }}{% endif %}")
   .schedule
     .empty-time-cell
 

deploy.sh

@@ -1,11 +1,12 @@
 #!/bin/sh -ex
 
 ENVIRONMENT=$1
+FORCE=$2
 
 if [ -z "$ENVIRONMENT" ]
 then
-      echo "Usage: ./deploy.sh staging|production"
+  echo "Usage: ./deploy.sh staging|production [--force]"
-      exit 1
+  exit 1
 fi
 
 if [ "$ENVIRONMENT" = "production" ]; then
@@ -13,8 +14,15 @@ if [ "$ENVIRONMENT" = "production" ]; then
   git push origin production
 fi
 
+# Check if the '--force' argument is provided
+EXTRA_VARS=""
+if [ "$FORCE" = "--force" ]; then
+  EXTRA_VARS="-e override_lock=true"
+fi
+
 pushd playbooks
 source .venv/bin/activate
-./ansible.sh -i environments/$ENVIRONMENT shared/deploy.yaml
+# Append $EXTRA_VARS to the ansible command if --force is provided
+./ansible.sh -i environments/$ENVIRONMENT shared/deploy.yaml $EXTRA_VARS
 deactivate
 popd