nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

apps requiring login don't show up on frontpage unless logged in

Browse Source
This commit is contained in:
mridulnagpal 2016-11-14 00:50:44 +05:30 committed by James Valleroy
parent 6bacd6bb04
commit fbe40f17b2
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
15 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plinth/frontpage.py
View File

@ -27,8 +27,9 @@ def get_shortcuts():
return sorted(shortcuts.values(), key=lambda item: item['label']) return sorted(shortcuts.values(), key=lambda item: item['label'])
def add_shortcut(id, label, url, icon, details=None): def add_shortcut(id, label, url, icon, details=None, login_required=False):
"""Add shortcut to front page.""" """Add shortcut to front page."""
if not url: if not url:
url = '?selected={id}'.format(id=id) url = '?selected={id}'.format(id=id)
@ -37,6 +38,7 @@ def add_shortcut(id, label, url, icon, details=None):
'label': label, 'label': label,
'url': url, 'url': url,
'icon': icon, 'icon': icon,
'login_required': login_required,
'details': details, 'details': details,
} }

3
plinth/modules/deluge/__init__.py
View File

@ -73,7 +73,8 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut('deluge', title, '/deluge', 'glyphicon-magnet') frontpage.add_shortcut('deluge', title, '/deluge', 'glyphicon-magnet',
login_required=True)
def is_enabled(): def is_enabled():

3
plinth/modules/ikiwiki/__init__.py
View File

@ -76,7 +76,8 @@ def add_shortcuts():
sites = [name for name in sites if name != ''] sites = [name for name in sites if name != '']
for site in sites: for site in sites:
frontpage.add_shortcut( frontpage.add_shortcut(
'ikiwiki_' + site, site, '/ikiwiki/' + site, 'glyphicon-edit') 'ikiwiki_' + site, site, '/ikiwiki/' + site, 'glyphicon-edit',
login_required=False)
def is_enabled(): def is_enabled():

2
plinth/modules/minetest/__init__.py
View File

@ -75,7 +75,7 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut('minetest', title, None, 'glyphicon-th-large', frontpage.add_shortcut('minetest', title, None, 'glyphicon-th-large',
description) description, login_required=False)
def enable(): def enable():

2
plinth/modules/mumble/__init__.py
View File

@ -80,7 +80,7 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut('mumble', title, None, 'glyphicon-headphones', frontpage.add_shortcut('mumble', title, None, 'glyphicon-headphones',
description) description, login_required=False)
def enable(): def enable():

2
plinth/modules/privoxy/__init__.py
View File

@ -84,7 +84,7 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut('privoxy', title, None, 'glyphicon-cloud-upload', frontpage.add_shortcut('privoxy', title, None, 'glyphicon-cloud-upload',
description) description, login_required=True)
def enable(): def enable():

2
plinth/modules/quassel/__init__.py
View File

@ -88,7 +88,7 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut('quassel', title, None, 'glyphicon-retweet', frontpage.add_shortcut('quassel', title, None, 'glyphicon-retweet',
description) description, login_required=True)
def enable(): def enable():

2
plinth/modules/radicale/__init__.py
View File

@ -78,7 +78,7 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut('radicale', title, None, 'glyphicon-calendar', frontpage.add_shortcut('radicale', title, None, 'glyphicon-calendar',
description) description, login_required=True)
def enable(): def enable():

2
plinth/modules/repro/__init__.py
View File

@ -92,7 +92,7 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut('repro', title, None, 'glyphicon-phone-alt', frontpage.add_shortcut('repro', title, None, 'glyphicon-phone-alt',
description) description, login_required=True)
def enable(): def enable():

3
plinth/modules/roundcube/__init__.py
View File

@ -85,7 +85,8 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut( frontpage.add_shortcut(
'roundcube', title, '/roundcube', 'glyphicon-envelope') 'roundcube', title, '/roundcube', 'glyphicon-envelope',
login_required=True)
def is_enabled(): def is_enabled():

3
plinth/modules/shaarli/__init__.py
View File

@ -70,7 +70,8 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut('shaarli', title, '/shaarli', 'glyphicon-bookmark') frontpage.add_shortcut('shaarli', title, '/shaarli', 'glyphicon-bookmark',
login_required=True)
def is_enabled(): def is_enabled():

3
plinth/modules/transmission/__init__.py
View File

@ -79,7 +79,8 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut( frontpage.add_shortcut(
'transmission', title, '/transmission', 'glyphicon-save') 'transmission', title, '/transmission', 'glyphicon-save',
login_required=True)
def is_enabled(): def is_enabled():

3
plinth/modules/ttrss/__init__.py
View File

@ -74,7 +74,8 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut('ttrss', title, '/tt-rss', 'glyphicon-envelope') frontpage.add_shortcut('ttrss', title, '/tt-rss', 'glyphicon-envelope',
login_required=True)
def is_enabled(): def is_enabled():

5
plinth/modules/xmpp/__init__.py
View File

@ -91,9 +91,10 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut('jsxc', _('Chat Client (jsxc)'), frontpage.add_shortcut('jsxc', _('Chat Client (jsxc)'),
reverse_lazy('xmpp:jsxc'), 'glyphicon-comment') reverse_lazy('xmpp:jsxc'), 'glyphicon-comment',
login_required=False)
frontpage.add_shortcut('xmpp', title, None, 'glyphicon-comment', frontpage.add_shortcut('xmpp', title, None, 'glyphicon-comment',
description) description, login_required=True)
def is_enabled(): def is_enabled():

32
plinth/templates/index.html
View File

@ -26,21 +26,23 @@
{% if shortcuts %} {% if shortcuts %}
{% for shortcut in shortcuts %} {% for shortcut in shortcuts %}
<div class="col-sm-4"> {% if user.is_authenticated or shortcut.login_required is False %}
<ul class="nav nav-pills nav-stacked"> <div class="col-sm-4">
{% if selected_id == shortcut.id %} <ul class="nav nav-pills nav-stacked">
<li class="active"> {% if selected_id == shortcut.id %}
<a href="{{ shortcut.url }}" class="active"> <li class="active">
{% else %} <a href="{{ shortcut.url }}" class="active">
<li> {% else %}
<a href="{{ shortcut.url }}"> <li>
{% endif %} <a href="{{ shortcut.url }}">
<span class="{{ shortcut.icon }} glyphicon"></span> {% endif %}
{{ shortcut.label }} <span class="{{ shortcut.icon }} glyphicon"></span>
</a> {{ shortcut.label }}
</li> </a>
</ul> </li>
</div> </ul>
</div>
{% endif %}
{% endfor %} {% endfor %}
{% else %} {% else %}