nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-01-21 07:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

toolbar: Rewamp toolbar code for simplicity and to fix issues

Browse Source 
- Fix problems with turbolinks. Closes: #1712.

- Remove unnecessary nesting of <button> inside <a> and use simple bootstrap
  recommendation for button.

- Add a external site icon for the 'Launch web client' button. Borrowed from
  clients presentation table.

- Add rel="noopener and noreferrer" for security. Borrowed from clients
  presentation table.

- Use font awesome instead of glyphicons.

- Use toolbar styling recommended by bootstrap.

- Fix showing/hiding of launch button and clients button. Closes: #1719.
  Closes #1713. Closes #1714.

- Place entire contents of toolbar in <section> for correct semantics.

- Add missing end of line to file.

- Hide is_relative_url() method unnecessarily exposed as templatetag.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2019-11-27 00:44:02 -08:00 committed by James Valleroy
parent e008decb14
commit 49228343b7
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
3 changed files with 62 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plinth/templates/app.html
View File

@ -57,7 +57,7 @@
</p>
{% endif %}
{% include "toolbar.html" with clients=clients enabled=is_enabled diagnostics_module_name=diagnostics_module_name %}
{% include "toolbar.html" with enabled=is_enabled %}
{% block subsubmenu %}
{% if subsubmenu %}

121
plinth/templates/toolbar.html
View File

@ -23,83 +23,54 @@
{% load static %}
{% block toolbar %}
{% if clients %}
<div class="toolbar toolbar-default">
<div class="toolbar-heading">
<section class="toolbar-title">
{% if clients|get_self_hosted_web_apps|length == 1 and clients|length == 1 %}
<section class="toolbar">
<div class="btn-toolbar" role="toolbar">
<a
{% if enabled %}
href='{{ clients|get_self_hosted_web_apps|first|lookup:"url" }}'
{% endif %}
target='_blank'
>
<button
role="button"
type="button"
class="btn btn-primary"
{% if not enabled %}
disabled="disabled"
{% endif %}
>
{% if clients %}
{% with client_platforms=clients|clients_get_platforms %}
{% if client_platforms.web|length == 1 %}
<a target='_blank' rel="noopener noreferrer"
class="btn btn-primary" role="button" data-turbolinks="false"
{% if not enabled %} disabled="disabled"
{% else %} href="{{ client_platforms.web.0.url }}"
{% endif %} data-turbolinks="false">
{% trans "Launch web client" %}
</button>
</a>
{% elif clients|get_self_hosted_web_apps|length == 1 %}
<button type="button" class="btn btn-default collapsed collapsible-button"
data-toggle="collapse" data-target="#clients">
<span class="fa fa-chevron-right fa-fw" aria-hidden="true"></span>
{% trans "Client Apps" %}
</button>
<a
{% if enabled %}
href='{{ clients|get_self_hosted_web_apps|first|lookup:"url" }}'
{% endif %}
target='_blank'
>
<button
role="button"
type="button"
class="btn btn-primary"
{% if not enabled %}
disabled="disabled"
{% endif %}
>
{% trans "Launch web client" %}
</button>
</a>
{% else %}
<button type="button" class="btn btn-default collapsed collapsible-button"
data-toggle="collapse" data-target="#clients">
<span class="fa fa-chevron-right fa-fw" aria-hidden="true"></span>
{% trans "Client Apps" %}
</button>
{% endif %}
{% block diagnostics %}
{% if diagnostics_module_name %}
<!-- Single button -->
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon glyphicon-cog" aria-hidden="true"></span> <span class="caret"></span>
</button>
<div class="dropdown-menu">
{% include "diagnostics_button.html" with module=diagnostics_module_name enabled=is_enabled %}
</div>
</div>
<span class="fa fa-external-link"></span>
</a>
{% endif %}
{% endblock %}
</section>
</div>
<div class="toolbar-body">
{% include "clients.html" with clients=clients enabled=is_enabled %}
</div>
</div>
{% endif %}
{% endblock toolbar %}
{% if client_platforms.web|length > 1 or client_platforms.other %}
<button type="button" data-toggle="collapse" data-target="#clients"
class="btn btn-default collapsed collapsible-button">
<span class="fa fa-chevron-right fa-fw" aria-hidden="true"></span>
{% trans "Client Apps" %}
</button>
{% endif %}
{% endwith %}
{% endif %}
{% if diagnostics_module_name %}
<!-- Single button -->
<div class="btn-group button-extra-actions">
<button type="button" class="btn btn-default dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false">
<span class="fa fa-cog" aria-hidden="true"></span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li>
{% include "diagnostics_button.html" with module=diagnostics_module_name enabled=is_enabled %}
</li>
</ul>
</div>
{% endif %}
</div>
<div class="toolbar-collapsed-content">
{% include "clients.html" with clients=clients enabled=is_enabled %}
</div>
</section>
{% endblock toolbar %}

38
plinth/templatetags/plinth_extras.py
View File

@ -76,30 +76,22 @@ def lookup(dictionary, key):
return dictionary[key]
@register.filter(name='is_relative_url')
def is_relative_url(url):
"""Check if the given link is relative or not"""
parsed_url = urlparse(url)
def _is_relative_url(url):
"""Check if the given link is relative or not."""
parsed_url = urlparse(str(url))
return not parsed_url.netloc
@register.filter(name='get_self_hosted_web_apps')
def get_self_hosted_web_apps(clients):
"""Get a list of self hosted web apps"""
clients_with_web_platforms = list(
filter(
lambda c: len(
list(filter(lambda p: p['type'] == 'web', c['platforms']))),
clients))
clients_with_self_hosted_apps = list(
filter(
lambda c: len(
list(
filter(lambda p: is_relative_url(p['url']), c['platforms'])
)), clients_with_web_platforms))
mapped_list = list(
map(
lambda c: list(filter(lambda p: p['type'] == 'web', c['platforms'])
), clients_with_self_hosted_apps))
@register.filter(name='clients_get_platforms')
def clients_get_platforms(clients):
"""Return lists of self hosted platforms and all other platforms."""
other = []
web = []
for client in clients:
for platform in client['platforms']:
if platform['type'] == 'web' and _is_relative_url(platform['url']):
web.append(platform)
else:
other.append(platform)
return [elm for clnt in mapped_list for elm in clnt]
return {'web': web, 'other': other}