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

Replace glyphicons with forkawesome icons

Browse Source 
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
Prachi Srivastava 2019-01-14 14:35:34 +05:30 committed by Sunil Mohan Adapa
parent 75d6b667ba
commit 5d68f6bf52
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
47 changed files with 81 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/control vendored
View File

@ -63,6 +63,7 @@ Depends:
debconf,
dnsutils,
e2fsprogs,
fonts-fork-awesome,
fonts-lato,
gettext,
gir1.2-glib-2.0,

4
plinth/menu.py
View File

@ -100,5 +100,5 @@ main_menu = Menu()
def init():
"""Create main menu and other essential menus."""
main_menu.add_urlname('', 'glyphicon-download-alt', 'apps')
main_menu.add_urlname('', 'glyphicon-cog', 'system')
main_menu.add_urlname('', 'fa-download', 'apps')
main_menu.add_urlname('', 'fa-cog', 'system')

2
plinth/modules/avahi/__init__.py
View File

@ -59,7 +59,7 @@ manual_page = 'ServiceDiscovery'
def init():
"""Intialize the service discovery module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-lamp', 'avahi:index')
menu.add_urlname(name, 'fa-compass', 'avahi:index')
global service # pylint: disable=W0603
service = service_module.Service(managed_services[0], name, ports=['mdns'],

2
plinth/modules/backups/__init__.py
View File

@ -54,7 +54,7 @@ SESSION_PATH_VARIABLE = 'fbx-backups-upload-path'
def init():
"""Intialize the module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-duplicate', 'backups:index')
menu.add_urlname(name, 'fa-files-o', 'backups:index')
def setup(helper, old_version=None):

10
plinth/modules/backups/templates/backups_repository.inc
View File

@ -26,7 +26,7 @@
<th colspan="2">
{% if repository.error %}
<span class="glyphicon glyphicon-warning-sign mount-error"
<span class="fa fa-exclamation-triangle mount-error"
aria-hidden="true" title="{{ repository.error }}">
</span>
{% endif %}
@ -45,7 +45,7 @@
{% csrf_token %}
<button type="submit" class="btn btn-sm btn-default"
title="{% trans 'Unmount Location' %}">
<span class="glyphicon glyphicon-eject" aria-hidden="true">
<span class="fa fa-eject" aria-hidden="true">
</button>
</form>
@ -56,7 +56,7 @@
{% csrf_token %}
<button type="submit" class="btn btn-sm btn-default"
title="{% trans 'Mount Location' %}">
<span class="glyphicon glyphicon-eye-open" aria-hidden="true">
<span class="fa fa-eye" aria-hidden="true">
</button>
</form>
@ -65,7 +65,7 @@
<a title="{% trans 'Remove Location. This will not delete the remote backup.' %}"
role="button" class="repository-remove btn btn-sm btn-default"
href="{% url 'backups:repository-remove' uuid %}">
<span class="glyphicon glyphicon-trash" aria-hidden="true">
<span class="fa fa-trash" aria-hidden="true">
</a>
{% endif %}
@ -91,7 +91,7 @@
</a>
<a class="archive-delete btn btn-sm btn-default"
href="{% url 'backups:delete' uuid archive.name %}">
<span class="glyphicon glyphicon-trash" aria-hidden="true">
<span class="fa fa-trash" aria-hidden="true">
</span>
</a>
</td>

2
plinth/modules/bind/__init__.py
View File

@ -83,7 +83,7 @@ listen-on-v6 { any; };
def init():
"""Intialize the BIND module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-globe', 'bind:index', short_description)
menu.add_urlname(name, 'fa-globe-w', 'bind:index', short_description)
global service
setup_helper = globals()['setup_helper']

2
plinth/modules/cockpit/__init__.py
View File

@ -63,7 +63,7 @@ manual_page = 'Cockpit'
def init():
"""Intialize the module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-wrench', 'cockpit:index',
menu.add_urlname(name, 'fa-wrench', 'cockpit:index',
short_description)
global service

2
plinth/modules/config/__init__.py
View File

