diff --git a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/Views/Shared/LinksRenderPartial.cshtml b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/Views/Shared/LinksRenderPartial.cshtml index 09f82a5ac..f28c71940 100644 --- a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/Views/Shared/LinksRenderPartial.cshtml +++ b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/Views/Shared/LinksRenderPartial.cshtml @@ -4,38 +4,48 @@ @using cloudscribe.SimpleContent.ContentTemplates.ViewModels @inject IStringLocalizer sr @inject ILinkListOptionsProvider optionsProvider +@inject IOptions iconClassesAccessor + @{ - + var icons = iconClassesAccessor.Value; var sorted = Model.Items.OrderBy(x => x.Sort).ToList(); var options = await optionsProvider.ResolveLinkListOptions(Context.Request.Host.Host, Context.Request.Path); var imageStyle = "height:" + options.ImageRenderMaxHeight.ToString() + "px;"; } @functions { -public string GetTarget(ListItemModel item) -{ - if (item.OpensInNewWindow) { return "_blank"; } - return null; -} + public string GetTarget(ListItemModel item) + { + if (item.OpensInNewWindow) { return "_blank"; } + return null; + } }
@Html.Raw(Model.ContentAbove)
-
+
    @for (int i = 0; i < Model.Items.Count; i++) { -
    -

    @sorted[i].Title

    - - @if (!string.IsNullOrWhiteSpace(sorted[i].ResizedUrl)) - { - - @sorted[i].AltText - - } -

    @sorted[i].Description

    -
    +
  • +
    +

    @sorted[i].Title + @if (GetTarget(sorted[i]) == "_blank") + { + + } +

    +
    +
    + @if (!string.IsNullOrWhiteSpace(sorted[i].ResizedUrl)) + { + + @sorted[i].AltText + + } +

    @sorted[i].Description

    +
    +
    • } -
