统一端口5000

404 页面不跳转显示加入文档链接
SeriaWei · Jan 18, 2018 · 83f17c1 · 83f17c1
1 parent b787b5e
commit 83f17c1
Show file tree

Hide file tree

Showing 16 changed files with 84 additions and 23 deletions.
diff --git a/Run.cmd b/Run.cmd
@@ -6,12 +6,9 @@ ECHO dotnet core sdk was not find, please install the latest sdk at first.
 start https://www.microsoft.com/net/download/windows
 exit
 )
-echo ASPNETCORE_ENVIRONMENT=Development
-set ASPNETCORE_ENVIRONMENT=Development
-
 if not exist "src/ZKEACMS.WebHost/bin/Debug/netcoreapp2.0/ZKEACMS.WebHost.dll" (
 call Build.cmd
 )
 
 cd src/ZKEACMS.WebHost
-dotnet bin/Debug/netcoreapp2.0/ZKEACMS.WebHost.dll
+call Run.cmd
diff --git a/src/ZKEACMS.WebHost/Properties/launchSettings.json b/src/ZKEACMS.WebHost/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:3705/",
+      "applicationUrl": "http://localhost:5000/",
       "sslPort": 0
     }
   },
@@ -20,6 +20,7 @@
       "launchBrowser": true,
       "launchUrl": "http://localhost:5000",
       "environmentVariables": {
+        "ASPNETCORE_URLS": "http://localhost:5000",
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }

diff --git a/src/ZKEACMS.WebHost/Run.cmd b/src/ZKEACMS.WebHost/Run.cmd
@@ -1,4 +1,6 @@
 @echo off
 echo ASPNETCORE_ENVIRONMENT=Development
+echo ASPNETCORE_URLS=http://localhost:5000
 set ASPNETCORE_ENVIRONMENT=Development
+set ASPNETCORE_URLS=http://localhost:5000
 dotnet bin/Debug/netcoreapp2.0/ZKEACMS.WebHost.dll
diff --git a/src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml b/src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml
@@ -14,8 +14,8 @@
     <p class="text-muted">或者您还可以使用其它账号登录：</p>
     <br />
     <p>
-        <a href="@Url.Action("Index","Dashboard")" class="btn btn-info">返回后台</a>
-        <a href="@Url.Action("Login","Account")" class="btn btn-info">切换账号</a>
+        <a href="@Url.Action("Index","Dashboard")" class="btn btn-primary">返回后台</a>
+        <a href="@Url.Action("Login","Account")" class="btn btn-primary">切换账号</a>
     </p>
     <br />
     <hr />

diff --git a/src/ZKEACMS.WebHost/Views/Error/NotFond.cshtml b/src/ZKEACMS.WebHost/Views/Error/NotFond.cshtml
@@ -16,7 +16,8 @@
     <p class="text-muted">或者您还可以访问其它页面：</p>
     <br />
     <p>
-        <a href="~/" class="btn btn-info">访问首页</a>
+        <a href="~/" class="btn btn-primary">首页</a>
+        <a href="@Url.Action("Index","Page")" class="btn btn-primary">管理页面</a>
     </p>
     <br />
     <hr />

diff --git a/src/ZKEACMS.WebHost/Views/Layout/Index.cshtml b/src/ZKEACMS.WebHost/Views/Layout/Index.cshtml
@@ -40,6 +40,10 @@
                 <i class="glyphicon glyphicon-plus"></i>
                 添加布局
             </a>
+            <a href="http://www.zkea.net/zkeacms/document/layout" class="btn btn-link btn-xs" target="_blank">
+                <i class="glyphicon glyphicon-question-sign"></i>
+                说明文档
+            </a>
         </div>
     }
 

diff --git a/src/ZKEACMS.WebHost/Views/Navigation/Index.cshtml b/src/ZKEACMS.WebHost/Views/Navigation/Index.cshtml
@@ -30,6 +30,10 @@
                 <i class="glyphicon glyphicon-plus"></i>
                 添加导航
             </a>
+            <a href="http://www.zkea.net/zkeacms/document/navigationwidget" class="btn btn-link btn-xs" target="_blank">
+                <i class="glyphicon glyphicon-question-sign"></i>
+                说明文档
+            </a>
             <small class="text-muted">"M" 表示该导航会在手机上显示。<strong>右键</strong>可创建子导航。</small>
         </div>
     }

