From b302e7a1be85f53f8860b8f9b3ebf5847f485562 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Tue, 1 Nov 2016 15:57:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E6=B5=8B=E8=AF=95=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=99=BB?= =?UTF-8?q?=E9=99=86=E5=90=8E=E6=B2=A1=E6=9C=89=E5=90=8E=E5=8F=B0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9D=83=E9=99=90=E6=97=B6=E6=98=BE=E7=A4=BA=E6=AD=A4?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bootstrap.Admin/Bootstrap.Admin.csproj | 8 +++++--- Bootstrap.Admin/Content/css/site.css | 6 ++++++ Bootstrap.Admin/Content/html/dummy.html | 15 +++++++++++++++ Bootstrap.Admin/Controllers/HomeController.cs | 3 ++- Bootstrap.Admin/Models/ContentModel.cs | 8 ++++++++ Bootstrap.Admin/Scripts/Content.js | 1 + Bootstrap.Admin/Views/Home/Index.cshtml | 9 ++++++--- Bootstrap.Admin/Views/Shared/Content.cshtml | 3 +++ 8 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 Bootstrap.Admin/Content/html/dummy.html create mode 100644 Bootstrap.Admin/Models/ContentModel.cs create mode 100644 Bootstrap.Admin/Scripts/Content.js create mode 100644 Bootstrap.Admin/Views/Shared/Content.cshtml diff --git a/Bootstrap.Admin/Bootstrap.Admin.csproj b/Bootstrap.Admin/Bootstrap.Admin.csproj index f3c06583..2a76ab6c 100644 --- a/Bootstrap.Admin/Bootstrap.Admin.csproj +++ b/Bootstrap.Admin/Bootstrap.Admin.csproj @@ -113,6 +113,7 @@ + @@ -152,6 +153,7 @@ + @@ -169,9 +171,7 @@ - - Designer - + @@ -193,6 +193,7 @@ Global.asax + @@ -232,6 +233,7 @@ + Web.config diff --git a/Bootstrap.Admin/Content/css/site.css b/Bootstrap.Admin/Content/css/site.css index 1d7b5109..c40237fe 100644 --- a/Bootstrap.Admin/Content/css/site.css +++ b/Bootstrap.Admin/Content/css/site.css @@ -624,3 +624,9 @@ ul.breadcrumb { ul.breadcrumb > li > a > i { padding-right: 6px; } + +iframe { + width: 100%; + border: none; + height: 500px; +} diff --git a/Bootstrap.Admin/Content/html/dummy.html b/Bootstrap.Admin/Content/html/dummy.html new file mode 100644 index 00000000..66ecf3d2 --- /dev/null +++ b/Bootstrap.Admin/Content/html/dummy.html @@ -0,0 +1,15 @@ + + + + + + + + + + + +
我就是一个测试页面
+
Bottom
+ + diff --git a/Bootstrap.Admin/Controllers/HomeController.cs b/Bootstrap.Admin/Controllers/HomeController.cs index 555f0a83..ce7f1042 100644 --- a/Bootstrap.Admin/Controllers/HomeController.cs +++ b/Bootstrap.Admin/Controllers/HomeController.cs @@ -17,8 +17,9 @@ namespace Bootstrap.Admin.Controllers /// public ActionResult Index() { - var v = new HeaderBarModel(); + var v = new ContentModel(); v.ShowMenu = "hide"; + v.Url = "/Content/html/dummy.html"; return View(v); } /// diff --git a/Bootstrap.Admin/Models/ContentModel.cs b/Bootstrap.Admin/Models/ContentModel.cs new file mode 100644 index 00000000..c5775ebe --- /dev/null +++ b/Bootstrap.Admin/Models/ContentModel.cs @@ -0,0 +1,8 @@ + +namespace Bootstrap.Admin.Models +{ + public class ContentModel : HeaderBarModel + { + public string Url { get; set; } + } +} \ No newline at end of file diff --git a/Bootstrap.Admin/Scripts/Content.js b/Bootstrap.Admin/Scripts/Content.js new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/Bootstrap.Admin/Scripts/Content.js @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Bootstrap.Admin/Views/Home/Index.cshtml b/Bootstrap.Admin/Views/Home/Index.cshtml index e51031da..0a91e2a4 100644 --- a/Bootstrap.Admin/Views/Home/Index.cshtml +++ b/Bootstrap.Admin/Views/Home/Index.cshtml @@ -1,9 +1,12 @@ -@model Bootstrap.Admin.Models.HeaderBarModel +@model ContentModel @{ - ViewBag.Title = "Rules"; Layout = "~/Views/Shared/_Normal.cshtml"; } +@section javascript { + +} + @section header { @Html.Partial("Header", Model) } -

欢迎使用本系统

+@Html.Partial("Content", Model) \ No newline at end of file diff --git a/Bootstrap.Admin/Views/Shared/Content.cshtml b/Bootstrap.Admin/Views/Shared/Content.cshtml new file mode 100644 index 00000000..5af3f5bf --- /dev/null +++ b/Bootstrap.Admin/Views/Shared/Content.cshtml @@ -0,0 +1,3 @@ +@model ContentModel +

欢迎使用本系统

+ \ No newline at end of file