video style

SeriaWei · Sep 28, 2016 · 318927f · 318927f
1 parent 014b399
commit 318927f
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 48 deletions.
diff --git a/Easy.CMS.Web/Modules/Common/CommonPlug.cs b/Easy.CMS.Web/Modules/Common/CommonPlug.cs
@@ -10,7 +10,6 @@ namespace Easy.CMS.Common
 {
     public class CommonPlug : PluginBase
     {
-        const string CdnHost = "http://cdn.zkeasoft.com";
         public override IEnumerable<RouteDescriptor> RegistRoute()
         {
             yield return new RouteDescriptor
@@ -162,22 +161,22 @@ public override IEnumerable<AdminMenu> AdminMenu()
 
         protected override void InitScript(Func<string, ResourceHelper> script)
         {
-            script("OWL.Carousel").Include("~/Modules/Common/Scripts/OwlCarousel/owl.carousel.min.js", "~/Modules/Common/Scripts/OwlCarousel/owl.carousel.min.js", CdnHost + "/Modules/Common/Scripts/OwlCarousel/owl.carousel.min.js")
-                .Include("~/Modules/Common/Scripts/Owl.Carousel.js", "~/Modules/Common/Scripts/Owl.Carousel.min.js", CdnHost + "/Modules/Common/Scripts/Owl.Carousel.min.js");
+            script("OWL.Carousel").Include("~/Modules/Common/Scripts/OwlCarousel/owl.carousel.min.js", "~/Modules/Common/Scripts/OwlCarousel/owl.carousel.min.js", Urls.CdnHost + "/Modules/Common/Scripts/OwlCarousel/owl.carousel.min.js")
+                .Include("~/Modules/Common/Scripts/Owl.Carousel.js", "~/Modules/Common/Scripts/Owl.Carousel.min.js", Urls.CdnHost + "/Modules/Common/Scripts/Owl.Carousel.min.js");
 
-            script("LayoutDesign").Include("~/Modules/Common/Scripts/LayoutDesign.js", "~/Modules/Common/Scripts/LayoutDesign.min.js", CdnHost + "/Modules/Common/Scripts/LayoutDesign.min.js");
-            script("PageDesign").Include("~/Modules/Common/Scripts/PageDesign.js", "~/Modules/Common/Scripts/PageDesign.min.js", CdnHost + "/Modules/Common/Scripts/PageDesign.min.js");
+            script("LayoutDesign").Include("~/Modules/Common/Scripts/LayoutDesign.js", "~/Modules/Common/Scripts/LayoutDesign.min.js", Urls.CdnHost + "/Modules/Common/Scripts/LayoutDesign.min.js");
+            script("PageDesign").Include("~/Modules/Common/Scripts/PageDesign.js", "~/Modules/Common/Scripts/PageDesign.min.js", Urls.CdnHost + "/Modules/Common/Scripts/PageDesign.min.js");
         }
 
         protected override void InitStyle(Func<string, ResourceHelper> style)
         {
-            style("Layout").Include("~/Modules/Common/Content/Layout.css", "~/Modules/Common/Content/Layout.min.css", CdnHost + "/Modules/Common/Content/Layout.min.css");
+            style("Layout").Include("~/Modules/Common/Content/Layout.css", "~/Modules/Common/Content/Layout.min.css", Urls.CdnHost + "/Modules/Common/Content/Layout.min.css");
 
-            style("Login").Include("~/Modules/Common/Content/Login.css", "~/Modules/Common/Content/Login.min.css", CdnHost + "/Modules/Common/Content/Login.min.css");
+            style("Login").Include("~/Modules/Common/Content/Login.css", "~/Modules/Common/Content/Login.min.css", Urls.CdnHost + "/Modules/Common/Content/Login.min.css");
 
             style("OWL.Carousel")
-                .Include("~/Modules/Common/Scripts/OwlCarousel/owl.carousel.css", "~/Modules/Common/Scripts/OwlCarousel/owl.carousel.min.css", CdnHost + "/Modules/Common/Scripts/OwlCarousel/owl.carousel.min.css")
-                .Include("~/Modules/Common/Scripts/OwlCarousel/owl.transitions.css", "~/Modules/Common/Scripts/OwlCarousel/owl.transitions.min.css", CdnHost + "/Modules/Common/Scripts/OwlCarousel/owl.transitions.min.css");
+                .Include("~/Modules/Common/Scripts/OwlCarousel/owl.carousel.css", "~/Modules/Common/Scripts/OwlCarousel/owl.carousel.min.css", Urls.CdnHost + "/Modules/Common/Scripts/OwlCarousel/owl.carousel.min.css")
+                .Include("~/Modules/Common/Scripts/OwlCarousel/owl.transitions.css", "~/Modules/Common/Scripts/OwlCarousel/owl.transitions.min.css", Urls.CdnHost + "/Modules/Common/Scripts/OwlCarousel/owl.transitions.min.css");
         }
 
         public override IEnumerable<PermissionDescriptor> RegistPermission()

diff --git a/Easy.CMS.Web/Modules/Section/Content/SectionClient.css b/Easy.CMS.Web/Modules/Section/Content/SectionClient.css
@@ -21,17 +21,21 @@
 
         .video .video-play:hover {
             opacity: 1;
-            background-position:50% 50%;
+            background-position: 50% 50%;
         }
 
 .pop-video {
     height: 100%;
+    overflow: hidden;
 }
 
     .pop-video video,
-    .pop-video embed {
+    .pop-video embed,
+    .pop-video iframe {
         display: block;
         margin: 0 auto;
+        padding: 0;
+        border: none;
         height: 100% !important;
         width: 100% !important;
         max-width: 100%;

diff --git a/Easy.CMS.Web/Modules/Section/Content/SectionClient.min.css b/Easy.CMS.Web/Modules/Section/Content/SectionClient.min.css
@@ -3,4 +3,4 @@
  * Copyright 2016 ZKEASOFT
  * http://www.zkea.net/licenses
  */
-.video{position:relative}.video .video-play{position:absolute;background:url("Images/play-video.png") 50% 52% no-repeat;display:block;width:100%;height:100%;left:0;top:0;opacity:.6;transition:all linear .3s}.video .video-play:hover{opacity:1;background-position:50% 50%}.pop-video{height:100%}.pop-video video,.pop-video embed{display:block;margin:0 auto;height:100% !important;width:100% !important;max-width:100%;max-height:100%}
+.video{position:relative}.video .video-play{position:absolute;background:url("Images/play-video.png") 50% 52% no-repeat;display:block;width:100%;height:100%;left:0;top:0;opacity:.6;transition:all linear .3s}.video .video-play:hover{opacity:1;background-position:50% 50%}.pop-video{height:100%;overflow:hidden}.pop-video video,.pop-video embed,.pop-video iframe{display:block;margin:0 auto;padding:0;border:none;height:100% !important;width:100% !important;max-width:100%;max-height:100%}
diff --git a/Easy.CMS.Web/Modules/Section/SectionPlug.cs b/Easy.CMS.Web/Modules/Section/SectionPlug.cs
@@ -28,13 +28,13 @@ public override IEnumerable<AdminMenu> AdminMenu()
 
         protected override void InitScript(Func<string, ResourceHelper> script)
         {
-            
+
         }
 
         protected override void InitStyle(Func<string, ResourceHelper> style)
         {
-            style("SectionAdmin").Include("~/Modules/Section/Content/Section.css", "~/Modules/Section/Content/Section.min.css");
-            style("Section").Include("~/Modules/Section/Content/SectionClient.css", "~/Modules/Section/Content/SectionClient.min.css");
+            style("SectionAdmin").Include("~/Modules/Section/Content/Section.css", "~/Modules/Section/Content/Section.min.css", Urls.CdnHost + "/Modules/Section/Content/Section.min.css");
+            style("Section").Include("~/Modules/Section/Content/SectionClient.css", "~/Modules/Section/Content/SectionClient.min.css", Urls.CdnHost + "/Modules/Section/Content/SectionClient.min.css");
         }
 
         public override IEnumerable<PermissionDescriptor> RegistPermission()

diff --git a/Easy.CMS.Web/ResourceManager.cs b/Easy.CMS.Web/ResourceManager.cs
@@ -1,12 +1,12 @@
 /* http://www.zkea.net/ Copyright 2016 ZKEASOFT http://www.zkea.net/licenses */
 using System;
 using Easy.Web.Resource;
+using Easy.Web.CMS;
 
-namespace Easy
+namespace Easy.CMS.Web
 {
-    public class ResourceManager : Web.Resource.ResourceManager
+    public class ResourceManager : Easy.Web.Resource.ResourceManager
     {
-        const string CdnHost = "http://cdn.zkeasoft.com";
         protected override void InitScript(Func<string, ResourceHelper> script)
         {
 
@@ -16,38 +16,38 @@ protected override void InitScript(Func<string, ResourceHelper> script)
                 .Include("~/Scripts/jquery-ui/jquery-ui.js", "~/Scripts/jquery-ui/jquery-ui.min.js", "//cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.min.js");
 
             script("Easy")
-                .Include("~/Scripts/EasyPlug/Easy.js", "~/Scripts/EasyPlug/Easy.min.js", CdnHost + "/Scripts/EasyPlug/Easy.min.js").RequiredAtHead();
+                .Include("~/Scripts/EasyPlug/Easy.js", "~/Scripts/EasyPlug/Easy.min.js", Urls.CdnHost + "/Scripts/EasyPlug/Easy.min.js").RequiredAtHead();
 
             script("lightBox")
-                .Include("~/Scripts/lightbox/js/lightbox.js", "~/Scripts/lightbox/js/lightbox.js", CdnHost + "/Scripts/lightbox/js/lightbox.js");
+                .Include("~/Scripts/lightbox/js/lightbox.js", "~/Scripts/lightbox/js/lightbox.js", Urls.CdnHost + "/Scripts/lightbox/js/lightbox.js");
 
             script("validate")
-                .Include("~/Scripts/jquery.validate.js", "~/Scripts/jquery.validate.min.js", CdnHost + "/Scripts/jquery.validate.min.js")
-                .Include("~/Scripts/jquery.validate.unobtrusive.js", "~/Scripts/jquery.validate.unobtrusive.min.js", CdnHost + "/Scripts/jquery.validate.unobtrusive.min.js")
-                .Include("~/Scripts/jquery.unobtrusive-ajax.js", "~/Scripts/jquery.unobtrusive-ajax.min.js", CdnHost + "/Scripts/jquery.unobtrusive-ajax.min.js");
+                .Include("~/Scripts/jquery.validate.js", "~/Scripts/jquery.validate.min.js", Urls.CdnHost + "/Scripts/jquery.validate.min.js")
+                .Include("~/Scripts/jquery.validate.unobtrusive.js", "~/Scripts/jquery.validate.unobtrusive.min.js", Urls.CdnHost + "/Scripts/jquery.validate.unobtrusive.min.js")
+                .Include("~/Scripts/jquery.unobtrusive-ajax.js", "~/Scripts/jquery.unobtrusive-ajax.min.js", Urls.CdnHost + "/Scripts/jquery.unobtrusive-ajax.min.js");
 
             script("jsTree")
-                .Include("~/Scripts/jstree/src/jstree.js", "~/Scripts/jstree/src/jstree.js", CdnHost + "/Scripts/jstree/src/jstree.js")
-                .Include("~/Scripts/jstree/src/jstree.checkbox.js", "~/Scripts/jstree/src/jstree.checkbox.min.js", CdnHost + "/Scripts/jstree/src/jstree.checkbox.min.js")
-                .Include("~/Scripts/jstree/src/jstree.contextmenu.js", "~/Scripts/jstree/src/jstree.contextmenu.min.js", CdnHost + "/Scripts/jstree/src/jstree.contextmenu.min.js")
-                .Include("~/Scripts/jstree/src/jstree.dnd.js", "~/Scripts/jstree/src/jstree.dnd.min.js", CdnHost + "/Scripts/jstree/src/jstree.dnd.min.js")
-                .Include("~/Scripts/jstree/src/jstree.search.js", "~/Scripts/jstree/src/jstree.search.min.js", CdnHost + "/Scripts/jstree/src/jstree.search.min.js")
-                .Include("~/Scripts/jstree/src/jstree.sort.js", "~/Scripts/jstree/src/jstree.sort.min.js", CdnHost + "/Scripts/jstree/src/jstree.sort.min.js")
-                .Include("~/Scripts/jstree/src/jstree.state.js", "~/Scripts/jstree/src/jstree.state.min.js", CdnHost + "/Scripts/jstree/src/jstree.state.min.js")
-                .Include("~/Scripts/jstree/src/jstree.types.js", "~/Scripts/jstree/src/jstree.types.min.js", CdnHost + "/Scripts/jstree/src/jstree.types.min.js")
-                .Include("~/Scripts/jstree/src/jstree.unique.js", "~/Scripts/jstree/src/jstree.unique.min.js", CdnHost + "/Scripts/jstree/src/jstree.unique.min.js")
-                .Include("~/Scripts/jstree/src/jstree.wholerow.js", "~/Scripts/jstree/src/jstree.wholerow.min.js", CdnHost + "/Scripts/jstree/src/jstree.wholerow.min.js");
+                .Include("~/Scripts/jstree/src/jstree.js", "~/Scripts/jstree/src/jstree.js", Urls.CdnHost + "/Scripts/jstree/src/jstree.js")
+                .Include("~/Scripts/jstree/src/jstree.checkbox.js", "~/Scripts/jstree/src/jstree.checkbox.min.js", Urls.CdnHost + "/Scripts/jstree/src/jstree.checkbox.min.js")
+                .Include("~/Scripts/jstree/src/jstree.contextmenu.js", "~/Scripts/jstree/src/jstree.contextmenu.min.js", Urls.CdnHost + "/Scripts/jstree/src/jstree.contextmenu.min.js")
+                .Include("~/Scripts/jstree/src/jstree.dnd.js", "~/Scripts/jstree/src/jstree.dnd.min.js", Urls.CdnHost + "/Scripts/jstree/src/jstree.dnd.min.js")
+                .Include("~/Scripts/jstree/src/jstree.search.js", "~/Scripts/jstree/src/jstree.search.min.js", Urls.CdnHost + "/Scripts/jstree/src/jstree.search.min.js")
+                .Include("~/Scripts/jstree/src/jstree.sort.js", "~/Scripts/jstree/src/jstree.sort.min.js", Urls.CdnHost + "/Scripts/jstree/src/jstree.sort.min.js")
+                .Include("~/Scripts/jstree/src/jstree.state.js", "~/Scripts/jstree/src/jstree.state.min.js", Urls.CdnHost + "/Scripts/jstree/src/jstree.state.min.js")
+                .Include("~/Scripts/jstree/src/jstree.types.js", "~/Scripts/jstree/src/jstree.types.min.js", Urls.CdnHost + "/Scripts/jstree/src/jstree.types.min.js")
+                .Include("~/Scripts/jstree/src/jstree.unique.js", "~/Scripts/jstree/src/jstree.unique.min.js", Urls.CdnHost + "/Scripts/jstree/src/jstree.unique.min.js")
+                .Include("~/Scripts/jstree/src/jstree.wholerow.js", "~/Scripts/jstree/src/jstree.wholerow.min.js", Urls.CdnHost + "/Scripts/jstree/src/jstree.wholerow.min.js");
 
 
             script("admin")
-                .Include("~/Content/themes/Admin/script/admin.js", "~/Content/themes/Admin/script/admin.min.js", CdnHost + "/Content/themes/Admin/script/admin.min.js")
-                .Include("~/Scripts/EasyPlug/Easy.Grid.js", "~/Scripts/EasyPlug/Easy.Grid.min.js", CdnHost + "/Scripts/EasyPlug/Easy.Grid.min.js")
+                .Include("~/Content/themes/Admin/script/admin.js", "~/Content/themes/Admin/script/admin.min.js", Urls.CdnHost + "/Content/themes/Admin/script/admin.min.js")
+                .Include("~/Scripts/EasyPlug/Easy.Grid.js", "~/Scripts/EasyPlug/Easy.Grid.min.js", Urls.CdnHost + "/Scripts/EasyPlug/Easy.Grid.min.js")
                 .Include("~/Scripts/tinymce/tinymce.min.js", "~/Scripts/tinymce/tinymce.min.js")
-                .Include("~/Scripts/CryptoJS/components/core.js", "~/Scripts/CryptoJS/components/core-min.js", CdnHost + "/Scripts/CryptoJS/components/core-min.js")
-                .Include("~/Scripts/CryptoJS/components/enc-base64.js", "~/Scripts/CryptoJS/components/enc-base64-min.js", CdnHost + "/Scripts/CryptoJS/components/enc-base64-min.js")
+                .Include("~/Scripts/CryptoJS/components/core.js", "~/Scripts/CryptoJS/components/core-min.js", Urls.CdnHost + "/Scripts/CryptoJS/components/core-min.js")
+                .Include("~/Scripts/CryptoJS/components/enc-base64.js", "~/Scripts/CryptoJS/components/enc-base64-min.js", Urls.CdnHost + "/Scripts/CryptoJS/components/enc-base64-min.js")
                 .Include("~/Scripts/Statistics.js")
-                .Include("~/Scripts/bootstrap-datetimepicker/moment-with-locales.js", "~/Scripts/bootstrap-datetimepicker/moment-with-locales.min.js", CdnHost + "/Scripts/bootstrap-datetimepicker/moment-with-locales.min.js")
-                .Include("~/Scripts/bootstrap-datetimepicker/bootstrap-datetimepicker.js", "~/Scripts/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js", CdnHost + "/Scripts/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js");
+                .Include("~/Scripts/bootstrap-datetimepicker/moment-with-locales.js", "~/Scripts/bootstrap-datetimepicker/moment-with-locales.min.js", Urls.CdnHost + "/Scripts/bootstrap-datetimepicker/moment-with-locales.min.js")
+                .Include("~/Scripts/bootstrap-datetimepicker/bootstrap-datetimepicker.js", "~/Scripts/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js", Urls.CdnHost + "/Scripts/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js");
 
         }
 
@@ -57,24 +57,24 @@ protected override void InitStyle(Func<string, ResourceHelper> style)
                 .Include("~/Content/bootstrap/css/bootstrap.css", "~/Content/bootstrap/css/bootstrap.min.css", "//cdn.bootcss.com/bootstrap/3.3.6/css/bootstrap.css")
                 .Include("~/Content/bootstrap/css/bootstrap-theme.css", "~/Content/bootstrap/css/bootstrap-theme.min.css", "//cdn.bootcss.com/bootstrap/3.3.6/css/bootstrap-theme.min.css");
 
-            style("Site").Include("~/Content/Site.css", "~/Content/Site.min.css", CdnHost + "/Content/Site.min.css").RequiredAtFoot();
+            style("Site").Include("~/Content/Site.css", "~/Content/Site.min.css", Urls.CdnHost + "/Content/Site.min.css").RequiredAtFoot();
             style("jQueryUi")
                 .Include("~/Scripts/jquery-ui/jquery-ui.css", "~/Scripts/jquery-ui/jquery-ui.min.css", "//cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.min.css")
                 .Include("~/Scripts/jquery-ui/jquery-ui.theme.css", "~/Scripts/jquery-ui/jquery-ui.theme.min.css", "//cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.theme.min.css")
                 .Include("~/Scripts/jquery-ui/jquery-ui.structure.css", "~/Scripts/jquery-ui/jquery-ui.structure.css", "//cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.structure.min.css");
             style("Easy")
-                .Include("~/Scripts/EasyPlug/Css/Easy.css", "~/Scripts/EasyPlug/Css/Easy.min.css", CdnHost + "/Scripts/EasyPlug/Css/Easy.min.css");
+                .Include("~/Scripts/EasyPlug/Css/Easy.css", "~/Scripts/EasyPlug/Css/Easy.min.css", Urls.CdnHost + "/Scripts/EasyPlug/Css/Easy.min.css");
 
             style("lightBox")
-               .Include("~/Scripts/lightbox/css/lightbox.css", "~/Scripts/lightbox/css/lightbox.min.css", CdnHost + "/Scripts/lightbox/css/lightbox.min.css");
+               .Include("~/Scripts/lightbox/css/lightbox.css", "~/Scripts/lightbox/css/lightbox.min.css", Urls.CdnHost + "/Scripts/lightbox/css/lightbox.min.css");
 
             style("admin")
-                .Include("~/Content/themes/Admin/admin.css", "~/Content/themes/Admin/admin.min.css", CdnHost + "/Content/themes/Admin/admin.min.css")
-                .Include("~/Scripts/EasyPlug/Css/Easy.css", "~/Scripts/EasyPlug/Css/Easy.min.css", CdnHost + "/Scripts/EasyPlug/Css/Easy.min.css")
-                .Include("~/Scripts/EasyPlug/Css/Easy.Grid.css", "~/Scripts/EasyPlug/Css/Easy.Grid.min.css", CdnHost + "/Scripts/EasyPlug/Css/Easy.Grid.min.css")
-                .Include("~/Scripts/EasyPlug/Css/Easy.UI.css", "~/Scripts/EasyPlug/Css/Easy.UI.min.css", CdnHost + "/Scripts/EasyPlug/Css/Easy.UI.min.css")
-                .Include("~/Scripts/jstree/src/themes/default/style.css", "~/Scripts/jstree/src/themes/default/style.min.css", CdnHost + "/Scripts/jstree/src/themes/default/style.min.css")
-                .Include("~/Scripts/bootstrap-datetimepicker/bootstrap-datetimepicker.css", "~/Scripts/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css", CdnHost + "/Scripts/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css");
+                .Include("~/Content/themes/Admin/admin.css", "~/Content/themes/Admin/admin.min.css", Urls.CdnHost + "/Content/themes/Admin/admin.min.css")
+                .Include("~/Scripts/EasyPlug/Css/Easy.css", "~/Scripts/EasyPlug/Css/Easy.min.css", Urls.CdnHost + "/Scripts/EasyPlug/Css/Easy.min.css")
+                .Include("~/Scripts/EasyPlug/Css/Easy.Grid.css", "~/Scripts/EasyPlug/Css/Easy.Grid.min.css", Urls.CdnHost + "/Scripts/EasyPlug/Css/Easy.Grid.min.css")
+                .Include("~/Scripts/EasyPlug/Css/Easy.UI.css", "~/Scripts/EasyPlug/Css/Easy.UI.min.css", Urls.CdnHost + "/Scripts/EasyPlug/Css/Easy.UI.min.css")
+                .Include("~/Scripts/jstree/src/themes/default/style.css", "~/Scripts/jstree/src/themes/default/style.min.css", Urls.CdnHost + "/Scripts/jstree/src/themes/default/style.min.css")
+                .Include("~/Scripts/bootstrap-datetimepicker/bootstrap-datetimepicker.css", "~/Scripts/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css", Urls.CdnHost + "/Scripts/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css");
         }
     }
 }
diff --git a/EasyFrameWork.CMS/Constant.cs b/EasyFrameWork.CMS/Constant.cs
@@ -27,6 +27,7 @@ public class CacheTrigger
 
     public class Urls
     {
+        public const string CdnHost = "http://cdn.zkeasoft.com";
         public const string SelectPage = "/admin/page/select";
         public const string SelectMedia = "/admin/Media/Select";
         public const string StyleEditor = "/Modules/Common/Scripts/StyleEditor/index.html";