Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

13 files changed, 65 insertions, 37 deletions

diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index 00e6e2a70..4c26193b4 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -36,4 +36,10 @@
 
 .connphone {
 	color: green;
-}
\ No newline at end of file
+}
+
+.contact-photo-wrapper .oneway-overlay {
+	margin-top: -25px;
+	margin-left: 53px;
+	font-size: 20px;
+}
diff --git a/view/css/mod_viewconnections.css b/view/css/mod_viewconnections.css
index 56add4cac..1b0c7ab62 100644
--- a/view/css/mod_viewconnections.css
+++ b/view/css/mod_viewconnections.css
@@ -31,3 +31,9 @@
 .contact-entry-end {
 	clear: both;
 }
+
+.contact-entry-photo-wrapper .oneway-overlay {
+	margin-top: 25px;
+	margin-left: -25px;
+	font-size: 20px;
+}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index a32ac045b..f97029aad 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -179,14 +179,14 @@ a.wikilist {
 	overflow: auto;
 }
 
-.notifications-textinput input {
-	font-family: FontAwesome, sans-serif;
-}
-
 .notifications-textinput {
 	padding: .75rem 0.85rem;
 }
 
+.notifications-textinput input {
+	padding-left: 1.75rem;
+}
+
 .notifications-textinput-clear {
 	padding: .5rem;
 	line-height: 1;
@@ -196,6 +196,14 @@ a.wikilist {
 	cursor: pointer;
 }
 
+.notifications-textinput-filter {
+	padding: .5rem;
+	line-height: 1;
+	position: absolute;
+	top: .75rem;
+	left: 0.75rem;
+}
+
 .notification-content.collapsing {
 	overflow: hidden;
 }
@@ -216,3 +224,10 @@ a.wikilist {
 #notifications {
 	margin-bottom: 1rem;
 }
+
+/* contact block */
+.contact-block-div .oneway-overlay {
+	font-size: 20px;
+	margin-left: -25px;
+	margin-top: 25px;
+}
diff --git a/view/js/acl.js b/view/js/acl.js
index c8f7c7180..a5fae19bc 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -173,7 +173,7 @@ ACL.prototype.on_custom = function(event) {
 	that.deny_cid  = [];
 	that.deny_gid  = [];
 
-	datasrc2src('#acl-list-content .acl-list-item img[data-src]');
+	datasrc2src('#acl-list-content .list-group-item img[data-src]');
 
 	that.update_view('custom');
 	that.on_submit();
@@ -399,7 +399,7 @@ ACL.prototype.get = function(start, count, search) {
 
 ACL.prototype.populate = function(data) {
 	$(data.items).each(function(){
-		html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
+		html = "<div class='list-group-item clearfix acl-list-item {4} {7} {5}' id='{2}{3}'>"+that.item_tpl+"</div>";
 		html = html.format(this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable);
 		if (this.uids !== undefined) {
 			that.group_uids[this.xid] = this.uids;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1611cda60..dfd03707f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -604,14 +604,6 @@ footer {
 	padding: .15rem .5rem;
 }
 
-#nav-search-text::-webkit-input-placeholder {
-	font-family: FontAwesome, sans-serif;
-}
-
-#nav-search-text::-moz-placeholder {
-	font-family: FontAwesome, sans-serif;
-}
-
 nav .acpopup {
 	top: 46px !important;
 	margin-left: -35px;
@@ -842,21 +834,12 @@ div.jGrowl div.jGrowl-notification {
 
 #acl-search::-webkit-input-placeholder {
 	/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
-	font-family: FontAwesome, sans-serif, arial, freesans;
+	font-family: ForkAwesome, sans-serif, arial, freesans;
 }
 
 #acl-search::-moz-placeholder {
 	/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
-	font-family: FontAwesome, sans-serif, arial, freesans;
-}
-
-.acl-list-item {
-	width: 100%;
-	padding: 0.5rem;
-	margin-bottom: 0.5rem;
-	border: 1px solid #ccc;
-	float: left;
-	border-radius: $radius;
+	font-family: ForkAwesome, sans-serif, arial, freesans;
 }
 
 .acl-item-header {
@@ -865,10 +848,12 @@ div.jGrowl div.jGrowl-notification {
 
 .acl-list-item.grouphide {
 	border: 1px solid red;
+	z-index: 2;
 }
 
 .acl-list-item.groupshow {
 	border: 1px solid green;
+	z-index: 2;
 }
 
 .acl-list-item.taggable {
@@ -1800,3 +1785,8 @@ dl.bb-dl > dd > li {
 .caption-visible {
 	max-height: 75%;
 }
+
+.oneway-overlay {
+    position: absolute;
+    text-shadow: -2px 0 1px #fff, 0 2px 1px#fff, 2px 0 1px #fff, 0 -2px 1px #fff;
+}
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 73ae8f6d2..d9750de42 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -1,6 +1,6 @@
 <?php
 
-head_add_css('/library/font_awesome/css/font-awesome.min.css');
+head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
 head_add_css('/library/bootstrap/css/bootstrap.min.css');
 head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
 head_add_css('/view/css/bootstrap-red.css');
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index f4f851c8a..3d05cb455 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -31,15 +31,17 @@
 
 				<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>
 				</div>
 
-				<div class="acl-list-item" rel="acl-template" style="display:none">
-					<div class="acl-item-header">
-						<img class="menu-img-1" data-src="{0}"> {1}
+				<div class="list-group-item acl-list-item" rel="acl-template" style="display:none">
+					<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>
 					</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>
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>
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>
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}}