Merge branch 'dev' into oauth2

17 files changed, 79 insertions, 110 deletions

diff --git a/view/css/widgets.css b/view/css/widgets.css
index 9cfcb4a88..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;
 }
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/js/mod_cover_photo.js b/view/js/mod_cover_photo.js
index b9af8ce5c..5b64b8b91 100644
--- a/view/js/mod_cover_photo.js
+++ b/view/js/mod_cover_photo.js
@@ -27,13 +27,7 @@
                         if (typeof($(image).parent()[0]) !== 'undefined') {
                             var imageparent = document.getElementById($(image).parent()[0].id);
                             $(imageparent).toggleClass('embed-photo-selected-photo');
-                        }
-                    });
-                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-                    $('#embed-photo-OKButton').click(function () {
-                        $('.embed-photo-selected-photo').each(function (index) {
-                            var href = $(this).attr('href');
+							var href = $(imageparent).attr('href');
                             $.post("embedphotos/photolink", {href: href},
                                 function(ddata) {
                                     if (ddata['status']) {
@@ -42,13 +36,16 @@
                                         window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
                                     }
                                     return false;
-                                },
-                            'json');
-                        });
-                        $('#embedPhotoModalBodyAlbumDialog').html('');
-                        $('#embedPhotoModalBodyAlbumDialog').off('click');
-                        $('#embedPhotoModal').modal('hide');
+								},
+                               'json');
+                            $('#embedPhotoModalBodyAlbumDialog').html('');
+                            $('#embedPhotoModalBodyAlbumDialog').off('click');
+                            $('#embedPhotoModal').modal('hide');
+						}
                     });
+
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
                 } else {
                     window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
                 }
diff --git a/view/js/mod_profile_photo.js b/view/js/mod_profile_photo.js
index 832da764b..c05c8e25e 100644
--- a/view/js/mod_profile_photo.js
+++ b/view/js/mod_profile_photo.js
@@ -27,13 +27,7 @@
                         if (typeof($(image).parent()[0]) !== 'undefined') {
                             var imageparent = document.getElementById($(image).parent()[0].id);
                             $(imageparent).toggleClass('embed-photo-selected-photo');
-                        }
-                    });
-                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-                    $('#embed-photo-OKButton').click(function () {
-                        $('.embed-photo-selected-photo').each(function (index) {
-                            var href = $(this).attr('href');
+							var href = $(imageparent).attr('href');
                             $.post("embedphotos/photolink", {href: href},
                                 function(ddata) {
                                     if (ddata['status']) {
@@ -44,13 +38,16 @@
                                         window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
                                     }
                                     return false;
-                                },
-                            'json');
-                        });
-                        $('#embedPhotoModalBodyAlbumDialog').html('');
-                        $('#embedPhotoModalBodyAlbumDialog').off('click');
-                        $('#embedPhotoModal').modal('hide');
+								},
+                               'json');
+                            $('#embedPhotoModalBodyAlbumDialog').html('');
+                            $('#embedPhotoModalBodyAlbumDialog').off('click');
+                            $('#embedPhotoModal').modal('hide');
+						}
                     });
