Skip to content

Commit d3d72e6

Browse files
author
kuivenhoven1
committed
Have proper data for nested pie chart now
1 parent f424ee4 commit d3d72e6

File tree

8 files changed

+715
-162
lines changed

8 files changed

+715
-162
lines changed

‎statsPage/templates/base.html

Lines changed: 82 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -11,79 +11,92 @@
1111
<!-- http://bootsnipp.com/snippets/featured/social-buttons-for-bootstrap -->
1212
<!-- http://lipis.github.io/bootstrap-social/ -->
1313

14-
<nav class="navbar navbar-default">
14+
<nav role="navigation" class="navbar navbar-default">
1515
<div class="container-fluid">
1616
<div class="navbar-header">
17-
<ul class="nav navbar-nav">
18-
{% if user.is_authenticated %}<!--or current_path == '/stats/platform_bar/' %}-->
19-
<div class="container">
20-
<div class="row">
21-
<div class="btn-group">
22-
<li><a style="color:black; font-size:125%" href="/stats">Home</a></li>
23-
</div>&nbsp;
24-
<div class="btn-group">
25-
<li class="dropdown-toggle" data-toggle="dropdown" style="font-size:125%;">
26-
Global Stats <span class="caret"></span>
27-
</li>
28-
<ul class="dropdown-menu" role="menu">
29-
<li><a style="color:black; font-size:125%" href="/stats/world_stats/">World Stats</a></li>
30-
<li><a style="color:black; font-size:125%" href="/stats/geo_stats/">Geo Stats</a></li>
31-
</ul>
32-
</div>&nbsp;
33-
<div class="btn-group">
34-
<li class="dropdown-toggle" data-toggle="dropdown" style="font-size:125%;">
35-
Time Stats <span class="caret"></span>
36-
</li>
37-
<ul class="dropdown-menu" role="menu">
38-
<li><a style="color:black; font-size:125%" href="/stats/all_years_pie/">All Years Stats</a></li>
39-
<li><a style="color:black; font-size:125%" href="/stats/pie_by_year/">By Year Stats</a></li>
40-
</ul>
41-
</div>&nbsp;
42-
<div class="btn-group">
43-
<li class="dropdown-toggle" data-toggle="dropdown" style="font-size:125%">
44-
Session Stats <span class="caret"></span>
45-
</li>
46-
<ul class="dropdown-menu">
47-
<li><a style="color:black; font-size:125%" href="/stats/platform_bar/">Platform Stats</a></li>
48-
<li><a style="color:black; font-size:125%" href="/stats/calendar_data/">Duration Stats</a></li>
49-
<li><a style="color:black; font-size:125%" href="/stats/bar_sesh/">Bar Chart Dur Stats</a></li>
50-
</ul>
51-
</div>&nbsp;
52-
<div class="btn-group">
53-
<li class="dropdown-toggle" data-toggle="dropdown" style="font-size:125%">
54-
Function Stats <span class="caret"></span>
55-
</li>
56-
<ul class="dropdown-menu">
57-
<li><a style="color:black; font-size:125%" href="/stats/most_used_pie/">Actions Stats</a></li>
58-
</ul>
59-
</div>&nbsp;
60-
<div class="btn-group">
61-
<li class="dropdown-toggle" data-toggle="dropdown" style="font-size:125%">
62-
Testing Page <span class="caret"></span>
63-
</li>
64-
<ul class="dropdown-menu">
65-
<li><a style="color:black; font-size:125%" href="/stats/testing/">Testing Page</a></li>
66-
<li><a style="color:black; font-size:125%" href="/stats/nested_chart/">Nested Chart Page</a></li>
67-
</ul>
68-
</div>&nbsp;
69-
<div class="btn-group">
70-
<li><a style="color:black; font-size:125%" href="/logout/">Logout</a></li>
71-
</div>
72-
</div>
73-
</div>
74-
{% else %}
75-
<div class="btn-group">
76-
<li><a style="color:black; font-size:125%" href="/stats">Home</a></li>
77-
</div>&nbsp;
78-
<div class="btn-group">
79-
<li><a style="color:black; font-size:125%" href="/login">Log in</a></li>
80-
</div>
81-
{% endif %}
82-
</ul>
17+
<button type="button" data-target="#navbarCollapse" data-toggle="collapse" class="navbar-toggle">
18+
<span class="sr-only">Toggle nav</span>
19+
<span class="icon-bar"></span>
20+
<span class="icon-bar"></span>
21+
<span class="icon-bar"></span>
22+
</button>
23+
<a href="#" class="navbar-brand"><Brand</a>
8324
</div>
84-
</div>
85-
</nav>
25+
<!--div class="navbar-header"-->
26+
<div id="navbarCollapse" class="collapse navbar-collapse">
27+
{% if user.is_authenticated %}<!--or current_path == '/stats/platform_bar/' %}-->
28+
<ul class="nav navbar-nav">
29+
<li class="active"><a href="/stats">Home</a></li>
30+
<li class="dropdown">
31+
<a data-toggle="dropdown" class="dropdown-toggle" href="#">Global Stats<b class="caret"></b></a>
32+
<ul role="menu" class="dropdown-menu">
33+
<li><a href="/stats/world_stats/">World Stats</a></li>
34+
<li><a href="/stats/geo_stats/">Geo Stats</a></li>
35+
</ul>
36+
</li>
37+
38+
<li class="dropdown">
39+
<a data-toggle="dropdown" class="dropdown-toggle" href="#">Time Stats<b class="caret"></b></a>
40+
<ul role="menu" class="dropdown-menu">
41+
<li><a href="/stats/all_years_pie/">All Years Stats</a></li>
42+
<li><a href="/stats/pie_by_year/">By Year Stats</a></li>
43+
</ul>
44+
</li>
45+
46+
<li class="dropdown">
47+
<a data-toggle="dropdown" class="dropdown-toggle" href="#">Session Stats<b class="caret"></b></a>
48+
<ul role="menu" class="dropdown-menu">
49+
<li><a href="/stats/platform_bar/">Platform Stats</a></li>
50+
<li><a href="/stats/calendar_data/">Duration Stats</a></li>
51+
<li><a href="/stats/bar_sesh/">Bar Chart Dur Stats</a></li>
52+
</ul>
53+
</li>
8654

