aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-11-22 14:59:46 +0100
committerMario <mario@mariovavti.com>2019-11-22 14:59:46 +0100
commit530d816df6d4d0ede07fb56543519439dfa50bbc (patch)
treeb5202776942979f9b56a9be0e84b13cfcf65a0c6 /view
parent4a4c43bb2c336622181ccdd006642efc7b9f1ee5 (diff)
parent23c47f78eada85c1f897bbf348a4f802db9ef2f9 (diff)
downloadvolse-hubzilla-530d816df6d4d0ede07fb56543519439dfa50bbc.tar.gz
volse-hubzilla-530d816df6d4d0ede07fb56543519439dfa50bbc.tar.bz2
volse-hubzilla-530d816df6d4d0ede07fb56543519439dfa50bbc.zip
Merge branch 'better-conn-status' into 'dev'
More descriptive connection status icons See merge request hubzilla/core!1789
Diffstat (limited to 'view')
-rwxr-xr-xview/tpl/connection_template.tpl4
-rw-r--r--view/tpl/connstatus.tpl1
-rwxr-xr-xview/tpl/contact_template.tpl4
-rw-r--r--view/tpl/micropro_card.tpl2
-rwxr-xr-xview/tpl/micropro_img.tpl2
5 files changed, 5 insertions, 8 deletions
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index de22bcdbb..f9b46b41e 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -24,9 +24,7 @@
<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >
<img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" />
</a>
- {{if $contact.oneway}}
- <i class="fa fa-fw fa-minus-circle oneway-overlay text-danger"></i>
- {{/if}}
+ {{include "connstatus.tpl" perminfo=$contact.perminfo}}
</div>
<div class="contact-info">
{{if $contact.status}}
diff --git a/view/tpl/connstatus.tpl b/view/tpl/connstatus.tpl
new file mode 100644
index 000000000..667775f3a
--- /dev/null
+++ b/view/tpl/connstatus.tpl
@@ -0,0 +1 @@
+<i class="fa fa-fw fa-comments oneway-overlay text-{{if $perminfo.connpermcount == 3}}success{{elseif $perminfo.connpermcount > 0}}warning{{else}}danger{{/if}}" title="{{$perminfo.connperms}}"></i>
diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl
index 2a2f996f4..40495b789 100755
--- a/view/tpl/contact_template.tpl
+++ b/view/tpl/contact_template.tpl
@@ -1,9 +1,7 @@
<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
<div class="contact-entry-photo-wrapper" >
<a href="{{$contact.link}}" title="{{$contact.img_hover}}" ><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
- {{if $contact.oneway}}
- <i class="fa fa-fw fa-minus-circle oneway-overlay text-danger"></i>
- {{/if}}
+ {{include "connstatus.tpl" perminfo=$contact.perminfo}}
</div>
<div class="contact-entry-photo-end" ></div>
<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
diff --git a/view/tpl/micropro_card.tpl b/view/tpl/micropro_card.tpl
index a3c693dbd..1bdf92da1 100644
--- a/view/tpl/micropro_card.tpl
+++ b/view/tpl/micropro_card.tpl
@@ -1,5 +1,5 @@
<a class="list-group-item{{if $class}} {{$class}}{{/if}} fakelink" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}>
- <img class="menu-img-3" src="{{$photo}}" title="{{$title}}" alt="" />{{if $oneway}}<i class="fa fa-fw fa-minus-circle oneway-overlay text-danger"></i>{{/if}}
+ <img class="menu-img-3" src="{{$photo}}" title="{{$title}}" alt="" />{{include "connstatus.tpl"}}
<span class="contactname">{{$name}}</span>
<span class="dropdown-sub-text">{{$addr}}<br>{{$network}}</span>
</a>
diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl
index 7464430b5..f6b12d53f 100755
--- a/view/tpl/micropro_img.tpl
+++ b/view/tpl/micropro_img.tpl
@@ -1 +1 @@
-<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="" />{{if $oneway}}<i class="fa fa-fw fa-minus-circle oneway-overlay text-danger"></i>{{/if}}</a></div>
+<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="" />{{include "connstatus.tpl"}}