diff --git a/pinaxcon/templates/symposion/dashboard/_new_proposal.html b/pinaxcon/templates/symposion/dashboard/_new_proposal.html index a66558fe09d3ccad6d64a5845d2f4984538f47ea..3a8a5497a2731b73dc8cb6b751673995025dc17c 100644 --- a/pinaxcon/templates/symposion/dashboard/_new_proposal.html +++ b/pinaxcon/templates/symposion/dashboard/_new_proposal.html @@ -1,6 +1,6 @@

New Proposal

-

Click one of the following links to create a speaking or miniconf proposal.

-

Once submitted you will be able to see the status of your proposals, as well manage the submission and co-speakers from this page

+

Click one of the following links to create a session proposal.

+

Once submitted you will be able to see the status of your proposals, as well manage the submission and co-speakers from this page.

{% for kind in proposal_kinds %} {{ kind }} diff --git a/pinaxcon/templates/symposion/dashboard/_profile.html b/pinaxcon/templates/symposion/dashboard/_profile.html index 59ef62f24f60c07bc270300ab87e1da6bf4ee721..94d94db838bbad9be5d593cbd5a631b2ff64b716 100644 --- a/pinaxcon/templates/symposion/dashboard/_profile.html +++ b/pinaxcon/templates/symposion/dashboard/_profile.html @@ -1,14 +1,13 @@

Speaker Profile

{% if not user.speaker_profile %}

- To create a speaking or miniconf proposal you must first create a speaker - profile. + To create a session proposal you must first create a speaker profile.

{% endif %}

- Your speaker profile is independent of your attendee profile and the - details you provide here will be used during selection and to populate - your speaker bio on the conference website. + Your speaker profile is independent of your attendee profile. + The details you provide here will be used during the session selection process, + and to populate your speaker bio on the conference website.

{% if not user.speaker_profile %} diff --git a/pinaxcon/templates/symposion/dashboard/speaking.html b/pinaxcon/templates/symposion/dashboard/speaking.html index 5baab215395ada2badc60c2dd0d0d2a6afc82e52..88e9002b72f68ed36bd6aa52edbdc030a6df5eeb 100644 --- a/pinaxcon/templates/symposion/dashboard/speaking.html +++ b/pinaxcon/templates/symposion/dashboard/speaking.html @@ -3,7 +3,7 @@
-

{% trans "Speaking and Miniconfs" %}

+

{% trans "Speaking and Sessions" %}

diff --git a/pinaxcon/templates/symposion/schedule/_grid.html b/pinaxcon/templates/symposion/schedule/_grid.html index 7b4847fe3f667f6ea960d9d98d8c7d5c5c340334..80e28382c3ad035b6af88ae62df985b6bfdc1537 100644 --- a/pinaxcon/templates/symposion/schedule/_grid.html +++ b/pinaxcon/templates/symposion/schedule/_grid.html @@ -12,7 +12,7 @@ {% with timetable|day_has_tracks:timetable.day as has_tracks %} {% if has_tracks %} - Miniconf + Track {% for room in timetable.rooms %} {% with room|trackname:timetable.day as track_name %} {% if track_name %}

{{ track_name }}

{% endif %}