From 5d68f6bf52ceb834177d08bf008c5dd005521fab Mon Sep 17 00:00:00 2001 From: Prachi Srivastava Date: Mon, 14 Jan 2019 14:35:34 +0530 Subject: [PATCH] Replace glyphicons with forkawesome icons Reviewed-by: Sunil Mohan Adapa --- debian/control | 1 + plinth/menu.py | 4 ++-- plinth/modules/avahi/__init__.py | 2 +- plinth/modules/backups/__init__.py | 2 +- .../backups/templates/backups_repository.inc | 10 +++++----- plinth/modules/bind/__init__.py | 2 +- plinth/modules/cockpit/__init__.py | 2 +- plinth/modules/config/__init__.py | 2 +- plinth/modules/datetime/__init__.py | 2 +- plinth/modules/diagnostics/__init__.py | 2 +- .../diagnostics/templates/diagnostics.html | 2 +- plinth/modules/diaspora/__init__.py | 2 +- plinth/modules/dynamicdns/__init__.py | 2 +- plinth/modules/firewall/__init__.py | 2 +- .../templates/firstboot_navbar.html | 2 +- plinth/modules/help/help.py | 8 ++++---- plinth/modules/help/templates/statuslog.html | 2 +- .../ikiwiki/templates/ikiwiki_manage.html | 2 +- plinth/modules/letsencrypt/__init__.py | 2 +- plinth/modules/monkeysphere/__init__.py | 2 +- .../monkeysphere/templates/monkeysphere.html | 6 +++--- plinth/modules/names/__init__.py | 2 +- plinth/modules/networks/__init__.py | 2 +- .../networks/templates/connection_show.html | 6 +++--- .../networks/templates/connections_list.html | 2 +- plinth/modules/pagekite/__init__.py | 2 +- .../templates/pagekite_custom_services.html | 2 +- plinth/modules/restore/__init__.py | 2 +- plinth/modules/security/__init__.py | 2 +- plinth/modules/shaarli/__init__.py | 2 +- plinth/modules/sharing/templates/sharing.html | 4 ++-- plinth/modules/snapshot/__init__.py | 2 +- .../snapshot/templates/snapshot_manage.html | 2 +- plinth/modules/ssh/__init__.py | 2 +- plinth/modules/storage/__init__.py | 2 +- plinth/modules/storage/templates/storage.html | 2 +- plinth/modules/upgrades/__init__.py | 2 +- plinth/modules/users/__init__.py | 2 +- .../modules/users/templates/users_list.html | 4 ++-- plinth/templates/base.html | 18 ++++++++--------- plinth/templates/cards.html | 4 ++-- plinth/templates/clients.html | 4 ++-- plinth/templates/menu.html | 2 +- plinth/templates/setup.html | 2 +- plinth/templates/submenu.html | 2 +- plinth/tests/test_menu.py | 4 ++-- static/themes/default/css/plinth.css | 20 +++++++++---------- 47 files changed, 81 insertions(+), 80 deletions(-) diff --git a/debian/control b/debian/control index 917026448..671cc803c 100644 --- a/debian/control +++ b/debian/control @@ -63,6 +63,7 @@ Depends: debconf, dnsutils, e2fsprogs, + fonts-fork-awesome, fonts-lato, gettext, gir1.2-glib-2.0, diff --git a/plinth/menu.py b/plinth/menu.py index 10fb6c385..b2576d26a 100644 --- a/plinth/menu.py +++ b/plinth/menu.py @@ -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') diff --git a/plinth/modules/avahi/__init__.py b/plinth/modules/avahi/__init__.py index 58ed13f01..b7cfeff15 100644 --- a/plinth/modules/avahi/__init__.py +++ b/plinth/modules/avahi/__init__.py @@ -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'], diff --git a/plinth/modules/backups/__init__.py b/plinth/modules/backups/__init__.py index f0842ade4..6f856c253 100644 --- a/plinth/modules/backups/__init__.py +++ b/plinth/modules/backups/__init__.py @@ -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): diff --git a/plinth/modules/backups/templates/backups_repository.inc b/plinth/modules/backups/templates/backups_repository.inc index db5108256..91942e0cc 100644 --- a/plinth/modules/backups/templates/backups_repository.inc +++ b/plinth/modules/backups/templates/backups_repository.inc @@ -26,7 +26,7 @@ {% if repository.error %} - {% endif %} @@ -45,7 +45,7 @@ {% csrf_token %} @@ -56,7 +56,7 @@ {% csrf_token %} @@ -65,7 +65,7 @@ - {% endif %} @@ -91,7 +91,7 @@ - diff --git a/plinth/modules/bind/__init__.py b/plinth/modules/bind/__init__.py index df0c1a2a3..77d162dd3 100644 --- a/plinth/modules/bind/__init__.py +++ b/plinth/modules/bind/__init__.py @@ -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'] diff --git a/plinth/modules/cockpit/__init__.py b/plinth/modules/cockpit/__init__.py index 132d18813..0ec833c06 100644 --- a/plinth/modules/cockpit/__init__.py +++ b/plinth/modules/cockpit/__init__.py @@ -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 diff --git a/plinth/modules/config/__init__.py b/plinth/modules/config/__init__.py index 434cca198..d525a337c 100644 --- a/plinth/modules/config/__init__.py +++ b/plinth/modules/config/__init__.py @@ -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() diff --git a/plinth/modules/datetime/__init__.py b/plinth/modules/datetime/__init__.py index 6d1157036..50d51b661 100644 --- a/plinth/modules/datetime/__init__.py +++ b/plinth/modules/datetime/__init__.py @@ -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'] diff --git a/plinth/modules/diagnostics/__init__.py b/plinth/modules/diagnostics/__init__.py index 485562ee9..a0d6b8c9f 100644 --- a/plinth/modules/diagnostics/__init__.py +++ b/plinth/modules/diagnostics/__init__.py @@ -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(): diff --git a/plinth/modules/diagnostics/templates/diagnostics.html b/plinth/modules/diagnostics/templates/diagnostics.html index f8f45f94a..767129e82 100644 --- a/plinth/modules/diagnostics/templates/diagnostics.html +++ b/plinth/modules/diagnostics/templates/diagnostics.html @@ -69,7 +69,7 @@ {% if module_results %} {% include "diagnostics_results.html" with results=module_results %} {% else %} -

