Changeset - 499b3b6769ae
[Not reviewed]
pinaxcon/templates/symposion/proposals/_proposal_fields.html
Show inline comments
...
 
@@ -3,5 +3,11 @@
 

	
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Withdrawn</label>
 
      <div class="col-sm-10 col-lg-10">
 
<div class="row my-4">
 
  <h2 class="col-12">
 
    Details
 
  </h2>
 
</div>
 

	
 
<div class="row">
 
  <label class="list-label col-md-2">Withdrawn</label>
 
  <div class="col-md-10">
 
    {% if proposal.cancelled %}
...
 
@@ -14,5 +20,5 @@
 

	
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Submitted by</label>
 
      <div class="col-sm-10 col-lg-10">
 
<div class="row">
 
  <label class="list-label col-md-2">Submitted by</label>
 
  <div class="col-md-10">
 
    <p>{{ proposal.speaker }} &lt;{{ proposal.speaker.email }}&gt;</p>
...
 
@@ -21,5 +27,5 @@
 

	
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Proposal Type</label>
 
      <div class="col-sm-10 col-lg-10">
 
<div class="row">
 
  <label class="list-label col-md-2">Proposal Type</label>
 
  <div class="col-md-10">
 
    <p>{{ proposal.kind.name|capfirst }}</p>
...
 
@@ -28,5 +34,5 @@
 

	
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Target Audience</label>
 
      <div class="col-sm-10 col-lg-10">
 
<div class="row">
 
  <label class="list-label col-md-2">Target Audience</label>
 
  <div class="col-md-10">
 
    <p>{{ proposal.get_target_audience_display }}&nbsp;</p>
...
 
@@ -36,5 +42,5 @@
 
{% if proposal.talk_format %}
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Talk Format</label>
 
      <div class="col-sm-10 col-lg-10">
 
<div class="row">
 
  <label class="list-label col-md-2">Talk Format</label>
 
  <div class="col-md-10">
 
    <p>{{ proposal.get_talk_format_display }}</p>
...
 
@@ -45,5 +51,5 @@
 
{% if proposal.can_exhibit %}
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Can exhibit?</label>
 
      <div class="col-sm-10 col-lg-10">
 
<div class="row">
 
  <label class="list-label col-md-2">Can exhibit?</label>
 
  <div class="col-md-10">
 
    <p>{{ proposal.get_can_exhibit_display }}</p>
...
 
@@ -51,4 +57,4 @@
 
  <div>
 
      <label class="col-sm-2 col-lg-2">Exhibition Requirements</label>
 
      <div class="col-sm-10 col-lg-10">
 
    <label class="list-label col-md-2">Exhibition Requirements</label>
 
    <div class="col-md-10">
 
      {% if proposal.exhibition_requirements %}
...
 
@@ -62,3 +68,2 @@
 
  </div>
 

	
 
</div>
...
 
@@ -67,5 +72,5 @@
 
{% if proposal.additional_speakers.all %}
 
      <div>
 
        <label class="col-sm-2 col-lg-2">Additional Speakers</label>
 
        <div class="col-sm-10 col-lg-10">
 
<div class="row">
 
  <label class="list-label col-md-2">Additional Speakers</label>
 
  <div class="col-md-10">
 
    <table class="table">
...
 
@@ -96,8 +101,7 @@
 
</div>
 
      <p></p>
 
{% endif %}
 

	
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Abstract</label>
 
      <div class="col-sm-10 col-lg-10">
 
<div class="row">
 
  <label class="list-label col-md-2">Abstract</label>
 
  <div class="col-md-10">
 
    <div class="abstract monospace-text well">{{ proposal.abstract_html|safe }}&nbsp;</div>
...
 
@@ -107,5 +111,5 @@
 

	
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Private Abstract</label>
 
      <div class="col-sm-10 col-lg-10">
 
<div class="row">
 
  <label class="list-label col-md-2">Private Abstract</label>
 
  <div class="col-md-10">
 
    <div class="private_abstract monospace-text well">{{ proposal.private_abstract_html|safe }}&nbsp;</div>
