diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /view/tpl/photo_view.tpl | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'view/tpl/photo_view.tpl')
| -rwxr-xr-x | view/tpl/photo_view.tpl | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 867a1e87b..254733622 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -2,23 +2,41 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> - {{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="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); }" ></i> + {{if $tools || $map || $edit}} + <div class="btn-group"> + <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> + <i class="icon-caret-down"></i> + </button> + <ul class="dropdown-menu"> + {{if $tools}} + <li class="nav-item"> + <a class="nav-link" href="{{$tools.profile.0}}"><i class="icon-user"></i> {{$tools.profile.1}}</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{$tools.cover.0}}"><i class="icon-picture"></i> {{$tools.cover.1}}</a> + </li> + {{/if}} + {{if $map}} + <li class="nav-item"> + <a class="nav-link" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="icon-globe"></i> {{$map_text}}</a> + </li> + {{/if}} + {{if $edit}} + <li class="nav-item"> + <a class="nav-link" href="#" title="" onclick="openClose('photo-edit'); return false;"><i class="icon-pencil"></i> {{$edit.edit}}</a> + </li> + {{/if}} + </ul> </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> - {{/if}} - {{if $lock}} - <i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> - {{/if}} + {{if $lock}} + <div class="btn-group"> + <button id="lockview" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ><i class="icon-lock"></i></button> + <ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> </div> - <div class="btn-group btn-group"> + {{/if}} + {{if $prevlink || $nextlink}} + <div class="btn-group"> {{if $prevlink}} <a href="{{$prevlink.0}}" class="btn btn-default btn-xs" title="{{$prevlink.1}}"><i class="icon-backward"></i></a> {{/if}} @@ -26,6 +44,7 @@ <a href="{{$nextlink.0}}" class="btn btn-default btn-xs" title="{{$nextlink.1}}"><i class="icon-forward"></i></a> {{/if}} </div> + {{/if}} </div> <h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2> <div class="clear"></div> @@ -36,6 +55,7 @@ <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}}" /> + {{* album renaming is not supported atm. <div class="form-group"> <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum_label}}</label> <input id="photo-edit-albumname" class="form-control" type="text" name="albname" value="{{$edit.album}}" placeholder="{{$edit.newalbum_placeholder}}" list="dl-albums" /> @@ -49,6 +69,7 @@ </datalist> {{/if}} </div> + *}} <div class="form-group"> <label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label> <input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" /> |