diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-07 14:47:02 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-07 14:47:02 -0400 |
| commit | cee36087470acbc4aeff121ab91cd337737dcc67 (patch) | |
| tree | a093294b2b3ee2f99c0dc5b95d5844bf9817eafa /view/theme/diabook-red/photo_view.tpl | |
| parent | bc69a957dc875b699240827cb4af2691f8a8fcd6 (diff) | |
| parent | f931d5c918fa3146afa851a4f32c90a35ee1c85b (diff) | |
| download | volse-hubzilla-cee36087470acbc4aeff121ab91cd337737dcc67.tar.gz volse-hubzilla-cee36087470acbc4aeff121ab91cd337737dcc67.tar.bz2 volse-hubzilla-cee36087470acbc4aeff121ab91cd337737dcc67.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: small fix
changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
ignore utf8 offset error for unit tests
had arg order backwards
try assertContains
tag tests cont.
fix autonamenegativelength test
some work on tests
* master:
Diffstat (limited to 'view/theme/diabook-red/photo_view.tpl')
| -rwxr-xr-x | view/theme/diabook-red/photo_view.tpl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/view/theme/diabook-red/photo_view.tpl b/view/theme/diabook-red/photo_view.tpl index 511fc73ac..09dfb2aae 100755 --- a/view/theme/diabook-red/photo_view.tpl +++ b/view/theme/diabook-red/photo_view.tpl @@ -24,4 +24,13 @@ {{ endif }} {{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }} -{{ if $edit }}$edit{{ endif }}
\ No newline at end of file +{{ if $edit }}$edit{{ endif }} + +<div style="margin-top:20px"> +</div> +<div id="wall-photo-container"> +$comments +</div> + +$paginate + |