diff --git a/Run.cmd b/Run.cmd index ebebaa713..8b1eadc69 100644 --- 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 \ No newline at end of file +call Run.cmd \ No newline at end of file diff --git a/src/ZKEACMS.WebHost/Properties/launchSettings.json b/src/ZKEACMS.WebHost/Properties/launchSettings.json index 416c80dc3..46f8a5552 100644 --- 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 index ae129fb27..a868455ce 100644 --- 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 \ No newline at end of file diff --git a/src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml b/src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml index d423912aa..7a08b85cf 100644 --- a/src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml +++ b/src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml @@ -14,8 +14,8 @@

或者您还可以使用其它账号登录：


- 返回后台 - 切换账号 + 返回后台 + 切换账号


diff --git a/src/ZKEACMS.WebHost/Views/Error/NotFond.cshtml b/src/ZKEACMS.WebHost/Views/Error/NotFond.cshtml index 5b1621f5e..ec5214f77 100644 --- a/src/ZKEACMS.WebHost/Views/Error/NotFond.cshtml +++ b/src/ZKEACMS.WebHost/Views/Error/NotFond.cshtml @@ -16,7 +16,8 @@

或者您还可以访问其它页面：


- 访问首页 + 首页 + 管理页面


diff --git a/src/ZKEACMS.WebHost/Views/Layout/Index.cshtml b/src/ZKEACMS.WebHost/Views/Layout/Index.cshtml index d8fdacfe2..8cdfac414 100644 --- a/src/ZKEACMS.WebHost/Views/Layout/Index.cshtml +++ b/src/ZKEACMS.WebHost/Views/Layout/Index.cshtml @@ -40,6 +40,10 @@ 添加布局 + + + 说明文档 + } diff --git a/src/ZKEACMS.WebHost/Views/Navigation/Index.cshtml b/src/ZKEACMS.WebHost/Views/Navigation/Index.cshtml index 9360618ce..c8334f111 100644 --- a/src/ZKEACMS.WebHost/Views/Navigation/Index.cshtml +++ b/src/ZKEACMS.WebHost/Views/Navigation/Index.cshtml @@ -30,6 +30,10 @@ 添加导航 + + + 说明文档 + "M" 表示该导航会在手机上显示。右键可创建子导航。 } diff --git a/src/ZKEACMS.WebHost/Views/Page/Edit.cshtml b/src/ZKEACMS.WebHost/Views/Page/Edit.cshtml index 39b9db59a..1ecbc7ddd 100644 --- a/src/ZKEACMS.WebHost/Views/Page/Edit.cshtml +++ b/src/ZKEACMS.WebHost/Views/Page/Edit.cshtml @@ -68,7 +68,7 @@ } - @(pageVersion.PublishDate.HasValue ? pageVersion.PublishDate.Value.ToString("f") : "") + @(pageVersion.PublishDate.HasValue ? pageVersion.PublishDate.Value.ToString("g") : "") @pageVersion.Description diff --git a/src/ZKEACMS.WebHost/Views/Page/Index.cshtml b/src/ZKEACMS.WebHost/Views/Page/Index.cshtml index f5203a8c1..412229aa0 100644 --- a/src/ZKEACMS.WebHost/Views/Page/Index.cshtml +++ b/src/ZKEACMS.WebHost/Views/Page/Index.cshtml @@ -99,6 +99,7 @@

+ 说明文档
diff --git a/src/ZKEACMS.WebHost/Views/Page/PageZones.cshtml b/src/ZKEACMS.WebHost/Views/Page/PageZones.cshtml index 7906719aa..50fd0f0ba 100644 --- a/src/ZKEACMS.WebHost/Views/Page/PageZones.cshtml +++ b/src/ZKEACMS.WebHost/Views/Page/PageZones.cshtml @@ -147,6 +147,7 @@ 发布 } + diff --git a/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml b/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml new file mode 100644 index 000000000..ec5214f77 --- /dev/null +++ b/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml @@ -0,0 +1,32 @@ +@{ + ViewBag.Title = "页面不存在"; + Layout = Layouts.NormalDefault; +} +
+

+

404

+
+
+

页面不存在

+
+
+

