Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Further work on feature page

Roland Geiderd605530e64a1
diff --git a/wger/core/templates/base_features.html b/wger/core/templates/base_features.html
index c9006e41c..0e0e48a98 100644
--- a/wger/core/templates/base_features.html
+++ b/wger/core/templates/base_features.html
@@ -2,9 +2,6 @@
{% load i18n %}
{% block template %}
-
-<div class="row" style="margin-top: 3em;">
- <div class="col-md-10 col-md-offset-1" id="main-content">
{% if show_shariff %}
{% include 'misc/fragments/shariff_modal.html' %}
@@ -19,8 +16,6 @@
<div class="clearfix"></div>
{% endif %}
-
-
{% if messages and not no_messages %}
{% for message in messages %}
<div class="alert {% if message.tags == 'warning'%}alert-error{% elif message.tags == 'info' %}alert-info{% elif message.tags == 'success' %}alert-success{% endif %}">
@@ -31,6 +26,4 @@
{% endif %}
{% block content %}{% endblock %}
- </div>
-</div>
{% endblock %}
diff --git a/wger/core/templates/template_features.html b/wger/core/templates/template_features.html
index cbbc33612..4361b959f 100644
--- a/wger/core/templates/template_features.html
+++ b/wger/core/templates/template_features.html
@@ -45,13 +45,14 @@
{% endblock %}
+ <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
+ <link href='https://fonts.googleapis.com/css?family=Kaushan+Script' rel='stylesheet' type='text/css'>
+ <link href='https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
+ <link href='https://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700' rel='stylesheet' type='text/css'>
{% compress css %}
- <link rel="stylesheet" type="text/css" href="{% static 'css/workout-manager.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'css/workout-manager-common.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'bower_components/bootstrap/dist/css/bootstrap.min.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'bower_components/components-font-awesome/css/font-awesome.min.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'css/bootstrap-custom.css' %}">
-
+ <link rel="stylesheet" type="text/css" href="{% static 'css/agency.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'bower_components/shariff/build/shariff.min.css' %}">
{% endcompress %}
@@ -64,19 +65,16 @@
<title>wger Workout Manager - {% trans "Features" %}</title>
</head>
-<body>
+
+<body id="page-top" class="index">
{% if user.is_authenticated %}
{% include 'navigation.html' %}
{% endif %}
-<div id="main">
- <div class="container">
- {% block template %}{% endblock %}
- </div>
+ {% block template %}{% endblock %}
<div id="current-url" data-current-url="{{request_full_path}}"></div>
<div id="current-language" data-current-language="{{language.short_name}}"></div>
-</div>
diff --git a/wger/software/static/css/agency.css b/wger/software/static/css/agency.css
new file mode 100644
index 000000000..2b41c0ba0
--- /dev/null
+++ b/wger/software/static/css/agency.css
@@ -0,0 +1,746 @@
+/*!
+ * Start Bootstrap - Agency v3.3.7 (http://startbootstrap.com/template-overviews/agency)
+ * Copyright 2013-2016 Start Bootstrap
+ * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap/blob/gh-pages/LICENSE)
+ */
+body {
+ overflow-x: hidden;
+ font-family: "Roboto Slab", "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+.text-muted {
+ color: #777777;
+}
+.text-primary {
+ color: #fed136;
+}
+p {
+ font-size: 14px;
+ line-height: 1.75;
+}
+p.large {
+ font-size: 16px;
+}
+a,
+a:hover,
+a:focus,
+a:active,
+a.active {
+ outline: none;
+}
+a {
+ color: #fed136;
+}
+a:hover,
+a:focus,
+a:active,
+a.active {
+ color: #fec503;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ text-transform: uppercase;
+ font-weight: 700;
+}
+.img-centered {
+ margin: 0 auto;
+}
+.bg-light-gray {
+ background-color: #eeeeee;
+}
+.bg-darkest-gray {
+ background-color: #222222;
+}
+.btn-primary {
+ color: white;
+ background-color: #fed136;
+ border-color: #fed136;
+ font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ text-transform: uppercase;
+ font-weight: 700;
+}
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.open .dropdown-toggle.btn-primary {
+ color: white;
+ background-color: #fec503;
+ border-color: #f6bf01;
+}
+.btn-primary:active,
+.btn-primary.active,
+.open .dropdown-toggle.btn-primary {
+ background-image: none;
+}
+.btn-primary.disabled,
+.btn-primary[disabled],
+fieldset[disabled] .btn-primary,
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary:hover,
+.btn-primary.disabled:focus,
+.btn-primary[disabled]:focus,
+fieldset[disabled] .btn-primary:focus,
+.btn-primary.disabled:active,
+.btn-primary[disabled]:active,
+fieldset[disabled] .btn-primary:active,
+.btn-primary.disabled.active,
+.btn-primary[disabled].active,
+fieldset[disabled] .btn-primary.active {
+ background-color: #fed136;
+ border-color: #fed136;
+}
+.btn-primary .badge {
+ color: #fed136;
+ background-color: white;
+}
+.btn-xl {
+ color: white;
+ background-color: #fed136;
+ border-color: #fed136;
+ font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ text-transform: uppercase;
+ font-weight: 700;
+ border-radius: 3px;
+ font-size: 18px;
+ padding: 20px 40px;
+}
+.btn-xl:hover,
+.btn-xl:focus,
+.btn-xl:active,
+.btn-xl.active,
+.open .dropdown-toggle.btn-xl {
+ color: white;
+ background-color: #fec503;
+ border-color: #f6bf01;
+}
+.btn-xl:active,
+.btn-xl.active,
+.open .dropdown-toggle.btn-xl {
+ background-image: none;
+}
+.btn-xl.disabled,
+.btn-xl[disabled],
+fieldset[disabled] .btn-xl,
+.btn-xl.disabled:hover,
+.btn-xl[disabled]:hover,
+fieldset[disabled] .btn-xl:hover,
+.btn-xl.disabled:focus,
+.btn-xl[disabled]:focus,
+fieldset[disabled] .btn-xl:focus,
+.btn-xl.disabled:active,
+.btn-xl[disabled]:active,
+fieldset[disabled] .btn-xl:active,
+.btn-xl.disabled.active,
+.btn-xl[disabled].active,
+fieldset[disabled] .btn-xl.active {
+ background-color: #fed136;
+ border-color: #fed136;
+}
+.btn-xl .badge {
+ color: #fed136;
+ background-color: white;
+}
+.navbar-custom {
+ background-color: #222222;
+ border-color: transparent;
+}
+.navbar-custom .navbar-brand {
+ color: #fed136;
+ font-family: "Kaushan Script", "Helvetica Neue", Helvetica, Arial, cursive;
+}
+.navbar-custom .navbar-brand:hover,
+.navbar-custom .navbar-brand:focus,
+.navbar-custom .navbar-brand:active,
+.navbar-custom .navbar-brand.active {
+ color: #fec503;
+}
+.navbar-custom .navbar-collapse {
+ border-color: rgba(255, 255, 255, 0.02);
+}
+.navbar-custom .navbar-toggle {
+ background-color: #fed136;
+ border-color: #fed136;
+ font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ text-transform: uppercase;
+ color: white;
+ font-size: 12px;
+}
+.navbar-custom .navbar-toggle:hover,
+.navbar-custom .navbar-toggle:focus {
+ background-color: #fed136;
+}
+.navbar-custom .nav li a {
+ font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ text-transform: uppercase;
+ font-weight: 400;
+ letter-spacing: 1px;
+ color: white;
+}
+.navbar-custom .nav li a:hover,
+.navbar-custom .nav li a:focus {
+ color: #fed136;
+ outline: none;
+}
+.navbar-custom .navbar-nav > .active > a {
+ border-radius: 0;
+ color: white;
+ background-color: #fed136;
+}
+.navbar-custom .navbar-nav > .active > a:hover,
+.navbar-custom .navbar-nav > .active > a:focus {
+ color: white;
+ background-color: #fec503;
+}
+@media (min-width: 768px) {
+ .navbar-custom {
+ background-color: transparent;
+ padding: 25px 0;
+ -webkit-transition: padding 0.3s;
+ -moz-transition: padding 0.3s;
+ transition: padding 0.3s;
+ border: none;
+ }
+ .navbar-custom .navbar-brand {
+ font-size: 2em;
+ -webkit-transition: all 0.3s;
+ -moz-transition: all 0.3s;
+ transition: all 0.3s;
+ }
+ .navbar-custom .navbar-nav > .active > a {
+ border-radius: 3px;
+ }
+}
+@media (min-width: 768px) {
+ .navbar-custom.affix {
+ background-color: #222222;
+ padding: 10px 0;
+ }
+ .navbar-custom.affix .navbar-brand {
+ font-size: 1.5em;
+ }
+}
+header {
+ background-image: url('../images/main.jpg');
+ background-repeat: no-repeat;
+ background-attachment: scroll;
+ background-position: center center;
+ -webkit-background-size: cover;
+ -moz-background-size: cover;
+ background-size: cover;
+ -o-background-size: cover;
+ text-align: center;
+ color: white;
+}
+header .intro-text {
+ padding-top: 100px;
+ padding-bottom: 50px;
+}
+header .intro-text .intro-lead-in {
+ font-family: "Droid Serif", "Helvetica Neue", Helvetica, Arial, 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;
+ text-transform: uppercase;
+ font-weight: 700;
+ font-size: 50px;
+ line-height: 50px;
+ margin-bottom: 25px;
+}
+@media (min-width: 768px) {
+ header .intro-text {
+ padding-top: 300px;
+ padding-bottom: 200px;
+ }
+ header .intro-text .intro-lead-in {
+ font-family: "Droid Serif", "Helvetica Neue", Helvetica, Arial, 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;
+ text-transform: uppercase;
+ font-weight: 700;
+ font-size: 75px;
+ line-height: 75px;
+ margin-bottom: 50px;
+ }
+}
+section {
+ padding: 100px 0;
+}
+section h2.section-heading {
+ font-size: 40px;
+ margin-top: 0;
+ margin-bottom: 15px;
+}
+section h3.section-subheading {
+ font-size: 16px;
+ font-family: "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ text-transform: none;
+ font-style: italic;
+ font-weight: 400;
+ margin-bottom: 75px;
+}
+@media (min-width: 768px) {
+ section {
+ padding: 150px 0;
+ }
+}
+.service-heading {
+ margin: 15px 0;
+ text-transform: none;
+}
+#portfolio .portfolio-item {
+ margin: 0 0 15px;
+ right: 0;
+}
+#portfolio .portfolio-item .portfolio-link {
+ display: block;
+ position: relative;
+ max-width: 400px;
+ margin: 0 auto;
+}
+#portfolio .portfolio-item .portfolio-link .portfolio-hover {
+ background: rgba(254, 209, 54, 0.9);
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ opacity: 0;
+ transition: all ease 0.5s;
+ -webkit-transition: all ease 0.5s;
+ -moz-transition: all ease 0.5s;
+}
+#portfolio .portfolio-item .portfolio-link .portfolio-hover:hover {
+ opacity: 1;
+}
+#portfolio .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content {
+ position: absolute;
+ width: 100%;
+ height: 20px;
+ font-size: 20px;
+ text-align: center;
+ top: 50%;
+ margin-top: -12px;
+ color: white;
+}
+#portfolio .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content i {
+ margin-top: -12px;
+}
+#portfolio .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content h3,
+#portfolio .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content h4 {
+ margin: 0;
+}
+#portfolio .portfolio-item .portfolio-caption {
+ max-width: 400px;
+ margin: 0 auto;
+ background-color: white;
+ text-align: center;
+ padding: 25px;
+}
+#portfolio .portfolio-item .portfolio-caption h4 {
+ text-transform: none;
+ margin: 0;
+}
+#portfolio .portfolio-item .portfolio-caption p {
+ font-family: "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-style: italic;
+ font-size: 16px;
+ margin: 0;
+}
+#portfolio * {
+ z-index: 2;
+}
+@media (min-width: 767px) {
+ #portfolio .portfolio-item {
+ margin: 0 0 30px;
+ }
+}
+.timeline {
+ list-style: none;
+ padding: 0;
+ position: relative;
+}
+.timeline:before {
+ top: 0;
+ bottom: 0;
+ position: absolute;
+ content: "";
+ width: 2px;
+ background-color: #f1f1f1;
+ left: 40px;
+ margin-left: -1.5px;
+}
+.timeline > li {
+ margin-bottom: 50px;
+ position: relative;
+ min-height: 50px;
+}
+.timeline > li:before,
+.timeline > li:after {
+ content: " ";
+ display: table;
+}
+.timeline > li:after {
+ clear: both;
+}
+.timeline > li .timeline-panel {
+ width: 100%;
+ float: right;
+ padding: 0 20px 0 100px;
+ position: relative;
+ text-align: left;
+}
+.timeline > li .timeline-panel:before {
+ border-left-width: 0;
+ border-right-width: 15px;
+ left: -15px;
+ right: auto;
+}
+.timeline > li .timeline-panel:after {
+ border-left-width: 0;
+ border-right-width: 14px;
+ left: -14px;
+ right: auto;
+}
+.timeline > li .timeline-image {
+ left: 0;
+ margin-left: 0;
+ width: 80px;
+ height: 80px;
+ position: absolute;
+ z-index: 100;
+ background-color: #fed136;
+ color: white;
+ border-radius: 100%;
+ border: 7px solid #f1f1f1;
+ text-align: center;
+}
+.timeline > li .timeline-image h4 {
+ font-size: 10px;
+ margin-top: 12px;
+ line-height: 14px;
+}
+.timeline > li.timeline-inverted > .timeline-panel {
+ float: right;
+ text-align: left;
+ padding: 0 20px 0 100px;
+}
+.timeline > li.timeline-inverted > .timeline-panel:before {
+ border-left-width: 0;
+ border-right-width: 15px;
+ left: -15px;
+ right: auto;
+}
+.timeline > li.timeline-inverted > .timeline-panel:after {
+ border-left-width: 0;
+ border-right-width: 14px;
+ left: -14px;
+ right: auto;
+}
+.timeline > li:last-child {
+ margin-bottom: 0;
+}
+.timeline .timeline-heading h4 {
+ margin-top: 0;
+ color: inherit;
+}
+.timeline .timeline-heading h4.subheading {
+ text-transform: none;
+}
+.timeline .timeline-body > p,
+.timeline .timeline-body > ul {
+ margin-bottom: 0;
+}
+@media (min-width: 768px) {
+ .timeline:before {
+ left: 50%;
+ }
+ .timeline > li {
+ margin-bottom: 100px;
+ min-height: 100px;
+ }
+ .timeline > li .timeline-panel {
+ width: 41%;
+ float: left;
+ padding: 0 20px 20px 30px;
+ text-align: right;
+ }
+ .timeline > li .timeline-image {
+ width: 100px;
+ height: 100px;
+ left: 50%;
+ margin-left: -50px;
+ }
+ .timeline > li .timeline-image h4 {
+ font-size: 13px;
+ margin-top: 16px;
+ line-height: 18px;
+ }
+ .timeline > li.timeline-inverted > .timeline-panel {
+ float: right;
+ text-align: left;
+ padding: 0 30px 20px 20px;
+ }
+}
+@media (min-width: 992px) {
+ .timeline > li {
+ min-height: 150px;
+ }
+ .timeline > li .timeline-panel {
+ padding: 0 20px 20px;
+ }
+ .timeline > li .timeline-image {
+ width: 150px;
+ height: 150px;
+ margin-left: -75px;
+ }
+ .timeline > li .timeline-image h4 {
+ font-size: 18px;
+ margin-top: 30px;
+ line-height: 26px;
+ }
+ .timeline > li.timeline-inverted > .timeline-panel {
+ padding: 0 20px 20px;
+ }
+}
+@media (min-width: 1200px) {
+ .timeline > li {
+ min-height: 170px;
+ }
+ .timeline > li .timeline-panel {
+ padding: 0 20px 20px 100px;
+ }
+ .timeline > li .timeline-image {
+ width: 170px;
+ height: 170px;
+ margin-left: -85px;
+ }
+ .timeline > li .timeline-image h4 {
+ margin-top: 40px;
+ }
+ .timeline > li.timeline-inverted > .timeline-panel {
+ padding: 0 100px 20px 20px;
+ }
+}
+.team-member {
+ text-align: center;
+ margin-bottom: 50px;
+}
+.team-member img {
+ margin: 0 auto;
+ border: 7px solid white;
+}
+.team-member h4 {
+ margin-top: 25px;
+ margin-bottom: 0;
+ text-transform: none;
+}
+.team-member p {
+ margin-top: 0;
+}
+aside.clients img {
+ margin: 50px auto;
+}
+section#contact {
+ background-color: #222222;
+ background-image: url('../img/map-image.png');
+ background-position: center;
+ background-repeat: no-repeat;
+}
+section#contact .section-heading {
+ color: white;
+}
+section#contact .form-group {
+ margin-bottom: 25px;
+}
+section#contact .form-group input,
+section#contact .form-group textarea {
+ padding: 20px;
+}
+section#contact .form-group input.form-control {
+ height: auto;
+}
+section#contact .form-group textarea.form-control {
+ height: 236px;
+}
+section#contact .form-control:focus {
+ border-color: #fed136;
+ box-shadow: none;
+}
+section#contact ::-webkit-input-placeholder {
+ font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, 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;
+ text-transform: uppercase;
+ font-weight: 700;
+ color: #eeeeee;
+}
+section#contact ::-moz-placeholder {
+ /* Firefox 19+ */
+ font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ text-transform: uppercase;
+ font-weight: 700;
+ color: #eeeeee;
+}
+section#contact :-ms-input-placeholder {
+ font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ text-transform: uppercase;
+ font-weight: 700;
+ color: #eeeeee;
+}
+section#contact .text-danger {
+ color: #e74c3c;
+}
+footer {
+ padding: 25px 0;
+ text-align: center;
+}
+footer span.copyright {
+ line-height: 40px;
+ font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, 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;
+ text-transform: uppercase;
+ text-transform: none;
+}
+ul.social-buttons {
+ margin-bottom: 0;
+}
+ul.social-buttons li a {
+ display: block;
+ background-color: #222222;
+ height: 40px;
+ width: 40px;
+ border-radius: 100%;
+ font-size: 20px;
+ line-height: 40px;
+ color: white;
+ outline: none;
+ -webkit-transition: all 0.3s;
+ -moz-transition: all 0.3s;
+ transition: all 0.3s;
+}
+ul.social-buttons li a:hover,
+ul.social-buttons li a:focus,
+ul.social-buttons li a:active {
+ background-color: #fed136;
+}
+.btn:focus,
+.btn:active,
+.btn.active,
+.btn:active:focus {
+ outline: none;
+}
+.portfolio-modal .modal-dialog {
+ margin: 0;
+ height: 100%;
+ width: auto;
+}
+.portfolio-modal .modal-content {
+ border-radius: 0;
+ background-clip: border-box;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ border: none;
+ min-height: 100%;
+ padding: 100px 0;
+ text-align: center;
+}
+.portfolio-modal .modal-content h2 {
+ margin-bottom: 15px;
+ font-size: 3em;
+}
+.portfolio-modal .modal-content p {
+ margin-bottom: 30px;
+}
+.portfolio-modal .modal-content p.item-intro {
+ margin: 20px 0 30px;
+ font-family: "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-style: italic;
+ font-size: 16px;
+}
+.portfolio-modal .modal-content ul.list-inline {
+ margin-bottom: 30px;
+ margin-top: 0;
+}
+.portfolio-modal .modal-content img {
+ margin-bottom: 30px;
+}
+.portfolio-modal .close-modal {
+ position: absolute;
+ width: 75px;
+ height: 75px;
+ background-color: transparent;
+ top: 25px;
+ right: 25px;
+ cursor: pointer;
+}
+.portfolio-modal .close-modal:hover {
+ opacity: 0.3;
+}
+.portfolio-modal .close-modal .lr {
+ height: 75px;
+ width: 1px;
+ margin-left: 35px;
+ background-color: #222222;
+ transform: rotate(45deg);
+ -ms-transform: rotate(45deg);
+ /* IE 9 */
+ -webkit-transform: rotate(45deg);
+ /* Safari and Chrome */
+ z-index: 1051;
+}
+.portfolio-modal .close-modal .lr .rl {
+ height: 75px;
+ width: 1px;
+ background-color: #222222;
+ transform: rotate(90deg);
+ -ms-transform: rotate(90deg);
+ /* IE 9 */
+ -webkit-transform: rotate(90deg);
+ /* Safari and Chrome */
+ z-index: 1052;
+}
+.portfolio-modal .modal-backdrop {
+ opacity: 0;
+ display: none;
+}
+::-moz-selection {
+ text-shadow: none;
+ background: #fed136;
+}
+::selection {
+ text-shadow: none;
+ background: #fed136;
+}
+img::selection {
+ background: transparent;
+}
+img::-moz-selection {
+ background: transparent;
+}
+body {
+ webkit-tap-highlight-color: #fed136;
+}
diff --git a/wger/software/static/images/SOURCES.txt b/wger/software/static/images/SOURCES.txt
new file mode 100644
index 000000000..c093d3437
--- /dev/null
+++ b/wger/software/static/images/SOURCES.txt
@@ -0,0 +1 @@
+https://www.pexels.com/photo/hands-feet-training-muscles-39613/
diff --git a/wger/software/static/images/gym-management-1.5.png b/wger/software/static/images/gym-management-1.5.png
index da7545268..9e051d2db 100644
Binary files a/wger/software/static/images/gym-management-1.5.png and b/wger/software/static/images/gym-management-1.5.png differ
diff --git a/wger/software/static/images/main.jpg b/wger/software/static/images/main.jpg
new file mode 100644
index 000000000..d156104aa
Binary files /dev/null and b/wger/software/static/images/main.jpg differ
diff --git a/wger/software/static/images/muscle-overview-1.1-en.png b/wger/software/static/images/muscle-overview-1.1-en.png
index cabffbef9..27835674c 100644
Binary files a/wger/software/static/images/muscle-overview-1.1-en.png and b/wger/software/static/images/muscle-overview-1.1-en.png differ
diff --git a/wger/software/static/images/weight-chart.png b/wger/software/static/images/weight-chart.png
index fd4cb1402..9081e7efa 100644
Binary files a/wger/software/static/images/weight-chart.png and b/wger/software/static/images/weight-chart.png differ
diff --git a/wger/software/static/images/workout-log.png b/wger/software/static/images/workout-log.png
index 8574db47a..2f1054f66 100644
Binary files a/wger/software/static/images/workout-log.png and b/wger/software/static/images/workout-log.png differ
diff --git a/wger/software/templates/features.html b/wger/software/templates/features.html
index b84649ecc..77d80884c 100644
--- a/wger/software/templates/features.html
+++ b/wger/software/templates/features.html
@@ -18,303 +18,167 @@
{# Content #}
{# #}
{% block content %}
-<div class="jumbotron">
-<div class="row">
- <div class="col-md-5">
- <img src="{% static 'images/logos/logo-marketplace.svg' %}"
- class="img-responsive"
- alt=""
- style="width: 70%;">
- </div>
- <div class="col-md-4">
- <div id="shoutout">
- <h2>{% trans "Your body." %}</h2>
- <h2>{% trans "Your workouts." %}</h2>
- <h2>{% trans "Your data." %}</h2>
- <h2>{% trans "Your progress." %}</h2>
+ <header>
+ <div class="container">
+ <div class="intro-text">
+ <div class="intro-heading">{% trans "Welcome to wger" %}</div>
+ <div class="intro-lead-in">{% trans "Your body." %}</div>
+ <div class="intro-lead-in">{% trans "Your workouts." %}</div>
+ <div class="intro-lead-in">{% trans "Your data." %}</div>
+ <div class="intro-lead-in">{% trans "Your progress." %}</div>
+ {% if not user.is_authenticated %}
+ <a href="{% url 'core:user:demo-entries' %}" class="page-scroll btn btn-xl">{% trans "Try it now" %}</a>
+ {% endif %}
+
+ {% if not user.is_authenticated or user.userprofile.is_temporary %}
+ {% if allow_registration %}
+ <a href="{% url 'core:user:registration' %}" class="page-scroll btn btn-xl">{% trans "Register" %}</a>
+ {% endif %}
+
+ <a href="{% url 'core:user:login' %}" class="page-scroll btn btn-xl">{% trans "Login" %}</a>
+ {% endif %}
+ </div>
</div>
- </div>
- <div class="col-md-3">
- {% if not user.is_authenticated %}
- <p>
- <a href="{% url 'core:user:demo-entries' %}" class="btn btn-success btn-lg btn-block">{% trans "Try it now" %}</a>
- </p>
- {% endif %}
-
- {% if not user.is_authenticated or user.userprofile.is_temporary %}
- {% if allow_registration %}
- <p>
- <a href="{% url 'core:user:registration' %}" class="btn btn-default btn-lg btn-block">{% trans "Register" %}</a>
- </p>
- {% endif %}
-
- <p>
- <a href="{% url 'core:user:login' %}" class="btn btn-default btn-lg btn-block">{% trans "Login" %}</a>
- </p>
- {% endif %}
- </div>
-</div>
-</div>
-
-
-
-
-
-<div class="row">
- <div class="col-sm-8 col-sm-offset-2 col-xs-12">
- {% blocktrans %}wger Workout Manager is a free, open source web application that manages
+ </header>
+
+ <!-- Services Section -->
+ <section id="services">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 text-center">
+ <h2 class="section-heading">{% trans "What does it do" %}</h2>
+ <h3 class="section-subheading text-muted">{% 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 %}
- </div>
-</div>
-<hr>
-
-
-
-
-<div class="row" style="margin-top: 4em;">
- <h4>
- <span class="{% fa_class 'user' %}"></span>
- <strong>
- {% trans "Workouts" %}
- </strong>
- </h4>
-
- <div class="row" style="margin-top: 2em;">
- <div class="col-md-8">
- <img src="{% static 'images/workout.png' %}"
- class="img-rounded"
- height="400px"
- style="width:100%;"
- alt="{% trans 'Workouts' %}">
- </div>
-
- <div class="col-md-4">
- <p>{% blocktrans %}Create and manage your workout routines by selecting how
+ </h3>
+ </div>
+ </div>
+ <div class="row text-center">
+ <div class="col-md-4">
+ <span class="fa-stack fa-4x">
+ <i class="fa fa-circle fa-stack-2x text-primary"></i>
+ <i class="fa fa-user fa-stack-1x fa-inverse"></i>
+ </span>
+ <h4 class="service-heading">{% trans "Workouts" %}</h4>
+ <p class="text-muted">{% 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 %}
- </p>
- </div>
- </div>
-</div>
-
-
-<div class="row" style="margin-top: 4em;">
- <h4>
- <span class="{% fa_class 'line-chart' %}"></span>
- <strong>
- {% trans "Workout log" %}
- </strong>
- </h4>
-
- <div class="row" style="margin-top: 2em;">
- <div class="col-md-8">
- <img src="{% static 'images/workout-log.png' %}"
- class="img-rounded"
- height="400px"
- style="width:100%;"
- alt="{% trans 'Workout log' %}">
- </div>
-
-
- <div class="col-md-4">
- <p>{% 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.)" %}</p>
- </div>
- </div>
-</div>
-
-
-<div class="row" style="margin-top: 4em;">
- <h4>
- <span class="{% fa_class 'user' %}"></span>
- <strong>
- {% trans "Nutrition" %}
- </strong>
- </h4>
-
- <div class="row" style="margin-top: 2em;">
-
- <div class="col-md-8">
- <img src="{% static 'images/plan.png' %}"
- class="img-rounded"
- height="400px"
- style="width:100%;"
- alt="{% trans 'Nutrition' %}">
- </div>
-
-
- <div class="col-md-4">
- <p>{% 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 %}</p>
- </div>
- </div>
-</div>
-
-
-<div class="row" style="margin-top: 4em;">
- <h4>
- <span class="{% fa_class 'bar-chart' %}"></span>
- <strong>
- {% trans "Weight tracker" %}
- </strong>
- </h4>
-
- <div class="col-md-8">
- <img src="{% static 'images/weight-chart.png' %}"
- class="img-rounded"
- height="400px";
- style="width: 100%;"
- alt="{% trans 'Weight tracker' %}">
- </div>
-
- <div class="col-md-4">
- <p>
- {% blocktrans %}keep track of your progress with the weight log chart
+ also combine different workouts into a schedule.{% endblocktrans %}</p>
+ </div>
+ <div class="col-md-4">
+ <span class="fa-stack fa-4x">
+ <i class="fa fa-circle fa-stack-2x text-primary"></i>
+ <i class="fa fa-laptop fa-stack-1x fa-inverse"></i>
+ </span>
+ <h4 class="service-heading">{% trans "Nutrition" %}</h4>
+ <p class="text-muted">{% 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 %}</p>
+ </div>
+ <div class="col-md-4">
+ <span class="fa-stack fa-4x">
+ <i class="fa fa-circle fa-stack-2x text-primary"></i>
+ <i class="fa fa-lock fa-stack-1x fa-inverse"></i>
+ </span>
+ <h4 class="service-heading">Lorem ipsum</h4>
+ <p class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima maxime quam architecto quo inventore harum ex magni, dicta impedit.</p>
+ </div>
+ </div>
+ </div>
+ </section>
+
+ <section id="about">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 text-center">
+ <h2 class="section-heading">{% trans "Features" %}</h2>
+ <h3 class="section-subheading text-muted">{% trans "Among many others" %}</h3>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-12">
+ <ul class="timeline">
+ <li>
+ <div class="timeline-image">
+ <img class="img-circle img-responsive" src="{% static 'images/weight-chart.png' %}" alt="">
+ </div>
+ <div class="timeline-panel">
+ <div class="timeline-heading">
+ <h4>{% trans "Weight tracker" %}</h4>
+ <h4 class="subheading">{% trans "Weight tracker" %}</h4>
+ </div>
+ <div class="timeline-body">
+ <p class="text-muted">{% 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 %}
- </p>
- </div>
-
-</div>
-
-
-<div class="row" style="margin-top: 4em;">
- <h4>
- <span class="{% fa_class 'list' %}"></span>
- <strong>
- {% trans "Exercise database" %}
- </strong>
- </h4>
-
- <div class="col-md-8">
- <img src="{% static 'images/muscle-overview-1.1-en.png' %}"
- class="img-rounded"
- height="400px";
- style="width: 100%;"
- alt="{% trans 'Exercise database' %}">
- </div>
-
- <div class="col-md-4">
- <p>
- {% blocktrans %}The exercise database contains around hundred exercises
+ are reaching your goals or need to adjust something.{% endblocktrans %}</p>
+ </div>
+ </div>
+ </li>
+ <li class="timeline-inverted">
+ <div class="timeline-image">
+ <img class="img-circle img-responsive" src="{% static 'images/muscle-overview-1.1-en.png' %}" alt="">
+ </div>
+ <div class="timeline-panel">
+ <div class="timeline-heading">
+ <h4>{% trans 'Exercise database' %}</h4>
+ <h4 class="subheading">An Agency is Born</h4>
+ </div>
+ <div class="timeline-body">
+ <p class="text-muted">{% 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 %}
- </p>
- </div>
-
-</div>
-
-
-<div class="row" style="margin-top: 4em;">
- <h4>
- <span class="{% fa_class 'home' %}"></span>
- <strong>
- {% trans "Gym management" %}
- </strong>
- </h4>
-
- <div class="col-md-8">
- <img src="{% static 'images/gym-management-1.5.png' %}"
- class="img-rounded"
- height="400px";
- style="width: 100%;"
- alt="{% trans 'Gym management' %}">
- </div>
-
- <div class="col-md-4">
- <p>
- {% blocktrans %}Use the application for your gym to manage its
+ page, so you keep them in mind.{% endblocktrans %}</p>
+ </div>
+ </div>
+ </li>
+ <li>
+ <div class="timeline-image">
+ <img class="img-circle img-responsive" src="{% static 'images/gym-management-1.5.png' %}" alt="">
+ </div>
+ <div class="timeline-panel">
+ <div class="timeline-heading">
+ <h4>{% trans 'Gym management' %}</h4>
+ <h4 class="subheading">Transition to Full Service</h4>
+ </div>
+ <div class="timeline-body">
+ <p class="text-muted">{% 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 %}
- </p>
- </div>
-
-</div>
-
-
-<div class="row" style="margin-top: 4em;">
- <h4>
- <span class="{% fa_class 'eye' %}"></span>
- <strong>
- {% trans "100% Open Source" %}
- </strong>
- </h4>
- <p>
- {% blocktrans %}All of the code running wger is open source, allowing
- the public to openly review its code and security. Anyone can contribute towards
- the development of wger or deploy private installations.{% endblocktrans %}
- </p>
-</div>
-
-
-<div class="row" style="margin-top: 4em;">
- <h4>
- <span class="{% fa_class 'globe' %}"></span>
- <strong>
- {% trans "Join and help" %}
- </strong>
- </h4>
- <a href="https://github.com/wger-project/wger" class="btn btn-primary btn-block">
- {% trans "Join development" %}
- <span class="glyphicon glyphicon-chevron-right"></span>
- </a>
- <a href="{% url 'software:issues' %}" class="btn btn-primary btn-block">
- {% trans "Problems and wishes" %}
- <span class="glyphicon glyphicon-chevron-right"></span>
- </a>
- <a href="https://www.transifex.com/rge/wger-workout-manager/" class="btn btn-primary btn-block">
- {% trans "Translate" %}
- <span class="glyphicon glyphicon-chevron-right"></span>
- </a>
-</div>
-
-
-<div class="row" style="margin-top: 4em;">
- <h4>
- <span class="{% fa_class 'retweet' %}"></span>
- <strong>
- {% trans "REST API" %}
- </strong>
- </h4>
- <p>
- {% blocktrans %}wger provides a REST API with full read write access
- to all data. To access 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 %}
- </p>
-</div>
-
+ distribute the administrative tasks such as trainer or gym manager.{% endblocktrans %}</p>
+ </div>
+ </div>
+ </li>
+ <li class="timeline-inverted">
+ <div class="timeline-image">
+ <img class="img-circle img-responsive" src="{% static 'images/workout-log.png' %}" alt="">
+ </div>
+ <div class="timeline-panel">
+ <div class="timeline-heading">
+ <h4>{% trans 'Workout log' %}</h4>
+ <h4 class="subheading">Phase Two Expansion</h4>
+ </div>
+ <div class="timeline-body">
+ <p class="text-muted">{% 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.)" %}</p>
+ </div>
+ </div>
+ </li>
+ <li class="timeline-inverted">
+ <div class="timeline-image">
+ <h4>{% blocktrans %}100% Free
+ <br>and
+ <br>Open Source{% endblocktrans %}
+ </h4>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </section>
-<div class="row" style="margin-top: 4em;">
- <h4>
- <span class="{% fa_class 'plus' %}"></span>
- <strong>
- {% trans "Other features" %}
- </strong>
- </h4>
- <ul>
- <li>{% trans "Smooth performance and easy user interface." %}</li>
- <li>{% trans "Export workouts, nutrition plans and routines as PDF" %}</li>
- <!--<li>{% trans "Create complex routines, specify how much the exercise weights increase each week" %}</li>-->
- <li>{% trans "Gym-optimised view with countdown to easily log weights during the workout" %}</li>
- <li>{% trans "Export your routines and workouts to an application such as iCal or google calendar." %}</li>
- <li>{% trans "Receive email notifications to remind you to change your routine (optional)" %}</li>
- <li>{% trans "Calendar view with last workouts and weight logs for easy overview and control" %}</li>
- <li>{% trans "Support for both metric (kg) and imperial (lb) weight units" %}</li>
- <li>{% trans "Available in many languages" %}</li>
- <li>{% trans "BMI and daily calories calculator" %}</li>
- <li>{% trans "Automatically calculated grams of macronutrients per body weight" %}</li>
- <li>{% trans "Mobile friendly version" %}</li>
- <li>{% trans "Import and export your weight data to and from CSV" %}</li>
- </ul>
-</div>
{% endblock %}