@ -73,7 +73,7 @@ def init():
"""Initialize the module"""
menu = main_menu.get('system')
menu.add_urlname(
ugettext_lazy('Configure'), 'glyphicon-cog', 'config:index')
ugettext_lazy('Configure'), 'fa-cog', 'config:index')
# Register domain with Name Services module.
domainname = get_domainname()

2
plinth/modules/datetime/__init__.py
View File

@ -50,7 +50,7 @@ service = None
def init():
"""Intialize the date/time module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-time', 'datetime:index')
menu.add_urlname(name, 'fa-clock-o', 'datetime:index')
global service
setup_helper = globals()['setup_helper']

2
plinth/modules/diagnostics/__init__.py
View File

@ -43,7 +43,7 @@ manual_page = 'Diagnostics'
def init():
"""Initialize the module"""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-screenshot', 'diagnostics:index')
menu.add_urlname(name, 'fa-heartbeat', 'diagnostics:index')
def diagnose():

2
plinth/modules/diagnostics/templates/diagnostics.html
View File

@ -69,7 +69,7 @@
{% if module_results %}
{% include "diagnostics_results.html" with results=module_results %}
{% else %}
<p><span class="glyphicon glyphicon-hourglass"></span></p>
<p><span class="fa fa-hourglass"></span></p>
{% endif %}
{% endfor %}
{% endif %}

2
plinth/modules/diaspora/__init__.py
View File

@ -76,7 +76,7 @@ clients = clients
def init():
"""Initialize the Diaspora module."""
menu = main_menu.get('apps')
menu.add_urlname(name, 'glyphicon-thumbs-up', 'diaspora:index',
menu.add_urlname(name, 'fa-thumbs-o-up', 'diaspora:index',
short_description)
global service

2
plinth/modules/dynamicdns/__init__.py
View File

@ -58,7 +58,7 @@ manual_page = 'DynamicDNS'
def init():
"""Initialize the module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-refresh', 'dynamicdns:index')
menu.add_urlname(name, 'fa-refresh', 'dynamicdns:index')
current_status = dynamicdns.get_status()
if current_status['enabled']:
services = dynamicdns.get_enabled_services(

2
plinth/modules/firewall/__init__.py
View File

@ -54,7 +54,7 @@ LOGGER = logging.getLogger(__name__)
def init():
"""Initailze firewall module"""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-fire', 'firewall:index')
menu.add_urlname(name, 'fa-shield', 'firewall:index')
service_enabled.connect(on_service_enabled)

2
plinth/modules/first_boot/templates/firstboot_navbar.html
View File

@ -21,6 +21,6 @@
<li>
<a href="{% url 'help:index' %}" title="{% trans "Help" %}">
<span class="glyphicon-question-sign glyphicon nav-icon"></span>
<span class="fa fa-question-circle nav-icon"></span>
</a>
</li>

8
plinth/modules/help/help.py
View File

@ -35,15 +35,15 @@ from plinth.menu import main_menu
def init():
"""Initialize the Help module"""
menu = main_menu.add_urlname(
ugettext_lazy('Documentation'), 'glyphicon-book', 'help:index')
ugettext_lazy('Documentation'), 'fa-book', 'help:index')
menu.add_urlname(
ugettext_lazy('Manual'), 'glyphicon-info-sign', 'help:manual',
ugettext_lazy('Manual'), 'fa-info-circle', 'help:manual',
order=10)
menu.add_urlname(
ugettext_lazy('Download Manual'), 'glyphicon-download-alt',
ugettext_lazy('Download Manual'), 'fa-download',
'help:download-manual', order=15)
menu.add_urlname(
ugettext_lazy('About'), 'glyphicon-star', 'help:about', order=100)
ugettext_lazy('About'), 'fa-star', 'help:about', order=100)
def index(request):

2
plinth/modules/help/templates/statuslog.html
View File

@ -34,7 +34,7 @@
</p>
<p class="alert alert-warning">
<span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span>
<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
<span class="sr-only">{% trans "Caution:" %}</span>
{% blocktrans trimmed %}
Please remove any passwords or other personal information from

2
plinth/modules/ikiwiki/templates/ikiwiki_manage.html
View File