+
@Html.Raw(Model.ContentBelow)
\ No newline at end of file diff --git a/src/cloudscribe.SimpleContent.Web/Design/IconCssClasses.cs b/src/cloudscribe.SimpleContent.Web/Design/IconCssClasses.cs index 2af4d401c..f7d7a2b57 100644 --- a/src/cloudscribe.SimpleContent.Web/Design/IconCssClasses.cs +++ b/src/cloudscribe.SimpleContent.Web/Design/IconCssClasses.cs @@ -25,8 +25,6 @@ public class IconCssClasses public string Home { get; set; } = "glyphicons glyphicons-home"; - //public string HideEditToolbar { get; set; } = "glyphicon glyphicon-chevron-right"; - public string ShowEditToolbar { get; set; } = "glyphicon glyphicon-pencil"; public string NewItem { get; set; } = "glyphicon glyphicon-plus"; @@ -44,37 +42,6 @@ public class IconCssClasses public string Unpublish { get; set; } = "glyphicon glyphicon-eye-close"; public string RelatedPosts { get; set; } = "far fa-hand-point-right"; //"fas fa-asterisk"; - - // - - - - // public string JustifyLeft { get; set; } = "glyphicon glyphicon-align-left"; - - //public string JustifyCenter { get; set; } = "glyphicon glyphicon-align-center"; - - //public string JustifyRight { get; set; } = "glyphicon glyphicon-align-right"; - - //public string JustifyFull { get; set; } = "glyphicon glyphicon-align-justify"; - - //public string UnorderedList { get; set; } = "glyphicon glyphicon-list"; - - //public string OrderedList { get; set; } = "glyphicon glyphicon-th-list"; - - //public string Outdent { get; set; } = "glyphicon glyphicon-indent-left"; - - //public string Indent { get; set; } = "glyphicon glyphicon-indent-right"; - - //public string Hyperlink { get; set; } = "glyphicon glyphicon-globe"; - - //public string RemoveHyperlink { get; set; } = "glyphicon glyphicon-remove"; - - //public string InsertImage { get; set; } = "glyphicon glyphicon-picture"; - - //public string ToggleSource { get; set; } = "glyphicon glyphicon-eye-open"; - - //public string ClearAllFormatting { get; set; } = "glyphicon glyphicon-fire"; - - + public string OpenInNewWindow { get; set; } = "fas fa-external-link-alt"; } } diff --git a/src/sourceDev.WebApp/appsettings.json b/src/sourceDev.WebApp/appsettings.json index c7401db26..e5c13752d 100644 --- a/src/sourceDev.WebApp/appsettings.json +++ b/src/sourceDev.WebApp/appsettings.json @@ -165,7 +165,7 @@ "SimpleContentIconConfig": { "DefaultSetId": "fontawesome5x", "IconSets": [ - { + { "SetId": "fontawesome4x", "Previous": "fa fa-backward", "Next": "fa fa-forward", @@ -185,10 +185,10 @@ "SortAlpha": "fa fa-sort-alpha-asc", "Edit": "fa-pencil-square-o", "View": "fa fa-eye", - "Delete": "fa fa-trash-o" - - }, - { + "Delete": "fa fa-trash-o", + "OpenInNewWindow": "fa fa-external-link" + }, + { "SetId": "fontawesome5x", "Previous": "fas fa-backward", "Next": "fas fa-forward", @@ -209,9 +209,9 @@ "Edit": "fas fa-pencil-alt", "View": "fas fa-eye", "Delete": "far fa-trash-alt", - "Unpublish": "far fa-eye-slash" - - }, + "Unpublish": "far fa-eye-slash", + "OpenInNewWindow": "fas fa-external-link-alt" + }, { "SetId": "glyphicons", "Previous": "glyphicon glyphicon-backward", @@ -233,8 +233,8 @@ "Edit": "glyphicon glyphicon-edit", "View": "glyphicon glyphicon-eye-open", "Delete": "glyphicon glyphicon-trash", - "Unpublish": "glyphicon glyphicon-eye-close" - + "Unpublish": "glyphicon glyphicon-eye-close", + "OpenInNewWindow": "glyphicon glyphicon-square-new-window" } ] diff --git a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/list-of-links.json b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/list-of-links.json new file mode 100644 index 000000000..be998f7f6 --- /dev/null +++ b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/list-of-links.json @@ -0,0 +1 @@ +{"Id":"list-of-links","ProjectId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","ParentId":"0","ParentSlug":"","PageOrder":3,"Title":"list of links","Author":"Admin","Slug":"list-of-links","ExternalUrl":"","CorrelationKey":null,"MetaDescription":null,"MetaJson":null,"MetaHtml":null,"Content":"\r\n
\r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n\r\n","PubDate":"2024-12-11T14:21:11.7769023Z","LastModified":"2024-12-11T15:56:20.243055Z","IsPublished":true,"MenuOnly":false,"ShowMenu":false,"ViewRoles":null,"Categories":[],"Comments":[],"ShowHeading":true,"ShowPubDate":false,"ShowLastModified":false,"ShowCategories":false,"ShowComments":false,"MenuFilters":null,"DisableEditor":false,"Resources":[],"ContentType":"html","CreatedUtc":"2024-12-11T14:19:46.3814172Z","CreatedByUser":"admin","LastModifiedByUser":"admin","DraftContent":null,"DraftAuthor":null,"DraftPubDate":null,"TemplateKey":"sct-ListOfLinks","SerializedModel":"{\"ContentAbove\":null,\"ContentBelow\":null,\"Items\":[{\"FullSizeUrl\":null,\"ResizedUrl\":\"/media/images/img_1150-ws.jpg\",\"ThumbnailUrl\":null,\"LinkUrl\":\"https://www.google.com\",\"Title\":\"link 1\",\"Description\":\"google.com\",\"AltText\":null,\"Sort\":1,\"OpensInNewWindow\":true},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"https://www.bbc.co.cuk\",\"Title\":\"link 2\",\"Description\":\"bbc\",\"AltText\":null,\"Sort\":3,\"OpensInNewWindow\":false}]}","DraftSerializedModel":null,"Serializer":"Json","ShowCreatedBy":null,"ShowCreatedDate":null,"ShowLastModifiedBy":null,"ShowLastModifiedDate":null} \ No newline at end of file diff --git a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json index 0a4d1b660..8c27f5968 100644 --- a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json +++ b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json @@ -1 +1 @@ -{"AuthorBio":"","Comment":"","NormalizedEmail":"ADMIN@ADMIN.COM","NormalizedUserName":"ADMIN","EmailConfirmed":true,"EmailConfirmSentUtc":null,"AgreementAcceptedUtc":null,"LockoutEndDateUtc":null,"NewEmail":"","NewEmailApproved":false,"LastPasswordChangeUtc":"2024-06-03T14:17:55.2771124Z","MustChangePwd":false,"PasswordHash":"AQAAAAIAAYagAAAAEGVnALS6pFN3EERYv0nYhCQ4jy0t3WB+uYVRUM40L55rqYdKv3yw1MmjWvEYd6x2Pw==","CanAutoLockout":true,"AccessFailedCount":0,"RolesChanged":false,"SecurityStamp":"S7ZJ6RCVYLDHBWTECX2S2GQXJKWUXNSL","Signature":"","TwoFactorEnabled":false,"BrowserKey":"fb4ead8f-7afd-4cd9-84b0-3718d71fa575","Id":"17595de8-d27a-4304-bded-76b61a16ad19","SiteId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","Email":"admin@admin.com","UserName":"admin","DisplayName":"Admin","FirstName":"","LastName":"","AvatarUrl":"","DateOfBirth":null,"CreatedUtc":"2016-08-04T12:03:50.2175089Z","LastModifiedUtc":"2016-08-04T12:03:50.2175089Z","DisplayInMemberList":true,"Gender":"","IsLockedOut":false,"LastLoginUtc":"2024-11-27T08:52:25.2785938Z","PhoneNumber":"","PhoneNumberConfirmed":false,"AccountApproved":true,"TimeZoneId":"","WebSiteUrl":""} \ No newline at end of file +{"AuthorBio":"","Comment":"","NormalizedEmail":"ADMIN@ADMIN.COM","NormalizedUserName":"ADMIN","EmailConfirmed":true,"EmailConfirmSentUtc":null,"AgreementAcceptedUtc":null,"LockoutEndDateUtc":null,"NewEmail":"","NewEmailApproved":false,"LastPasswordChangeUtc":"2024-06-03T14:17:55.2771124Z","MustChangePwd":false,"PasswordHash":"AQAAAAIAAYagAAAAEGVnALS6pFN3EERYv0nYhCQ4jy0t3WB+uYVRUM40L55rqYdKv3yw1MmjWvEYd6x2Pw==","CanAutoLockout":true,"AccessFailedCount":0,"RolesChanged":false,"SecurityStamp":"S7ZJ6RCVYLDHBWTECX2S2GQXJKWUXNSL","Signature":"","TwoFactorEnabled":false,"BrowserKey":"a1490bf5-7bc0-4c51-8781-50e43a7f2698","Id":"17595de8-d27a-4304-bded-76b61a16ad19","SiteId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","Email":"admin@admin.com","UserName":"admin","DisplayName":"Admin","FirstName":"","LastName":"","AvatarUrl":"","DateOfBirth":null,"CreatedUtc":"2016-08-04T12:03:50.2175089Z","LastModifiedUtc":"2016-08-04T12:03:50.2175089Z","DisplayInMemberList":true,"Gender":"","IsLockedOut":false,"LastLoginUtc":"2024-12-11T14:19:23.5104068Z","PhoneNumber":"","PhoneNumberConfirmed":false,"AccountApproved":true,"TimeZoneId":"","WebSiteUrl":""} \ No newline at end of file