From c618bfc607498998916f01fd9c6985c2ecd47356 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 24 Feb 2018 19:42:39 +0100
Subject: mark connections where we do not have post_comments permissions with
 an no entry sign.

---
 view/tpl/connection_template.tpl | 7 ++++++-
 view/tpl/contact_template.tpl    | 3 +++
 view/tpl/micropro_img.tpl        | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 8e49c9e27..4543a69d0 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -18,7 +18,12 @@
 	</div>
 	<div class="section-content-tools-wrapper">
 		<div class="contact-photo-wrapper" >
-			<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>
+			<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}}
 		</div>
 		<div class="contact-info">
 			{{if $contact.status}}
diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl
index 3d1bfa4a4..2a2f996f4 100755
--- a/view/tpl/contact_template.tpl
+++ b/view/tpl/contact_template.tpl
@@ -1,6 +1,9 @@
 <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}}
 	</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_img.tpl b/view/tpl/micropro_img.tpl
index a7c5973f3..7464430b5 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="" /></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="" />{{if $oneway}}<i class="fa fa-fw fa-minus-circle oneway-overlay text-danger"></i>{{/if}}</a></div>
-- 
cgit v1.2.3


From be3e0ca9a11923e1eba6b565af512c9339597f74 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 26 Feb 2018 12:54:26 +0100
Subject: change fontname in css and fix issue with unicode characters

---
 view/tpl/acl_selector.tpl   | 2 +-
 view/tpl/navbar_default.tpl | 2 +-
 view/tpl/navbar_tucson.tpl  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index f4f851c8a..e032071b3 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -31,7 +31,7 @@
 
 				<div id="acl-wrapper">
 					<div id="acl-list">
-						<input class="form-control" type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
+						<input class="form-control" type="text" id="acl-search" placeholder="&#xf002;" title="{{$search}}">
 						<small class="text-muted">{{$showlimitedDesc}}</small>
 						<div id="acl-list-content"></div>
 					</div>
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 2c9570938..b0b3198c6 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -120,7 +120,7 @@
 	<ul id="nav-right" class="navbar-nav ml-auto">
 		<li class="nav-item collapse clearfix" id="nav-search">
 			<form class="form-inline" method="get" action="search" role="search">
-				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
+				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="{{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
 			</form>
 			<div id="nav-search-spinner" class="spinner-wrapper">
 				<div class="spinner s"></div>
diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl
index 2c9570938..b0b3198c6 100755
--- a/view/tpl/navbar_tucson.tpl
+++ b/view/tpl/navbar_tucson.tpl
@@ -120,7 +120,7 @@
 	<ul id="nav-right" class="navbar-nav ml-auto">
 		<li class="nav-item collapse clearfix" id="nav-search">
 			<form class="form-inline" method="get" action="search" role="search">
-				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
+				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="{{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
 			</form>
 			<div id="nav-search-spinner" class="spinner-wrapper">
 				<div class="spinner s"></div>
-- 
cgit v1.2.3


From 032cbca6511cd0e0bbd5d6a41993a7a3734efc37 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 26 Feb 2018 13:57:13 +0100
Subject: slightly improve custom acl selector

---
 view/tpl/acl_selector.tpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index e032071b3..c8196ee78 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -37,9 +37,11 @@
 					</div>
 				</div>
 
-				<div class="acl-list-item" rel="acl-template" style="display:none">
+				<div class="acl-list-item list-group-item" rel="acl-template" style="display:none">
 					<div class="acl-item-header">
-						<img class="menu-img-1" data-src="{0}"> {1}
+						<img class="menu-img-3" data-src="{0}">
+						<span class="contactname">{1}</span>
+						<span class="dropdown-sub-text">{6}</span>
 					</div>
 					<button class="acl-button-hide btn btn-sm btn-outline-danger"><i class="fa fa-times"></i> {{$hide}}</button>
 					<button class="acl-button-show btn btn-sm btn-outline-success"><i class="fa fa-check"></i> {{$show}}</button>
-- 
cgit v1.2.3


From ee5fd8a0bddde6aab6ce63c2ee48350999d7070d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 26 Feb 2018 15:09:46 +0100
Subject: fix minor issue with custom acl selector

---
 view/tpl/acl_selector.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index c8196ee78..d42fb1c3b 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -37,7 +37,7 @@
 					</div>
 				</div>
 
-				<div class="acl-list-item list-group-item" rel="acl-template" style="display:none">
+				<div class="list-group-item acl-list-item" rel="acl-template" style="display:none">
 					<div class="acl-item-header">
 						<img class="menu-img-3" data-src="{0}">
 						<span class="contactname">{1}</span>
-- 
cgit v1.2.3


From f8f69767b7099c1803fbebcd10c51b63918be38c Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 26 Feb 2018 15:13:53 +0100
Subject: missing clearfix

---
 view/tpl/acl_selector.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index d42fb1c3b..3d05cb455 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -38,7 +38,7 @@
 				</div>
 
 				<div class="list-group-item acl-list-item" rel="acl-template" style="display:none">
-					<div class="acl-item-header">
+					<div class="acl-item-header clearfix">
 						<img class="menu-img-3" data-src="{0}">
 						<span class="contactname">{1}</span>
 						<span class="dropdown-sub-text">{6}</span>
-- 
cgit v1.2.3


From 3bd2288ea91b512503df3e76b5e2f11f774d87c5 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 26 Feb 2018 20:17:53 +0100
Subject: fix icon position and make string translatable

---
 view/tpl/notifications_widget.tpl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 211e8e05b..18250cf97 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -154,10 +154,11 @@
 				{{/if}}
 				{{if $notification.filter}}
 				<div class="list-group-item cursor-pointer" id="tt-{{$notification.type}}-only">
-					<i class="fa fa-fw fa-filter"></i> {{$notification.filter.label}}
+					<i class="fa fa-fw fa-filter"></i> {{$notification.filter.posts_label}}
 				</div>
 				<div class="list-group-item clearfix notifications-textinput" id="cn-{{$notification.type}}-only">
-					<input id="cn-{{$notification.type}}-input" type="text" class="form-control form-control-sm" placeholder="&#xf0b0;  Filter by name">
+					<div class="text-muted notifications-textinput-filter"><i class="fa fa-fw fa-filter"></i></div>
+					<input id="cn-{{$notification.type}}-input" type="text" class="form-control form-control-sm" placeholder="{{$notification.filter.name_label}}">
 					<div id="cn-{{$notification.type}}-input-clear" class="text-muted notifications-textinput-clear d-none"><i class="fa fa-times"></i></div>
 				</div>
 				{{/if}}
-- 
cgit v1.2.3