diff options
| author | friendica <info@friendica.com> | 2015-03-11 19:35:23 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-11 19:35:23 -0700 |
| commit | 64ae17aa6a1bdbc3933422272a391d4e3662f59b (patch) | |
| tree | b87f4c0866d9ecfa832d43b7e622e3100386a408 /view | |
| parent | a40c19d19d31bba3fe037a9778c521461e2b0290 (diff) | |
| parent | b3a9a6c802170a15cc58fd3af966b35f81c50818 (diff) | |
| download | volse-hubzilla-64ae17aa6a1bdbc3933422272a391d4e3662f59b.tar.gz volse-hubzilla-64ae17aa6a1bdbc3933422272a391d4e3662f59b.tar.bz2 volse-hubzilla-64ae17aa6a1bdbc3933422272a391d4e3662f59b.zip | |
Merge branch 'master' into openid
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/comment_item.tpl | 12 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index c9a3c451c..b62b31033 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -40,18 +40,18 @@ </button> </div> <div class='btn-group'> - <button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;"> + <!--button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;"> <i class="icon-camera comment-icon"></i> - </button> + </button--> <button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;"> <i class="icon-link comment-icon"></i> </button> - <button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;"> + <!--button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;"> <i class="icon-facetime-video comment-icon"></i> - </button> - </div> + </button--> + <!--/div--> {{if $feature_encrypt}} - <div class='btn-group'> + <!--div class='btn-group'--> <button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"> <i class="icon-key comment-icon"></i> </button> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 05aa76d67..51ea8eedf 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -68,12 +68,12 @@ <button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"> <i id="profile-link" class="icon-link jot-icons"></i> </button> - <button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;"> + <!--button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;"> <i id="profile-video" class="icon-facetime-video jot-icons"></i> </button> <button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;"> <i id="profile-audio" class="icon-volume-up jot-icons"></i> - </button> + </button --> </div> <div class="btn-group hidden-xs hidden-sm"> <button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;"> @@ -114,8 +114,8 @@ {{if $writephoto}}<li class="visible-xs"><a id="wall-image-upload-sub" href="#" ><i class="icon-camera"></i> {{$upload}}</a></li>{{/if}} <li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i> {{$attach}}</a></li> <li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i> {{$weblink}}</a></li> - <li class="visible-xs"><a href="#" onclick="jotVideoURL(); return false;"><i class="icon-facetime-video"></i> {{$video}}</a></li> - <li class="visible-xs"><a href="#" onclick="jotAudioURL(); return false;"><i class="icon-volume-up"></i> {{$audio}}</a></li> + <!--li class="visible-xs"><a href="#" onclick="jotVideoURL(); return false;"><i class="icon-facetime-video"></i> {{$video}}</a></li--> + <!--li class="visible-xs"><a href="#" onclick="jotAudioURL(); return false;"><i class="icon-volume-up"></i> {{$audio}}</a></li--> {{/if}} <li class="divider visible-xs"></li> <li class="visible-xs visible-sm"><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i> {{$setloc}}</a></li> |