diff options
| -rw-r--r-- | LHSCamp/LHSCamp/App_Start/RouteConfig.cs | 6 | ||||
| -rw-r--r-- | LHSCamp/LHSCamp/Content/Scripts/candidate.js | 6 | ||||
| -rw-r--r-- | LHSCamp/LHSCamp/LHSCamp.csproj | 15 | ||||
| -rw-r--r-- | LHSCamp/LHSCamp/Views/Candidates/GetClass.cshtml | 1 | ||||
| -rw-r--r-- | LHSCamp/LHSCamp/Web.config | 2 | ||||
| -rw-r--r-- | LHSCamp/LHSCamp/packages.config | 2 |
6 files changed, 18 insertions, 14 deletions
diff --git a/LHSCamp/LHSCamp/App_Start/RouteConfig.cs b/LHSCamp/LHSCamp/App_Start/RouteConfig.cs index 5c3ea26..492e995 100644 --- a/LHSCamp/LHSCamp/App_Start/RouteConfig.cs +++ b/LHSCamp/LHSCamp/App_Start/RouteConfig.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Mvc; +using System.Web.Mvc; using System.Web.Routing; namespace LHSCamp diff --git a/LHSCamp/LHSCamp/Content/Scripts/candidate.js b/LHSCamp/LHSCamp/Content/Scripts/candidate.js index 2101deb..de38d4f 100644 --- a/LHSCamp/LHSCamp/Content/Scripts/candidate.js +++ b/LHSCamp/LHSCamp/Content/Scripts/candidate.js @@ -75,4 +75,8 @@ $("#add-pic-button").click(function () { } setSelected(selected); refreshSelected(); -});
\ No newline at end of file +}); + +if (window.location.href.indexOf("?tab=questions")) { + $("#tabs li[nth-child=2]").click(); +}
\ No newline at end of file diff --git a/LHSCamp/LHSCamp/LHSCamp.csproj b/LHSCamp/LHSCamp/LHSCamp.csproj index af558ee..459498d 100644 --- a/LHSCamp/LHSCamp/LHSCamp.csproj +++ b/LHSCamp/LHSCamp/LHSCamp.csproj @@ -23,6 +23,7 @@ <IISExpressUseClassicPipelineMode /> <TypeScriptToolsVersion>0.9</TypeScriptToolsVersion> <includesetaclproviderondestination>False</includesetaclproviderondestination> + <UseGlobalApplicationHostFile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -53,6 +54,14 @@ <Reference Include="dotless.Core"> <HintPath>..\packages\dotless.1.4.0.0\lib\dotless.Core.dll</HintPath> </Reference> + <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> + <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> + <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath> + <Private>True</Private> + </Reference> <Reference Include="Microsoft.CSharp" /> <Reference Include="System" /> <Reference Include="System.Data" /> @@ -133,12 +142,6 @@ </Reference> </ItemGroup> <ItemGroup> - <Reference Include="EntityFramework"> - <HintPath>..\packages\EntityFramework.6.1.0-alpha1\lib\net45\EntityFramework.dll</HintPath> - </Reference> - <Reference Include="EntityFramework.SqlServer"> - <HintPath>..\packages\EntityFramework.6.1.0-alpha1\lib\net45\EntityFramework.SqlServer.dll</HintPath> - </Reference> <Reference Include="Microsoft.AspNet.Identity.Core"> <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.0.0-alpha1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath> </Reference> diff --git a/LHSCamp/LHSCamp/Views/Candidates/GetClass.cshtml b/LHSCamp/LHSCamp/Views/Candidates/GetClass.cshtml index 09f8149..8d1349c 100644 --- a/LHSCamp/LHSCamp/Views/Candidates/GetClass.cshtml +++ b/LHSCamp/LHSCamp/Views/Candidates/GetClass.cshtml @@ -89,6 +89,7 @@ <div class="overlay"> <a href="/Candidates/@(candidate.Id)">platform info</a> <a class="add-pic-button">(+) add picture</a> + <a href="/Candidates/@(candidate.Id)?tab=questions">ask a ?</a> </div> </div> diff --git a/LHSCamp/LHSCamp/Web.config b/LHSCamp/LHSCamp/Web.config index 111e40d..007e0c3 100644 --- a/LHSCamp/LHSCamp/Web.config +++ b/LHSCamp/LHSCamp/Web.config @@ -8,7 +8,7 @@ <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --> <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> <section name="dotless" type="dotless.Core.configuration.DotlessConfigurationSectionHandler, dotless.Core" /> - </configSections> + <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections> <connectionStrings> <add name="LCDB" connectionString="Server=.\SQLEXPRESS;Database=lhsc;TRUSTED_CONNECTION=TRUE;" providerName="System.Data.SqlClient" /> </connectionStrings> diff --git a/LHSCamp/LHSCamp/packages.config b/LHSCamp/LHSCamp/packages.config index 3d22225..ebd976f 100644 --- a/LHSCamp/LHSCamp/packages.config +++ b/LHSCamp/LHSCamp/packages.config @@ -4,7 +4,7 @@ <package id="AutoMapper" version="3.3.1" targetFramework="net45" /> <package id="bootstrap" version="3.0.0" targetFramework="net45" /> <package id="dotless" version="1.4.0.0" targetFramework="net45" /> - <package id="EntityFramework" version="6.1.0-alpha1" targetFramework="net45" /> + <package id="EntityFramework" version="6.1.3" targetFramework="net45" /> <package id="jQuery" version="1.10.2" targetFramework="net45" /> <package id="jquery.TypeScript.DefinitelyTyped" version="0.7.3" targetFramework="net45" /> <package id="jQuery.Validation" version="1.11.1" targetFramework="net45" /> |