...
 
@@ -115,5 +119,5 @@
 

	
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Project</label>
 
      <div class="col-sm-10 col-lg-10">
 
<div class="row">
 
  <label class="list-label col-md-2">Project</label>
 
  <div class="col-md-10">
 
    {% if proposal.project %}
...
 
@@ -126,5 +130,5 @@
 

	
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Project URL</label>
 
      <div class="col-sm-10 col-lg-10">
 
<div class="row">
 
  <label class="list-label col-md-2">Project URL</label>
 
  <div class="col-md-10">
 
    {% if proposal.project_url %}
...
 
@@ -137,5 +141,5 @@
 

	
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Video URL</label>
 
      <div class="col-sm-10 col-lg-10">
 
<div class="row">
 
  <label class="list-label col-md-2">Video URL</label>
 
  <div class="col-md-10">
 
    {% if proposal.video_url %}
...
 
@@ -148,5 +152,5 @@
 

	
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Special Requirements</label>
 
      <div class="col-sm-10 col-lg-10">
 
<div class="row">
 
  <label class="list-label col-md-2">Special Requirements</label>
 
  <div class="col-md-10">
 
    {% if proposal.technical_requirements_html %}
...
 
@@ -157,5 +161,23 @@
 
  </div>
 
      &nbsp;
 
</div>
 
    <br/>
 

	
 
<div class="row">
 
  <label class="list-label col-md-2">Recording Release</label>
 
  <div class="col-md-10">
 
    <p>{{ proposal.recording_release }}&nbsp;</p>
 
  </div>
 
</div>
 

	
 
<div class="row">
 
  <label class="list-label col-md-2">Materials Release</label>
 
  <div class="col-md-10">
 
    <p>{{ proposal.materials_release }}&nbsp;</p>
 
  </div>
 
</div>
 

	
 
<div class="row my-4">
 
  <h2 class="col-12">
 
    Speakers
 
  </h2>
 
</div>
 

	
...
 
@@ -163,19 +185,19 @@
 
{% if speaker.name %}
 
        <div class="panel panel-default">
 
          <div class="panel-heading">
 
            <h3 class="panel-title">Speaker: {{ speaker.name }}</h3>
 
<div class="card card-default my-3">
 
  <div class="card-header">
 
    <h3 class="card-title">{{ speaker.name }}</h3>
 
  </div>
 
          <div class="panel-body">
 
            <div>
 
              <label class="col-sm-2 col-lg-2">Biography</label>
 
              <div class="col-sm-10 col-lg-10 well monospace-text">{{ speaker.biography_html|safe }}&nbsp;</div>
 
  <div class="card-body">
 
    <div class="row">
 
      <label class="list-label col-md-2">Biography</label>
 
      <div class="col-md-10 well monospace-text">{{ speaker.biography_html|safe }}&nbsp;</div>
 
    </div>
 
            <div>
 
              <label class="col-sm-2 col-lg-2">Experience</label>
 
              <div class="col-sm-10 col-lg-10 well monospace-text">{{ speaker.experience_html|safe }}&nbsp;</div>
 
    <div class="row">
 
      <label class="list-label col-md-2">Experience</label>
 
      <div class="col-md-10 well monospace-text">{{ speaker.experience_html|safe }}&nbsp;</div>
 
    </div>
 
    {% if speaker.accessibility_html %}
 
              <div>
 
                <label class="col-sm-2 col-lg-2">Accessibility Requirements</label>
 
                <div class="col-sm-10 col-lg-10 well monospace-text">{{ speaker.accessibility_html|safe }}&nbsp;</div>
 
    <div class="row">
 
      <label class="list-label col-md-2">Accessibility Requirements</label>
 
      <div class="col-md-10 well monospace-text">{{ speaker.accessibility_html|safe }}&nbsp;</div>
 
    </div>
...
 
@@ -189,5 +211,12 @@
 