@ -53,7 +53,7 @@
class="btn btn-default btn-sm pull-right"
role="button"
title="{% blocktrans %}Delete site {{ site }}{% endblocktrans %}">
<span class="glyphicon glyphicon-trash"
<span class="fa fa-trash"
aria-hidden="true"></span>
</a>

2
plinth/modules/letsencrypt/__init__.py
View File

@ -71,7 +71,7 @@ logger = logging.getLogger(__name__)
def init():
"""Intialize the module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-lock', 'letsencrypt:index',
menu.add_urlname(name, 'fa-lock', 'letsencrypt:index',
short_description)
domainname_change.connect(on_domainname_change)
domain_added.connect(on_domain_added)

2
plinth/modules/monkeysphere/__init__.py
View File

@ -58,7 +58,7 @@ def init():
"""Initialize the monkeysphere module."""
menu = main_menu.get('system')
menu.add_urlname(
_('Monkeysphere'), 'glyphicon-certificate', 'monkeysphere:index')
_('Monkeysphere'), 'fa-certificate', 'monkeysphere:index')
def setup(helper, old_version=None):

6
plinth/modules/monkeysphere/templates/monkeysphere.html
View File

@ -96,7 +96,7 @@
{% if domain not in key.imported_domains %}
<li>
<span class="label label-default"
><span class="glyphicon glyphicon-remove"
><span class="fa fa-times"
aria-hidden="true"></span></span>
<span class="monkeysphere-importable-domain"
>{{ domain }}</span>
@ -104,7 +104,7 @@
{% elif domain not in key.available_domains %}
<li>
<span class="label label-warning"
><span class="glyphicon glyphicon-warning-sign"
><span class="fa fa-exclamation-triangle"
aria-hidden="true"></span></span>
<span class="monkeysphere-unavailable-domain"
>{{ domain }}</span>
@ -112,7 +112,7 @@
{% else %}
<li>
<span class="label label-success"
><span class="glyphicon glyphicon-ok"
><span class="fa fa-check"
aria-hidden="true"></span></span>
<span class="monkeysphere-imported-domain"
>{{ domain }}</span>

2
plinth/modules/names/__init__.py
View File

@ -50,7 +50,7 @@ manual_page = 'NameServices'
def init():
"""Initialize the names module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-tag', 'names:index')
menu.add_urlname(name, 'fa-tags', 'names:index')
domain_added.connect(on_domain_added)
domain_removed.connect(on_domain_removed)

2
plinth/modules/networks/__init__.py
View File

