Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Further integration of bootstrap

Roland Geider5c933a68e0f5
diff --git a/wger/config/templates/language/overview.html b/wger/config/templates/language/overview.html
index e3a1cbb65..eff92f514 100644
--- a/wger/config/templates/language/overview.html
+++ b/wger/config/templates/language/overview.html
@@ -7,7 +7,7 @@
{% block content %}
-<table>
+<table class="table">
<thead>
<tr>
<th>{% trans "Language short name" %}</th>
diff --git a/wger/config/templates/language/view.html b/wger/config/templates/language/view.html
index 8f56e6c2e..66d70d33f 100644
--- a/wger/config/templates/language/view.html
+++ b/wger/config/templates/language/view.html
@@ -7,7 +7,7 @@
{% block content %}
-<table>
+<table class="table">
<thead>
<tr>
<th>{% trans "Language short name" %}</th>
@@ -29,7 +29,7 @@ exercises and ingredients will be shown for the current language (for example
the exercises should be shown in languages A, B and C; the ingredients only
in A).{% endblocktrans %}</p>
-<table>
+<table class="table">
<thead>
<tr>
<th>{% trans "Language full name" %}</th>
@@ -40,7 +40,7 @@ in A).{% endblocktrans %}</p>
{% for config in view_language.language_source.all %}
{% ifchanged config.get_item_display %}
<tr>
- <td colspan="2" style="text-align:center; background-color:#eeeeec;">{{config.get_item_display}}</td>
+ <td colspan="2" class="active" style="text-align:center;">{{config.get_item_display}}</td>
</tr>
{% endifchanged %}
<tr>
diff --git a/wger/core/templates/license/list.html b/wger/core/templates/license/list.html
index 45faf5dff..d21333b32 100644
--- a/wger/core/templates/license/list.html
+++ b/wger/core/templates/license/list.html
@@ -8,7 +8,7 @@
{% block content %}
-<table>
+<table class="table">
<thead>
<tr>
<th>{% trans "Actions" %}</th>
diff --git a/wger/exercises/templates/equipment/list.html b/wger/exercises/templates/equipment/list.html
index d9382245f..77f31a6bf 100644
--- a/wger/exercises/templates/equipment/list.html
+++ b/wger/exercises/templates/equipment/list.html
@@ -8,7 +8,7 @@
{% block content %}
-<table>
+<table class="table">
<thead>
<tr>
<th>{% trans "Actions" %}</th>
diff --git a/wger/exercises/templates/exercise/pending.html b/wger/exercises/templates/exercise/pending.html
index 300f44ce9..a0cf9c2d9 100644
--- a/wger/exercises/templates/exercise/pending.html
+++ b/wger/exercises/templates/exercise/pending.html
@@ -8,7 +8,7 @@
{% block content %}
-<table>
+<table class="table">
<thead>
<tr>
<th>{% trans "Submission date" %}</th>
diff --git a/wger/nutrition/static/js/nutrition.js b/wger/nutrition/static/js/nutrition.js
index 2deafdd09..868c4087d 100644
--- a/wger/nutrition/static/js/nutrition.js
+++ b/wger/nutrition/static/js/nutrition.js
@@ -22,10 +22,9 @@
function update_ingredient_value(url)
{
- form_data = $('#nutritional-values-form').serializeArray();
+ var form_data = $('#nutritional-values-form').serializeArray();
$.post(url, form_data, function(data) {
- console.log(data);
// Show any validation errors
$('#calculator-errors').html('');
if (data['errors'])
@@ -44,7 +43,7 @@ function update_ingredient_value(url)
$('#value-fat-saturated').html(parseFloat(data['fat_saturated']).toFixed(2));
$('#value-fibres').html(parseFloat(data['fibres']).toFixed(2));
$('#value-sodium').html(parseFloat(data['sodium']).toFixed(2));
- });
+ });
}
function init_ingredient_detail(url)
diff --git a/wger/nutrition/templates/ingredient/overview.html b/wger/nutrition/templates/ingredient/overview.html
index c23b4df9d..f1e5bab0a 100644
--- a/wger/nutrition/templates/ingredient/overview.html
+++ b/wger/nutrition/templates/ingredient/overview.html
@@ -30,13 +30,11 @@ $(document).ready(function() {
{% block content %}
{% if ingredients_list %}
-<ul>
+<div class="list-group">
{% for ingredient in ingredients_list %}
- <li>
- <a href="{{ ingredient.get_absolute_url }}">{{ ingredient.name }}</a>
- </li>
+ <a class="list-group-item" href="{{ ingredient.get_absolute_url }}">{{ ingredient.name }}</a>
{% endfor %}
-</ul>
+</div>
{% else %}
<p>
<a href="{% url 'ingredient-add' %}" class="btn btn-block">
diff --git a/wger/nutrition/templates/ingredient/pending.html b/wger/nutrition/templates/ingredient/pending.html
index b30f1070d..ae9ce4620 100644
--- a/wger/nutrition/templates/ingredient/pending.html
+++ b/wger/nutrition/templates/ingredient/pending.html
@@ -8,7 +8,7 @@
{% block content %}
-<table>
+<table class="table">
<thead>
<tr>
<th>{% trans "Submission date" %}</th>
diff --git a/wger/nutrition/templates/ingredient/view.html b/wger/nutrition/templates/ingredient/view.html
index 5234e85ec..f9ef8d907 100644
--- a/wger/nutrition/templates/ingredient/view.html
+++ b/wger/nutrition/templates/ingredient/view.html
@@ -27,31 +27,27 @@ the search.{% endblocktrans %}
</p>
{% if perms.exercises %}
-<div class="ym-grid linearize-level-1">
- <div class="ym-g50 ym-gl">
- <div class="ym-gbox-left">
- <div class="alert alert-success">
- <a href="{% url 'ingredient-accept' ingredient.id %}">
- <img src="{% static 'images/icons/status-on.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Accept' %}">
- {% trans "Accept" %}
- </a>
- </div>
+<div class="row">
+ <div class="col-md-6">
+ <div class="alert alert-success">
+ <a href="{% url 'ingredient-accept' ingredient.id %}">
+ <img src="{% static 'images/icons/status-on.svg' %}"
+ width="32"
+ height="32"
+ alt="{% trans 'Accept' %}">
+ {% trans "Accept" %}
+ </a>
</div>
</div>
- <div class="ym-g50 ym-gl">
- <div class="ym-gbox-left">
- <div class="alert alert-error">
- <a href="{% url 'ingredient-decline' ingredient.id %}">
- <img src="{% static 'images/icons/status-off.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Decline' %}">
- {% trans "Decline" %}
- </a>
- </div>
+ <div class="col-md-6">
+ <div class="alert alert-error">
+ <a href="{% url 'ingredient-decline' ingredient.id %}">
+ <img src="{% static 'images/icons/status-off.svg' %}"
+ width="32"
+ height="32"
+ alt="{% trans 'Decline' %}">
+ {% trans "Decline" %}
+ </a>
</div>
</div>
</div>
@@ -66,31 +62,31 @@ the search.{% endblocktrans %}
<div itemscope itemtype="http://schema.org/NutritionInformation">
<meta itemprop="name" content="{{ingredient.name}}" />
-<form class="ym-form"
+<form class="form-horizontal"
method="post"
action="{% url 'ingredient-get-values' ingredient.id %}"
id="nutritional-values-form"
style="background-color: transparent; border-width: 0px; box-shadow: 0px 0px 0px 0px transparent;">
{% csrf_token %}
<div id="calculator-errors" class="ym-error"></div>
- <input type="hidden" value="{{ingredient.id}}" name="ingredient"></input>
+ <input type="hidden" value="{{ingredient.id}}" name="ingredient">
- <div class="ym-grid">
- <div class="ym-g33 ym-gl" style="text-align:right;">
+ <div class="row">
+ <div class="col-md-4" style="text-align:right;">
{% trans 'Nutritional values in' %}
</div>
- <div class="ym-g33 ym-gl">
- <div class="ym-fbox-text {% if form.amount.errors %}ym-error{% endif %}">{{form.amount}}</div>
+ <div class="col-md-4">
+ <div class="ym-fbox-text {% if form.amount.errors %}ym-error{% endif %}">{{form.amount|form_field_add_css:'form-control'}}</div>
</div>
- <div class="ym-g33 ym-gl">
- <div class="ym-fbox-select {% if form.unit.errors %}ym-error{% endif %}">{{form.unit}}</div>
+ <div class="col-md-4">
+ <div class="ym-fbox-select {% if form.unit.errors %}ym-error{% endif %}">{{form.unit|form_field_add_css:'form-control'}}</div>
</div>
</div>
</form>
-<table>
+<table class="table">
<thead>
<tr>
<th colspan="2">
@@ -146,7 +142,7 @@ the search.{% endblocktrans %}
</tbody>
</table>
-<table>
+<table class="table">
<thead>
<tr>
<th colspan="2">
diff --git a/wger/nutrition/templates/plan/overview.html b/wger/nutrition/templates/plan/overview.html
index a475e143a..6a85aeb86 100644
--- a/wger/nutrition/templates/plan/overview.html
+++ b/wger/nutrition/templates/plan/overview.html
@@ -7,7 +7,7 @@
{% block content %}
{% if plans %}
- <table>
+<table class="table">
<thead>
<tr>
<th>{% trans "Description" %}</th>
diff --git a/wger/nutrition/templates/plan/view.html b/wger/nutrition/templates/plan/view.html
index 7033c23e6..14daa9e0f 100644
--- a/wger/nutrition/templates/plan/view.html
+++ b/wger/nutrition/templates/plan/view.html
@@ -31,10 +31,10 @@ $(document).ready(function() {
</p>
{% endif %}
-<table class="bordertable">
+<table class="table table-bordered">
<thead>
- <tr>
- <th class="ym-g15">{% trans "Meal" %}</th>
+ <tr style="background: #E0E0E0;">
+ <th>{% trans "Meal" %}</th>
<th>{% trans "Contents" %}</th>
<th>{% trans "Energy" %}</th>
<th>{% trans "Protein" %}</th>
@@ -176,7 +176,7 @@ $(document).ready(function() {
<h3>{% trans "Nutritional data" %}</h3>
-<table>
+<table class="table table-condensed">
<thead>
<tr>
<th>{% trans "Macronutrients" %}</th>
@@ -247,7 +247,7 @@ $(document).ready(function() {
{% block sidebar %}
<h3>{% trans "Energy" %}</h3>
-<table id="nutritional-data-energy">
+<table class="table table-condensed" id="nutritional-data-energy">
<thead>
<tr>
<th>{% trans "Energy" %}</th>
diff --git a/wger/nutrition/templates/rate/form.html b/wger/nutrition/templates/rate/form.html
index 4cf5258df..440ab00b7 100644
--- a/wger/nutrition/templates/rate/form.html
+++ b/wger/nutrition/templates/rate/form.html
@@ -28,7 +28,7 @@ at rest. This is the minimum energy needed for the body to function, without any
additional physical activity.{% endblocktrans %}</p>
<form action="{% url 'calories-calculate-bmr' %}"
method="post"
- class="ym-form calories-autoform"
+ class="calories-autoform"
id="bmr-form">
{% csrf_token %}
@@ -77,24 +77,19 @@ required per day.{% endblocktrans %}</p>
{% endif %}
-<table>
+
{% yaml_form_field form_activities.sleep_hours %}
-</table>
-<div class="ym-grid linearize-level-1">
- <div class="ym-g50 ym-gl">
- <table>
+<div class="row">
+ <div class="col-md-6">
{% yaml_form_field form_activities.work_hours %}
{% yaml_form_field form_activities.sport_hours %}
{% yaml_form_field form_activities.freetime_hours %}
- </table>
</div>
- <div class="ym-g50 ym-gl">
- <table>
- {% yaml_form_field form_activities.work_intensity "ym-fbox-select" %}
- {% yaml_form_field form_activities.sport_intensity "ym-fbox-select" %}
- {% yaml_form_field form_activities.freetime_intensity "ym-fbox-select" %}
- </table>
+ <div class="col-md-6">
+ {% yaml_form_field form_activities.work_intensity %}
+ {% yaml_form_field form_activities.sport_intensity %}
+ {% yaml_form_field form_activities.freetime_intensity %}
</div>
</div>
@@ -116,14 +111,14 @@ needs based on your level of physical activity.{% endblocktrans %}</p>
class="ym-form calories-autoform"
id="base-calories-form">
{% csrf_token %}
-<table>
+<table class="table">
<tr>
<td>{% trans "Basic caloric intake" %}</td>
<td><span id="id_base_calories"></span></td>
</tr>
<tr>
<td colspan="2">
- <input type="submit" value="{% trans 'Calculate basic caloric intake' %}" id="form-calculate-daily-calories">
+ <input type="submit" class="btn btn-default btn-block" value="{% trans 'Calculate basic caloric intake' %}" id="form-calculate-daily-calories">
</td>
</tr>
</table>
@@ -136,28 +131,25 @@ you might just enter yourself the amount of calories if you know the value.{% en
</p>
<form action="{% url 'calories-calculate-total' %}"
method="post"
- class="ym-form"
+ class=""
id="total-calories-form">
-{% csrf_token %}
-<table>
- {% yaml_form_field form_calories.additional_calories %}
+ <div class="row">
+ {% csrf_token %}
+ {% yaml_form_field form_calories.additional_calories %}
{% yaml_form_field form_calories.calories %}
- <tr>
- <td colspan="2">
- <input type="submit" value="{% trans 'Transfer basic intake to total daily calories' %}" id="form-transfer-calories">
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <input type="submit" value="{% trans 'Add additional calories to total daily calories' %}" id="add-calories-total">
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <input type="submit" value="{% trans 'Save total calories to profile' %}" id="form-update-calories">
- </td>
- </tr>
-</table>
+
+ <div class="col-md-12">
+ <input type="submit" class="btn btn-default btn-block" value="{% trans 'Transfer basic intake to total daily calories' %}" id="form-transfer-calories">
+ </div>
+
+ <div class="col-md-12">
+ <input type="submit" class="btn btn-default btn-block" value="{% trans 'Add additional calories to total daily calories' %}" id="add-calories-total">
+ </div>
+
+ <div class="col-md-12">
+ <input type="submit" class="btn btn-default btn-block" value="{% trans 'Save total calories to profile' %}" id="form-update-calories">
+ </div>
+ </div>
</form>
diff --git a/wger/nutrition/templates/units/list.html b/wger/nutrition/templates/units/list.html
index bf6031573..3af30e16d 100644
--- a/wger/nutrition/templates/units/list.html
+++ b/wger/nutrition/templates/units/list.html
@@ -8,7 +8,7 @@
{% block content %}
-<table>
+<table class="table">
<thead>
<tr>
<th>{% trans "Actions" %}</th>
diff --git a/wger/software/templates/api.html b/wger/software/templates/api.html
index c07f18614..88cec5310 100644
--- a/wger/software/templates/api.html
+++ b/wger/software/templates/api.html
@@ -25,8 +25,8 @@ it along with the username either in the header or in form of GET parameters.
See the link on the sidebar for details.</p>
-<div class="ym-grid linearize-level-1">
- <div class="ym-g50 ym-gl">
+<div class="row">
+ <div class="col-md-6">
<h4>Public endpoints</h4>
<ul>
<li>daysofweek</em></li>
@@ -43,7 +43,7 @@ See the link on the sidebar for details.</p>
<li>license</li>
</ul>
</div>
- <div class="ym-g50 ym-gl">
+ <div class="col-md-6">
<h4>Private endpoints</h4>
<ul>
<li>day</li>
@@ -86,10 +86,10 @@ to make exploration/discovery easier.</p>
<h4>Getting A Collection Of Resources</h4>
-<code>
+<pre>
curl https://wger.de/api/v1/exercise/ | python -m json.tool
curl https://wger.de/api/v1/exercise/schema/ | python -m json.tool
-</code>
+</pre>
<ul>
@@ -130,7 +130,7 @@ can just specify the IDs you want or provide an offset.</p>
<p>Some examples:</p>
-<code>
+<pre>
curl https://wger.de/api/v1/exercise/?name__istartswith=bicep | python -m json.tool
curl https://wger.de/api/v1/exercise/?status__in=2,4,5 | python -m json.tool
curl https://wger.de/api/v1/exercise/?language=1 | python -m json.tool
@@ -140,7 +140,9 @@ curl https://wger.de/api/v1/exercise/1/ | python -m json.tool
# quoting needed for bash
curl "https://wger.de/api/v1/exercise/set/1;3/" | python -m json.tool
curl "https://wger.de/api/v1/exercise/?offset=20&limit=20" | python -m json.tool
-</code>
+
+# Note: the "| python -m json.tool" is only for formatting the returned JSON
+</pre>
<p></p>
{% endblock %}
@@ -153,6 +155,6 @@ This is also new for us, if you plan on using the API,
<a href="https://groups.google.com/group/wger">we'd love to hear from you</a>.
</div>
-<p><a href="/api/v1/?format=json" class="btn btn-block" rel="nofollow">Browse the API</a></p>
-<p><a href="{% url 'core:api-key' %}" class="btn btn-block">Generate API KEY</a></p>
+<p><a href="/api/v1/?format=json" class="btn btn-block btn-default" rel="nofollow">Browse the API</a></p>
+<p><a href="{% url 'core:api-key' %}" class="btn btn-block btn-default">Generate API KEY</a></p>
{% endblock %}
diff --git a/wger/software/templates/code.html b/wger/software/templates/code.html
index 5014666d6..64a997786 100644
--- a/wger/software/templates/code.html
+++ b/wger/software/templates/code.html
@@ -16,7 +16,7 @@
installation instructions see below.{% endblocktrans %}</p>
<p>
-<a class="btn btn-primary"
+<a class="btn btn-primary btn-block"
href="https://pypi.python.org/packages/source/w/wger/wger-1.4.tar.gz">
{% trans "download stable version:" %} 1.4</a>
</p>
@@ -31,12 +31,12 @@ easy to set up, but you can skip this step if you don't mind installing all
dependencies system-wide (in that case, install django and the other applications
with a <code>sudo</code>).{% endblocktrans %}</p>
-<code>
+<pre>
$ sudo apt-get install python-virtualenv
$ sudo apt-get install python-dev
$ virtualenv python-django
$ source python-django/bin/activate
-</code>
+</pre>
<p>{% blocktrans %}Get the application from PyPI, initialise and start it.{% endblocktrans %}</p>
@@ -127,21 +127,21 @@ to install more packages if you want the thumbnailer to be able to read more
image formats, consult the documentation <a href="http://pillow.readthedocs.org">for pillow</a>
for more details):</p>
-<code>
+<pre>
$ sudo apt-get install python-virtualenv
$ sudo apt-get install python-dev
$ virtualenv python-django
$ source python-django/bin/activate
$ pip install -r requirements.txt
-</code>
+</pre>
<p>Get the code, create a superuser and start the webserver:</p>
-<code>
+<pre>
$ git clone https://github.com/rolandgeider/wger.git
$ cd wger
$ python start.py
-</code>
+</pre>
<p>That's it. You can either start the server again with
<code>start.py</code> or do it the django way with
@@ -260,7 +260,7 @@ $ python extras/scripts/create_local_settings.py
<p>Initialise the database, create a super user and load these
fixtures:</p>
-<code>
+<pre>
$ python manage.py syncdb
$ python manage.py migrate core
$ python manage.py migrate --all
@@ -275,7 +275,7 @@ $ python manage.py loaddata exercises
$ python manage.py loaddata ingredients
$ python manage.py loaddata weight_units
$ python manage.py loaddata ingredient_units
-</code>
+</pre>
<p>What you do next depends on the server you use and how you
want to serve the application (mod_wsgi, fastCGI). There is a sample <code>wsgi.py</code>
diff --git a/wger/software/templates/contribute.html b/wger/software/templates/contribute.html
index 62e368b74..ea00457bc 100644
--- a/wger/software/templates/contribute.html
+++ b/wger/software/templates/contribute.html
@@ -6,9 +6,8 @@
{% block title %}{% trans "Contribute!" %}{% endblock %}
{% block content %}
-<div class="ym-grid linearize-level-1">
-<div class="ym-g50 ym-gl">
- <div class="ym-gbox-left">
+<div class="row">
+ <div class="col-md-6">
<p>{% blocktrans %}wger Workout Manager is build by volunteers,
the development process is open and freely accessible to anybody interested.
If you are new to the free software world, we recommend to take a
@@ -21,100 +20,80 @@ Use this opportunity and influence the direction of the
project. {% endblocktrans %}</p>
</div>
-</div>
-<div class="ym-gl" style="width: 41%;">
- <div class="ym-gbox-left ym-clearfix">
-
-
- <div class="box success">
- <p style="text-align:center;"><strong>{% blocktrans %}The goal is to build an awesome
+ <div class="col-md-6">
+ <div class="panel panel-primary">
+ <div class="panel-heading">
+ <h3 class="panel-title">{% trans "Our goal" %}</h3>
+ </div>
+ <div class="panel-body">
+ <span style="text-align:center;"><strong>{% blocktrans %}The goal is to build an awesome
and flexible fitness manager, along with a comprehensive and complete list of exercises and
-ingredients, all released under a free license.{% endblocktrans %}</strong></p>
+ingredients, all released under a free license.{% endblocktrans %}</strong></span>
+ </div>
</div>
-
</div>
</div>
-</div>
-
-<div class="ym-grid linearize-level-1">
- <div class="ym-g25 ym-gl">
- <div class="ym-gbox-left">
- <h3>{% trans "Use the site" %}</h3>
- </div>
+<div class="row" style="margin-bottom: 1em;">
+ <div class="col-md-3">
+ <h3>{% trans "Use the site" %}</h3>
</div>
- <div class="ym-g66 ym-gl">
- <div class="ym-gbox-left">
+ <div class="col-md-9">
<p>{% blocktrans %}Simply use the site and tell your friends
how useful it is! ;) . When you find something that you specially liked,
could need some improvements or just doesn't work, tell us! This might not sound
like much, but is incredibly important!{% endblocktrans %}</p>
-<a class="btn " href="{% url 'core:contact' %}">{% trans "Get in touch" %} »</a>
-
- </div>
-
+<a class="btn btn-default" href="{% url 'core:contact' %}">{% trans "Get in touch" %} »</a>
</div>
</div>
-<div class="ym-grid linearize-level-1">
- <div class="ym-g25 ym-gl">
- <div class="ym-gbox-left">
- <h3>{% trans "Submit exercises" %}</h3>
- </div>
+<div class="row" style="margin-bottom: 1em;">
+ <div class="col-md-3">
+ <h3>{% trans "Submit exercises" %}</h3>
</div>
- <div class="ym-g66 ym-gl">
- <div class="ym-gbox-left">
+ <div class="col-md-9">
<p>{% blocktrans %}Submit those cool exercises that you absolutely
love and do every week but are not in the list yet. If you think some description
is too short or some other detail is missing or could be improved, tell!{% endblocktrans %}</p>
- {% if user.is_authenticated and not user.userprofile.is_temporary %}
- <a class="btn " href="{% url 'exercise-add' %}">{% trans "Add exercise" %} »</a>
- {% else %}
- <a class="btn disabled" href="#">{% trans "Only registered users can do this" %} »</a>
- {% endif %}
- </div>
+ {% if user.is_authenticated and not user.userprofile.is_temporary %}
+ <a class="btn btn-default" href="{% url 'exercise-add' %}">{% trans "Add exercise" %} »</a>
+ {% else %}
+ <a class="btn disabled btn-default" href="#">{% trans "Only registered users can do this" %} »</a>
+ {% endif %}
</div>
</div>
-<div class="ym-grid linearize-level-1">
- <div class="ym-g25 ym-gl">
- <div class="ym-gbox-left">
- <h3>{% trans "Translate" %}</h3>
- </div>
+<div class="row" style="margin-bottom: 1em;">
+ <div class="col-md-3">
+ <h3>{% trans "Translate" %}</h3>
</div>
- <div class="ym-g66 ym-gl">
- <div class="ym-gbox-left">
- <p>{% blocktrans %}Do you want to use wger in your own language?
+ <div class="col-md-9">
+ <p>{% blocktrans %}Do you want to use wger in your own language?
Do you think the current translation could be improved?
The translations are easily managed and edited online, if you are interested,
go to the transifex site, request access and we will set everything
up. {% endblocktrans %}</p>
-
- <a class="btn "
- href="https://www.transifex.com/projects/p/wger-workout-manager/">{% trans "Translate with Transifex" %} »</a>
- </div>
+
+ <a class="btn btn-default"
+ href="https://www.transifex.com/projects/p/wger-workout-manager/">{% trans "Translate with Transifex" %} »</a>
</div>
</div>
-<div class="ym-grid linearize-level-1">
- <div class="ym-g25 ym-gl">
- <div class="ym-gbox-left">
- <h3>{% trans "Code" %}</h3>
- </div>
+<div class="row" style="margin-bottom: 1em;">
+ <div class="col-md-3">
+ <h3>{% trans "Code" %}</h3>
</div>
- <div class="ym-g66 ym-gl">
- <div class="ym-gbox-left">
- <p>{% blocktrans %}Obviously, you are highly encouraged to clone the
+ <div class="col-md-9">
+ <p>{% blocktrans %}Obviously, you are highly encouraged to clone the
repo and start hacking! Once you are ready, send a pull request and we
will show the world. Take a look at the developer guide for more details
on this.{% endblocktrans %}</p>
-
- <a class="btn" href="{% url 'software:code' %}">{% trans "Get the code" %} »</a>
- </div>
+
+ <a class="btn btn-default" href="{% url 'software:code' %}">{% trans "Get the code" %} »</a>
</div>
</div>
diff --git a/wger/software/templates/license.html b/wger/software/templates/license.html
index af4cd20a8..af0a4c03e 100644
--- a/wger/software/templates/license.html
+++ b/wger/software/templates/license.html
@@ -10,28 +10,38 @@
<p>{% blocktrans %}wger Workout Manager is Free/Libre Open Source
Software (FLOSS).{% endblocktrans %}</p>
-
-<img src="{% static 'images/agpl-v3.svg' %}"
- width="88"
- height="31"
- alt="{% trans 'Released under the Affero GPL' %}"
- title="{% trans 'Released under the Affero GPL' %}"
- class="float-left">
-<p>{% blocktrans %}wger Workout Manager is released under the <strong>Affero GNU
+<div class="row">
+ <div class="col-md-2">
+ <img src="{% static 'images/agpl-v3.svg' %}"
+ width="88"
+ height="31"
+ alt="{% trans 'Released under the Affero GPL' %}"
+ title="{% trans 'Released under the Affero GPL' %}"
+ class="float-left">
+ </div>
+ <div class="col-md-10">
+ <p>{% blocktrans %}wger Workout Manager is released under the <strong>Affero GNU
General Public License (AGPL) Version 3+</strong> and can (under the conditions
of the license) be used, modified and distributed (also with modifications)
without restrictions.{% endblocktrans %}</p>
-
-<img src="{% static 'images/cc-by-sa.svg' %}"
- width="88"
- height="31"
- alt="{% trans 'CC-BY-SA' %}"
- title="{% trans 'CC-BY-SA' %}"
- class="float-left">
-<p>{% blocktrans %}The data fixtures with the exercise and ingredient lists are
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-md-2">
+ <img src="{% static 'images/cc-by-sa.svg' %}"
+ width="88"
+ height="31"
+ alt="{% trans 'CC-BY-SA' %}"
+ title="{% trans 'CC-BY-SA' %}"
+ class="float-left">
+ </div>
+ <div class="col-md-10">
+ <p>{% blocktrans %}The data fixtures with the exercise and ingredient lists are
released additionally under a <strong>Creative Commons Attribution Share Alike 3
(CC-BY-SA)</strong> license.</a>{% endblocktrans %}</p>
-
+ </div>
+</div>
<p>{% blocktrans %}A copy of both licenses is contained in every wger Workout
Manager release and can be read in the