mravi/ungleich-user
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

minor changes, can't figure it out

Browse source
This commit is contained in:
downhill 2018-11-10 16:06:25 +01:00
parent f641b1a0e3
commit fe265caec8
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dal/dal/settings.py
View file

@ -66,6 +66,7 @@ NAMEKO_POOL_SIZE = 4
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
STATIC_ROOT = os.path.dirname('/home/downhill/ungleich/vuejsuserservice/dal/dal/static/')
# Quick-start development settings - unsuitable for production # Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ # See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/
@ -88,6 +89,7 @@ INSTALLED_APPS = [
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'sekizai',
'dal', 'dal',
] ]
@ -123,6 +125,7 @@ TEMPLATES = [
'django.template.context_processors.request', 'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth', 'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages', 'django.contrib.messages.context_processors.messages',
'sekizai.context_processors.sekizai',
], ],
}, },
}, },

14
dal/dal/templates/base_short.html
View file

@ -1,4 +1,4 @@
{% load staticfiles i18n %} <!--cms_tags sekizai_tags %}--> {% load staticfiles i18n sekizai_tags %} <!--cms_tags sekizai_tags %}-->
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -18,19 +18,19 @@
<!-- Custom CSS --> <!-- Custom CSS -->
<link href="{% static 'hosting/css/landing-page.css' %}" rel="stylesheet"> <link href="{% static 'hosting/css/landing-page.css' %}" rel="stylesheet">
<!-- <link href="{% static 'hosting/css/user_keys.css' %}" rel="stylesheet"> <link href="{% static 'hosting/css/user_keys.css' %}" rel="stylesheet">
<link href="{% static 'hosting/css/payment.css' %}" rel="stylesheet"> <link href="{% static 'hosting/css/payment.css' %}" rel="stylesheet">
<link href="{% static 'hosting/css/order.css' %}" rel="stylesheet"> <link href="{% static 'hosting/css/order.css' %}" rel="stylesheet">
<link href="{% static 'hosting/css/orders.css' %}" rel="stylesheet">--> <link href="{% static 'hosting/css/orders.css' %}" rel="stylesheet">
<link href="{% static 'hosting/css/commons.css' %}" rel="stylesheet"> <link href="{% static 'hosting/css/commons.css' %}" rel="stylesheet">
<!-- <link href="{% static 'hosting/css/virtual-machine.css' %}" rel="stylesheet">--> <link href="{% static 'hosting/css/virtual-machine.css' %}" rel="stylesheet">
<link href="{% static 'hosting/css/dashboard.css' %}" rel="stylesheet"> <link href="{% static 'hosting/css/dashboard.css' %}" rel="stylesheet">
<!-- <link href="{% static 'hosting/css/price_calculator.css' %}" rel="stylesheet">--> <link href="{% static 'hosting/css/price_calculator.css' %}" rel="stylesheet">
{% block css_extra %} {% block css_extra %}
{% endblock css_extra %} {% endblock css_extra %}
<!-- render_block "css" postprocessor "compressor.contrib.sekizai.compress" %} {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
render_block "js" postprocessor "compressor.contrib.sekizai.compress" %}--> <!-- render_block "js" postprocessor "compressor.contrib.sekizai.compress" %}-->
<!-- Custom Fonts --> <!-- Custom Fonts -->
<link href='//fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'> <link href='//fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>

5
dal/dal/templates/landing.html
View file

@ -8,6 +8,7 @@
.auth-footer { .auth-footer {
color: black; color: black;
} }
a:link { color: #000000 }
</style> </style>
<div class="auth_container"> <div class="auth_container">
<div class="auth_bg"></div> <div class="auth_bg"></div>
@ -19,8 +20,8 @@
<form action={% url 'index' %} method="post" class="form" nonvalidated> <form action={% url 'index' %} method="post" class="form" nonvalidated>
{% csrf_token %} {% csrf_token %}
<div class="text-center"> <div class="text-center">
<br>Username:<br><input type="text" name="username" id="username"> <div class="form-group"><label class="sr-only control-label" for="username">Username</label><input class="form-control" type="text" name="username" id="username" placeholder="Username"></div>
<br>Password:<br><input type="password" name="password" id="password"> <div class="form-group"><label class="sr-only control-label" for="password">Password</label><input class="form-control" type="password" name="password" id="password" placeholder="Password"></div>
<br><br> <br><br>
<button type="submit" class="btn choice-btn"> Log in </button> <button type="submit" class="btn choice-btn"> Log in </button>
</div> </div>