mobile navigation

DataBase/Update/2.3/Script.sql

@@ -0,0 +1,27 @@
+IF NOT EXISTS ( SELECT  1
+                FROM    sys.syscolumns
+                WHERE   id = OBJECT_ID(N'Navigation')
+                        AND name = N'IsMobile' )
+    BEGIN
+        ALTER TABLE dbo.Navigation ADD IsMobile BIT NULL;
+    END;
+GO
+IF NOT EXISTS ( SELECT  1
+                FROM    dbo.Language
+                WHERE   LanKey = N'NavigationEntity@IsMobile' )
+    BEGIN
+        INSERT  INTO dbo.Language
+                ( LanKey ,
+                  LanID ,
+                  LanValue ,
+                  Module ,
+                  LanType
+	            )
+        VALUES  ( N'NavigationEntity@IsMobile' ,
+                  2052 ,
+                  N'ÊÖ»úµ¼º½' ,
+                  N'NavigationEntity' ,
+                  N'EntityProperty'  
+	            );
+    END;
+GO

Easy.CMS.Web/Modules/Common/Models/NavigationEntity.cs

@@ -10,7 +10,7 @@ public class NavigationEntity : EditorEntity
     {
         public string ID { get; set; }
         public int? DisplayOrder { get; set; }
-
+        public bool? IsMobile { get; set; }
         public string ParentId { get; set; }
         public string Url { get; set; }
         public bool IsCurrent { get; set; }
@@ -31,6 +31,7 @@ protected override void ViewConfigure()
             ViewConfig(m => m.DisplayOrder).AsHidden();
             ViewConfig(m => m.Title).AsTextBox().Required().Order(1);
             ViewConfig(m => m.Url).AsTextBox().Required().Order(2).AddClass("select").AddProperty("data-url", Urls.SelectPage);
+            ViewConfig(m => m.IsMobile).AsCheckBox();
             ViewConfig(m => m.IsCurrent).AsHidden();
         }
     }

Easy.CMS.Web/Modules/Common/Views/Widget.Navigation.cshtml

@@ -33,6 +33,19 @@
         </ul>
     }
 }
+@helper MobileLi(string parentId = "#")
+{
+    foreach (var item in Model.Navigations.Where(m => m.ParentId == parentId))
+    {
+        if (item.IsMobile ?? false)
+        {
+            <li class="pull-left @(item.IsCurrent ? "active" : "")">
+                @Html.SmartLink(Url.PathContent(item.Url), item.Title)
+            </li>
+        }
+        @MobileLi(item.ID)
+    }
+}
 <div class="navigation">
     <div class="navbar navbar-default @(Model.Widget.IsTopFix?"navbar-fixed-top":"")" role="navigation">
         <div class="@(Model.Widget.CustomerClass??"container")">
@@ -52,15 +65,8 @@
                     </a>
                 }
                 @{
-                    var top = Model.Navigations.Where(m => m.ParentId == "#").Skip(1).Take(2);
                     <ul class="nav navbar-nav nav-mobile visible-xs">
-                        @foreach (var item in top)
-                        {
-                            <li class="pull-left @(item.IsCurrent ? "active" : "")">
-                                @Html.SmartLink(Url.PathContent(item.Url), item.Title)
-                            </li>
-
-                        }
+                       @MobileLi()
                     </ul>
                 }
             </div>

Easy.CMS.Web/Modules/Common/Views/Widget.Video.cshtml

@@ -1,34 +1,33 @@
 @using System.Text.RegularExpressions
 @model Easy.CMS.Common.Models.VideoWidget
 
