tags: Replace short description with tags in app pages

Fixes #2460

Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>
[sunil: Update the style to provide spacing after tags lines]
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
Joseph Nuthalapati 2024-11-19 13:20:05 +05:30 committed by Sunil Mohan Adapa
parent a54a29f009
commit 4a620fd1db
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
42 changed files with 70 additions and 102 deletions

View File

@ -56,7 +56,6 @@ class BepastyApp(app_module.App):
info = app_module.Info(self.app_id, self._version, name=_('bepasty'),
icon_filename='bepasty',
short_description=_('File & Snippet Sharing'),
description=_description, manual_page='bepasty',
clients=manifest.clients, tags=manifest.tags)
self.add(info)

View File

@ -54,7 +54,6 @@ class CalibreApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('calibre'), icon_filename='calibre',
short_description=_('E-book Library'),
description=_description, manual_page='Calibre',
clients=manifest.clients, tags=manifest.tags,
donation_url='https://calibre-ebook.com/donate')

View File

@ -50,7 +50,6 @@ class CoturnApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Coturn'), icon_filename='coturn',
short_description=_('VoIP Helper'),
description=_description, manual_page='Coturn',
tags=manifest.tags)
self.add(info)

View File

@ -58,10 +58,8 @@ class DelugeApp(app_module.App):
info = app_module.Info(
app_id=self.app_id, version=self._version, name=_('Deluge'),
icon_filename='deluge',
short_description=_('BitTorrent Web Client'),
description=_description, manual_page='Deluge',
clients=manifest.clients,
icon_filename='deluge', description=_description,
manual_page='Deluge', clients=manifest.clients,
donation_url='https://www.patreon.com/deluge_cas',
tags=manifest.tags)
self.add(info)

View File

@ -59,7 +59,6 @@ class EjabberdApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
depends=['coturn'], name=_('ejabberd'),
icon_filename='ejabberd',
short_description=_('Chat Server'),
description=_description,
manual_page='ejabberd',
clients=manifest.clients, tags=manifest.tags)

View File

@ -60,10 +60,9 @@ class EmailApp(plinth.app.App):
info = plinth.app.Info(app_id=self.app_id, version=self._version,
name=_('Postfix/Dovecot'),
icon_filename='email',
short_description=_('Email Server'),
description=_description, manual_page='Email',
clients=manifest.clients, tags=manifest.tags,
icon_filename='email', description=_description,
manual_page='Email', clients=manifest.clients,
tags=manifest.tags,
donation_url='https://rspamd.com/support.html')
self.add(info)

View File

@ -58,7 +58,6 @@ class FeatherWikiApp(app_module.App):
info = app_module.Info(self.app_id, self._version,
name=_('Feather Wiki'),
icon_filename='featherwiki',
short_description=_('Personal Notebooks'),
description=_description,
manual_page='FeatherWiki',
clients=manifest.clients, tags=manifest.tags)

View File

@ -46,7 +46,6 @@ class GitwebApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Gitweb'), icon_filename='gitweb',
short_description=_('Simple Git Hosting'),
description=_description, manual_page='GitWeb',
clients=manifest.clients, tags=manifest.tags)
self.add(info)

View File

@ -43,7 +43,6 @@ class IkiwikiApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('ikiwiki'), icon_filename='ikiwiki',
short_description=_('Wiki and Blog'),
description=_description, manual_page='Ikiwiki',
clients=manifest.clients, tags=manifest.tags,
donation_url='https://ikiwiki.info/tipjar/')

View File

@ -39,7 +39,6 @@ class InfinotedApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('infinoted'), icon_filename='infinoted',
short_description=_('Gobby Server'),
description=_description,
manual_page='Infinoted',
clients=manifest.clients, tags=manifest.tags)

View File

@ -40,10 +40,9 @@ class JanusApp(app_module.App):
super().__init__()
info = app_module.Info(self.app_id, self._version, name=_('Janus'),
icon_filename='janus',
short_description=_('Video Room'),
description=_description, manual_page='Janus',
clients=manifest.clients, tags=manifest.tags)
icon_filename='janus', description=_description,
manual_page='Janus', clients=manifest.clients,
tags=manifest.tags)
self.add(info)
menu_item = menu.Menu('menu-janus', info.name, info.short_description,

View File

@ -36,7 +36,6 @@ class JSXCApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('JSXC'), icon_filename='jsxc',
short_description=_('Chat Client'),
description=_description, manual_page='JSXC',
clients=manifest.clients, tags=manifest.tags)
self.add(info)

