Skip to content

Commit

Permalink
Release v.14.2.7900.0
Browse files Browse the repository at this point in the history
  • Loading branch information
SFBuild committed Jun 28, 2022
1 parent bb5b71c commit 1092547
Show file tree
Hide file tree
Showing 22 changed files with 915 additions and 602 deletions.
27 changes: 9 additions & 18 deletions Bootstrap4/MVC/Views/EventScheduler/List.Calendar.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,14 @@
@Html.Script(ScriptRef.JQuery, "top", false)
@Html.Script(ScriptRef.KendoAll, "top", false)
@Html.Script(ScriptRef.KendoTimezones, "top", false)
@Html.StyleSheet(Url.EmbeddedResource("Telerik.Sitefinity.Resources.Reference", "Telerik.Sitefinity.Resources.Scripts.Kendo.styles.kendo_common_min.css"), "head", false)

@if (Html.ShouldRenderInlineEditing() || SystemManager.IsDesignMode || SystemManager.IsPreviewMode)
{
@Html.StyleSheet(Url.EmbeddedResource("Telerik.Sitefinity.Resources.Reference", "Telerik.Sitefinity.Resources.Scripts.Kendo.styles.kendo_bootstrap-v4_min.css"), "bottom", false)

if (ViewBag.IsRtl)
{
@Html.StyleSheet(Url.EmbeddedResource("Telerik.Sitefinity.Resources.Reference", "Telerik.Sitefinity.Resources.Scripts.Kendo.styles.kendo_rtl_min.css"), "bottom", false)
}
@Html.StyleSheet(Url.EmbeddedResource("Telerik.Sitefinity.Resources.Reference", "Telerik.Sitefinity.Resources.Scripts.Kendo.styles.kendo_bootstrap_main_min.css"), "bottom", false)
}
else
{
@Html.StyleSheet(Url.EmbeddedResource("Telerik.Sitefinity.Resources.Reference", "Telerik.Sitefinity.Resources.Scripts.Kendo.styles.kendo_bootstrap-v4_min.css"), "head", false)

if (ViewBag.IsRtl)
{
@Html.StyleSheet(Url.EmbeddedResource("Telerik.Sitefinity.Resources.Reference", "Telerik.Sitefinity.Resources.Scripts.Kendo.styles.kendo_rtl_min.css"), "bottom", false)
}
@Html.StyleSheet(Url.EmbeddedResource("Telerik.Sitefinity.Resources.Reference", "Telerik.Sitefinity.Resources.Scripts.Kendo.styles.kendo_bootstrap_main_min.css"), "head", false)
}
<div data-sf-current-page-id='@ViewBag.CurrentPageId' data-sf-widget-id='@ViewBag.WidgetId' data-sf-role="scheduler-wrapper" data-sf-rtl="@ViewBag.IsRtl" class='@Model.ListCssClass' data-sf-controller-events='@Url.Content("~/web-interface/events")' data-sf-controller-calendars='@Url.Content("~/web-interface/calendars")' data-sf-siteid="@SystemManager.CurrentContext.CurrentSite.Id"
data-sf-defaultview='@Model.EventSchedulerViewMode' data-sf-allowchangecalendarview='@Json.Encode(Model.AllowChangeCalendarView)' data-sf-allowcalendarfilter='@Json.Encode(Model.AllowCalendarFilter)' data-sf-weekstartday='@Model.WeekStartDay' data-sf-loaded='false'
Expand All @@ -35,12 +25,13 @@ else
<div class="col-md-10">
<div data-sf-role="scheduler"></div>
</div>
@if (Model.AllowCalendarFilter) {
<div class="col-md-2">
<div data-sf-role="calendarlist" style="display: none;">
<h4 class="sf-calendarList-title">@Html.Resource("Calendars")</h4>
@if (Model.AllowCalendarFilter)
{
<div class="col-md-2">
<div data-sf-role="calendarlist" style="display: none;">
<h4 class="sf-calendarList-title">@Html.Resource("Calendars")</h4>
</div>
</div>
</div>
}
</div>
<script data-sf-role="event-alldayeventtemplate" type="text/x-kendo-tmpl">
Expand Down
2 changes: 1 addition & 1 deletion Bootstrap4/MVC/Views/Profile/Edit.ProfileEdit.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
{
<button data-sf-role="profile-submit" type="submit" class="btn btn-primary">@Html.Resource("EditProfileSave")</button>
}

@Html.AddSitefinityAntiforgeryToken()
@if (SystemManager.IsPreviewMode)
{
<div class="text-danger" role="alert" aria-live="assertive" data-sf-role="profile-submit-preview-message" style="display:none">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@

@Html.HiddenFor(m => m.RequiresQuestionAndAnswer)

@FormGroupPanel("FirstName", m => m.Profile["FirstName"], "RegistrationFirstName", "text", null, HtmlHelper.ClientValidationEnabled ? RegistrationHelper.GetProfileValidationAttributes("FirstName") : null)
@FormGroupPanel("FirstName", m => m.Profile["FirstName"], "RegistrationFirstName", "text", null, HtmlHelper.ClientValidationEnabled ? RegistrationHelper.GetProfileValidationAttributes("FirstName") : null)

@FormGroupPanel("LastName", m => m.Profile["LastName"], "RegistrationLastName", "text", null, HtmlHelper.ClientValidationEnabled ? RegistrationHelper.GetProfileValidationAttributes("LastName") : null)

Expand All @@ -106,7 +106,7 @@
{
<button type="submit" class="btn btn-primary" @(SystemManager.IsDesignMode ? "disabled" : "")>@Html.Resource("Register")</button>
}

@Html.AddSitefinityAntiforgeryToken()
<div class="mt-3">
<div>Already registered?</div>
<a href="@Model.LoginPageUrl">@Html.Resource("BackToLogin")</a>
Expand Down
1 change: 0 additions & 1 deletion Bootstrap4/MVC/Views/SearchBox/SearchBox.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<input type="hidden" data-sf-role="resultsUrl" value="@(Model.ResultsUrl)" />
<input type="hidden" data-sf-role="indexCatalogue" value="@(Model.IndexCatalogue)" />
<input type="hidden" data-sf-role="wordsMode" value="@(Model.WordsMode.ToString())" />
<input type="hidden" data-sf-role="disableSuggestions" value='@(Model.DisableSuggestions ? ("true") : ("false"))' />
<input type="hidden" data-sf-role="minSuggestionLength" value="@(Model.MinSuggestionLength)" />
<input type="hidden" data-sf-role="suggestionFields" value="@(Model.SuggestionFields)" />
Expand Down
19 changes: 7 additions & 12 deletions Bootstrap4/MVC/Views/SearchResults/SearchResults.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -62,43 +62,39 @@
}

<div class="sf-search-results media-list">

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

@foreach (var item in Model.Results.Data)
{
var hasLink = item.GetValue("Link") != null && !String.IsNullOrEmpty(item.GetValue("Link").ToString());
<div class="media sf-media">

@if (((Telerik.Sitefinity.Services.Search.Model.Document)item).ItemType.ToString() == typeof(Telerik.Sitefinity.Libraries.Model.Image).ToString())
{

<div class="media-left pr-2 sf-img-thmb">
<a href="@item.GetValue("Link")">
<img src="@item.GetValue("Link")" alt="@item.GetValue("Title")" width="120" />
</a>
</div>
}

else if (((Telerik.Sitefinity.Services.Search.Model.Document)item).ItemType.ToString() == typeof(Telerik.Sitefinity.Libraries.Model.Video).ToString())
{
LibrariesManager librariesManager = LibrariesManager.GetManager();
var videoTmbId = new Guid((string)item.GetValue("Id"));
Video video = librariesManager.GetVideo(videoTmbId);
if (video != null)
string thumbUrl = HyperLinkHelpers.GetVideoThumbnailUrl(librariesManager, videoTmbId);
if (!string.IsNullOrEmpty(thumbUrl))
{
var thumbUrl = video.ThumbnailUrl;

<div class="media-left pr-2">
<div class="sf-video-thmb">

<a href="@item.GetValue("Link")">
<img src="@thumbUrl" alt="@item.GetValue("Title")" width="120" />

<div class="sf-icon-play"></div>

</a>
</div>
</div>
}

}

else
Expand Down Expand Up @@ -176,7 +172,6 @@
<input type="hidden" data-sf-role="searchResLanguage" value='@Request.QueryStringGet("language")' />
<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="searchResWordsMode" value='@Request.QueryStringGet("wordsMode")' />
<input type="hidden" data-sf-role="scoringInfo" value='@Request.QueryStringGet("scoringInfo")' />

</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,11 @@
<div class="form-group">
@Html.LabelFor(u => u.Email, Html.Resource("Email"))

<div class="form-inline">
@Html.TextBoxFor(m => m.Email, attributes)
<button class="btn btn-primary ml-2" type="submit" @(SystemManager.IsDesignMode ? "disabled" : "")>@Html.Resource("ButtonSubscribe")</button>
</div>
<div class="form-inline">
@Html.TextBoxFor(m => m.Email, attributes)
<button class="btn btn-primary ml-2" type="submit" @(SystemManager.IsDesignMode ? "disabled" : "")>@Html.Resource("ButtonSubscribe")</button>
@Html.AddSitefinityAntiforgeryToken()
</div>

@if (Html.ValidationMessageFor(m => m.Email) != null)
{
Expand Down
1 change: 1 addition & 0 deletions Bootstrap4/MVC/Views/TextField/Read.Default.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<div class="@Model.CssClass form-group" data-sf-role="text-field-container">
<strong>@Model.MetaField.Title</strong>
<p>@Model.Value</p>
<input type="hidden" name="@Model.MetaField.FieldName" value="@Model.Value" />
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,11 @@
<div class="form-group">
@Html.LabelFor(u => u.Email, Html.Resource("Email"))

<div class="form-inline">
@Html.TextBoxFor(u => u.Email, attributes)
<button type="submit" class="btn btn-primary ml-2" @(SystemManager.IsDesignMode ? "disabled" : "")>@Html.Resource("ButtonUnsubscribe")</button>
</div>
<div class="form-inline">
@Html.TextBoxFor(u => u.Email, attributes)
<button type="submit" class="btn btn-primary ml-2" @(SystemManager.IsDesignMode ? "disabled" : "")>@Html.Resource("ButtonUnsubscribe")</button>
@Html.AddSitefinityAntiforgeryToken()
</div>

@if (Html.ValidationMessageFor(u => u.Email) != null)
{
Expand Down
Loading

0 comments on commit 1092547

Please sign in to comment.