Skip to content

Commit

Permalink
Merge 91c0778 into 721dc10
Browse files Browse the repository at this point in the history
  • Loading branch information
@dondrzzy
dondrzzy committed Jun 27, 2018
2 parents 721dc10 + 91c0778 commit 2a7c867
Show file tree
Hide file tree
Showing 12 changed files with 268 additions and 3 deletions.
2 changes: 2 additions & 0 deletions wger/core/templates/template_features.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,15 @@
<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/agency.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'bower_components/shariff/build/shariff.min.css' %}">
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css">
{% endcompress %}

<link rel="icon" href="{% static 'images/favicon.png' %}" type="image/png">

{% compress js %}
<script src="{% static 'bower_components/jquery/dist/jquery.js' %}"></script>
<script src="{% static 'bower_components/bootstrap/dist/js/bootstrap.min.js' %}"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/parallax/3.1.0/parallax.js"></script>
{% endcompress %}

<title>wger Workout Manager - {% trans "Features" %}</title>
Expand Down
46 changes: 46 additions & 0 deletions wger/software/static/css/agency.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ h6 {
text-transform: uppercase;
font-weight: 700;
}
.carousel-control.left{
background: transparent !important;
}
.carousel-control.right{
background: transparent !important;
}
.img-centered {
margin: 0 auto;
}
Expand Down Expand Up @@ -283,6 +289,46 @@ header .intro-text .intro-heading {
line-height: 50px;
margin-bottom: 25px;
}

.jarallax {
height: 700px;
background-attachment: fixed;
background-position: 50% 50%;
background-image: url("../images/gym_10.jpg");
}
.jarallax-1{
height: 700px;
background-attachment: fixed;
background-position: center;
background-image: url("../images/gym_2.jpg");
}
.jarallax-2{
height: 700px;
background-attachment: fixed;
background-position: 50% 50%;
background-image: url("../images/gym_1.jpg");
}
.jarallax-inner{
background: #0000004a;
height: 100%
}
.light{
color: #fff;
}
.dark{
color: #000;
}
.intro h1{
text-transform: uppercase;
font-weight: 700;
font-size: 40px;
line-height: 75px;
margin-bottom: 50px;
padding-top: 100px;
}
.intro-body h1{
font-size:
}
@media (min-width: 768px) {
header .intro-text {
padding-top: 300px;
Expand Down
Binary file added wger/software/static/images/gym_1.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added wger/software/static/images/gym_10.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added wger/software/static/images/gym_2.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added wger/software/static/images/gym_3.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added wger/software/static/images/gym_4.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added wger/software/static/images/gym_7.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added wger/software/static/images/ss2.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added wger/software/static/images/ss5.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added wger/software/static/images/ss6.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
223 changes: 220 additions & 3 deletions wger/software/templates/features.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,151 @@
{# #}
{% block content %}
<header>
<div class="container">
<div class="intro-text">
<div class="container-fluid">
<div id="myCarousel" class="hidden-xs hidden-sm carousel slide" data-ride="carousel">
<!-- Indicators -->
<ol class="carousel-indicators">
<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
<li data-target="#myCarousel" data-slide-to="1"></li>
<!-- <li data-target="#myCarousel" data-slide-to="2"></li> -->
</ol>

<!-- Wrapper for slides -->
<div class="carousel-inner">

<div class="item active">
<img src="{% static 'images/main.jpg' %}" alt="Los Angeles" style="width:100%;">
<div class="carousel-caption">
<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 allow_guest_users and not user.is_authenticated %}
<a href="{% url 'core:user:demo-entries' %}" class="page-scroll btn btn-xl" rel="nofollow" style="margin-top: 1em;">
{% 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" style="margin-top: 1em;">
{% trans "Register" %}
</a>
{% endif %}

<a href="{% url 'core:user:login' %}" class="page-scroll btn btn-xl" style="margin-top: 1em;">
{% trans "Login" %}
</a>
{% endif %}
</div>
</div>
</div>

<div class="item">
<img src="{% static 'images/gym_3.jpg' %}" alt="Chicago" style="width:100%;">
<div class="carousel-caption">
<div class="intro-text">
<div class="intro-heading">{% trans "Bulk up or tone with wger" %}</div>
<div class="intro-lead-in">{% trans "Set up your workouts using:" %}</div>
<div class="intro-lead-in">{% trans "Repetitions" %}</div>
<div class="intro-lead-in">{% trans "Minutes" %}</div>
<div class="intro-lead-in">{% trans "Miles" %}</div>
<div class="intro-lead-in">{% trans "Until failure" %}</div>
{% if allow_guest_users and not user.is_authenticated %}
<a href="{% url 'core:user:demo-entries' %}" class="page-scroll btn btn-xl" rel="nofollow" style="margin-top: 1em;">
{% 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" style="margin-top: 1em;">
{% trans "Register" %}
</a>
{% endif %}

<a href="{% url 'core:user:login' %}" class="page-scroll btn btn-xl" style="margin-top: 1em;">
{% trans "Login" %}
</a>
{% endif %}
</div>
</div>
</div>

<div class="item">
<img src="{% static 'images/gym_4.jpg' %}" alt="New York" style="width:100%;">
<div class="carousel-caption">
<div class="intro-text">
<div class="intro-heading">{% trans "Manage your gym" %}</div>
<div class="intro-lead-in">{% trans "Gym managers" %}</div>
<div class="intro-lead-in">{% trans "Gym trainers" %}</div>
<div class="intro-lead-in">{% trans "Gym users" %}</div>
{% if allow_guest_users and not user.is_authenticated %}
<a href="{% url 'core:user:demo-entries' %}" class="page-scroll btn btn-xl" rel="nofollow" style="margin-top: 1em;">
{% 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" style="margin-top: 1em;">
{% trans "Register" %}
</a>
{% endif %}

<a href="{% url 'core:user:login' %}" class="page-scroll btn btn-xl" style="margin-top: 1em;">
{% trans "Login" %}
</a>
{% endif %}
</div>
</div>
</div>
<div class="item">
<img src="{% static 'images/gym_7.jpg' %}" alt="New York" style="width:100%;">
<div class="carousel-caption">
<div class="intro-text">
<div class="intro-heading">{% trans "Share on wger" %}</div>
<div class="intro-lead-in">{% trans "Impport and export workouts" %}</div>
<div class="intro-lead-in">{% trans "Incoporate fitbit data" %}</div>
<div class="intro-lead-in">{% trans "Your nutrional plans" %}</div>
<div class="intro-lead-in">{% trans "Your workputs" %}</div>

{% if allow_guest_users and not user.is_authenticated %}
<a href="{% url 'core:user:demo-entries' %}" class="page-scroll btn btn-xl" rel="nofollow" style="margin-top: 1em;">
{% 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" style="margin-top: 1em;">
{% trans "Register" %}
</a>
{% endif %}

<a href="{% url 'core:user:login' %}" class="page-scroll btn btn-xl" style="margin-top: 1em;">
{% trans "Login" %}
</a>
{% endif %}
</div>
</div>
</div>

</div>

<!-- Left and right controls -->
<a class="left carousel-control" href="#myCarousel" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left"></span>
<span class="sr-only">Previous</span>
</a>
<a class="right carousel-control" href="#myCarousel" data-slide="next">
<span class="glyphicon glyphicon-chevron-right"></span>
<span class="sr-only">Next</span>
</a>
</div>
<div class="hidden-lg hidden-xl hidden-md 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>
Expand Down Expand Up @@ -112,7 +255,81 @@ <h4 class="service-heading text-light">{% trans 'Diary' %}</h4>
</div>
</div>
</section>

<div class="jarallax" style="background-repeat: no-repeat; background-size: cover; background-position: center center;">
<div class="jarallax-inner container-fluid">
<div class="row">
<div class="col-md-6">
<div class="intro light">
<div class="intro-heading">
<h1>Lorem ipsum eiusmod</h1>
</div>
<div class="intro-body">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit
in voluptate
</p>
</div>
</div>
</div>
<div class="col-md-6">
<div class="intro-img">
<img class="img-responsive" src="{% static 'images/ss5.jpg' %}" >
</div>
</div>
</div>
</div>
</div>
<div class="jarallax-1" style="background-repeat: no-repeat; background-size: cover; background-position: center center;">
<div class="jarallax-inner container-fluid">
<div class="row">
<div class="col-md-6">
<div class="intro-img">
<img style="padding: 15px;" class="img-responsive" src="{% static 'images/ss2.jpg' %}" >
</div>
</div>
<div class="col-md-6">
<div class="intro light">
<div class="intro-heading">
<h1>Lorem ipsum eiusmod</h1>
</div>
<div class="intro-body">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit
in voluptate
</p>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="jarallax-2" style="background-repeat: no-repeat; background-size: cover; background-position: center center;">
<div class="jarallax-inner container-fluid">
<div class="row">
<div class="col-md-6">
<div class="intro light">
<div class="intro-heading">
<h1>Lorem ipsum eiusmod</h1>
</div>
<div class="intro-body">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit
in voluptate
</p>
</div>
</div>
</div>
<div class="col-md-6">
<div class="intro-img">
<img style="padding-top: 150px;" class="img-responsive" src="{% static 'images/ss6.jpg' %}" >
</div>
</div>
</div>
</div>
</div>
<section id="about" class="bg-light-gray">
<div class="container">
<div class="row">
Expand Down

0 comments on commit 2a7c867

Please sign in to comment.