@ -42,7 +42,7 @@ manual_page = 'Networks'
def init():
"""Initialize the Networks module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-signal', 'networks:index')
menu.add_urlname(name, 'fa-signal', 'networks:index')
def setup(helper, old_version=None):

6
plinth/modules/networks/templates/connection_show.html
View File

@ -276,7 +276,7 @@
</div>
<div class="alert alert-info">
<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
<span class="fa fa-info-circle" aria-hidden="true"></span>
{% blocktrans trimmed %}
This interface should be connected to a local
network/machine. If you connect this interface to a
@ -296,7 +296,7 @@
</div>
<div class="alert alert-info">
<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
<span class="fa fa-info-circle" aria-hidden="true"></span>
{% blocktrans trimmed %}
This interface should receive your Internet connection.
If you connect it to a local network/machine, many
@ -315,7 +315,7 @@
</div>
<div class="alert alert-danger">
<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
<span class="fa fa-exclamation-circle" aria-hidden="true"></span>
{% blocktrans trimmed %}
This interface is not maintained by {{ box_name }}. Its
security status is unknown to {{ box_name }}. Many {{ box_name }}

2
plinth/modules/networks/templates/connections_list.html
View File

@ -63,7 +63,7 @@
class="btn btn-default btn-sm pull-right"
role="button"
title="{% blocktrans with name=connection.name %}Delete connection {{ name }}{% endblocktrans %}">
<span class="glyphicon glyphicon-trash"
<span class="fa fa-trash-o"
aria-hidden="true"></span>
</a>

2
plinth/modules/pagekite/__init__.py
View File

@ -80,7 +80,7 @@ manual_page = 'PageKite'
def init():
"""Intialize the PageKite module"""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-flag', 'pagekite:index',
menu.add_urlname(name, 'fa-flag', 'pagekite:index',
short_description)
# Register kite name with Name Services module.

2
plinth/modules/pagekite/templates/pagekite_custom_services.html
View File

@ -99,7 +99,7 @@
</div>
<button type="submit" class="btn btn-default"
title="{% trans "Delete this service" %}">
<span class="glyphicon glyphicon-trash" aria-hidden="true">
<span class="fa fa-trash-o" aria-hidden="true">
</span>
</button>
</form>

2
plinth/modules/restore/__init__.py
View File

@ -60,7 +60,7 @@ service = None
def init():
"""Initialize the reStore module."""
menu = main_menu.get('apps')
menu.add_urlname(name, 'glyphicon-hdd', 'restore:index', short_description)
menu.add_urlname(name, 'fa-hdd-o', 'restore:index', short_description)
global service
setup_helper = globals()['setup_helper']

2
plinth/modules/security/__init__.py
View File

@ -46,7 +46,7 @@ ACCESS_CONF_SNIPPETS = [OLD_ACCESS_CONF_SNIPPET, ACCESS_CONF_SNIPPET]
def init():
"""Initialize the module"""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-lock', 'security:index')
menu.add_urlname(name, 'fa-lock', 'security:index')
def setup(helper, old_version=None):

2
plinth/modules/shaarli/__init__.py
View File

@ -52,7 +52,7 @@ manual_page = 'Shaarli'
def init():
"""Initialize the module."""
menu = main_menu.get('apps')
menu.add_urlname(name, 'glyphicon-bookmark', 'shaarli:index',
menu.add_urlname(name, 'fa-bookmark', 'shaarli:index',
short_description)
global service

4
plinth/modules/sharing/templates/sharing.html
View File

@ -76,12 +76,12 @@
<td class="share-operations">
<a class="share-edit btn btn-sm btn-default"
href="{% url 'sharing:edit' share.name %}">
<span class="glyphicon glyphicon-edit" aria-hidden="true"></span>
<span class="fa fa-pencil-square-o" aria-hidden="true"></span>
</a>
<form class="form form-inline" method="post"
action="{% url 'sharing:remove' share.name %}">
{% csrf_token %}
<button class="share-remove btn btn-sm btn-default glyphicon glyphicon-trash"
<button class="share-remove btn btn-sm btn-default fa fa-trash"
type="submit"></button>
</form>
</td>

2
plinth/modules/snapshot/__init__.py
View File

@ -61,7 +61,7 @@ fs_types_supported = ['btrfs']
def init():
"""Initialize the module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-film', 'snapshot:index')
menu.add_urlname(name, 'fa-film', 'snapshot:index')
def is_supported():

2
plinth/modules/snapshot/templates/snapshot_manage.html
View File

@ -65,7 +65,7 @@
title="{% blocktrans trimmed with number=snapshot.number %}
Rollback to snapshot #{{ number }}
{% endblocktrans %}">
<span class="glyphicon glyphicon-repeat"
<span class="fa fa-repeat"
aria-hidden="true"></span>
</a>
</td>

2
plinth/modules/ssh/__init__.py
View File

@ -50,7 +50,7 @@ service = None
def init():
"""Intialize the ssh module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-console', 'ssh:index')
menu.add_urlname(name, 'fa-terminal', 'ssh:index')
global service
service = service_module.Service(

2
plinth/modules/storage/__init__.py
View File

@ -60,7 +60,7 @@ is_essential = True
def init():
"""Intialize the module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-hdd', 'storage:index')
menu.add_urlname(name, 'fa-hdd-o', 'storage:index')
def get_disks():

2
plinth/modules/storage/templates/storage.html
View File

@ -94,7 +94,7 @@
{% csrf_token %}
<button type="submit"
class="btn btn-sm btn-default glyphicon glyphicon-eject">
class="btn btn-sm btn-default fa fa-eject">
</button>
</form>
{% endif %}

2
plinth/modules/upgrades/__init__.py
View File

