Skip to content

Commit 90a55c5

Browse files
committed
Replace menus with relevant ones
Signed-off-by: Nir Izraeli <[email protected]>
1 parent 5031647 commit 90a55c5

File tree

2 files changed

+19
-29
lines changed

2 files changed

+19
-29
lines changed

server/rematch/navigation.py

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,32 @@
11
class Menu:
2+
active_url = None
3+
24
def __init__(self, name, url=None, icon=None, *submenu, **kwargs):
35
self.name = name
46
self.icon = icon if icon else ''
5-
self.url = url if url else 'javascript:;'
7+
self.url = url if url else ''
68
self.submenu = submenu
7-
self.active = False or any(sm.active for sm in self.submenu)
9+
self.active = (url == self.active_url or
10+
any(sm.active for sm in self.submenu))
811

912
@property
1013
def menu_class(self):
1114
return 'sub-menu' if self.submenu else 'mf'
1215

1316

1417
def navigation(request):
18+
Menu.active_url = request.resolver_match.url_name
19+
print(Menu.active_url)
1520
menu = [Menu("Dashboard", icon='fa-dashboard'),
16-
Menu("UI Elements", None, 'fa-desktop',
17-
Menu("General", url='general.html'),
18-
Menu("Buttons", url='buttons.html'),
19-
Menu("Panels", url='panels.html')),
20-
21-
Menu("Components", None, 'fa-cogs',
22-
Menu("Calendar", url='calendar.html'),
23-
Menu("Gallery", url='gallery.html'),
24-
Menu("Todo List", url='todo_list.html')),
25-
26-
Menu("Extra Pages", None, 'fa-book',
27-
Menu("Blank Page", url='blank.html'),
28-
Menu("Login", url='login.html'),
29-
Menu("Lock Screen", url='lock_screen.html')),
30-
31-
Menu("Forms", None, 'fa-tasks',
32-
Menu("Form Components", url='form_component.html')),
33-
34-
Menu("Data Tables", None, 'fa-th',
35-
Menu("Basic Table", url='basic_table.html'),
36-
Menu("Responsive Table", url='responsive_table.html')),
37-
38-
Menu("Charts", None, 'fa-bar-chart-o',
39-
Menu("Morris", url='morris.html'),
40-
Menu("Chartjs", url='chartjs.html'))]
21+
Menu("Collaboration", None, 'fa-cogs',
22+
Menu("Projects", url='project-list'),
23+
Menu("Files", url='file-list'),
24+
Menu("Tasks", url='task-list'),
25+
Menu("Instances", url='instance-list')),
26+
27+
Menu("Account", None, 'fa-desktop',
28+
Menu("Your profile", url='profile'),
29+
# Menu("Settings", url='settings'),
30+
Menu("Logout", url='auth_logout'))]
4131

4232
return {'navigation': menu}

server/template/sidebar.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ <h5 class="centered">{{ user.first_name }} {{ user.last_name }} </h5>
77

88
{% for menu in navigation %}
99
<li class="{{ menu.menu_class }}">
10-
<a href="{{ menu.url }}"{% if menu.active %} class="active"{% endif %}>
10+
<a href="{% if menu.url %}{% url menu.url %}i{% else %}javascript:;{% endif %}"{% if menu.active %} class="active"{% endif %}>
1111
<i class="fa {{menu.icon}}"></i>
1212
<span>{{menu.name}}</span>
1313
</a>{% if menu.submenu %}
1414
<ul class="sub">{% for submenu in menu.submenu %}
15-
<li{% if submenu.active %} class="active"{% endif %}><a href="{{ submenu.url }}">{{ submenu.name }}</a></li>{% endfor %}
15+
<li{% if submenu.active %} class="active"{% endif %}><a href="{% url submenu.url %}">{{ submenu.name }}</a></li>{% endfor %}
1616
</ul>{% endif %}
1717
</li>
1818
{% endfor %}

0 commit comments

Comments
 (0)