icons updated

This commit is contained in:
mridulnagpal 2016-12-18 02:58:16 +05:30 committed by James Valleroy
parent 071058b427
commit 8d5fc5f1c4
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
16 changed files with 22 additions and 25 deletions

View File

@ -27,15 +27,15 @@ 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, configure_url=None, def add_shortcut(id, label, url, details=None, configure_url=None,
login_required=False, icon_url=None): login_required=False, icon=None):
"""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)
if not icon_url: if not icon:
icon_url = id icon = id
shortcuts[id] = { shortcuts[id] = {
'id': id, 'id': id,
@ -45,7 +45,6 @@ def add_shortcut(id, label, url, icon, details=None, configure_url=None,
'login_required': login_required, 'login_required': login_required,
'details': details, 'details': details,
'configure_url': configure_url, 'configure_url': configure_url,
'icon_url': icon_url,
} }

View File

@ -82,7 +82,7 @@ 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',
login_required=True) login_required=True)

View File

@ -83,8 +83,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,
login_required=False, icon_url='ikiwiki') login_required=False, icon='ikiwiki')
def is_enabled(): def is_enabled():

View File

@ -89,7 +89,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,
description, reverse_lazy('minetest:index'), description, reverse_lazy('minetest:index'),
login_required=False) login_required=False)

View File

@ -89,7 +89,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,
description, reverse_lazy('mumble:index'), description, reverse_lazy('mumble:index'),
login_required=False) login_required=False)

View File

@ -94,7 +94,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,
description, reverse_lazy('privoxy:index'), description, reverse_lazy('privoxy:index'),
login_required=True) login_required=True)

View File

@ -95,7 +95,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,
description, reverse_lazy('quassel:index'), description, reverse_lazy('quassel:index'),
login_required=True) login_required=True)

View File

@ -87,7 +87,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,
description, reverse_lazy('radicale:index'), description, reverse_lazy('radicale:index'),
login_required=True) login_required=True)

View File

@ -101,7 +101,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,
description, reverse_lazy('repro:index'), description, reverse_lazy('repro:index'),
login_required=True) login_required=True)

View File

@ -92,7 +92,7 @@ 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',
login_required=True) login_required=True)

View File

@ -77,7 +77,7 @@ 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',
login_required=True) login_required=True)

View File

@ -88,7 +88,7 @@ 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',
login_required=True) login_required=True)

View File

@ -83,7 +83,7 @@ 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',
login_required=True) login_required=True)

View File

@ -99,9 +99,9 @@ def setup(helper, old_version=None):
def add_shortcut(): def add_shortcut():
frontpage.add_shortcut('jsxc', _('Chat Client \n (jsxc)'), frontpage.add_shortcut('jsxc', _('Chat Client \n (jsxc)'),
reverse_lazy('xmpp:jsxc'), 'glyphicon-comment', reverse_lazy('xmpp:jsxc'),
None, login_required=True) None, login_required=True)
frontpage.add_shortcut('xmpp', title, None, 'glyphicon-comment', frontpage.add_shortcut('xmpp', title, None,
description, reverse_lazy('xmpp:index'), description, reverse_lazy('xmpp:index'),
login_required=True) login_required=True)

View File

@ -38,7 +38,7 @@
<a href="{{ shortcut.url }}"> <a href="{{ shortcut.url }}">
{% endif %} {% endif %}
<center> <center>
<img src="{% static 'theme/icons/' %}{{ shortcut.icon_url }}.png" style="max-width: 100px; height: 100px" /> <img src="{% static 'theme/icons/' %}{{ shortcut.icon }}.png" style="max-width: 100px; height: 100px" />
<br> <br>
{{ shortcut.label|linebreaks }} {{ shortcut.label|linebreaks }}
</center> </center>

View File

@ -38,12 +38,11 @@ def index(request):
shortcuts = frontpage.get_shortcuts() shortcuts = frontpage.get_shortcuts()
selection = request.GET.get('selected') selection = request.GET.get('selected')
details, details_label, configure_url, icon_url = None, None, None, None details, details_label, configure_url= None, None, None
if selection in frontpage.shortcuts: if selection in frontpage.shortcuts:
details = frontpage.shortcuts[selection]['details'] details = frontpage.shortcuts[selection]['details']
details_label = frontpage.shortcuts[selection]['label'] details_label = frontpage.shortcuts[selection]['label']
configure_url = frontpage.shortcuts[selection]['configure_url'] configure_url = frontpage.shortcuts[selection]['configure_url']
icon_url = frontpage.shortcuts[selection]['icon_url']
return TemplateResponse(request, 'index.html', return TemplateResponse(request, 'index.html',
{'title': _('FreedomBox'), {'title': _('FreedomBox'),
@ -51,8 +50,7 @@ def index(request):
'selected_id': selection, 'selected_id': selection,
'details': details, 'details': details,
'details_label': details_label, 'details_label': details_label,
'configure_url': configure_url, 'configure_url': configure_url })
'icon_url': icon_url, })
class ServiceView(FormView): class ServiceView(FormView):