diff options
| author | friendica <info@friendica.com> | 2014-04-09 21:11:49 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-09 21:11:49 -0700 |
| commit | 795d74171358abe23cc4be01dac0e48d04ee46b4 (patch) | |
| tree | 510711393c7f0a45152f3a111782b2c8a927ae9e | |
| parent | 46ed2570b80d7468dc6e875ccb02f533f9cbd139 (diff) | |
| download | volse-hubzilla-795d74171358abe23cc4be01dac0e48d04ee46b4.tar.gz volse-hubzilla-795d74171358abe23cc4be01dac0e48d04ee46b4.tar.bz2 volse-hubzilla-795d74171358abe23cc4be01dac0e48d04ee46b4.zip | |
issue #400 - lock not showing up for previews of private mentions (or 'new/search' item view)
also reformat the new/search template to pick up recent changes to conv_item.tpl
| -rw-r--r-- | include/conversation.php | 6 | ||||
| -rwxr-xr-x | view/tpl/search_item.tpl | 13 |
2 files changed, 10 insertions, 9 deletions
diff --git a/include/conversation.php b/include/conversation.php index 8803e74e7..d56e468ad 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -635,7 +635,11 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $star = false; $isstarred = "unstarred icon-star-empty"; - $lock = false; + $lock = (($item['item_private'] || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) + ? t('Private Message') + : false + ); + $likebuttons = false; $shareable = false; diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index c5acfa4a4..81ce4e136 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -16,15 +16,12 @@ </div> </div> <div class="wall-item-photo-end"></div> - <div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" > - {{if $item.lock}}<i class="wall-item-lock icon-lock lockview" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></i> - {{else}}<div class="wall-item-lock"></div>{{/if}} - <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div> - </div> </div> - <div class="wall-item-author"> - <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><br /> - <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> + <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}}" > <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div> |