Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove the banner for submitted exercises, info is in license box

Roland Geider0aa0155e9cbe
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index c962f361c..2847b3b93 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -306,16 +306,6 @@ weight_log_chart({{json|safe}}, "{{svg_uuid}}", "{{reps}}")
</p>
<hr>
-{% if exercise.status == exercise.EXERCISE_STATUS_ACCEPTED %}
-<div class="alert" style="margin-top:1em;">
-<h3>{% trans "User submitted exercise" %}</h3>
-{% with username=exercise.user %}
-<p>{% blocktrans %}This exercise was submitted by <strong>{{username}}</strong>.{% endblocktrans %}
-{% endwith %}
-</div>
-<hr>
-{% endif %}
-
{% if perms.exercises %}
<h3>{% trans "Options" %}</h3>
<p>
diff --git a/wger/exercises/templates/mobile/exercise/view.html b/wger/exercises/templates/mobile/exercise/view.html
index a2c7a8196..c326b5a27 100644
--- a/wger/exercises/templates/mobile/exercise/view.html
+++ b/wger/exercises/templates/mobile/exercise/view.html
@@ -342,16 +342,6 @@ $(document).ready(function() {
{% endif %}
-{% if exercise.status == exercise.EXERCISE_STATUS_ACCEPTED %}
-<div class="alert" style="margin-top:1em;">
-<h3>{% trans "User submitted exercise" %}</h3>
-{% with username=exercise.user %}
-<p>{% blocktrans %}This exercise was submitted by <strong>{{username}}</strong>.{% endblocktrans %}
-{% endwith %}
-</div>
-<hr>
-{% endif %}
-
{% license_sidebar exercise.license exercise.license_author %}
{% endblock %}
diff --git a/wger/nutrition/templates/ingredient/overview.html b/wger/nutrition/templates/ingredient/overview.html
index c19b60cf6..e23c25328 100644
--- a/wger/nutrition/templates/ingredient/overview.html
+++ b/wger/nutrition/templates/ingredient/overview.html
@@ -49,26 +49,9 @@ $(document).ready(function() {
<div style="padding-top:3em;"></div>
{% pagination paginator page_obj %}
-
-
{% endblock %}
{% block sidebar %}
-<h3>{% trans "Search" %}</h3>
-<div class="ui-widget">
- <form action="{% url 'ingredient-search' %}"
- method="get"
- id="search_form">
- {% csrf_token %}
- <input name="term"
- type="search"
- id="ingredient-search"
- class="ajax-form-element"
- placeholder="{% trans 'ingredient name' %}"
- style="width:100%;">
- </form>
-</div>
-
{% if user.is_authenticated and not user.userprofile.is_temporary %}
<h3>{% trans "Add ingredient" %}</h3>
<p>
@@ -83,4 +66,18 @@ $(document).ready(function() {
</p>
{% endif %}
+<h3>{% trans "Search" %}</h3>
+<div class="ui-widget">
+ <form action="{% url 'ingredient-search' %}"
+ method="get"
+ id="search_form">
+ {% csrf_token %}
+ <input name="term"
+ type="search"
+ id="ingredient-search"
+ class="ajax-form-element"
+ placeholder="{% trans 'ingredient name' %}"
+ style="width:100%;">
+ </form>
+</div>
{% endblock %}