Self hosted FLOSS fitness/workout, nutrition and weight tracker
Use an off canvas menu in the mobile version
Roland Geider91fd02bb348e
diff --git a/wger/core/static/css/bootstrap-custom.css b/wger/core/static/css/bootstrap-custom.cssindex b24cf69e7..cec077370 100644--- a/wger/core/static/css/bootstrap-custom.css+++ b/wger/core/static/css/bootstrap-custom.css@@ -28,6 +28,7 @@ html {-ms-text-size-adjust: 100%;}+body {font-family: "Open Sans Light", Arial, Helvetica, sans-serif;background-color: #204A87;@@ -63,6 +64,110 @@ body {}+.wger-mobile-list-group > .list-group-item {+ background-color: #F5F5F5;+}+++.application-name {+ text-shadow: 2px 3px 3px #292929;+ font-family: "Open Sans Bold",Arial,Helvetica,sans-serif;+ font-weight: 300;+ font-size: 180%;+ color: #FFF;+ width: 50%;+ text-align: center;+ margin-top: 0.2em;+}+++/**************************************************************+ * Off Canvas menu+ *+ * http://getbootstrap.com/examples/offcanvas/+ **************************************************************/+html,+body {+ overflow-x: hidden; /* Prevent scroll on narrow devices */+}++#main-template {+ overflow-x: hidden;+}++.sidebar-offcanvas #main-navbar-navigation {+ border-color: transparent;+ margin-left: -30px;+}++@media screen and (max-width: 767px) {+ .row-offcanvas {+ position: relative;+ -webkit-transition: all .25s ease-out;+ -moz-transition: all .25s ease-out;+ transition: all .25s ease-out;+ }++ .row-offcanvas-right {+ right: 0;+ }++ .row-offcanvas-left {+ left: 0;+ }++ .row-offcanvas-right+ .sidebar-offcanvas {+ right: -70%;+ }++ .row-offcanvas-left+ .sidebar-offcanvas {+ left: -70%;+ }++ .row-offcanvas-right.active {+ right: 70%;+ }++ .row-offcanvas-left.active {+ left: 70%;+ }++ .sidebar-offcanvas {+ position: absolute;+ top: 0;+ width: 70%;+ }+}+++/**************************************************************+ * forward-port nav-header to bootstrap 3+ **************************************************************/++.nav-header {+ display: block;+ padding: 3px 15px;+ font-size: 11px;+ font-weight: bold;+ line-height: 20px;+ color: #999999;+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);+ text-transform: uppercase;+}++.nav li + .nav-header {+ margin-top: 9px;+}++.nav-list > li > a,+.nav-list .nav-header {+ margin-right: -15px;+ margin-left: -15px;+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);+}+/*************************************************************** Alerts**************************************************************/diff --git a/wger/core/templates/mobile/navigation.html b/wger/core/templates/mobile/navigation.htmlindex 69ff8fc59..675bfe40a 100644--- a/wger/core/templates/mobile/navigation.html+++ b/wger/core/templates/mobile/navigation.html@@ -7,44 +7,48 @@<h4 class="modal-title">{% trans "Language" %}</h4></div><div class="modal-body">- <ul class="list-group">+ <div class="list-group">{% for language in languages %}{% language_select language %}{% endfor %}- </ul>+ </div></div></div></div></div>-<nav id="nav">+<nav id="nav" style="overflow-y: scroll;position: fixed;"><div>- <div class="navbar navbar-default navbar-fixed-top ">+ <div class="navbar navbar-default" style="background-color: transparent; border-width: 0px;"><div class="container">- <div class="navbar-header">- <a class="navbar-toggle" data-toggle="collapse" data-target="#main-navbar-navigation">- <span class="icon-bar"></span>- <span class="icon-bar"></span>- <span class="icon-bar"></span>- </a>- </div>- <div class="navbar-collapse collapse" id="main-navbar-navigation">++ <div class="navbar-collapse " id="main-navbar-navigation"><ul class="nav navbar-nav">{# #}{# User tab #}{# #}- <li {% if active_tab == 'user' %}class="active"{% endif %}><a href="{% url 'core:index' %}">{% trans "Dashboard" %}</a></li>+ <li>+ <a href="{% url 'core:index' %}">+ {% if active_tab == 'user' %}<strong>{% endif %}+ {% trans "Dashboard" %}+ {% if active_tab == 'user' %}</strong>{% endif %}+ </a>+ </li>{# #}{# Workout tab #}{# #}- <li class="dropdown {% if active_tab == 'workout' %}active{% endif %}">+ <li class="dropdown"><a href="{% url 'workout-overview' %}"rel="nofollow"class="dropdown-toggle"- data-toggle="dropdown">{% trans "Workouts" %} <b class="caret"></b></a>+ data-toggle="dropdown">+ {% if active_tab == 'workout' %}<strong>{% endif %}+ {% trans "Workouts" %} <b class="caret"></b>+ {% if active_tab == 'workout' %}</strong>{% endif %}+ </a><ul class="dropdown-menu"><li><a href="{% url 'workout-overview' %}" rel="nofollow">{% trans "Workouts" %}</a></li><li><a href="{% url 'workout-calendar' %}" rel="nofollow">{% trans "Calendar" %}</a></li>@@ -56,16 +60,19 @@{# #}{# Exercises tab #}{# #}- <li class="dropdown {% if active_tab == 'exercises' %}active{% endif %}">+ <li class="dropdown"><a href="{% url 'exercise-overview' %}"class="dropdown-toggle"- data-toggle="dropdown">{% trans "Exercises" %} <b class="caret"></b></a>+ data-toggle="dropdown">+ {% if active_tab == 'exercises' %}<strong>{% endif %}+ {% trans "Exercises" %} <b class="caret"></b>+ {% if active_tab == 'exercises' %}</strong>{% endif %}+ </a><ul class="dropdown-menu"><li><a href="{% url 'exercise-overview' %}">{% trans "Exercises" %}</a></li><li><a href="{% url 'muscle-overview' %}">{% trans "Muscle overview" %}</a></li><li><a href="{% url 'equipment-overview' %}">{% trans "Equipment overview" %}</a></li>{% if user.is_authenticated and not user.userprofile.is_temporary %}- <li class="divider"></li><li><a href="{% url 'exercise-add' %}">{% trans "Add new exercise" %}</a><li>{% endif %}@@ -84,12 +91,16 @@{# #}{# Weight tab #}{# #}- <li class="dropdown{% if active_tab == 'weight' %} active{% endif %}">+ <li class="dropdown"><a href="{% url 'weight-overview' %}"class="dropdown-toggle"data-toggle="dropdown"- rel="nofollow">{% trans "Weight" %} <b class="caret"></b></a>+ rel="nofollow">+ {% if active_tab == 'weight' %}<strong>{% endif %}+ {% trans "Weight" %} <b class="caret"></b>+ {% if active_tab == 'weight' %}</strong>{% endif %}+ </a><ul class="dropdown-menu"><li><a href="{% url 'weight-overview' %}" rel="nofollow">{% trans "Weight overview" %}</a></li><li><a href="{% url 'weight-add' %}" rel="nofollow">{% trans "Add weight entry" %}</a></li>@@ -100,11 +111,15 @@{# #}{# Nutrition tab #}{# #}- <li class="dropdown {% if active_tab == 'nutrition' %}active{% endif %}">+ <li class="dropdown"><a href="{% url 'nutrition-overview' %}"class="dropdown-toggle"data-toggle="dropdown"- rel="nofollow">{% trans "Nutrition" %} <b class="caret"></b></a>+ rel="nofollow">+ {% if active_tab == 'nutrition' %}<strong>{% endif %}+ {% trans "Nutrition" %} <b class="caret"></b>+ {% if active_tab == 'nutrition' %}</strong>{% endif %}+ </a><ul class="dropdown-menu"><li><a href="{% url 'nutrition-overview' %}" rel="nofollow">{% trans "Nutrition plans" %}</a></li><li><a href="{% url 'ingredient-list' %}">{% trans "Ingredient overview" %}</a></li>@@ -125,10 +140,14 @@{# #}{# Software tab #}{# #}- <li class="dropdown {% if active_tab == 'software' %}active{% endif %}">+ <li class="dropdown"><a href=""class="dropdown-toggle"- data-toggle="dropdown">{% trans "About this software" %} <b class="caret"></b></a>+ data-toggle="dropdown">+ {% if active_tab == 'software' %}<strong>{% endif %}+ {% trans "About this software" %} <b class="caret"></b>+ {% if active_tab == 'software' %}</strong>{% endif %}+ </a><ul class="dropdown-menu"><li><a href="{% url 'software:features' %}">{% trans "Features" %}</a></li><li><a href="{% url 'software:contribute' %}">{% trans "Contribute!" %} </a></li>@@ -164,38 +183,29 @@<li><a href="{% url 'core:contact' %}">{% trans "Get in touch" %}</a></li><li><a href="{% url 'core:about' %}">{% trans "About" %}</a></li>- {# Site version #}- <li><a href="?flavour=full" data-ajax="false" rel="nofollow">{% trans "Desktop version" %}</a></li>-{# Language #}- <li class="dropdown">- <a href="#language-options" data-toggle="modal">{% trans "Language" %}</a>- </li>+ <li><a href="#language-options" data-toggle="modal">{% trans "Language" %}</a></li></ul></li>- </ul>- {# #}- {# Options tab #}- {# #}- {% if not user.is_authenticated or user.userprofile.is_temporary %}- <ul class="nav navbar-nav pull-right">- <li class="divider-vertical"></li>++ {# #}+ {# Options tab #}+ {# #}+ {% if not user.is_authenticated or user.userprofile.is_temporary %}<li class="dropdown">- <a href="#" class="dropdown-toggle" data-toggle="dropdown">- {% trans "Login" %} / {% trans "Register" %}- <b class="caret"></b>- </a>- <ul class="dropdown-menu">- <li><a href="{% url 'core:login' %}">{% trans "Login" %}</a></li>- <li><a href="{% url 'core:registration' %}">{% trans "Register" %}</a></li>- <li><a href="{% url 'core:password_reset' %}">{% trans "Reset password" %}</a></li>- </ul>+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">+ {% trans "Login" %} / {% trans "Register" %}+ <b class="caret"></b>+ </a>+ <ul class="dropdown-menu">+ <li><a href="{% url 'core:login' %}">{% trans "Login" %}</a></li>+ <li><a href="{% url 'core:registration' %}">{% trans "Register" %}</a></li>+ <li><a href="{% url 'core:password_reset' %}">{% trans "Reset password" %}</a></li>+ </ul></li>- </ul>- {% else %}- <ul class="nav navbar-nav navbar-right">+ {% else %}<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{% if user.email %}@@ -217,8 +227,10 @@</li></ul></li>+ {% endif %}</ul>- {% endif %}++</div><!--/.nav-collapse --></div></div>diff --git a/wger/core/templates/mobile/template.html b/wger/core/templates/mobile/template.htmlindex eb8dcd8b8..6d10e21f1 100644--- a/wger/core/templates/mobile/template.html+++ b/wger/core/templates/mobile/template.html@@ -50,6 +50,14 @@<script src="{% static 'js/weight.js' %}"></script><script src="{% static 'js/nutrition.js' %}"></script><script src="{% static 'js/browserid.js' %}" type="text/javascript"></script>++ <script>+ $(document).ready(function () {+ $('[data-toggle=offcanvas]').click(function () {+ $('.row-offcanvas').toggleClass('active')+ });+ });+ </script>{% endcompress %}{% block header %}{% endblock %}@@ -58,52 +66,21 @@<body>{% browserid_info %}<header>- <!--- <div class="container">- <div class="row">- <div class="col-md-offset-9 col-md-3">- <a href="{% url 'core:contact' %}">{% trans "Get in touch" %}</a>- |-- {# #}- {# Render the links to the other languages #}- {# #}- <div class="btn-group">- <button type="button" class="btn btn-primary dropdown-toggle btn-xs" data-toggle="dropdown">- <img src="/static/images/icons/flag-{{language.short_name}}.svg"- width="18"- height="11"- alt="{% trans language.full_name %}"- title="{% trans language.full_name %}"- style="border: 1px solid #151515;">- {{language.full_name}} <span class="caret"></span>- </button>- <ul class="dropdown-menu" role="menu">- {% for language in languages %}- {% language_select language %}- {% endfor %}- <li class="divider"></li>- <li>- <a href="https://www.transifex.com/projects/p/wger-workout-manager/">- <span class="glyphicon glyphicon-plus"></span>- {% trans "Translate" %}- </a>- </li>- </ul>- </div>- </div>- </div>- </div>- -->- <!--- <div class="container">- <span class="name">wger</span>+ <div class="navbar navbar-fixed-top" style="background-color: #204A87;">+ <button type="button"+ class="btn btn-primary pull-left"+ data-toggle="offcanvas"+ style="margin-top: 0.5em;margin-left: 0.5em;">+ <span class="glyphicon glyphicon-th-list"></span>+ </button>+ <span class="center-block application-name">+ wger+ </span></div>- --></header>-{% include 'navigation.html' %}-<div id="main">- <div class="container">++<div class="container">+ <div id="main" class="row-offcanvas row-offcanvas-left"><div class="modal fade" id="wger-ajax-info" tabindex="-1" role="dialog"><div class="modal-dialog"><div class="modal-content">@@ -130,7 +107,16 @@{% endif %}</div>{% endif %}- {% block template %}{% endblock %}++ {#<div class="col-xs-12 col-sm-9"> #}+ <div id="main-template">+ {% block template %}{% endblock %}+ </div>++ {# <div class="col-xs-7 col-sm-3 sidebar-offcanvas" role="navigation"> #}+ <div class="sidebar-offcanvas" role="navigation">+ {% include 'navigation.html' %}+ </div></div></div>diff --git a/wger/manager/templates/mobile/tags/language_select.html b/wger/manager/templates/mobile/tags/language_select.htmlnew file mode 100644index 000000000..1be9b9336--- /dev/null+++ b/wger/manager/templates/mobile/tags/language_select.html@@ -0,0 +1,14 @@+{% load i18n %}+{% load staticfiles %}++<a href="{{i18n_path}}" class="list-group-item wger-list-group-item">+<span class="glyphicon glyphicon-chevron-right pull-right"></span>++ <img src="{% static path %}"+ width="18"+ height="11"+ alt="{% trans language_name %}"+ title="{% trans language_name %}"+ style="border: 1px solid #151515;">+ {% trans language_name %}+</a>\ No newline at end of file