Commit 6cfb7fb6 authored by Rafal's avatar Rafal

toggle work

parent ea3e9864
This diff is collapsed.
This diff is collapsed.
$('#myTabs a').click(function (e) {
e.preventDefault()
$(this).tab('show')
})
\ No newline at end of file
{% extends 'user_panel/default/base.html' %} <h2>Mapa</h2>
{% block content %}
<div class="container">
<div class="row">
<div class="col-md-6">
<h2>Mapa</h2>
</div>
</div>
</div>
{% endblock content %}
\ No newline at end of file
...@@ -4,9 +4,29 @@ ...@@ -4,9 +4,29 @@
<div class="container"> <div class="row">
{% include 'user_panel/content/maps.html' %} <div class="col-md-10 col-md-offset-1">
<ul class="nav nav-tabs nav-justified">
<li class="active"><a data-toggle="tab" href="#beacons">Twoje beacony</a></li>
<li><a data-toggle="tab" href="#map">Mapa</a></li>
</ul>
<div class="tab-content">
<div id="beacons" class="tab-pane fade in active">
<h3>HOME</h3>
<p>Some content.</p>
</div>
<div id="map" class="tab-pane fade">
{% include 'user_panel/content/maps.html' %}
</div>
</div> </div>
</div>
</div>
{% endblock content %} {% endblock content %}
\ No newline at end of file
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<link rel="stylesheet" type="text/css" href="{% static 'css/dashboard.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'css/dashboard.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'css/login.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'css/login.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'css/footer.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'css/footer.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'css/left_bar.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'css/font-awesome.min.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'css/font-awesome.min.css' %}" />
<title>Activy</title> <title>Activy</title>
...@@ -18,7 +17,6 @@ ...@@ -18,7 +17,6 @@
<body> <body>
{% include 'user_panel/default/user_bar.html' %} {% include 'user_panel/default/user_bar.html' %}
{% include 'user_panel/default/left_bar.html' %}
<div id="wrap" style="margin-top:20px;"> <div id="wrap" style="margin-top:20px;">
...@@ -30,9 +28,10 @@ ...@@ -30,9 +28,10 @@
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed --> <!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="{% static 'js/bootstrap.min.js' %}"></script>
<script src="{% static 'js/hobby_detail.js' %}"></script>
<script src="{% static 'js/map.js' %}"></script> <script src="{% static 'js/map.js' %}"></script>
<script src="{% static 'js/project_detail.js' %}"></script>
<script src="{% static 'js/bootstrap.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
< <
</body> </body>
</html> </html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment