Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V9 Fix - Theme Errors #399

Merged
merged 1 commit into from
Jul 18, 2022
Merged

V9 Fix - Theme Errors #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Articulate/App_Plugins/Articulate/Themes/Material/Views/Partials/CommentsDisqus.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@using Articulate.Models
@using Umbraco.Cms.Core.Models.PublishedContent
@using Umbraco.Extensions
@model Articulate.Models.PostModel

@if (Model.DisqusShortName.IsNullOrWhiteSpace())
Expand All @@ -22,7 +24,7 @@ else
/** DO NOT MODIFY BELOW THIS LINE **/

var disqus_identifier = '@Model.Key';
var disqus_url = '@UmbracoContext.UrlAbsolute(Model.Id)';
var disqus_url = '@Model.Url(mode: UrlMode.Absolute)';

(function () {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
Expand Down
4 changes: 3 additions & 1 deletion src/Articulate/App_Plugins/Articulate/Themes/Material/Views/Partials/CommentsFacebook.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@using Umbraco.Cms.Core.Models.PublishedContent
@using Umbraco.Extensions
@model Articulate.Models.PostModel

@*Facebook comments aren't responsive. Use at your own risk.*@
Expand All @@ -11,4 +13,4 @@
js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<div class="fb-comments" data-href="@UmbracoContext.UrlAbsolute(Model.Id)" data-numposts="5" data-colorscheme="light"></div>
<div class="fb-comments" data-href="@Model.Url(mode: UrlMode.Absolute)" data-numposts="5" data-colorscheme="light"></div>
7 changes: 3 additions & 4 deletions src/Articulate/App_Plugins/Articulate/Themes/Material/Views/Tags.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
@using Articulate
@using Articulate.Models
@using Umbraco.Extensions

.Security

@inherits Umbraco.Web.Mvc.UmbracoViewPage<Articulate.Models.TagListModel>
@model Articulate.Models.TagListModel
@{
Layout = "Master.cshtml";
ViewBag.CssWrapperClass = "demo-blog--blogpost";
Expand Down Expand Up @@ -66,7 +65,7 @@
new string[] {"mdl-data-table__cell--non-numeric date", "mdl-data-table__cell--non-numeric", "mdl-data-table__cell--non-numeric" },
@<span>@item.PublishedDate.ToString("yyyy-MM-dd")</span>,
@<a href="@item.Url()">@item.Name</a>,
@<a href="@item.Url#disqus_thread" data-disqus-identifier="@item.Key"></a>)
@<a href="@item.Url()#disqus_thread" data-disqus-identifier="@item.Key"></a>)
</div>
<div class="mdl-card__menu">
<a href="@Url.ArticulateTagRssUrl(asArray[i])" title="RSS Feed" class="mdl-button mdl-button--icon mdl-js-button mdl-js-ripple-effect mdl-color--primary mdl-color-text--grey-50">
Expand Down
4 changes: 3 additions & 1 deletion src/Articulate/App_Plugins/Articulate/Themes/Mini/Views/Partials/CommentsDisqus.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@using Articulate.Models
@using Umbraco.Cms.Core.Models.PublishedContent
@using Umbraco.Extensions
@model Articulate.Models.PostModel

<div class="post-comment">
Expand All @@ -24,7 +26,7 @@
/** DO NOT MODIFY BELOW THIS LINE **/

var disqus_identifier = '@Model.Key';
var disqus_url = '@UmbracoContext.UrlAbsolute(Model.Id)';
var disqus_url = '@Model.Url(mode: UrlMode.Absolute)';

(function () {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
Expand Down
4 changes: 3 additions & 1 deletion src/Articulate/App_Plugins/Articulate/Themes/Mini/Views/Partials/CommentsFacebook.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@using Umbraco.Cms.Core.Models.PublishedContent
@using Umbraco.Extensions
@model Articulate.Models.PostModel

@*Facebook comments aren't responsive. Use at your own risk.*@
Expand All @@ -11,4 +13,4 @@
js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<div class="fb-comments" data-href="@UmbracoContext.UrlAbsolute(Model.Id)" data-numposts="5" data-colorscheme="light"></div>
<div class="fb-comments" data-href="@Model.Url(mode: UrlMode.Absolute)" data-numposts="5" data-colorscheme="light"></div>
1 change: 1 addition & 0 deletions src/Articulate/App_Plugins/Articulate/Themes/Phantom/Views/Author.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@using Articulate
@using Umbraco.Extensions

@model Articulate.Models.AuthorModel
@{
Expand Down
6 changes: 4 additions & 2 deletions src/Articulate/App_Plugins/Articulate/Themes/Phantom/Views/Partials/CommentsDisqus.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@using Articulate.Models
@using Umbraco.Cms.Core.Models.PublishedContent
@using Umbraco.Extensions
@model Articulate.Models.PostModel

@if (Model.DisqusShortName.IsNullOrWhiteSpace())
Expand All @@ -22,7 +24,7 @@ else
/** DO NOT MODIFY BELOW THIS LINE **/

var disqus_identifier = '@Model.Key';
var disqus_url = '@UmbracoContext.UrlAbsolute(Model.Id)';
var disqus_url = '@Model.Url(mode: UrlMode.Absolute)';

(function () {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
Expand All @@ -37,4 +39,4 @@ else
comments powered by <span class="logo-disqus">Disqus</span>
</a>
</div>
}
}
4 changes: 3 additions & 1 deletion src/Articulate/App_Plugins/Articulate/Themes/Phantom/Views/Partials/CommentsFacebook.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@using Umbraco.Cms.Core.Models.PublishedContent
@using Umbraco.Extensions
@model Articulate.Models.PostModel

@*Facebook comments aren't responsive. Use at your own risk.*@
Expand All @@ -11,4 +13,4 @@
js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<div class="fb-comments" data-href="@UmbracoContext.UrlAbsolute(Model.Id)" data-numposts="5" data-colorscheme="light"></div>
<div class="fb-comments" data-href="@Model.Url(mode: UrlMode.Absolute)" data-numposts="5" data-colorscheme="light"></div>
6 changes: 4 additions & 2 deletions src/Articulate/App_Plugins/Articulate/Themes/VAPOR/Views/Partials/CommentsDisqus.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@using Articulate.Models
@using Umbraco.Cms.Core.Models.PublishedContent
@using Umbraco.Extensions
@model Articulate.Models.PostModel

@if (Model.DisqusShortName.IsNullOrWhiteSpace())
Expand All @@ -22,7 +24,7 @@ else
/** DO NOT MODIFY BELOW THIS LINE **/

var disqus_identifier = '@Model.Key';
var disqus_url = '@UmbracoContext.UrlAbsolute(Model.Id)';
var disqus_url = '@Model.Url(mode: UrlMode.Absolute)';

(function () {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
Expand All @@ -37,4 +39,4 @@ else
comments powered by <span class="logo-disqus">Disqus</span>
</a>
</div>
}
}
4 changes: 3 additions & 1 deletion src/Articulate/App_Plugins/Articulate/Themes/VAPOR/Views/Partials/CommentsFacebook.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@using Umbraco.Cms.Core.Models.PublishedContent
@using Umbraco.Extensions
@model Articulate.Models.PostModel

@*Facebook comments aren't responsive. Use at your own risk.*@
Expand All @@ -11,4 +13,4 @@
js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<div class="fb-comments" data-href="@UmbracoContext.UrlAbsolute(Model.Id)" data-numposts="5" data-colorscheme="light"></div>
<div class="fb-comments" data-href="@Model.Url(mode: UrlMode.Absolute)" data-numposts="5" data-colorscheme="light"></div>