Skip to content

globe icon added, pc logo click goes on landing page, default logo an… #3

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
awrunpatel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

globe icon added, pc logo click goes on landing page, default logo an… #3

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
Binary file modified dashub/__pycache__/__init__.cpython-312.pyc
View file
Open in desktop
Binary file not shown.
Binary file modified dashub/__pycache__/apps.cpython-312.pyc
View file
Open in desktop
Binary file not shown.
Binary file modified dashub/__pycache__/compat.cpython-312.pyc
View file
Open in desktop
Binary file not shown.
Binary file modified dashub/__pycache__/settings.cpython-312.pyc
View file
Open in desktop
Binary file not shown.
Binary file modified dashub/__pycache__/utils.cpython-312.pyc
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion dashub/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Title on the brand (19 chars max) (will default to current_admin_site.site_header)
"site_brand": None,
# URL of the logo for your site, used for brand on top left
"site_logo": "https://cdn.practet.com/static/logo-new.webp",
"site_logo": "/static/assets/img/logo.png",
# Relative path to a favicon for your site, will default to site_logo if absent (ideally 32x32 px)
"site_icon": None,
############
Expand Down
Binary file removed dashub/static/assets/img/baby.png
View file
Open in desktop
Binary file not shown.
Binary file added dashub/static/assets/img/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 0 additions & 17 deletions dashub/static/assets/img/logo1.svg
View file
Open in desktop

This file was deleted.

Binary file removed dashub/static/assets/img/teachers/1.png
View file
Open in desktop
Binary file not shown.
Binary file removed dashub/static/assets/img/teachers/2.png
View file
Open in desktop
Binary file not shown.
Binary file removed dashub/static/assets/img/teachers/3.png
View file
Open in desktop
Binary file not shown.
Binary file removed dashub/static/assets/img/teachers/4.png
View file
Open in desktop
Binary file not shown.
36 changes: 20 additions & 16 deletions dashub/templates/admin/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,27 @@
<!-- [Mobile Media Block end] -->
<div class="ms-auto">
<ul class="list-unstyled">
<li class="ps-h-item">
<a href="/" class="ps-head-link me-0" target="_blank">
<i class="fa fa-globe"></i>
</a>
</li>
<li class="dropdown dropdown-user ps-h-item">
<a class="ps-head-link dropdown-toggle arrow-none me-0" data-bs-toggle="dropdown" href="#"
role="button" aria-haspopup="false" data-bs-auto-close="outside" aria-expanded="false">
<img src="{{ request.user.get_avatar }}" alt="user-image" class="user-avatar"/>
role="button" aria-haspopup="false" data-bs-auto-close="outside" aria-expanded="false">
<img src="{{ request.user.get_avatar|default:'/static/assets/img/user.png' }}"
alt="user-image" class="user-avatar"/>
</a>
<div class="dropdown-menu dropdown-menu-end ps-h-dropdown">
<div class="dropdown-header px-0 mb-2 d-flex align-items-center justify-content-between">
<h5 class="m-0">Profile</h5>
</div>
<div class="dropdown-body">
<div class="notification-scroll position-relative"
style="max-height: calc(100vh - 225px)">
<div class="notification-scroll position-relative" style="max-height: calc(100vh - 225px)">
<div class="d-flex mb-1">
<div class="flex-shrink-0">
<img src="{{ request.user.get_avatar }}" alt="{{ request.user }}"
class="user-avatar wid-35"/>
<img src="{{ request.user.get_avatar|default:'/static/assets/img/user.png' }}"
alt="{{ request.user }}" class="user-avatar wid-35"/>
</div>
<div class="flex-grow-1 ms-3">
<h6 class="mb-1">{{ request.user }}</h6>
Expand All @@ -98,16 +103,16 @@ <h6 class="mb-1">{{ request.user }}</h6>
{% get_user_menu user request.current_app|default:"admin" as user_menu %}
{% for link in user_menu %}
<a href="{{ link.url }}" class="dropdown-item">
<span>
<i class="ps-icon text-muted me-2 {{ link.icon }}"></i>
<span>{% trans link.name %}</span>
</span>
<span>
<i class="ps-icon text-muted me-2 {{ link.icon }}"></i>
<span>{% trans link.name %}</span>
</span>
</a>
{% endfor %}

{% if perms|can_view_self %}
<a href="{% jazzy_admin_url request.user request.current_app|default:"admin" %}"
class="dropdown-item">
class="dropdown-item">
<span>
<i class="ps-icon text-muted me-2 fa fa-user"></i>
<span>{% trans 'View Profile' %}</span>
Expand All @@ -134,6 +139,7 @@ <h6 class="mb-1">{{ request.user }}</h6>
</div>
</div>
</li>

</ul>
</div>
</div>
Expand All @@ -147,7 +153,7 @@ <h6 class="mb-1">{{ request.user }}</h6>
<nav class="ps-sidebar">
<div class="navbar-wrapper">
<div class="m-header">
<a href="" class="b-brand text-primary">
<a href="/admin" class="b-brand text-primary">
<img src="{{ dashub_settings.site_logo }}" class="img-fluid logo-lg"
alt="{{ dashub_settings.site_title }}">
</a>
Expand All @@ -157,8 +163,7 @@ <h6 class="mb-1">{{ request.user }}</h6>
<div class="card-body">
<div class="d-flex align-items-center">
<div class="flex-shrink-0">
<img src="{{ request.user.get_avatar }}" alt="user-image"
class="user-avatar wid-45 rounded-circle"/>
<img src="{% if request.user.get_avatar %}{{ request.user.get_avatar }}{% else %}{% static 'assets/img/user.png' %}{% endif %}" alt="user-image" class="user-avatar wid-45 rounded-circle"/>
</div>
<div class="flex-grow-1 ms-3 me-2">
<h6 class="mb-0">{{ request.user }}</h6>
Expand Down Expand Up @@ -302,7 +307,7 @@ <h2 class="mb-0">{% block content_title %}{% endblock %}</h2>
<div class="footer-wrapper container-fluid">
<div class="row">
<div class="col my-1">
<p class="m-0">Copyright &copy; 2023 | All Right Reserved</p>
<p class="m-0">Copyright &copy; {% now "Y" %} | All Rights Reserved</p>
</div>
<div class="col-auto my-1">
<ul class="list-inline footer-link mb-0">
Expand All @@ -317,7 +322,6 @@ <h2 class="mb-0">{% block content_title %}{% endblock %}</h2>
<!-- [ Footer ] end -->
{% endif %}
{% endblock %}

</div>

<!-- Required Js -->
Expand Down
Binary file modified dashub/templatetags/__pycache__/__init__.cpython-312.pyc
View file
Open in desktop
Binary file not shown.
Binary file added dashub/templatetags/__pycache__/dashub.cpython-312.pyc
View file
Open in desktop
Binary file not shown.