diff --git a/src/ZKEACMS.WebHost/Views/Page/Edit.cshtml b/src/ZKEACMS.WebHost/Views/Page/Edit.cshtml
@@ -68,7 +68,7 @@
                                 }
                             </td>
                             <td>
-                                @(pageVersion.PublishDate.HasValue ? pageVersion.PublishDate.Value.ToString("f") : "")
+                                @(pageVersion.PublishDate.HasValue ? pageVersion.PublishDate.Value.ToString("g") : "")
                             </td>
                             <td>
                                 @pageVersion.Description

diff --git a/src/ZKEACMS.WebHost/Views/Page/Index.cshtml b/src/ZKEACMS.WebHost/Views/Page/Index.cshtml
@@ -99,6 +99,7 @@
                 </p>
             </div>
             <div class="modal-footer">
+                <a href="http://www.zkea.net/zkeacms/document/managepage" class="btn btn-primary" target="_blank">说明文档</a>
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
             </div>
         </div><!-- /.modal-content -->

diff --git a/src/ZKEACMS.WebHost/Views/Page/PageZones.cshtml b/src/ZKEACMS.WebHost/Views/Page/PageZones.cshtml
@@ -147,6 +147,7 @@
                     发布
                 </a>
             }
+
         </div>
     </div>
 </div>

diff --git a/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml b/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml
@@ -0,0 +1,32 @@
+@{
+    ViewBag.Title = "页面不存在";
+    Layout = Layouts.NormalDefault;
+}
+<div class="page-header" style="text-align: center;">
+    <br /><br />
+    <h1 style="font-size: 6em" class="text-danger">404</h1>
+</div>
+<div style="text-align:center">
+    <h2>页面不存在</h2>
+    <br />
+    <br />
+    <p>看起来您正在尝试访问一个不存在的页面，您可以重新检查一下访问的URL地址是否正确。</p>
+    <p>如果这是您创建的页面，您可以在<strong>发布</strong>以后，再尝试访问该页面</p>
+    <br />
+    <p class="text-muted">或者您还可以访问其它页面：</p>
+    <br />
+    <p>
+        <a href="~/" class="btn btn-primary">首页</a>
+        <a href="@Url.Action("Index","Page")" class="btn btn-primary">管理页面</a>
+    </p>
+    <br />
+    <hr />
+    <div>
+        <p>
+            <a href="http://www.zkea.net" target="_blank" title="深圳市纸壳软件科技有限公司">ZKEASOFT</a>. All Rights Reserved,
+            Powered by <a href="http://www.zkea.net/zkeacms/zkeacmscore" target="_blank">ZKEACMS</a>
+            <br />Copyright © 2016-@DateTime.Now.Year <a href="http://www.zkea.net/licenses" target="_blank">许可协议</a>
+        </p>
+    </div>
+</div>
+
diff --git a/src/ZKEACMS.WebHost/Views/Theme/Index.cshtml b/src/ZKEACMS.WebHost/Views/Theme/Index.cshtml
@@ -23,7 +23,7 @@
                                 @if (hostingEnvironment.IsDevelopment())
                                 {
                                     <div class="pull-right">
-                                        <a class="download" href="@Url.Action("ThemePackage", new {id = item.ID})" title="打包">
+                                        <a class="download pack-theme" href="@Url.Action("ThemePackage", new {id = item.ID})" title="打包">
                                             <i class="glyphicon glyphicon-download-alt"></i>
                                         </a>
                                     </div>

diff --git a/src/ZKEACMS.WebHost/wwwroot/css/admin.css b/src/ZKEACMS.WebHost/wwwroot/css/admin.css
@@ -620,3 +620,11 @@ div.dataTables_wrapper div.dataTables_processing {
 a[ismobile=true]:after {
     content: " M"
 }
+a.pack-theme{
+    color:#000;
+}
+@media (min-width: 1200px) {
+    .template-list .thumb-item {
+        max-width: 180px;
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,7 +68,7 @@ @@
                                     }
                                 </td>
                                 <td>
-                                    @(pageVersion.PublishDate.HasValue ? pageVersion.PublishDate.Value.ToString("f") : "")
+                                    @(pageVersion.PublishDate.HasValue ? pageVersion.PublishDate.Value.ToString("g") : "")
                                 </td>
                                 <td>
                                     @pageVersion.Description
@@ Expand Down @@