+
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
                 } else {
                     window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
                 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 75992468e..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 {
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/cover_photo.tpl b/view/tpl/cover_photo.tpl
index 7ad4482e4..cbcf46320 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -41,10 +41,6 @@
 				</div>
 				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
 			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
-				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
-			</div>
 		</div><!-- /.modal-content -->
 	</div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index 5b4954c8e..f4e12d793 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -21,6 +21,9 @@
 	<tr><td style="padding:11px 0;" colspan="2">{{$hitemlink}}</td></tr>
 	<tr><td></td><td>{{$thanks}}</td></tr>
 	<tr><td></td><td>{{$site_admin}}</td></tr>
+
+	<tr><td style="font-size: 12px; color: #444444; padding-top: 18px;" colspan="2">{{$opt_out1}}</td></tr>
+	<tr><td style="font-size: 12px; color: #444444;" colspan="2">{{$opt_out2}}</td></tr>
 	</tbody>
 </table>
 </body>
diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
index 56925c18b..5f1984edb 100755
--- a/view/tpl/email_notify_text.tpl
+++ b/view/tpl/email_notify_text.tpl
@@ -11,3 +11,4 @@
 {{$thanks}}
 {{$site_admin}}
 
+{{$opt_out1}} {{$opt_out2}}
\ No newline at end of file
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 0ffc8b349..c1dab52d5 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -459,13 +459,7 @@ var activeCommentText = '';
                         if (typeof($(image).parent()[0]) !== 'undefined') {
                             var imageparent = document.getElementById($(image).parent()[0].id);
                             $(imageparent).toggleClass('embed-photo-selected-photo');
-                        }
-                    });
-                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-                    $('#embed-photo-OKButton').click(function () {
-                        $('.embed-photo-selected-photo').each(function (index) {
-                            var href = $(this).attr('href');
+                            var href = $(imageparent).attr('href');
                             $.post("embedphotos/photolink", {href: href},
                                 function(ddata) {
                                     if (ddata['status']) {
@@ -476,12 +470,14 @@ var activeCommentText = '';
                                     }
                                     return false;
                                 },
-                            'json');
-                        });
-                        $('#embedPhotoModalBodyAlbumDialog').html('');
-                        $('#embedPhotoModalBodyAlbumDialog').off('click');
-                        $('#embedPhotoModal').modal('hide');
+         	                   'json');
+	                        $('#embedPhotoModalBodyAlbumDialog').html('');
+    	                    $('#embedPhotoModalBodyAlbumDialog').off('click');
+        	                $('#embedPhotoModal').modal('hide');
+                        }
                     });
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
                 } else {
                     window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
                 }
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 13e7602be..bc9339d4c 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -293,10 +293,6 @@
 				</div>
 				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
 			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
-				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
-			</div>
 		</div><!-- /.modal-content -->
 	</div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
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}}
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 832f135f3..edde6af3f 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -35,8 +35,6 @@
 			<br />
 			{{/if}}
 
-
-
 			<div id="profile-photo-submit-wrapper">
 				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
 			</div>
@@ -65,10 +63,6 @@
 				</div>
 				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
 			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
-				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
-			</div>
 		</div><!-- /.modal-content -->
 	</div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index f1ab1ebad..2be323deb 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -91,10 +91,6 @@
 				</div>
 				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
 			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
-				<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
-			</div>
 		</div><!-- /.modal-content -->
 	</div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
@@ -391,16 +387,10 @@
 						if (typeof($(image).parent()[0]) !== 'undefined') {
 							var imageparent = document.getElementById($(image).parent()[0].id);
 							$(imageparent).toggleClass('embed-photo-selected-photo');
-						}
-					});
-					$('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-					$('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-					$('#embed-photo-OKButton').click(function () {
-						$('.embed-photo-selected-photo').each(function (index) {
-							var href = $(this).attr('href');
-							$.post("embedphotos/photolink", {href: href},
-								function(ddata) {
-									if (ddata['status']) {
+							var href = $(imageparent).attr('href');
+                            $.post("embedphotos/photolink", {href: href},
+                                function(ddata) {
+                                    if (ddata['status']) {
 										{{if !$mimeType || $mimeType == 'text/markdown'}}
 										var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' )
 										editor.getSession().insert(editor.getCursorPosition(), imgURL)
@@ -408,17 +398,20 @@
 										var currentContent = $('#editor').val();
 										$('#editor').val(currentContent + ddata['photolink']);
 										{{/if}}
-									} else {
-										window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
-									}
-									return false;
+                                    } else {
+                                        window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
+                                    }
+                                    return false;
 								},
-							'json');
-						});
-						$('#embedPhotoModalBodyAlbumDialog').html('');
-						$('#embedPhotoModalBodyAlbumDialog').off('click');
-						$('#embedPhotoModal').modal('hide');
-					});
+                               'json');
+                            $('#embedPhotoModalBodyAlbumDialog').html('');
+                            $('#embedPhotoModalBodyAlbumDialog').off('click');
+                            $('#embedPhotoModal').modal('hide');
+						}
+                    });
+
+					$('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+					$('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
 				} else {
 					window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
 				}