aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-16 22:06:03 -0700
committerfriendica <info@friendica.com>2015-03-16 22:06:03 -0700
commitbc22df9057198018f9cc490d0e3e013692f52b90 (patch)
treeb7a9bb4470297e85d07317135d8f6c7bd5553c0c /view
parent7c194c37b891f122740de52d154db0af612e0074 (diff)
downloadvolse-hubzilla-bc22df9057198018f9cc490d0e3e013692f52b90.tar.gz
volse-hubzilla-bc22df9057198018f9cc490d0e3e013692f52b90.tar.bz2
volse-hubzilla-bc22df9057198018f9cc490d0e3e013692f52b90.zip
display a map for photos if allowed. Note: there is a bug in that if the map div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out.
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_photos.css1
-rwxr-xr-xview/tpl/photo_view.tpl10
2 files changed, 10 insertions, 1 deletions
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index a2b3459cf..f95a0ca2f 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -19,6 +19,7 @@
}
#photo-edit,
+#photo-map,
#photo-album-edit-wrapper,
#photo-upload-form {
display: none;
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 3ece68876..1deaa67fc 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -7,10 +7,15 @@
{{if $tools}}
<a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a>
{{/if}}
+ {{if $map}}
+ <div class="btn-group btn-group">
+ <i class="icon-globe btn btn-default btn-xs" title="{{$map_text}}" onclick="openClose('photo-map');"></i>
+ </div>
+ {{/if}}
<div class="btn-group btn-group dropdown">
{{if $edit}}
- <i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i>
+ <i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit'); $('#map-frame').attr('src',function(i,val) { return val;});"></i>
{{/if}}
{{if $lock}}
<i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
@@ -31,6 +36,9 @@
<div class="clear"></div>
</div>
+ <div id="photo-map">
+ {{$map}}
+ </div>
<div id="photo-edit" class="section-content-tools-wrapper">
<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
<input type="hidden" name="item_id" value="{{$edit.item_id}}" />