diff --git a/src/YangKai.BlogEngine.Web.Mvc.BootStrapper/Task/4.Bundles/BundlesConfig.cs b/src/YangKai.BlogEngine.Web.Mvc.BootStrapper/Task/4.Bundles/BundlesConfig.cs
index fbfe4428..1a1af86f 100644
--- a/src/YangKai.BlogEngine.Web.Mvc.BootStrapper/Task/4.Bundles/BundlesConfig.cs
+++ b/src/YangKai.BlogEngine.Web.Mvc.BootStrapper/Task/4.Bundles/BundlesConfig.cs
@@ -20,8 +20,6 @@ public void Run()
"~/Content/js/buttons.js",
"~/Content/js/md5.js",
"~/Content/js/uuid.js",
- "~/Content/plugin/ckeditor_3.6.1/ckeditor.js",
- "~/Content/plugin/ckfinder_aspnet_2.0.1/ckfinder.js",
"~/Content/plugin/syntaxhighlighter_3.0.83/scripts/shCore.js",
"~/Content/plugin/syntaxhighlighter_3.0.83/scripts/shBrushCSharp.js",
"~/Content/plugin/syntaxhighlighter_3.0.83/scripts/shBrushCss.js",
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/css/style.css b/src/YangKai.BlogEngine.Web.Mvc/Content/css/style.css
index d1741ff2..5ee1ddd0 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/css/style.css
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/css/style.css
@@ -87,6 +87,9 @@ h6,
.bg-color-yellow {
background-color: #ffc40d !important;
}
+.bg-color-pink {
+ background-color: #c3325f !important;
+}
::-moz-selection {
background: #f2dede;
}
@@ -329,8 +332,13 @@ article .date div:last-child {
color: #FFF;
float: left;
}
-.bg-color-pink {
- background-color: #c3325f !important;
+#archives .group > a,
+.group > a:hover {
+ color: #333333;
+}
+#archives ul {
+ padding: 5px;
+ margin-left: 10px;
}
.intro h5 {
margin: 10px 0 10px 0;
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/css/style.less b/src/YangKai.BlogEngine.Web.Mvc/Content/css/style.less
index 053b3e31..16abe1cd 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/css/style.less
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/css/style.less
@@ -25,6 +25,7 @@ line-height:1.4
.bg-color-darken {background-color: #1c1c1c !important;}
.bg-color-orange {background-color: #CD4900 !important;}
.bg-color-yellow {background-color: #ffc40d !important;}
+.bg-color-pink {background-color: #c3325f !important;}
//文章选中颜色
::-moz-selection {background: #f2dede;}
@@ -279,11 +280,11 @@ article {
float: left;
}
}
-.bg-color-pink {
- background-color: #c3325f !important;
-}
+#archives .group >a,.group >a:hover{color:#333}
+#archives ul{ padding: 5px;margin-left: 10px;}
+
.intro {
h5 {
margin: 10px 0 10px 0;
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/css/style.min.css b/src/YangKai.BlogEngine.Web.Mvc/Content/css/style.min.css
index 3a51ea2f..21340b1d 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/css/style.min.css
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/css/style.min.css
@@ -1 +1 @@
-body{padding-top:60px;padding-bottom:20px;font-family:"Microsoft YaHei","微软雅黑",PMingLiU,Verdana,Arial,Helvetica,sans-serif;background:url(/Content/img/bg.png)}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Microsoft YaHei","微软雅黑",PMingLiU,Verdana,Arial,Helvetica,sans-serif;line-height:1.4}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#ccc;margin-top:5px;margin-right:-10px}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.bg-color-purple{background-color:#603cba!important}.bg-color-greenDark{background-color:#008641!important}.bg-color-blue{background-color:#0072bc!important}.bg-color-red{background-color:#bc1c48!important}.bg-color-green{background-color:#01a31c!important}.bg-color-blueDark{background-color:#662d91!important}.bg-color-darken{background-color:#1c1c1c!important}.bg-color-orange{background-color:#cd4900!important}.bg-color-yellow{background-color:#ffc40d!important}::-moz-selection{background:#f2dede}::selection{background:#f2dede}::-webkit-selection{background:#f2dede}.ui-match{background:#ff9632}a:hover{text-decoration:none}a.button:hover{color:#fff}.loading{padding:5px 5px 0 20px;background:url(/Content/img/ajax-loader.gif) 0 3px no-repeat}article{margin-bottom:20px;border-radius:0;padding:0 20px 20px 20px;margin:10px 0;min-height:200px}article .categories a:first-child .tags a:first-child{padding-left:2px}article section{margin-left:85px}article .categories{margin-right:10px}article .thumb{margin:0 15px 0 10px;float:left}article header h2{margin-top:0}article header h2 a{cursor:pointer}article header h2 strong{margin-left:10px;padding-left:5px;font-size:24px;color:#428bca}article header div{margin:-10px 5px 20px 80px;padding-top:3px;border-top:1px solid #27aae2}article header div>span,article header article footer span{margin-right:20px}article li{margin-bottom:25px}article .date{width:70px;height:70px;background-color:#0072bc;color:#fff;float:left;text-align:center;font-weight:bold;font-family:Georgia,Arial,Tahoma,Geneva}article .date div:first-child{font-size:38px;margin-top:2px;height:46px;line-height:46px}article .date div:last-child{margin-top:-3px;font-size:15px;height:18px;line-height:18px}.img-article-thumbnail{width:160px;height:100px}.pagination{margin-bottom:5px}.pagination a{cursor:pointer}.technologies{color:#fff;margin:20px auto}.technologies a{height:130px;width:130px;margin:5px;padding:15px;color:#000;display:block;cursor:pointer;overflow:hidden;text-decoration:none;border:1px solid #ccc}.technologies a p{padding-top:15px;font-size:12px}.technologies a div{text-align:center;display:block}.technologies a div img{width:80px;height:80px}.technologies a.wide{width:270px}.technologies a:hover{outline:3px #225a68 solid}.post-related{line-height:20px;font-size:13px;margin-top:40px}.post-related ul{list-style:none}.post-related ul li{line-height:26px}.post-related ul li a:hover{color:#01a31c}.post-related .title{border-top:6px solid #01a31c;height:1px;margin:20px 0 30px 0;position:relative}.post-related .title span{display:block;height:40px;padding:0 18px;line-height:40px;background:#01a31c;color:#fff;position:absolute;top:-25px;overflow:hidden}.home{text-align:center;margin-top:20px}#cta-content{margin-top:-10px;height:500px;width:100%;background:url('/Content/img/main_bg_tile.jpg') repeat-x transparent 50% 50%;text-align:center;color:#fff}#cta-content h1,#cta-content h2{text-shadow:0 0 10px rgba(0,0,0,.5)}#cta-content .grid-image{width:100%;height:100%;background:url('/Content/img/main_bg_grid_tile.png') repeat transparent}#cta-content .lights{width:100%;height:100%;background:url('/Content/img/main_bg_image.jpg') repeat-x transparent 50% 50%}#cta-content .wrapped-content{padding:150px 0 20px 0;margin:auto}#cta-content h1{letter-spacing:12px;color:#fff;font-size:50px;margin:3px 0}#cta-content h2{font-weight:normal;letter-spacing:1px;margin-top:20px;margin-bottom:40px;font-size:22px}#cta-content h2 p{margin:auto;font-weight:normal;letter-spacing:1px;font-size:12px;padding-top:10px}.post-nav a,.post-nav span{height:35px;display:block;color:#fff;padding:0 20px 0 20px}.post-nav{margin-bottom:15px;letter-spacing:4px;overflow:hidden;display:block;text-align:center;margin-left:16px;position:relative}.post-nav a:hover{background:#0072bc;text-decoration:none}.post-nav li{line-height:35px;height:35px;display:block;margin-right:20px;background:#ccc;color:#fff;float:left}.bg-color-pink{background-color:#c3325f!important}.intro h5{margin:10px 0 10px 0;padding-bottom:10px;border-bottom:5px solid}.intro h5.green{border-color:#008641;color:#008641}.intro h5.red{border-color:#bc1c48;color:#bc1c48}.intro h5.yellow{border-color:#ffc40d;color:#ffc40d}.breadcrumb{padding-left:10px;border-left:#f88fb7 20px solid;border-radius:0}.comment{line-height:20px;font-size:13px;margin-top:40px;position:relative}.comment li:hover .gravatar{border-right-color:#e38383}.comment li:hover .comment-meta a{display:inline}.comment .comment-meta a{display:none;margin-top:5px;color:#ccc}.comment ul{list-style:none}.comment .commentid{font-weight:bold;color:#e38383}.comment .text>span{float:right;padding-right:5px;font-size:13px;color:#ccc}.comment li{margin-bottom:15px;padding-bottom:21px;background:url(/Content/img/postline.png) bottom repeat-x;zoom:1}.comment .nocomment{padding:20px;font-size:20px}.comment .gravatar{float:left;padding-right:20px;border-right:1px solid #d1d9db;margin:0 20px 0 0;border-right-color:#d1d9db}.comment .title{border-top:6px solid #0072bc;height:1px;margin:20px 0 40px 0;position:relative}.comment .title span{display:block;height:40px;padding:0 18px;line-height:40px;background:#0072bc;color:#fff;position:absolute;top:-25px;overflow:hidden}.gravatar img{width:40px;height:40px}.loadingbox{text-align:center;height:24px;line-height:12px;position:absolute;left:50%;top:0;margin-left:-45px;padding:6px 16px 6px 16px;font-weight:bold;font-size:12px;color:#333;background:#f9edbe;border:1px solid #f0c36d;border-radius:5px;z-index:10000}.navbar .search{margin:12px 15px 0 15px;height:28px;padding:4px 20px 4px 8px;font-size:12px;font-weight:normal;width:90px;border:none;-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.4),0 1px 0 rgba(255,255,255,.1);-moz-box-shadow:inset 0 1px 0 rgba(0,0,0,.4),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(0,0,0,.4),0 1px 0 rgba(255,255,255,.1);-webkit-border-radius:12px;-moz-border-radius:12px;border-radius:12px;-webkit-transition:width .7s;-moz-transition:width .7s;transition:width .7s}.navbar .search:focus{width:180px}.navbar .btn-navbar{margin-top:10px}.navbar .navbar-brand{padding:5px 20px 5px}.navbar .navbar-brand img{width:40px;height:40px;margin-right:10px}.container .content{margin:0 auto;color:#666}.container>footer{text-align:center}.container>footer .footer-links{margin-top:10px}.container>footer .footer-links li:first-child{padding-left:0}.container>footer .footer-links li{display:inline;padding:0 2px}.container>footer p{margin-bottom:0;color:#777}.avatar-mini{width:24px;height:24px}.personal-box{padding:15px;width:320px}.personal-box p{color:#666}.personal-box .avatar{width:80px;height:80px}.personal-box .hr{border-bottom:1px solid #bebebe;-moz-box-shadow:0 2px 4px rgba(0,0,0,.12);-o-box-shadow:0 2px 4px rgba(0,0,0,.12);-webkit-box-shadow:0 2px 4px rgba(0,0,0,.12);box-shadow:0 2px 4px rgba(0,0,0,.12);margin-bottom:15px;padding-bottom:15px}table .action{width:20px}.sider{position:relative;padding:45px 15px 15px;margin:0 -15px 15px;background-color:#fafafa;border-color:#e5e5e5 #eee #eee;border-style:solid;border-width:1px 0;margin-left:0;margin-right:0;background-color:#fff;border-width:1px;border-color:#ddd;border-radius:4px 4px 0 0;box-shadow:none}.sider>div:first-child{position:absolute;top:15px;left:15px;font-size:12px;font-weight:bold;color:#bbb;text-transform:uppercase;letter-spacing:1px}.sider.has-error{border-color:#b94a48}.sider.has-error>div:first-child{color:#b94a48}.form-group.has-error span[class*="cke_editor_"]{border-color:#b94a48}@media screen and (max-width:480px){.navbar .navbar-right input{display:block}#cta-content{height:250px}#cta-content h1{font-size:16px}#cta-content h2{font-size:12px}#cta-content .wrapped-content{padding:70px 0 20px 0}}@media screen and (min-width:480px){.navbar .navbar-right input{display:none}#cta-content{height:350px}#cta-content h1{font-size:20px}#cta-content h2{font-size:16px}#cta-content .wrapped-content{padding:120px 0 20px 0}}@media screen and (min-width:768px){.navbar .navbar-right input{display:none}#cta-content{height:500px}#cta-content h1{font-size:30px}#cta-content h2{font-size:18px}#cta-content .wrapped-content{padding:150px 0 20px 0}}@media screen and (min-width:992px){.navbar .navbar-right input{display:none}#cta-content{height:450px}#cta-content h1{font-size:40px}#cta-content h2{font-size:20px}#cta-content .wrapped-content{padding:140px 0 20px 0}}@media screen and (min-width:1200px){.navbar .navbar-right input{display:block}#cta-content{height:500px}#cta-content h1{font-size:50px}#cta-content h2{font-size:22px}#cta-content .wrapped-content{padding:150px 0 20px 0}}
\ No newline at end of file
+body{padding-top:60px;padding-bottom:20px;font-family:"Microsoft YaHei","微软雅黑",PMingLiU,Verdana,Arial,Helvetica,sans-serif;background:url(/Content/img/bg.png)}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Microsoft YaHei","微软雅黑",PMingLiU,Verdana,Arial,Helvetica,sans-serif;line-height:1.4}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#ccc;margin-top:5px;margin-right:-10px}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.bg-color-purple{background-color:#603cba!important}.bg-color-greenDark{background-color:#008641!important}.bg-color-blue{background-color:#0072bc!important}.bg-color-red{background-color:#bc1c48!important}.bg-color-green{background-color:#01a31c!important}.bg-color-blueDark{background-color:#662d91!important}.bg-color-darken{background-color:#1c1c1c!important}.bg-color-orange{background-color:#cd4900!important}.bg-color-yellow{background-color:#ffc40d!important}.bg-color-pink{background-color:#c3325f!important}::-moz-selection{background:#f2dede}::selection{background:#f2dede}::-webkit-selection{background:#f2dede}.ui-match{background:#ff9632}a:hover{text-decoration:none}a.button:hover{color:#fff}.loading{padding:5px 5px 0 20px;background:url(/Content/img/ajax-loader.gif) 0 3px no-repeat}article{margin-bottom:20px;border-radius:0;padding:0 20px 20px 20px;margin:10px 0;min-height:200px}article .categories a:first-child .tags a:first-child{padding-left:2px}article section{margin-left:85px}article .categories{margin-right:10px}article .thumb{margin:0 15px 0 10px;float:left}article header h2{margin-top:0}article header h2 a{cursor:pointer}article header h2 strong{margin-left:10px;padding-left:5px;font-size:24px;color:#428bca}article header div{margin:-10px 5px 20px 80px;padding-top:3px;border-top:1px solid #27aae2}article header div>span,article header article footer span{margin-right:20px}article li{margin-bottom:25px}article .date{width:70px;height:70px;background-color:#0072bc;color:#fff;float:left;text-align:center;font-weight:bold;font-family:Georgia,Arial,Tahoma,Geneva}article .date div:first-child{font-size:38px;margin-top:2px;height:46px;line-height:46px}article .date div:last-child{margin-top:-3px;font-size:15px;height:18px;line-height:18px}.img-article-thumbnail{width:160px;height:100px}.pagination{margin-bottom:5px}.pagination a{cursor:pointer}.technologies{color:#fff;margin:20px auto}.technologies a{height:130px;width:130px;margin:5px;padding:15px;color:#000;display:block;cursor:pointer;overflow:hidden;text-decoration:none;border:1px solid #ccc}.technologies a p{padding-top:15px;font-size:12px}.technologies a div{text-align:center;display:block}.technologies a div img{width:80px;height:80px}.technologies a.wide{width:270px}.technologies a:hover{outline:3px #225a68 solid}.post-related{line-height:20px;font-size:13px;margin-top:40px}.post-related ul{list-style:none}.post-related ul li{line-height:26px}.post-related ul li a:hover{color:#01a31c}.post-related .title{border-top:6px solid #01a31c;height:1px;margin:20px 0 30px 0;position:relative}.post-related .title span{display:block;height:40px;padding:0 18px;line-height:40px;background:#01a31c;color:#fff;position:absolute;top:-25px;overflow:hidden}.home{text-align:center;margin-top:20px}#cta-content{margin-top:-10px;height:500px;width:100%;background:url('/Content/img/main_bg_tile.jpg') repeat-x transparent 50% 50%;text-align:center;color:#fff}#cta-content h1,#cta-content h2{text-shadow:0 0 10px rgba(0,0,0,.5)}#cta-content .grid-image{width:100%;height:100%;background:url('/Content/img/main_bg_grid_tile.png') repeat transparent}#cta-content .lights{width:100%;height:100%;background:url('/Content/img/main_bg_image.jpg') repeat-x transparent 50% 50%}#cta-content .wrapped-content{padding:150px 0 20px 0;margin:auto}#cta-content h1{letter-spacing:12px;color:#fff;font-size:50px;margin:3px 0}#cta-content h2{font-weight:normal;letter-spacing:1px;margin-top:20px;margin-bottom:40px;font-size:22px}#cta-content h2 p{margin:auto;font-weight:normal;letter-spacing:1px;font-size:12px;padding-top:10px}.post-nav a,.post-nav span{height:35px;display:block;color:#fff;padding:0 20px 0 20px}.post-nav{margin-bottom:15px;letter-spacing:4px;overflow:hidden;display:block;text-align:center;margin-left:16px;position:relative}.post-nav a:hover{background:#0072bc;text-decoration:none}.post-nav li{line-height:35px;height:35px;display:block;margin-right:20px;background:#ccc;color:#fff;float:left}#archives .group>a,.group>a:hover{color:#333}#archives ul{padding:5px;margin-left:10px}.intro h5{margin:10px 0 10px 0;padding-bottom:10px;border-bottom:5px solid}.intro h5.green{border-color:#008641;color:#008641}.intro h5.red{border-color:#bc1c48;color:#bc1c48}.intro h5.yellow{border-color:#ffc40d;color:#ffc40d}.breadcrumb{padding-left:10px;border-left:#f88fb7 20px solid;border-radius:0}.comment{line-height:20px;font-size:13px;margin-top:40px;position:relative}.comment li:hover .gravatar{border-right-color:#e38383}.comment li:hover .comment-meta a{display:inline}.comment .comment-meta a{display:none;margin-top:5px;color:#ccc}.comment ul{list-style:none}.comment .commentid{font-weight:bold;color:#e38383}.comment .text>span{float:right;padding-right:5px;font-size:13px;color:#ccc}.comment li{margin-bottom:15px;padding-bottom:21px;background:url(/Content/img/postline.png) bottom repeat-x;zoom:1}.comment .nocomment{padding:20px;font-size:20px}.comment .gravatar{float:left;padding-right:20px;border-right:1px solid #d1d9db;margin:0 20px 0 0;border-right-color:#d1d9db}.comment .title{border-top:6px solid #0072bc;height:1px;margin:20px 0 40px 0;position:relative}.comment .title span{display:block;height:40px;padding:0 18px;line-height:40px;background:#0072bc;color:#fff;position:absolute;top:-25px;overflow:hidden}.gravatar img{width:40px;height:40px}.loadingbox{text-align:center;height:24px;line-height:12px;position:absolute;left:50%;top:0;margin-left:-45px;padding:6px 16px 6px 16px;font-weight:bold;font-size:12px;color:#333;background:#f9edbe;border:1px solid #f0c36d;border-radius:5px;z-index:10000}.navbar .search{margin:12px 15px 0 15px;height:28px;padding:4px 20px 4px 8px;font-size:12px;font-weight:normal;width:90px;border:none;-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,.4),0 1px 0 rgba(255,255,255,.1);-moz-box-shadow:inset 0 1px 0 rgba(0,0,0,.4),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(0,0,0,.4),0 1px 0 rgba(255,255,255,.1);-webkit-border-radius:12px;-moz-border-radius:12px;border-radius:12px;-webkit-transition:width .7s;-moz-transition:width .7s;transition:width .7s}.navbar .search:focus{width:180px}.navbar .btn-navbar{margin-top:10px}.navbar .navbar-brand{padding:5px 20px 5px}.navbar .navbar-brand img{width:40px;height:40px;margin-right:10px}.container .content{margin:0 auto;color:#666}.container>footer{text-align:center}.container>footer .footer-links{margin-top:10px}.container>footer .footer-links li:first-child{padding-left:0}.container>footer .footer-links li{display:inline;padding:0 2px}.container>footer p{margin-bottom:0;color:#777}.avatar-mini{width:24px;height:24px}.personal-box{padding:15px;width:320px}.personal-box p{color:#666}.personal-box .avatar{width:80px;height:80px}.personal-box .hr{border-bottom:1px solid #bebebe;-moz-box-shadow:0 2px 4px rgba(0,0,0,.12);-o-box-shadow:0 2px 4px rgba(0,0,0,.12);-webkit-box-shadow:0 2px 4px rgba(0,0,0,.12);box-shadow:0 2px 4px rgba(0,0,0,.12);margin-bottom:15px;padding-bottom:15px}table .action{width:20px}.sider{position:relative;padding:45px 15px 15px;margin:0 -15px 15px;background-color:#fafafa;border-color:#e5e5e5 #eee #eee;border-style:solid;border-width:1px 0;margin-left:0;margin-right:0;background-color:#fff;border-width:1px;border-color:#ddd;border-radius:4px 4px 0 0;box-shadow:none}.sider>div:first-child{position:absolute;top:15px;left:15px;font-size:12px;font-weight:bold;color:#bbb;text-transform:uppercase;letter-spacing:1px}.sider.has-error{border-color:#b94a48}.sider.has-error>div:first-child{color:#b94a48}.form-group.has-error span[class*="cke_editor_"]{border-color:#b94a48}@media screen and (max-width:480px){.navbar .navbar-right input{display:block}#cta-content{height:250px}#cta-content h1{font-size:16px}#cta-content h2{font-size:12px}#cta-content .wrapped-content{padding:70px 0 20px 0}}@media screen and (min-width:480px){.navbar .navbar-right input{display:none}#cta-content{height:350px}#cta-content h1{font-size:20px}#cta-content h2{font-size:16px}#cta-content .wrapped-content{padding:120px 0 20px 0}}@media screen and (min-width:768px){.navbar .navbar-right input{display:none}#cta-content{height:500px}#cta-content h1{font-size:30px}#cta-content h2{font-size:18px}#cta-content .wrapped-content{padding:150px 0 20px 0}}@media screen and (min-width:992px){.navbar .navbar-right input{display:none}#cta-content{height:450px}#cta-content h1{font-size:40px}#cta-content h2{font-size:20px}#cta-content .wrapped-content{padding:140px 0 20px 0}}@media screen and (min-width:1200px){.navbar .navbar-right input{display:block}#cta-content{height:500px}#cta-content h1{font-size:50px}#cta-content h2{font-size:22px}#cta-content .wrapped-content{padding:150px 0 20px 0}}
\ No newline at end of file
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/app.coffee b/src/YangKai.BlogEngine.Web.Mvc/Content/js/app.coffee
index ae43fdb7..ff033fba 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/app.coffee
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/app.coffee
@@ -4,6 +4,7 @@
'ArticleServices',
'CommentServices',
'UserServices',
+'ChannelServices',
'customDirectives',
'ngProgress',
'ui.utils',
@@ -92,10 +93,10 @@ angular.module("app-admin",['formatFilters',
templateUrl: "/partials/Admin/board/list.html"
controller: BoardController)
#home
- .when("/",
- templateUrl: "/partials/Admin/index.html"
- controller: HomeController)
- .otherwise redirectTo: "/"
+ #.when("/",
+ # templateUrl: "/partials/Admin/index.html"
+ # controller: HomeController)
+ .otherwise redirectTo: "/article"
]
interceptor = ["$rootScope", "$q", (scope, $q) ->
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/app.js b/src/YangKai.BlogEngine.Web.Mvc/Content/js/app.js
index ad6f2e50..24365b94 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/app.js
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/app.js
@@ -1,6 +1,6 @@
var interceptor;
-angular.module("app", ['formatFilters', 'MessageServices', 'ArticleServices', 'CommentServices', 'UserServices', 'customDirectives', 'ngProgress', 'ui.utils', 'ui.bootstrap', 'ngGrid']).config([
+angular.module("app", ['formatFilters', 'MessageServices', 'ArticleServices', 'CommentServices', 'UserServices', 'ChannelServices', 'customDirectives', 'ngProgress', 'ui.utils', 'ui.bootstrap', 'ngGrid']).config([
"$locationProvider", "$routeProvider", "$httpProvider", function($locationProvider, $routeProvider, $httpProvider) {
$httpProvider.responseInterceptors.push(interceptor);
$locationProvider.html5Mode(false).hashPrefix('!');
@@ -64,11 +64,8 @@ angular.module("app-admin", ['formatFilters', 'MessageServices', 'ArticleService
}).when("/board", {
templateUrl: "/partials/Admin/board/list.html",
controller: BoardController
- }).when("/", {
- templateUrl: "/partials/Admin/index.html",
- controller: HomeController
}).otherwise({
- redirectTo: "/"
+ redirectTo: "/article"
});
}
]);
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/app.min.js b/src/YangKai.BlogEngine.Web.Mvc/Content/js/app.min.js
index 296c4777..83501503 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/app.min.js
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/app.min.js
@@ -1 +1 @@
-var interceptor;angular.module("app",["formatFilters","MessageServices","ArticleServices","CommentServices","UserServices","customDirectives","ngProgress","ui.utils","ui.bootstrap","ngGrid"]).config(["$locationProvider","$routeProvider","$httpProvider",function(n,t,i){return i.responseInterceptors.push(interceptor),n.html5Mode(!1).hashPrefix("!"),t.when("/list/:channel/:group/:type/:query",{templateUrl:"/partials/Article/list.html",controller:ArticleListController}).when("/list/:channel/:group",{templateUrl:"/partials/Article/list.html",controller:ArticleListController}).when("/list/:channel",{templateUrl:"/partials/Article/list.html",controller:ArticleListController}).when("/search/:key",{templateUrl:"/partials/Article/list.html",controller:ArticleListController}).when("/post/:url",{templateUrl:"/partials/Article/detail.html",controller:ArticleDetailController}).when("/archives",{templateUrl:"/partials/Article/archives.html",controller:ArchivesController}).when("/board",{templateUrl:"/partials/message.html",controller:MessageController}).when("/about",{templateUrl:"/partials/about.html",controller:AboutController}).when("/",{templateUrl:"/partials/index.html",controller:HomeController}).otherwise({redirectTo:"/"})}]),angular.module("app-login",["UserServices","ui.utils","ui.bootstrap"]),angular.module("app-admin",["formatFilters","MessageServices","ArticleServices","CommentServices","UserServices","ChannelServices","GroupServices","CategoryServices","customDirectives","ngProgress","FileUpload","ui.utils","ui.bootstrap","ngGrid"]).config(["$locationProvider","$routeProvider","$httpProvider",function(n,t,i){return i.responseInterceptors.push(interceptor),n.html5Mode(!1).hashPrefix("!"),t.when("/channel",{templateUrl:"/partials/Admin/channel/list.html",controller:ChannelController}).when("/channel(':channel')/group",{templateUrl:"/partials/Admin/group/list.html",controller:GroupController}).when("/channel(':channel')/group(':group')/category",{templateUrl:"/partials/Admin/category/list.html",controller:CategoryController}).when("/article",{templateUrl:"/partials/Admin/article/list.html",controller:ArticleController}).when("/article(':id')",{templateUrl:"/partials/Admin/article/detail.html",controller:ArticleDetailController}).when("/article/new",{templateUrl:"/partials/Admin/article/detail.html",controller:ArticleDetailController}).when("/board",{templateUrl:"/partials/Admin/board/list.html",controller:BoardController}).when("/",{templateUrl:"/partials/Admin/index.html",controller:HomeController}).otherwise({redirectTo:"/"})}]),interceptor=["$rootScope","$q",function(n,t){var i,r;return r=function(n){return n},i=function(n){var i;return i=n.status,i===401?message.error("401 Unauthorized"):i===400?message.error(n.data["odata.error"].innererror.message):i===500&&message.error(n.data["odata.error"].innererror.message),t.reject(n)},function(n){return n.then(r,i)}}]
\ No newline at end of file
+var interceptor;angular.module("app",["formatFilters","MessageServices","ArticleServices","CommentServices","UserServices","ChannelServices","customDirectives","ngProgress","ui.utils","ui.bootstrap","ngGrid"]).config(["$locationProvider","$routeProvider","$httpProvider",function(n,t,i){return i.responseInterceptors.push(interceptor),n.html5Mode(!1).hashPrefix("!"),t.when("/list/:channel/:group/:type/:query",{templateUrl:"/partials/Article/list.html",controller:ArticleListController}).when("/list/:channel/:group",{templateUrl:"/partials/Article/list.html",controller:ArticleListController}).when("/list/:channel",{templateUrl:"/partials/Article/list.html",controller:ArticleListController}).when("/search/:key",{templateUrl:"/partials/Article/list.html",controller:ArticleListController}).when("/post/:url",{templateUrl:"/partials/Article/detail.html",controller:ArticleDetailController}).when("/archives",{templateUrl:"/partials/Article/archives.html",controller:ArchivesController}).when("/board",{templateUrl:"/partials/message.html",controller:MessageController}).when("/about",{templateUrl:"/partials/about.html",controller:AboutController}).when("/",{templateUrl:"/partials/index.html",controller:HomeController}).otherwise({redirectTo:"/"})}]),angular.module("app-login",["UserServices","ui.utils","ui.bootstrap"]),angular.module("app-admin",["formatFilters","MessageServices","ArticleServices","CommentServices","UserServices","ChannelServices","GroupServices","CategoryServices","customDirectives","ngProgress","FileUpload","ui.utils","ui.bootstrap","ngGrid"]).config(["$locationProvider","$routeProvider","$httpProvider",function(n,t,i){return i.responseInterceptors.push(interceptor),n.html5Mode(!1).hashPrefix("!"),t.when("/channel",{templateUrl:"/partials/Admin/channel/list.html",controller:ChannelController}).when("/channel(':channel')/group",{templateUrl:"/partials/Admin/group/list.html",controller:GroupController}).when("/channel(':channel')/group(':group')/category",{templateUrl:"/partials/Admin/category/list.html",controller:CategoryController}).when("/article",{templateUrl:"/partials/Admin/article/list.html",controller:ArticleController}).when("/article(':id')",{templateUrl:"/partials/Admin/article/detail.html",controller:ArticleDetailController}).when("/article/new",{templateUrl:"/partials/Admin/article/detail.html",controller:ArticleDetailController}).when("/board",{templateUrl:"/partials/Admin/board/list.html",controller:BoardController}).otherwise({redirectTo:"/article"})}]),interceptor=["$rootScope","$q",function(n,t){var i,r;return r=function(n){return n},i=function(n){var i;return i=n.status,i===401?message.error("401 Unauthorized"):i===400?message.error(n.data["odata.error"].innererror.message):i===500&&message.error(n.data["odata.error"].innererror.message),t.reject(n)},function(n){return n.then(r,i)}}]
\ No newline at end of file
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/ArchivesController.coffee b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/ArchivesController.coffee
index 36487aa9..086d1028 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/ArchivesController.coffee
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/ArchivesController.coffee
@@ -1,4 +1,12 @@
-ArchivesController=["$scope","$http", ($scope,$http) ->
+ArchivesController=["$scope","Channel", ($scope,Channel) ->
$scope.$parent.title='Archives'
$scope.$parent.showBanner=false
+
+ $scope.load = ->
+ $scope.loading=true
+ Channel.archives (data)->
+ $scope.list = data
+ $scope.loading=false
+
+ $scope.load()
]
\ No newline at end of file
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/ArchivesController.js b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/ArchivesController.js
index dd56d377..c31ca05e 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/ArchivesController.js
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/ArchivesController.js
@@ -1,8 +1,16 @@
var ArchivesController;
ArchivesController = [
- "$scope", "$http", function($scope, $http) {
+ "$scope", "Channel", function($scope, Channel) {
$scope.$parent.title = 'Archives';
- return $scope.$parent.showBanner = false;
+ $scope.$parent.showBanner = false;
+ $scope.load = function() {
+ $scope.loading = true;
+ return Channel.archives(function(data) {
+ $scope.list = data;
+ return $scope.loading = false;
+ });
+ };
+ return $scope.load();
}
];
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/ArchivesController.min.js b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/ArchivesController.min.js
index 15abde93..288a61eb 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/ArchivesController.min.js
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/ArchivesController.min.js
@@ -1 +1 @@
-var ArchivesController=["$scope","$http",function(n){return n.$parent.title="Archives",n.$parent.showBanner=!1}]
\ No newline at end of file
+var ArchivesController=["$scope","Channel",function(n,t){return n.$parent.title="Archives",n.$parent.showBanner=!1,n.load=function(){return n.loading=!0,t.archives(function(t){return n.list=t,n.loading=!1})},n.load()}]
\ No newline at end of file
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/GlobalController.coffee b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/GlobalController.coffee
index ee3906fe..544f6111 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/GlobalController.coffee
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/GlobalController.coffee
@@ -7,5 +7,6 @@
$scope.User=data
$scope.search = ->
+ debugger
$window.location.href="/#!/search/#{$scope.key}"
]
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/GlobalController.js b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/GlobalController.js
index 4351c3e5..c467b709 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/GlobalController.js
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/GlobalController.js
@@ -11,7 +11,7 @@ GlobalController = [
return $scope.User = data;
});
return $scope.search = function() {
- return $window.location.href = "/#!/search/" + $scope.key;
+ debugger; return $window.location.href = "/#!/search/" + $scope.key;
};
}
];
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/LoginController.coffee b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/LoginController.coffee
index 3241af88..25670669 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/LoginController.coffee
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/LoginController.coffee
@@ -20,7 +20,6 @@
$window.location.href='/admin'
,(error)->
$scope.user.Password=''
- message.error error.data['odata.error'].innererror.message
$scope.submitting=false
$scope.signout = ->
@@ -49,6 +48,5 @@ LoginDialogController=["$scope","$window", "dialog","User",($scope,$window, dial
$window.location.href='/'
,(error)->
$scope.user.Password=''
- message.error error.data['odata.error'].innererror.message
$scope.submitting=false
]
\ No newline at end of file
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/LoginController.js b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/LoginController.js
index 8ee7ae1e..fa1b360c 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/LoginController.js
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/LoginController.js
@@ -23,7 +23,6 @@ LoginController = [
return $window.location.href = '/admin';
}, function(error) {
$scope.user.Password = '';
- message.error(error.data['odata.error'].innererror.message);
return $scope.submitting = false;
});
};
@@ -59,7 +58,6 @@ LoginDialogController = [
return $window.location.href = '/';
}, function(error) {
$scope.user.Password = '';
- message.error(error.data['odata.error'].innererror.message);
return $scope.submitting = false;
});
};
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/LoginController.min.js b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/LoginController.min.js
index d389de28..274ce02c 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/LoginController.min.js
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/controllers/LoginController.min.js
@@ -1 +1 @@
-var LoginController,LoginDialogController;LoginController=["$scope","$window","$dialog","User",function(n,t,i,r){return n.opts={dialogFade:!0,backdropFade:!0,templateUrl:"/partials/admin/login-dialog.html",controller:"LoginDialogController"},n.open=function(){return i.dialog(n.opts).open()},n.close=function(){return n.sgindialog=!1},n.signin=function(){return n.submitting=!0,r.signin({id:"(1)"},n.user,function(){return n.submitting=!1,t.location.href="/admin"},function(t){return n.user.Password="",message.error(t.data["odata.error"].innererror.message),n.submitting=!1})},n.signout=function(){return n.submitting=!0,r.signout({id:"(1)"},function(){return n.submitting=!1,t.location.href="/"})},n.manage=function(){return t.location.href="/admin/"},n.view=function(){return t.location.href="/"}}],LoginDialogController=["$scope","$window","dialog","User",function(n,t,i,r){return n.close=function(n){return i.close(n)},n.signin=function(){return n.submitting=!0,r.signin({id:"(1)"},n.user,function(){return n.submitting=!1,t.location.href="/"},function(t){return n.user.Password="",message.error(t.data["odata.error"].innererror.message),n.submitting=!1})}}]
\ No newline at end of file
+var LoginController,LoginDialogController;LoginController=["$scope","$window","$dialog","User",function(n,t,i,r){return n.opts={dialogFade:!0,backdropFade:!0,templateUrl:"/partials/admin/login-dialog.html",controller:"LoginDialogController"},n.open=function(){return i.dialog(n.opts).open()},n.close=function(){return n.sgindialog=!1},n.signin=function(){return n.submitting=!0,r.signin({id:"(1)"},n.user,function(){return n.submitting=!1,t.location.href="/admin"},function(){return n.user.Password="",n.submitting=!1})},n.signout=function(){return n.submitting=!0,r.signout({id:"(1)"},function(){return n.submitting=!1,t.location.href="/"})},n.manage=function(){return t.location.href="/admin/"},n.view=function(){return t.location.href="/"}}],LoginDialogController=["$scope","$window","dialog","User",function(n,t,i,r){return n.close=function(n){return i.close(n)},n.signin=function(){return n.submitting=!0,r.signin({id:"(1)"},n.user,function(){return n.submitting=!1,t.location.href="/"},function(){return n.user.Password="",n.submitting=!1})}}]
\ No newline at end of file
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/directives/custom/oDataPager.coffee b/src/YangKai.BlogEngine.Web.Mvc/Content/js/directives/custom/oDataPager.coffee
index 99ee039d..0c5ef3ca 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/directives/custom/oDataPager.coffee
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/directives/custom/oDataPager.coffee
@@ -1,4 +1,4 @@
-myDirectives.directive "odataPager", ($compile)->
+myDirectives.directive "odataPager", ['$compile',($compile)->
(scope, element, attrs) ->
data=undefined
@@ -20,4 +20,4 @@
data=value
return if data==null or data==undefined
update()
-
\ No newline at end of file
+]
\ No newline at end of file
diff --git a/src/YangKai.BlogEngine.Web.Mvc/Content/js/directives/custom/oDataPager.js b/src/YangKai.BlogEngine.Web.Mvc/Content/js/directives/custom/oDataPager.js
index b96b7901..bb84c35d 100644
--- a/src/YangKai.BlogEngine.Web.Mvc/Content/js/directives/custom/oDataPager.js
+++ b/src/YangKai.BlogEngine.Web.Mvc/Content/js/directives/custom/oDataPager.js
@@ -1,34 +1,36 @@
-myDirectives.directive("odataPager", function($compile) {
- return function(scope, element, attrs) {
- var data, update;
- data = void 0;
- update = function() {
- if (scope.currentPage === void 0) {
- scope.currentPage = 1;
- }
- if (scope.numData !== data['odata.count'] && scope.numData) {
- scope.currentPage = 1;
- }
- scope.numData = data['odata.count'];
- scope.numPages = Math.ceil(scope.numData / 10);
- element.context.innerHTML = '