{% if can_manage_proposal or request.user.speaker_profile in proposal.speakers %}
 
      <div>
 
        <label class="col-sm-2 col-lg-2">Travel Assistance Required</label>
 
        <div class="col-sm-10 col-lg-10">
 

	
 
<div class="row my-4">
 
  <h2 class="col-12">
 
    Travel Assistance
 
  </h2>
 
</div>
 

	
 

	
 
<div class="row">
 
  <div class="col-12">
 
    <table class="table">
...
 
@@ -220,17 +249 @@
 
{% endif %}
 

	
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Recording Release</label>
 
      <div class="col-sm-10 col-lg-10">
 
        <p>{{ proposal.recording_release }}&nbsp;</p>
 
      </div>
 
      &nbsp;
 
    </div>
 

	
 
    <div>
 
      <label class="col-sm-2 col-lg-2">Materials Release</label>
 
      <div class="col-sm-10 col-lg-10">
 
        <p>{{ proposal.materials_release }}&nbsp;</p>
 
      </div>
 
      &nbsp;
 
    </div>
pinaxcon/templates/symposion/proposals/_proposal_row.html
Show inline comments
 
  <!-- {% if proposal.result.status == "accepted" %}
 
    <div class="card card-success mx-4">
 
  {% if proposal.result.status == "accepted" %}
 
    <div class="card card-success border-primary mx-4 my-4">
 
  {% elif proposal.result.status == "rejected" %}
 
    <div class="card card-danger mx-4">
 
    <div class="card card-danger border-primary mx-4 my-4">
 
  {% elif proposal.result.status == "standby" %}
 
    <div class="card card-warning mx-4">
 
    <div class="card card-warning border-primary mx-4 my-4">
 
  {% else %}
 
    <div class="card card-primary mx-4">
 
  {% endif %} -->
 
    <div class="card border-primary">
 
    <div class="card card-primary border-primary mx-4 my-4">
 
  {% endif %}
 
      <div class="card-body">
pinaxcon/templates/symposion/proposals/base.html
Show inline comments
...
 
@@ -4,6 +4,2 @@
 

	
 
{% block utility_body_outer %}
 
{% block proposals_body_outer %}
 
  <div class="l-content-page">
 
    <div class="l-content-page--richtext">
 
{% block utility_body %}
...
 
@@ -12,5 +8,2 @@
 
{% endblock %}
 
    </div>
 
  </div>
 
{% endblock %}
 
{% endblock %}
 

	
pinaxcon/templates/symposion/proposals/proposal_detail.html
Show inline comments
...
 
@@ -7,8 +7,8 @@
 

	
 
{% block proposals_body_outer %}
 
  <div class="tabbable">
 
    <ul class="nav nav-tabs">
 
      <li class="active"><a href="#proposal-detail" data-toggle="tab">{% trans "Proposal Details" %}</a></li>
 
      <li><a href="#supporting-document" data-toggle="tab">{% trans "Supporting Documents" %}</a></li>
 
      <li><a href="#reviewer-feedback" data-toggle="tab">{% trans "Reviewer Feedback" %} ({{ proposal.messages.all|length }})</a></li>
 
{% block proposals_body %}
 
  <div>
 
    <ul class="nav nav-pills mb-5">
 
      <li class="nav-item"><a class="nav-link active" href="#proposal-detail" data-toggle="tab">{% trans "Proposal Details" %}</a></li>
 
      <li class="nav-item"><a class="nav-link" href="#supporting-document" data-toggle="tab">{% trans "Supporting Documents" %}</a></li>
 
      <li class="nav-item"><a class="nav-link" href="#reviewer-feedback" data-toggle="tab">{% trans "Reviewer Feedback" %} ({{ proposal.messages.all|length }})</a></li>
 
    </ul>
...
 
@@ -18,3 +18,2 @@
 
        {% include "symposion/proposals/_proposal_fields.html" %}
 
        <div class="btn-group">
 
          {% if not proposal.cancelled %}
...
 
