Skip to content

Commit

Permalink
Merge pull request #858 from ProjectSidewalk/develop
Browse files Browse the repository at this point in the history 
v4.0.1
  • Loading branch information
Manaswi Saha authored Jul 11, 2017
2 parents ff8b533 + 48c190d commit 83cd409
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 18 deletions.
25 changes: 13 additions & 12 deletions app/views/faq.scala.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ <h2 class="question" id="how-can-i-help">How can I help?</h2>
<div class="row">
<div class="col-sm-12">
<p>
Great! We really appreciate your help! It would be very helpful if you could use our tool to <i>audit accessibility of neighborhoods.</i>
Thanks for chipping in! You can help us out by using our tool to <i>audit the accessibility of neighborhoods.</i>
By accessibility audit, we mean:
</p>
<ol>
<li>
Click <a href='@routes.AuditController.audit'>Start Auditing</a>.
Click <a href='@routes.AuditController.audit'>Start Mapping</a>.
</li>
<li>
Take an interactive tutorial to learn how to use our tool (if you haven't taken one before).
Take an interactive tutorial to learn how to use our tool (if you haven't taken it before).
</li>
<li>
Walk along the streets and explore the neighborhood to find and label accessibility features.
</li>
</ol>
<p>
Please watch the following video to see the demo of how the accessibility audit works:
Please watch the following video to see a demo of how an accessibility audit works:
</p>
</div>
<div class="video col-sm-12" style="text-align:center">
Expand All @@ -53,11 +53,11 @@ <h2 class="question" id="how-can-i-help">How can I help?</h2>
</div>

<div class="faq-item">
<h2 class="question" id="can-i-select-a-neighborhood-to-audit">Can I select a neighborhood to audit?</h2>
<h2 class="question" id="can-i-select-a-neighborhood-to-audit">Can I pick which neighborhood I audit?</h2>
<div class="row">
<div class="col-sm-12">
<p>
Yes! Please follow the following steps:
Yes! Just follow these steps:
</p>
<ol>
<li>
Expand Down Expand Up @@ -179,13 +179,14 @@ <h3>References</h3>
</div>

<div class="faq-item">
<h2 class="question" id="what-to-do-when-navigation-arrow-disappears">What to do when navigation arrow disappears?</h2>
<h2 class="question" id="what-to-do-when-navigation-arrow-disappears">What to do when the navigation arrow disappears?</h2>
<div class="row">
<div class="col-sm-12">
<p>
Sometimes during auditing, you would have noticed that the navigation arrows go missing, especially, while walking straight.
Sometimes while auditing, you may have noticed that the navigation arrows go missing, especially while walking straight.
Worry not, there is a simple solution! <br/><br/>
Just double click on the street to move ahead and you are all set!
Just double click on the street to move ahead and you are all set! <br/><br/>
And if you are still stuck, you can always use the Jump button on the left.

</p>
</div>
Expand Down Expand Up @@ -233,7 +234,7 @@ <h2 class="question" id="why-do-my-labels-disappear">Why do my labels disappear?
</p>
<p>
So, <i>why</i> does it work like this? Well, the answer is kind of complicated but the short answer is:
the Google Street View interface is akin to a 3-dimensional interface similar to walking in the real world.
the Google Street View interface is akin to a 3-dimensional interface, similar to walking in the real world.
When you place a label, we convert the 3D position of the label to a 2D lat/long position. However, once you take a
step to a new location, we cannot accurately recompute the label's position in 3D for that new view. See, we told
you it was kind of complicated. :)
Expand All @@ -248,7 +249,7 @@ <h2 class="question" id="why-do-my-labels-disappear">Why do my labels disappear?
</div>

<div class="faq-item">
<h2 class="question" id="are-there-keyboard-shortcuts-for-the-image-labeling-interface">Are there keyboard shortcuts for the image labeling interface?</h2>
<h2 class="question" id="are-there-keyboard-shortcuts-for-the-image-labeling-interface">Are there keyboard shortcuts?</h2>
<div class="row">
<div class="col-sm-12">
<div class="spacer10"></div>
Expand Down Expand Up @@ -304,7 +305,7 @@ <h2 class="question" id="are-there-keyboard-shortcuts-for-the-image-labeling-int
</tr>
<tr>
<th></th>
<th><kbd>Enter</kbd></th>
<th><kbd>Enter</kbd> or <kbd>Esc</kbd></th>
<td>Close label rating</td>
</tr>
<tr>
Expand Down
20 changes: 15 additions & 5 deletions app/views/navbar.scala.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
</li>
</ul>
} else {
<a href="#SignIn" data-toggle="modal" data-target="#sign-in-modal-container">
<a href="#SignIn" data-toggle="modal" data-target="#sign-in-modal-container" id="sign-in-button">
&nbsp;Sign in
</a>
}
Expand All @@ -100,11 +100,9 @@
$("#sign-in-modal").removeClass("hidden");
});

// Log if user /clicks/ on sign-in button, but not necessarily signs in
$("#sign-in-button").on('click', function(){
function logWebpageActivity(activity){
var url = "/userapi/logWebpageActivity";
var async = true;
var activity = "Click_module=SignIn";
$.ajax({
async: async,
contentType: 'application/json; charset=utf-8',
Expand All @@ -117,6 +115,18 @@
console.error(result);
}
});
}

// Triggered when 'Sign In' in navbar is clicked
// Logs "Click_module=SignIn"
$("#sign-in-button").on('click', function(){
logWebpageActivity("Click_module=SignIn");
});

// Triggered when 'Start Mapping' in navbar is clicked
// Logs "Click_module=StartMapping_location=Index"
$(".navbarStartBtn").on('click', function(){
logWebpageActivity("Click_module=StartMapping_location=Navbar");
});
});
</script>
Expand Down Expand Up @@ -364,7 +374,7 @@ <h4 class="modal-title" id="sign-up-label">Sign up</h4>
</ul>
</template>
<template id="navbar-dropdown-list-signed-out">
<a href="#SignIn" data-toggle="modal" data-target="#sign-in-modal-container">
<a href="#SignIn" data-toggle="modal" data-target="#sign-in-modal-container" id="sign-in-button">
Sign in
</a>
</template>
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import scalariform.formatter.preferences._

name := """sidewalk-webpage"""

version := "4.0.0"
version := "4.0.1"

scalaVersion := "2.10.4"

Expand Down
6 changes: 6 additions & 0 deletions public/assets/homepage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,10 @@ $( document ).ready(function() {
var author = e.currentTarget.id.split('-')[0];
logWebpageActivity("Click_module=Quotes_author="+author);
});

// Triggered when 'Start Mapping' in video container is clicked
// Logs "Click_module=StartMapping_location=Index"
$(".bodyStartBtn").on("click", function(){
logWebpageActivity("Click_module=StartMapping_location=Index");
});
});

0 comments on commit 83cd409

Please sign in to comment.