Skip to content

Commit

Permalink
video button in the prompt box.
Browse files Browse the repository at this point in the history
Some style cleanup
  • Loading branch information
deleted committed Oct 31, 2012
1 parent b82f540 commit b07a62d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
9 changes: 9 additions & 0 deletions geocamTiePoint/static/geocamTiePoint/css/backbone.css
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,19 @@ input#locationSearch {
background-color: #ff9;
}

.alert .close{
top: -26px;
right: -26px;
}

.error{
color: red;
}

.btn.disabled, .btn[disabled] {
color: #888;
}

.navbar .nav li a {
padding-bottom: 0px;
}
Expand Down
9 changes: 4 additions & 5 deletions geocamTiePoint/static/geocamTiePoint/js/backbone/views.js
Original file line number Diff line number Diff line change
Expand Up @@ -463,9 +463,7 @@ $(function($) {

}); // end MapView

var lorem = '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec fringilla, lorem vitae tincidunt sagittis, dolor purus pretium mi, id interdum magna enim in ligula. Nulla facilisi. Suspendisse potenti. Quisque eu enim faucibus felis euismod convallis vel ac orci. Suspendisse et commodo leo. Etiam a ligula arcu, ut vulputate ligula. Vestibulum posuere orci eu purus interdum tincidunt at ut augue. Proin sed nulla massa, sit amet condimentum neque. Etiam quis sapien velit. Nulla convallis aliquet nulla ut laoreet. Morbi at lacus velit. Ut at libero purus, eu malesuada metus. Nam egestas, erat non ultrices scelerisque, massa nulla placerat orci, ac iaculis eros lectus a quam. Mauris sit amet ante eu urna dignissim placerat eu eget elit. Curabitur vitae cursus dolor.</p>'+

'<p>Integer ac nibh nibh, feugiat porta magna. Nam commodo neque a velit sollicitudin mollis. Quisque id porttitor urna. Etiam sed est sit amet felis blandit pretium quis et dolor. Duis at nunc velit, at ultricies sem. Aliquam erat volutpat. Suspendisse potenti. Fusce rhoncus fringilla turpis ac commodo. Phasellus pellentesque consequat quam eget tempor. Mauris egestas mollis lacus a placerat. Vestibulum vehicula eros eget metus vulputate sit amet vehicula enim tempor. Cras fringilla magna dolor, sed porta odio. In vitae placerat lorem. Nulla eros erat, auctor ac aliquet vel, tincidunt in velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Maecenas nisi eros, ornare nec elementum vel, eleifend ut velit.</p>';
var lorem = '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec fringilla, lorem vitae tincidunt sagittis, dolor purus pretium mi, id interdum magna enim in ligula. Nulla facilisi. Suspendisse potenti. Quisque eu enim faucibus felis euismod convallis vel ac orci. Suspendisse et commodo leo. Etiam a ligula arcu, ut vulputate ligula. Vestibulum posuere orci eu purus interdum tincidunt at ut augue. Proin sed nulla massa, sit amet condimentum neque. Etiam quis sapien velit. Nulla convallis aliquet nulla ut laoreet. Morbi at lacus velit. Ut at libero purus, eu malesuada metus. Nam egestas, erat non ultrices scelerisque, massa nulla placerat orci, ac iaculis eros lectus a quam. Mauris sit amet ante eu urna dignissim placerat eu eget elit. Curabitur vitae cursus dolor.</p>';

app.views.SplitOverlayView = app.views.OverlayView.extend({

Expand Down Expand Up @@ -493,7 +491,7 @@ $(function($) {
},
{
promptText: 'Use "Share" to see options for viewing your overlay in maps outside this site.',
videoId: '95h45vkpxr8',
videoId: 'rgNW5Iaq1Dw',
helpFunc: function () {
this.$('#export').focus();
flicker(
Expand Down Expand Up @@ -521,6 +519,7 @@ $(function($) {
'<a id="promptNextStep" class="btn btn-mini">&gt;&gt;</a>'+
'</div>'+
'<span id="userPromptText" class="floatleft">Add matching tiepoints on both sides to align your overlay.</span>'+
'<button id="video" class="btn btn-mini">Video</button>'+
'<a class="close" data-dismiss="alert">&times;</a>'+
//'<button id="promptHelp" class="btn btn-mini">details</button>'+
'</span>'+
Expand Down Expand Up @@ -738,7 +737,7 @@ $(function($) {
return false;
});

this.$('button#help').click(function(){
this.$('button#help, button#video').click(function(){
$('#helpText').modal('show');
});
this.$('#promptPrevStep').click(_.bind(this.prevHelpStep, this));
Expand Down

0 comments on commit b07a62d

Please sign in to comment.