Skip to content

Commit

Permalink
Release v.14.3.8000.0
Browse files Browse the repository at this point in the history
  • Loading branch information
SFBuild committed Oct 28, 2022
1 parent 1092547 commit 6695250
Show file tree
Hide file tree
Showing 33 changed files with 586 additions and 264 deletions.
2 changes: 1 addition & 1 deletion Bootstrap4/MVC/Views/Comments/Comments.Default.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@

@if (Model.RequiresCaptcha)
{
<div data-sf-role="captcha-container" class="sf-Comments-captcha">
<div data-sf-role="captcha-container" class="sf-Comments-captcha" style="display:none;">
<div>
<img data-sf-role="captcha-image" src="@Url.WidgetContent("assets/dist/img/dummy.jpg")" alt="" />
</div>
Expand Down
73 changes: 73 additions & 0 deletions Bootstrap4/MVC/Views/Facets/Facets.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
@model Telerik.Sitefinity.Frontend.Search.Mvc.Models.FacetsWidgetViewModel
@using System;
@using System.Globalization;
@using Telerik.Sitefinity;
@using Telerik.Sitefinity.Frontend.Mvc.Helpers;
@using Telerik.Sitefinity.Publishing.PublishingPoints;

@{
const int defaultFacetsCollapseCount = 10;
}

<div id="facetContainer">
@if (ViewBag.HasAnyFacetElements)
{
<h3 class="h6 mb-3 font-weight-normal">@Model.FilterResultsLabel</h3>

<div class="d-flex align-items-center justify-content-between">
<label class="form-label">@Model.AppliedFiltersLabel</label>
<button id="sf-facet-clear-all-btn" class="btn btn-link px-0 py-0 mb-2" hidden>@Model.ClearAllLabel</button>
</div>
<ul id="applied-filters" class="list-unstyled list-inline" data-sf-applied-filter-html-tag="li" data-sf-filter-label-css-class="sf-facets-filter-label list-inline-item bg-secondary rounded-pill pl-2 pr-4 pb-1 mr-1 mb-1 mw-100 position-relative overflow-hidden text-truncate text-nowrap" data-sf-remove-filter-css-class="sf-facets-remove-filter px-2 position-absolute">
</ul>
}

<div id="facetContent" class="mb-3">
@foreach (var facet in Model.SearchFacets)
{
var value = 0;
if (facet.FacetElements.Any())
{
<h4 class="h6 font-weight-normal mt-3">@facet.FacetTitle</h4>

<ul class="list-unstyled mb-0" id="[email protected]">
@foreach (var facetElement in facet.FacetElements)
{
string facetElementLabel = facetElement.FacetValue;

if (facetElement.FacetFieldType == SearchIndexAdditonalFieldType.DateAndTime)
{
DateTime facetDateValue = DateTime.Parse(facetElementLabel);
facetElementLabel = facetDateValue.ToSitefinityUITime().ToString("MMM dd, yyyy");
}

value++;
bool hideElement = (value > defaultFacetsCollapseCount) && Model.IsShowMoreLessButtonActive;
<li class="form-check" @(hideElement ? "hidden" : string.Empty)>
<input type="checkbox"
id="[email protected]@facetElement.FacetValue"
class="form-check-input"
data-facet-key="@facet.FacetFieldName"
data-facet-value="@facetElement.FacetValue" />
<label for="[email protected]@facetElement.FacetValue" id="[email protected]" class="form-check-label">@facetElementLabel</label>
@if (Model.DisplayItemCount)
{
<span class="small text-muted">(@facetElement.FacetCount)</span>
}
</li>
}
</ul>
if (facet.FacetElements.Count > defaultFacetsCollapseCount && Model.IsShowMoreLessButtonActive)
{
<button type="button" class="btn btn-link p-0" show-more="@Model.ShowMoreLabel" show-less="@Model.ShowLessLabel" data-facet-type="@facet.FacetFieldName" id="[email protected]">@Model.ShowMoreLabel</button>
}
}
}
</div>

</div>

<input type="hidden" id="sf-currentPageUrl" value="@(ViewBag.CurrentPageUrl ?? string.Empty)" />

@Html.Script(Url.WidgetContent("Mvc/Scripts/Facets/query-string-utils.js"), "bottom", throwException: false)
@Html.Script(Url.WidgetContent("Mvc/Scripts/Facets/facets-widget.js"), "bottom", throwException: false)
43 changes: 22 additions & 21 deletions Bootstrap4/MVC/Views/LoginForm/LoginForm.LoginForm.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
@using Telerik.Sitefinity.Services;
@using Telerik.Sitefinity.Frontend.Identity.Mvc.Models.LoginForm;
@using Telerik.Sitefinity.Web;
@using Telerik.Sitefinity.Web.Utilities;
@using Telerik.Sitefinity.Abstractions;
@using Telerik.Sitefinity.Security.CSRF;

@*Add scripts and stylesheets*@
@Html.Script(ScriptRef.JQuery, "top", true)
@Html.Script("//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.js", "top", true)
@Html.Script("//ajax.aspnetcdn.com/ajax/mvc/4.0/jquery.validate.unobtrusive.min.js", "top", true)
@Html.Script("//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.js", "top", true, false, new List<KeyValuePair<string, string>>() { HtmlConstants.CrossOriginHtmlAttribute })
@Html.Script("//ajax.aspnetcdn.com/ajax/mvc/4.0/jquery.validate.unobtrusive.min.js", "top", true, false, new List<KeyValuePair<string, string>>() { HtmlConstants.CrossOriginHtmlAttribute })

@{
var hasExternalProviders = Model.ExternalProviders != null && Model.ExternalProviders.Count() > 0;
Expand All @@ -25,14 +26,14 @@
@using (Html.BeginFormSitefinity(@Request.Url.Query, null, null, FormMethod.Post, new Dictionary<string, object> { { "role", "form" } }, true))
{
@Html.ValidationSummary(true);

<div class="@rowClass">
<div class="@colClass">
<h3>@Html.Resource("LoginFormLogInLegendHeader")</h3>

@if ((!string.IsNullOrEmpty(Request.QueryStringGet("err")) && ViewBag.ControllerId.Equals(Request.QueryStringGet("sf_login_cntrl_id"))) || Model.LoginError)
{
<div class="alert alert-danger" role="alert" aria-live="assertive">@Html.Resource("IncorrectCredentialsMessage")</div>
<div class="alert alert-danger" role="alert" aria-live="assertive">@Html.Resource("IncorrectCredentialsMessage")</div>
}

@FormGroupPanel("UserName", u => u.UserName, "LoginUserName", "text", null, new Dictionary<string, object>() { { "aria-required", "true" } })
Expand All @@ -53,38 +54,38 @@
</label>
</div>
}
@if (Model.ShowForgotPasswordLink)
{
<div class="text-lg-right pr-4 @isPulledRight">
@Html.ActionLink(Html.Resource("ForgottenPasword"), "ForgotPassword")
</div>
}
</div>
@if (Model.ShowForgotPasswordLink)
{
<div class="text-lg-right pr-4 @isPulledRight">
@Html.ActionLink(Html.Resource("ForgottenPasword"), "ForgotPassword")
</div>
}
</div>
}

<div class="form-group">
<button type="submit" class="btn btn-primary" @(SystemManager.IsDesignMode ? "disabled" : "")>@Html.Resource("LoginFormLogInButton")</button>
</div>

@Html.AddSitefinityAntiforgeryToken()

@if (Model.ShowRegistrationLink)
{
<div class="sf-registration-link">
<div>@Html.Resource("NotRegisteredYet")</div>
<a href="@Model.RegisterPageUrl">@Html.Resource("LoginFormRegisterNow")</a>
<div class="sf-registration-link">
<div>@Html.Resource("NotRegisteredYet")</div>
<a href="@Model.RegisterPageUrl">@Html.Resource("LoginFormRegisterNow")</a>
</div>
}
</div>
}
</div>


