Skip to content

Commit e7853bc

Browse files
app-generatorapp-generator
committed
Release v1.0.7 - Fix Sidebar & RTL layout
1 parent 3689f1a commit e7853bc

File tree

4 files changed

+157
-116
lines changed

4 files changed

+157
-116
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# CHANGELOG
22

3-
## [1.0.6] 2022-11-11
3+
## [1.0.7] 2022-11-20
4+
### Fixes
5+
6+
- Fix sidebar & RTL Layout
7+
- NOTE: `1.0.6` is broken
8+
9+
## [1.0.6] 2022-11-20
410
### Improvements
511

612
- Integrate all pages for `Django.contrib.AUTH`

‎admin_argon/templates/includes/sidebar-rtl.html‎

Lines changed: 75 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,80 @@
1-
{% load static %}
1+
{% load static %}
22

3-
<aside class="sidenav bg-white navbar navbar-vertical navbar-expand-xs border-0 border-radius-xl my-3 fixed-end me-4 rotate-caret" id="sidenav-main">
4-
<div class="sidenav-header">
5-
<i class="fas fa-times p-3 cursor-pointer text-secondary opacity-5 position-absolute start-0 top-0 d-none d-xl-none" aria-hidden="true" id="iconSidenav"></i>
6-
<a class="navbar-brand m-0" href="/">
7-
<img src="{% static 'img/logo-ct-dark.png' %}" class="navbar-brand-img h-100" alt="main_logo">
8-
<span class="me-1 font-weight-bold">Argon Dashboard 2</span>
9-
</a>
10-
</div>
11-
<hr class="horizontal dark mt-0">
12-
<div class="collapse navbar-collapse px-0 w-auto " id="sidenav-collapse-main">
13-
<ul class="navbar-nav">
14-
<li class="nav-item">
15-
<a class="nav-link " href="../pages/dashboard.html">
16-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
17-
<i class="ni ni-tv-2 text-primary text-sm opacity-10"></i>
18-
</div>
19-
<span class="nav-link-text me-1">لوحة القيادة</span>
20-
</a>
21-
</li>
22-
<li class="nav-item">
23-
<a class="nav-link " href="../pages/tables.html">
24-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
25-
<i class="ni ni-calendar-grid-58 text-warning text-sm opacity-10"></i>
26-
</div>
27-
<span class="nav-link-text me-1">الجداول</span>
28-
</a>
29-
</li>
30-
<li class="nav-item">
31-
<a class="nav-link " href="../pages/billing.html">
32-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
33-
<i class="ni ni-credit-card text-success text-sm opacity-10"></i>
34-
</div>
35-
<span class="nav-link-text me-1">الفواتير</span>
36-
</a>
37-
</li>
38-
<li class="nav-item">
39-
<a class="nav-link " href="../pages/virtual-reality.html">
40-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
41-
<i class="ni ni-app text-info text-sm opacity-10"></i>
42-
</div>
43-
<span class="nav-link-text me-1">الواقع الافتراضي</span>
44-
</a>
45-
</li>
46-
<li class="nav-item">
47-
<a class="nav-link active" href="../pages/rtl.html">
48-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
49-
<i class="ni ni-world-2 text-danger text-sm opacity-10"></i>
50-
</div>
51-
<span class="nav-link-text me-1">RTL</span>
52-
</a>
53-
</li>
54-
<li class="nav-item mt-3">
55-
<h6 class="ps-4 me-4 pe-2 text-uppercase text-xs font-weight-bolder opacity-6">صفحات المرافق</h6>
56-
</li>
57-
<li class="nav-item">
58-
<a class="nav-link " href="../pages/profile.html">
59-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
60-
<i class="ni ni-single-02 text-dark text-sm opacity-10"></i>
61-
</div>
62-
<span class="nav-link-text me-1">حساب تعريفي</span>
63-
</a>
64-
</li>
65-
<li class="nav-item">
66-
<a class="nav-link " href="../pages/sign-in.html">
67-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
68-
<i class="ni ni-single-copy-04 text-warning text-sm opacity-10"></i>
69-
</div>
70-
<span class="nav-link-text me-1">تسجيل الدخول</span>
71-
</a>
72-
</li>
73-
<li class="nav-item">
74-
<a class="nav-link " href="../pages/sign-up.html">
75-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
76-
<i class="ni ni-collection text-info text-sm opacity-10"></i>
77-
</div>
78-
<span class="nav-link-text me-1">اشتراك</span>
79-
</a>
80-
</li>
81-
</ul>
82-
</div>
83-
<div class="sidenav-footer mx-3 ">
84-
<div class="card card-plain shadow-none" id="sidenavCard">
85-
<img class="w-50 mx-auto" src="{% static 'img/illustrations/icon-documentation.svg' %}" alt="sidebar_illustration">
86-
<div class="card-body text-center p-3 w-100 pt-0">
87-
<div class="docs-info">
88-
<h6 class="mb-0 text-center">تحتاج مساعدة?</h6>
89-
<p class="text-xs font-weight-bold text-center mb-0">يرجى التحقق من مستنداتنا</p>
3+
<aside class="sidenav bg-white navbar navbar-vertical navbar-expand-xs border-0 border-radius-xl my-3 fixed-end me-4 rotate-caret" id="sidenav-main">
4+
<div class="sidenav-header">
5+
<i class="fas fa-times p-3 cursor-pointer text-secondary opacity-5 position-absolute start-0 top-0 d-none d-xl-none" aria-hidden="true" id="iconSidenav"></i>
6+
<a class="navbar-brand m-0" href="/">
7+
<img src="{% static 'img/logo-ct-dark.png' %}" class="navbar-brand-img h-100" alt="main_logo">
8+
<span class="me-1 font-weight-bold">Argon Dashboard 2</span>
9+
</a>
10+
</div>
11+
<hr class="horizontal dark mt-0">
12+
<div class="collapse navbar-collapse px-0 w-auto " id="sidenav-collapse-main">
13+
<ul class="navbar-nav">
14+
<li class="nav-item">
15+
<a class="nav-link " href="{% url 'index' %}">
16+
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
17+
<i class="ni ni-tv-2 text-primary text-sm opacity-10"></i>
18+
</div>
19+
<span class="nav-link-text me-1">لوحة القيادة</span>
20+
</a>
21+
</li>
22+
<li class="nav-item">
23+
<a class="nav-link " href="{% url 'tables' %}">
24+
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
25+
<i class="ni ni-calendar-grid-58 text-warning text-sm opacity-10"></i>
26+
</div>
27+
<span class="nav-link-text me-1">الجداول</span>
28+
</a>
29+
</li>
30+
<li class="nav-item">
31+
<a class="nav-link " href="{% url 'billing' %}">
32+
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
33+
<i class="ni ni-credit-card text-success text-sm opacity-10"></i>
34+
</div>
35+
<span class="nav-link-text me-1">الفواتير</span>
36+
</a>
37+
</li>
38+
<li class="nav-item">
39+
<a class="nav-link " href="{% url 'vr' %}">
40+
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
41+
<i class="ni ni-app text-info text-sm opacity-10"></i>
42+
</div>
43+
<span class="nav-link-text me-1">الواقع الافتراضي</span>
44+
</a>
45+
</li>
46+
<li class="nav-item">
47+
<a class="nav-link active" href="{% url 'rtl' %}">
48+
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
49+
<i class="ni ni-world-2 text-danger text-sm opacity-10"></i>
50+
</div>
51+
<span class="nav-link-text me-1">RTL</span>
52+
</a>
53+
</li>
54+
<li class="nav-item mt-3">
55+
<h6 class="ps-4 me-4 pe-2 text-uppercase text-xs font-weight-bolder opacity-6">صفحات المرافق</h6>
56+
</li>
57+
<li class="nav-item">
58+
<a class="nav-link " href="{% url 'profile' %}">
59+
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
60+
<i class="ni ni-single-02 text-dark text-sm opacity-10"></i>
9061
</div>
62+
<span class="nav-link-text me-1">حساب تعريفي</span>
63+
</a>
64+
</li>
65+
</ul>
66+
</div>
67+
<div class="sidenav-footer mx-3 ">
68+
<div class="card card-plain shadow-none" id="sidenavCard">
69+
<img class="w-50 mx-auto" src="{% static 'img/illustrations/icon-documentation.svg' %}" alt="sidebar_illustration">
70+
<div class="card-body text-center p-3 w-100 pt-0">
71+
<div class="docs-info">
72+
<h6 class="mb-0 text-center">تحتاج مساعدة?</h6>
73+
<p class="text-xs font-weight-bold text-center mb-0">يرجى التحقق من مستنداتنا</p>
9174
</div>
9275
</div>
93-
<a href="https://github.com/app-generator/django-admin-argon-dashboard" target="_blank" class="btn btn-dark btn-sm w-100 mb-3">Download</a>
94-
<a class="btn btn-primary btn-sm mb-0 w-100" href="https://appseed.us" type="button">Support</a>
9576
</div>
96-
</aside>
77+
<a href="https://github.com/app-generator/django-admin-argon-dashboard" target="_blank" class="btn btn-dark btn-sm w-100 mb-3">Download</a>
78+
<a class="btn btn-primary btn-sm mb-0 w-100" href="https://appseed.us" type="button">Support</a>
79+
</div>
80+
</aside>

