From 106bf4227ee98a492de8c7481a444b50fda0a2bf Mon Sep 17 00:00:00 2001
From: Erik Zaadi <erik.zaadi@gmail.com>
Date: Thu, 5 May 2011 16:35:20 +0300
Subject: [PATCH] continuing to update mvc sample

---
 .../AdditionalHtmlAndUrlHelpers.cs            |  1 +
 .../MvcApplication/MvcApplication.csproj      |  6 ++++--
 Samples/MvcSample/MvcUI/MvcUI.csproj          | 16 ++++++++--------
 .../MvcSample/MvcUI/Views/Shared/Error.aspx   | 11 -----------
 .../MvcSample/MvcUI/Views/Shared/Error.cshtml |  7 +++++++
 .../MvcSample/MvcUI/Views/Shared/Footer.ascx  |  2 --
 .../MvcUI/Views/Shared/Footer.cshtml          |  1 +
 .../MvcUI/Views/Shared/LoginControl.cshtml    |  2 +-
 .../MvcSample/MvcUI/Views/Shared/Menu.cshtml  | 19 ++++++++++++-------
 9 files changed, 34 insertions(+), 31 deletions(-)
 delete mode 100644 Samples/MvcSample/MvcUI/Views/Shared/Error.aspx
 create mode 100644 Samples/MvcSample/MvcUI/Views/Shared/Error.cshtml
 delete mode 100644 Samples/MvcSample/MvcUI/Views/Shared/Footer.ascx
 create mode 100644 Samples/MvcSample/MvcUI/Views/Shared/Footer.cshtml

diff --git a/Samples/MvcSample/MvcApplication/Models/HtmlHelpers/AdditionalHtmlAndUrlHelpers.cs b/Samples/MvcSample/MvcApplication/Models/HtmlHelpers/AdditionalHtmlAndUrlHelpers.cs
index 13db69d..c790efc 100644
--- a/Samples/MvcSample/MvcApplication/Models/HtmlHelpers/AdditionalHtmlAndUrlHelpers.cs
+++ b/Samples/MvcSample/MvcApplication/Models/HtmlHelpers/AdditionalHtmlAndUrlHelpers.cs
@@ -4,6 +4,7 @@
 using System.Web;
 using System.Web.Mvc;
 using System.Text;
