# HG changeset patch # User Brian Neal # Date 1482117574 21600 # Node ID fa5d03c5c28ce4f77579c7aa02ccc78eb0fed592 # Parent f56798c96ec26ae59b0bfd18cb909805b1c11041 Finish (?) converting downloads to V3 design. diff -r f56798c96ec2 -r fa5d03c5c28c downloads/static/css/downloads.css --- a/downloads/static/css/downloads.css Tue Dec 13 21:56:21 2016 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -#downloads-add td { - padding-bottom: 5px; -} - -#downloads-add fieldset { - margin: 1em 0 1em; - padding: 0.5em; -} diff -r f56798c96ec2 -r fa5d03c5c28c downloads/views.py --- a/downloads/views.py Tue Dec 13 21:56:21 2016 -0600 +++ b/downloads/views.py Sun Dec 18 21:19:34 2016 -0600 @@ -97,6 +97,7 @@ return render(request, 'downloads/download_summary.html', { 'page': the_page, 'title': 'Newest Downloads', + 'V3_DESIGN': True, }) ####################################################################### @@ -117,6 +118,7 @@ return render(request, 'downloads/download_summary.html', { 'page': the_page, 'title': 'Popular Downloads', + 'V3_DESIGN': True, }) ####################################################################### @@ -136,6 +138,7 @@ return render(request, 'downloads/download_summary.html', { 'page': the_page, 'title': 'Highest Rated Downloads', + 'V3_DESIGN': True, }) ####################################################################### @@ -147,6 +150,7 @@ raise Http404 return render(request, 'downloads/download_detail.html', { 'download' : download, + 'V3_DESIGN': True, }) ####################################################################### @@ -170,6 +174,7 @@ return render(request, 'downloads/add.html', { 'add_form': form, + 'V3_DESIGN': True, }) ####################################################################### @@ -177,6 +182,7 @@ @login_required def thanks(request): return render(request, 'downloads/thanks.html', { + 'V3_DESIGN': True, }) ####################################################################### diff -r f56798c96ec2 -r fa5d03c5c28c sg101/templates/downloads/add.html --- a/sg101/templates/downloads/add.html Tue Dec 13 21:56:21 2016 -0600 +++ b/sg101/templates/downloads/add.html Sun Dec 18 21:19:34 2016 -0600 @@ -1,15 +1,9 @@ -{% extends 'base.html' %} +{% extends 'v3/base.html' %} {% load downloads_tags %} {% load core_tags %} {% load script_tags %} {% load static from staticfiles %} {% block title %}Add Download{% endblock %} -{% block custom_css %} - -{% endblock %} -{% block custom_js %} -{% script_tags 'jquery-ui markitup' %} -{% endblock %} {% block content %}

Downloads

{% include 'downloads/navigation.html' %} @@ -35,18 +29,45 @@
{% csrf_token %} -
+
Upload Form - -{{ add_form.as_table }} - - - -
  - {% comment_dialogs %} - -
+ {{ add_form.non_field_errors }} + {{ add_form.title.errors }} +
+
+ +
+
+ {{ add_form.category.errors }} +
+
+ +
+
+ {% post_box add_form.description %} + {{ add_form.file.errors }} +
+
+ +
+
+
+{% include 'core/v3/post_box_modals.html' %} {% endblock %} + +{% block custom_js %} + + +{% endblock %} diff -r f56798c96ec2 -r fa5d03c5c28c sg101/templates/downloads/download_detail.html --- a/sg101/templates/downloads/download_detail.html Tue Dec 13 21:56:21 2016 -0600 +++ b/sg101/templates/downloads/download_detail.html Sun Dec 18 21:19:34 2016 -0600 @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'v3/base.html' %} {% load downloads_tags %} {% load comment_tags %} {% load script_tags %} @@ -6,13 +6,6 @@ {% block title %}Downloads Details{% endblock %} {% block custom_css %} - -{% endblock %} -{% block custom_js %} -{% script_tags "markitup jquery-ui" %} - - - {% endblock %} {% block content %}

Downloads

@@ -27,5 +20,13 @@

This download has {{ comment_count }} comment{{ comment_count|pluralize }}.


{% render_comment_list download %} -{% render_comment_form user download %} +{% render_comment_form_v3 user download %} +{% include 'core/v3/post_box_modals.html' %} {% endblock %} +{% block custom_js %} + + + + + +{% endblock %} diff -r f56798c96ec2 -r fa5d03c5c28c sg101/templates/downloads/download_summary.html --- a/sg101/templates/downloads/download_summary.html Tue Dec 13 21:56:21 2016 -0600 +++ b/sg101/templates/downloads/download_summary.html Sun Dec 18 21:19:34 2016 -0600 @@ -1,30 +1,25 @@ -{% extends 'base.html' %} +{% extends 'v3/base.html' %} {% load downloads_tags %} {% load static from staticfiles %} {% block title %}{{ title }}{% endblock %} -{% block custom_css %} - - - -{% endblock %} -{% block custom_js %} - - -{% endblock %} {% block content %}

Downloads

{% include 'downloads/navigation.html' %}

{{ title }}

{% if page.object_list %} -{% include 'core/pagination.html' %} +{% include 'core/v3/pagination.html' %}
{% for download in page.object_list %} {% include 'downloads/download.html' %} {% endfor %}
-{% include 'core/pagination.html' %} +{% include 'core/v3/pagination.html' %} {% else %}

No downloads available at this time.

{% endif %} {% endblock %} +{% block custom_js %} + + +{% endblock %} diff -r f56798c96ec2 -r fa5d03c5c28c sg101/templates/downloads/thanks.html --- a/sg101/templates/downloads/thanks.html Tue Dec 13 21:56:21 2016 -0600 +++ b/sg101/templates/downloads/thanks.html Sun Dec 18 21:19:34 2016 -0600 @@ -1,15 +1,15 @@ -{% extends 'base.html' %} +{% extends 'v3/base.html' %} {% load static from staticfiles %} {% load downloads_tags %} {% block title %}Thanks for the Download{% endblock %} -{% block custom_css %} -{{ add_form.media }} - -{% endblock %} {% block content %}

Downloads

{% include 'downloads/navigation.html' %} -

Thanks for the Download

-

Thank you for sending in a download! Your file will be reviewed by the site staff and made -available shortly.

+
+
Thanks for the Download
+

+ Thank you for sending in a download! Your file will be reviewed by the site + staff and made available shortly. +

+
{% endblock %}