diff --git a/pinaxcon/templates/account/_login_sidebar.html b/pinaxcon/templates/account/_login_sidebar.html
new file mode 100644
index 00000000..dcf7d21b
--- /dev/null
+++ b/pinaxcon/templates/account/_login_sidebar.html
@@ -0,0 +1 @@
+{# provide log in sidebar here #}
\ No newline at end of file
diff --git a/pinaxcon/templates/account/_signup_sidebar.html b/pinaxcon/templates/account/_signup_sidebar.html
new file mode 100644
index 00000000..660aca18
--- /dev/null
+++ b/pinaxcon/templates/account/_signup_sidebar.html
@@ -0,0 +1 @@
+{# provide sign up in sidebar here #}
\ No newline at end of file
diff --git a/pinaxcon/templates/account/base.html b/pinaxcon/templates/account/base.html
new file mode 100644
index 00000000..8f15d1c3
--- /dev/null
+++ b/pinaxcon/templates/account/base.html
@@ -0,0 +1,25 @@
+{% extends "utility_page.html" %}
+
+{% load i18n %}
+
+{% block body_class %}account{% endblock %}
+
+{% block utility_body %}
+
+ <div class="btn-group">
+ <a class="btn {% block btn-settings %}{% endblock %}" href="{% url "account_settings" %}">
+ {% trans "Settings" %}
+ </a>
+ <a class="btn {% block btn-password %}{% endblock %}" href="{% url "account_password" %}">
+ {% trans "Change password" %}
+ </a>
+ <a class="btn {% block btn-delete %}{% endblock %}" href="{% url "account_delete" %}">
+ {% trans "Delete account" %}
+ </a>
+ </div>
+ <br />
+
+ {% block account_body %}
+ {% endblock %}
+
+{% endblock %}
diff --git a/pinaxcon/templates/account/delete.html b/pinaxcon/templates/account/delete.html
new file mode 100644
index 00000000..c7041257
--- /dev/null
+++ b/pinaxcon/templates/account/delete.html
@@ -0,0 +1,20 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+
+{% block body_class %}account account-delete{% endblock %}
+
+{% block head_title %}{% trans "Delete Account" %}{% endblock %}
+{% block page_title %}{% trans "Delete Account" %}{% endblock %}
+{% block btn-delete %}btn__active{% endblock %}
+
+{% block account_body %}
+
+ <p>{% blocktrans %}If you go ahead and delete your account, your information will be <b>expunged within {{ ACCOUNT_DELETION_EXPUNGE_HOURS }} hours</b>.{% endblocktrans %}</p>
+
+ <form method="post" action="{% url "account_delete" %}" autocapitalize="off">
+ {% csrf_token %}
+ <button type="submit" class="btn btn-danger">{% trans "Delete My Account" %}</button>
+ </form>
+
+{% endblock %}
diff --git a/pinaxcon/templates/account/email/email_confirmation_message.txt b/pinaxcon/templates/account/email/email_confirmation_message.txt
new file mode 100644
index 00000000..c3b42445
--- /dev/null
+++ b/pinaxcon/templates/account/email/email_confirmation_message.txt
@@ -0,0 +1,6 @@
+{% load i18n account_tags %}{% blocktrans with site_name=current_site.name %}A user on {{ site_name }} has created an account using this email address.
+
+To confirm this email address, go to {{ activate_url }}
+
+If you did not sign up for this site, you can ignore this message.
+{% endblocktrans %}
\ No newline at end of file
diff --git a/pinaxcon/templates/account/email/email_confirmation_subject.txt b/pinaxcon/templates/account/email/email_confirmation_subject.txt
new file mode 100644
index 00000000..ad4cf943
--- /dev/null
+++ b/pinaxcon/templates/account/email/email_confirmation_subject.txt
@@ -0,0 +1 @@
+{% load i18n %}{% blocktrans with site_name=current_site.name %}Confirm email address for {{ site_name }}{% endblocktrans %}
\ No newline at end of file
diff --git a/pinaxcon/templates/account/email/invite_user.txt b/pinaxcon/templates/account/email/invite_user.txt
new file mode 100644
index 00000000..a8173375
--- /dev/null
+++ b/pinaxcon/templates/account/email/invite_user.txt
@@ -0,0 +1,4 @@
+{% load i18n %}{% blocktrans with name=current_site.name %}You have been invited to sign up at {{ name }}.
+
+{{ signup_url }}
+{% endblocktrans %}
\ No newline at end of file
diff --git a/pinaxcon/templates/account/email/invite_user_subject.txt b/pinaxcon/templates/account/email/invite_user_subject.txt
new file mode 100644
index 00000000..86a4b06e
--- /dev/null
+++ b/pinaxcon/templates/account/email/invite_user_subject.txt
@@ -0,0 +1 @@
+{% load i18n %}{% blocktrans with name=current_site.name %}Create an account on {{ name }}{% endblocktrans %}
\ No newline at end of file
diff --git a/pinaxcon/templates/account/email/password_change.txt b/pinaxcon/templates/account/email/password_change.txt
new file mode 100644
index 00000000..66f40e9b
--- /dev/null
+++ b/pinaxcon/templates/account/email/password_change.txt
@@ -0,0 +1 @@
+{% load i18n %}{% blocktrans with now=user.account.now %}This is the email notification to confirm your password has been changed on {{ now }}.{% endblocktrans %}
\ No newline at end of file
diff --git a/pinaxcon/templates/account/email/password_change_subject.txt b/pinaxcon/templates/account/email/password_change_subject.txt
new file mode 100644
index 00000000..e722a8ae
--- /dev/null
+++ b/pinaxcon/templates/account/email/password_change_subject.txt
@@ -0,0 +1 @@
+{% load i18n %}{% trans "Change password email notification" %}
\ No newline at end of file
diff --git a/pinaxcon/templates/account/email/password_reset.txt b/pinaxcon/templates/account/email/password_reset.txt
new file mode 100644
index 00000000..55170c7b
--- /dev/null
+++ b/pinaxcon/templates/account/email/password_reset.txt
@@ -0,0 +1,5 @@
+{% load i18n %}{% blocktrans with site_name=current_site.name %}You're receiving this email because you or someone else has requested a password for your user account at {{ site_name }}.
+It can be safely ignored if you did not request a password reset. Click the link below to reset your password.
+
+{{ password_reset_url }}
+{% endblocktrans %}
\ No newline at end of file
diff --git a/pinaxcon/templates/account/email/password_reset_subject.txt b/pinaxcon/templates/account/email/password_reset_subject.txt
new file mode 100644
index 00000000..94020c9b
--- /dev/null
+++ b/pinaxcon/templates/account/email/password_reset_subject.txt
@@ -0,0 +1 @@
+{% load i18n %}{% blocktrans with site_name=current_site.name %}[{{ site_name }}] Password reset{% endblocktrans %}
\ No newline at end of file
diff --git a/pinaxcon/templates/account/email_confirm.html b/pinaxcon/templates/account/email_confirm.html
new file mode 100644
index 00000000..bbe42ad9
--- /dev/null
+++ b/pinaxcon/templates/account/email_confirm.html
@@ -0,0 +1,16 @@
+{% extends "utility_page.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Confirm Email" %}{% endblock %}
+{% block page_title %}{% trans "Confirm Email" %}{% endblock %}
+
+{% block utility_body %}
+ <form method="post" action="{% url "account_confirm_email" key=confirmation.key %}">
+ <fieldset>
+ {% csrf_token %}
+ <p>{% blocktrans with email=confirmation.email_address.email %}Confirm email address <b>{{ email }}</b>?{% endblocktrans %}</p>
+ <button type="submit" class="btn btn-primary">{% trans "Confirm" %}</button>
+ </fieldset>
+ </form>
+{% endblock %}
diff --git a/pinaxcon/templates/account/email_confirmation_sent.html b/pinaxcon/templates/account/email_confirmation_sent.html
new file mode 100644
index 00000000..b9f35a6d
--- /dev/null
+++ b/pinaxcon/templates/account/email_confirmation_sent.html
@@ -0,0 +1,12 @@
+{% extends "utility_page.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Confirm your email address" %}{% endblock %}
+{% block page_title %}{% trans "Confirm your email address" %}{% endblock %}
+
+{% block utility_body %}
+
+ <p>{% blocktrans %}We have sent you an email to <b>{{ email }}</b> for verification. Follow the link provided to finalize the signup process. If you do not receive it within a few minutes, contact us at <a href="mailto:{{ THEME_CONTACT_EMAIL }}">{{ THEME_CONTACT_EMAIL }}</a>.{% endblocktrans %}</p>
+ <p><a href="{{ success_url }}">{% trans "Go back" %}</a></p>
+{% endblock %}
diff --git a/pinaxcon/templates/account/email_confirmed.html b/pinaxcon/templates/account/email_confirmed.html
new file mode 100644
index 00000000..2b444a58
--- /dev/null
+++ b/pinaxcon/templates/account/email_confirmed.html
@@ -0,0 +1,10 @@
+{% extends "utility_page.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Email confirmed" %}{% endblock %}
+{% block page_title %}{% trans "Email confirmed" %}{% endblock %}
+
+{% block utility_body %}
+ <p>{% blocktrans with email=confirmation.email_address.email %}You have confirmed <b>{{ email }}</b>{% endblocktrans %}</p>
+{% endblock %}
diff --git a/pinaxcon/templates/account/login.html b/pinaxcon/templates/account/login.html
new file mode 100644
index 00000000..14276fa4
--- /dev/null
+++ b/pinaxcon/templates/account/login.html
@@ -0,0 +1,39 @@
+{% extends "utility_page.html" %}
+
+{% load account_tags %}
+{% load i18n %}
+{% load bootstrap %}
+
+{% block head_title %}{% trans "Log in" %}{% endblock %}
+{% block page_title %}{% trans "Log in to an existing account" %}{% endblock %}
+
+{% block utility_body %}
+
+ {% if ACCOUNT_OPEN_SIGNUP %}
+ <p class="login-signup">
+ {% trans "Don't have an account?" %} <strong><a href="{% urlnext 'account_signup' %}">{% trans "Sign up" %}</a></strong>
+ </p>
+ {% endif %}
+
+ <form method="POST" action="{% url "account_login" %}" autocapitalize="off" {% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
+ {% csrf_token %}
+ <fieldset>
+ {% include "_form_snippet.html" with form=form %}
+
+ {% if redirect_field_value %}
+ <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+ {% endif %}
+ <button type="submit" class="btn btn-primary">{% trans "Log in" %}</button>
+ <a href="{% url "account_password_reset" %}" class="btn btn-link">{% trans "Forgot your password?" %}</a>
+ </fieldset>
+ </form>
+{% endblock %}
+
+{% block scripts %}
+ {{ block.super }}
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $('#id_username').focus();
+ });
+ </script>
+{% endblock %}
diff --git a/pinaxcon/templates/account/logout.html b/pinaxcon/templates/account/logout.html
new file mode 100644
index 00000000..031f8544
--- /dev/null
+++ b/pinaxcon/templates/account/logout.html
@@ -0,0 +1,14 @@
+{% extends "utility_page.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Log out" %}{% endblock %}
+{% block page_title %}{% trans "Log out" %}{% endblock %}
+
+{% block utility_body %}
+ <form method="POST" action="{% url "account_logout" %}">
+ {% csrf_token %}
+ <p>{% trans "Are you sure you want to log out?" %}</p>
+ <button type="submit" class="btn btn-primary">{% trans "Log out" %}</button>
+ </form>
+{% endblock %}
diff --git a/pinaxcon/templates/account/password_change.html b/pinaxcon/templates/account/password_change.html
new file mode 100644
index 00000000..7f85c596
--- /dev/null
+++ b/pinaxcon/templates/account/password_change.html
@@ -0,0 +1,20 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+{% load bootstrap %}
+
+{% block body_class %}account account-password{% endblock %}
+
+{% block head_title %}{% trans "Change password" %}{% endblock %}
+{% block page_title %}{% trans "Change password" %}{% endblock %}
+{% block btn-password %}btn__active{% endblock %}
+
+{% block account_body %}
+ <form method="POST" action="">
+ <fieldset>
+ {% csrf_token %}
+ {% include "_form_snippet.html" with form=form %}
+ <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
+ </fieldset>
+ </form>
+{% endblock %}
diff --git a/pinaxcon/templates/account/password_reset.html b/pinaxcon/templates/account/password_reset.html
new file mode 100644
index 00000000..d3e36565
--- /dev/null
+++ b/pinaxcon/templates/account/password_reset.html
@@ -0,0 +1,30 @@
+{% extends "utility_page.html" %}
+
+{% load i18n %}
+{% load bootstrap %}
+{% load account_tags %}
+
+{% block head_title %}{% trans "Password reset" %}{% endblock %}
+{% block page_title %}{% trans "Password reset" %}{% endblock %}
+
+{% user_display request.user as user_display %}
+
+{% block utility_body %}
+ <form method="POST" action="">
+ <p class="lead">{% trans "Forgotten your password? Enter your email address below, and we'll send you an email allowing you to reset it." %}</p>
+ <fieldset class="row">
+ {% csrf_token %}
+ {% include "_form_snippet.html" with form=form %}
+ <button type="submit" class="btn btn-primary">
+ {% trans "Reset my password" %}
+ </button>
+ </fieldset>
+ </form>
+ <p>{% blocktrans %}If you have any trouble resetting your password, contact us at <a href="mailto:{{ THEME_CONTACT_EMAIL }}">{{ THEME_CONTACT_EMAIL }}</a>.{% endblocktrans %}</p>
+{% endblock %}
+
+{% block extra_body %}
+ <script>
+ $("#id_email").focus();
+ </script>
+{% endblock %}
diff --git a/pinaxcon/templates/account/password_reset_sent.html b/pinaxcon/templates/account/password_reset_sent.html
new file mode 100644
index 00000000..c1b43edc
--- /dev/null
+++ b/pinaxcon/templates/account/password_reset_sent.html
@@ -0,0 +1,23 @@
+{% extends "utility_page.html" %}
+
+{% load i18n %}
+{% load account_tags %}
+
+{% block head_title %}{% trans "Password reset sent" %}{% endblock %}
+{% block page_title %}{% trans "Password reset sent" %}{% endblock %}
+
+{% block utility_body %}
+ {% if not resend %}
+ <p>{% blocktrans %}We have sent you an email. If you do not receive it within a few minutes, try resending or contact us at <a href="mailto:{{ THEME_CONTACT_EMAIL }}">{{ THEME_CONTACT_EMAIL }}</a>.{% endblocktrans %}</p>
+
+ <form method="POST" action="{% url "account_password_reset" %}">
+ {% csrf_token %}
+ {% for field in form %}
+ {{ field.as_hidden }}
+ {% endfor %}
+ <button type="submit" name="resend" class="btn btn-primary">{% trans "Resend" %}</button>
+ </form>
+ {% else %}
+ <p>{% blocktrans %}We have resent the password email. If you do not receive it within a few minutes, contact us at <a href="mailto:{{ THEME_CONTACT_EMAIL }}">{{ THEME_CONTACT_EMAIL }}</a>.{% endblocktrans %}</p>
+ {% endif %}
+{% endblock %}
diff --git a/pinaxcon/templates/account/password_reset_token.html b/pinaxcon/templates/account/password_reset_token.html
new file mode 100644
index 00000000..c91cfaff
--- /dev/null
+++ b/pinaxcon/templates/account/password_reset_token.html
@@ -0,0 +1,18 @@
+{% extends "utility_page.html" %}
+
+{% load i18n %}
+{% load bootstrap %}
+
+{% block head_title %}{% trans "Set your new password" %}{% endblock %}
+{% block page_title %}{% trans "Set your new password" %}{% endblock %}
+
+{% block utility_body %}
+ <form method="POST" action="{% url "account_password_reset_token" uidb36=uidb36 token=token %}">
+ <legend>{% trans "Set your new password" %}</legend>
+ <fieldset>
+ {% csrf_token %}
+ {% include "_form_snippet.html" with form=form %}
+ <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
+ </fieldset>
+ </form>
+{% endblock %}
diff --git a/pinaxcon/templates/account/password_reset_token_fail.html b/pinaxcon/templates/account/password_reset_token_fail.html
new file mode 100644
index 00000000..043406f5
--- /dev/null
+++ b/pinaxcon/templates/account/password_reset_token_fail.html
@@ -0,0 +1,11 @@
+{% extends "utility_page.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Bad token" %}{% endblock %}
+{% block page_title %}{% trans "Bad token" %}{% endblock %}
+
+{% block utility_body %}
+ {% url "account_password_reset" as url %}
+ <p>{% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a <a href="{{ url }}">new password reset</a>.{% endblocktrans %}</p>
+{% endblock %}
diff --git a/pinaxcon/templates/account/settings.html b/pinaxcon/templates/account/settings.html
new file mode 100644
index 00000000..e06d39c1
--- /dev/null
+++ b/pinaxcon/templates/account/settings.html
@@ -0,0 +1,20 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+{% load bootstrap %}
+
+{% block body_class %}account account-settings{% endblock %}
+
+{% block head_title %}{% trans "Account Settings" %}{% endblock %}
+{% block page_title %}{% trans "Account Settings" %}{% endblock %}
+{% block btn-settings %}btn__active{% endblock %}
+
+{% block account_body %}
+ <form method="POST" action="{% url "account_settings" %}">
+ <fieldset>
+ {% csrf_token %}
+ {% include "_form_snippet.html" with form=form %}
+ <button class="btn btn-primary" type="submit">{% trans "Save" %}</button>
+ </fieldset>
+ </form>
+{% endblock %}
diff --git a/pinaxcon/templates/account/signup.html b/pinaxcon/templates/account/signup.html
new file mode 100644
index 00000000..a5a3dbda
--- /dev/null
+++ b/pinaxcon/templates/account/signup.html
@@ -0,0 +1,33 @@
+{% extends "utility_page.html" %}
+
+{% load account_tags %}
+{% load i18n %}
+{% load bootstrap %}
+
+{% block head_title %}{% trans "Sign up" %}{% endblock %}
+{% block page_title %}{% trans "Sign up" %}{% endblock %}
+
+{% block utility_body %}
+ <p>
+ {% trans "Already have an account?" %} <strong><a href="{% urlnext 'account_login' %}">{% trans "Log in" %}</a></strong>
+ </p>
+ <form id="signup_form" method="post" action="{% url "account_signup" %}" autocapitalize="off" {% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
+ {% csrf_token %}
+ <fieldset>
+ {% include "_form_snippet.html" with form=form %}
+ </fieldset>
+ {% if redirect_field_value %}
+ <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+ {% endif %}
+ <button type="submit" class="btn btn-primary">{% trans "Sign up" %}</button>
+ </form>
+{% endblock %}
+
+{% block scripts %}
+ {{ block.super }}
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $('#id_username').focus();
+ });
+ </script>
+{% endblock %}
diff --git a/pinaxcon/templates/account/signup_closed.html b/pinaxcon/templates/account/signup_closed.html
new file mode 100644
index 00000000..270d869c
--- /dev/null
+++ b/pinaxcon/templates/account/signup_closed.html
@@ -0,0 +1,14 @@
+{% extends "site_base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}{% trans "Sign up" %}{% endblock %}
+
+{% block body %}
+ <h1>{% trans "This site is in private beta" %}</h1>
+ <p>{% blocktrans %}If you have signup code you can enter it below.{% endblocktrans %}</p>
+ <form method="get" action="">
+ <div><input type="text" name="code" placeholder="{% trans 'Your signup code...' %}" /></div>
+ <div><input type="submit" class="btn btn-primary"></div>
+ </form>
+{% endblock %}
diff --git a/pinaxcon/templates/symposion/proposals/base.html b/pinaxcon/templates/symposion/proposals/base.html
index 43464cad..43cef910 100644
--- a/pinaxcon/templates/symposion/proposals/base.html
+++ b/pinaxcon/templates/symposion/proposals/base.html
@@ -1,16 +1,16 @@
-{% extends "site_base_wagtail.html" %}
+{% extends "utility_page.html" %}
{% load staticfiles %}
-{% block body %}
+
+{% block utility_body_outer %}
+{% block proposals_body_outer %}
<div class="l-content-page">
<div class="l-content-page--richtext">
- <h2>{% block page_title %}{% endblock %}</h2>
- {% block proposals_body %}
+ {% block utility_body %}
+ {% block proposals_body %}
+ {% endblock %}
{% endblock %}
</div>
</div>
{% endblock %}
-
-{% block extra_script %}
-<script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script>
{% endblock %}
diff --git a/pinaxcon/templates/symposion/proposals/document_create.html b/pinaxcon/templates/symposion/proposals/document_create.html
index 9598d220..4ddb997a 100644
--- a/pinaxcon/templates/symposion/proposals/document_create.html
+++ b/pinaxcon/templates/symposion/proposals/document_create.html
@@ -9,9 +9,9 @@
{% csrf_token %}
<fieldset>
{% include "_form_snippet.html" with form=form %}
+ <div class="btn-group">
+ <input class="btn btn-primary" type="submit" value="Upload" />
+ </div>
</fieldset>
- <div class="form-actions">
- <input class="btn btn-primary" type="submit" value="Upload" />
- </div>
</form>
{% endblock %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_detail.html b/pinaxcon/templates/symposion/proposals/proposal_detail.html
index 745737e8..401aabae 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_detail.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_detail.html
@@ -5,15 +5,13 @@
{% load bootstrap %}
{% block head_title %}{{ proposal.title }}{% endblock %}
+{% block page_title %}#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}){% endblock %}
-
-{% block body %}
+{% block proposals_body_outer %}
<div class="panel panel__compact">
<div class="panel--content">
- <h2>{% block page_title %}#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}){% endblock %}</h2>
-
<div class="panel--tab-controls">
<div class="panel--tabs"><a data-tab-control="Details" class="panel--tab-switch is-active">{% trans "Proposal Details" %}</a><a data-tab-control="Documents" class="panel--tab-switch">{% trans "Supporting Documents" %}</a><a data-tab-control="Feedback" class="panel--tab-switch">{% trans "Reviewer Feedback" %} ({{ proposal.messages.all|length }})</a>
</div>
@@ -80,10 +78,10 @@
{% csrf_token %}
<fieldset>
{% include "_form_snippet.html" with form=message_form %}
+ <div class="btn-group">
+ <button type="submit" name="message_submit" class="btn btn-primary">{% trans 'Submit' %}</button>
+ </div>
</fieldset>
- <div class="actions">
- <button type="submit" name="message_submit" class="btn btn-primary">{% trans 'Submit' %}</button>
- </div>
</form>
</div>
</div>
diff --git a/pinaxcon/templates/symposion/proposals/proposal_edit.html b/pinaxcon/templates/symposion/proposals/proposal_edit.html
index 1d4f894f..108bd672 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_edit.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_edit.html
@@ -3,7 +3,7 @@
{% load bootstrap %}
{% block head_title %}Editing {{ proposal.title }}{% endblock %}
-{% block page_title %}Edit: {{ proposal.title }}{% endblock %}
+{% block page_title %}Editing: {{ proposal.title }}{% endblock %}
{% block proposals_body %}
<p><a href="{% url "proposal_speaker_manage" proposal.pk %}">Manage speakers</a></p>
@@ -12,10 +12,11 @@
{% csrf_token %}
<fieldset>
{% include "_form_snippet.html" with form=form %}
+ <div class="btn-group">
+ <input class="btn btn-primary" type="submit" value="Save" />
+ <a class="btn btn-default" href="{% url "proposal_detail" proposal.pk %}">Cancel</a>
+ </div>
</fieldset>
- <div class="form-actions">
- <input class="btn btn-primary" type="submit" value="Save" />
- <a class="btn btn-default" href="{% url "proposal_detail" proposal.pk %}">Cancel</a>
- </div>
+
</form>
{% endblock %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_leave.html b/pinaxcon/templates/symposion/proposals/proposal_leave.html
index dbaad042..edb5d076 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_leave.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_leave.html
@@ -1,8 +1,9 @@
{% extends "symposion/proposals/base.html" %}
-{% block body %}
- <h3>Leaving {{ proposal.title }}</h3>
+{% block page_title %}Leaving {{ proposal.title }}{% endblock %}
+{% block head_title %}Leaving {{ proposal.title }}{% endblock %}
+{% block body %}
<form method="POST" action="" enctype="multipart/form-data">
{% csrf_token %}
<p>Are you sure you wish to leave as a speaker on <b>{{ proposal.title }}</b>?</p>
diff --git a/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html b/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html
index 9ae5b1cf..ac61919f 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html
@@ -4,6 +4,7 @@
{% load bootstrap %}
{% block page_title %}{% trans 'Proposal:' %} {{ proposal.title }}{% endblock %}
+{% block head_title %}{% trans 'Proposal:' %} {{ proposal.title }}{% endblock %}
{% block proposals_body %}
<h1></h1>
@@ -27,10 +28,12 @@
<form method="POST" action="" enctype="multipart/form-data">
{% csrf_token %}
- {% include "_form_snippet.html" with form=add_speaker_form %}
- <div class="form-action">
- <input type="submit" value="Add speaker" class="btn btn-primary" />
- </div>
+ <fieldset>
+ {% include "_form_snippet.html" with form=add_speaker_form %}
+ <div class="btn-group">
+ <input type="submit" value="Add speaker" class="btn btn-primary" />
+ </div>
+ </fieldset>
</form>
{% endblock %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_submit.html b/pinaxcon/templates/symposion/proposals/proposal_submit.html
index 0a8294a2..edae8305 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_submit.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_submit.html
@@ -4,6 +4,7 @@
{% load i18n %}
{% block page_title %}{% trans "Submit A Proposal" %}{% endblock %}
+{% block head_title %}{% trans "Submit A Proposal" %}{% endblock %}
{% block proposals_body %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html b/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html
index ddef907e..358f82a7 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html
@@ -3,20 +3,21 @@
{% load i18n %}
{% block page_title %}Submit a Proposal for a {{ kind.name }}{% endblock %}
+{% block head_title %}Submit a Proposal for a {{ kind.name }}{% endblock %}
{% block proposals_body %}
<form method="POST" action="" enctype="multipart/form-data">
{% csrf_token %}
<fieldset>
{% include "_form_snippet.html" with form=proposal_form %}
- </fieldset>
- <div class="form-actions">
<p>
You will be able to edit your proposal after it has been submitted. The program committee may ask questions, provide feedback, and even suggest changes to your proposal as part of the review processes.
</p>
- <input class="btn btn-primary" type="submit" name="finish" value="Save" />
- <!-- <span style="float: right; padding: 4px 6px">or</span> -->
- <input class="btn btn-default" type="submit" name="add-speakers" value="Save and Add Additional Speakers" />
- </div>
+ <div class="btn-group">
+ <input class="btn btn-primary" type="submit" name="finish" value="Save" />
+ <!-- <span style="float: right; padding: 4px 6px">or</span> -->
+ <input class="btn btn-default" type="submit" name="add-speakers" value="Save and Add Additional Speakers" />
+ </div>
+ </fieldset>
</form>
{% endblock %}
diff --git a/pinaxcon/templates/symposion/speakers/base.html b/pinaxcon/templates/symposion/speakers/base.html
index 3327d0a4..eaf4e530 100644
--- a/pinaxcon/templates/symposion/speakers/base.html
+++ b/pinaxcon/templates/symposion/speakers/base.html
@@ -1 +1,6 @@
-{% extends "site_base_wagtail.html" %}
+{% extends "utility_page.html" %}
+
+{% block utility_body %}
+ {% block proposals_body %}
+ {% endblock %}
+{% endblock %}
diff --git a/pinaxcon/templates/symposion/speakers/speaker_create.html b/pinaxcon/templates/symposion/speakers/speaker_create.html
index c51b86d9..63ac9ae3 100644
--- a/pinaxcon/templates/symposion/speakers/speaker_create.html
+++ b/pinaxcon/templates/symposion/speakers/speaker_create.html
@@ -4,22 +4,18 @@
{% load i18n %}
{% load pinax_boxes_tags %}
+{% block head_title %}{% trans "Create Speaker Profile" %}{% endblock %}
{% block page_title %}{% trans "Create Speaker Profile" %}{% endblock %}
-{% block body %}
-<div class="l-content-page">
- <div class="l-content-page--richtext">
+{% block proposals_body %}
<form method="POST" action="" enctype="multipart/form-data">
{% csrf_token %}
- <h2>{% trans "Create Speaker Profile" %}</h2>
<fieldset>
{% include "_form_snippet.html" with form=speaker_form %}
+ <div class="btn-group">
+ <input class="btn btn-primary" type="submit" value="Save" />
+ <a class="btn btn-default" href="{% url "dashboard" %}">Cancel</a>
+ </div>
</fieldset>
- <div class="form-actions">
- <input class="btn btn-primary" type="submit" value="Save" />
- <a class="btn btn-default" href="{% url "dashboard" %}">Cancel</a>
- </div>
</form>
- </div>
-</div>
{% endblock %}
diff --git a/pinaxcon/templates/symposion/speakers/speaker_edit.html b/pinaxcon/templates/symposion/speakers/speaker_edit.html
index d63ded20..b4f84df8 100644
--- a/pinaxcon/templates/symposion/speakers/speaker_edit.html
+++ b/pinaxcon/templates/symposion/speakers/speaker_edit.html
@@ -4,22 +4,18 @@
{% load i18n %}
{% load pinax_boxes_tags %}
+{% block head_title %}{% trans "Edit Speaker Profile" %}{% endblock %}
{% block page_title %}{% trans "Edit Speaker Profile" %}{% endblock %}
-{% block body %}
-<div class="l-content-page">
- <div class="l-content-page--richtext">
+{% block proposals_body %}
<form method="POST" action="" enctype="multipart/form-data">
{% csrf_token %}
- <h2>{% trans "Edit Speaker Profile" %}</h2>
<fieldset>
{% include "_form_snippet.html" with form=speaker_form %}
+ <div class="btn-group">
+ <input class="btn btn-primary" type="submit" value="Save" />
+ <a class="btn btn-default" href="{% url "dashboard" %}">Cancel</a>
+ </div>
</fieldset>
- <div class="form-actions">
- <input class="btn btn-primary" type="submit" value="Save" />
- <a class="btn btn-default" href="{% url "dashboard" %}">Cancel</a>
- </div>
</form>
- </div>
-</div>
{% endblock %}
diff --git a/pinaxcon/templates/utility_page.html b/pinaxcon/templates/utility_page.html
new file mode 100644
index 00000000..833b029a
--- /dev/null
+++ b/pinaxcon/templates/utility_page.html
@@ -0,0 +1,26 @@
+{% extends "site_base_wagtail.html" %}
+{% load staticfiles %}
+
+{% block body %}
+ <div class="panel panel__compact panel__bg">
+ <div style="background-image: url('{% static 'lca2017/images/wineglass_bg_optimised.jpg' %}');" class="panel--bg"></div>
+ <div class="panel--content">
+ <h2>{% block page_title %}{% endblock %}</h2>
+ <br />
+ <br />
+ </div>
+ </div>
+
+ {% block utility_body_outer %}
+ <div class="l-content-page">
+ <div class="l-content-page--richtext">
+ {% block utility_body %}
+ {% endblock %}
+ </div>
+ </div>
+ {% endblock %}
+{% endblock %}
+
+{% block extra_script %}
+<script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script>
+{% endblock %}
diff --git a/static/src/lca2017/css/app.css b/static/src/lca2017/css/app.css
index 7dc528cc..320df10a 100755
--- a/static/src/lca2017/css/app.css
+++ b/static/src/lca2017/css/app.css
@@ -784,6 +784,10 @@ table.alt tr:not(:last-of-type) {
border: 1px solid #3ab1c9;
}
+.btn__active {
+ border: solid #3ab1c9;
+}
+
.btn-group {
display: -ms-flexbox;
diff --git a/static/src/lca2017/images/wineglass_bg_optimised.jpg b/static/src/lca2017/images/wineglass_bg_optimised.jpg
new file mode 100755
index 00000000..3990a721
Binary files /dev/null and b/static/src/lca2017/images/wineglass_bg_optimised.jpg differ