+using System.Web.WebPages;
 
 namespace GithubSharp.Samples.MvcSample.MvcApplication.Models.HtmlHelpers
 {
diff --git a/Samples/MvcSample/MvcApplication/MvcApplication.csproj b/Samples/MvcSample/MvcApplication/MvcApplication.csproj
index b794aec..5d0b1bf 100644
--- a/Samples/MvcSample/MvcApplication/MvcApplication.csproj
+++ b/Samples/MvcSample/MvcApplication/MvcApplication.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -90,7 +90,9 @@
     <Compile Include="Models\ViewModels\LoginViewModel.cs" />
     <Compile Include="ServerApp.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Default.cs" />
+    <Compile Include="Default.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Core\Core.csproj">
diff --git a/Samples/MvcSample/MvcUI/MvcUI.csproj b/Samples/MvcSample/MvcUI/MvcUI.csproj
index 542130a..7d843ef 100644
--- a/Samples/MvcSample/MvcUI/MvcUI.csproj
+++ b/Samples/MvcSample/MvcUI/MvcUI.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -106,11 +106,8 @@
     <Content Include="Views\Repository\PublicKeys.aspx" />
     <Content Include="Views\Repository\Search.aspx" />
     <Content Include="Views\Repository\Tags.aspx" />
-    <Content Include="Views\Shared\Error.aspx" />
-    <Content Include="Views\Shared\Footer.ascx" />
-    <Content Include="Views\Shared\Login.aspx" />
-    <Content Include="Views\Shared\LoginControl.ascx" />
-    <Content Include="Views\Shared\Menu.ascx" />
+    <None Include="Views\Shared\Error.cshtml" />
+    <None Include="Views\Shared\Footer.cshtml" />
     <Content Include="Views\User\Index.aspx" />
     <Content Include="Web.config" />
     <Content Include="Web.Debug.config">
@@ -136,7 +133,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+      <FlavorProperties GUID="{349C5851-65DF-11DA-9384-00065B846F21}">
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
@@ -165,6 +162,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Views\Shared\Login.cshtml" />
+    <Content Include="Views\Shared\LoginControl.cshtml" />
+    <Content Include="Views\Shared\Menu.cshtml" />
     <None Include="Views\_ViewStart.cshtml" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Samples/MvcSample/MvcUI/Views/Shared/Error.aspx b/Samples/MvcSample/MvcUI/Views/Shared/Error.aspx
deleted file mode 100644
index f6e27b8..0000000
--- a/Samples/MvcSample/MvcUI/Views/Shared/Error.aspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.master" Inherits="System.Web.Mvc.ViewPage<GithubSharp.Samples.MvcSample.MvcApplication.Models.ViewModels.ErrorViewModel>" %>
-
-<asp:Content ID="errorTitle" ContentPlaceHolderID="TitleContent" runat="server">
-    Error
-</asp:Content>
-
-<asp:Content ID="errorContent" ContentPlaceHolderID="MainContent" runat="server">
-    <h2>
-        Sorry, an error occurred while processing your request.
-    </h2>
-</asp:Content>
diff --git a/Samples/MvcSample/MvcUI/Views/Shared/Error.cshtml b/Samples/MvcSample/MvcUI/Views/Shared/Error.cshtml
new file mode 100644
index 0000000..7682769
--- /dev/null
+++ b/Samples/MvcSample/MvcUI/Views/Shared/Error.cshtml
@@ -0,0 +1,7 @@
+@model GithubSharp.Samples.MvcSample.MvcApplication.Models.ViewModels.ErrorViewModel
+@section Title {
+Error
+}
+<h2>
+    Sorry, an error occurred while processing your request.
+</h2>
diff --git a/Samples/MvcSample/MvcUI/Views/Shared/Footer.ascx b/Samples/MvcSample/MvcUI/Views/Shared/Footer.ascx
deleted file mode 100644
index 278d1fb..0000000
--- a/Samples/MvcSample/MvcUI/Views/Shared/Footer.ascx
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-Copyright 2011 <a href"http://erikzaadi.com">Erik Zaadi</a>
diff --git a/Samples/MvcSample/MvcUI/Views/Shared/Footer.cshtml b/Samples/MvcSample/MvcUI/Views/Shared/Footer.cshtml
new file mode 100644
index 0000000..5f71254
--- /dev/null
+++ b/Samples/MvcSample/MvcUI/Views/Shared/Footer.cshtml
@@ -0,0 +1 @@
+Copyright 2011 <a href"http://erikzaadi.com">Erik Zaadi</a>
\ No newline at end of file
diff --git a/Samples/MvcSample/MvcUI/Views/Shared/LoginControl.cshtml b/Samples/MvcSample/MvcUI/Views/Shared/LoginControl.cshtml
index 50228d5..fe0307b 100644
--- a/Samples/MvcSample/MvcUI/Views/Shared/LoginControl.cshtml
+++ b/Samples/MvcSample/MvcUI/Views/Shared/LoginControl.cshtml
@@ -21,7 +21,7 @@
             @if (!string.IsNullOrEmpty(Model.Message))
                {
             <div class="error span-8">
-                @Model.Message%></div>
+                @Model.Message</div>
             }
         </div>
     </fieldset>
diff --git a/Samples/MvcSample/MvcUI/Views/Shared/Menu.cshtml b/Samples/MvcSample/MvcUI/Views/Shared/Menu.cshtml
index 0dc7d2d..96e217a 100644
--- a/Samples/MvcSample/MvcUI/Views/Shared/Menu.cshtml
+++ b/Samples/MvcSample/MvcUI/Views/Shared/Menu.cshtml
@@ -1,16 +1,21 @@
+@{
+    var currentController = ViewContext.Controller.ValueProvider.GetValue("controller").RawValue.ToString();
+    Func<string,string> currentOrNot = (string x) => { return currentController == x ? "CurrentAPI" : ""; };
+
+}
 <ul id="menu">
     <li>
-        @Html.ActionLink("User", "Index", "User",null, new { @class = ViewContext.RouteData.GetRequiredString("controller") == "User" ? "CurrentAPI" : "" })</li>
+        @Html.ActionLink("User", "Index", "User",null, new { @class = currentOrNot("User") })</li>
     <li>
-        @Html.ActionLink("Issues", "Index", "Issues", null, new { @class = ViewContext.RouteData.GetRequiredString("controller") == "Issues" ? "CurrentAPI" : "" })</li>
+        @Html.ActionLink("Issues", "Index", "Issues", null, new { @class = currentOrNot("Issues") })</li>
     <li>
-        @Html.ActionLink("Network", "Index", "Network", null, new { @class = ViewContext.RouteData.GetRequiredString("controller") == "Network" ? "CurrentAPI" : "" })</li>
+        @Html.ActionLink("Network", "Index", "Network", null, new { @class = currentOrNot("Network")})</li>
     <li>
-        @Html.ActionLink("Repository", "Index", "Repository", null, new { @class = ViewContext.RouteData.GetRequiredString("controller") == "Repository" ? "CurrentAPI" : "" })</li>
+        @Html.ActionLink("Repository", "Index", "Repository", null, new { @class = currentOrNot("Repository") })</li>
     <li>
-        @Html.ActionLink("Commit", "Index", "Commit", null, new { @class = ViewContext.RouteData.GetRequiredString("controller") == "Commit" ? "CurrentAPI" : "" })</li>
+        @Html.ActionLink("Commit", "Index", "Commit", null, new { @class = currentOrNot("Commit")})</li>
     <li>
-        @Html.ActionLink("Object", "Index", "Object", null, new { @class = ViewContext.RouteData.GetRequiredString("controller") == "Object" ? "CurrentAPI" : "" })</li>
+        @Html.ActionLink("Object", "Index", "Object", null, new { @class = currentOrNot("Object") })</li>
     <li>
-        @Html.ActionLink("Gists", "Index", "Gists", null, new { @class = ViewContext.RouteData.GetRequiredString("controller") == "Gists" ? "CurrentAPI" : "" })</li>
+        @Html.ActionLink("Gists", "Index", "Gists", null, new { @class = currentOrNot("Gists") })</li>
 </ul>