Merge branch 'hotfix-19.1' into develop

# Conflicts:
#	RockWeb/Themes/Rock/Assets/Lava/GroupDetail.lava

Author: maxwelleley

Rock.Frontend.Styles/src/themes/RockNextGen/Assets/Lava/GroupDetail.lava

@@ -165,9 +165,11 @@
 
 						{% if AllowedActions.Edit == true or AllowedActions.ManageMembers == true %}
 						<div class="pull-left rollover-item" style="position: absolute; right:0; top:0;">
+							{% if ButtonVisibility.AllowGroupMemberDelete == true %}
 							<a href="#" onclick="{{ member.Id | Postback:'DeleteGroupMember' }}" >
 							<i class="ti ti-x"></i>
 							</a>
+							{% endif %}
 							<a href="#" onclick="{{ member.Id | Postback:'EditGroupMember' }}" class="margin-l-sm">
 							<i class="ti ti-pencil"></i>
 							</a>
@@ -232,9 +234,11 @@
 
 						{% if AllowedActions.Edit == true or AllowedActions.ManageMembers == true %}
 						<div class="pull-left rollover-item" style="position: absolute; right:0; top:0;">
+							{% if ButtonVisibility.AllowGroupMemberDelete == true %}
 							<a href="#" onclick="{{ member.Id | Postback:'DeleteGroupMember' }}" >
 							<i class="ti ti-x"></i>
 							</a>
+							{% endif %}
 							<a href="#" onclick="{{ member.Id | Postback:'EditGroupMember' }}" class="margin-l-sm">
 							<i class="ti ti-pencil"></i>
 							</a>
@@ -299,9 +303,11 @@
 
 						{% if AllowedActions.Edit == true or AllowedActions.ManageMembers == true %}
 						<div class="pull-left rollover-item" style="position: absolute; right:0; top:0;">
+							{% if ButtonVisibility.AllowGroupMemberDelete == true %}
 							<a href="#" onclick="{{ member.Id | Postback:'DeleteGroupMember' }}" >
 							<i class="ti ti-x"></i>
 							</a>
+							{% endif %}
 							<a href="#" onclick="{{ member.Id | Postback:'EditGroupMember' }}" class="margin-l-sm">
 							<i class="ti ti-pencil"></i>
 							</a>

RockWeb/Blocks/Groups/GroupDetailLava.ascx.cs

@@ -987,6 +987,7 @@ private void DisplayViewGroup()
                 Dictionary<string, object> buttonVisibility = new Dictionary<string, object>();
                 buttonVisibility.Add( AttributeKey.ShowEmailGroupLeadersButton, GetAttributeValue( AttributeKey.ShowEmailGroupLeadersButton ) );
                 buttonVisibility.Add( AttributeKey.ShowEmailRosterParentsButton, GetAttributeValue( AttributeKey.ShowEmailRosterParentsButton ) );
+                buttonVisibility.Add( AttributeKey.AllowGroupMemberDelete, GetAttributeValue( AttributeKey.AllowGroupMemberDelete ) );
                 mergeFields.Add( "ButtonVisibility", buttonVisibility );
 
                 string template = GetAttributeValue( AttributeKey.LavaTemplate );
@@ -1378,7 +1379,7 @@ private void DisplayDeleteGroupMember( int groupMemberId )
                 // persist the group member id for use in partial postbacks
                 this.CurrentGroupMemberId = groupMember.Id;
 
-                lConfirmDeleteMsg.Text = string.Format( "Are you sure you want to delete (remove) {0} from {1}?", groupMember.Person.FullName, groupMember.Group.Name );
+                lConfirmDeleteMsg.Text = string.Format( "Are you sure you want to remove {0} from {1}?", groupMember.Person.FullName, groupMember.Group.Name );
 
                 mdConfirmDelete.Show();
                 //mdConfirmDelete.Header.Visible = false;

RockWeb/Themes/Flat/Assets/Lava/GroupDetail.lava

@@ -165,9 +165,11 @@
 
 						{% if AllowedActions.Edit == true or AllowedActions.ManageMembers == true %}
 						<div class="pull-left rollover-item" style="position: absolute; right:0; top:0;">
+							{% if ButtonVisibility.AllowGroupMemberDelete == true %}
 							<a href="#" onclick="{{ member.Id | Postback:'DeleteGroupMember' }}" >
 							<i class="ti ti-x"></i>
 							</a>
+							{% endif %}
 							<a href="#" onclick="{{ member.Id | Postback:'EditGroupMember' }}" class="margin-l-sm">
 							<i class="ti ti-pencil"></i>
 							</a>
@@ -232,9 +234,11 @@
 
 						{% if AllowedActions.Edit == true or AllowedActions.ManageMembers == true %}
 						<div class="pull-left rollover-item" style="position: absolute; right:0; top:0;">
+							{% if ButtonVisibility.AllowGroupMemberDelete == true %}
 							<a href="#" onclick="{{ member.Id | Postback:'DeleteGroupMember' }}" >
 							<i class="ti ti-x"></i>
 							</a>