-@if (Model.Url.IsNotNullAndWhiteSpace())
-{
-    <video controls="controls"
-           name="media"
-           src="@Url.Content(Model.Url)"
-           style="width:@(Model.Width.HasValue?Model.Width+"px":"auto");height:@(Model.Height.HasValue?Model.Height+"px":"auto")">
-        您的浏览器不支持播放该视频
-    </video>
-}
-else if (Model.Code.IsNotNullAndWhiteSpace())
-{
-    if (Model.Width.HasValue)
+<div class="widget-video">
+    @if (Model.Url.IsNotNullAndWhiteSpace())
     {
-        Model.Code = Regex.Replace(Model.Code, @"width=""(\d+)""", "width=\"" + Model.Width + "\"");
-        Model.Code = Regex.Replace(Model.Code, @"width=(\d+)", "width=" + Model.Width);
-        Model.Code = Regex.Replace(Model.Code, @"width:(\d+)", "width:" + Model.Width);
+        <video controls="controls"
+               name="media"
+               src="@Url.Content(Model.Url)"
+               style="width:@(Model.Width.HasValue?Model.Width+"px":"auto");height:@(Model.Height.HasValue?Model.Height+"px":"auto")">
+            您的浏览器不支持播放该视频
+        </video>
     }
-    else
+    else if (Model.Code.IsNotNullAndWhiteSpace())
     {
-        Model.Code = Regex.Replace(Model.Code, @"width=""(\d+)""", "width=\"100%\"");
-        Model.Code = Regex.Replace(Model.Code, @"width=(\d+)", "width=100%");
-        Model.Code = Regex.Replace(Model.Code, @"width:(\d+)", "width:100%");
+        if (Model.Width.HasValue)
+        {
+            Model.Code = Regex.Replace(Model.Code, @"("")?width("")?=("")?(\d+)("")?", "width=\"" + Model.Width.Value + "\"");
+            Model.Code = Regex.Replace(Model.Code, @"("")?width("")?:("")?(\d+)("")?", "width:" + Model.Width);
+        }
+        else
+        {
+            Model.Code = Regex.Replace(Model.Code, @"("")?width("")?=("")?(\d+)("")?", "width=\"100%\"");
+            Model.Code = Regex.Replace(Model.Code, @"width:(\d+)(px|%)", "width:100%");
+        }
+        if (Model.Height.HasValue)
+        {
+            Model.Code = Regex.Replace(Model.Code, @"("")?height("")?=("")?(\d+)("")?", "height=" + Model.Height.Value);
+            Model.Code = Regex.Replace(Model.Code, @"("")?height("")?:("")?(\d+)("")?", "height:" + Model.Height.Value);
+        }
+        @Html.Raw(Model.Code)
     }
-    if (Model.Height.HasValue)
-    {
-        Model.Code = Regex.Replace(Model.Code, @"height=""(\d+)""", "height=\"" + Model.Height + "\"");
-        Model.Code = Regex.Replace(Model.Code, @"height=(\d+)", "height=" + Model.Height);
-        Model.Code = Regex.Replace(Model.Code, @"height:(\d+)", "height:" + Model.Height);
-    }
-    @Html.Raw(Model.Code)
-}
+</div>

Easy.CMS.Web/Themes/Cerulean/css/Navigation.less

@@ -4,12 +4,11 @@
     margin: -@margin-base;
 
     .nav.nav-mobile {
-        margin: 5px auto;
+        margin: 0 auto;
         float: left;
 
         > li > a {
-            padding-left: 10px;
-            padding-right: 10px;
+            padding:15px 10px;
         }
     }
     .navbar {

Easy.CMS.Web/Themes/Cosmo/css/Navigation.less

@@ -4,12 +4,11 @@
     margin: -@margin-base;
 
     .nav.nav-mobile {
-        margin: 5px auto;
+        margin: 0 auto;
         float: left;
 
         > li > a {
-            padding-left: 10px;
-            padding-right: 10px;
+            padding:15px 10px;
         }
     }
     .navbar {

Easy.CMS.Web/Themes/Cyborg/css/Navigation.less

@@ -4,12 +4,11 @@
     margin: -@margin-base;
 
     .nav.nav-mobile {
-        margin: 5px auto;
+        margin: 0 auto;
         float: left;
 
         > li > a {
-            padding-left: 10px;
-            padding-right: 10px;
+            padding:15px 10px;
         }
     }
     .navbar {

Easy.CMS.Web/Themes/Darkly/css/Navigation.less

@@ -4,12 +4,11 @@
     margin: -@margin-base;
 
     .nav.nav-mobile {
-        margin: 5px auto;
+        margin: 0 auto;
         float: left;
 
         > li > a {
-            padding-left: 10px;
-            padding-right: 10px;
+            padding:15px 10px;
         }
     }
     .navbar {

Easy.CMS.Web/Themes/Default/css/Navigation.less

@@ -4,12 +4,11 @@
     margin: -@margin-base;
 
     .nav.nav-mobile {
-        margin: 5px auto;
+        margin: 0 auto;
         float: left;
 
         > li > a {
-            padding-left: 10px;
-            padding-right: 10px;
+            padding:15px 10px;
         }
     }
 

Easy.CMS.Web/Themes/Flatly/css/Navigation.less

@@ -4,12 +4,11 @@
     margin: -@margin-base;
 
     .nav.nav-mobile {
-        margin: 5px auto;
+        margin: 0 auto;
         float: left;
 
         > li > a {
-            padding-left: 10px;
-            padding-right: 10px;
+            padding:15px 10px;
         }
     }
     .navbar {

Easy.CMS.Web/Themes/Journal/css/Navigation.less

@@ -4,12 +4,11 @@
     margin: -@margin-base;
 
     .nav.nav-mobile {
-        margin: 5px auto;
+        margin: 0 auto;
         float: left;
 
         > li > a {
-            padding-left: 10px;
-            padding-right: 10px;
+            padding:15px 10px;
         }
     }
     .navbar {

Easy.CMS.Web/Themes/Lumen/css/Navigation.less

@@ -4,12 +4,11 @@
     margin: -@margin-base;
 
     .nav.nav-mobile {
-        margin: 5px auto;
+        margin: 0 auto;
         float: left;
 
         > li > a {
-            padding-left: 10px;
-            padding-right: 10px;
+            padding:15px 10px;
         }
     }
     .navbar {