Skip to content

Dev/pre production #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scarperharper wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Dev/pre production #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99cc308
Adds new banner, adapts to new data structure
scarperharper Apr 24, 2017
a0d4296
Fixing some relative links
scarperharper Apr 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Images/background.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
109 changes: 78 additions & 31 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,42 @@
<title>Coventry Data Explorer</title>

<!-- Bootstrap -->
<link href="../gentelella/vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="gentelella/vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="../gentelella/vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="gentelella/vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<!-- iCheck -->
<link href="../gentelella/vendors/iCheck/skins/flat/green.css" rel="stylesheet">
<link href="gentelella/vendors/iCheck/skins/flat/green.css" rel="stylesheet">
<!-- Custom Theme Style -->
<link href="../gentelella/build/css/custom.min.css" rel="stylesheet">
<link href="gentelella/build/css/custom.min.css" rel="stylesheet">
<!-- local -->
<link href="/src/css/main.css" rel="stylesheet">
<link href="src/css/main.css" rel="stylesheet">

<style>
@media (max-width: 768px) {
.headline h3 {
font-size: 26px;
}
.headline {
font-size: 13px;
}
}
@media (min-width: 768px) {
.headline h3 {
font-size: 36px;
}
.headline {
font-size: 16px;
}
}
@media (min-width: 1024px) {
.headline h3 {
font-size: 56px;
}
.headline {
font-size: 22px;
}
}
</style>
</head>

<body class="nav-sm">
Expand Down Expand Up @@ -75,41 +102,41 @@ <h3 class="pull-right hidden-sm hidden-xs" style="margin-right:20px;line-height:
<!-- page content -->
<div class="right_col" role="main">
<!-- top tiles -->
<!-- <div class="row tile_count">
<div class="row tile_count">
<div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">
<span class="count_top"><i class="fa fa-user"></i> Total Users</span>
<div class="count">2500</div>
<span class="count_bottom"><i class="green">4% </i> From last Week</span>
<span class="count_top"><i class="fa fa-user"></i> Coventry Residents</span>
<div class="count">345,400</div>
<span class="count_bottom">As of mid 2005</span>
</div>
<div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">
<span class="count_top"><i class="fa fa-clock-o"></i> Average Time</span>
<div class="count">123.50</div>
<span class="count_bottom"><i class="green"><i class="fa fa-sort-asc"></i>3% </i> From last Week</span>
<span class="count_top"><i class="fa fa-clock-o"></i> Average Age</span>
<div class="count">33</div>
<span class="count_bottom"><i class="green"><i class="fa fa-sort-desc"></i>Younger </i> than average</span>
</div>
<div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">
<span class="count_top"><i class="fa fa-user"></i> Total Males</span>
<div class="count green">2,500</div>
<span class="count_bottom"><i class="green"><i class="fa fa-sort-asc"></i>34% </i> From last Week</span>
<span class="count_top"><i class="fa fa-user"></i> Employment</span>
<div class="count">68%</div>
<span class="count_bottom"><i class="red"><i class="fa fa-sort-desc"></i>Lower </i> than average</span>
</div>
<div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">
<span class="count_top"><i class="fa fa-user"></i> Total Females</span>
<div class="count">4,567</div>
<span class="count_bottom"><i class="red"><i class="fa fa-sort-desc"></i>12% </i> From last Week</span>
<span class="count_top"><i class="fa fa-user"></i> Crime Rate pp</span>
<div class="count">6.2/100</div>
<span class="count_bottom"><i class="red"><i class="fa fa-sort-desc"></i>Lower </i> than average</span>
</div>
<div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">
<span class="count_top"><i class="fa fa-user"></i> Total Collections</span>
<div class="count">2,315</div>
<span class="count_bottom"><i class="green"><i class="fa fa-sort-asc"></i>34% </i> From last Week</span>
<span class="count_top"><i class="fa fa-user"></i> Cultural events</span>
<div class="count">73%</div>
<span class="count_bottom">Engagement</span>
</div>
<div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">
<span class="count_top"><i class="fa fa-user"></i> Total Connections</span>
<div class="count">7,325</div>
<span class="count_bottom"><i class="green"><i class="fa fa-sort-asc"></i>34% </i> From last Week</span>
<span class="count_top"><i class="fa fa-user"></i> Life Expectancy</span>
<div class="count">79.5</div>
<span class="count_bottom"><i class="red"><i class="fa fa-sort-desc"></i>Lower </i> than average</span>
</div>
</div> -->
</div>
<!-- /top tiles -->

<div class="row">
<!-- <div class="row">
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="dashboard_graph">

Expand All @@ -125,8 +152,28 @@ <h3>Exploring <small>the Data of Coventry</small></h3>

<div class="clearfix"></div>
</div>

</div>

</div>
<br /> -->

<div class="row">
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="col-md-12 headline" style="background-image: url(/Images/background.jpg);-webkit-background-size: cover;-moz-background-size: cover;-o-background-size: cover;background-size: cover;">
<h3 style="color:#dddddd;">Exploring <small>the Data of Coventry</small></h3>
<div class="row">
<div class="col-md-8 col-sm-8">
<p style="color:#cccccc">Using this tool you can explore the difference between the wards of Coventry, and the correlations between the differences in their data.</p>
</div>
<div class="col-md-4 col-sm-4">
</div>
</div>
</div>

<div class="clearfix"></div>
</div>

</div>
<br />

Expand Down Expand Up @@ -467,15 +514,15 @@ <h2 id="correlations">Correlations in Ward Data</h2>
</div>

<!-- jQuery -->
<script src="../gentelella/vendors/jquery/dist/jquery.min.js"></script>
<script src="gentelella/vendors/jquery/dist/jquery.min.js"></script>
<!-- Bootstrap -->
<script src="../gentelella/vendors/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="gentelella/vendors/bootstrap/dist/js/bootstrap.min.js"></script>

<!-- Custom Theme Scripts -->
<script src="../gentelella/build/js/custom.min.js"></script>
<script src="gentelella/build/js/custom.min.js"></script>

<!-- iCheck -->
<script src="../gentelella/vendors/iCheck/icheck.min.js"></script>
<script src="gentelella/vendors/iCheck/icheck.min.js"></script>

<!-- D3 -->
<script src="https://d3js.org/d3.v4.min.js"></script>
Expand All @@ -485,7 +532,7 @@ <h2 id="correlations">Correlations in Ward Data</h2>
<script src="https://d3js.org/topojson.v1.min.js"></script>

<!-- local -->
<script src="/src/js/3maps.js"></script>
<script src="src/js/3maps.js"></script>

</body>
</html>
4 changes: 2 additions & 2 deletions src/js/3maps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ d3.select('#rightlowerpanel select')
function menuchange(side) {

var values = d3.select("#" + side + "panel select").property('value');
csvpath = './Tables/'.concat(values, '.csv');
questionpath = './Questions/'.concat(values, '.txt');
csvpath = './Data/Tables/'.concat(values, '.csv');
questionpath = './Data/Questions/'.concat(values, '.txt');

// Remove previous question and checkboxes
d3.select("#" + side + "panel .question").selectAll("*").remove();
Expand Down