Skip to content

Commit 158f314

Browse files
committed
Add dropdown header ability to BootstrapButton
1 parent 6f02549 commit 158f314

File tree

7 files changed

+55
-4
lines changed

7 files changed

+55
-4
lines changed

Build/CommonAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
//
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
18-
[assembly: AssemblyVersion("3.6.30")]
19-
[assembly: AssemblyFileVersion("3.6.30")]
18+
[assembly: AssemblyVersion("3.6.31")]
19+
[assembly: AssemblyFileVersion("3.6.31")]
2020
//[assembly: AssemblyInformationalVersion("2.5-filters")]

Griddly.Mvc/GriddlyButton.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public GriddlyButton(string additionalClassName = null)
2626
public bool Enabled { get; set; }
2727
public bool EnableOnSelection { get; set; }
2828
public bool IsSeparator { get; set; }
29+
public bool IsHeader { get; set; }
2930
public GriddlyDropdownCaret DropdownCaret { get; set; }
3031

3132
/// <summary>

Griddly.Mvc/GriddlySettings.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,16 @@ public GriddlySettings ButtonSeparator(bool alignRight = false)
401401
});
402402
}
403403

404+
public GriddlySettings ButtonHeader(string text, bool alignRight = false)
405+
{
406+
return Add(new GriddlyButton()
407+
{
408+
IsHeader = true,
409+
Text = text,
410+
AlignRight = alignRight
411+
});
412+
}
413+
404414
public GriddlySettings SelectColumn(Expression<Func<object, object>> id, object summaryValue = null)
405415
{
406416
RowId(id, "id");

Griddly.NetCore.Razor/Pages/Shared/Griddly/BootstrapButton.cshtml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,16 @@ Func<List<GriddlyButton>, IHtmlContent> RenderList = @<text>@{
8888
{
8989
<div class="dropdown-divider"></div>
9090
}
91+
else if (button.IsHeader)
92+
{
93+
<h6 class="dropdown-header">
94+
@if(button.TextTemplate != null)
95+
{
96+
@button.TextTemplate(button)
97+
}
98+
@button.Text
99+
</h6>
100+
}
91101
else if (button is GriddlyHtmlButton)
92102
{@(((GriddlyHtmlButton)button).HtmlTemplate(button))}
93103
else
@@ -99,6 +109,16 @@ Func<List<GriddlyButton>, IHtmlContent> RenderList = @<text>@{
99109
{
100110
<li class="divider"></li>
101111
}
112+
else if (button.IsHeader)
113+
{
114+
<li class="dropdown-header">
115+
@if (button.TextTemplate != null)
116+
{
117+
@button.TextTemplate(button)
118+
}
119+
@button.Text
120+
</li>
121+
}
102122
else
103123
{
104124
<li class="@(!button.Enabled || button.EnableOnSelection == true ? "disabled" : null)" @Html.AttributeIf("data-enable-on-selection", button.EnableOnSelection, button.EnableOnSelection.ToString().ToLower())>

Griddly.NetCore.Razor/Pages/Shared/Griddly/ButtonStrip.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
groups.Add(currentList);
2727
}
2828

29-
if (b.IsSeparator)
29+
if (b.IsSeparator || b.IsHeader)
3030
{
3131
currentList = null;
3232
}

Griddly/Views/Shared/Griddly/BootstrapButton.cshtml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,16 @@ else
130130
{
131131
<div class="dropdown-divider"></div>
132132
}
133+
else if (button.IsHeader)
134+
{
135+
<h6 class="dropdown-header">
136+
@if(button.TextTemplate != null)
137+
{
138+
@button.TextTemplate(button)
139+
}
140+
@button.Text
141+
</h6>
142+
}
133143
else if (button is GriddlyHtmlButton)
134144
{@(((GriddlyHtmlButton)button).HtmlTemplate(button))}
135145
else
@@ -141,6 +151,16 @@ else
141151
{
142152
<li class="divider"></li>
143153
}
154+
else if (button.IsHeader)
155+
{
156+
<li class="dropdown-header">
157+
@if (button.TextTemplate != null)
158+
{
159+
@button.TextTemplate(button)
160+
}
161+
@button.Text
162+
</li>
163+
}
144164
else
145165
{
146166
<li class="@(!button.Enabled || button.EnableOnSelection == true ? "disabled" : null)" @Html.AttributeIf("data-enable-on-selection", button.EnableOnSelection, button.EnableOnSelection.ToString().ToLower())>

Griddly/Views/Shared/Griddly/ButtonStrip.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
groups.Add(currentList);
2626
}
2727

28-
if (b.IsSeparator)
28+
if (b.IsSeparator || b.IsHeader)
2929
{
3030
currentList = null;
3131
}

0 commit comments

Comments
 (0)