Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Moved share button to footer

Malcolm Jones4e7a515b28f1
diff --git a/wger/core/templates/base_features.html b/wger/core/templates/base_features.html
index 0e0e48a98..ee89310c9 100644
--- a/wger/core/templates/base_features.html
+++ b/wger/core/templates/base_features.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% block template %}
- {% if show_shariff %}
+ <!-- {% if show_shariff %}
{% include 'misc/fragments/shariff_modal.html' %}
<button type="button"
@@ -14,7 +14,7 @@
{% trans "Share" %}
</button>
<div class="clearfix"></div>
- {% endif %}
+ {% endif %} -->
{% if messages and not no_messages %}
{% for message in messages %}
diff --git a/wger/core/templates/misc/license/list.html b/wger/core/templates/misc/license/list.html
new file mode 100644
index 000000000..ecd6bc507
--- /dev/null
+++ b/wger/core/templates/misc/license/list.html
@@ -0,0 +1,48 @@
+% extends "base.html" %}
+{% load i18n staticfiles wger_extras %}
+
+{% block title %}{% trans "License list" %}{% endblock %}
+
+
+{% block content %}
+<ul class="list-group">
+ {% for license in license_list %}
+ <li class="list-group-item ">
+ <div class="btn-group pull-right">
+ <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <span class="{% fa_class 'cog' %}"></span>
+ </button>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="{% url 'core:license:edit' license.id %}" class="wger-modal-dialog">{% trans 'Edit' %}</a>
+ </li>
+ <li>
+ <a href="{% url 'core:license:delete' license.id %}" class="wger-modal-dialog">{% trans 'Delete' %}</a>
+ </li>
+ </ul>
+ </div>
+ {{license}}
+ </li>
+ {% empty %}
+ <li class="list-group-item">
+ {% trans "Nothing found" %}
+ </li>
+ {% endfor %}
+</ul>
+{% endblock %}
+
+
+
+
+{% block sidebar %}
+{% if perms.core.add_license %}
+<p>
+ <a href="{% url 'core:license:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
+ {% trans "Add" %}
+ </a>
+</p>
+
+<p>{% blocktrans %}If a license has been localized, e.g. the Creative Commons
+licenses for the different countries, add them as separate entries here.{% endblocktrans %}</p>
+{% endif %}
+{% endblock %}
diff --git a/wger/core/templates/template_features.html b/wger/core/templates/template_features.html
index 157692e84..01b502e7f 100644
--- a/wger/core/templates/template_features.html
+++ b/wger/core/templates/template_features.html
@@ -104,6 +104,15 @@
<span class="{% fa_class 'globe' %}"></span>
</a>
</li>
+ <li>
+ {% if show_shariff %}
+ {% include 'misc/fragments/shariff_modal.html' %}
+ <a data-toggle="modal" href="#shariffModal" title="Share">
+ <span class="{% fa_class 'share-alt' %}"></span>
+ </a>
+ <div class="clearfix"></div>
+ {% endif %}
+ </li>
</ul>
</div>
<div class="col-md-4">