‎admin_argon/templates/includes/sidebar.html‎

Lines changed: 74 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,127 @@
1-
{% load static %}
2-
3-
<aside class="sidenav bg-white navbar navbar-vertical navbar-expand-xs border-0 border-radius-xl my-3 fixed-end me-4 rotate-caret" id="sidenav-main">
1+
{% load i18n static admin_argon %}
2+
3+
<aside class="sidenav bg-white navbar navbar-vertical navbar-expand-xs border-0 border-radius-xl my-3 fixed-start ms-4 " id="sidenav-main">
44
<div class="sidenav-header">
5-
<i class="fas fa-times p-3 cursor-pointer text-secondary opacity-5 position-absolute start-0 top-0 d-none d-xl-none" aria-hidden="true" id="iconSidenav"></i>
5+
<i class="fas fa-times p-3 cursor-pointer text-secondary opacity-5 position-absolute end-0 top-0 d-none d-xl-none" aria-hidden="true" id="iconSidenav"></i>
66
<a class="navbar-brand m-0" href="/">
77
<img src="{% static 'img/logo-ct-dark.png' %}" class="navbar-brand-img h-100" alt="main_logo">
8-
<span class="me-1 font-weight-bold">Argon Dashboard 2</span>
8+
<span class="ms-1 font-weight-bold">Argon Dashboard 2</span>
99
</a>
1010
</div>
1111
<hr class="horizontal dark mt-0">
12-
<div class="collapse navbar-collapse px-0 w-auto " id="sidenav-collapse-main">
12+
<div class="collapse navbar-collapse w-auto " id="sidenav-collapse-main">
1313
<ul class="navbar-nav">
14+
{% admin_get_menu as app_list %}
15+
{% if app_list %}
16+
{% for app in app_list %}
17+
{% if app.has_perms and not app.pinned %}
18+
<li class="nav-item">
19+
{% comment %} <span class="nav-link{% if app_label != app.label and app.url not in request.path|urlencode %} collapsed{% endif %} text-white" data-bs-toggle="collapse" data-bs-target="#submenu-{{ app.app_label }}">
20+
<span class="d-flex justify-content-between align-items-center">
21+
<div class="text-center me-2 d-flex align-items-center justify-content-center">
22+
<span class="sidebar-icon {{ app.icon }}"></span>
23+
</div>
24+
<a href="{{ app.url }}">
25+
<span class="nav-link-text ms-1">{{ app.label|slice:10 }}{% if app.label|length > 10 %}..{% endif %}</span>
26+
</a>
27+
</span>
28+
</span> {% endcomment %}
29+
<a class="nav-link {% if app_label != app.label and app.url not in request.path|urlencode %} collapsed{% endif %}" data-bs-toggle="collapse" data-bs-target="#submenu-{{ app.app_label }}" href="{{ app.url }}">
30+
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
31+
<i class="{{ app.icon }} text-primary text-sm opacity-10"></i>
32+
</div>
33+
<span class="nav-link-text ms-1">{{ app.label|slice:10 }}{% if app.label|length > 10 %}..{% endif %}</span>
34+
</a>
35+
36+
{% if app.models %}
37+
<div class="multi-level ms-5 collapse {% if 'tables-bootstrap-' in segment or app_label == app.label or app.url in request.path|urlencode %} show {% endif %}" role="list" id="submenu-{{ app.app_label }}" aria-expanded="{% if app_label == app.label or app.url in request.path|urlencode %}true{% else %}false{% endif %}">
38+
<ul class="flex-column nav">
39+
{% for model in app.models %}
40+
{% if model.url %}
41+
<li class="nav-item{% if 'bootstrap-tables' in segment or model.url in request.path|urlencode %} active {% endif %} list-unstyled">
42+
<a class="nav-link" href="{{ model.url }}">
43+
<span class="nav-link-text ms-1">{{ model.label }}</span>
44+
</a>
45+
</li>
46+
{% else %}
47+
<li class="nav-item list-unstyled">{{ model.label }}</li>
48+
{% endif %}
49+
{% endfor %}
50+
</ul>
51+
</div>
52+
{% endif %}
53+
</li>
54+
{% endif %}
55+
{% endfor %}
56+
{% endif %}
57+
1458
<li class="nav-item">
15-
<a class="nav-link " href="{% url 'index' %}">
16-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
59+
{% if request.user.is_superuser %}
60+
<a href="{% url 'admin:index' %}" class="nav-link {% if 'index' in segment %} active {% endif %}">
61+
{% else %}
62+
<a href="{% url 'index' %}" class="nav-link {% if 'index' in segment %} active {% endif %}">
63+
{% endif %}
64+
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
1765
<i class="ni ni-tv-2 text-primary text-sm opacity-10"></i>
1866
</div>
19-
<span class="nav-link-text me-1">لوحة القيادة</span>
67+
<span class="nav-link-text ms-1">Dashboard</span>
2068
</a>
2169
</li>
70+
71+
{% if request.user.is_authenticated and not request.user.is_superuser %}
2272
<li class="nav-item">
2373
<a class="nav-link " href="{% url 'tables' %}">
24-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
74+
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
2575
<i class="ni ni-calendar-grid-58 text-warning text-sm opacity-10"></i>
2676
</div>
27-
<span class="nav-link-text me-1">الجداول</span>
77+
<span class="nav-link-text ms-1">Tables</span>
2878
</a>
2979
</li>
3080
<li class="nav-item">
3181
<a class="nav-link " href="{% url 'billing' %}">
32-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
82+
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
3383
<i class="ni ni-credit-card text-success text-sm opacity-10"></i>
3484
</div>
35-
<span class="nav-link-text me-1">الفواتير</span>
85+
<span class="nav-link-text ms-1">Billing</span>
3686
</a>
3787
</li>
3888
<li class="nav-item">
3989
<a class="nav-link " href="{% url 'vr' %}">
40-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
90+
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
4191
<i class="ni ni-app text-info text-sm opacity-10"></i>
4292
</div>
43-
<span class="nav-link-text me-1">الواقع الافتراضي</span>
93+
<span class="nav-link-text ms-1">Virtual Reality</span>
4494
</a>
4595
</li>
4696
<li class="nav-item">
47-
<a class="nav-link active" href="{% url 'rtl' %}">
48-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
97+
<a class="nav-link " href="{% url 'rtl' %}">
98+
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
4999
<i class="ni ni-world-2 text-danger text-sm opacity-10"></i>
50100
</div>
51-
<span class="nav-link-text me-1">RTL</span>
101+
<span class="nav-link-text ms-1">RTL</span>
52102
</a>
53103
</li>
54104
<li class="nav-item mt-3">
55-
<h6 class="ps-4 me-4 pe-2 text-uppercase text-xs font-weight-bolder opacity-6">صفحات المرافق</h6>
105+
<h6 class="ps-4 ms-2 text-uppercase text-xs font-weight-bolder opacity-6">Account pages</h6>
56106
</li>
57107
<li class="nav-item">
58108
<a class="nav-link " href="{% url 'profile' %}">
59-
<div class="icon icon-shape icon-sm border-radius-md text-center ms-2 d-flex align-items-center justify-content-center">
109+
<div class="icon icon-shape icon-sm border-radius-md text-center me-2 d-flex align-items-center justify-content-center">
60110
<i class="ni ni-single-02 text-dark text-sm opacity-10"></i>
61111
</div>
62-
<span class="nav-link-text me-1">حساب تعريفي</span>
112+
<span class="nav-link-text ms-1">Profile</span>
63113
</a>
64114
</li>
115+
{% endif %}
65116
</ul>
66117
</div>
67118
<div class="sidenav-footer mx-3 ">
68119
<div class="card card-plain shadow-none" id="sidenavCard">
69120
<img class="w-50 mx-auto" src="{% static 'img/illustrations/icon-documentation.svg' %}" alt="sidebar_illustration">
70121
<div class="card-body text-center p-3 w-100 pt-0">
71122
<div class="docs-info">
72-
<h6 class="mb-0 text-center">تحتاج مساعدة?</h6>
73-
<p class="text-xs font-weight-bold text-center mb-0">يرجى التحقق من مستنداتنا</p>
123+
<h6 class="mb-0">Need help?</h6>
124+
<p class="text-xs font-weight-bold mb-0">Please check the links</p>
74125
</div>
75126
</div>
76127
</div>

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
setup(
1010
name='django-admin-argon-dashboard',
11-
version='1.0.6',
11+
version='1.0.7',
1212
zip_safe=False,
1313
packages=find_packages(),
1414
include_package_data=True,

0 commit comments

Comments
 (0)