Skip to content

Commit

Permalink
added mapFastenDiagram.png
Browse files Browse the repository at this point in the history
  • Loading branch information
trey0 committed Oct 30, 2012
1 parent feb28e6 commit 9f4b2cb
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
8 changes: 8 additions & 0 deletions geocamTiePoint/static/geocamTiePoint/css/backbone.css
Expand Up @@ -141,3 +141,11 @@ a.btn-primary {
#newOverlayFile { #newOverlayFile {
padding-bottom: 10px; padding-bottom: 10px;
} }

.get-started {
font-size: 1.2em;
font-weight: bold;
padding: 10px;
margin-top: 10px;
margin-bottom: 15px;
}
4 changes: 2 additions & 2 deletions geocamTiePoint/static/geocamTiePoint/js/backbone/views.js
Expand Up @@ -68,7 +68,8 @@ $(function($) {
'<p>MapFasten helps you quickly align an image or PDF with a map, '+ '<p>MapFasten helps you quickly align an image or PDF with a map, '+
'creating a shareable map layer that you can display in maps ' + 'creating a shareable map layer that you can display in maps ' +
'based on the Google Maps API and combine with other layers.</p>'+ 'based on the Google Maps API and combine with other layers.</p>'+
'<p><a class="welcomeEntry" href="#overlays/">Let\'s get started &gt;&gt;</a></p>'+ '<p><a class="btn btn-primary get-started" href="#overlays/">Let\'s get started &gt;&gt;</a></p>' +
'<img src="' + settings.STATIC_URL + '/mapFasten/icons/mapFastenDiagram.png" width="400" height="297"/>' +
'</div>', '</div>',
}); });


Expand Down Expand Up @@ -591,7 +592,6 @@ $(function($) {
}, },


zoomMaximum: function() { zoomMaximum: function() {
var offset = 8;
//var imageZoom = this.imageView.model.maxZoom(); //var imageZoom = this.imageView.model.maxZoom();
var imageZoom = this.imageView.gmap.mapTypes.get('image-map').maxZoom; var imageZoom = this.imageView.gmap.mapTypes.get('image-map').maxZoom;
google.maps.event.addListenerOnce(this.imageView.gmap, 'bounds_changed', _.bind(this.matchImageZoom, this)); google.maps.event.addListenerOnce(this.imageView.gmap, 'bounds_changed', _.bind(this.matchImageZoom, this));
Expand Down
4 changes: 2 additions & 2 deletions geocamTiePoint/templates/geocamTiePoint/backbone.html
Expand Up @@ -42,9 +42,9 @@
<script type="text/javascript" src="/static/geocamTiePoint/js/backbone/router.js"></script> <script type="text/javascript" src="/static/geocamTiePoint/js/backbone/router.js"></script>


<script type="text/javascript"> <script type="text/javascript">
$(function($){ window.settings = {{settings|safe}};


window.settings = {{settings|safe}}; $(function($){


app.overlays = app.overlays || new app.models.OverlayCollection; app.overlays = app.overlays || new app.models.OverlayCollection;
{% if initial_overlays_json %} {% if initial_overlays_json %}
Expand Down
1 change: 1 addition & 0 deletions geocamTiePoint/views.py
Expand Up @@ -63,6 +63,7 @@ def export_settings(export_vars=None):
if export_vars == None: if export_vars == None:
export_vars = ('GEOCAM_TIE_POINT_DEFAULT_MAP_VIEWPORT', export_vars = ('GEOCAM_TIE_POINT_DEFAULT_MAP_VIEWPORT',
'GEOCAM_TIE_POINT_ZOOM_LEVELS_PAST_OVERLAY_RESOLUTION', 'GEOCAM_TIE_POINT_ZOOM_LEVELS_PAST_OVERLAY_RESOLUTION',
'STATIC_URL',
) )
return dumps(dict([(k, getattr(settings, k)) for k in export_vars])) return dumps(dict([(k, getattr(settings, k)) for k in export_vars]))


Expand Down

0 comments on commit 9f4b2cb

Please sign in to comment.