View File

@ -54,9 +54,8 @@ class KiwixApp(app_module.App):
info = app_module.Info(
app_id=self.app_id, version=self._version, name=_('Kiwix'),
icon_filename='kiwix', short_description=_('Offline Wikipedia'),
description=_description, manual_page='Kiwix',
clients=manifest.clients, tags=manifest.tags,
icon_filename='kiwix', description=_description,
manual_page='Kiwix', clients=manifest.clients, tags=manifest.tags,
donation_url='https://www.kiwix.org/en/support-us/')
self.add(info)

View File

@ -50,12 +50,12 @@ class MatrixSynapseApp(app_module.App):
"""Create components for the app."""
super().__init__()
info = app_module.Info(
app_id=self.app_id, version=self._version, depends=['coturn'],
name=_('Matrix Synapse'), icon_filename='matrixsynapse',
short_description=_('Chat Server'), description=_description,
manual_page='MatrixSynapse', clients=manifest.clients,
tags=manifest.tags)
info = app_module.Info(app_id=self.app_id, version=self._version,
depends=['coturn'], name=_('Matrix Synapse'),
icon_filename='matrixsynapse',
description=_description,
manual_page='MatrixSynapse',
clients=manifest.clients, tags=manifest.tags)
self.add(info)
menu_item = menu.Menu('menu-matrixsynapse', info.name,

View File

@ -49,11 +49,9 @@ class MediaWikiApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('MediaWiki'), icon_filename='mediawiki',
short_description=_('Wiki'),
description=_description,
manual_page='MediaWiki',
clients=manifest.clients,
tags=manifest.tags)
clients=manifest.clients, tags=manifest.tags)
self.add(info)
menu_item = menu.Menu('menu-mediawiki', info.name,

View File

@ -54,9 +54,9 @@ class MinetestApp(app_module.App):
info = app_module.Info(
app_id=self.app_id, version=self._version, name=_('Minetest'),
icon_filename='minetest', short_description=_('Block Sandbox'),
description=_description, manual_page='Minetest',
clients=manifest.clients, tags=manifest.tags,
icon_filename='minetest', description=_description,
manual_page='Minetest', clients=manifest.clients,
tags=manifest.tags,
donation_url='https://www.minetest.net/get-involved/#donate')
self.add(info)

View File

@ -43,11 +43,9 @@ class MiniDLNAApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('MiniDLNA'), icon_filename='minidlna',
short_description=_('Simple Media Server'),
description=_description,
manual_page='MiniDLNA',
clients=manifest.clients,
tags=manifest.tags)
clients=manifest.clients, tags=manifest.tags)
self.add(info)
menu_item = menu.Menu(

View File

@ -41,7 +41,6 @@ class MinifluxApp(app_module.App):
info = app_module.Info(self.app_id, self._version, name=_('Miniflux'),
icon_filename='miniflux',
short_description=_('News Feed Reader'),
description=_description,
manual_page='miniflux',
clients=manifest.clients, tags=manifest.tags,

View File

@ -43,9 +43,8 @@ class MumbleApp(app_module.App):
info = app_module.Info(
app_id=self.app_id, version=self._version, name=_('Mumble'),
icon_filename='mumble', short_description=_('Voice Chat'),
description=_description, manual_page='Mumble',
clients=manifest.clients, tags=manifest.tags,
icon_filename='mumble', description=_description,
manual_page='Mumble', clients=manifest.clients, tags=manifest.tags,
donation_url='https://wiki.mumble.info/wiki/Donate')
self.add(info)

View File

@ -62,12 +62,11 @@ class NextcloudApp(app_module.App):
"""Create components for the app."""
super().__init__()
info = app_module.Info(
app_id=self.app_id, version=self._version, name=_('Nextcloud'),
icon_filename='nextcloud',
short_description=_('File Storage & Collaboration'),
description=_description, manual_page='Nextcloud',
clients=manifest.clients, tags=manifest.tags)
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Nextcloud'), icon_filename='nextcloud',
description=_description,
manual_page='Nextcloud',
clients=manifest.clients, tags=manifest.tags)
self.add(info)
menu_item = menu.Menu('menu-nextcloud', info.name,

View File

@ -44,7 +44,6 @@ class OpenVPNApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('OpenVPN'), icon_filename='openvpn',
short_description=_('Virtual Private Network'),
description=_description, manual_page='OpenVPN',
clients=manifest.clients, tags=manifest.tags)
self.add(info)

View File

@ -51,8 +51,8 @@ class PrivoxyApp(app_module.App):
info = app_module.Info(
app_id=self.app_id, version=self._version, name=_('Privoxy'),
icon_filename='privoxy', short_description=_('Web Proxy'),
description=_description, manual_page='Privoxy',
icon_filename='privoxy', description=_description,
manual_page='Privoxy',
donation_url='https://www.privoxy.org/faq/general.html#DONATE',
tags=manifest.tags)
self.add(info)

View File

@ -49,7 +49,6 @@ class QuasselApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Quassel'), icon_filename='quassel',
short_description=_('IRC Client'),
description=_description, manual_page='Quassel',
clients=manifest.clients, tags=manifest.tags)
self.add(info)

