Skip to content

Redisign message element. #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Antoliny0919 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Redisign message element. #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions djangosnippets/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,6 @@ def user_url(user):
DISQUS_WEBSITE_SHORTNAME = "djangosnippets"
DISQUS_USE_SINGLE_SIGNON = True

MESSAGE_TAGS = {
messages.DEBUG: "secondary",
messages.INFO: "info",
messages.SUCCESS: "success",
messages.WARNING: "warning",
messages.ERROR: "alert",
}


DATABASES = {"default": dj_database_url.config(conn_max_age=600, conn_health_checks=True)}
DATABASES["default"]["ATOMIC_REQUESTS"] = True

Expand Down
13 changes: 2 additions & 11 deletions djangosnippets/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{% endif %}
</p>
</div></div>
<header><div class="inner">
<header class="mb-0"><div class="inner">
<a title="Go back to the frontpage" href="{% url 'home' %}" id="logo">django<b>snippets</b></a>
<nav>
<ul>
Expand All @@ -38,6 +38,7 @@
</ul>
</nav>
</div></header>
{% include 'includes/messages.html' %}
<div id="main" class="container mb-auto mx-auto w-7/8">
{% block secondary_nav %}
<nav id="subnav">
Expand All @@ -48,16 +49,6 @@
</ul>
</nav>
{% endblock %}

{% if messages %}
{% for message in messages %}
<div data-alert class="alert-box {% if message.tags %} {{ message.tags }}{% else %}message_info{% endif %}">
{{ message }}
<a href="#" class="close">&times;</a>
</div>
{% endfor %}
{% endif %}

<div id="base-container">
<h1>{% block content_header %}{% endblock %}</h1>
{% block new_content_header %}{% endblock %}
Expand Down
33 changes: 33 additions & 0 deletions djangosnippets/templates/includes/messages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{% if messages %}
{% for message in messages %}
<div class="mx-4 relative" x-data="{ show: true }">
<div data-alert
class="absolute w-full flex justify-between pl-8 pr-4 py-2 border-2 rounded-md font-text text-lg
{% if 'error' in message.tags %}
border-red-600 bg-red-100
{% elif 'warning' in message.tags %}
border-orange-600 bg-orange-100
{% elif 'success' in message.tags %}
border-green-600 bg-green-100
{% else %}
border-blue-600 bg-blue-100
{% endif %}
"
:class="show ? '' : 'opacity-0 duration-500 -translate-y-10'"
>
{{ message }}
<button type="button" @click="show = false" href="#" class="m-0 text-base-black border-2 p-0 px-2 rounded-full text-base relative
{% if 'error' in message.tags %}
bg-red-400
{% elif 'warning' in message.tags %}
bg-orange-400
{% elif 'success' in message.tags %}
bg-green-400
{% else %}
bg-blue-400
{% endif %}
"><span class="relative -top-0.5">&times;</span></button>
</div>
</div>
{% endfor %}
{% endif %}