+							{% endif %}
 							<a href="#" onclick="{{ member.Id | Postback:'EditGroupMember' }}" class="margin-l-sm">
 							<i class="ti ti-pencil"></i>
 							</a>
@@ -299,9 +303,11 @@
 
 						{% if AllowedActions.Edit == true or AllowedActions.ManageMembers == true %}
 						<div class="pull-left rollover-item" style="position: absolute; right:0; top:0;">
+							{% if ButtonVisibility.AllowGroupMemberDelete == true %}
 							<a href="#" onclick="{{ member.Id | Postback:'DeleteGroupMember' }}" >
 							<i class="ti ti-x"></i>
 							</a>
+							{% endif %}
 							<a href="#" onclick="{{ member.Id | Postback:'EditGroupMember' }}" class="margin-l-sm">
 							<i class="ti ti-pencil"></i>
 							</a>

RockWeb/Themes/RockManager/Assets/Lava/GroupDetail.lava

@@ -165,9 +165,11 @@
 
 						{% if AllowedActions.Edit == true or AllowedActions.ManageMembers == true %}
 						<div class="pull-left rollover-item" style="position: absolute; right:0; top:0;">
+							{% if ButtonVisibility.AllowGroupMemberDelete == true %}
 							<a href="#" onclick="{{ member.Id | Postback:'DeleteGroupMember' }}" >
 							<i class="ti ti-x"></i>
 							</a>
+							{% endif %}
 							<a href="#" onclick="{{ member.Id | Postback:'EditGroupMember' }}" class="margin-l-sm">
 							<i class="ti ti-pencil"></i>
 							</a>
@@ -232,9 +234,11 @@
 
 						{% if AllowedActions.Edit == true or AllowedActions.ManageMembers == true %}
 						<div class="pull-left rollover-item" style="position: absolute; right:0; top:0;">
+							{% if ButtonVisibility.AllowGroupMemberDelete == true %}
 							<a href="#" onclick="{{ member.Id | Postback:'DeleteGroupMember' }}" >
 							<i class="ti ti-x"></i>
 							</a>
+							{% endif %}
 							<a href="#" onclick="{{ member.Id | Postback:'EditGroupMember' }}" class="margin-l-sm">
 							<i class="ti ti-pencil"></i>
 							</a>
@@ -299,9 +303,11 @@
 
 						{% if AllowedActions.Edit == true or AllowedActions.ManageMembers == true %}
 						<div class="pull-left rollover-item" style="position: absolute; right:0; top:0;">
+							{% if ButtonVisibility.AllowGroupMemberDelete == true %}
 							<a href="#" onclick="{{ member.Id | Postback:'DeleteGroupMember' }}" >
 							<i class="ti ti-x"></i>
 							</a>
+							{% endif %}
 							<a href="#" onclick="{{ member.Id | Postback:'EditGroupMember' }}" class="margin-l-sm">
 							<i class="ti ti-pencil"></i>
 							</a>

RockWeb/Themes/Stark/Assets/Lava/GroupDetail.lava

@@ -162,9 +162,11 @@
 
 						{% if AllowedActions.Edit == true or AllowedActions.ManageMembers == true %}
 						<div class="pull-left rollover-item" style="position: absolute; right:0; top:0;">
+							{% if ButtonVisibility.AllowGroupMemberDelete == true %}
 							<a href="#" onclick="{{ member.Id | Postback:'DeleteGroupMember' }}" >
 							<i class="ti ti-x"></i>
 							</a>
+							{% endif %}
 							<a href="#" onclick="{{ member.Id | Postback:'EditGroupMember' }}" class="margin-l-sm">
 							<i class="ti ti-pencil"></i>
 							</a>
@@ -229,9 +231,11 @@
 
 						{% if AllowedActions.Edit == true or AllowedActions.ManageMembers == true %}
 						<div class="pull-left rollover-item" style="position: absolute; right:0; top:0;">
+							{% if ButtonVisibility.AllowGroupMemberDelete == true %}
 							<a href="#" onclick="{{ member.Id | Postback:'DeleteGroupMember' }}" >
 							<i class="ti ti-x"></i>
 							</a>
+							{% endif %}
 							<a href="#" onclick="{{ member.Id | Postback:'EditGroupMember' }}" class="margin-l-sm">
 							<i class="ti ti-pencil"></i>
 							</a>
@@ -296,9 +300,11 @@
 
 						{% if AllowedActions.Edit == true or AllowedActions.ManageMembers == true %}
 						<div class="pull-left rollover-item" style="position: absolute; right:0; top:0;">
+							{% if ButtonVisibility.AllowGroupMemberDelete == true %}
 							<a href="#" onclick="{{ member.Id | Postback:'DeleteGroupMember' }}" >
 							<i class="ti ti-x"></i>
 							</a>
+							{% endif %}
 							<a href="#" onclick="{{ member.Id | Postback:'EditGroupMember' }}" class="margin-l-sm">
 							<i class="ti ti-pencil"></i>
 							</a>