From 5ffc3088f3a9bf85b26b732ad2926de662a1debe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=93teris=20Caune?= <cuu508@gmail.com>
Date: Sat, 4 Aug 2018 19:43:00 +0300
Subject: [PATCH] staticfiles -> static, and some cleanup

---
 templates/accounts/badges.html                   |  2 +-
 templates/accounts/billing.html                  |  2 +-
 templates/accounts/login.html                    |  2 +-
 templates/accounts/notifications.html            |  9 +--------
 templates/accounts/profile.html                  |  2 +-
 templates/base.html                              |  5 +----
 templates/base_bare.html                         |  4 +---
 templates/front/base_docs.html                   |  1 -
 templates/front/channel_checks.html              |  2 +-
 templates/front/channels.html                    |  2 +-
 templates/front/docs.html                        |  2 +-
 templates/front/docs_api.html                    |  2 +-
 templates/front/docs_cron.html                   |  2 +-
 templates/front/log.html                         |  2 +-
 templates/front/my_checks.html                   |  2 +-
 templates/front/my_checks_desktop.html           |  2 +-
 templates/front/welcome.html                     |  2 +-
 templates/integrations/add_discord.html          |  2 +-
 templates/integrations/add_email.html            |  2 +-
 templates/integrations/add_hipchat.html          |  2 +-
 templates/integrations/add_opsgenie.html         |  2 +-
 templates/integrations/add_pagertree.html        |  2 +-
 templates/integrations/add_pd.html               |  2 +-
 templates/integrations/add_pushbullet.html       | 11 ++---------
 templates/integrations/add_pushover.html         |  9 +--------
 templates/integrations/add_slack.html            | 11 +----------
 templates/integrations/add_sms.html              |  2 +-
 templates/integrations/add_telegram.html         |  2 +-
 templates/integrations/add_victorops.html        |  2 +-
 templates/integrations/add_webhook.html          |  2 +-
 templates/integrations/add_zendesk.html          |  2 +-
 templates/integrations/hipchat_capabilities.json |  2 +-
 templates/integrations/hipchat_message.json      |  2 +-
 templates/payments/pricing.html                  |  2 +-
 templates/payments/pricing_not_owner.html        |  2 +-
 35 files changed, 35 insertions(+), 71 deletions(-)

diff --git a/templates/accounts/badges.html b/templates/accounts/badges.html
index 27cf6fc2..2caa2c6a 100644
--- a/templates/accounts/badges.html
+++ b/templates/accounts/badges.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress staticfiles hc_extras %}
+{% load compress static hc_extras %}
 
 {% block title %}Account Settings - {% site_name %}{% endblock %}
 
diff --git a/templates/accounts/billing.html b/templates/accounts/billing.html
index 44cd2ab9..279cb528 100644
--- a/templates/accounts/billing.html
+++ b/templates/accounts/billing.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress staticfiles hc_extras %}
+{% load compress static hc_extras %}
 
 {% block title %}Account Settings - {% site_name %}{% endblock %}
 
diff --git a/templates/accounts/login.html b/templates/accounts/login.html
index 2578dfa9..6f1e75a8 100644
--- a/templates/accounts/login.html
+++ b/templates/accounts/login.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress hc_extras staticfiles %}
+{% load compress hc_extras static %}
 
 {% block content %}
 <div class="row">
diff --git a/templates/accounts/notifications.html b/templates/accounts/notifications.html
index b1c3979c..b4b07c07 100644
--- a/templates/accounts/notifications.html
+++ b/templates/accounts/notifications.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress staticfiles hc_extras %}
+{% load hc_extras %}
 
 {% block title %}Account Settings - {% site_name %}{% endblock %}
 
@@ -96,10 +96,3 @@
     </div>
 </div>
 {% endblock %}
-
-{% block scripts %}
-{% compress js %}
-<script src="{% static 'js/jquery-2.1.4.min.js' %}"></script>
-<script src="{% static 'js/bootstrap.min.js' %}"></script>
-{% endcompress %}
-{% endblock %}
diff --git a/templates/accounts/profile.html b/templates/accounts/profile.html
index 77c0fcbe..a59d5f9d 100644
--- a/templates/accounts/profile.html
+++ b/templates/accounts/profile.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress staticfiles hc_extras %}
+{% load compress static hc_extras %}
 
 {% block title %}Account Settings - {% site_name %}{% endblock %}
 
