Self hosted FLOSS fitness/workout, nutrition and weight tracker
Further integration of bootstrap
Roland Geidere6029417f3d4
diff --git a/wger/core/templates/misc/contact.html b/wger/core/templates/misc/contact.htmlindex 7515282d2..160dad8df 100644--- a/wger/core/templates/misc/contact.html+++ b/wger/core/templates/misc/contact.html@@ -6,55 +6,48 @@{% block content %}-<div class="ym-grid linearize-level-1">- <div class="ym-g66 ym-gl">- <div class="ym-gbox-left">-+<div class="row">+ <div class="col-md-6"><p>{% blocktrans %}Thank you for your interest. Feel free to use any of theways below to send feedback you have about any aspect of the site. Forsupport, it's better to use the mailing list(<a href="mailto:[email protected]">[email protected]</a>), to reporta bug, consider doing it through the <a href="{{issues}}">issue tracker</a>.{% endblocktrans %}</p>-- </div></div>- <div class="ym-g33 ym-gl">- <div class="ym-gbox-left alert alert-block alert-info">++ <div class="col-md-6">+ <div class="alert alert-block alert-info">{% blocktrans %}If you want to further help and improve this project,you might also be interested <a href="{{contribute}}">in contributing</a>.{% endblocktrans %}</div></div>-</div>-<div class="ym-grid linearize-level-1">- <div class="ym-g33 ym-gl">- <div class="ym-gbox-left">+</div>+<div class="row">+ <div class="col-md-4"><h3>{% trans "Feedback form" %}</h3><p>{% blocktrans %}A simple contact form. Remember thatif you want an answer, you need to include some way to contact you.{% endblocktrans %}</p><p><a class="btn" href="{{feedback}}">{% trans "Open feedback form" %}</a></p>- </div></div>- <div class="ym-g33 ym-gl">- <div class="ym-gbox-left">+ <div class="col-md-4"><h3>{% trans "Twitter" %}</h3><p>{% blocktrans %}We are also on twitter. Write us and tell us whatyou think! Except patches, don't send patches via twitter.{% endblocktrans %}</p><p><a href="https://twitter.com/wger_de"class="btn twitter-mention-button">{% trans "tweet to @wger_de" %}</a></p>- </div></div>- <div class="ym-g33 ym-gl">- <div class="ym-gbox-left">- <h3>{% trans "Forum / Mailing list" %}</h3>- <p>{% blocktrans %}Use the public group to get support for your+++ <div class="col-md-4">+ <h3>{% trans "Forum / Mailing list" %}</h3>+ <p>{% blocktrans %}Use the public group to get support for yourlocal wger installation, discuss issues or your new idea, etc.(no registration needed){% endblocktrans %}</p>- <p><a href="https://groups.google.com/group/wger" class="btn">{% trans "Go to mailing list" %}</a></p>- </div>+ <p><a href="https://groups.google.com/group/wger" class="btn">{% trans "Go to mailing list" %}</a></p></div></div>diff --git a/wger/core/templates/user/api_key.html b/wger/core/templates/user/api_key.htmlindex b1cbdb36f..601ce1017 100644--- a/wger/core/templates/user/api_key.html+++ b/wger/core/templates/user/api_key.html@@ -22,7 +22,7 @@ https://wger.de/api/v1/workout/?username={{user.username}}&api_key={% if key %}{</pre></p>-<table>+<table class="table"><tr><td>{% trans "Your API key" %}@@ -56,16 +56,16 @@ https://wger.de/api/v1/workout/?username={{user.username}}&api_key={% if key %}{<p>{% if key %}- <a href="{% url 'core:api-key' %}?new_key=true" class="btn btn-block">{% trans 'Delete current API key and generate new one' %}</a>+ <a href="{% url 'core:api-key' %}?new_key=true" class="btn btn-block btn-default">{% trans 'Delete current API key and generate new one' %}</a>{% else %}- <a href="{% url 'core:api-key' %}?new_key=true" class="btn btn-block">{% trans 'Generate new API key' %}</a>+ <a href="{% url 'core:api-key' %}?new_key=true" class="btn btn-block btn-default">{% trans 'Generate new API key' %}</a>{% endif %}</p><p>- <a href="{% url 'software:api' %}" class="btn btn-block">{% trans 'Documentation' %}</a>+ <a href="{% url 'software:api' %}" class="btn btn-block btn-default">{% trans 'Documentation' %}</a></p>{% endblock %}diff --git a/wger/core/templates/user/preferences.html b/wger/core/templates/user/preferences.htmlindex 6a9096d58..d7dcc8f57 100644--- a/wger/core/templates/user/preferences.html+++ b/wger/core/templates/user/preferences.html@@ -8,9 +8,9 @@{% block header %}<script>$(function() {- $("#preferences-accordion").accordion({- heightStyle: "content"- });+ //$("#preferences-accordion").accordion({+ // heightStyle: "content"+ //});});</script>{% endblock %}@@ -20,45 +20,82 @@ $(function() {{% block content %}<form action="{% url 'core:preferences' %}"method="post"- class="ym-form">+ class="form-horizontal">{% csrf_token %}{{ form.non_field_errors }}- <div id="preferences-accordion">- <h3>{% trans "Email" %}</h3>- <div>- <table>+ <div class="panel-group" id="preferences-accordion">++ <div class="panel panel-default">+ <div class="panel-heading">+ <h3 class="panel-title">+ <a data-toggle="collapse" data-parent="#preferences-accordion" href="#collapseEmail">+ {% trans "Email" %}+ </a>+ </h3>+ </div>+ <div id="collapseEmail" class="panel-collapse collapse in">+ <div class="panel-body">{% yaml_form_field email_form.email %}- </table>+ </div>+ </div></div>- <h3>{% trans "Workout reminders" %}</h3>- <div>- <table>++ <div class="panel panel-default">+ <div class="panel-heading">+ <h3 class="panel-title">+ <a data-toggle="collapse" data-parent="#preferences-accordion" href="#collapseReminder">+ {% trans "Workout reminders" %}+ </a>+ </h3>+ </div>+ <div id="collapseReminder" class="panel-collapse collapse">+ <div class="panel-body">{% yaml_form_field form.workout_reminder_active %}{% yaml_form_field form.workout_duration %}{% yaml_form_field form.workout_reminder %}- </table>+ </div>+ </div></div>- <h3>{% trans "Gym mode" %} ({% trans "mobile version only" %})</h3>- <div>- <table>+ <div class="panel panel-default">+ <div class="panel-heading">+ <h3 class="panel-title">+ <a data-toggle="collapse" data-parent="#preferences-accordion" href="#collapseGymMode">+ {% trans "Gym mode" %} ({% trans "mobile version only" %})+ </a>+ </h3>+ </div>+ <div id="collapseGymMode" class="panel-collapse collapse">+ <div class="panel-body">{% yaml_form_field form.timer_active %}{% yaml_form_field form.timer_pause %}- </table>+ </div>+ </div></div>- <h3>{% trans "Other settings" %}</h3>- <div>- <table>++ <div class="panel panel-default">+ <div class="panel-heading">+ <h3 class="panel-title">+ <a data-toggle="collapse" data-parent="#preferences-accordion" href="#collapseOther">+ {% trans "Other settings" %}+ </a>+ </h3>+ </div>+ <div id="collapseOther" class="panel-collapse collapse">+ <div class="panel-body">{% yaml_form_field form.notification_language "ym-fbox-select" %}{% yaml_form_field form.show_comments %}{% yaml_form_field form.show_english_ingredients %}- </table>+ </div>+ </div></div></div>- <input type="submit" value="{% trans 'Save' %}">+ <div class="form-group">+ <input type="submit" value="{% trans 'Save' %}" id="form-save" class="btn btn-default btn-block">+ </div></form>{% endblock %}