Merge pull request #12502 from annando/no-gs-import

[friendica.git] / view / theme / frio / templates / wall_thread.tpl

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 55858d811ea9dba5c773a830623c7bd1c46fe710..4f2d7e1bc4b4b6082b3d2e29b41b2f8561c08385 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -158,12 +158,12 @@ as the value of $top_child_total (this is done at the end of this file)
                                                <span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span>
                                        </a>
                                {{/if}}
-                               {{if $item.lock}}
-                                       <span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.lock}}" data-toggle="tooltip">
-                                               &nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small>
+                               {{if $item.connector}}
+                                       <small><i class="fa fa-plug" title="{{$item.connector}}" aria-hidden="true"></i></small>
+                               {{else}}
+                                       <span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.privacy}}" data-toggle="tooltip">
+                                               &nbsp;<small><i class="fa {{if $item.private == 1}}fa-lock{{elseif $item.private == 0}}fa-globe{{else}}fa-low-vision{{/if}}" aria-hidden="true"></i></small>
                                        </span>
-                               {{elseif $item.connector}}
-                                       <small><i class="fa fa-lock" title="{{$item.connector}}"></i></small>
                                {{/if}}
                                </h4>
 
@@ -221,7 +221,15 @@ as the value of $top_child_total (this is done at the end of this file)
                        <div class="contact-info-comment">
                                <h5 class="media-heading">
                                        <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span class="fakelink">{{$item.name}}</span></a>
+                                       {{if $item.connector}}
+                                               <small><i class="fa fa-plug" title="{{$item.connector}}" aria-hidden="true"></i></small>
+                                       {{else}}
+                                               <span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.privacy}}" data-toggle="tooltip">
+                                                       &nbsp;<small><i class="fa {{if $item.private == 1}}fa-lock{{elseif $item.private == 0}}fa-globe{{else}}fa-low-vision{{/if}}" aria-hidden="true"></i></small>
+                                               </span>
+                                       {{/if}}
                                        <span class="text-muted">
+                               </h5>
                                <small>
                                        <a href="{{$item.plink.orig}}">
                                                <time class="time" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time>
@@ -235,7 +243,6 @@ as the value of $top_child_total (this is done at the end of this file)
                                        {{/if}}
                                </small>
                        </span>
-                               </h5>
                        </div>
                {{/if}} {{* End of if $item.thread_level != 1 *}}
                </div>
@@ -271,12 +278,12 @@ as the value of $top_child_total (this is done at the end of this file)
                                <span class="mention label label-default sm">{{$tag nofilter}} <i class="fa fa-eye-slash" aria-hidden="true"></i></span>
                        {{/foreach*}}
                {{/if}}
-                       {{foreach $item.folders as $cat}}
-                               <span class="folder label btn-danger sm p-category">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                       {{foreach $item.folders as $folder}}
+                               <span class="folder label btn-danger sm p-category">{{$folder.name}}{{if $folder.removeurl}} (<a href="{{$folder.removeurl}}" class="filerm" title="{{$remove}}">x</a>){{/if}}</span>
                        {{/foreach}}
 
                        {{foreach $item.categories as $cat}}
-                               <span class="category label btn-success sm p-category"><a href="{{$cat.url}}">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                               <span class="category label btn-success sm p-category"><a href="{{$cat.url}}">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" class="filerm" title="{{$remove}}">x</a>){{/if}}</span>
                        {{/foreach}}
                        </div>
                        {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
@@ -330,13 +337,8 @@ as the value of $top_child_total (this is done at the end of this file)
                                {{/if}}
                        {{/if}}
 
-            {{if !$item.lock && !$item.connector}}
-                               <span role="presentation" class="separator button-browser-share"></span>
-                               <button type="button" class="btn-link button-browser-share" onclick="navigator.share({url: '{{$item.plink.orig}}'})"><i class="fa fa-share-alt"></i> {{$item.browsershare}}</button>
-                       {{/if}}
-
                        {{* Put additional actions in a dropdown menu *}}
-                       {{if $item.menu && ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread || $item.ignore || ($item.drop && $item.drop.dropping))}}
+                       {{if $item.menu && ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread || $item.ignore || ($item.drop && $item.drop.dropping) || $item.browsershare)}}
                                <span role="presentation" class="separator"></span>
                                <span class="more-links btn-group{{if $item.thread_level > 1}} dropup{{/if}}">
                                        <button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuOptions-{{$item.id}}" aria-haspopup="true" aria-expanded="false" title="{{$item.menu}}"><i class="fa fa-ellipsis-h" aria-hidden="true"></i>&nbsp;{{$item.menu}}</button>
@@ -385,6 +387,12 @@ as the value of $top_child_total (this is done at the end of this file)
                                                </li>
                                                {{/if}}
 
+                                               {{if $item.browsershare}}
+                                                       <li role="menuitem" class="button-browser-share">
+                                                               <a id="browser-share-{{$item.id}}" href="javascript:navigator.share({url: '{{$item.plink.orig}}'})" class="btn-link button-browser-share" title="{{$item.browsershare.1}}"><i class="fa fa-share-alt" aria-hidden="true"></i>&nbsp;{{$item.browsershare.0}}</a>
+                                                       </li>
+                                               {{/if}}
+
                                                {{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || ($item.drop && $item.drop.dropping))}}
                                                <li role="separator" class="divider"></li>
                                                {{/if}}
@@ -486,8 +494,8 @@ as the value of $top_child_total (this is done at the end of this file)
                                </div>
                        {{/if}}
 
-                       {{if !$item.lock && !$item.connector}}
-                               <button type="button" class="btn btn-sm button-browser-share" onclick="navigator.share({url: '{{$item.plink.orig}}'})" title="{{$item.browsershare}}"><i class="fa fa-share-alt"></i></button>
+                       {{if $item.browsershare}}
+                               <button type="button" class="btn btn-sm button-browser-share" onclick="navigator.share({url: '{{$item.plink.orig}}'})" title="{{$item.browsershare.1}}"><i class="fa fa-share-alt"></i></button>
                        {{/if}}
 
                        {{* Put additional actions in a dropdown menu *}}
@@ -548,6 +556,12 @@ as the value of $top_child_total (this is done at the end of this file)
                                                </li>
                                                {{/if}}
 
+                                               {{if $item.language}}
+                                               <li role="menuitem">
+                                                       <a id="language-{{$item.id}}" href="javascript:alert('{{$item.language.1}}');" class="btn-link filer-item language-icon" title="{{$item.language.0}}"><i class="fa fa-language" aria-hidden="true"></i>&nbsp;{{$item.language.0}}</a>
+                                               </li>
+                                               {{/if}}
+
                                                {{if $item.ignore || ($item.drop && $item.drop.dropping)}}
                                                        <li role="separator" class="divider"></li>
                                                {{/if}}