View File

@ -51,11 +51,9 @@ class RadicaleApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Radicale'), icon_filename='radicale',
short_description=_('Calendar and Addressbook'),
description=_description,
manual_page='Radicale',
clients=manifest.clients,
tags=manifest.tags)
clients=manifest.clients, tags=manifest.tags)
self.add(info)
menu_item = menu.Menu('menu-radicale', info.name,

View File

@ -48,11 +48,9 @@ class RoundcubeApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Roundcube'), icon_filename='roundcube',
short_description=_('Email Client'),
description=_description,
manual_page='Roundcube',
clients=manifest.clients,
tags=manifest.tags)
clients=manifest.clients, tags=manifest.tags)
self.add(info)
menu_item = menu.Menu('menu-roundcube', info.name,

View File

@ -49,7 +49,6 @@ class RSSBridgeApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('RSS-Bridge'), icon_filename='rssbridge',
short_description=_('RSS Feed Generator'),
description=_description,
manual_page='RSSBridge', donation_url=None,
clients=manifest.clients, tags=manifest.tags)

View File

@ -51,9 +51,9 @@ class SambaApp(app_module.App):
info = app_module.Info(
app_id=self.app_id, version=self._version, name=_('Samba'),
icon_filename='samba', short_description=_('Network File Storage'),
manual_page='Samba', description=_description,
clients=manifest.clients, tags=manifest.tags,
icon_filename='samba', manual_page='Samba',
description=_description, clients=manifest.clients,
tags=manifest.tags,
donation_url='https://www.samba.org/samba/donations.html')
self.add(info)

View File

@ -39,9 +39,8 @@ class SearxApp(app_module.App):
info = app_module.Info(
app_id=self.app_id, version=self._version, name=_('Searx'),
icon_filename='searx', short_description=_('Web Search'),
description=_description, manual_page='Searx',
clients=manifest.clients, tags=manifest.tags,
icon_filename='searx', description=_description,
manual_page='Searx', clients=manifest.clients, tags=manifest.tags,
donation_url='https://searx.me/static/donate.html')
self.add(info)

View File

@ -34,7 +34,6 @@ class ShaarliApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Shaarli'), icon_filename='shaarli',
short_description=_('Bookmarks'),
description=_description, manual_page='Shaarli',
clients=manifest.clients, tags=manifest.tags)
self.add(info)

View File

@ -49,10 +49,8 @@ class ShadowsocksApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Shadowsocks Client'),
icon_filename='shadowsocks',
short_description=_('Bypass Censorship'),
description=_description,
manual_page='Shadowsocks',
tags=manifest.tags)
manual_page='Shadowsocks', tags=manifest.tags)
self.add(info)
menu_item = menu.Menu('menu-shadowsocks', info.name,

View File

@ -43,12 +43,11 @@ class ShadowsocksServerApp(app_module.App):
"""Create components for the app."""
super().__init__()
info = app_module.Info(
app_id=self.app_id, version=self._version,
name=_('Shadowsocks Server'), icon_filename='shadowsocks',
short_description=_('Help Others Bypass Censorship'),
description=_description, manual_page='Shadowsocks',
tags=manifest.tags)
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Shadowsocks Server'),
icon_filename='shadowsocks',
description=_description,
manual_page='Shadowsocks', tags=manifest.tags)
self.add(info)
menu_item = menu.Menu('menu-shadowsocks-server', info.name,

View File

@ -57,7 +57,6 @@ class SyncthingApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Syncthing'), icon_filename='syncthing',
short_description=_('File Synchronization'),
description=_description,
manual_page='Syncthing',
clients=manifest.clients,

View File

@ -63,7 +63,6 @@ class TiddlyWikiApp(app_module.App):
info = app_module.Info(self.app_id, self._version,
name=_('TiddlyWiki'),
icon_filename='tiddlywiki',
short_description=_('Non-linear Notebooks'),
description=_description,
manual_page='TiddlyWiki',
clients=manifest.clients, tags=manifest.tags)

View File

@ -61,7 +61,6 @@ class TorApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
depends=['names'
], name=_('Tor'), icon_filename='tor',
short_description=_('Anonymity Network'),
description=_description, manual_page='Tor',
clients=manifest.clients, tags=manifest.tags,
donation_url='https://donate.torproject.org/')

