Combine layouts
This commit is contained in:
+29
-17
@@ -44,9 +44,9 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="AutoMapper, Version=2.1.267.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
|
||||
<Reference Include="AutoMapper, Version=2.2.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\packages\AutoMapper.2.1.267\lib\net40\AutoMapper.dll</HintPath>
|
||||
<HintPath>..\packages\AutoMapper.2.2.0\lib\net40\AutoMapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="EntityFramework, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
@@ -64,9 +64,6 @@
|
||||
<Private>True</Private>
|
||||
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="MoreLinq, Version=1.0.11522.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\morelinq.1.0\lib\net35\MoreLinq.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.configuration" />
|
||||
<Reference Include="System.Data.Entity" />
|
||||
<Reference Include="System.Web.ApplicationServices" />
|
||||
@@ -107,11 +104,20 @@
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Attributes\ActionLogAttribute.cs" />
|
||||
<Compile Include="Attributes\DenyFutureDateAttribute.cs" />
|
||||
<Compile Include="Attributes\DenyPreviousMonthDateAttribute.cs" />
|
||||
<Compile Include="Attributes\FormatHintAttribute.cs" />
|
||||
<Compile Include="Attributes\HttpParamActionAttribute.cs" />
|
||||
<Compile Include="Attributes\InputSizeAttribute.cs" />
|
||||
<Compile Include="Attributes\NoEditLabelAttribute.cs" />
|
||||
<Compile Include="Attributes\UnitsAttribute.cs" />
|
||||
<Compile Include="Context\MileageTrakerContext.cs" />
|
||||
<Compile Include="Controllers\AccountController.cs" />
|
||||
<Compile Include="Controllers\CityController.cs" />
|
||||
<Compile Include="Controllers\ControllerBase.cs" />
|
||||
<Compile Include="Controllers\EmployeeController.cs" />
|
||||
<Compile Include="Controllers\UserController.cs" />
|
||||
<Compile Include="Membership\CodeFirstMembershipProvider.cs" />
|
||||
<Compile Include="Membership\CodeFirstRoleProvider.cs" />
|
||||
<Compile Include="Membership\Crypto.cs" />
|
||||
@@ -131,8 +137,6 @@
|
||||
<Compile Include="Migrations\Configuration.cs" />
|
||||
<Compile Include="Models\Role.cs" />
|
||||
<Compile Include="Models\User.cs" />
|
||||
<Compile Include="Utility\ActionLogAttribute.cs" />
|
||||
<Compile Include="Utility\HttpParamActionAttribute.cs" />
|
||||
<Compile Include="ViewModels\Account\ChangePasswordViewModel.cs" />
|
||||
<Compile Include="ViewModels\Account\LoginViewModel.cs" />
|
||||
<Compile Include="ViewModels\Account\RegisterModel.cs" />
|
||||
@@ -140,10 +144,11 @@
|
||||
<Compile Include="ViewModels\EmployeeMileageViewModel.cs" />
|
||||
<Compile Include="ViewModels\Log\LogIndexViewModel.cs" />
|
||||
<Compile Include="ViewModels\Log\LogPartialDetails.cs" />
|
||||
<Compile Include="ViewModels\User\CreateUserViewModel.cs" />
|
||||
<Compile Include="ViewModels\User\UserDetailsViewModel.cs" />
|
||||
<Compile Include="ViewModels\Vehicle\VehicleMileageViewModel.cs" />
|
||||
<Compile Include="ViewModels\Vehicle\VehiclePartialDetails.cs" />
|
||||
<Compile Include="ViewModels\Vehicle\VehicleMileageItem.cs" />
|
||||
<Compile Include="Utility\FormatHintAttribute.cs" />
|
||||
<Compile Include="DAL\ChronologicalOrderException.cs" />
|
||||
<Compile Include="DAL\DataService.cs" />
|
||||
<Compile Include="Controllers\CreateLogController.cs" />
|
||||
@@ -166,8 +171,6 @@
|
||||
<Compile Include="Utility\TitleCaseFormatter.cs" />
|
||||
<Compile Include="ViewModels\CreateLog\ConfirmCreateLogViewModel.cs" />
|
||||
<Compile Include="ViewModels\CreateLog\CreateLogViewModel.cs" />
|
||||
<Compile Include="Utility\DenyFutureDateAttribute.cs" />
|
||||
<Compile Include="Utility\DenyPreviousMonthDateAttribute.cs" />
|
||||
<Compile Include="ViewModels\Log\LogQueryViewModel.cs" />
|
||||
<Compile Include="ViewModels\Log\LogResultsViewModel.cs" />
|
||||
</ItemGroup>
|
||||
@@ -178,6 +181,7 @@
|
||||
<Content Include="Content\bootstrap.css" />
|
||||
<Content Include="Content\bootstrap.min.css" />
|
||||
<Content Include="Content\CreateLog.Index.css" />
|
||||
<Content Include="Content\images\Header.login.mobile.png" />
|
||||
<Content Include="Content\images\glyphicons-halflings-white.png" />
|
||||
<Content Include="Content\images\glyphicons-halflings.png" />
|
||||
<Content Include="Content\images\glyphicons_005_car.png" />
|
||||
@@ -185,11 +189,11 @@
|
||||
<Content Include="Content\images\glyphicons_005_car_half_white.png" />
|
||||
<Content Include="Content\images\glyphicons_026_road.png" />
|
||||
<Content Include="Content\images\Header.login.png" />
|
||||
<Content Include="Content\images\Header.mobile.png" />
|
||||
<Content Include="Content\images\Header.png" />
|
||||
<Content Include="Content\jquery.qtip.min.css" />
|
||||
<Content Include="Content\images\Rainbow.png" />
|
||||
<Content Include="Content\images\spinner.gif" />
|
||||
<Content Include="Content\Site.admin.css" />
|
||||
<Content Include="Content\Site.css" />
|
||||
<Content Include="Content\themes\custom-theme\images\ui-bg_flat_0_aaaaaa_40x100.png" />
|
||||
<Content Include="Content\themes\custom-theme\images\ui-bg_flat_55_fbec88_40x100.png" />
|
||||
@@ -241,7 +245,7 @@
|
||||
<Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
|
||||
<Content Include="Views\_ViewStart.cshtml" />
|
||||
<Content Include="Views\Shared\Error.cshtml" />
|
||||
<Content Include="Views\Shared\_Layout.admin.cshtml" />
|
||||
<Content Include="Views\Shared\_Layout.cshtml" />
|
||||
<Content Include="Views\Web.config" />
|
||||
<Content Include="Views\Log\BackToLogs.cshtml" />
|
||||
<Content Include="Views\Vehicle\BackToVehicles.cshtml" />
|
||||
@@ -255,11 +259,22 @@
|
||||
<Content Include="Views\Shared\EditorTemplates\Password.cshtml" />
|
||||
<Content Include="Views\Shared\EditorTemplates\Boolean.cshtml" />
|
||||
<Content Include="Views\Shared\_Layout.login.cshtml" />
|
||||
<Content Include="Views\Shared\_Layout.authentication.cshtml" />
|
||||
<Content Include="Views\Shared\_NavAccountInfo.cshtml" />
|
||||
<Content Include="Views\Shared\_ValidationSummary.cshtml" />
|
||||
<Content Include="Views\User\Index.cshtml" />
|
||||
<Content Include="Views\User\Details.cshtml" />
|
||||
<Content Include="Views\User\Create.cshtml" />
|
||||
<Content Include="Views\User\Edit.cshtml" />
|
||||
<Content Include="Views\User\BackToUsers.cshtml" />
|
||||
<Content Include="Views\Shared\EditorTemplates\MultilineText.cshtml" />
|
||||
<Content Include="Views\Shared\EditorTemplates\EmailAddress.cshtml" />
|
||||
<Content Include="Views\Shared\DisplayTemplates\EmailAddress.cshtml" />
|
||||
<Content Include="Views\Shared\DisplayTemplates\Boolean.cshtml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="packages.config" />
|
||||
<Content Include="packages.config">
|
||||
<SubType>Designer</SubType>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Views\Shared\EditorTemplates\DateTime.cshtml" />
|
||||
@@ -272,9 +287,6 @@
|
||||
<ItemGroup>
|
||||
<Content Include="Views\Log\Index.cshtml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Views\Shared\_Layout.cshtml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Views\Vehicle\Index.cshtml" />
|
||||
</ItemGroup>
|
||||
|
||||
Reference in New Issue
Block a user