Skip to content

Commit

Permalink
Merge pull request #48 from RyanBeatty/privacy
Browse files Browse the repository at this point in the history
fixed privacy policy assets, src path was corrupted
  • Loading branch information
ugiacoman committed Oct 12, 2015
2 parents 394083b + c1bc842 commit 1ecd369
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 30 deletions.
Binary file modified steerclear/templates/privacy-policy/advertising.html
Binary file not shown.
Binary file modified steerclear/templates/privacy-policy/analytics.html
Binary file not shown.
Binary file modified steerclear/templates/privacy-policy/control.html
Binary file not shown.
44 changes: 22 additions & 22 deletions steerclear/templates/privacy-policy/data-collection.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@
}
</style>

<link href="static/privacy-policy/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="static/privacy-policy/css/bootstrap-responsive.css" rel="stylesheet">
<link href="static/privacy-policy/css/main.css" rel="stylesheet">
<link href="../../static/privacy-policy/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="../../static/privacy-policy/css/bootstrap-responsive.css" rel="stylesheet">
<link href="../../static/privacy-policy/css/main.css" rel="stylesheet">
</head>

<body>


<div class="container-fluid">
<div class="showMobile thickBottom">
<div class="goBack"><a href="index.html"><img width="60" src="static/privacy-policy/img/arrow-back.png" /></a></div>
<div class="goBack"><a href="index.html"><img width="60" src="../../static/privacy-policy/img/arrow-back.png" /></a></div>
<div class="pageTitle">Data Collection</div>
<div class="clear"></div>
</div>
Expand All @@ -49,14 +49,14 @@ <h2>Data Collection</h2>

<h3 class="padLeft appSummaryTitle">User Details</h3>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/tick.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/tick.png" /> </div>
<div class="itemName">

Email address </div>
<div class="clear"></div>
</div>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/tick.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/tick.png" /> </div>
<div class="itemName">

Mobile device telephone no. </div>
Expand All @@ -66,21 +66,21 @@ <h3 class="padLeft appSummaryTitle">User Details</h3>

<h3 class="padLeft appSummaryTitle"> Device identifier </h3>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/cross.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/cross.png" /> </div>
<div class="itemName">

Device information (UDID) </div>
<div class="clear"></div>
</div>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/cross.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/cross.png" /> </div>
<div class="itemName">

MAC address </div>
<div class="clear"></div>
</div>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/cross.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/cross.png" /> </div>
<div class="itemName">

OS version </div>
Expand All @@ -90,42 +90,42 @@ <h3 class="padLeft appSummaryTitle"> Device identifier </h3>

<h3 class="padLeft appSummaryTitle"> User files </h3>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/cross.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/cross.png" /> </div>
<div class="itemName">

Photos/videos </div>
<div class="clear"></div>
</div>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/cross.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/cross.png" /> </div>
<div class="itemName">

Browser history </div>
<div class="clear"></div>
</div>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/cross.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/cross.png" /> </div>
<div class="itemName">

Phone/text log </div>
<div class="clear"></div>
</div>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/cross.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/cross.png" /> </div>
<div class="itemName">

Contacts </div>
<div class="clear"></div>
</div>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/cross.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/cross.png" /> </div>
<div class="itemName">

Messages </div>
<div class="clear"></div>
</div>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/cross.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/cross.png" /> </div>
<div class="itemName">

Installed apps </div>
Expand All @@ -135,7 +135,7 @@ <h3 class="padLeft appSummaryTitle"> User files </h3>

<h3 class="padLeft appSummaryTitle">Location</h3>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/tick.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/tick.png" /> </div>
<div class="itemName">

Location Data </div>
Expand All @@ -145,14 +145,14 @@ <h3 class="padLeft appSummaryTitle">Location</h3>

<h3 class="padLeft appSummaryTitle">Biometrics</h3>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/cross.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/cross.png" /> </div>
<div class="itemName">

Fingerprint reader </div>
<div class="clear"></div>
</div>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/cross.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/cross.png" /> </div>
<div class="itemName">

Voice authentification </div>
Expand All @@ -162,7 +162,7 @@ <h3 class="padLeft appSummaryTitle">Biometrics</h3>

<h3 class="padLeft appSummaryTitle">Health, medical or therapy information</h3>
<div class="itemRow">
<div class="itemActive"> <img width="30" src="static/privacy-policy/img/cross.png" /> </div>
<div class="itemActive"> <img width="30" src="../../static/privacy-policy/img/cross.png" /> </div>
<div class="itemName">

Data </div>
Expand All @@ -176,9 +176,9 @@ <h3 class="padLeft appSummaryTitle">Health, medical or therapy information</h3>
</div><!--/.fluid-container-->


<script src="static/privacy-policy/js/jquery.min.js"></script>
<script src="static/privacy-policy/js/bootstrap.min.js"></script>
<script src="static/privacy-policy/js/main.js"></script>
<script src="../../static/privacy-policy/js/jquery.min.js"></script>
<script src="../../static/privacy-policy/js/bootstrap.min.js"></script>
<script src="../../static/privacy-policy/js/main.js"></script>

</body>
</html>
Binary file modified steerclear/templates/privacy-policy/direct-marketing.html
Binary file not shown.
16 changes: 8 additions & 8 deletions steerclear/templates/privacy-policy/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
}
</style>

<link href="static/privacy-policy/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="static/privacy-policy/css/bootstrap-responsive.css" rel="stylesheet">
<link href="static/privacy-policy/css/main.css" rel="stylesheet">
<link href="../../static/privacy-policy/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="../../static/privacy-policy/css/bootstrap-responsive.css" rel="stylesheet">
<link href="../../static/privacy-policy/css/main.css" rel="stylesheet">
</head>

<body>
Expand All @@ -52,15 +52,15 @@
<div class="contactOption">
<a href="steerclear.wm.edu" target=_blank>
<div class="floatLeft appSummaryTitle">Website</div>
<div class="floatRight rightPad"><img src="static/privacy-policy/img/arrow-right.png" /></div>
<div class="floatRight rightPad"><img src="../../static/privacy-policy/img/arrow-right.png" /></div>
<div class="clear"></div>
</a>
</div>

<div class="contactOption">
<a href="mailto:[email protected]" >
<div class="floatLeft appSummaryTitle">Contact</div>
<div class="floatRight rightPad"><img src="static/privacy-policy/img/arrow-right.png" /></div>
<div class="floatRight rightPad"><img src="../../static/privacy-policy/img/arrow-right.png" /></div>
<div class="clear"></div>
</a>
</div>
Expand Down Expand Up @@ -139,9 +139,9 @@
</div><!--/.fluid-container-->


<script src="static/privacy-policy/js/jquery.min.js"></script>
<script src="static/privacy-policy/js/bootstrap.min.js"></script>
<script src="static/privacy-policy/js/main.js"></script>
<script src="../../static/privacy-policy/js/jquery.min.js"></script>
<script src="../../static/privacy-policy/js/bootstrap.min.js"></script>
<script src="../../static/privacy-policy/js/main.js"></script>
<script>
var screenSize = 0;
window.onload=function(){ screenSize = $(window).width();}
Expand Down
Binary file modified steerclear/templates/privacy-policy/location-services.html
Binary file not shown.
Binary file modified steerclear/templates/privacy-policy/payments.html
Binary file not shown.
Binary file modified steerclear/templates/privacy-policy/security.html
Binary file not shown.
Binary file modified steerclear/templates/privacy-policy/social-networking.html
Binary file not shown.

0 comments on commit 1ecd369

Please sign in to comment.