diff --git a/templates/base.html b/templates/base.html
index 2841eed4..23d26005 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,5 +1,4 @@
-{% load hc_extras %}
-<!DOCTYPE html>
+<!DOCTYPE html>{% load compress staticfiles hc_extras %}
 <html lang="en">
 <head>
     <meta charset="utf-8">
@@ -13,8 +12,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="apple-mobile-web-app-title" content="{% site_name %}">
     <meta name="application-name" content="{% site_name %}">
-
-    {% load compress staticfiles %}
     <link rel="icon" type="image/x-icon" href="{% static 'img/favicon.ico' %}">
     <link rel="apple-touch-icon" sizes="180x180" href="{% static 'img/apple-touch-180.png' %}">
 
diff --git a/templates/base_bare.html b/templates/base_bare.html
index 98172e51..35bf23f2 100644
--- a/templates/base_bare.html
+++ b/templates/base_bare.html
@@ -1,5 +1,4 @@
-{% load hc_extras %}
-<!DOCTYPE html>
+<!DOCTYPE html>{% load compress static hc_extras %}
 <html lang="en">
 <head>
     <meta charset="utf-8">
@@ -7,7 +6,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <link href='//fonts.googleapis.com/css?family=Open+Sans:400,300,600' rel='stylesheet' type='text/css'>
-    {% load compress staticfiles %}
     <link rel="icon" type="image/x-icon" href="{% static 'img/favicon.ico' %}">
 
     {% compress css %}
diff --git a/templates/front/base_docs.html b/templates/front/base_docs.html
index 978a731e..a38f1a18 100644
--- a/templates/front/base_docs.html
+++ b/templates/front/base_docs.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load staticfiles %}
 
 {% block content %}
 <div class="row">
diff --git a/templates/front/channel_checks.html b/templates/front/channel_checks.html
index dae40013..10c6bcd7 100644
--- a/templates/front/channel_checks.html
+++ b/templates/front/channel_checks.html
@@ -1,4 +1,4 @@
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize hc_extras %}
 
 <form method="post">
 {% csrf_token %}
diff --git a/templates/front/channels.html b/templates/front/channels.html
index e2f0edf1..7a647300 100644
--- a/templates/front/channels.html
+++ b/templates/front/channels.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load compress humanize static hc_extras %}
 
 {% block title %}Integrations - {% site_name %}{% endblock %}
 
diff --git a/templates/front/docs.html b/templates/front/docs.html
index 5cf6a4e6..efd10454 100644
--- a/templates/front/docs.html
+++ b/templates/front/docs.html
@@ -1,5 +1,5 @@
 {% extends "front/base_docs.html" %}
-{% load compress staticfiles hc_extras %}
+{% load compress static hc_extras %}
 
 {% block title %}Documentation - {% site_name %}{% endblock %}
 {% block description %}
diff --git a/templates/front/docs_api.html b/templates/front/docs_api.html
index 50ddb69d..2d76424c 100644
--- a/templates/front/docs_api.html
+++ b/templates/front/docs_api.html
@@ -1,5 +1,5 @@
 {% extends "front/base_docs.html" %}
-{% load compress staticfiles hc_extras %}
+{% load compress static hc_extras %}
 
 {% block title %}REST API - {% site_name %}{% endblock %}
 
diff --git a/templates/front/docs_cron.html b/templates/front/docs_cron.html
index feb706e3..47a667a1 100644
--- a/templates/front/docs_cron.html
+++ b/templates/front/docs_cron.html
@@ -1,5 +1,5 @@
 {% extends "front/base_docs.html" %}
-{% load compress staticfiles hc_extras %}
+{% load hc_extras %}
 
 {% block title %}Cron Syntax Cheatsheet - {% site_name %}{% endblock %}
 
diff --git a/templates/front/log.html b/templates/front/log.html
index 65c7d57e..a7f78bf6 100644
--- a/templates/front/log.html
+++ b/templates/front/log.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load compress humanize static hc_extras %}
 
 {% block title %}My Checks - {% site_name %}{% endblock %}
 
