diff --git a/core/fixtures/flatpages.json b/core/fixtures/flatpages.json
index a3ab24f..a2b614d 100644
--- a/core/fixtures/flatpages.json
+++ b/core/fixtures/flatpages.json
@@ -1 +1 @@
-[{"model": "flatpages.flatpage", "pk": 1, "fields": {"url": "/about/terms/", "title": "Terms of Service", "content": "
Here is where you should include your terms of service. This should generally work as follows, according to wikipedia:
\r\n\r\n\r\nDisambiguation/definition of key words and phrases \r\nUser rights and responsibilities\r\n\r\nProper or expected usage; potential misuse \r\nAccountability for online actions, behavior, and conduct \r\nPrivacy policy outlining the use of personal data \r\nPayment details such as membership or subscription fees, etc. \r\nOpt-out policy describing procedure for account termination, if available \r\n \r\n \r\nDisclaimer/Limitation of Liability clarifying the site's legal liability for damages incurred by users \r\nAny warrant canaries \r\nUser notification upon modification of terms, if offered \r\n ", "enable_comments": false, "template_name": "", "registration_required": false, "sites": [1]}}, {"model": "flatpages.flatpage", "pk": 2, "fields": {"url": "/about/aup/", "title": "Acceptable Upload Policy", "content": "Here is where you would set your acceptable upload policy. Consider informing users about:
\r\n\r\nWho may upload whose works (own, commissions, other) \r\nRestricted subject matter \r\nContent writing \r\n ", "enable_comments": false, "template_name": "", "registration_required": false, "sites": [1]}}, {"model": "flatpages.flatpage", "pk": 3, "fields": {"url": "/about/help/", "title": "Honeycomb Help", "content": "Help for Honeycomb", "enable_comments": false, "template_name": "", "registration_required": false, "sites": [1]}}, {"model": "flatpages.flatpage", "pk": 4, "fields": {"url": "/about/markdown/", "title": "Markdown help", "content": "Help for markdown", "enable_comments": false, "template_name": "", "registration_required": false, "sites": [1]}}, {"model": "flatpages.flatpage", "pk": 5, "fields": {"url": "/about/credits/", "title": "Credits", "content": "\r\n\r\nCredit where credit is due! The inspiration for Honeycomb came from a discussion among members of The Furry Writers' Guild on what an ideal writing site should be. It should be:
\r\n\r\n\r\neasy to post one's work \r\neasy to interact socially with other users \r\neasy to promote works to others through promotions or editor highlights \r\neasy to organize work through tags and folders \r\neasy to discover new authors and their work \r\neasy for publishers to maintain a presence through pages and advertising \r\n \r\n\r\nFrom out of the FWGs discussions came a specification, which was picked up by OpenFurry as a project. The intent was to provide an implementation and website for use by the furry subculture. The project was open-sourced to allow other communities of writers and readers to use it and contribute as well!
\r\n\r\nAdditionally, the following resources contributed to make the Honeycomb project what it is:
\r\n\r\n\r\nDjango \r\nDjango is the framework upon which Honeycomb is built \r\nBootstrap \r\nBootstrap provides the stylistic framework for the site \r\nGlyphicons \r\nThe Glyphicons icon font provides most of the icons you see throughout the site \r\ndjango-nose \r\ndjango-nose
provides additional testing framework for Honeycomb \r\ndjango-taggit \r\ndjango-taggit
provides the mechanism used for tagging submissions ", "enable_comments": false, "template_name": "", "registration_required": false, "sites": [1]}}]
\ No newline at end of file
+[{"model": "flatpages.flatpage", "pk": 1, "fields": {"url": "/about/terms/", "title": "Terms of Service", "content": "Here is where you should include your terms of service. This should generally work as follows, according to wikipedia:
\r\n\r\n\r\nDisambiguation/definition of key words and phrases \r\nUser rights and responsibilities\r\n\r\nProper or expected usage; potential misuse \r\nAccountability for online actions, behavior, and conduct \r\nPrivacy policy outlining the use of personal data \r\nPayment details such as membership or subscription fees, etc. \r\nOpt-out policy describing procedure for account termination, if available \r\n \r\n \r\nDisclaimer/Limitation of Liability clarifying the site's legal liability for damages incurred by users \r\nAny warrant canaries \r\nUser notification upon modification of terms, if offered \r\n ", "enable_comments": false, "template_name": "", "registration_required": false, "sites": [1]}}, {"model": "flatpages.flatpage", "pk": 2, "fields": {"url": "/about/aup/", "title": "Acceptable Upload Policy", "content": "Here is where you would set your acceptable upload policy. Consider informing users about:
\r\n\r\nWho may upload whose works (own, commissions, other) \r\nRestricted subject matter \r\nContent writing \r\n ", "enable_comments": false, "template_name": "", "registration_required": false, "sites": [1]}}, {"model": "flatpages.flatpage", "pk": 3, "fields": {"url": "/about/help/", "title": "Honeycomb Help", "content": "Help for Honeycomb", "enable_comments": false, "template_name": "", "registration_required": false, "sites": [1]}}, {"model": "flatpages.flatpage", "pk": 4, "fields": {"url": "/about/markdown/", "title": "Markdown help", "content": "Help for markdown", "enable_comments": false, "template_name": "", "registration_required": false, "sites": [1]}}, {"model": "flatpages.flatpage", "pk": 5, "fields": {"url": "/about/credits/", "title": "Credits", "content": "\r\n\r\nCredit where credit is due! The inspiration for Honeycomb came from a discussion among members of The Furry Writers' Guild on what an ideal writing site should be. It should be:
\r\n\r\n\r\neasy to post one's work \r\neasy to interact socially with other users \r\neasy to promote works to others through promotions or editor highlights \r\neasy to organize work through tags and folders \r\neasy to discover new authors and their work \r\neasy for publishers to maintain a presence through pages and advertising \r\n \r\n\r\nFrom out of the FWGs discussions came a specification, which was picked up by OpenFurry as a project. The intent was to provide an implementation and website for use by the furry subculture. The project was open-sourced to allow other communities of writers and readers to use it and contribute as well!
\r\n\r\nAdditionally, the following resources contributed to make the Honeycomb project what it is:
\r\n\r\n\r\nDjango \r\nDjango is the framework upon which Honeycomb is built \r\nBootstrap \r\nBootstrap provides the stylistic framework for the site \r\nGlyphicons \r\nThe Glyphicons icon font provides most of the icons you see throughout the site \r\ndjango-nose \r\ndjango-nose
provides additional testing framework for Honeycomb \r\ndjango-taggit \r\ndjango-taggit
provides the mechanism used for tagging submissions \r\nCoveralls.io \r\nCoveralls ensures that test coverage remains above a certain level. Current coverage of the master branch of Honeycomb is \r\nCoveralls.io \r\nTravis CI ensures that all tests pass whenever a change is made to the source code of Honeycomb. The current build status of the master branch of Honeycomb is \r\n ", "enable_comments": false, "template_name": "", "registration_required": false, "sites": [1]}}]
\ No newline at end of file
diff --git a/core/static/app/base.css b/core/static/app/base.css
index 64e5927..8475b6d 100644
--- a/core/static/app/base.css
+++ b/core/static/app/base.css
@@ -5,6 +5,23 @@ body {
/* background: url('lightpaperfibers.png'); */
}
+.accessibility-aid {
+ position: absolute;
+ width: 1px;
+ height: 1px;
+ margin: 0;
+ overflow: hidden;
+ clip: rect(1px, 1px, 1px, 1px);
+}
+
+.accessability-aid:focus {
+ width: auto;
+ height: auto;
+ margin: auto;
+ overflow: visible;
+ clip: none;
+}
+
.navbar-static-top {
margin-bottom: 19px;
}
@@ -80,3 +97,9 @@ footer img {
height: 14px;
vertical-align: text-top;
}
+
+@media (max-width: 992px) {
+ footer div {
+ text-align: right;
+ }
+}
diff --git a/core/static/app/base.js b/core/static/app/base.js
index d286f17..1b93b22 100644
--- a/core/static/app/base.js
+++ b/core/static/app/base.js
@@ -1,3 +1,9 @@
$(function () {
$('[data-toggle="tooltip"]').tooltip()
+ $(document).on("click", ".js-skip-to-content", function() {
+ return $("#start-of-content")
+ .next()
+ .attr("tabindex","-1")
+ .focus()
+ });
})
diff --git a/core/templates/base.html b/core/templates/base.html
index f04286c..eb51729 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -132,7 +132,8 @@
-
+ Skip to content
+
{% if title or flatpage.title %}
-
+
+
+
+
+
+
+
+
-
+
All posted content is © the creators.
-
+
Help
Markdown
diff --git a/db.sqlite3 b/db.sqlite3
index 525441a..a4215bb 100644
Binary files a/db.sqlite3 and b/db.sqlite3 differ
diff --git a/submissions/folder_views.py b/submissions/folder_views.py
index 3b2c061..2b89e3a 100644
--- a/submissions/folder_views.py
+++ b/submissions/folder_views.py
@@ -178,6 +178,7 @@ def delete_folder(request, username=None, folder_id=None, folder_slug=None):
messages.success(request, 'Folder deleted successfully.')
return redirect(next_url)
return render(request, 'confirm_delete_folder.html', {
+ 'title': 'Deleting folder "{}"'.format(folder.name),
'folder': folder,
})
diff --git a/submissions/migrations/0003_auto_20161028_2238.py b/submissions/migrations/0003_auto_20161028_2238.py
new file mode 100644
index 0000000..03022b0
--- /dev/null
+++ b/submissions/migrations/0003_auto_20161028_2238.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.2 on 2016-10-28 22:38
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0002_auto_20161028_0540'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='submission',
+ name='mtime',
+ field=models.DateTimeField(blank=True),
+ ),
+ ]
diff --git a/submissions/migrations/0004_auto_20161028_2240.py b/submissions/migrations/0004_auto_20161028_2240.py
new file mode 100644
index 0000000..4f9a627
--- /dev/null
+++ b/submissions/migrations/0004_auto_20161028_2240.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.2 on 2016-10-28 22:40
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0003_auto_20161028_2238'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='submission',
+ name='mtime',
+ field=models.DateTimeField(blank=True, null=True),
+ ),
+ ]
diff --git a/submissions/models.py b/submissions/models.py
index efd6188..e7176cc 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -51,7 +51,7 @@ class Submission(models.Model):
# Additional metadata
ctime = models.DateTimeField(auto_now_add=True)
- mtime = models.DateTimeField(auto_now=True)
+ mtime = models.DateTimeField(blank=True, null=True)
views = models.PositiveIntegerField(default=0)
enjoy_votes = models.PositiveIntegerField(default=0)
rating_stars = models.CharField(max_length=40, default='☆' * 5)
diff --git a/submissions/templates/confirm_delete_folder.html b/submissions/templates/confirm_delete_folder.html
index d0a4e49..2b4ccf3 100644
--- a/submissions/templates/confirm_delete_folder.html
+++ b/submissions/templates/confirm_delete_folder.html
@@ -1,12 +1,25 @@
{% extends "base.html" %}
{% block content %}
+{% include 'profile-tabs-snippet.html' with author=user %}
You are about to delete your folder {{ folder.name }}. Are you sure that you want to do this? All submissions in the folder are safe; this folder will simply be removed from their list of folders.
+
+
+
Folder contents
+ {% for submission in folder.submissions.all %}
+
+
+ {% include 'submission-list-snippet.html' with submission=submission author=submission.owner %}
+
+
+ {% endfor %}
+
+
{% endblock %}
diff --git a/submissions/templates/confirm_delete_submission.html b/submissions/templates/confirm_delete_submission.html
index 52724d1..441771c 100644
--- a/submissions/templates/confirm_delete_submission.html
+++ b/submissions/templates/confirm_delete_submission.html
@@ -5,8 +5,26 @@
You are about to delete your submission {{ submission.title }}. Are you sure that you want to do this?
+
+
+
Submission description
+ {% if submission.description_rendered %}
+ {{ submission.description_rendered|safe }}
+ {% else %}
+ No description provided
+ {% endif %}
+
+
+
+
+
Submission text
+
+ {{ submission.content_rendered|safe }}
+
+
+
{% endblock %}
diff --git a/submissions/templates/edit_folder.html b/submissions/templates/edit_folder.html
index f44961e..6220a57 100644
--- a/submissions/templates/edit_folder.html
+++ b/submissions/templates/edit_folder.html
@@ -1,9 +1,16 @@
{% extends "base.html" %}
{% block content %}
+{% include 'profile-tabs-snippet.html' with author=user %}
{% endblock %}
diff --git a/submissions/templates/edit_submission.html b/submissions/templates/edit_submission.html
index 92112a3..d4b436a 100644
--- a/submissions/templates/edit_submission.html
+++ b/submissions/templates/edit_submission.html
@@ -1,9 +1,111 @@
{% extends "base.html" %}
+{% load form_extras %}
{% block content %}
{% endblock %}
diff --git a/submissions/templates/list_root_folders.html b/submissions/templates/list_root_folders.html
index e98a9a1..492fd76 100644
--- a/submissions/templates/list_root_folders.html
+++ b/submissions/templates/list_root_folders.html
@@ -1,6 +1,7 @@
{% extends "base.html" %}
{% block content %}
+{% include 'profile-tabs-snippet.html' with author=user %}