aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-17 16:05:46 -0700
committerredmatrix <git@macgirvin.com>2016-07-17 16:05:46 -0700
commit279359c1bddb6e4473894e5dd5bd3c944a469814 (patch)
tree6288b51853c455771475c841ccefa0614b037ffc
parentdc9fa7cf64ee41e0c9457737079aee16093a4b9c (diff)
parent2b674d4cd983d637ddc863f9b87b9d863542e250 (diff)
downloadvolse-hubzilla-279359c1bddb6e4473894e5dd5bd3c944a469814.tar.gz
volse-hubzilla-279359c1bddb6e4473894e5dd5bd3c944a469814.tar.bz2
volse-hubzilla-279359c1bddb6e4473894e5dd5bd3c944a469814.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--Zotlabs/Module/Embedphotos.php2
-rwxr-xr-xview/tpl/photo_album.tpl2
2 files changed, 3 insertions, 1 deletions
diff --git a/Zotlabs/Module/Embedphotos.php b/Zotlabs/Module/Embedphotos.php
index 2cd420664..0dac873c5 100644
--- a/Zotlabs/Module/Embedphotos.php
+++ b/Zotlabs/Module/Embedphotos.php
@@ -159,7 +159,7 @@ function embedphotos_widget_album($args) {
'$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
'$order' => false,
'$upload_form' => $upload_form,
- '$usage' => $usage_message
+ '$no_fullscreen_btn' => true
));
return $o;
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index b391a00a1..f097646e4 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -12,8 +12,10 @@
<button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
{{/if}}
</div>
+ {{if !$no_fullscreen_btn}}
<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+ {{/if}}
</div>
<h2>{{$album}}</h2>
<div class="clear"></div>