Browse Source

new footer

master
alice 3 months ago
parent
commit
92e8e19e6c
6 changed files with 352 additions and 321 deletions
  1. +2
    -0
      ccvpn/settings.py
  2. +0
    -5
      kb/apps.py
  3. +310
    -295
      poetry.lock
  4. +3
    -3
      pyproject.toml
  5. +16
    -5
      static/css/style.css
  6. +21
    -13
      templates/layout.html

+ 2
- 0
ccvpn/settings.py View File

@@ -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


+ 0
- 5
kb/apps.py View File

@@ -1,5 +0,0 @@
from django.apps import AppConfig


class HelpConfig(AppConfig):
name = 'help'

+ 310
- 295
poetry.lock
File diff suppressed because it is too large
View File


+ 3
- 3
pyproject.toml View File

@@ -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"}


+ 16
- 5
static/css/style.css View File

@@ -311,13 +311,24 @@ box-shadow: 1px 1px 2px 1px rgba(0,0,0,0.21);


footer{
padding-top: 4em;
clear: both;
color: #1c619a;
text-align: center;
display: flex;
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 {


+ 21
- 13
templates/layout.html View File

@@ -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>
{% if CLIENT_ON_VPN %}
<b>{% trans "You are using the VPN." %}</b>
{% endif %}
{% trans "Your IP address: " %}
{{ CLIENT_IP }}
<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>
<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 %}
Your are connected over CCVPN
{% else %}
Your are not connected over CCVPN
{% endif %}
</li>
</ul>
</footer>

{{ADDITIONAL_HTML | safe}}


Loading…
Cancel
Save