DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

QS 0.9.1 PORD

This commit is contained in:
Holger Trampe 2020-05-31 14:27:36 +02:00
parent 9542ddfff4
commit a82b2286fe
5 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chat/templates/chat/chat_allusers.html
View File

@ -20,14 +20,20 @@
position: absolute; position: absolute;
} }
</style> </style>
<div class="card col-2" style="position: fixed; right: 35px; bottom: 75px;"> <div class="card" style="position: fixed; right: 35px; bottom: 75px;">
<div class="card-body"> <div class="card-body">
<h4>Chat öffnen <h4>Chat öffnen
<button class="btn btn-sm btn-secondary" style="float: right;" onclick="javascript:$('#chat_alluserscontent').fadeOut()"><small><i class="fas fa-times"></i></small></button> <button class="btn btn-sm btn-secondary" style="float: right;" onclick="javascript:$('#chat_alluserscontent').fadeOut()"><small><i class="fas fa-times"></i></small></button>
</h4> </h4>
<hr> <hr>
{% for user in usersofagency %} <div class="row" style="float: right">
<span> <div class="col">
{% for user in usersofagency %}
{% if forloop.counter|divisibleby:4 %}
</div>
<div class="col">
{% endif %}
<span style="padding: 20px;">
<div class='icon-container'> <div class='icon-container'>
<img class="img-profile roundimg" src="{{ user.profile.get_photo_url }}"> <img class="img-profile roundimg" src="{{ user.profile.get_photo_url }}">
@ -49,6 +55,7 @@
</span> </span>
<br /> <br />
{% endfor %} {% endfor %}
</div>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">

4
chat/templates/chat/chat_content_basechat.html
View File

@ -1,7 +1,7 @@
<style type="text/css"> <style type="text/css">
.scroll { .scroll {
max-height: 400px; max-height: 300px;
min-height: 500px; min-height: 300px;
overflow-y: auto; overflow-y: auto;
} }

BIN
digitaleagentur/__pycache__/settings.cpython-38.pyc
View File

Binary file not shown.

12
digitaleagentur/settings.py
View File

@ -168,22 +168,10 @@ LOGIN_REDIRECT_URL = 'users-dashboard'
# LOGIN PAGE FOR LOGIN-REDIRECT # LOGIN PAGE FOR LOGIN-REDIRECT
LOGIN_URL = 'login' LOGIN_URL = 'login'
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/2.2/howto/static-files/
#SITE_ROOT = os.path.dirname(os.path.realpath(__file__))
#SITE_ROOT = '/var/www/digitale-agentur.com/digitaleagentur/digitaleagentur/../'
#STATIC_ROOT = (os.path.join(SITE_ROOT, 'static'))
#DEV-UMBGEUNG
STATIC_URL = '/static/' STATIC_URL = '/static/'
############################# FÜR COMMIT
SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) + '/..' SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) + '/..'
STATIC_ROOT = (os.path.join(SITE_ROOT, 'users/static/')) STATIC_ROOT = (os.path.join(SITE_ROOT, 'users/static/'))
#STATICFILES_DIRS = (os.path.join(SITE_ROOT, 'users/static/'),)
# CRISPY # CRISPY
CRISPY_TEMPLATE_PACK = 'bootstrap4' CRISPY_TEMPLATE_PACK = 'bootstrap4'

4
users/signals.py
View File

@ -383,6 +383,10 @@ def receiver_function(sender, **kwargs):
now_minus = datetime.datetime.now() - datetime.timedelta(minutes=2) now_minus = datetime.datetime.now() - datetime.timedelta(minutes=2)
Presence.objects.filter(last_seen__lt=now_minus).delete() Presence.objects.filter(last_seen__lt=now_minus).delete()
print(settings.MEDIA_URL)
print(settings.MEDIA_ROOT)
print(os.path.join(BASE_DIR, 'media'))
print(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
# PREENCE CHANGED # PREENCE CHANGED
@receiver(signal=presence_changed) @receiver(signal=presence_changed)