Fixed issue with column wrapping on sort indicator

programcsharp · programcsharp · commit 251953f8189d · 2014-03-03T08:42:42.000-07:00
Force pass ViewBag.AlignRight down through to right buttons on button strip
diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
@@ -15,5 +15,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.26.0")]
-[assembly: AssemblyFileVersion("1.0.26.0")]
+[assembly: AssemblyVersion("1.0.28.0")]
+[assembly: AssemblyFileVersion("1.0.28.0")]
diff --git a/Griddly/Views/Shared/Griddly/ButtonStrip.cshtml b/Griddly/Views/Shared/Griddly/ButtonStrip.cshtml
@@ -27,6 +27,8 @@
             }
                 @foreach (GriddlyButton button in rightButtons)
                 {
+                    button.AlignRight = true;
+
                     if (button.IsSeparator)
                     {
                         @:</div>
diff --git a/Griddly/Views/Shared/Griddly/Griddly.cshtml b/Griddly/Views/Shared/Griddly/Griddly.cshtml
@@ -96,11 +96,10 @@
                     @foreach (GriddlyColumn column in settings.Columns)
                     {
                         bool isSortable = !simple && !string.IsNullOrWhiteSpace(column.SortField);
-                        <th class="@column.ClassName @(isSortable ? "sortable" : null) @(column is GriddlySelectColumn ? "select" : null) @(column.DefaultSort != null ? (column.DefaultSort == SortDirection.Descending ? "sorted_d" : "sorted_a") : null)" @Html.AttributeNullable("data-griddly-sortfield", simple ? null : column.SortField)>
-                            @column.Caption
+                        <th class="@column.ClassName @(isSortable ? "sortable" : null) @(column is GriddlySelectColumn ? "select" : null) @(column.DefaultSort != null ? (column.DefaultSort == SortDirection.Descending ? "sorted_d" : "sorted_a") : null)" @Html.AttributeNullable("data-griddly-sortfield", simple ? null : column.SortField)>                            
                             @if (isSortable)
                             {
-                                <span class="icon">&nbsp;</span>
+                                <text>@column.Caption<span class="icon">&nbsp;</span></text>
                             }
                             else if (column is GriddlySelectColumn)
                             {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@`
`27`	`27`	`}`
`28`	`28`	`@foreach (GriddlyButton button in rightButtons)`
`29`	`29`	`{`
	`30`	`+ button.AlignRight = true;`
	`31`	`+`
`30`	`32`	`if (button.IsSeparator)`
`31`	`33`	`{`
`32`	`34`	`@:</div>`
Original file line number	Diff line number	Diff line change
`@@ -96,11 +96,10 @@`
`96`	`96`	`@foreach (GriddlyColumn column in settings.Columns)`
`97`	`97`	`{`
`98`	`98`	`bool isSortable = !simple && !string.IsNullOrWhiteSpace(column.SortField);`
`99`		`- <th class="@column.ClassName @(isSortable ? "sortable" : null) @(column is GriddlySelectColumn ? "select" : null) @(column.DefaultSort != null ? (column.DefaultSort == SortDirection.Descending ? "sorted_d" : "sorted_a") : null)" @Html.AttributeNullable("data-griddly-sortfield", simple ? null : column.SortField)>`
`100`		`- @column.Caption`
	`99`	`+ <th class="@column.ClassName @(isSortable ? "sortable" : null) @(column is GriddlySelectColumn ? "select" : null) @(column.DefaultSort != null ? (column.DefaultSort == SortDirection.Descending ? "sorted_d" : "sorted_a") : null)" @Html.AttributeNullable("data-griddly-sortfield", simple ? null : column.SortField)>`
`101`	`100`	`@if (isSortable)`
`102`	`101`	`{`
`103`		`- <span class="icon"> </span>`
	`102`	`+ <text>@column.Caption<span class="icon"> </span></text>`
`104`	`103`	`}`
`105`	`104`	`else if (column is GriddlySelectColumn)`
`106`	`105`	`{`