看起来您正在尝试访问一个不存在的页面，您可以重新检查一下访问的URL地址是否正确。

+

如果这是您创建的页面，您可以在发布以后，再尝试访问该页面

+
+

或者您还可以访问其它页面：

+
+

+ 首页 + 管理页面 +

+
+
+
+

+ ZKEASOFT. All Rights Reserved, + Powered by ZKEACMS +
Copyright © 2016-@DateTime.Now.Year 许可协议 +

+
+
+ diff --git a/src/ZKEACMS.WebHost/Views/Theme/Index.cshtml b/src/ZKEACMS.WebHost/Views/Theme/Index.cshtml index 6a96cee29..22af7ec4b 100644 --- a/src/ZKEACMS.WebHost/Views/Theme/Index.cshtml +++ b/src/ZKEACMS.WebHost/Views/Theme/Index.cshtml @@ -23,7 +23,7 @@ @if (hostingEnvironment.IsDevelopment()) {
- +
diff --git a/src/ZKEACMS.WebHost/wwwroot/css/admin.css b/src/ZKEACMS.WebHost/wwwroot/css/admin.css index e49260125..aeaa07b3b 100644 --- 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; + } +} diff --git a/src/ZKEACMS.WebHost/wwwroot/css/admin.min.css b/src/ZKEACMS.WebHost/wwwroot/css/admin.min.css index 9e41cfe64..a45071791 100644 --- a/src/ZKEACMS.WebHost/wwwroot/css/admin.min.css +++ b/src/ZKEACMS.WebHost/wwwroot/css/admin.min.css @@ -4,4 +4,4 @@ * 深圳市纸壳软件有限公司 * http://www.zkea.net/licenses */ -body{background:url(../images/dotted.png)}img{max-width:100%}#wrap{height:100%}.tab-content.panel{border-top-color:#fff;border-top-left-radius:0;border-top-right-radius:0}.form-horizontal{padding-left:15px;padding-right:15px}.form-horizontal .control-label{display:block;text-align:right}@media(max-width:1199px){.form-horizontal .control-label{padding-top:0;margin-bottom:7px;text-align:left}}.field-validation-error{top:10px;position:relative;display:block;background:#ca2026;color:#fff;padding:.7rem 1rem;font-size:14px;margin-bottom:10px}.field-validation-error:before{content:" ";display:block;border-top:2px solid transparent;border-left:8px solid transparent;border-right:8px solid transparent;border-bottom:8px solid #ca2026;position:absolute;left:10px;top:-10px}@media(min-width:1440px){.form-horizontal{width:85%}}.input-group .form-control{position:static}.input-group.loading::before{display:block;content:" ";position:absolute;height:2px;bottom:0;left:0;width:0;background:#f00}.input-group.loading.processing::before{width:100%;transition:width 2s}.form-control.required{background-color:#fff0dd}a.badge:hover{background-color:#1f1f1f}.navbar-fixed-left{border-radius:0;position:fixed;left:0;top:50px;width:190px;height:100%;border:0}.navbar-fixed-left .navbar-header,.navbar-fixed-left .navbar-nav,.navbar-fixed-left .navbar-nav>li{float:none}.navbar-fixed-left .navbar-nav{margin:0}.userInfo{background-color:#424242;height:80px}.userInfo>img{height:60px;margin:10px 0 0 10px}.userInfo>strong{color:#e28271;margin-left:10px}.main-container{padding:65px 0 0 190px}#main-body{overflow:auto;padding:0 15px;position:absolute;left:190px;right:0;bottom:0;top:65px}.accordion-inner{background-color:#3d3e43;border:none;padding:5px 0 5px 0;display:none}.accordion-inner a{border-left:2px solid #3d3e43;display:block;padding:2px 0 2px 10px;text-decoration:none;color:#fff}.accordion-group .group{float:right}.accordion-group .group:after{content:""}.accordion-group .active .group:after{content:""}.b_F79999:hover{border-left:2px solid #f79999 !important}.b_C3F7A7:hover{border-left:2px solid #c3f7a7 !important}.b_9FDDF6:hover{border-left:2px solid #9fddf6 !important}.b_F6F1A2:hover{border-left:2px solid #f6f1a2 !important}.b_C1F8A9:hover{border-left:2px solid #c1f8a9 !important}.b_F5C294:hover{border-left:2px solid #f5c294 !important}#main-menu .menu-item.active{background:#eaeaea;color:#000;text-shadow:none}#main-menu .menu-item,#main-menu .group-item{padding:7px 10px;margin:5px 0;border-left:2px solid transparent}.toolBar{padding:6px 15px;background-color:#f7f7f9;border-top:1px solid #e1e1e8;clear:both;margin:15px -15px -15px -15px}#toolBar{padding-bottom:10px;border-bottom:1px solid #ddd;margin-bottom:10px}.input-group .mce-panel{border:1px solid #ccc;border-radius:0}.input-group-addon .glyphicon{cursor:pointer;font-size:13px;margin-left:5px}.input-group-addon .glyphicon:hover{color:#e28271}.popUpToolBar{background-color:#f7f7f9;border-top:1px solid #e1e1e8;width:100%;position:fixed;bottom:0;padding:5px;left:0;z-index:10}.fullRowList{margin:0;padding:1px 0;list-style:none;color:#717171}.fullRowList li{padding:6px;border:1px solid #ddd;border-left:5px solid #008000;margin:5px;background-color:#fff}.fullRowList li.sorting{height:34px;border:1px solid #ededed;border-left:5px solid #e28271}.fullRowList.widgets li{cursor:move}.fullRowList li ul{list-style:none;padding-left:2.2rem}.fullRowList li.actived{border-left:5px solid #e28271;color:#e28271}.fullRowList.droping{background-color:#9fddf6}.fullRowList .glyphicon{font-size:12px}.fullRowList.tags input{border:1px solid #fff;padding:2px 4px}.fullRowList.tags input:hover{border:1px solid #ddd}.fullRowList.tags input:focus{border:1px solid #ddd}.fullRowList.tags input+code{display:none}.fullRowList.tags input:focus+code{display:inline}.fullRowList.ui-sortable li{cursor:move}.input-group-collection{background-color:#fff;border:1px solid #ccc;border-radius:4px;padding-bottom:8px}.input-group-collection .btn.add{margin-top:8px}.input-group-collection .items .item{display:block;position:relative;border-bottom:1px solid #f2f2f2}.input-group-collection .item .form-group{margin:8px 0}.input-group-collection .delete{position:absolute;right:10px;top:10px;color:#f00}.jstree a::after{font-weight:normal;color:#b4b4b4;font-size:11px;line-height:20px}.jstree a[ispublish="false"],.jstree a[publishdate="null"]{color:#008000}.jstree a[ispublish="false"]::after{content:" (已修改"}.jstree a[publishdate="null"]::after{content:" (未发布"}.jstree a[ishomepage="true"],.jstree a[url="~/index"]{font-weight:bold;color:#f00}.form-control[type=checkbox]{width:15px;box-shadow:none;margin:0;padding:0;border-radius:0}.control-label{font-weight:normal}.control-label .glyphicon{cursor:pointer;margin-left:3px}.control-label .glyphicon:hover{color:#f00}.ui-draggable-dragging{z-index:1}.simplePreview .simpleDesign .panel{margin:5px}.simplePreview .panel-relative{position:relative}.simplePreview .panel-toolbar{text-align:center;margin-top:5px;padding:0 0 5px}.simplePreview .simpleDesign>.container{width:auto}.description{font-size:13px}.icon-left{padding-left:70px}.icon-left .icon{margin-left:-70px;font-size:16px}.icon-left .label{float:left;margin:3px 5px 0 0}#section-groups .edit-pragraph{max-height:300px;overflow:hidden;text-overflow:ellipsis}.sort-handle{cursor:n-resize}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0%,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f5f5f5 0%,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#f5f5f5));background-image:linear-gradient(to bottom,#f5f5f5 0%,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff5f5f5',GradientType=0)}.form-group select#ZoneID,.form-group select.select{cursor:pointer}#media-list .edit{width:100%;line-height:normal;margin:0;padding:0}.thumbnail.active{background:#337ab7;color:#fff}#media-list .thumbnail>a.img-link{display:block;height:130px;overflow:hidden}#media-list .thumbnail>a.img-link img{max-height:100%}#media-list .thumbnail .caption{text-align:center;padding:5px 0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:relative}#media-list .thumbnail.status-2 .caption:after{display:block;content:"文件不完整";color:#fff;position:absolute;left:0;top:0;bottom:0;right:0;background:#ca2026;line-height:30px}#media-list .thumbnail .caption .edit{text-align:center}#media-list .thumbnail .close{position:absolute;right:8px;top:-12px;opacity:.7}#media-list .thumbnail .tool{position:absolute;left:20px;bottom:50px;text-shadow:0 0 5px #fff;text-align:left}#media-list .thumbnail .tool a{margin:0 3px;color:#3d3e43}#media-list .thumbnail .close:hover{opacity:1}#media-list .new-folder .close{display:none}.navbar-inverse .navbar-nav>li>a{color:#fff}.navbar-inverse .navbar-nav>li a:hover{background-color:#000}.dataTable{background-color:#fff}.dataTable thead,.dataTable tfoot{background-color:#fff}.dataTable .input-group-addon{cursor:pointer}.dataTable .form-control{font-weight:normal;width:100%}.dataTable .range-search{position:relative}.dataTable .range-search input.max{display:none;position:absolute;left:0;bottom:-100%;width:100%;z-index:2;margin-bottom:-2px}.dataTable .range-search input.max.show{display:block}.dataTable .glyphicon{margin:0 3px}table.table-bordered.dataTable th,table.table-bordered.dataTable td{vertical-align:middle}table.table-bordered.dataTable th,table.table-bordered.dataTable td:first-child{white-space:nowrap}div.dataTables_wrapper div.dataTables_processing{text-indent:-5000px;background:#fff url('../js/EasyPlug/Css/Images/loader.gif') center center no-repeat;width:50px;margin-left:-25px}.tag-selector .panel:last-child{margin-bottom:0}a[ismobile=true]:after{content:" M"} \ No newline at end of file +body{background:url(../images/dotted.png)}img{max-width:100%}#wrap{height:100%}.tab-content.panel{border-top-color:#fff;border-top-left-radius:0;border-top-right-radius:0}.form-horizontal{padding-left:15px;padding-right:15px}.form-horizontal .control-label{display:block;text-align:right}@media(max-width:1199px){.form-horizontal .control-label{padding-top:0;margin-bottom:7px;text-align:left}}.field-validation-error{top:10px;position:relative;display:block;background:#ca2026;color:#fff;padding:.7rem 1rem;font-size:14px;margin-bottom:10px}.field-validation-error:before{content:" ";display:block;border-top:2px solid transparent;border-left:8px solid transparent;border-right:8px solid transparent;border-bottom:8px solid #ca2026;position:absolute;left:10px;top:-10px}@media(min-width:1440px){.form-horizontal{width:85%}}.input-group .form-control{position:static}.input-group.loading::before{display:block;content:" ";position:absolute;height:2px;bottom:0;left:0;width:0;background:#f00}.input-group.loading.processing::before{width:100%;transition:width 2s}.form-control.required{background-color:#fff0dd}a.badge:hover{background-color:#1f1f1f}.navbar-fixed-left{border-radius:0;position:fixed;left:0;top:50px;width:190px;height:100%;border:0}.navbar-fixed-left .navbar-header,.navbar-fixed-left .navbar-nav,.navbar-fixed-left .navbar-nav>li{float:none}.navbar-fixed-left .navbar-nav{margin:0}.userInfo{background-color:#424242;height:80px}.userInfo>img{height:60px;margin:10px 0 0 10px}.userInfo>strong{color:#e28271;margin-left:10px}.main-container{padding:65px 0 0 190px}#main-body{overflow:auto;padding:0 15px;position:absolute;left:190px;right:0;bottom:0;top:65px}.accordion-inner{background-color:#3d3e43;border:none;padding:5px 0 5px 0;display:none}.accordion-inner a{border-left:2px solid #3d3e43;display:block;padding:2px 0 2px 10px;text-decoration:none;color:#fff}.accordion-group .group{float:right}.accordion-group .group:after{content:""}.accordion-group .active .group:after{content:""}.b_F79999:hover{border-left:2px solid #f79999 !important}.b_C3F7A7:hover{border-left:2px solid #c3f7a7 !important}.b_9FDDF6:hover{border-left:2px solid #9fddf6 !important}.b_F6F1A2:hover{border-left:2px solid #f6f1a2 !important}.b_C1F8A9:hover{border-left:2px solid #c1f8a9 !important}.b_F5C294:hover{border-left:2px solid #f5c294 !important}#main-menu .menu-item.active{background:#eaeaea;color:#000;text-shadow:none}#main-menu .menu-item,#main-menu .group-item{padding:7px 10px;margin:5px 0;border-left:2px solid transparent}.toolBar{padding:6px 15px;background-color:#f7f7f9;border-top:1px solid #e1e1e8;clear:both;margin:15px -15px -15px -15px}#toolBar{padding-bottom:10px;border-bottom:1px solid #ddd;margin-bottom:10px}.input-group .mce-panel{border:1px solid #ccc;border-radius:0}.input-group-addon .glyphicon{cursor:pointer;font-size:13px;margin-left:5px}.input-group-addon .glyphicon:hover{color:#e28271}.popUpToolBar{background-color:#f7f7f9;border-top:1px solid #e1e1e8;width:100%;position:fixed;bottom:0;padding:5px;left:0;z-index:10}.fullRowList{margin:0;padding:1px 0;list-style:none;color:#717171}.fullRowList li{padding:6px;border:1px solid #ddd;border-left:5px solid #008000;margin:5px;background-color:#fff}.fullRowList li.sorting{height:34px;border:1px solid #ededed;border-left:5px solid #e28271}.fullRowList.widgets li{cursor:move}.fullRowList li ul{list-style:none;padding-left:2.2rem}.fullRowList li.actived{border-left:5px solid #e28271;color:#e28271}.fullRowList.droping{background-color:#9fddf6}.fullRowList .glyphicon{font-size:12px}.fullRowList.tags input{border:1px solid #fff;padding:2px 4px}.fullRowList.tags input:hover{border:1px solid #ddd}.fullRowList.tags input:focus{border:1px solid #ddd}.fullRowList.tags input+code{display:none}.fullRowList.tags input:focus+code{display:inline}.fullRowList.ui-sortable li{cursor:move}.input-group-collection{background-color:#fff;border:1px solid #ccc;border-radius:4px;padding-bottom:8px}.input-group-collection .btn.add{margin-top:8px}.input-group-collection .items .item{display:block;position:relative;border-bottom:1px solid #f2f2f2}.input-group-collection .item .form-group{margin:8px 0}.input-group-collection .delete{position:absolute;right:10px;top:10px;color:#f00}.jstree a::after{font-weight:normal;color:#b4b4b4;font-size:11px;line-height:20px}.jstree a[ispublish="false"],.jstree a[publishdate="null"]{color:#008000}.jstree a[ispublish="false"]::after{content:" (已修改"}.jstree a[publishdate="null"]::after{content:" (未发布"}.jstree a[ishomepage="true"],.jstree a[url="~/index"]{font-weight:bold;color:#f00}.form-control[type=checkbox]{width:15px;box-shadow:none;margin:0;padding:0;border-radius:0}.control-label{font-weight:normal}.control-label .glyphicon{cursor:pointer;margin-left:3px}.control-label .glyphicon:hover{color:#f00}.ui-draggable-dragging{z-index:1}.simplePreview .simpleDesign .panel{margin:5px}.simplePreview .panel-relative{position:relative}.simplePreview .panel-toolbar{text-align:center;margin-top:5px;padding:0 0 5px}.simplePreview .simpleDesign>.container{width:auto}.description{font-size:13px}.icon-left{padding-left:70px}.icon-left .icon{margin-left:-70px;font-size:16px}.icon-left .label{float:left;margin:3px 5px 0 0}#section-groups .edit-pragraph{max-height:300px;overflow:hidden;text-overflow:ellipsis}.sort-handle{cursor:n-resize}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0%,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f5f5f5 0%,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#f5f5f5));background-image:linear-gradient(to bottom,#f5f5f5 0%,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff5f5f5',GradientType=0)}.form-group select#ZoneID,.form-group select.select{cursor:pointer}#media-list .edit{width:100%;line-height:normal;margin:0;padding:0}.thumbnail.active{background:#337ab7;color:#fff}#media-list .thumbnail>a.img-link{display:block;height:130px;overflow:hidden}#media-list .thumbnail>a.img-link img{max-height:100%}#media-list .thumbnail .caption{text-align:center;padding:5px 0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:relative}#media-list .thumbnail.status-2 .caption:after{display:block;content:"文件不完整";color:#fff;position:absolute;left:0;top:0;bottom:0;right:0;background:#ca2026;line-height:30px}#media-list .thumbnail .caption .edit{text-align:center}#media-list .thumbnail .close{position:absolute;right:8px;top:-12px;opacity:.7}#media-list .thumbnail .tool{position:absolute;left:20px;bottom:50px;text-shadow:0 0 5px #fff;text-align:left}#media-list .thumbnail .tool a{margin:0 3px;color:#3d3e43}#media-list .thumbnail .close:hover{opacity:1}#media-list .new-folder .close{display:none}.navbar-inverse .navbar-nav>li>a{color:#fff}.navbar-inverse .navbar-nav>li a:hover{background-color:#000}.dataTable{background-color:#fff}.dataTable thead,.dataTable tfoot{background-color:#fff}.dataTable .input-group-addon{cursor:pointer}.dataTable .form-control{font-weight:normal;width:100%}.dataTable .range-search{position:relative}.dataTable .range-search input.max{display:none;position:absolute;left:0;bottom:-100%;width:100%;z-index:2;margin-bottom:-2px}.dataTable .range-search input.max.show{display:block}.dataTable .glyphicon{margin:0 3px}table.table-bordered.dataTable th,table.table-bordered.dataTable td{vertical-align:middle}table.table-bordered.dataTable th,table.table-bordered.dataTable td:first-child{white-space:nowrap}div.dataTables_wrapper div.dataTables_processing{text-indent:-5000px;background:#fff url('../js/EasyPlug/Css/Images/loader.gif') center center no-repeat;width:50px;margin-left:-25px}.tag-selector .panel:last-child{margin-bottom:0}a[ismobile=true]:after{content:" M"}a.pack-theme{color:#000}@media(min-width:1200px){.template-list .thumb-item{max-width:180px}} \ No newline at end of file diff --git a/src/ZKEACMS/Controllers/ErrorController.cs b/src/ZKEACMS/Controllers/ErrorController.cs index 452e4ce2e..d50ccbce9 100644 --- a/src/ZKEACMS/Controllers/ErrorController.cs +++ b/src/ZKEACMS/Controllers/ErrorController.cs @@ -10,24 +10,25 @@ public class ErrorController : Controller public ErrorController() { } - public ActionResult Index() + public IActionResult Index() { - Response.StatusCode = 500; - return View(); + var result = View(); + result.StatusCode = 500; + return result; } - public ActionResult NotFond() + public IActionResult NotFond() { - Response.StatusCode = 404; - //Response.TrySkipIisCustomErrors = true; - return View(); + var result = View(); + result.StatusCode = 404; + return result; } - public ActionResult Forbidden() + public IActionResult Forbidden() { - Response.StatusCode = 403; - //Response.TrySkipIisCustomErrors = true; - return View(); + var result = View(); + result.StatusCode = 403; + return result; } } } diff --git a/src/ZKEACMS/Filter/WidgetAttribute.cs b/src/ZKEACMS/Filter/WidgetAttribute.cs index cf2bcd39a..c837287d8 100644 --- a/src/ZKEACMS/Filter/WidgetAttribute.cs +++ b/src/ZKEACMS/Filter/WidgetAttribute.cs @@ -141,7 +141,16 @@ public override void OnActionExecuted(ActionExecutedContext filterContext) { if (!(filterContext.Result is RedirectResult)) { - filterContext.Result = new RedirectResult("~/error/notfond?f=" + filterContext.HttpContext.Request.Path); + var viewResult = filterContext.Result as ViewResult; + if (viewResult != null) + { + viewResult.StatusCode = 404; + viewResult.ViewName = "NotFound"; + } + else + { + filterContext.Result = new RedirectResult("~/error/notfond?f=" + filterContext.HttpContext.Request.Path); + } } } }