View File

@ -55,7 +55,6 @@ class TorProxyApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Tor Proxy'), icon_filename='torproxy',
short_description=_('Anonymity Network'),
description=_description,
manual_page='TorProxy',
clients=manifest.clients, tags=manifest.tags,

View File

@ -72,10 +72,8 @@ class TransmissionApp(app_module.App):
info = app_module.Info(
app_id=self.app_id, version=self._version, name=_('Transmission'),
icon_filename='transmission',
short_description=_('BitTorrent Web Client'),
description=_description, manual_page='Transmission',
clients=manifest.clients,
icon_filename='transmission', description=_description,
manual_page='Transmission', clients=manifest.clients,
donation_url='https://transmissionbt.com/donate/',
tags=manifest.tags)
self.add(info)

View File

@ -48,7 +48,6 @@ class TTRSSApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Tiny Tiny RSS'), icon_filename='ttrss',
short_description=_('News Feed Reader'),
description=_description,
manual_page='TinyTinyRSS',
clients=manifest.clients, tags=manifest.tags,

View File

@ -45,10 +45,9 @@ class WireguardApp(app_module.App):
info = app_module.Info(
app_id=self.app_id, version=self._version, name=_('WireGuard'),
icon_filename='wireguard',
short_description=_('Virtual Private Network'),
description=_description, manual_page='WireGuard',
clients=manifest.clients, tags=manifest.tags,
icon_filename='wireguard', description=_description,
manual_page='WireGuard', clients=manifest.clients,
tags=manifest.tags,
donation_url='https://www.wireguard.com/donations/')
self.add(info)

View File

@ -51,9 +51,9 @@ class WordPressApp(app_module.App):
info = app_module.Info(
app_id=self.app_id, version=self._version, name=_('WordPress'),
icon_filename='wordpress', short_description=_('Website and Blog'),
description=_description, manual_page='WordPress',
clients=manifest.clients, tags=manifest.tags,
icon_filename='wordpress', description=_description,
manual_page='WordPress', clients=manifest.clients,
tags=manifest.tags,
donation_url='https://wordpressfoundation.org/donate/')
self.add(info)

View File

@ -54,7 +54,6 @@ class ZophApp(app_module.App):
info = app_module.Info(app_id=self.app_id, version=self._version,
name=_('Zoph'), icon_filename='zoph',
short_description=_('Photo Organizer'),
description=_description, manual_page='Zoph',
clients=manifest.clients)
self.add(info)

View File

@ -45,23 +45,23 @@
{% endif %}
</section>
{% block description %}
{% for paragraph in app_info.description %}
<p>{{ paragraph|safe }}</p>
{% endfor %}
{% endblock %}
{% if app_info.tags %}
<div>
<div class="app-tags">
{% for tag in app_info.tags %}
<a href="{% url 'apps' %}?tag={{ tag|urlencode }}"
class="btn btn-light rounded-pill tag">
<a href="{% url 'apps' %}?tag={{ tag|urlencode }}"
class="btn btn-light rounded-pill tag">
{% trans tag %}
</a>
{% endfor %}
</div>
{% endif %}
{% block description %}
{% for paragraph in app_info.description %}
<p>{{ paragraph|safe }}</p>
{% endfor %}
{% endblock %}
{% if app_info.manual_page %}
<p class="manual-page">
<a href="{% url 'help:manual-page' lang='-' page=app_info.manual_page %}">

View File

@ -895,6 +895,16 @@ input[type='submit'].running-status-button {
margin: auto 0;
}
.app-tags {
margin-bottom: 0.5rem;
margin-left: -0.75rem;
line-height: 2.75;
}
.app-tags .tag {
vertical-align: top;
}
@media screen and (max-width: 767px) {
.app-header {
display: flex;