Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into feature-teams

Browse source
This commit is contained in:
James Tauber 2012-08-01 19:48:47 -04:00
commit c18fd7e378
4 changed files with 58 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
symposion_project/static/symposion/css/symposion.css
View file

File diff suppressed because one or more lines are too long

7
symposion_project/static/symposion/less/symposion-components.less
View file

@ -34,14 +34,13 @@ header {
// Boxes // Boxes
.content-box.editable { .content-box.editable {
border: 1px dashed #bbb; border: 1px dashed #ccc;
padding: 5px; padding: 1px;
min-height: 30px; min-height: 30px;
} }
.edit-toggle { .edit-toggle {
position: relative; position: relative;
float: left; float: right;
left: -20px;
} }
// Markitup // Markitup

6
symposion_project/templates/boxes/box.html
View file

@ -16,8 +16,8 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal">Close</a> <a href="#" class="btn" data-dismiss="modal">{% trans "Close" %}</a>
<button type="submit" class="btn btn-primary">Save changes</a> <button type="submit" class="btn btn-primary">{% trans "Save changes" %}</a>
</div> </div>
</form> </form>
</div> </div>
@ -25,7 +25,7 @@
<div id="content_{{ label }}" class="content-box {% if form %}editable{% endif %}"> <div id="content_{{ label }}" class="content-box {% if form %}editable{% endif %}">
{% if form %} {% if form %}
<a href="#edit_{{ label }}" data-toggle="modal" class="btn edit-toggle"><i class="icon-pencil"></i></a> <a href="#edit_{{ label }}" data-toggle="modal" class="btn edit-toggle"><i class="icon-pencil"></i> {% trans "Edit this content" %}</a>
{% endif %} {% endif %}
{{ box.content|safe }} {{ box.content|safe }}
</div> </div>

83
symposion_project/templates/proposals/proposal_detail.html
View file

@ -1,58 +1,69 @@
{% extends "site_base.html" %} {% extends "site_base.html" %}
{% load i18n %}
{% block head_title %}{{ proposal.title }}{% endblock %} {% block head_title %}{{ proposal.title }}{% endblock %}
{% block body %} {% block body %}
<h1>{{ proposal.title }}</h1> <div class="pull-right">
<p>
{% if not proposal.cancelled %} {% if not proposal.cancelled %}
{% if request.user == proposal.speaker.user %} {% if request.user == proposal.speaker.user %}
<a href="{% url proposal_edit proposal.pk %}">Edit</a> <a href="{% url proposal_edit proposal.pk %}" class="btn">
| <a href="{% url proposal_cancel proposal.pk %}">Cancel Talk</a> {% trans "Edit this proposal" %}
</a>
<a href="{% url proposal_cancel proposal.pk %}" class="btn">
{% trans "Cancel this proposal" %}
</a>
{% else %} {% else %}
<a href="{% url proposal_leave proposal.pk %}">Leave</a> <a href="{% url proposal_leave proposal.pk %}" class="btn">
{% trans "Remove me from this proposal" %}
</a>
{% endif %} {% endif %}
{% else %} {% else %}
Cancelled Cancelled
{% endif %} {% endif %}
</p>
<div>
{{ proposal.description }}
</div> </div>
<h2>{{ proposal.title }}</h2>
<p><b>Type</b>: {{ proposal.kind.name }}</p> <dl>
<dt>{% trans "Submitted by" %}</dt>
<dd>{{ proposal.speaker }}</dd>
<div> {% if proposal.additional_speakers.all %}
{{ proposal.abstract|safe }} <dt>{% trans "Additional Speakers" %}</dt>
</div> <dd>
{% for speaker in proposal.additional_speakers.all %}
<li>
{% if speaker.user %}
<strong>{{ speaker.name }}</strong> &gt;{{ speaker.email }}&lt;
{% else %}
{{ speaker.email }} ({% trans "Invitation Sent" %})
{% endif %}
</li>
{% endfor %}
</dd>
{% endif %}
<p><b>Audience level</b>: {{ proposal.get_audience_level_display }}</p> <dt>{% trans "Description" %}</dt>
<dd>{{ proposal.description }}</dd>
<p><b>Submitting speaker</b>: {{ proposal.speaker }}</p> <dt>{% trans "Type" %}</dt>
<dd>{{ proposal.kind.name }}</dd>
{% if proposal.additional_speakers.all %} <dt>{% trans "Audience Level" %}</dt>
<p><b>Additional speakers</b>:</p> <dd>{{ proposal.get_audience_level_display }}</dd>
<ul>
{% for speaker in proposal.additional_speakers.all %} <dt>{% trans "Abstract" %}</dt>
{% if speaker.user %} <dd>{{ proposal.abstract|safe }}</dd>
<li><b>{{ speaker.name }}</b> &mdash; {{ speaker.email }}</li>
{% else %} {% if request.user == proposal.speaker.user %}
<li>{{ speaker.email }} &mdash; pending invitation</li> <dt>{% trans "Private Notes" %}</dt>
{% endif %} <dd>{{ proposal.additional_notes }}</dd>
{% endfor %} {% endif %}
</ul> </dl>
{% endif %}
{% if request.user == proposal.speaker.user %} {% if request.user == proposal.speaker.user %}
<p><b>Additional Notes:</b></p> <h3>Supporting Documents</h3>
<p>{{ proposal.additional_notes }}</p>
{% endif %}
{% if request.user == proposal.speaker.user %}
<h2>Supporting Documents</h2>
{% if proposal.supporting_documents.exists %} {% if proposal.supporting_documents.exists %}
<table class="table table-striped"> <table class="table table-striped">
@ -71,6 +82,6 @@
{% else %} {% else %}
<p>No supporting documents attached to this proposal.</p> <p>No supporting documents attached to this proposal.</p>
{% endif %} {% endif %}
<a class="btn btn-small{% if proposal.cancelled %} btn-disabled{% endif %}" href="{% url proposal_document_create proposal.pk %}"><i class="icon-plus"></i> add document</a> <a class="btn btn-small{% if proposal.cancelled %} btn-disabled{% endif %}" href="{% url proposal_document_create proposal.pk %}"><i class="icon-upload"></i> Add Document</a>
{% endif %} {% endif %}
{% endblock %} {% endblock %}