Switched to generic views
This commit is contained in:
Tris
@@ -21,7 +21,7 @@
|
||||
<ul class="nav-buttons">
|
||||
{% if request.ensemble_id %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{% url 'my_projects' %}"><i class="fas fa-music"></i> <span class="">My
|
||||
<a class="nav-link" href="{% url 'ensemble_detail' %}"><i class="fas fa-music"></i> <span class="">My
|
||||
Projects</span></a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
<h1>Projects for {{ ensemble.name }}</h1>
|
||||
<div class="list-group narrow">
|
||||
{% for project in ensemble.active_projects %}
|
||||
<a class="" href="{% url 'project' project_id=project.id %}">
|
||||
<a class="" href="{% url 'project_detail' pk=project.id %}">
|
||||
<h3>{{ project.name }}</h3>
|
||||
<p><small>Due in {{ project.deadline|timeuntil }}</small></p>
|
||||
</a>
|
||||
@@ -1,41 +0,0 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{{ project.name }}</h1>
|
||||
{% block page %}
|
||||
<div class="narrow">
|
||||
<h3 class="text-center">Due in {{ project.deadline|timeuntil }}!</h3>
|
||||
<p>There have been {{ project.submissions.count }} submissions so far...</p>
|
||||
<table>
|
||||
<tbody>
|
||||
{% for submission in project.submissions %}
|
||||
<tr>
|
||||
<td>{{ submission.date|timesince }} ago</td>
|
||||
<td>{{ submission.name }} ({{ submission.instrument }})</td>
|
||||
{% if request.user.is_authenticated %}
|
||||
<td>
|
||||
<a href="{% url 'submission' project_id=project.pk submission_id=submission.pk %}"><i class="fas fa-info-circle"></i></a>
|
||||
|
||||
<a href="{{ submission.presigned_url }}"><i class="fas fa-download"></i></a>
|
||||
</td>
|
||||
{% endif %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% endblock %}
|
||||
<div class="project-links">
|
||||
<div class="pills" role="tablist">
|
||||
<a role="tab" href="{% url 'project' project_id=project.id %}">Project info</a>
|
||||
<a role="tab" href="{% url 'resources' project_id=project.pk %}">Resources</a>
|
||||
{% for page in project.wiki_pages.all %}
|
||||
<a class="nav-link {% if page.id == wiki_id %}active{% endif %}"
|
||||
href="{% url 'wiki' project_id=project.id wiki_id=page.id %}">{{ page.title }}</a>
|
||||
{% endfor %}
|
||||
<!--a role="tab" href="">Record a submission</a-->
|
||||
<a role="tab" href="{% url 'create_submission' project_id=project.id %}">Send a file</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,21 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{{ project.name }}</h1>
|
||||
{% block page %}
|
||||
No content
|
||||
{% endblock %}
|
||||
<div class="project-links">
|
||||
<div class="pills" role="tablist">
|
||||
<a role="tab" href="{% url 'project_detail' pk=project.id %}">Project info</a>
|
||||
<a role="tab" href="{% url 'resource_list' project=project.pk %}">Resources</a>
|
||||
{% for page in project.wiki_pages.all %}
|
||||
<a class="nav-link {% if page.id == wiki_id %}active{% endif %}"
|
||||
href="{% url 'wiki' project=project.id pk=page.id %}">{{ page.title }}</a>
|
||||
{% endfor %}
|
||||
<!--a role="tab" href="">Record a submission</a-->
|
||||
<a role="tab" href="{% url 'submission_create' project=project.id %}">Send a file</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,25 @@
|
||||
{% extends "interface/project_base.html" %}
|
||||
|
||||
{% block page %}
|
||||
<div class="narrow">
|
||||
<h3 class="text-center">Due in {{ project.deadline|timeuntil }}!</h3>
|
||||
<p>There have been {{ project.submissions.count }} submissions so far...</p>
|
||||
<table>
|
||||
<tbody>
|
||||
{% for submission in project.submissions %}
|
||||
<tr>
|
||||
<td>{{ submission.date|timesince }} ago</td>
|
||||
<td>{{ submission.name }} ({{ submission.instrument }})</td>
|
||||
{% if request.user.is_authenticated %}
|
||||
<td>
|
||||
<a href="{% url 'submission_detail' project=project.pk pk=submission.pk %}"><i class="fas fa-info-circle"></i></a>
|
||||
|
||||
<a href="{{ submission.presigned_url }}"><i class="fas fa-download"></i></a>
|
||||
</td>
|
||||
{% endif %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,15 @@
|
||||
{% extends "interface/project_base.html" %}
|
||||
|
||||
{% block page %}
|
||||
<div class="narrow">
|
||||
<h3>{{ title }}</h3>
|
||||
<p>{{ instructions }}</p>
|
||||
<form method="POST">
|
||||
{% csrf_token %}
|
||||
{{ form }}
|
||||
<div class="form-actions">
|
||||
<button>Create</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,37 @@
|
||||
{% extends "interface/project_base.html" %}
|
||||
|
||||
{% block page %}
|
||||
<div class="narrow">
|
||||
<h3>Resources</h3>
|
||||
<div class="list-group narrow">
|
||||
{% for resource in object_list %}
|
||||
{% with download=resource.presigned_url %}
|
||||
<div>
|
||||
<h3>
|
||||
{{ resource.name }}
|
||||
{% if download %}
|
||||
<a href="{{ download }}">
|
||||
<i class="fas fa-download"></i>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if request.user.is_authenticated %}
|
||||
<a href="{% url 'resource_upload' project=project.pk pk=resource.pk %}">
|
||||
<i class="fas fa-upload"></i>
|
||||
</a>
|
||||
{% endif %}
|
||||
</h3>
|
||||
<p><small>{{ resource.description }}</small></p>
|
||||
{% if download and resource.media_type == 'audio' %}
|
||||
<audio class="resource-player" controls src="{{ download }}"></audio>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endwith %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% if request.user.is_authenticated %}
|
||||
<div class="admin-actions">
|
||||
<a href="{% url 'resource_create' project=project.pk %}"><i class="fas fa-plus-circle"></i> Add new</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "interface/project.html" %}
|
||||
{% extends "interface/project_base.html" %}
|
||||
|
||||
{% block page %}
|
||||
<div class="narrow">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "interface/project.html" %}
|
||||
{% extends "interface/project_base.html" %}
|
||||
|
||||
{% block page %}
|
||||
<div class="narrow">
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
<div class="form-actions text-right">
|
||||
<a class=""
|
||||
href="{% url 'cancel_submission' project_id=project.pk submission_id=submission.pk %}">Cancel</a>
|
||||
href="{{ cancel_url }}">Cancel</a>
|
||||
|
||||
<button type="submit" id="upload">Upload</button>
|
||||
</div>
|
||||
@@ -53,8 +53,8 @@ function startUpload(e) {
|
||||
//$('input[name="file"]').attr('disabled', true);
|
||||
|
||||
// patch form to use our ajax policy
|
||||
$('input[name="policy"]').val("{{ ajax_post.fields.policy }}");
|
||||
$('input[name="signature"]').val("{{ ajax_post.fields.signature }}");
|
||||
$('input[name="policy"]').val("{{ ajax_upload.fields.policy }}");
|
||||
$('input[name="signature"]').val("{{ ajax_upload.fields.signature }}");
|
||||
$('input[name="success_action_redirect"]').remove();
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ function startUpload(e) {
|
||||
if (xhr.status == 204) {
|
||||
status.html("Finished upload");
|
||||
let s3_location = xhr.getResponseHeader("Location");
|
||||
location.href += "/complete?location=" + s3_location;
|
||||
location.href = "{{ success_url }}?location=" + s3_location;
|
||||
} else {
|
||||
status.html("Something went wrong");
|
||||
console.log(xhr.responseText);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "interface/project.html" %}
|
||||
{% extends "interface/project_base.html" %}
|
||||
|
||||
{% block page %}
|
||||
<div class="wiki-page">
|
||||
|
||||
Reference in New Issue
Block a user