Skip to content

Commit c7adf47

Browse files
committed
+ (Connection) Fixed a formatting issue in the Connections block where the "Idle" status badge included a line break, causing it to wrap unexpectedly. The badge now displays consistently across all statuses. (Fixes SparkDevNetwork#6152)
1 parent ba20598 commit c7adf47

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

RockWeb/Blocks/Connection/ConnectionOpportunitySelect.ascx.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// <copyright>
1+
// <copyright>
22
// Copyright by the Spark Development Network
33
//
44
// Licensed under the Rock Community License (the "License");
@@ -138,7 +138,7 @@ private static class ViewStateKey
138138
<span class='badge badge-info badge-circle js-legend-badge'>Assigned To You</span>
139139
<span class='badge badge-warning badge-circle js-legend-badge'>Unassigned Item</span>
140140
<span class='badge badge-critical badge-circle js-legend-badge'>Critical Status</span>
141-
<span class='badge badge-danger badge-circle js-legend-badge'>{{ IdleTooltip }}</span>
141+
<span class='badge badge-danger badge-circle js-legend-badge' data-toggle='tooltip' data-html='true' title='{{IdleTooltipList}}'>{{ IdleTooltip }}</span>
142142
</div>";
143143

144144
private const string OpportunitySummaryTemplateDefaultValue = @"
@@ -648,15 +648,17 @@ private void GetSummaryData()
648648
}
649649

650650
//Set the Idle tooltip
651-
var connectionTypes = opportunities.Where( o => allOpportunities.Contains( o.Id ) ).Select( o => o.ConnectionType ).Distinct().ToList();
651+
var connectionTypes = opportunities.Where( o => allOpportunities.Contains( o.Id ) ).Select( o => o.ConnectionType ).DistinctBy( c => c.Id ).ToList();
652+
string idleTooltip = string.Empty;
652653
StringBuilder sb = new StringBuilder();
653654
if ( connectionTypes.Select( t => t.DaysUntilRequestIdle ).Distinct().Count() == 1 )
654655
{
655-
sb.Append( String.Format( "Idle (no activity in {0} days)", connectionTypes.Select( t => t.DaysUntilRequestIdle ).Distinct().First() ) );
656+
idleTooltip = String.Format( "Idle (no activity in {0} days)", connectionTypes.Select( t => t.DaysUntilRequestIdle ).Distinct().First() );
656657
}
657658
else
658659
{
659-
sb.Append( "Idle (no activity in several days)<br/><ul class='list-unstyled'>" );
660+
idleTooltip = "Idle (no activity in several days)";
661+
sb.Append( @"<ul class=""list-unstyled mb-0"">" );
660662
foreach ( var connectionType in connectionTypes )
661663
{
662664
sb.Append( String.Format( "<li>{0}: {1} days</li>", connectionType.Name, connectionType.DaysUntilRequestIdle ) );
@@ -668,7 +670,8 @@ private void GetSummaryData()
668670
var statusMergeFields = Rock.Lava.LavaHelper.GetCommonMergeFields( this.RockPage );
669671
statusMergeFields.Add( "ConnectionOpportunities", allOpportunities );
670672
statusMergeFields.Add( "ConnectionTypes", connectionTypes );
671-
statusMergeFields.Add( "IdleTooltip", sb.ToString().EncodeHtml() );
673+
statusMergeFields.Add( "IdleTooltip", idleTooltip );
674+
statusMergeFields.Add( "IdleTooltipList", sb );
672675
lStatusBarContent.Text = statusTemplate.ResolveMergeFields( statusMergeFields );
673676
BindSummaryData();
674677
}

0 commit comments

Comments
 (0)