diff --git a/interface/models.py b/interface/models.py index e2cba05..3a00617 100644 --- a/interface/models.py +++ b/interface/models.py @@ -2,6 +2,7 @@ from django.db import models from django.utils.text import slugify from django.utils import timezone from django.conf import settings +from django.shortcuts import resolve_url import random @@ -87,6 +88,9 @@ class WikiPage(models.Model): title = models.CharField(max_length=255) markdown = models.TextField() + def get_absolute_url(self): + return resolve_url('wiki', project=self.project_id, pk=self.pk) + def __str__(self): return self.title diff --git a/interface/static/interface/css/polyphonic.css b/interface/static/interface/css/polyphonic.css index ed72b58..6fdd1f6 100644 --- a/interface/static/interface/css/polyphonic.css +++ b/interface/static/interface/css/polyphonic.css @@ -40,6 +40,12 @@ BODY { margin: 0px auto; } +.collapse { + display: flex; + flex-direction: row; + justify-content: space-around; +} + @media all and (max-width: 900px) { .mdhide { display: none; @@ -53,8 +59,12 @@ BODY { UL.nav-buttons { flex-direction: column; } + .collapse { + flex-direction: column; + } } + /* HEADER BAR */ .navigation { @@ -90,18 +100,13 @@ UL.nav-buttons > LI { margin: 2px 10px; } -.admin-actions { - text-align: right; - margin: 10px; -} - /* FORMS */ FORM.vertical { display: flex; flex-direction: column; max-width: 400px; - margin: 20px auto; + margin: 0px auto; } LABEL { @@ -112,6 +117,10 @@ TEXTAREA { height: 50px; } +INPUT[type=checkbox] { + margin-right: auto; +} + .form-actions { text-align: right; margin-top: 20px; @@ -200,10 +209,11 @@ H1 { text-align: center; } -TABLE { - width: 100%; +TD { + padding: 5px; } + TABLE.horizontal TH { text-align: right; } @@ -228,4 +238,23 @@ TABLE.horizontal TH { border: 1px solid var(--border-color); border-radius: 10px; padding: 5px; +} + +.admin-tools { + float: right; + padding: 10pt; +} + +.disabled { + background-color: #DDD; +} + +.dz-image { + width: 240px !important; +} + +.dz-progress { + width: 200px !important; + margin-left: -100px !important; + margin-top: 24px !important; } \ No newline at end of file diff --git a/interface/templates/interface/default_form.html b/interface/templates/interface/default_form.html new file mode 100644 index 0000000..a520dbe --- /dev/null +++ b/interface/templates/interface/default_form.html @@ -0,0 +1,14 @@ +{% extends "interface/project_base.html" %} + +{% block page %} +
- Joining code for participants:
- {{ ensemble_url }}
+ Joining instructions for participants
+ URL: {{ ensemble_url }}
+ Passphrase: {{ ensemble.passphrase }}
Sorry, not much you can do here yet. diff --git a/interface/templates/interface/project_base.html b/interface/templates/interface/project_base.html index 09c795c..959a369 100644 --- a/interface/templates/interface/project_base.html +++ b/interface/templates/interface/project_base.html @@ -2,6 +2,13 @@ {% block content %} +{% if request.is_admin %} +
There have been {{ project.submissions.count }} submissions so far...
-