diff --git a/plinth/frontpage.py b/plinth/frontpage.py index a1c361bd8..0bdb0a6c8 100644 --- a/plinth/frontpage.py +++ b/plinth/frontpage.py @@ -27,15 +27,15 @@ def get_shortcuts(): return sorted(shortcuts.values(), key=lambda item: item['label']) -def add_shortcut(id, label, url, icon, details=None, configure_url=None, - login_required=False, icon_url=None): +def add_shortcut(id, label, url, details=None, configure_url=None, + login_required=False, icon=None): """Add shortcut to front page.""" if not url: url = '?selected={id}'.format(id=id) - if not icon_url: - icon_url = id + if not icon: + icon = id shortcuts[id] = { 'id': id, @@ -45,7 +45,6 @@ def add_shortcut(id, label, url, icon, details=None, configure_url=None, 'login_required': login_required, 'details': details, 'configure_url': configure_url, - 'icon_url': icon_url, } diff --git a/plinth/modules/deluge/__init__.py b/plinth/modules/deluge/__init__.py index a0b9c2211..24a59ab32 100644 --- a/plinth/modules/deluge/__init__.py +++ b/plinth/modules/deluge/__init__.py @@ -82,7 +82,7 @@ def setup(helper, old_version=None): def add_shortcut(): - frontpage.add_shortcut('deluge', title, '/deluge', 'glyphicon-magnet', + frontpage.add_shortcut('deluge', title, '/deluge', login_required=True) diff --git a/plinth/modules/ikiwiki/__init__.py b/plinth/modules/ikiwiki/__init__.py index 085f4155c..65c82dfc1 100644 --- a/plinth/modules/ikiwiki/__init__.py +++ b/plinth/modules/ikiwiki/__init__.py @@ -83,8 +83,8 @@ def add_shortcuts(): sites = [name for name in sites if name != ''] for site in sites: frontpage.add_shortcut( - 'ikiwiki_' + site, site, '/ikiwiki/' + site, 'glyphicon-edit', - login_required=False, icon_url='ikiwiki') + 'ikiwiki_' + site, site, '/ikiwiki/' + site, + login_required=False, icon='ikiwiki') def is_enabled(): diff --git a/plinth/modules/minetest/__init__.py b/plinth/modules/minetest/__init__.py index acf19cdee..759418360 100644 --- a/plinth/modules/minetest/__init__.py +++ b/plinth/modules/minetest/__init__.py @@ -89,7 +89,7 @@ def setup(helper, old_version=None): def add_shortcut(): - frontpage.add_shortcut('minetest', title, None, 'glyphicon-th-large', + frontpage.add_shortcut('minetest', title, None, description, reverse_lazy('minetest:index'), login_required=False) diff --git a/plinth/modules/mumble/__init__.py b/plinth/modules/mumble/__init__.py index 52d140f63..56754697a 100644 --- a/plinth/modules/mumble/__init__.py +++ b/plinth/modules/mumble/__init__.py @@ -89,7 +89,7 @@ def setup(helper, old_version=None): def add_shortcut(): - frontpage.add_shortcut('mumble', title, None, 'glyphicon-headphones', + frontpage.add_shortcut('mumble', title, None, description, reverse_lazy('mumble:index'), login_required=False) diff --git a/plinth/modules/privoxy/__init__.py b/plinth/modules/privoxy/__init__.py index 3c17cdec5..6b7018517 100644 --- a/plinth/modules/privoxy/__init__.py +++ b/plinth/modules/privoxy/__init__.py @@ -94,7 +94,7 @@ def setup(helper, old_version=None): def add_shortcut(): - frontpage.add_shortcut('privoxy', title, None, 'glyphicon-cloud-upload', + frontpage.add_shortcut('privoxy', title, None, description, reverse_lazy('privoxy:index'), login_required=True) diff --git a/plinth/modules/quassel/__init__.py b/plinth/modules/quassel/__init__.py index 3d0744e99..be60ed287 100644 --- a/plinth/modules/quassel/__init__.py +++ b/plinth/modules/quassel/__init__.py @@ -95,7 +95,7 @@ def setup(helper, old_version=None): def add_shortcut(): - frontpage.add_shortcut('quassel', title, None, 'glyphicon-retweet', + frontpage.add_shortcut('quassel', title, None, description, reverse_lazy('quassel:index'), login_required=True) diff --git a/plinth/modules/radicale/__init__.py b/plinth/modules/radicale/__init__.py index 51ab3edec..56befa52e 100644 --- a/plinth/modules/radicale/__init__.py +++ b/plinth/modules/radicale/__init__.py @@ -87,7 +87,7 @@ def setup(helper, old_version=None): def add_shortcut(): - frontpage.add_shortcut('radicale', title, None, 'glyphicon-calendar', + frontpage.add_shortcut('radicale', title, None, description, reverse_lazy('radicale:index'), login_required=True) diff --git a/plinth/modules/repro/__init__.py b/plinth/modules/repro/__init__.py index c584c5fce..cd9d230c4 100644 --- a/plinth/modules/repro/__init__.py +++ b/plinth/modules/repro/__init__.py @@ -101,7 +101,7 @@ def setup(helper, old_version=None): def add_shortcut(): - frontpage.add_shortcut('repro', title, None, 'glyphicon-phone-alt', + frontpage.add_shortcut('repro', title, None, description, reverse_lazy('repro:index'), login_required=True) diff --git a/plinth/modules/roundcube/__init__.py b/plinth/modules/roundcube/__init__.py index 82af63eb5..0c70a6c47 100644 --- a/plinth/modules/roundcube/__init__.py +++ b/plinth/modules/roundcube/__init__.py @@ -92,7 +92,7 @@ def setup(helper, old_version=None): def add_shortcut(): frontpage.add_shortcut( - 'roundcube', title, '/roundcube', 'glyphicon-envelope', + 'roundcube', title, '/roundcube', login_required=True) diff --git a/plinth/modules/shaarli/__init__.py b/plinth/modules/shaarli/__init__.py index 8caec70b5..34ac01b24 100644 --- a/plinth/modules/shaarli/__init__.py +++ b/plinth/modules/shaarli/__init__.py @@ -77,7 +77,7 @@ def setup(helper, old_version=None): def add_shortcut(): - frontpage.add_shortcut('shaarli', title, '/shaarli', 'glyphicon-bookmark', + frontpage.add_shortcut('shaarli', title, '/shaarli', login_required=True) diff --git a/plinth/modules/transmission/__init__.py b/plinth/modules/transmission/__init__.py index 3eab52fea..9a25aecda 100644 --- a/plinth/modules/transmission/__init__.py +++ b/plinth/modules/transmission/__init__.py @@ -88,7 +88,7 @@ def setup(helper, old_version=None): def add_shortcut(): frontpage.add_shortcut( - 'transmission', title, '/transmission', 'glyphicon-save', + 'transmission', title, '/transmission', login_required=True) diff --git a/plinth/modules/ttrss/__init__.py b/plinth/modules/ttrss/__init__.py index b88a8844e..445e97039 100644 --- a/plinth/modules/ttrss/__init__.py +++ b/plinth/modules/ttrss/__init__.py @@ -83,7 +83,7 @@ def setup(helper, old_version=None): def add_shortcut(): - frontpage.add_shortcut('ttrss', title, '/tt-rss', 'glyphicon-envelope', + frontpage.add_shortcut('ttrss', title, '/tt-rss', login_required=True) diff --git a/plinth/modules/xmpp/__init__.py b/plinth/modules/xmpp/__init__.py index 875919671..72bb5805e 100644 --- a/plinth/modules/xmpp/__init__.py +++ b/plinth/modules/xmpp/__init__.py @@ -99,9 +99,9 @@ def setup(helper, old_version=None): def add_shortcut(): frontpage.add_shortcut('jsxc', _('Chat Client \n (jsxc)'), - reverse_lazy('xmpp:jsxc'), 'glyphicon-comment', + reverse_lazy('xmpp:jsxc'), None, login_required=True) - frontpage.add_shortcut('xmpp', title, None, 'glyphicon-comment', + frontpage.add_shortcut('xmpp', title, None, description, reverse_lazy('xmpp:index'), login_required=True) diff --git a/plinth/templates/index.html b/plinth/templates/index.html index efd5ee5c7..54124bfb3 100644 --- a/plinth/templates/index.html +++ b/plinth/templates/index.html @@ -38,7 +38,7 @@ {% endif %}
- +
{{ shortcut.label|linebreaks }}
diff --git a/plinth/views.py b/plinth/views.py index cfdeb4a86..46fe491e3 100644 --- a/plinth/views.py +++ b/plinth/views.py @@ -38,12 +38,11 @@ def index(request): shortcuts = frontpage.get_shortcuts() selection = request.GET.get('selected') - details, details_label, configure_url, icon_url = None, None, None, None + details, details_label, configure_url= None, None, None if selection in frontpage.shortcuts: details = frontpage.shortcuts[selection]['details'] details_label = frontpage.shortcuts[selection]['label'] configure_url = frontpage.shortcuts[selection]['configure_url'] - icon_url = frontpage.shortcuts[selection]['icon_url'] return TemplateResponse(request, 'index.html', {'title': _('FreedomBox'), @@ -51,8 +50,7 @@ def index(request): 'selected_id': selection, 'details': details, 'details_label': details_label, - 'configure_url': configure_url, - 'icon_url': icon_url, }) + 'configure_url': configure_url }) class ServiceView(FormView):