diff --git a/FullCalendarMVC/FullCalendar.MVC4/Properties/AssemblyInfo.cs b/FullCalendarMVC/FullCalendar.MVC4/Properties/AssemblyInfo.cs index b24e94e..f6663b6 100644 --- a/FullCalendarMVC/FullCalendar.MVC4/Properties/AssemblyInfo.cs +++ b/FullCalendarMVC/FullCalendar.MVC4/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("FullCalendar.MVC4")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.4.0")] -[assembly: AssemblyFileVersion("1.0.4.0")] +[assembly: AssemblyVersion("1.0.5.0")] +[assembly: AssemblyFileVersion("1.0.5.0")] diff --git a/FullCalendarMVC/FullCalendar.MVC5/Properties/AssemblyInfo.cs b/FullCalendarMVC/FullCalendar.MVC5/Properties/AssemblyInfo.cs index ff926e8..f40a193 100644 --- a/FullCalendarMVC/FullCalendar.MVC5/Properties/AssemblyInfo.cs +++ b/FullCalendarMVC/FullCalendar.MVC5/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("FullCalendar.MVC5")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.4.0")] -[assembly: AssemblyFileVersion("1.0.4.0")] +[assembly: AssemblyVersion("1.0.5.0")] +[assembly: AssemblyFileVersion("1.0.5.0")] diff --git a/FullCalendarMVC/FullCalendar.Tests/Abstract/PropertyParserFactoryTests.cs b/FullCalendarMVC/FullCalendar.Tests/Abstract/PropertyParserFactoryTests.cs index 0300c76..d8d6dba 100644 --- a/FullCalendarMVC/FullCalendar.Tests/Abstract/PropertyParserFactoryTests.cs +++ b/FullCalendarMVC/FullCalendar.Tests/Abstract/PropertyParserFactoryTests.cs @@ -457,13 +457,29 @@ public void GetPropertyParser_TimeFormatIsSent_StringPropertyParserIsCreated() } [Test] - public void GetPropertyParser_ColumnFormatIsSent_StringPropertyParserIsCreated() + public void GetPropertyParser_ColumnHeaderFormatIsSent_StringPropertyParserIsCreated() { - PropertyInfo property = typeof(FullCalendarParameters).GetProperties().Single(x => x.Name == nameof(FullCalendarParameters.ColumnFormat)); + PropertyInfo property = typeof(FullCalendarParameters).GetProperties().Single(x => x.Name == nameof(FullCalendarParameters.ColumnHeaderFormat)); IPropertyParser propertyParser = PropertyParserFactory.GetPropertyParser(property); propertyParser.Should().BeOfType(); } + [Test] + public void GetPropertyParser_ColumnHeaderTextIsSent_FunctionPropertyParserIsCreated() + { + PropertyInfo property = typeof(FullCalendarParameters).GetProperties().Single(x => x.Name == nameof(FullCalendarParameters.ColumnHeaderText)); + IPropertyParser propertyParser = PropertyParserFactory.GetPropertyParser(property); + propertyParser.Should().BeOfType(); + } + + [Test] + public void GetPropertyParser_ColumnHeaderHtmlIsSent_FunctionPropertyParserIsCreated() + { + PropertyInfo property = typeof(FullCalendarParameters).GetProperties().Single(x => x.Name == nameof(FullCalendarParameters.ColumnHeaderHtml)); + IPropertyParser propertyParser = PropertyParserFactory.GetPropertyParser(property); + propertyParser.Should().BeOfType(); + } + [Test] public void GetPropertyParser_TitleFormatIsSent_StringPropertyParserIsCreated() { diff --git a/FullCalendarMVC/FullCalendar.Tests/Properties/AssemblyInfo.cs b/FullCalendarMVC/FullCalendar.Tests/Properties/AssemblyInfo.cs index 2773a3b..d34e9f3 100644 --- a/FullCalendarMVC/FullCalendar.Tests/Properties/AssemblyInfo.cs +++ b/FullCalendarMVC/FullCalendar.Tests/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("FullCalendar.Tests")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/FullCalendarMVC/FullCalendar.UI/Content/fullcalendar.css b/FullCalendarMVC/FullCalendar.UI/Content/fullcalendar.css index 71720d2..28ff058 100644 --- a/FullCalendarMVC/FullCalendar.UI/Content/fullcalendar.css +++ b/FullCalendarMVC/FullCalendar.UI/Content/fullcalendar.css @@ -1,1494 +1,1265 @@ /*! - * FullCalendar v3.5.1 Stylesheet + * FullCalendar v3.8.0 * Docs & License: https://fullcalendar.io/ * (c) 2017 Adam Shaw */ - - .fc { - direction: ltr; - text-align: left; -} + direction: ltr; + text-align: left; } .fc-rtl { - text-align: right; -} - -body .fc { /* extra precedence to overcome jqui */ - font-size: 1em; -} + text-align: right; } +body .fc { + /* extra precedence to overcome jqui */ + font-size: 1em; } /* Colors --------------------------------------------------------------------------------------------------*/ +.fc-highlight { + /* when user is selecting cells */ + background: #bce8f1; + opacity: .3; } +.fc-bgevent { + /* default look for background events */ + background: #8fdf82; + opacity: .3; } -.fc-highlight { /* when user is selecting cells */ - background: #bce8f1; - opacity: .3; -} - -.fc-bgevent { /* default look for background events */ - background: rgb(143, 223, 130); - opacity: .3; -} - -.fc-nonbusiness { /* default look for non-business-hours areas */ - /* will inherit .fc-bgevent's styles */ - background: #d7d7d7; -} - +.fc-nonbusiness { + /* default look for non-business-hours areas */ + /* will inherit .fc-bgevent's styles */ + background: #d7d7d7; } /* Buttons (styled