diff --git a/templates/front/my_checks.html b/templates/front/my_checks.html
index 582ef53c..4e8bc8c3 100644
--- a/templates/front/my_checks.html
+++ b/templates/front/my_checks.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress staticfiles hc_extras %}
+{% load compress static hc_extras %}
 
 {% block title %}{{ num_down|num_down_title }}{% endblock %}
 
diff --git a/templates/front/my_checks_desktop.html b/templates/front/my_checks_desktop.html
index cffb6d4b..81f77c02 100644
--- a/templates/front/my_checks_desktop.html
+++ b/templates/front/my_checks_desktop.html
@@ -1,4 +1,4 @@
-{% load hc_extras staticfiles %}
+{% load hc_extras %}
 <table id="checks-table" class="table">
     <tr>
         <th></th>
diff --git a/templates/front/welcome.html b/templates/front/welcome.html
index 9b1e61ce..f8fa3c28 100644
--- a/templates/front/welcome.html
+++ b/templates/front/welcome.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress hc_extras humanize staticfiles %}
+{% load compress hc_extras humanize static %}
 
 {% block description %}
     <meta name="description" content="Cron Monitoring. Monitor nightly backups, weekly reports, cron jobs and background tasks. Receive alerts when your tasks don't run on time.">
diff --git a/templates/integrations/add_discord.html b/templates/integrations/add_discord.html
index 6f9817df..67620e4b 100644
--- a/templates/integrations/add_discord.html
+++ b/templates/integrations/add_discord.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Add Discord - {% site_name %}{% endblock %}
 
diff --git a/templates/integrations/add_email.html b/templates/integrations/add_email.html
index 4e2ff728..2450fb24 100644
--- a/templates/integrations/add_email.html
+++ b/templates/integrations/add_email.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Notification Channels - {% site_name %}{% endblock %}
 
diff --git a/templates/integrations/add_hipchat.html b/templates/integrations/add_hipchat.html
index 6562b035..cc01378b 100644
--- a/templates/integrations/add_hipchat.html
+++ b/templates/integrations/add_hipchat.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Notification Channels - {% site_name %}{% endblock %}
 
diff --git a/templates/integrations/add_opsgenie.html b/templates/integrations/add_opsgenie.html
index 731a90dc..f0115b96 100644
--- a/templates/integrations/add_opsgenie.html
+++ b/templates/integrations/add_opsgenie.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Add OpsGenie - {% site_name %}{% endblock %}
 
diff --git a/templates/integrations/add_pagertree.html b/templates/integrations/add_pagertree.html
index 33fe3d94..b09a5ccf 100644
--- a/templates/integrations/add_pagertree.html
+++ b/templates/integrations/add_pagertree.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Add PagerTree - {% site_name %}{% endblock %}
 
diff --git a/templates/integrations/add_pd.html b/templates/integrations/add_pd.html
index 00316518..64702dd9 100644
--- a/templates/integrations/add_pd.html
+++ b/templates/integrations/add_pd.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Add PagerDuty - {% site_name %}{% endblock %}
 
diff --git a/templates/integrations/add_pushbullet.html b/templates/integrations/add_pushbullet.html
index 67e7dedd..02069de4 100644
--- a/templates/integrations/add_pushbullet.html
+++ b/templates/integrations/add_pushbullet.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Add Pushbullet - {% site_name %}{% endblock %}
 
@@ -27,11 +27,4 @@
     </div>
 </div>
 </div>