@@ -31,5 +30,7 @@
 
      </div>
 
      </div>
 

	
 
      <div class="tab-pane" id="supporting-document">
 
        <div class="row">
 
          <div class="col-12">
 
            <h2 class="my-4">Documents</h2>
 
            {% if proposal.supporting_documents.exists %}
...
 
@@ -51,3 +52,7 @@
 
           {% endif %}
 
        <a class="btn btn-default btn-sm{% if proposal.cancelled %} btn-disabled{% endif %}" href="{% url "proposal_document_create" proposal.pk %}"><i class="fa fa-upload"></i> {% trans 'Add Document' %}</a>
 
           <a class="btn btn-primary {% if proposal.cancelled %} btn-disabled{% endif %}" href="{% url "proposal_document_create" proposal.pk %}"><i class="fa fa-upload"></i> {% trans 'Add Document' %}</a>
 
          </div>
 
        </div>
 
        
 
        
 
      </div>
...
 
@@ -55,9 +60,14 @@
 
      <div class="tab-pane" id="reviewer-feedback">
 
        <h3>{% trans 'Conversation with Reviewers' %}</h3>
 
        <div class="row">
 
          <div class="col-12">
 
            <h2 class="my-4">{% trans 'Conversation with Reviewers' %}</h2>
 
          </div>
 
        </div>
 
        
 
        {% for message in proposal.messages.all %}
 
          <div class="panel panel-default">
 
            <div class="panel-body">
 
          <div class="card">
 
            <div class="card-body">
 
              <div class="comment monospace-text"><em>{{ message.message|safe }}</em></div>
 
            </div>
 
            <div class="panel-heading">
 
            <div class="card-footer">
 
              <div><b>{{ message.user.username }}</b> {{ message.submitted_at|timesince }} ago</div>
...
 
@@ -67,3 +77,3 @@
 
        {% endfor %}
 
        <h3>{% trans 'Leave a Message' %}</h3>
 
        <h3 class="my-4">{% trans 'Leave a Message' %}</h3>
 
        <p>{% trans 'You can leave a message for the reviewers here.' %}</p>
pinaxcon/templates/symposion/proposals/proposal_edit.html
Show inline comments
...
 
@@ -12,6 +12,4 @@
 
        {% 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>
pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html
Show inline comments
...
 
@@ -8,10 +8,3 @@
 
{% block proposals_body %}
 
    <h1></h1>
 

	
 
    <p>
 
      <a href="{% url "proposal_edit" proposal.pk %}">{% trans 'Edit proposal' %}
 
      </a>
 
    </p>
 

	
 
    <h3>{% trans 'Current Speakers' %}</h3>
 
    <h2 class="my-5">{% trans 'Current Speakers' %}</h2>
 

	
...
 
@@ -25,3 +18,3 @@
 

	
 
    <h3>{% trans 'Add another speaker' %}</h3>
 
    <h3 class="mt-5">{% trans 'Add another speaker' %}</h3>
 

	
...
 
@@ -31,5 +24,4 @@
 
          {% include "_form_snippet.html" with form=add_speaker_form %}
 
          <div class="btn-group">
 
            <input type="submit" value="Add speaker" class="btn btn-primary"/>
 
          </div>
 
            <a href="{% url "proposal_edit" proposal.pk %}" class="btn btn-light">{% trans 'Cancel' %}
 
        </fieldset>
pinaxcon/templates/symposion/proposals/proposal_submit_kind.html
Show inline comments
...
 
@@ -15,7 +15,4 @@
 
          </p>
 
          <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>
static/src/scss/app.scss
Show inline comments
...
 
@@ -95,6 +95,2 @@ li.nav-item {
 

	
 
    a.nav-link {
 
        padding-top: 0;
 
    }
 

	
 
    &.active > a.nav-link {
...
 
@@ -260 +256,13 @@ ul.messagelist {
 
}
 

	
 
label.list-label {
 
    font-weight: bold;
 
}
 

	
 
.nav-pills>.nav-item {
 
    background-color: #f3f3f3;
 

	
 
    a {
 
        color: $primary;
 
    }
 
}
0 comments (0 inline, 0 general)