new footer

ccvpn/settings.py

@@ -337,6 +337,8 @@ OPENVPN_CONFIG_HEADER = """\
 
 RUN_ONLINE_TESTS = False
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 # Local settings
 try:
     from .local_settings import *  # noqa

kb/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class HelpConfig(AppConfig):
-    name = 'help'

pyproject.toml

@@ -8,18 +8,18 @@ authors = ["CCrypto <code@ccrypto.org>"]
 python = "^3.6"
 django = "^3.0"
 jsonfield = "^3.1"
-django_countries = "^6.1.2"
+django_countries = "^7"
 markdown = "^3.1"
 requests = "^2.21"
 pygal = "^2.4"
-pytz = "^2020.1"
+pytz = "^2021.1"
 python-bitcoinlib = "^0.11"
 stripe = "^2.24"
 django-constance = {version = "^2.7",extras = ["database"]}
 lcoreapi = {git = "https://git.packetimpact.net/lvpn/lcoreapi.git", tag = "v1.1.1"}
 pygments = "^2.3"
 psycopg2-binary = "^2.8"
-python-frontmatter = "^0.5.0"
+python-frontmatter = "^1"
 django-tinymce4-lite = "^1.7"
 django-admin-list-filter-dropdown = "^1.0"
 django-lcore = {git = "https://git.packetimpact.net/lvpn/django-lcore.git", tag = "v1.6.0"}

static/css/style.css

@@ -311,13 +311,24 @@ box-shadow: 1px 1px 2px 1px rgba(0,0,0,0.21);
 
 
 footer{
-    padding-top: 4em;
     clear: both;
-    color: #1c619a;
+    display: flex;
-    text-align: center;
+    justify-content: center;
+    background: #002D5F;
+    margin-top: 6em;
+    padding-bottom: 2em;
+    font-size: 0.9em;
+    flex-wrap:wrap;
+}
+footer, footer a {
+    color: #ccc;
+}
+footer .footer-column {
+    text-align: left;
+    list-style-type:none;
+    padding-left: 0;
+    margin: 2em;
 }
-footer a { color: #1c619a; }
-footer p { margin-top: 0.6em; margin-bottom: 0.5em; }
 
 
 .message p {

templates/layout.html

@@ -52,7 +52,7 @@
             <ul>
                 <li><a href="/">{% trans "VPN" %}</a></li>
                 <li><a href="/status">{% trans "Servers" %}</a></li>
-                <li><a href="/page/help">{% trans "Support" %}</a></li>
+                <li><a href="/page/help">{% trans "Guides & Support" %}</a></li>
                 {% if user.is_authenticated %}
                 <li><a href="/tickets/">{% trans "Tickets" %}</a></li>
                 {% endif %}
@@ -80,18 +80,26 @@
     {% endblock %}
 
     <footer id="footer">
-        <p>
+        <ul class="footer-column">
+            <li>By <a href="https://ccrypto.org/">CCrypto</a></li>
+            <li><a href="/page/tos">{% trans 'ToS' %}</a></li>
+            <li><a href="https://git.ccrypto.org/CCrypto/ccvpn3">{% trans 'Source code' %}</a></li>
+        </ul>
+        <ul class="footer-column">
+            <li><a href="https://status.ccrypto.org/">{% trans 'Service Status' %}</a></li>
+            <li><a href="/page/help">{% trans "Guides & Support" %}</a></li>
+            <li><a href="https://twitter.com/CCrypto_VPN">{% trans 'CCrypto_VPN on Twitter' %}</a></li>
+        </ul>
+        <ul class="footer-column">
+            <li>Your IP: {{CLIENT_IP}}</li>
+            <li>
                 {% if CLIENT_ON_VPN %}
-                <b>{% trans "You are using the VPN." %}</b>
+                    Your are connected over CCVPN
+                {% else %}
+                    Your are not connected over CCVPN
                 {% endif %}
-            {% trans "Your IP address: " %}
+            </li>
-            {{ CLIENT_IP }}
+        </ul>
-            <br />
-            <a href="//ccrypto.org/">Cognitive Cryptography</a>
-            - <a href="https://twitter.com/CCrypto_VPN">{% trans 'CCrypto_VPN on Twitter' %}</a>
-            - <a href="/page/tos">{% trans 'ToS' %}</a>
-            - <a href="https://github.com/CCrypto/ccvpn3">{% trans "It's open-source!" %}</a>
-        </p>
     </footer>
 
     {{ADDITIONAL_HTML | safe}}