-{% endblock %}
-
-{% block scripts %}
-{% compress js %}
-<script src="{% static 'js/jquery-2.1.4.min.js' %}"></script>
-<script src="{% static 'js/bootstrap.min.js' %}"></script>
-{% endcompress %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/integrations/add_pushover.html b/templates/integrations/add_pushover.html
index c8249e4f..2aa10899 100644
--- a/templates/integrations/add_pushover.html
+++ b/templates/integrations/add_pushover.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Add Pushover - {% site_name %}{% endblock %}
 
@@ -176,10 +176,3 @@
 </div>
 </div>
 {% endblock %}
-
-{% block scripts %}
-{% compress js %}
-<script src="{% static 'js/jquery-2.1.4.min.js' %}"></script>
-<script src="{% static 'js/bootstrap.min.js' %}"></script>
-{% endcompress %}
-{% endblock %}
diff --git a/templates/integrations/add_slack.html b/templates/integrations/add_slack.html
index 2e25a8d8..50e98e03 100644
--- a/templates/integrations/add_slack.html
+++ b/templates/integrations/add_slack.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Add Slack - {% site_name %}{% endblock %}
 
@@ -188,13 +188,4 @@
 
 </div>
 </div>
-
-
-{% endblock %}
-
-{% block scripts %}
-{% compress js %}
-<script src="{% static 'js/jquery-2.1.4.min.js' %}"></script>
-<script src="{% static 'js/bootstrap.min.js' %}"></script>
-{% endcompress %}
 {% endblock %}
diff --git a/templates/integrations/add_sms.html b/templates/integrations/add_sms.html
index a6d3e088..3d50deed 100644
--- a/templates/integrations/add_sms.html
+++ b/templates/integrations/add_sms.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Notification Channels - {% site_name %}{% endblock %}
 
diff --git a/templates/integrations/add_telegram.html b/templates/integrations/add_telegram.html
index f7137075..696d3b32 100644
--- a/templates/integrations/add_telegram.html
+++ b/templates/integrations/add_telegram.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Notification Channels - {% site_name %}{% endblock %}
 
diff --git a/templates/integrations/add_victorops.html b/templates/integrations/add_victorops.html
index 753323a7..8b9ed7aa 100644
--- a/templates/integrations/add_victorops.html
+++ b/templates/integrations/add_victorops.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Add VictorOps - {% site_name %}{% endblock %}
 
diff --git a/templates/integrations/add_webhook.html b/templates/integrations/add_webhook.html
index e4bcb12b..3b1cffa0 100644
--- a/templates/integrations/add_webhook.html
+++ b/templates/integrations/add_webhook.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load compress humanize static hc_extras %}
 
 {% block title %}Add Webhook - {% site_name %}{% endblock %}
 
diff --git a/templates/integrations/add_zendesk.html b/templates/integrations/add_zendesk.html
index cb5fb228..ff314a3f 100644
--- a/templates/integrations/add_zendesk.html
+++ b/templates/integrations/add_zendesk.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize static hc_extras %}
 
 {% block title %}Add Zendesk - {% site_name %}{% endblock %}
 
diff --git a/templates/integrations/hipchat_capabilities.json b/templates/integrations/hipchat_capabilities.json
index b462f7fd..2950b040 100644
--- a/templates/integrations/hipchat_capabilities.json
+++ b/templates/integrations/hipchat_capabilities.json
@@ -1,4 +1,4 @@
-{% load hc_extras staticfiles %}
+{% load hc_extras static %}
 {
     "name": "{% site_name %}",
     "description": "Get Notified When Your Cron Jobs Fail",
diff --git a/templates/integrations/hipchat_message.json b/templates/integrations/hipchat_message.json
index cc46ef2d..05d04242 100644
--- a/templates/integrations/hipchat_message.json
+++ b/templates/integrations/hipchat_message.json
@@ -1,4 +1,4 @@
-{% load hc_extras humanize staticfiles %}
+{% load hc_extras humanize static %}
 {
     "message": "“{{ check.name_then_code|escapejs }}” is {{ check.status|upper }}.",
     {% if check.status == "up" %}
diff --git a/templates/payments/pricing.html b/templates/payments/pricing.html
index d0faa8ad..fde6d60b 100644
--- a/templates/payments/pricing.html
+++ b/templates/payments/pricing.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles compress hc_extras %}
+{% load static compress hc_extras %}
 
 {% block title %}Pricing - It's Free! - {% site_name %}{% endblock %}
 
diff --git a/templates/payments/pricing_not_owner.html b/templates/payments/pricing_not_owner.html
index df57a2e0..75294d35 100644
--- a/templates/payments/pricing_not_owner.html
+++ b/templates/payments/pricing_not_owner.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles compress hc_extras %}
+{% load hc_extras %}
 
 {% block title %}Pricing - {% site_name %}{% endblock %}