Use logos instead of icons in the apps page

- Adjust the template so that it uses glyphicons for sys page and logos for the app page - Add logos for missing apps (tor and sharing) and their licences Signed-off-by: Hemanth Kumar Veeranki <hems.india1997@gmail.com> Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
2026-01-21 07:55:00 +00:00 · 2018-06-19 21:05:48 +05:30 · 2018-06-19 21:05:48 +05:30 · 881302ac02
commit 881302ac02
parent f5fe1a0822
30 changed files with 38 additions and 27 deletions
--- a/2
+++ b/2
@ -59,8 +59,10 @@ otherwise.
 - static/themes/default/icons/roundcube.png :: [[https://roundcube.net/][GPL-3+]]
 - static/themes/default/icons/shaarli.png :: [[https://github.com/shaarli/Shaarli][zlib/libpng]]
 - static/themes/default/icons/shadowsocks.png :: [[https://commons.wikimedia.org/wiki/File:Shadowsocks_logo.png][Apache 2.0]]
+- static/themes/default/icons/sharing.png :: [[https://www.shareicon.net/social-share-this-107338][CC 2.5]]
 - static/themes/default/icons/syncthing.png :: [[https://github.com/syncthing/syncthing/][Mozilla Public License Version 2.0]]
 - static/themes/default/icons/tahoe.png :: [[https://github.com/thekishanraval/Logos][GPLv3+]]
+- static/themes/default/icons/tor.png :: [[https://commons.wikimedia.org/wiki/File:Tor_logo1.png][CC BY 3.0 US]]
 - static/themes/default/icons/transmission.png :: [[https://transmissionbt.com/][GPL]]
 - static/themes/default/icons/ttrss.png :: [[https://tt-rss.org/gitlab/fox/tt-rss][GPL]]
 - static/themes/default/icons/f-droid.png :: [[https://gitlab.com/fdroid/artwork/blob/master/fdroid-logo-2015/fdroid-logo.svg][CC-BY-SA 3.0 or GPLv3+]]
--- a/plinth/modules/coquelicot/init.py
+++ b/plinth/modules/coquelicot/init.py
@ -56,7 +56,7 @@ manual_page = 'Coquelicot'
 def init():
    """Intialize the module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-open-file', 'coquelicot:index',
+    menu.add_urlname(name, 'coquelicot', 'coquelicot:index',
                     short_description)

    global service
--- a/plinth/modules/deluge/init.py
+++ b/plinth/modules/deluge/init.py
@ -59,7 +59,7 @@ manual_page = 'Deluge'
 def init():
    """Initialize the Deluge module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-magnet', 'deluge:index',
+    menu.add_urlname(name, 'deluge', 'deluge:index',
                     short_description)
    register_group(group)

--- a/plinth/modules/ejabberd/init.py
+++ b/plinth/modules/ejabberd/init.py
@ -70,7 +70,7 @@ logger = logging.getLogger(__name__)
 def init():
    """Initialize the ejabberd module"""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-comment', 'ejabberd:index',
+    menu.add_urlname(name, 'ejabberd', 'ejabberd:index',
                     short_description)

    global service
--- a/plinth/modules/ikiwiki/init.py
+++ b/plinth/modules/ikiwiki/init.py
@ -67,7 +67,7 @@ manual_page = 'Ikiwiki'
 def init():
    """Initialize the ikiwiki module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-edit', 'ikiwiki:index',
+    menu.add_urlname(name, 'ikiwiki', 'ikiwiki:index',
                     short_description)
    register_group(group)

--- a/plinth/modules/infinoted/init.py
+++ b/plinth/modules/infinoted/init.py
@ -58,7 +58,7 @@ clients = clients
 def init():
    """Initialize the infinoted module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-pencil', 'infinoted:index',
+    menu.add_urlname(name, 'infinoted', 'infinoted:index',
                     short_description)

    global service
--- a/plinth/modules/jsxc/init.py
+++ b/plinth/modules/jsxc/init.py
@ -53,7 +53,7 @@ logger = logging.getLogger(__name__)
 def init():
    """Initialize the JSXC module"""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-comment', 'jsxc:index', short_description)
+    menu.add_urlname(name, 'jsxc', 'jsxc:index', short_description)

    global service
    setup_helper = globals()['setup_helper']
--- a/plinth/modules/matrixsynapse/init.py
+++ b/plinth/modules/matrixsynapse/init.py
@ -70,7 +70,7 @@ CONFIG_FILE_PATH = '/etc/matrix-synapse/homeserver.yaml'
 def init():
    """Initialize the matrix-synapse module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-comment', 'matrixsynapse:index',
+    menu.add_urlname(name, 'matrixsynapse', 'matrixsynapse:index',
                     short_description)

    global service
--- a/plinth/modules/mediawiki/init.py
+++ b/plinth/modules/mediawiki/init.py
@ -59,7 +59,7 @@ clients = clients
 def init():
    """Intialize the module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-edit', 'mediawiki:index',
+    menu.add_urlname(name, 'mediawiki', 'mediawiki:index',
                     short_description)

    global service
--- a/plinth/modules/minetest/init.py
+++ b/plinth/modules/minetest/init.py
@ -69,7 +69,7 @@ AUG_PATH = '/files' + CONFIG_FILE + '/.anon'
 def init():
    """Initialize the module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-th-large', 'minetest:index',
+    menu.add_urlname(name, 'minetest', 'minetest:index',
                     short_description)

    global service
--- a/plinth/modules/mumble/init.py
+++ b/plinth/modules/mumble/init.py
@ -58,7 +58,7 @@ manual_page = 'Mumble'
 def init():
    """Intialize the Mumble module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-headphones', 'mumble:index',
+    menu.add_urlname(name, 'mumble', 'mumble:index',
                     short_description)

    global service
--- a/plinth/modules/openvpn/init.py
+++ b/plinth/modules/openvpn/init.py
@ -55,7 +55,7 @@ manual_page = 'OpenVPN'
 def init():
    """Initialize the OpenVPN module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-lock', 'openvpn:index',
+    menu.add_urlname(name, 'openvpn', 'openvpn:index',
                     short_description)

    global service
--- a/plinth/modules/privoxy/init.py
+++ b/plinth/modules/privoxy/init.py
@ -64,7 +64,7 @@ manual_page = 'Privoxy'
 def init():
    """Intialize the module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-cloud-upload', 'privoxy:index',
+    menu.add_urlname(name, 'privoxy', 'privoxy:index',
                     short_description)

    global service
--- a/plinth/modules/quassel/init.py
+++ b/plinth/modules/quassel/init.py
@ -67,7 +67,7 @@ manual_page = 'Quassel'
 def init():
    """Initialize the quassel module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-retweet', 'quassel:index',
+    menu.add_urlname(name, 'quassel', 'quassel:index',
                     short_description)

    global service
--- a/plinth/modules/radicale/init.py
+++ b/plinth/modules/radicale/init.py
@ -62,7 +62,7 @@ CONFIG_FILE = '/etc/radicale/config'
 def init():
    """Initialize the radicale module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-calendar', 'radicale:index',
+    menu.add_urlname(name, 'radicale', 'radicale:index',
                     short_description)

    global service
--- a/plinth/modules/repro/init.py
+++ b/plinth/modules/repro/init.py
@ -69,7 +69,7 @@ manual_page = 'Repro'
 def init():
    """Initialize the repro module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-phone-alt', 'repro:index',
+    menu.add_urlname(name, 'repro', 'repro:index',
                     short_description)

    global service
--- a/plinth/modules/roundcube/init.py
+++ b/plinth/modules/roundcube/init.py
@ -64,7 +64,7 @@ manual_page = 'Roundcube'
 def init():
    """Intialize the module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-envelope', 'roundcube:index',
+    menu.add_urlname(name, 'roundcube', 'roundcube:index',
                     short_description)

    global service
--- a/plinth/modules/searx/init.py
+++ b/plinth/modules/searx/init.py
@ -58,7 +58,7 @@ manual_page = 'Searx'
 def init():
    """Intialize the module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-search', 'searx:index',
+    menu.add_urlname(name, 'searx', 'searx:index',
                     short_description)
    register_group(group)

--- a/plinth/modules/shadowsocks/init.py
+++ b/plinth/modules/shadowsocks/init.py
@ -58,7 +58,7 @@ manual_page = 'Shadowsocks'
 def init():
    """Intialize the module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-send', 'shadowsocks:index',
+    menu.add_urlname(name, 'shadowsocks', 'shadowsocks:index',
                     short_description)

    global service
--- a/plinth/modules/sharing/init.py
+++ b/plinth/modules/sharing/init.py
@ -41,7 +41,7 @@ description = [
 def init():
    """Initialize the module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-share', 'sharing:index')
+    menu.add_urlname(name, 'sharing', 'sharing:index')


 def list_shares():
--- a/plinth/modules/syncthing/init.py
+++ b/plinth/modules/syncthing/init.py
@ -68,7 +68,7 @@ manual_page = 'Syncthing'
 def init():
    """Intialize the module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-refresh', 'syncthing:index',
+    menu.add_urlname(name, 'syncthing', 'syncthing:index',
                     short_description)
    register_group(group)

--- a/plinth/modules/tahoe/init.py
+++ b/plinth/modules/tahoe/init.py
@ -87,7 +87,7 @@ description = [
 def init():
    """Intialize the module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-hdd', 'tahoe:index', short_description)
+    menu.add_urlname(name, 'tahoe-lafs', 'tahoe:index', short_description)

    global service
    setup_helper = globals()['setup_helper']
--- a/plinth/modules/tor/init.py
+++ b/plinth/modules/tor/init.py
@ -65,7 +65,7 @@ manual_page = 'Tor'
 def init():
    """Initialize the module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-eye-close', 'tor:index',
+    menu.add_urlname(name, 'tor', 'tor:index',
                     short_description)

    setup_helper = globals()['setup_helper']
--- a/plinth/modules/transmission/init.py
+++ b/plinth/modules/transmission/init.py
@ -60,7 +60,7 @@ manual_page = 'Transmission'
 def init():
    """Intialize the Transmission module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-save', 'transmission:index',
+    menu.add_urlname(name, 'transmission', 'transmission:index',
                     short_description)
    register_group(group)

--- a/plinth/modules/ttrss/init.py
+++ b/plinth/modules/ttrss/init.py
@ -67,7 +67,7 @@ manual_page = 'TinyTinyRSS'
 def init():
    """Intialize the module."""
    menu = main_menu.get('apps')
-    menu.add_urlname(name, 'glyphicon-envelope', 'ttrss:index',
+    menu.add_urlname(name, 'ttrss', 'ttrss:index',
                     short_description)
    register_group(group)

--- a/plinth/templates/cards.html
+++ b/plinth/templates/cards.html
@ -38,7 +38,11 @@
          <div class="card thumbnail">
            <a href="{{ item.url }}" class="nav-link">
              <div class="card-icon">
-                <span class="{{ item.icon }} glyphicon"></span>
+                {% if 'glyphicon-' in item.icon %}
+                  <span class="{{ item.icon }} glyphicon"></span>
+                {% else %}
+                  <img src="{% static 'theme/icons/' %}{{ item.icon }}.png"/>
+                {% endif %}
              </div>
              <div class="card-title">{{ item.name }}</div>
              <div class="card-description">{{ item.short_description}}</div>
--- a/plinth/templates/index.html
+++ b/plinth/templates/index.html
@ -87,8 +87,7 @@
                    <a href="{{ shortcut.url }}" class="nav-link">
                  {% endif %}
                        <div class="card-icon">
-                          <img src="{% static 'theme/icons/' %}{{ shortcut.icon }}.png"
-                               style="max-width: 100px; height: 100px; font-size: 80px"/>
+                          <img src="{% static 'theme/icons/' %}{{ shortcut.icon }}.png"/>
                        </div>
                        <div class="card-title">
                          {{ shortcut.name }}
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@ -281,6 +281,12 @@ a.menu_link_active {
    font-size: 80px;
 }

+.card-icon img {
+    width: 100px;
+    height: 100px;
+    font-size: 80px;
+}
+
 /* Button table - Tables with a list of actions as buttons on top */
 .button-table > .button-row + .table {
    margin-top: 10px;
--- a/static/themes/default/icons/sharing.png
+++ b/static/themes/default/icons/sharing.png
--- a/static/themes/default/icons/tor.png
+++ b/static/themes/default/icons/tor.png