+

{% endif %} {% endfor %} {% endif %} diff --git a/plinth/modules/diaspora/__init__.py b/plinth/modules/diaspora/__init__.py index 9e664458d..4dde6f73e 100644 --- a/plinth/modules/diaspora/__init__.py +++ b/plinth/modules/diaspora/__init__.py @@ -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 diff --git a/plinth/modules/dynamicdns/__init__.py b/plinth/modules/dynamicdns/__init__.py index 60b8c232a..7a41f5c2d 100644 --- a/plinth/modules/dynamicdns/__init__.py +++ b/plinth/modules/dynamicdns/__init__.py @@ -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( diff --git a/plinth/modules/firewall/__init__.py b/plinth/modules/firewall/__init__.py index 80d213cbc..763528641 100644 --- a/plinth/modules/firewall/__init__.py +++ b/plinth/modules/firewall/__init__.py @@ -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) diff --git a/plinth/modules/first_boot/templates/firstboot_navbar.html b/plinth/modules/first_boot/templates/firstboot_navbar.html index 860c38478..5bd1a562a 100644 --- a/plinth/modules/first_boot/templates/firstboot_navbar.html +++ b/plinth/modules/first_boot/templates/firstboot_navbar.html @@ -21,6 +21,6 @@
  • - +
    • diff --git a/plinth/modules/help/help.py b/plinth/modules/help/help.py index a93ee66a5..c9f70ac94 100644 --- a/plinth/modules/help/help.py +++ b/plinth/modules/help/help.py @@ -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): diff --git a/plinth/modules/help/templates/statuslog.html b/plinth/modules/help/templates/statuslog.html index 835b280c2..48c88afff 100644 --- a/plinth/modules/help/templates/statuslog.html +++ b/plinth/modules/help/templates/statuslog.html @@ -34,7 +34,7 @@

    - + {% trans "Caution:" %} {% blocktrans trimmed %} Please remove any passwords or other personal information from diff --git a/plinth/modules/ikiwiki/templates/ikiwiki_manage.html b/plinth/modules/ikiwiki/templates/ikiwiki_manage.html index 1e507a742..8053cd922 100644 --- a/plinth/modules/ikiwiki/templates/ikiwiki_manage.html +++ b/plinth/modules/ikiwiki/templates/ikiwiki_manage.html @@ -53,7 +53,7 @@ class="btn btn-default btn-sm pull-right" role="button" title="{% blocktrans %}Delete site {{ site }}{% endblocktrans %}"> - diff --git a/plinth/modules/letsencrypt/__init__.py b/plinth/modules/letsencrypt/__init__.py index b42b94eca..30da59a34 100644 --- a/plinth/modules/letsencrypt/__init__.py +++ b/plinth/modules/letsencrypt/__init__.py @@ -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) diff --git a/plinth/modules/monkeysphere/__init__.py b/plinth/modules/monkeysphere/__init__.py index f88b3d476..22e579943 100644 --- a/plinth/modules/monkeysphere/__init__.py +++ b/plinth/modules/monkeysphere/__init__.py @@ -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): diff --git a/plinth/modules/monkeysphere/templates/monkeysphere.html b/plinth/modules/monkeysphere/templates/monkeysphere.html index 2a9aa2378..3e8ea1700 100644 --- a/plinth/modules/monkeysphere/templates/monkeysphere.html +++ b/plinth/modules/monkeysphere/templates/monkeysphere.html @@ -96,7 +96,7 @@ {% if domain not in key.imported_domains %}

  • {{ domain }} @@ -104,7 +104,7 @@ {% elif domain not in key.available_domains %}
  • {{ domain }} @@ -112,7 +112,7 @@ {% else %}
  • {{ domain }} diff --git a/plinth/modules/names/__init__.py b/plinth/modules/names/__init__.py index 8fbd8a1e5..5e335ae00 100644 --- a/plinth/modules/names/__init__.py +++ b/plinth/modules/names/__init__.py @@ -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) diff --git a/plinth/modules/networks/__init__.py b/plinth/modules/networks/__init__.py index 494721329..555cb9a13 100644 --- a/plinth/modules/networks/__init__.py +++ b/plinth/modules/networks/__init__.py @@ -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): diff --git a/plinth/modules/networks/templates/connection_show.html b/plinth/modules/networks/templates/connection_show.html index bcf2faf7e..555eaea81 100644 --- a/plinth/modules/networks/templates/connection_show.html +++ b/plinth/modules/networks/templates/connection_show.html @@ -276,7 +276,7 @@
    - + {% blocktrans trimmed %} This interface should be connected to a local network/machine. If you connect this interface to a @@ -296,7 +296,7 @@
    - + {% blocktrans trimmed %} This interface should receive your Internet connection. If you connect it to a local network/machine, many @@ -315,7 +315,7 @@
    - + {% blocktrans trimmed %} This interface is not maintained by {{ box_name }}. Its security status is unknown to {{ box_name }}. Many {{ box_name }} diff --git a/plinth/modules/networks/templates/connections_list.html b/plinth/modules/networks/templates/connections_list.html index 22ca70c3c..dec9377f9 100644 --- a/plinth/modules/networks/templates/connections_list.html +++ b/plinth/modules/networks/templates/connections_list.html @@ -63,7 +63,7 @@ class="btn btn-default btn-sm pull-right" role="button" title="{% blocktrans with name=connection.name %}Delete connection {{ name }}{% endblocktrans %}"> - diff --git a/plinth/modules/pagekite/__init__.py b/plinth/modules/pagekite/__init__.py index 4d1d8c2bb..bc92942f5 100644 --- a/plinth/modules/pagekite/__init__.py +++ b/plinth/modules/pagekite/__init__.py @@ -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. diff --git a/plinth/modules/pagekite/templates/pagekite_custom_services.html b/plinth/modules/pagekite/templates/pagekite_custom_services.html index 0b836a335..6f29a8511 100644 --- a/plinth/modules/pagekite/templates/pagekite_custom_services.html +++ b/plinth/modules/pagekite/templates/pagekite_custom_services.html @@ -99,7 +99,7 @@
    diff --git a/plinth/modules/restore/__init__.py b/plinth/modules/restore/__init__.py index 37bb85fc7..70f1f2540 100644 --- a/plinth/modules/restore/__init__.py +++ b/plinth/modules/restore/__init__.py @@ -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'] diff --git a/plinth/modules/security/__init__.py b/plinth/modules/security/__init__.py index e5f9a4214..f11e6c338 100644 --- a/plinth/modules/security/__init__.py +++ b/plinth/modules/security/__init__.py @@ -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): diff --git a/plinth/modules/shaarli/__init__.py b/plinth/modules/shaarli/__init__.py index 63d9e5734..d258af0f3 100644 --- a/plinth/modules/shaarli/__init__.py +++ b/plinth/modules/shaarli/__init__.py @@ -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 diff --git a/plinth/modules/sharing/templates/sharing.html b/plinth/modules/sharing/templates/sharing.html index c7f5959a4..8133e5b7c 100644 --- a/plinth/modules/sharing/templates/sharing.html +++ b/plinth/modules/sharing/templates/sharing.html @@ -76,12 +76,12 @@
    {% csrf_token %} -
    diff --git a/plinth/modules/snapshot/__init__.py b/plinth/modules/snapshot/__init__.py index f9de65643..324b25e15 100644 --- a/plinth/modules/snapshot/__init__.py +++ b/plinth/modules/snapshot/__init__.py @@ -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(): diff --git a/plinth/modules/snapshot/templates/snapshot_manage.html b/plinth/modules/snapshot/templates/snapshot_manage.html index 8f8ba75e6..a3c594dfd 100644 --- a/plinth/modules/snapshot/templates/snapshot_manage.html +++ b/plinth/modules/snapshot/templates/snapshot_manage.html @@ -65,7 +65,7 @@ title="{% blocktrans trimmed with number=snapshot.number %} Rollback to snapshot #{{ number }} {% endblocktrans %}"> - diff --git a/plinth/modules/ssh/__init__.py b/plinth/modules/ssh/__init__.py index 0ad72c68b..3ad494107 100644 --- a/plinth/modules/ssh/__init__.py +++ b/plinth/modules/ssh/__init__.py @@ -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( diff --git a/plinth/modules/storage/__init__.py b/plinth/modules/storage/__init__.py index 99c88de71..9bf86f1c0 100644 --- a/plinth/modules/storage/__init__.py +++ b/plinth/modules/storage/__init__.py @@ -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(): diff --git a/plinth/modules/storage/templates/storage.html b/plinth/modules/storage/templates/storage.html index 3f37fd81c..1f7e02485 100644 --- a/plinth/modules/storage/templates/storage.html +++ b/plinth/modules/storage/templates/storage.html @@ -94,7 +94,7 @@ {% csrf_token %} {% endif %} diff --git a/plinth/modules/upgrades/__init__.py b/plinth/modules/upgrades/__init__.py index 0c6555a06..d9e9607ec 100644 --- a/plinth/modules/upgrades/__init__.py +++ b/plinth/modules/upgrades/__init__.py @@ -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, diff --git a/plinth/modules/users/__init__.py b/plinth/modules/users/__init__.py index d135bcb63..05a4d8bab 100644 --- a/plinth/modules/users/__init__.py +++ b/plinth/modules/users/__init__.py @@ -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): diff --git a/plinth/modules/users/templates/users_list.html b/plinth/modules/users/templates/users_list.html index 94a264121..9b026e758 100644 --- a/plinth/modules/users/templates/users_list.html +++ b/plinth/modules/users/templates/users_list.html @@ -45,7 +45,7 @@ class="btn btn-default btn-sm pull-right" role="button" title="{% blocktrans with username=user.username %}Delete user {{ username }}{% endblocktrans %}"> - {% endif %} @@ -57,7 +57,7 @@ {% if not user.is_active %} - {% endif %} diff --git a/plinth/templates/base.html b/plinth/templates/base.html index 241bd9621..59c11f4ef 100644 --- a/plinth/templates/base.html +++ b/plinth/templates/base.html @@ -69,6 +69,7 @@ + @@ -100,8 +101,7 @@ {% block mainmenu_left %} - {{ box_name }} + {% endblock %} @@ -121,7 +121,7 @@ - + {% trans "Apps" %}
    • @@ -130,7 +130,7 @@ - + {% trans "System" %} @@ -142,14 +142,14 @@ {% if user.is_authenticated %}
  • - +
  • @@ -194,12 +194,12 @@
  • - +
  • - + {% trans "Log in" %}
    • {% endif %} @@ -207,7 +207,7 @@ {% if user.is_authenticated %}
  • - + {% trans "Log out" %}
    • {% endif %} diff --git a/plinth/templates/cards.html b/plinth/templates/cards.html index ada6a43f1..38c9ae155 100644 --- a/plinth/templates/cards.html +++ b/plinth/templates/cards.html @@ -39,8 +39,8 @@
    {{ item.name }}
    - {% if 'glyphicon-' in item.icon %} - + {% if 'fa-' in item.icon %} + {% else %} {% endif %} diff --git a/plinth/templates/clients.html b/plinth/templates/clients.html index d2da15e2a..98296fb84 100644 --- a/plinth/templates/clients.html +++ b/plinth/templates/clients.html @@ -26,7 +26,7 @@

    @@ -48,7 +48,7 @@ {% else %} href="{{ platform.url }}" {% endif %}> {% trans "Launch" %} - +     {% endif %} diff --git a/plinth/templates/menu.html b/plinth/templates/menu.html index 7c5e97d07..4b7e9cb00 100644 --- a/plinth/templates/menu.html +++ b/plinth/templates/menu.html @@ -29,7 +29,7 @@
  • {% endif %} - + {{ item.label }} {% if item.items %} diff --git a/plinth/templates/setup.html b/plinth/templates/setup.html index 2f18e06be..df6b6df5c 100644 --- a/plinth/templates/setup.html +++ b/plinth/templates/setup.html @@ -86,7 +86,7 @@ This application is currently not available in your distribution. {% endblocktrans %}
    • {% endif %} diff --git a/plinth/templates/submenu.html b/plinth/templates/submenu.html index aefda29c5..bbbf62158 100644 --- a/plinth/templates/submenu.html +++ b/plinth/templates/submenu.html @@ -29,7 +29,7 @@
  • {% endif %} - + {{ item.label }}
    • diff --git a/plinth/tests/test_menu.py b/plinth/tests/test_menu.py index 7fb1a0dc6..39e9cd0a7 100644 --- a/plinth/tests/test_menu.py +++ b/plinth/tests/test_menu.py @@ -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): diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css index 5c70e98ad..95f40c36c 100644 --- a/static/themes/default/css/plinth.css +++ b/static/themes/default/css/plinth.css @@ -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 */