yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes merge issues

Browse Source
This commit is contained in:
Shannon
2015-02-22 16:59:40 +01:00
parent 1851303343
commit 9f5f8e57af
2 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs
View File

@@ -32,24 +32,4 @@
// }
// }
//}
{
// here we render <thead> and <tfoot>
if (dgTabs.ShowHeader)
table.Rows[0].TableSection = TableRowSection.TableHeader;
if (dgTabs.ShowFooter)
table.Rows[table.Rows.Count - 1].TableSection = TableRowSection.TableFooter;
}
}
protected void dgTabs_ItemDataBound(object sender, DataGridItemEventArgs e)
{
Table table = dgTabs.Controls[0] as Table;
if (table != null && table.Rows.Count > 0)
{
if (dgTabs.ShowHeader)
table.Rows[0].TableSection = TableRowSection.TableHeader;
if (dgTabs.ShowFooter)
table.Rows[table.Rows.Count - 1].TableSection = TableRowSection.TableFooter;
}
}
//}

1
src/Umbraco.Web/umbraco.presentation/macro.cs
View File

@@ -42,7 +42,6 @@ using Macro = umbraco.cms.businesslogic.macro.Macro;
using MacroErrorEventArgs = Umbraco.Core.Events.MacroErrorEventArgs;
using System.Linq;
using File = System.IO.File;
using MacroTypes = umbraco.cms.businesslogic.macro.MacroTypes;
using Member = umbraco.cms.businesslogic.member.Member;
namespace umbraco