diff --git a/ghostwriter/reporting/templates/reporting/finding_form.html b/ghostwriter/reporting/templates/reporting/finding_form.html index 15959b1d0..d439b41c9 100644 --- a/ghostwriter/reporting/templates/reporting/finding_form.html +++ b/ghostwriter/reporting/templates/reporting/finding_form.html @@ -8,7 +8,7 @@ {% endblock %} diff --git a/ghostwriter/reporting/templates/reporting/report_list.html b/ghostwriter/reporting/templates/reporting/report_list.html index 5e95b2c13..7fc3fb5c7 100644 --- a/ghostwriter/reporting/templates/reporting/report_list.html +++ b/ghostwriter/reporting/templates/reporting/report_list.html @@ -62,12 +62,12 @@ {{ report.last_update }} {% if report.complete %} {% if report.delivered %} - Delivered + Delivered {% else %} - Complete, Awaiting Delivery + Awaiting Delivery {% endif %} {% else %} - In Progress + In Progress {% endif %} {{ report.created_by }} diff --git a/ghostwriter/rolodex/templates/rolodex/client_form.html b/ghostwriter/rolodex/templates/rolodex/client_form.html index 8388375a2..1d22b88d5 100644 --- a/ghostwriter/rolodex/templates/rolodex/client_form.html +++ b/ghostwriter/rolodex/templates/rolodex/client_form.html @@ -7,8 +7,7 @@ {% endblock %} diff --git a/ghostwriter/rolodex/templates/rolodex/project_list.html b/ghostwriter/rolodex/templates/rolodex/project_list.html index 4a2d2c019..36caa3a6b 100644 --- a/ghostwriter/rolodex/templates/rolodex/project_list.html +++ b/ghostwriter/rolodex/templates/rolodex/project_list.html @@ -50,6 +50,8 @@ +

Note: New projects are added under a client!

+ {% if filter.qs|length == 0 %}

There are no projects to display.

{% else %} diff --git a/ghostwriter/shepherd/templates/shepherd/domain_form.html b/ghostwriter/shepherd/templates/shepherd/domain_form.html index bed7ff300..64cfa36c9 100644 --- a/ghostwriter/shepherd/templates/shepherd/domain_form.html +++ b/ghostwriter/shepherd/templates/shepherd/domain_form.html @@ -8,7 +8,7 @@ {% endblock %} diff --git a/ghostwriter/shepherd/templates/shepherd/server_form.html b/ghostwriter/shepherd/templates/shepherd/server_form.html index 6a983cf5c..dbbe3c5d3 100644 --- a/ghostwriter/shepherd/templates/shepherd/server_form.html +++ b/ghostwriter/shepherd/templates/shepherd/server_form.html @@ -8,7 +8,7 @@ {% endblock %} diff --git a/ghostwriter/shepherd/templates/shepherd/update.html b/ghostwriter/shepherd/templates/shepherd/update.html index 768359cf2..35ded45ef 100644 --- a/ghostwriter/shepherd/templates/shepherd/update.html +++ b/ghostwriter/shepherd/templates/shepherd/update.html @@ -24,15 +24,10 @@

Domain Update Control Panel

Pull Domains from Namecheap

-

Update the domain library by pulling the latest list of domain's from the configured Namecheap account.

- - {% if enable_namecheap %} -
- {% csrf_token %} - - -
- {% endif %} +

The domain library sync with Mamecheap was last requested on:

+

+ {{ namecheap_last_update_requested }} +

{% if namecheap_last_update_completed %} {% if namecheap_last_update_completed == 'Failed' %} @@ -52,6 +47,14 @@
Pull Domains from Namecheap
{% endif %} {% endif %} + {% if enable_namecheap %} +
+ {% csrf_token %} + + +
+ {% endif %} +
Domain Categories

@@ -84,7 +87,7 @@
Domain Categories
{% csrf_token %} - +
@@ -120,6 +123,6 @@
DNS Records
{% csrf_token %} - +
{% endblock %}