From 06fb7fab3bb2b1386d39ece0a2e391ba3e6ea376 Mon Sep 17 00:00:00 2001 From: mridulnagpal Date: Wed, 7 Dec 2016 19:44:15 +0530 Subject: [PATCH] License updated ikiwiki icon added title indented --- LICENSES | 13 +++++++++++++ plinth/frontpage.py | 6 +++++- plinth/modules/deluge/__init__.py | 2 +- plinth/modules/ikiwiki/__init__.py | 2 +- plinth/modules/minetest/__init__.py | 2 +- plinth/modules/mumble/__init__.py | 2 +- plinth/modules/privoxy/__init__.py | 2 +- plinth/modules/quassel/__init__.py | 2 +- plinth/modules/radicale/__init__.py | 2 +- plinth/modules/repro/__init__.py | 2 +- plinth/modules/restore/__init__.py | 2 +- plinth/modules/roundcube/__init__.py | 2 +- plinth/modules/shaarli/__init__.py | 2 +- plinth/modules/tor/__init__.py | 2 +- plinth/modules/transmission/__init__.py | 2 +- plinth/modules/ttrss/__init__.py | 2 +- plinth/modules/xmpp/__init__.py | 4 ++-- plinth/templates/index.html | 4 ++-- plinth/views.py | 6 ++++-- 19 files changed, 40 insertions(+), 21 deletions(-) diff --git a/LICENSES b/LICENSES index 357250a54..8266df31b 100644 --- a/LICENSES +++ b/LICENSES @@ -42,3 +42,16 @@ otherwise. - static/themes/default/img/network-freedombox.svg :: [[http://thread.gmane.org/gmane.linux.debian.freedombox.user/4124/focus=4439][GPL3+/CC-BY-SA]] - static/themes/default/img/network-internet.svg :: [[http://tango.freedesktop.org/][Public Domain]] - static/themes/default/img/network-wireless.svg :: [[http://tango.freedesktop.org/][Public Domain]] +- static/themes/default/icons/deluge.png :: - +- static/themes/default/icons/ikiwiki.png :: - +- static/themes/default/icons/jsxc.png :: - +- static/themes/default/icons/minetest.png :: - +- static/themes/default/icons/mumble.png :: - +- static/themes/default/icons/privoxy.png :: - +- static/themes/default/icons/quassel.png :: - +- static/themes/default/icons/radicale.png :: - +- static/themes/default/icons/repro.png :: - +- static/themes/default/icons/roundcube.png :: - +- static/themes/default/icons/transmission.png :: - +- static/themes/default/icons/ttrss.png :: - +- static/themes/default/icons/xmpp.png :: - diff --git a/plinth/frontpage.py b/plinth/frontpage.py index 8b3411514..a1c361bd8 100644 --- a/plinth/frontpage.py +++ b/plinth/frontpage.py @@ -28,12 +28,15 @@ def get_shortcuts(): def add_shortcut(id, label, url, icon, details=None, configure_url=None, - login_required=False): + login_required=False, icon_url=None): """Add shortcut to front page.""" if not url: url = '?selected={id}'.format(id=id) + if not icon_url: + icon_url = id + shortcuts[id] = { 'id': id, 'label': label, @@ -42,6 +45,7 @@ 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 75c5ae7fa..2ede275a0 100644 --- a/plinth/modules/deluge/__init__.py +++ b/plinth/modules/deluge/__init__.py @@ -38,7 +38,7 @@ managed_services = ['deluge-web'] managed_packages = ['deluged', 'deluge-web'] -title = _('BitTorrent Web Client (Deluge)') +title = ('BitTorrent Web Client \n (Deluge)') description = [ _('Deluge is a BitTorrent client that features a Web UI.'), diff --git a/plinth/modules/ikiwiki/__init__.py b/plinth/modules/ikiwiki/__init__.py index 6e61d3475..085f4155c 100644 --- a/plinth/modules/ikiwiki/__init__.py +++ b/plinth/modules/ikiwiki/__init__.py @@ -84,7 +84,7 @@ def add_shortcuts(): for site in sites: frontpage.add_shortcut( 'ikiwiki_' + site, site, '/ikiwiki/' + site, 'glyphicon-edit', - login_required=False) + login_required=False, icon_url='ikiwiki') def is_enabled(): diff --git a/plinth/modules/minetest/__init__.py b/plinth/modules/minetest/__init__.py index 42b03cf84..306b2bd35 100644 --- a/plinth/modules/minetest/__init__.py +++ b/plinth/modules/minetest/__init__.py @@ -46,7 +46,7 @@ managed_packages = ['minetest-server', 'minetest-mod-advspawning', 'minetest-mod-nether', 'minetest-mod-torches', ] -title = _('Block Sandbox (Minetest)') +title = ('Block Sandbox \n (Minetest)') description = [ format_lazy( diff --git a/plinth/modules/mumble/__init__.py b/plinth/modules/mumble/__init__.py index ead9a30a1..877fdbe0a 100644 --- a/plinth/modules/mumble/__init__.py +++ b/plinth/modules/mumble/__init__.py @@ -34,7 +34,7 @@ version = 1 depends = ['apps'] -title = _('Voice Chat (Mumble)') +title = ('Voice Chat \n (Mumble)') service = None diff --git a/plinth/modules/privoxy/__init__.py b/plinth/modules/privoxy/__init__.py index 52d7c7445..3fcb47bc2 100644 --- a/plinth/modules/privoxy/__init__.py +++ b/plinth/modules/privoxy/__init__.py @@ -41,7 +41,7 @@ managed_services = ['privoxy'] managed_packages = ['privoxy'] -title = _('Web Proxy (Privoxy)') +title = ('Web Proxy \n (Privoxy)') description = [ _('Privoxy is a non-caching web proxy with advanced filtering ' diff --git a/plinth/modules/quassel/__init__.py b/plinth/modules/quassel/__init__.py index 91cbf667f..b2c2f0e8d 100644 --- a/plinth/modules/quassel/__init__.py +++ b/plinth/modules/quassel/__init__.py @@ -40,7 +40,7 @@ managed_services = ['quasselcore'] managed_packages = ['quassel-core'] -title = _('IRC Client (Quassel)') +title = ('IRC Client \n (Quassel)') description = [ format_lazy( diff --git a/plinth/modules/radicale/__init__.py b/plinth/modules/radicale/__init__.py index 57aa99480..dd3f08748 100644 --- a/plinth/modules/radicale/__init__.py +++ b/plinth/modules/radicale/__init__.py @@ -40,7 +40,7 @@ managed_services = ['radicale'] managed_packages = ['radicale'] -title = _('Calendar and Addressbook (Radicale)') +title = ('Calendar and Addressbook \n (Radicale)') description = [ format_lazy( diff --git a/plinth/modules/repro/__init__.py b/plinth/modules/repro/__init__.py index ff3b18d5c..da13b7958 100644 --- a/plinth/modules/repro/__init__.py +++ b/plinth/modules/repro/__init__.py @@ -37,7 +37,7 @@ managed_services = ['repro'] managed_packages = ['repro'] -title = _('SIP Server (repro)') +title = ('SIP Server \n (repro)') description = [ _('repro provides various SIP services that a SIP softphone can utilize ' diff --git a/plinth/modules/restore/__init__.py b/plinth/modules/restore/__init__.py index 88beea423..7d0a45f4a 100644 --- a/plinth/modules/restore/__init__.py +++ b/plinth/modules/restore/__init__.py @@ -34,7 +34,7 @@ managed_services = ['node-restore'] managed_packages = ['node-restore'] -title = _('Unhosted Storage (reStore)') +title = ('Unhosted Storage \n (reStore)') description = [ format_lazy( diff --git a/plinth/modules/roundcube/__init__.py b/plinth/modules/roundcube/__init__.py index c806df26c..690e6cb5c 100644 --- a/plinth/modules/roundcube/__init__.py +++ b/plinth/modules/roundcube/__init__.py @@ -34,7 +34,7 @@ depends = ['apps'] managed_packages = ['sqlite3', 'roundcube', 'roundcube-sqlite3'] -title = _('Email Client (Roundcube)') +title = ('Email Client \n (Roundcube)') description = [ _('Roundcube webmail is a browser-based multilingual IMAP ' diff --git a/plinth/modules/shaarli/__init__.py b/plinth/modules/shaarli/__init__.py index dd19f6f11..f732e4afa 100644 --- a/plinth/modules/shaarli/__init__.py +++ b/plinth/modules/shaarli/__init__.py @@ -34,7 +34,7 @@ depends = ['apps'] managed_packages = ['shaarli'] -title = _('Bookmarks (Shaarli)') +title = ('Bookmarks \n (Shaarli)') description = [ _('Shaarli allows you to save and share bookmarks.'), diff --git a/plinth/modules/tor/__init__.py b/plinth/modules/tor/__init__.py index 7194a0e62..c0310f0cb 100644 --- a/plinth/modules/tor/__init__.py +++ b/plinth/modules/tor/__init__.py @@ -39,7 +39,7 @@ depends = ['apps', 'names'] managed_packages = ['tor', 'tor-geoipdb', 'torsocks', 'obfs4proxy', 'apt-transport-tor'] -title = _('Anonymity Network (Tor)') +title = ('Anonymity Network \n (Tor)') description = [ _('Tor is an anonymous communication system. You can learn more ' diff --git a/plinth/modules/transmission/__init__.py b/plinth/modules/transmission/__init__.py index 6ceb695b8..5c6f357c0 100644 --- a/plinth/modules/transmission/__init__.py +++ b/plinth/modules/transmission/__init__.py @@ -37,7 +37,7 @@ managed_services = ['transmission-daemon'] managed_packages = ['transmission-daemon'] -title = _('BitTorrent (Transmission)') +title = ('BitTorrent \n (Transmission)') description = [ _('BitTorrent is a peer-to-peer file sharing protocol. ' diff --git a/plinth/modules/ttrss/__init__.py b/plinth/modules/ttrss/__init__.py index 2c16e4ee4..b440de218 100644 --- a/plinth/modules/ttrss/__init__.py +++ b/plinth/modules/ttrss/__init__.py @@ -36,7 +36,7 @@ managed_services = ['tt-rss'] managed_packages = ['tt-rss', 'postgresql', 'dbconfig-pgsql', 'php-pgsql'] -title = _('News Feed Reader (Tiny Tiny RSS)') +title = ('News Feed Reader \n (Tiny Tiny RSS)') description = [ _('Tiny Tiny RSS is a news feed (RSS/Atom) reader and aggregator, ' diff --git a/plinth/modules/xmpp/__init__.py b/plinth/modules/xmpp/__init__.py index 84da7ef3a..8078fa0ad 100644 --- a/plinth/modules/xmpp/__init__.py +++ b/plinth/modules/xmpp/__init__.py @@ -41,7 +41,7 @@ managed_services = ['ejabberd'] managed_packages = ['libjs-jsxc', 'ejabberd'] -title = _('Chat Server (XMPP)') +title = ('Chat Server \n (XMPP)') description = [ _('XMPP is an open and standardized communication protocol. Here ' @@ -98,7 +98,7 @@ def setup(helper, old_version=None): def add_shortcut(): - frontpage.add_shortcut('jsxc', _('Chat Client (jsxc)'), + frontpage.add_shortcut('jsxc', ('Chat Client \n (jsxc)'), reverse_lazy('xmpp:jsxc'), 'glyphicon-comment', None, login_required=True) frontpage.add_shortcut('xmpp', title, None, 'glyphicon-comment', diff --git a/plinth/templates/index.html b/plinth/templates/index.html index d8dbf9486..efd5ee5c7 100644 --- a/plinth/templates/index.html +++ b/plinth/templates/index.html @@ -38,9 +38,9 @@ {% endif %}
- +
- {{ shortcut.label }} + {{ shortcut.label|linebreaks }}
diff --git a/plinth/views.py b/plinth/views.py index 489550d81..cfdeb4a86 100644 --- a/plinth/views.py +++ b/plinth/views.py @@ -38,11 +38,12 @@ def index(request): shortcuts = frontpage.get_shortcuts() selection = request.GET.get('selected') - details, details_label, configure_url = None, None, None + details, details_label, configure_url, icon_url = None, 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'), @@ -50,7 +51,8 @@ def index(request): 'selected_id': selection, 'details': details, 'details_label': details_label, - 'configure_url': configure_url}) + 'configure_url': configure_url, + 'icon_url': icon_url, }) class ServiceView(FormView):