@ -46,7 +46,7 @@ manual_page = 'Upgrades'
def init():
"""Initialize the module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-refresh', 'upgrades:index')
menu.add_urlname(name, 'fa-refresh', 'upgrades:index')
global service
service = service_module.Service('auto-upgrades', name, is_external=False,
is_enabled=is_enabled, enable=enable,

2
plinth/modules/users/__init__.py
View File

@ -51,7 +51,7 @@ groups = dict()
def init():
"""Intialize the user module."""
menu = main_menu.get('system')
menu.add_urlname(name, 'glyphicon-user', 'users:index')
menu.add_urlname(name, 'fa-users', 'users:index')
def setup(helper, old_version=None):

4
plinth/modules/users/templates/users_list.html
View File

@ -45,7 +45,7 @@
class="btn btn-default btn-sm pull-right"
role="button"
title="{% blocktrans with username=user.username %}Delete user {{ username }}{% endblocktrans %}">
<span class="glyphicon glyphicon-trash"
<span class="fa fa-trash-o"
aria-hidden="true"></span>
</a>
{% endif %}
@ -57,7 +57,7 @@
</a>
{% if not user.is_active %}
<span class="glyphicon glyphicon-ban-circle"
<span class="fa fa-ban"
aria-hidden="true"></span>
{% endif %}
</div>

18
plinth/templates/base.html
View File

@ -69,6 +69,7 @@
<!-- Bootstrap base CSS -->
<link rel="stylesheet" href="{% static '/javascript/bootstrap/css/bootstrap.min.css' %}"/>
<link rel="stylesheet" href="{% static '/javascript/fork-awesome/css/fork-awesome.css' %}"/>
<link rel="stylesheet" href="{% static 'theme/css/plinth.css' %}"/>
<link rel="stylesheet" href="{% static 'theme/css/responsive.css' %}"/>
<!-- Local link to system Turbolinks JS -->
@ -100,8 +101,7 @@
{% block mainmenu_left %}
<a href="{% url 'index' %}" class="navbar-brand"
title="{{ box_name }}">
<img src="{% static 'theme/img/FreedomBox-logo-32px-white.png' %}"
alt="{{ box_name }}" />
<i class="fa fa-freedombox fa-2x fa-inverse" aria-hidden="true"></i>
</a>
{% endblock %}
</div>
@ -121,7 +121,7 @@
<a href="{{ apps_url }}" title='{% trans " Apps" %}'
class="{% if apps_url == submenu.url %}
menu_link_active {% else %} menu_link {% endif %}">
<span class="glyphicon glyphicon-th"></span>
<span class="fa fa-th"></span>
{% trans "Apps" %}
</a>
</li>
@ -130,7 +130,7 @@
<a href="{{ system_url }}" title='{% trans " System" %}'
class="{% if system_url == submenu.url %}
menu_link_active {% else %} menu_link {% endif %}">
<span class="glyphicon glyphicon-cog nav-icon"></span>
<span class="fa fa-cog nav-icon"></span>
{% trans "System" %}
</a>
</li>
@ -142,14 +142,14 @@
{% if user.is_authenticated %}
<li>
<a href="{% url 'help:index' %}" title="{% trans "Help" %}">
<span class="glyphicon-question-sign glyphicon nav-icon"></span>
<span class="fa fa-question-circle nav-icon"></span>
</a>
</li>
<li class="dropdown">
<a href="{% url 'users:edit' request.user.username %}"
class="dropdown-toggle" data-toggle="dropdown"
role="button" aria-expanded="false">
<i class="glyphicon glyphicon-user nav-icon"></i>
<i class="fa fa-user nav-icon"></i>
{{ request.user.username }}
<span class="caret"></span>
</a>
@ -194,12 +194,12 @@
<li>
<a href="{% url 'language-selection' %}?next={{ request.path|iriencode }}"
title="{% trans "Select language" %}">
<i class="glyphicon glyphicon-globe nav-icon"></i>
<i class="fa fa-globe-w nav-icon"></i>
</a>
</li>
<li>
<a href="{% url 'users:login' %}" title="{% trans "Log in" %}">
<i class="glyphicon glyphicon-user nav-icon"></i>
<i class="fa fa-user nav-icon"></i>
{% trans "Log in" %}</a>
</li>
{% endif %}
@ -207,7 +207,7 @@
{% if user.is_authenticated %}
<li id="logout-nojs">
<a href="{% url 'users:logout' %}" title="{% trans "Log out" %}">
<i class="glyphicon glyphicon-remove-circle nav-icon"></i>
<i class="fa fa-times-circle nav-icon"></i>
{% trans "Log out" %}</a>
</li>
{% endif %}

4
plinth/templates/cards.html
View File

@ -39,8 +39,8 @@
<a href="{{ item.url }}" class="nav-link">
<div class="card-title">{{ item.name }}</div>
<div class="card-icon">
{% if 'glyphicon-' in item.icon %}
<span class="{{ item.icon }} glyphicon"></span>
{% if 'fa-' in item.icon %}
<span class="fa {{ item.icon }} fa-3x"></span>
{% else %}
<img src="{% static 'theme/icons/' %}{{ item.icon }}.png"/>
{% endif %}

4
plinth/templates/clients.html
View File

@ -26,7 +26,7 @@
<button id="clients-button" type="button" class="btn btn-default collapsed"
data-toggle="collapse" data-target="#clients">
{% trans "Client Apps" %}
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
<span class="fa fa-chevron-right" aria-hidden="true"></span>
</button>
</p>
@ -48,7 +48,7 @@
{% else %} href="{{ platform.url }}"
{% endif %}>
{% trans "Launch" %}
<span class="glyphicon glyphicon-new-window"></span>
<span class="fa fa-external-link"></span>
</a>
</td>
{% endif %}

2
plinth/templates/menu.html
View File

@ -29,7 +29,7 @@
<li>
<a href="{{ item.url }}">
{% endif %}
<span class="{{ item.icon }} glyphicon"></span>
<span class="fa {{ item.icon }}"></span>
{{ item.label }}
</a>
{% if item.items %}

2
plinth/templates/setup.html
View File

@ -86,7 +86,7 @@
This application is currently not available in your distribution.
{% endblocktrans %}
<button type="submit" class="btn btn-default btn-sm" name="refresh-packages">
<span class="glyphicon glyphicon-refresh"></span> Check again
<span class="fa fa-refresh"></span> Check again
</button>
</div>
{% endif %}

2
plinth/templates/submenu.html
View File

@ -29,7 +29,7 @@
<li>
<a href="{{ item.url }}">
{% endif %}
<span class="{{ item.icon }} glyphicon"></span>
<span class="fa {{ item.icon }}"></span>
{{ item.label }}
</a>
</li>

4
plinth/tests/test_menu.py
View File

@ -73,12 +73,12 @@ class MenuTestCase(TestCase):
apps_menu = main_menu.get('apps')
self.assertEqual(apps_menu.label, '')
self.assertEqual(apps_menu.icon, 'glyphicon-download-alt')
self.assertEqual(apps_menu.icon, 'fa-download')
self.assertEqual(str(apps_menu.url), '/apps/')
system_menu = main_menu.get('system')
self.assertEqual(system_menu.label, '')
self.assertEqual(system_menu.icon, 'glyphicon-cog')
self.assertEqual(system_menu.icon, 'fa-cog')
self.assertEqual(str(system_menu.url), '/sys/')
def test_menu_creation_without_arguments(self):

20
static/themes/default/css/plinth.css
View File

@ -67,14 +67,14 @@ body {
list-style-type: none;
}
.nav .glyphicon,
.sidebar .glyphicon {
.nav .fa,
.sidebar .fa {
margin-right: 4px;
}
.navbar-brand img {
.navbar-brand .fa {
float: left;
margin-top: -10px;
margin-top: -15px;
padding: 8px;
}
@ -220,17 +220,17 @@ footer license-info p {
}
/* Icon when collapsible content is shown */
#clients-button .glyphicon {
#clients-button .fa {
margin-left: 5px;
}
#clients-button .glyphicon:before,
.no-js #clients-button.collapsed .glyphicon:before {
content: "\e114";
#clients-button .fa:before,
.no-js #clients-button.collapsed .fa:before {
content: "\f054";
}
#clients-button.collapsed .glyphicon:before {
content: "\e080";
#clients-button.collapsed .fa:before {
content: "\f078";
}
/* No-JS fallbacks for collapsible content in clients.html */