Commits

Edison Chuang committed 793d25e Merge

Merge with [topic]demo

Comments (0)

Files changed (6)

source/MVC.ApiExplorer.Demo/Areas/AnArea/Controllers/Default2Controller.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-
-namespace The.controller.belong.to.an.area
-{
-	public class Default2Controller : Controller
-	{
-		public ActionResult Index()
-		{
-			return View();
-		}
-	}
-}

source/MVC.ApiExplorer.Demo/Areas/AnArea/Views/Default2/Index.cshtml

-@Html.Action("Explore", "ActionExplore", new { area = "", controllerType = typeof(The.controller.belong.to.an.area.InAreaController) })

source/MVC.ApiExplorer.Demo/Content/css/style.css

 body {
 	background-color: #FFFFFF;
 	color: #1B1919;
-	font-family: 'PT Serif Caption', 'Times New Roman',serif;
+	font: normal 16px "Helvetica Neue","HelveticaNeue",Helvetica,Arial,sans-serif;
 	line-height: 1.5;
 }
 
 h1
 {
-	font-family: 'Tinos', 'League Gothic' , 'Helvetica Neue' ,Arial,sans-serif;
 	font-size: 36px;
 }
 

source/MVC.ApiExplorer.Demo/Controllers/APIController.cs

 		[Description("Upload a file to service.")]
 		public ActionResult UploadFile(HttpPostedFileBase file)
 		{
-			return Json(new { Message = "Receive a file from client.", FileName = file.FileName });
+			return Json(new { Message = "Received a file from client.", FileName = file.FileName });
 		}
 
 		[HttpPost]
 		}
 
 		[HttpPost]
-		[ActionName("ChangedActionName")]
+		[ActionName("changed-action-name")]
 		[Description("An action which the name was changed by decorating with an ActionName attritube.")]
 		public ActionResult OriginalActionName(string msg, string value1, int value2 = 0, bool valut3 = false)
 		{

source/MVC.ApiExplorer.Demo/MVC.ApiExplorer.Demo.csproj

   <ItemGroup>
     <Compile Include="Areas\AnArea\AnAreaAreaRegistration.cs" />
     <Compile Include="Areas\AnArea\Controllers\InAreaController.cs" />
-    <Compile Include="Areas\AnArea\Controllers\Default2Controller.cs" />
     <Compile Include="Areas\AnArea\Controllers\ExploreOutterAPIController.cs" />
     <Compile Include="Controllers\APIController.cs" />
     <Compile Include="Controllers\ComplexModelAPIController.cs" />
     <Content Include="Areas\AnArea\Views\InArea\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Areas\AnArea\Views\Default2\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Areas\AnArea\Views\ExploreOutterAPI\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>

source/MVC.ApiExplorer.Demo/Views/Shared/_Layout.cshtml

 <head>
 	<meta charset="utf-8">
 	<title>MVC.ApiExplorer Demo - @ViewBag.Title</title>
-	<link href='http://fonts.googleapis.com/css?family=Tinos:700' rel='stylesheet' type='text/css'>
-	<link href='http://fonts.googleapis.com/css?family=PT+Serif+Caption' rel='stylesheet' type='text/css'>
 	<link rel="stylesheet" href="@Url.Content("Content/css/reset.css")">
 	<link rel="stylesheet" href="@Url.Content("Content/css/style.css")">
 </head>