@if (Model.ExternalProviders != null && Model.ExternalProviders.Count() > 0)
{
<div class="col-lg-6">
<div class="col-lg-6">
<h3>@Html.Resource("UseAccountIn")</h3>

@foreach (var provider in Model.ExternalProviders)
{
var classToBeAdd = "btn btn-lg btn-block border " + @provider.Value;
{
var classToBeAdd = "btn btn-lg btn-block border " + @provider.Value;
<div class="mb-1">
@Html.ActionLink(provider.Key, "LoginExternalProvider", new { model = provider.Key }, new { @class = classToBeAdd })
</div>
Expand Down
17 changes: 9 additions & 8 deletions Bootstrap4/MVC/Views/Profile/ConfirmPassword.ProfileEdit.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
@using Telerik.Sitefinity.UI.MVC;
@using Telerik.Sitefinity.Utilities;
@using Telerik.Sitefinity.Services;
@using Telerik.Sitefinity.Web.Utilities;

@Html.Script(ScriptRef.JQuery, "top", false)
@Html.Script("//ajax.aspnetcdn.com/ajax/jquery.validate/1.19.3/jquery.validate.js", "top", false)
@Html.Script("//ajax.aspnetcdn.com/ajax/mvc/4.0/jquery.validate.unobtrusive.min.js", "top", false)
@Html.Script("//ajax.aspnetcdn.com/ajax/jquery.validate/1.19.3/jquery.validate.js", "top", false, new List<KeyValuePair<string, string>>() { HtmlConstants.CrossOriginHtmlAttribute })
@Html.Script("//ajax.aspnetcdn.com/ajax/mvc/4.0/jquery.validate.unobtrusive.min.js", "top", false, new List<KeyValuePair<string, string>>() { HtmlConstants.CrossOriginHtmlAttribute })

<div>
<h3>@Html.Resource("EditProfileLink")</h3>
Expand All @@ -23,29 +24,29 @@
<div class="alert alert-danger" role="alert" aria-live="assertive">@ViewBag.ErrorMessage</div>
}

@using (Html.BeginFormSitefinity("EditEmail", "EditProfileForm", FormMethod.Post, new Dictionary<string, object> { { "enctype", "multipart/form-data"}, { "role", "form" }, { "aria-label", Html.Resource("EditProfileLink") } }))
@using (Html.BeginFormSitefinity("EditEmail", "EditProfileForm", FormMethod.Post, new Dictionary<string, object> { { "enctype", "multipart/form-data" }, { "role", "form" }, { "aria-label", Html.Resource("EditProfileLink") } }))
{
<div>
@Html.HiddenFor(u => u.UserId)
@Html.HiddenFor(u => u.Email)
@Html.HiddenFor(u => u.Email)
</div>

<p id='@Html.UniqueId("PasswordChangeDescription")'>@Html.Resource("PasswordEditMessage")</p>

<div class="form-group">
@{
var passwordDescription = Html.UniqueId("PasswordChangeDescription") + " " + Html.UniqueId("PasswordChangeValidationMessage");
}
@Html.LabelFor(u => u.Password, Html.Resource("Password"))
@Html.PasswordFor(u => u.Password, new { @class = "form-control", aria_describedby = passwordDescription})
@Html.PasswordFor(u => u.Password, new { @class = "form-control", aria_describedby = passwordDescription })

<div id='@Html.UniqueId("PasswordChangeValidationMessage")' class="text-danger" role="alert" aria-live="assertive">
@Html.ValidationMessageFor(u => u.Password)
</div>
</div>

<div>
<input class="btn btn-primary" data-sf-role="profile-submit" type="submit" value='@Html.Resource("EditProfileSave")' />
<input class="btn btn-primary" data-sf-role="profile-submit" type="submit" value='@Html.Resource("EditProfileSave")' />
</div>
}
</div>
6 changes: 4 additions & 2 deletions Bootstrap4/MVC/Views/Profile/Edit.ProfileEdit.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
@using Telerik.Sitefinity.UI.MVC;
@using Telerik.Sitefinity.Utilities;
@using Telerik.Sitefinity.Services;
@using Telerik.Sitefinity.Web.Utilities;

@Html.Script(ScriptRef.JQuery, "top", true)
@Html.Script("//ajax.aspnetcdn.com/ajax/jquery.validate/1.19.3/jquery.validate.js", "top", true)
@Html.Script("//ajax.aspnetcdn.com/ajax/mvc/4.0/jquery.validate.unobtrusive.min.js", "top", true)
@Html.Script("//ajax.aspnetcdn.com/ajax/jquery.validate/1.19.3/jquery.validate.js", "top", true, new List<KeyValuePair<string, string>>() { HtmlConstants.CrossOriginHtmlAttribute })
@Html.Script("//ajax.aspnetcdn.com/ajax/mvc/4.0/jquery.validate.unobtrusive.min.js", "top", true, new List<KeyValuePair<string, string>>() { HtmlConstants.CrossOriginHtmlAttribute })
<div class="@Model.CssClass">
<h3>@Html.Resource("EditProfileLink")</h3>
@if (Model.ShowProfileChangedMsg)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
@using Telerik.Sitefinity.Frontend.Identity.Mvc.Helpers;
@using Telerik.Sitefinity.Frontend.Identity.Mvc.Models.Registration;
@using Telerik.Sitefinity.Web;
@using Telerik.Sitefinity.Web.Utilities;

@*Add scripts and stylesheets*@
@Html.Script(ScriptRef.JQuery, "top", true)
@Html.Script("//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.js", "top", true)
@Html.Script("//ajax.aspnetcdn.com/ajax/mvc/4.0/jquery.validate.unobtrusive.min.js", "top", true)
@Html.Script("//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.js", "top", true, new List<KeyValuePair<string, string>>() { HtmlConstants.CrossOriginHtmlAttribute })
@Html.Script("//ajax.aspnetcdn.com/ajax/mvc/4.0/jquery.validate.unobtrusive.min.js", "top", true, new List<KeyValuePair<string, string>>() { HtmlConstants.CrossOriginHtmlAttribute })

@{
var hasExternalProviders = Model.ExternalProviders != null && Model.ExternalProviders.Count() > 0;
Expand Down
1 change: 1 addition & 0 deletions Bootstrap4/MVC/Views/SearchBox/SearchBox.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<input type="hidden" data-sf-role="searchTextBoxId" value='@("#" + searchTextBoxId.ToString())' />
<input type="hidden" data-sf-role="searchButtonId" value='@("#" + searchButtonId.ToString())' />
<input type="hidden" data-sf-role="scoringSettings" value='@(ViewBag.ScoringSettings ?? string.Empty)' />
<input type="hidden" data-sf-role="searchInAllSitesInTheIndex" value='@(Model.SearchInAllSitesInTheIndex.HasValue ? Model.SearchInAllSitesInTheIndex.ToString() : string.Empty)' />
</div>

@* The inline editing functionality is loading jQuery too. *@
Expand Down
27 changes: 18 additions & 9 deletions Bootstrap4/MVC/Views/SearchResults/SearchResults.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@using Telerik.Sitefinity.Libraries.Model;
@using Telerik.Sitefinity.Web;

<div class=" @Model.CssClass">
<div class=" @Model.CssClass" id="sf-search-result-container">

<div class="row">
<div class="col-lg-8">
Expand All @@ -27,7 +27,7 @@
<h1 role="alert" aria-live="assertive">@Html.Resource("No") @Html.HtmlSanitize(Model.ResultText)</h1>
}
</div>
<div class="col-lg-4">
<div class="col-lg-4" data-sf-hide-while-loading="true">
@if (Model.AllowSorting && @Model.Results.TotalCount > 0)
{
<label>
Expand All @@ -44,7 +44,7 @@

@if (Model.Languages.Length > 1)
{
<div>
<div data-sf-hide-while-loading="true">
<span>@Html.Resource("ChangeResultsLanguageLabel") </span>
@for (var i = 0; i < Model.Languages.Length; i++)
{
Expand All @@ -61,11 +61,11 @@
</div>
}

<div class="sf-search-results media-list">
<div class="sf-search-results media-list" data-sf-hide-while-loading="true">

@{
LibrariesManager librariesManager = LibrariesManager.GetManager();
}
}

@foreach (var item in Model.Results.Data)
{
Expand Down Expand Up @@ -131,7 +131,7 @@
{
if (ViewBag.IsFilteredbyPermission)
{
<ul class="pagination">
<ul class="pagination" data-sf-hide-while-loading="true">
@if (Model.CurrentPage > 1)
{
<li class="page-item">
Expand All @@ -150,14 +150,14 @@
{
if (Model.CurrentPage == Model.TotalPagesCount)
{
<em class="text-muted">@((Model.ItemsPerPage * Model.TotalPagesCount) - Model.Results.TotalCount) of @Model.Results.TotalCount results</em>
<em class="text-muted" data-sf-hide-while-loading="true">@((Model.ItemsPerPage * Model.TotalPagesCount) - Model.Results.TotalCount) of @Model.Results.TotalCount results</em>
}
else
{
<em class="text-muted">@Model.ItemsPerPage of @Model.Results.TotalCount results</em>
<em class="text-muted" data-sf-hide-while-loading="true">@Model.ItemsPerPage of @Model.Results.TotalCount results</em>
}

<div>
<div data-sf-hide-while-loading="true">
@Html.Action("Index", "ContentPager", new
{
currentPage = Model.CurrentPage,
Expand All @@ -173,7 +173,16 @@
<input type="hidden" data-sf-role="searchResIndexCatalogue" value='@Request.QueryStringGet("indexCatalogue")' />
<input type="hidden" data-sf-role="searchResQuery" value='@Request.QueryStringGet("searchQuery")' />
<input type="hidden" data-sf-role="scoringInfo" value='@Request.QueryStringGet("scoringInfo")' />
<input type="hidden" data-sf-role="resultsForAllSites" value='@Request.QueryStringGet("resultsForAllSites")' />

</div>

<div id="sf-search-results-loading-indicator" style="display:none">
<div class="d-flex justify-content-center my-5">
<div class="spinner-border text-primary my-5" role="status">
<span class="sr-only">Loading...</span>
</div>
</div>
</div>

@Html.Script(Url.WidgetContent("Mvc/Scripts/SearchResults/Search-results.js"), "bottom", throwException: false)
Loading

0 comments on commit 6695250

Please sign in to comment.