diff --git a/docs/changelog.rst b/docs/changelog.rst index 2d212d1e1..241613017 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -26,6 +26,7 @@ New languages: New features: * Add repetition (minutes, kilometer, etc.) and weight options (kg, lb, plates, until failure) to sets `#216`_ and `#217`_ +* Much improved landing page (thanks `@DeveloperMal`_) `#307`_ * Use the metricsgraphics library to more easily draw charts `#188`_ * Add extended PDF options to schedules as well (thanks `@alelevinas`_ ) `#272`_ * Show trained secondary muscles in workout view (thanks `@alokhan`_ ) `#282`_ @@ -70,6 +71,7 @@ Other improvements and bugfixes: `#25`_, `#243`_, `#279`_, `#275`_, `#270`_, `#2 .. _#302: https://github.com/wger-project/wger/issues/302 .. _#303: https://github.com/wger-project/wger/issues/303 .. _#304: https://github.com/wger-project/wger/issues/304 +.. _#307: https://github.com/wger-project/wger/issues/307 .. _#311: https://github.com/wger-project/wger/issues/311 .. _#312: https://github.com/wger-project/wger/issues/312 .. _#313: https://github.com/wger-project/wger/issues/313 @@ -80,6 +82,7 @@ Other improvements and bugfixes: `#25`_, `#243`_, `#279`_, `#275`_, `#270`_, `#2 .. _#324: https://github.com/wger-project/wger/issues/324 .. _#325: https://github.com/wger-project/wger/issues/325 .. _@petervanderdoes: https://github.com/petervanderdoes +.. _@DeveloperMal: https://github.com/DeveloperMal .. _@alelevinas: https://github.com/alelevinas .. _@jstoebel: https://github.com/jstoebel .. _@alokhan: https://github.com/alokhan diff --git a/wger/core/templates/mobile/index.html b/wger/core/templates/mobile/index.html index 52c718318..73e89cf8b 100644 --- a/wger/core/templates/mobile/index.html +++ b/wger/core/templates/mobile/index.html @@ -193,7 +193,7 @@ its default duration in your settings.{% endblocktrans %} data-toggle="modal" class="btn btn-default btn-block" style="white-space: normal;"> - +
{{plan}} diff --git a/wger/core/templates/template_features.html b/wger/core/templates/template_features.html index 01b502e7f..87a52d06c 100644 --- a/wger/core/templates/template_features.html +++ b/wger/core/templates/template_features.html @@ -45,10 +45,6 @@ {% endblock %} - - - - {% compress css %} diff --git a/wger/software/static/css/agency.css b/wger/software/static/css/agency.css index fdf943e57..3811173e1 100644 --- a/wger/software/static/css/agency.css +++ b/wger/software/static/css/agency.css @@ -3,9 +3,31 @@ * Copyright 2013-2016 Start Bootstrap * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap/blob/gh-pages/LICENSE) */ +@font-face { + font-family:"Open Sans Light"; + src:url("/static/fonts/OpenSans-Light.eot?") format("eot"), + url("/static/fonts/OpenSans-Light.woff") format("woff"), + url("/static/fonts/OpenSans-Light.ttf") format("truetype"), + url("/static/fonts/OpenSans-Light.svg#OpenSans-Light") format("svg"); + font-weight:normal; + font-style:normal; +} + +@font-face { + font-family:"Open Sans Bold"; + src:url("/static/fonts/OpenSans-Bold.eot?") format("eot"), + url("/static/fonts/OpenSans-Bold.woff") format("woff"), + url("/static/fonts/OpenSans-Bold.ttf") format("truetype"), + url("/static/fonts/OpenSans-Bold.svg#OpenSans-Bold") format("svg"); + font-weight:normal; + font-style:normal; +} + + body { overflow-x: hidden; - font-family: "Roboto Slab", "Helvetica Neue", Helvetica, Arial, sans-serif; + /*font-family: "Roboto Slab", "Helvetica Neue", Helvetica, Arial, sans-serif;*/ + font-family: font-family: "Open Sans Light", Arial, Helvetica, sans-serif; } .text-muted { color: #777777; @@ -45,7 +67,8 @@ h3, h4, h5, h6 { - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + /*font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;*/ + font-family: "Open Sans Bold", Arial, Helvetica, sans-serif; text-transform: uppercase; font-weight: 700; } @@ -62,7 +85,8 @@ h6 { color: white; background-color: #204a87; border-color: #204a87; - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + /*font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;*/ + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; text-transform: uppercase; font-weight: 700; } @@ -106,7 +130,7 @@ fieldset[disabled] .btn-primary.active { color: white; background-color: #204a87; border-color: #204a87; - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Bold", Arial, Helvetica, sans-serif; text-transform: uppercase; font-weight: 700; border-radius: 3px; @@ -155,7 +179,7 @@ fieldset[disabled] .btn-xl.active { } .navbar-custom .navbar-brand { color: #204a87; - font-family: "Kaushan Script", "Helvetica Neue", Helvetica, Arial, cursive; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; } .navbar-custom .navbar-brand:hover, .navbar-custom .navbar-brand:focus, @@ -169,7 +193,7 @@ fieldset[disabled] .btn-xl.active { .navbar-custom .navbar-toggle { background-color: #204a87; border-color: #204a87; - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; text-transform: uppercase; color: white; font-size: 12px; @@ -179,7 +203,7 @@ fieldset[disabled] .btn-xl.active { background-color: #204a87; } .navbar-custom .nav li a { - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; text-transform: uppercase; font-weight: 400; letter-spacing: 1px; @@ -245,14 +269,14 @@ header .intro-text { padding-bottom: 50px; } header .intro-text .intro-lead-in { - font-family: "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; font-style: italic; font-size: 22px; line-height: 22px; margin-bottom: 25px; } header .intro-text .intro-heading { - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; text-transform: uppercase; font-weight: 700; font-size: 50px; @@ -265,14 +289,14 @@ header .intro-text .intro-heading { padding-bottom: 200px; } header .intro-text .intro-lead-in { - font-family: "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; font-style: italic; font-size: 40px; line-height: 40px; margin-bottom: 25px; } header .intro-text .intro-heading { - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Bold", Arial, Helvetica, sans-serif; text-transform: uppercase; font-weight: 700; font-size: 75px; @@ -290,7 +314,7 @@ section h2.section-heading { } section h3.section-subheading { font-size: 16px; - font-family: "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; text-transform: none; font-style: italic; font-weight: 400; @@ -357,7 +381,7 @@ section h3.section-subheading { margin: 0; } #portfolio .portfolio-item .portfolio-caption p { - font-family: "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; font-style: italic; font-size: 16px; margin: 0; @@ -381,7 +405,7 @@ section h3.section-subheading { position: absolute; content: ""; width: 2px; - background-color: #f1f1f1; + background-color: #d3d7cf; left: 40px; margin-left: -1.5px; } @@ -427,7 +451,7 @@ section h3.section-subheading { background-color: #204a87; color: white; border-radius: 100%; - border: 7px solid #f1f1f1; + border: 7px solid #d3d7cf; text-align: center; } .timeline > li .timeline-image h4 { @@ -583,27 +607,27 @@ section#contact .form-control:focus { box-shadow: none; } section#contact ::-webkit-input-placeholder { - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; text-transform: uppercase; font-weight: 700; color: #eeeeee; } section#contact :-moz-placeholder { /* Firefox 18- */ - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; text-transform: uppercase; font-weight: 700; color: #eeeeee; } section#contact ::-moz-placeholder { /* Firefox 19+ */ - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; text-transform: uppercase; font-weight: 700; color: #eeeeee; } section#contact :-ms-input-placeholder { - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; text-transform: uppercase; font-weight: 700; color: #eeeeee; @@ -617,14 +641,14 @@ footer { } footer span.copyright { line-height: 40px; - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; text-transform: uppercase; text-transform: none; } footer ul.quicklinks { margin-bottom: 0; line-height: 40px; - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; text-transform: uppercase; text-transform: none; } @@ -681,7 +705,7 @@ ul.social-buttons li a:active { } .portfolio-modal .modal-content p.item-intro { margin: 20px 0 30px; - font-family: "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans Light", Arial, Helvetica, sans-serif; font-style: italic; font-size: 16px; } diff --git a/wger/software/static/images/main.jpg b/wger/software/static/images/main.jpg index d156104aa..bea0799bf 100644 Binary files a/wger/software/static/images/main.jpg and b/wger/software/static/images/main.jpg differ diff --git a/wger/software/static/images/rest-api.png b/wger/software/static/images/rest-api.png new file mode 100644 index 000000000..73f37f5e1 Binary files /dev/null and b/wger/software/static/images/rest-api.png differ diff --git a/wger/software/templates/features.html b/wger/software/templates/features.html index de73cc395..613107e75 100644 --- a/wger/software/templates/features.html +++ b/wger/software/templates/features.html @@ -46,11 +46,14 @@
-

{% trans "What does it do" %}

-

{% blocktrans %}wger Workout Manager is a free, open source web application that manages -your exercises, workouts and nutrition. It started as a pet project of mine to replace my -growing collection of different spreadsheets, but it has become something other -people could also find useful.{% endblocktrans %} +

{% trans "Your advantages" %}

+

+ {% blocktrans trimmed %} + wger Workout Manager is a free, open source web application that manages + your exercises, workouts and nutrition. It started as a pet project of + mine to replace my growing collection of different spreadsheets, but it + has become something other people could also find useful. + {% endblocktrans %}

@@ -61,27 +64,44 @@ people could also find useful.{% endblocktrans %}

{% trans "Workouts" %}

-

{% blocktrans %}Create and manage your workout routines by selecting how - many days your workout consists of, and adding different exercises to each. You can - also combine different workouts into a schedule.{% endblocktrans %}

+

+ {% blocktrans trimmed %} + You can create and manage flexible workout routines for any goals you + have. Select exactly which exercises you'll do and how many repetitions, + time or distance you want to do them. You can also combine different + workouts into a schedule. + {% endblocktrans %} +

- +

{% trans "Nutrition" %}

-

{% blocktrans %}Create a diet plan and see its nutritional -values (total energy, protein, carbohydrates, and so on) about -it. Select from more than 8000 ingredients for this.{% endblocktrans %}

+

+ {% blocktrans trimmed %} + Create your personal diet plan by creating as many meals with as many + different ingredients as you need. The application will calculate the + nutritional values (total energy, protein, carbohydrates, and so on) + about the whole plan as well as the indivual meals. + {% endblocktrans %} +

- + -

Lorem ipsum

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima maxime quam architecto quo inventore harum ex magni, dicta impedit.

+

{% trans 'Diary' %}

+

+ {% blocktrans trimmed %} + Enter the weights and repetitions you did for each exercise to generate + diagrams that let you see at a glance how well you are doing. The raw + numbers are of course still accessible. + {% endblocktrans %} + {% trans "You can also enter notes and a general impression (great, neutral, etc.)" %} +

@@ -105,12 +125,16 @@ it. Select from more than 8000 ingredients for this.{% endblocktrans %}

{% trans "Weight tracker" %}

-

{% trans "Weight tracker" %}

-

{% blocktrans %}keep track of your progress with the weight log chart - for each exercise and your own body weight. This makes it easy to see if you - are reaching your goals or need to adjust something.{% endblocktrans %}

+

+ {% blocktrans trimmed %} + Keep track of your progress with the body weight chart. This makes + it easy to see if you are reaching your goals or need to adjust + something. You can receive reminders so you regularly enter the + data. + {% endblocktrans %} +

@@ -121,13 +145,16 @@ it. Select from more than 8000 ingredients for this.{% endblocktrans %}

{% trans 'Exercise database' %}

-

Exercises

-

{% blocktrans %}The exercise database contains around hundred exercises - from which you can choose when creating a workout. Some have important notes - about the form to perform them. This is displayed in the workout overview - page, so you keep them in mind.{% endblocktrans %}

+

+ {% blocktrans trimmed %} + The exercise database contains around hundred exercises + from which you can choose when creating a workout. Some have important notes + about the form to perform them. This is displayed in the workout overview + page, so you keep them in mind. + {% endblocktrans %} +

@@ -138,37 +165,42 @@ it. Select from more than 8000 ingredients for this.{% endblocktrans %}

{% trans 'Gym management' %}

-

Manage Gyms

-

{% blocktrans %}Use the application for your gym to manage its - members, their workouts and attendance. Keep an eye on inactive members with - optional notifications. You can create users with different roles to - distribute the administrative tasks such as trainer or gym manager.{% endblocktrans %}

+

+ {% blocktrans trimmed %} + Use the application for your gym to manage its + members, their workouts and attendance. Keep an eye on inactive members with + optional notifications. You can create users with different roles to + distribute the administrative tasks such as trainer or gym manager. + {% endblocktrans %} +

  • - +
    -

    {% trans 'Workout log' %}

    -

    Log Your Workouts

    +

    {% trans "REST API" %}

    -

    {% blocktrans %}You can enter - the weights and repetitions you did for each exercise. As with the (body) weight, - it will generate some diagrams so you can see at a glance how well you are doing. - The raw numbers are still accessible as a table.{% endblocktrans %} - {% trans "You can also enter notes and a general impression (great, neutral, etc.)" %}

    +

    + {% blocktrans trimmed %} + wger provides a REST API with full read write access to all data + so you can integrate your own application and tools. Publicly accessible + data such as exercises you don't need any form of authentication, + for other objects such as workouts you need to get an API key. + {% endblocktrans %} +

  • -

    {% blocktrans %}100% Free +

    {% blocktrans trimmed %}100% Free
    and
    Open Source{% endblocktrans %}