Skip to content

UI fixes #278

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
d-sergienko wants to merge 4 commits into
base: master
Choose a base branch
from
Open

UI fixes #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a1bcba
fix logout button
Nov 18, 2023
54b7cc7
fix user_queues filter (#1)
d-sergienko Nov 24, 2023
8f4ff1c
sort queues by name
Nov 26, 2023
5cb22a0
add queue name to the card title
d-sergienko Dec 11, 2023
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
6 changes: 4 additions & 2 deletions qpanel/backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,10 @@ def filter_data_for_user(self, data, user):
user -- username
"""
enables = self.config.queue_enables_for_username(user)
not_enable = list(set(data.keys()) - set(enables))
map(data.pop, not_enable)
if len(enables):
for q in list(data.keys()):
if q not in enables:
data.pop(q)
return data

def parse_fs(self, data):
Expand Down
2 changes: 1 addition & 1 deletion qpanel/themes/qpanel/templates/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
</p>
</a>
</li>
{% endif %}
{% if has_users() %}
<li class="nav-item">
<a class="nav-link" href="{{url_for('.logout')}}">
Expand All @@ -48,7 +49,6 @@
</a>
</li>
{% endif %}
{% endif %}
<li class="nav-item dropdown">
<a class="nav-link" href="http://example.com" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="material-icons">language</i>
Expand Down
2 changes: 1 addition & 1 deletion qpanel/themes/qpanel/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<div class="content">
<div class="row">
{% include theme('row_general_data.html') %}
{% for queue_name, queue in queues.items() %}
{% for queue_name, queue in queues.items() | sort %}
<div class="col-md-4">
<div class="card card-chart">
<div class="card-header card-header-success queue-card">
Expand Down
4 changes: 2 additions & 2 deletions qpanel/themes/qpanel/templates/queue.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<div class="card">
<div class="card-header card-header-primary">
<h4 class="card-title">
{{ _('Agents') }}: <span id="total_agent" class="label label-default"></span>
[{{ name }}] {{ _('Agents') }}: <span id="total_agent" class="label label-default"></span>
</h4>
</div>
<div class="card-body">
Expand Down Expand Up @@ -102,7 +102,7 @@ <h4 class="card-title">
<div class="card">
<div class="card-header card-header-primary">
<h4 class="card-title">
{{ _('Callers') }}: <span id="total_callers" class="label label-default"></span>
[{{ name }}] {{ _('Callers') }}: <span id="total_callers" class="label label-default"></span>
</h4>
</div>
<div class="card-body">
Expand Down