From f713a8ae1efb8225ef6940ae910c80e1301daed1 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Sun, 20 Nov 2016 20:25:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=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 | 3 +- Bootstrap.Admin/Content/html/DeviceTest.htm | 22 ------- .../Controllers/AdminController.cs | 1 - Bootstrap.Admin/Controllers/HomeController.cs | 9 +++ Bootstrap.Admin/Views/Admin/Mobile.cshtml | 57 +------------------ Bootstrap.Admin/Views/Home/Mobile.cshtml | 18 ++++++ Bootstrap.Admin/Views/Shared/_Mobile.cshtml | 54 ++++++++++++++++++ DatabaseScripts/InitData.sql | 2 +- 8 files changed, 85 insertions(+), 81 deletions(-) delete mode 100644 Bootstrap.Admin/Content/html/DeviceTest.htm create mode 100644 Bootstrap.Admin/Views/Home/Mobile.cshtml create mode 100644 Bootstrap.Admin/Views/Shared/_Mobile.cshtml diff --git a/Bootstrap.Admin/Bootstrap.Admin.csproj b/Bootstrap.Admin/Bootstrap.Admin.csproj index 72def0ff..d757f0d8 100644 --- a/Bootstrap.Admin/Bootstrap.Admin.csproj +++ b/Bootstrap.Admin/Bootstrap.Admin.csproj @@ -194,7 +194,6 @@ - @@ -319,6 +318,8 @@ + + Web.config diff --git a/Bootstrap.Admin/Content/html/DeviceTest.htm b/Bootstrap.Admin/Content/html/DeviceTest.htm deleted file mode 100644 index df416388..00000000 --- a/Bootstrap.Admin/Content/html/DeviceTest.htm +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - diff --git a/Bootstrap.Admin/Controllers/AdminController.cs b/Bootstrap.Admin/Controllers/AdminController.cs index 42025512..a8cd517e 100644 --- a/Bootstrap.Admin/Controllers/AdminController.cs +++ b/Bootstrap.Admin/Controllers/AdminController.cs @@ -140,7 +140,6 @@ namespace Bootstrap.Admin.Controllers /// /// /// - [AllowAnonymous] public ActionResult Mobile() { var v = new NavigatorBarModel("~/Admin/Mobile"); diff --git a/Bootstrap.Admin/Controllers/HomeController.cs b/Bootstrap.Admin/Controllers/HomeController.cs index 7e2be9e7..03ee3874 100644 --- a/Bootstrap.Admin/Controllers/HomeController.cs +++ b/Bootstrap.Admin/Controllers/HomeController.cs @@ -85,5 +85,14 @@ namespace Bootstrap.Admin.Controllers else return View(); } + /// + /// + /// + /// + [AllowAnonymous] + public ActionResult Mobile() + { + return View(); + } } } \ No newline at end of file diff --git a/Bootstrap.Admin/Views/Admin/Mobile.cshtml b/Bootstrap.Admin/Views/Admin/Mobile.cshtml index 6e413823..25d9a3a7 100644 --- a/Bootstrap.Admin/Views/Admin/Mobile.cshtml +++ b/Bootstrap.Admin/Views/Admin/Mobile.cshtml @@ -10,65 +10,10 @@ } } -@section Javascript { - -} @section header { @Html.Partial("Header", Model) } @section navigator { @Html.Partial("Navigator", Model) } -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- - -
-
- - -
+@Html.Partial("_Mobile") \ No newline at end of file diff --git a/Bootstrap.Admin/Views/Home/Mobile.cshtml b/Bootstrap.Admin/Views/Home/Mobile.cshtml new file mode 100644 index 00000000..1666c5ca --- /dev/null +++ b/Bootstrap.Admin/Views/Home/Mobile.cshtml @@ -0,0 +1,18 @@ +@{ + ViewBag.Title = "客户端测试"; + Layout = "~/Views/Shared/_Layout.cshtml"; +} +@section css { + +} +
+ @Html.Partial("_Mobile") +
\ No newline at end of file diff --git a/Bootstrap.Admin/Views/Shared/_Mobile.cshtml b/Bootstrap.Admin/Views/Shared/_Mobile.cshtml new file mode 100644 index 00000000..ba53ac4b --- /dev/null +++ b/Bootstrap.Admin/Views/Shared/_Mobile.cshtml @@ -0,0 +1,54 @@ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + +
+
+ + +
+ diff --git a/DatabaseScripts/InitData.sql b/DatabaseScripts/InitData.sql index ed0a00b0..cdd16bd7 100644 --- a/DatabaseScripts/InitData.sql +++ b/DatabaseScripts/InitData.sql @@ -48,7 +48,7 @@ INSERT [dbo].[Navigations] ([ID], [ParentId], [Name], [Order], [Icon], [Url], [C INSERT [dbo].[Navigations] ([ID], [ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (18, 0, N'工具集合', 160, N'fa fa-gavel', N'#', N'0') INSERT [dbo].[Navigations] ([ID], [ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (19, 18, N'客户端测试', 10, N'fa fa-wrench', N'~/Admin/Mobile', N'0') INSERT [dbo].[Navigations] ([ID], [ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (20, 0, N'工具集合', 20, N'fa fa-gavel', N'#', N'1') -INSERT [dbo].[Navigations] ([ID], [ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (21, 20, N'客户端测试', 10, N'fa fa-wrench', N'../Content/html/DeviceTest.htm', N'1') +INSERT [dbo].[Navigations] ([ID], [ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (21, 20, N'客户端测试', 10, N'fa fa-wrench', N'../Home/Mobile', N'1') SET IDENTITY_INSERT [dbo].[Navigations] OFF DELETE FROM GROUPS WHERE ID = 1