WIP - remove BS4 classes

cove/cove_360/templates/cove_360/base.html

@@ -10,7 +10,7 @@
   <meta property="og:description" content="360Insights is a free tool to help you understand funders better. You can combine and visualise 360Giving and charity data, and explore funding across different areas - from grant dates to types of recipients.">
   <meta name="description" content="360Insights is a free tool to help you understand funders better. You can combine and visualise 360Giving and charity data, and explore funding across different areas - from grant dates to types of recipients.">
 
-  <title>360Giving Data Quality Tool</title>
+{% block title_tag %}<title>360Giving Data Quality Tool</title>{% endblock %}
 
   <link rel="shortcut icon" href="{% static 'dataexplore/images/favicon/favicon.ico' %}" />
   <link rel="stylesheet" type="text/css" href="{% static 'dataexplore/css/main.css' %}?{request.tag}">
@@ -27,7 +27,7 @@
 
 
             <li class="contextual-menu__item">
-                <a class="contextual-menu__button" href="/" >Data Quality Tool</a>
+                <a class="contextual-menu__button" href="{% url 'index' %}" >Data Quality Tool</a>
             </li>
 
             <li class="contextual-menu__item">
@@ -72,8 +72,8 @@
                   <a href="/"><img src="{% static 'dataexplore/images/360-giving-logo.svg' %}" alt="360 Giving"></a>
               </div>
               <div class="hero__column hero__lead">
-                  <h2 class="hero__title">Data Quality Tool</h2>
-                  <p class="hero__blurb">Convert, Validate, Explore 360 Giving Data.</p>
+                  <h2 class="hero__title">{% block hero_title %}Data Quality Tool{% endblock %}</h2>
+                  <p class="hero__blurb">{% block hero_blurb %}Convert, Validate, Explore 360 Giving Data.{% endblock %}</p>
               </div>
           </div>
       </div>

cove/cove_360/templates/cove_360/input.html

@@ -1,7 +1,7 @@
 {% extends request.current_app_base_template %}
-{% load bootstrap3 %}
 {% load i18n %}
 
+{% load bootstrap3 %}
 {% block content %}
 
 <style scoped>
@@ -86,37 +86,7 @@ <h2>Check your data</h2>
 </div>
 {% endif %}
 
-<p style="text-align: center;" class="margin-bottom:2"><a href="#TODO" >Or submit your data for publication.</a></p>
-
-
-{% if DATA_SUBMISSION_ENABLED %}
-<div class="row">
-    <div class="col-md-8">
-      <h2>Submit your data</h2>
-      <p>Submit your 360Giving data file to the <a href="https://data.threesixtygiving.org/">360Giving Data Registry</a>. Your file will also be checked to make sure you are submitting valid 360Giving data.</p>
-
-    </div>
-  </div>
-
-<div class="panel panel-default">
-  <div class="panel-body">
-    <form method="GET" action="." id="self-publishing-form">
-      {% csrf_token %}
-      <input type="hidden" name="self_publishing" value="true">
-      <div class="form-group">
-        <label for="source-url-input" class="control-label">Provide a link to your file:</label>
-        <input id="source-url-input" type="url" name="source_url" class="form-control">
-      </div>
-      <div class="form-group">
-        <button type="submit" class="btn btn-primary" title="Submit your data" id="submit-for-publishing-btn">
-            Submit
-        </button>
-        <p>Read our guidance on <a href="https://standard.threesixtygiving.org/en/latest/guidance/submit-data/">how to submit your data</a>.</p>
-    </div>
-    </form>
-  </div>
-</div>
-{% endif %}
+<p style="text-align: center;" class="margin-bottom:3"><a href="{% url 'publishing' %}" >Or submit your data for publication.</a></p>
 
 <script>
 

cove/cove_360/templates/cove_360/publisher_not_found.html

@@ -1,30 +1,25 @@
-{% extends "explore.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 {% block content %}
- <div class="panel panel-default">
-    <div class="panel-heading" >
-      <h3 class="panel-title panel-title-explore">
-        {% if data_status.can_publish %}
-          <span class="font-tick tick" aria-hidden="true"></span>
-        {% endif %}
-        {% trans "Submit your data" %}</h3>
-        </div>
-      <div class="panel-body" id="publisher-not-found-message">
-        <p>{% blocktrans %}Sorry you aren't able to submit this file because the domain name of the website hosting your file ({{source_url_domain}}) is not authorised for publishing 360Giving data.{% endblocktrans %}</p>
-        <p>{% blocktrans %}Please email 360Giving helpdesk via <a href="mailto:[email protected]">[email protected]</a> with the link to the file you want to submit to the Data Registry.{% endblocktrans %}</p>
-    </div>
-  </div>
+<h3>Problem submitting your data</h3>
+<div id="publisher-not-found-message">
+  <p>{% blocktrans %}Sorry you aren't able to submit this file because the domain name of the website hosting your file
+    ({{source_url_domain}}) is not authorised for publishing 360Giving data.{% endblocktrans %}</p>
+  <p>{% blocktrans %}Please email 360Giving helpdesk via <a
+      href="mailto:[email protected]">[email protected]</a> with the link to the file you want to
+    submit to the Data Registry.{% endblocktrans %}</p>
+</div>
 
-  <script>
-    window.addEventListener('load', function() {
+<script>
+  window.addEventListener('load', function () {
 
-      let publisherValidation = 'domain-invalid'
-      let dataValidation = 'data-unchecked'
-      let validation = publisherValidation + '-' + dataValidation;
-      source = '{{ source_url }}'
+    let publisherValidation = 'domain-invalid'
+    let dataValidation = 'data-unchecked'
+    let validation = publisherValidation + '-' + dataValidation;
+    source = '{{ source_url }}'
 
-      _paq.push(['trackEvent', 'Status', validation, source]);
-      _paq.push(['trackPageView']);
-    })
-  </script>
+    _paq.push(['trackEvent', 'Status', validation, source]);
+    _paq.push(['trackPageView']);
+  })
+</script>
 {% endblock %}

cove/cove_project/urls.py

@@ -2,6 +2,7 @@
 from django.conf.urls.static import static
 from django.conf import settings
 from django.urls import path
+from django.views.generic import TemplateView
 
 from cove.urls import urlpatterns, handler500  # noqa: F401
 
@@ -15,7 +16,8 @@
     path("api/results/<uuid:id>", cove_360.api.ResultsApiView.as_view(), name="api-results"),
     url(r'^xhr_results_ready/(.+)$', cove_360.views.results_ready, name='xhr_results_ready'),
     url(r'^common_errors', cove_360.views.common_errors, name='common_errors'),
-    url(r'^additional_checks', cove_360.views.additional_checks, name='additional_checks')
+    url(r'^additional_checks', cove_360.views.additional_checks, name='additional_checks'),
+    path("publishing/", TemplateView.as_view(template_name="cove_360/publishing.html"), name="publishing"),
 ]
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)