From f8dfd49f0fcfd5eb20d5bde9879874273d0afb67 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Sun, 18 Dec 2016 12:27:33 -0500 Subject: [PATCH] frontpage: Rearrange parameters for add_shortcut Rename id to shortcut_id. --- CHANGELOG.md | 3 +++ plinth/frontpage.py | 27 ++++++++++++++------------- plinth/modules/minetest/__init__.py | 3 ++- plinth/modules/mumble/__init__.py | 3 ++- plinth/modules/privoxy/__init__.py | 3 ++- plinth/modules/quassel/__init__.py | 3 ++- plinth/modules/radicale/__init__.py | 3 ++- plinth/modules/repro/__init__.py | 3 ++- plinth/modules/shaarli/__init__.py | 2 +- plinth/modules/xmpp/__init__.py | 5 +++-- 10 files changed, 33 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d59a2350..4565cb5b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ All notable changes to this project will be documented in this file. and exit. It can be followed by "essential" or "optional" to only list those modules. +### Changed +- frontpage: Show app logos instead of generic icons. + ## [0.12.0] - 2016-12-08 ### Added - Added screenshots to Readme. diff --git a/plinth/frontpage.py b/plinth/frontpage.py index eb1d46e16..2999ee9d6 100644 --- a/plinth/frontpage.py +++ b/plinth/frontpage.py @@ -27,18 +27,19 @@ def get_shortcuts(): return sorted(shortcuts.values(), key=lambda item: item['label']) -def add_shortcut(id, label, details=None, configure_url=None, - login_required=False, icon=None, url=None,): +def add_shortcut(shortcut_id, label, login_required=False, + icon=None, url=None, + details=None, configure_url=None): """Add shortcut to front page.""" if not url: - url = '?selected={id}'.format(id=id) + url = '?selected={id}'.format(id=shortcut_id) if not icon: - icon = id + icon = shortcut_id - shortcuts[id] = { - 'id': id, + shortcuts[shortcut_id] = { + 'id': shortcut_id, 'label': label, 'url': url, 'icon': icon, @@ -48,19 +49,19 @@ def add_shortcut(id, label, details=None, configure_url=None, } -def remove_shortcut(id): +def remove_shortcut(shortcut_id): """ Remove shortcut from front page. - If id ends with *, remove all shortcuts with that prefix. + If shortcut_id ends with *, remove all shortcuts with that prefix. """ def match(item): - if id[-1] == '*': - return item['id'].startswith(id[:-1]) + if shortcut_id[-1] == '*': + return item['id'].startswith(shortcut_id[:-1]) - return item['id'] == id + return item['id'] == shortcut_id global shortcuts - shortcuts = {id: shortcut - for id, shortcut in shortcuts.items() + shortcuts = {shortcut_id: shortcut + for shortcut_id, shortcut in shortcuts.items() if not match(shortcut)} diff --git a/plinth/modules/minetest/__init__.py b/plinth/modules/minetest/__init__.py index 2054dd22b..d2e8f4b75 100644 --- a/plinth/modules/minetest/__init__.py +++ b/plinth/modules/minetest/__init__.py @@ -90,7 +90,8 @@ def setup(helper, old_version=None): def add_shortcut(): frontpage.add_shortcut('minetest', title, url=None, - description, reverse_lazy('minetest:index'), + details=description, + configure_url=reverse_lazy('minetest:index'), login_required=False) diff --git a/plinth/modules/mumble/__init__.py b/plinth/modules/mumble/__init__.py index 7d3e682a9..2e4c8064b 100644 --- a/plinth/modules/mumble/__init__.py +++ b/plinth/modules/mumble/__init__.py @@ -90,7 +90,8 @@ def setup(helper, old_version=None): def add_shortcut(): frontpage.add_shortcut('mumble', title, - description, reverse_lazy('mumble:index'), + details=description, + configure_url=reverse_lazy('mumble:index'), login_required=False) diff --git a/plinth/modules/privoxy/__init__.py b/plinth/modules/privoxy/__init__.py index 7bf035079..98bbad0b7 100644 --- a/plinth/modules/privoxy/__init__.py +++ b/plinth/modules/privoxy/__init__.py @@ -95,7 +95,8 @@ def setup(helper, old_version=None): def add_shortcut(): frontpage.add_shortcut('privoxy', title, - description, reverse_lazy('privoxy:index'), + details=description, + configure_url=reverse_lazy('privoxy:index'), login_required=True) diff --git a/plinth/modules/quassel/__init__.py b/plinth/modules/quassel/__init__.py index 16049d1d7..519912422 100644 --- a/plinth/modules/quassel/__init__.py +++ b/plinth/modules/quassel/__init__.py @@ -96,7 +96,8 @@ def setup(helper, old_version=None): def add_shortcut(): frontpage.add_shortcut('quassel', title, - description, reverse_lazy('quassel:index'), + details=description, + configure_url=reverse_lazy('quassel:index'), login_required=True) diff --git a/plinth/modules/radicale/__init__.py b/plinth/modules/radicale/__init__.py index 31ef9f51e..4a4fcfb6f 100644 --- a/plinth/modules/radicale/__init__.py +++ b/plinth/modules/radicale/__init__.py @@ -88,7 +88,8 @@ def setup(helper, old_version=None): def add_shortcut(): frontpage.add_shortcut('radicale', title, - description, reverse_lazy('radicale:index'), + details=description, + configure_url=reverse_lazy('radicale:index'), login_required=True) diff --git a/plinth/modules/repro/__init__.py b/plinth/modules/repro/__init__.py index 9d8557f12..77e67b379 100644 --- a/plinth/modules/repro/__init__.py +++ b/plinth/modules/repro/__init__.py @@ -102,7 +102,8 @@ def setup(helper, old_version=None): def add_shortcut(): frontpage.add_shortcut('repro', title, - description, reverse_lazy('repro:index'), + details=description, + configure_url=reverse_lazy('repro:index'), login_required=True) diff --git a/plinth/modules/shaarli/__init__.py b/plinth/modules/shaarli/__init__.py index 34ac01b24..28f2740cb 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', + frontpage.add_shortcut('shaarli', title, url='/shaarli', login_required=True) diff --git a/plinth/modules/xmpp/__init__.py b/plinth/modules/xmpp/__init__.py index ed67b8678..785540a26 100644 --- a/plinth/modules/xmpp/__init__.py +++ b/plinth/modules/xmpp/__init__.py @@ -99,10 +99,11 @@ def setup(helper, old_version=None): def add_shortcut(): frontpage.add_shortcut('jsxc', _('Chat Client \n (jsxc)'), - reverse_lazy('xmpp:jsxc'), + url=reverse_lazy('xmpp:jsxc'), login_required=True) frontpage.add_shortcut('xmpp', title, - description, reverse_lazy('xmpp:index'), + details=description, + configure_url=reverse_lazy('xmpp:index'), login_required=True)