55+
<li class="dropdown">
56+
<a data-toggle="dropdown" class="dropdown-toggle" href="#">Function Stats<b class="caret"></b></a>
57+
<ul role="menu" class="dropdown-menu">
58+
<li><a href="/stats/most_used_pie/">Action Stats</a></li>
59+
</ul>
60+
</li>
61+
62+
<li class="dropdown">
63+
<a data-toggle="dropdown" class="dropdown-toggle" href="#">Testing Page<b class="caret"></b></a>
64+
<ul role="menu" class="dropdown-menu">
65+
<li><a href="/stats/testing/">Testing Page</a></li>
66+
<li><a href="/stats/nested_chart/">Nested Chart Page</a></li>
67+
<li><a href="/stats/k_bro/">K Bro Page</a></li>
68+
</ul>
69+
</li>
70+
71+
</ul>
72+
<ul class="nav navbar-nav navbar-right">
73+
<li><a href="/logout/">Logout</a></li>
74+
</ul>
75+
<ul class="nav navbar-nav navbar-right">
76+
<li><a href="/stats/survey/">Survey</a></li>
77+
</ul>
78+
<ul class="nav navbar-nav navbar-right">
79+
<li><a href="/stats/help/">Help</a></li>
80+
</ul>
81+
{% else %}
82+
83+
<ul class="nav navbar-nav navbar-left">
84+
<li><a href="/stats">Home</a></li>
85+
</ul>
86+
<ul class="nav navbar-nav navbar-right">
87+
<li><a href="/stats/survey/">Survey</a></li>
88+
</ul>
89+
<ul class="nav navbar-nav navbar-right">
90+
<li><a href="/stats/help/">Help</a></li>
91+
</ul>
92+
<ul class="nav navbar-nav navbar-right">
93+
<li><a href="/login">Login</a></li>
94+
</ul>
95+
{% endif %}
96+
</div>
97+
</div>
98+
</nav>
99+
87100

88101
<div class="container">
89102
{% block content %}

‎statsPage/templates/help.html

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{% extends "base.html" %}
2+
3+
{% block content %}
4+
{% load staticfiles %}
5+
<link href="{% static 'css/help.css' %}" rel="stylesheet">
6+
7+
<div class="container">
8+
<div id="feature-carousel" class="carousel slide" data-ride="carousel">
9+
<div class="carousel-inner" role="listbox">
10+
<div class="item active">
11+
<center><h2>UVC-DAT Analytics Help Page</h2></center>
12+
</div>
13+
</div>
14+
</div>
15+
</div>
16+
17+
<br>
18+
<div class="container">
19+
<center><p id="help_page">Please contact our support team at <span id="help_email">uvcdat-support@llnl.gov</span> if you have any questions, concerns, or comments.</p></center>
20+
</div>
21+
22+
23+
{% endblock content %}

‎statsPage/templates/survey.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{% extends "base.html" %}
2+
3+
{% block content %}
4+
{% load staticfiles %}
5+
<link href="{% static 'css/help.css' %}" rel="stylesheet">
6+
7+
<div class="container">
8+
<div id="feature-carousel" class="carousel slide" data-ride="carousel">
9+
<div class="carousel-inner" role="listbox">
10+
<div class="item active">
11+
<center><h2>UVC-DAT Analytics Survey Page</h2></center>
12+
</div>
13+
</div>
14+
</div>
15+
</div>
16+
17+
18+
19+
{% endblock content %}

0 commit comments

Comments
 (0)