diff options
| author | friendica <info@friendica.com> | 2014-03-25 12:47:46 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-03-25 12:47:46 -0700 |
| commit | f14596b1ebeecf2c75939374136c830e44dbd923 (patch) | |
| tree | cef612ce9d8e9ac7d0676e4c01be48aea5d9e4f4 /view/tpl | |
| parent | dc091800c3a138810b2c14127dfa2fe4fab3616b (diff) | |
| parent | fbb12ca86acf40bf61f2ad8f69aee78db8df8dcb (diff) | |
| download | volse-hubzilla-f14596b1ebeecf2c75939374136c830e44dbd923.tar.gz volse-hubzilla-f14596b1ebeecf2c75939374136c830e44dbd923.tar.bz2 volse-hubzilla-f14596b1ebeecf2c75939374136c830e44dbd923.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/conv_item.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/hdr.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 8d59951e7..dcf82e765 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -34,8 +34,8 @@ <div class="wall-item-photo-end"></div> </div> - <div class="wall-item-author"> - {{if $item.lock}}<i class="wall-item-lock icon-lock lockview" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i> {{/if}}<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}<br /> + <div class="wall-item-author dropdown"> + {{if $item.lock}}<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> {{/if}}<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}<br /> <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}" > diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index f1e78b897..efb43224c 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -3,5 +3,3 @@ <ul id="nav-notifications-template" style="display:none;" rel="template"> <li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> </ul> - -<div id="panel" style="display: none;"></div> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index c676cd773..e7b41523f 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,6 +1,6 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <base href="{{$baseurl}}/" /> -<meta name="viewport" content="width=device-width, initial-scale=1"> +<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=0"> <meta name="generator" content="{{$generator}}" /> <!--[if IE]> |