Ditched bootstrap

This commit is contained in:
2020-09-06 22:22:28 +10:00
parent a1d10ea30a
commit 8a8bccd850
19 changed files with 403 additions and 169 deletions
+24 -28
View File
@@ -6,49 +6,45 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
<link rel="stylesheet" href="{% static 'interface/css/polyphonic.css' %}"></link>
<script src="https://kit.fontawesome.com/c837098e5b.js" crossorigin="anonymous"></script>
<title>{% block title %}Polyphonic{% endblock %}</title>
</head>
<body>
{% block header %}
<nav class="navbar navbar-expand-lg navbar-dark">
<a class="navbar-brand" href="/"><i class="fas fa-random"></i> Polyphonic</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<span class="navbar-text">Virtual Ensemble Manager</span>
<div class="collapse navbar-collapse" id="navbarSupportedContent"></div>
<ul class="navbar-nav ml-auto">
<div class="main">
{% block navigation %}
<nav class="navigation">
<div>
<a class="brand" href="/"><i class="fas fa-random smhide"></i> Polyphonic</a>
<span class="mdhide">Virtual Ensemble Manager</span>
</div>
<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> My Projects</a>
<a class="nav-link" href="{% url 'my_projects' %}"><i class="fas fa-music"></i> <span class="">My
Projects</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'register' %}"><i class="fas fa-users"></i> Change Ensemble</a>
<a class="nav-link" href="{% url 'register' %}"><i class="fas fa-users"></i> <span class="">Change
Ensemble</span></a>
</li>
{% endif %}
<li class="nav-item">
<a class="nav-link" href=""><i class="fas fa-question"></i> About</a>
<a class="nav-link" href=""><i class="fas fa-question"></i> <span class="">About</span></a>
</li>
</ul>
</div>
</ul>
</nav>
{% endblock %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
{% block content %}
<h1>No content!</h1>
{% endblock %}
<div class="content">
{% block content %}
<h1>No content!</h1>
{% endblock %}
</div>
</div>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
<!-- late load scripts -->
<script src="https://kit.fontawesome.com/c837098e5b.js" crossorigin="anonymous"></script>
</body>
</html>
@@ -1,29 +0,0 @@
<form class="form-horizontal" method="post">{% csrf_token %}
<fieldset>
<legend>{{ title }}</legend>
{% for field in form %}
{% if field.errors %}
<div class="control-group error">
<label class="control-label">{{ field.label }}</label>
<div class="controls">{{ field }}
<span class="help-inline">
{% for error in field.errors %}{{ error }}{% endfor %}
</span>
</div>
</div>
{% else %}
<div class="control-group">
<label class="control-label">{{ field.label }}</label>
<div class="controls">{{ field }}
{% if field.help_text %}
<p class="help-inline"><small>{{ field.help_text }}</small></p>
{% endif %}
</div>
</div>
{% endif %}
{% endfor %}
</fieldset>
<div class="form-actions text-right">
<button type="submit" class="btn btn-primary" >Submit</button>
</div>
</form>
+18 -25
View File
@@ -1,31 +1,24 @@
{% extends "base.html" %}
{% block content %}
<div class="container" id="project">
<h1>{{ project.name }}</h1>
<div class="row">
<div class="col-9">
{% block page %}
<h3 class="text-center">Due in {{ project.deadline|timeuntil }}</h3>
<p>There have been {{ project.submissions.count }} submissions so far...</p>
{% endblock %}
</div>
<div class="col-3">
<div class="nav flex-column nav-pills" role="tablist">
<a class="nav-link" role=tab"
href="{% url 'project' project_id=project.id %}">Project info</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 %}"
role="tab">{{ page.title }}</a>
{% endfor %}
<a class="nav-link" role="tab"
href="">Record a submission</a>
<a class="nav-link" role="tab"
href="{% url 'submission' project_id=project.id %}">Send a file</a>
</div>
</div>
<h1>{{ project.name }}</h1>
<div>
{% 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>
</div>
{% endblock %}
</div>
<div class="project-links">
<div class="pills" role="tablist">
<a role=tab" href="{% url 'project' project_id=project.id %}">Project info</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 'submission' project_id=project.id %}">Send a file</a>
</div>
</div>
{% endblock %}
@@ -2,17 +2,13 @@
{% block content %}
<div class="container">
<h1>Projects for {{ ensemble.name }}</h1>
<div class="col-md-8 offset-md-2">
<div class="list-group">
<div class="list-group narrow">
{% for project in ensemble.active_projects %}
<a class="list-group-item list-group-item-action" href="{% url 'project' project_id=project.id %}">
<h4>{{ project.name }}</h4>
<a class="" href="{% url 'project' project_id=project.id %}">
<h3>{{ project.name }}</h3>
<p><small>Due in {{ project.deadline|timeuntil }}</small></p>
</a>
{% endfor %}
</div>
</div>
</div>
{% endblock %}
+13 -14
View File
@@ -1,25 +1,24 @@
{% extends "base.html" %}
{% block content %}
<div class="col-md-4 offset-md-4">
<div class="card">
<div class="card-header">Enter the ensemble details given to you</div>
<div class="card-body">
<div class="narrow">
<div>
<h3>My Ensembles</h3>
<ul>
{% for ensemble in current %}
<li><a href="/?code={{ ensemble.ensemble_code}}">{{ ensemble.name }}</a></li>
{% endfor %}
</ul>
</div>
<div>
<form action="" method="POST">
<h3>Add a new ensemble</h3>
{% csrf_token %}
<div class="form-group">
<label for="code">Ensemble Code</label>
<input type="text" class="form-control" placeholder="xxxx-xxxx-xxxx" name="code" value="{{ code }}"/>
</div>
<div class="form-group">
<label for="passphrase">Passphrase</label>
<input type="password" class="form-control" name="passphrase"/>
</div>
<div class="text-right">
{{ form }}
<div class="form-actions">
<button class="btn btn-primary">Enter</button>
</div>
</form>
</div>
</div>
</div>
{% endblock %}
@@ -10,7 +10,13 @@
</p>
<div class="">
{% include "interface/bootstrap-form.html" %}
<form action="" method="POST" enctype="multipart/form-data">
{% csrf_token %}
{{ form }}
<div class="form-actions">
<button type="submit" class="btn-primary">Continue</button>
</div>
</form>
</div>
</div>
</div>
+14 -34
View File
@@ -4,44 +4,24 @@
{% block content %}
<div class="container">
<div class="col-md-4 offset-md-4">
<div class="card" id="legacy-upload">
<div class="card-header">Ready to upload file</div>
<div class="card-body">
<form method="POST" action="{{ upload.url }}" enctype="multipart/form-data" id="video-upload">
{% for field, value in upload.fields.items %}
<input type="hidden" name="{{ field }}" value="{{ value }}" />
{% endfor %}
<input name="file" type="file" accept="video/*"/>
<div class="narrow">
<h3>Ready to upload file</h3>
<form method="POST" action="{{ upload.url }}" enctype="multipart/form-data" id="video-upload">
{% for field, value in upload.fields.items %}
<input type="hidden" name="{{ field }}" value="{{ value }}" />
{% endfor %}
<div class="form-actions text-right">
<a class="btn btn-secondary" href="{% url 'cancel_submission' project_id=project.pk submission_id=submission.pk %}">Cancel</a>
<button class="btn btn-primary">Upload</button>
</div>
</form>
</div>
<input name="file" type="file" accept="video/*" />
<div class="form-actions text-right">
<a class=""
href="{% url 'cancel_submission' project_id=project.pk submission_id=submission.pk %}">Cancel</a>
&nbsp;
<button class="">Upload</button>
</div>
</div>
</form>
</div>
<script src="{% static 'dropzone/dropzone.js' %}"></script>
<script>
(function() {
</div>
//document.getElementById('fallback-file').remove();
Dropzone.options.videoUpload = {
paramName: "file", // The name that will be used to transfer the file
maxFilesize: 500, // MB
accept: function(file, done) {
if (file.name == "justinbieber.jpg") {
done("Naha, you don't.");
} else { done(); }
}
}
})();
</script>
{% endblock %}