Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
Navilois committed Jun 12, 2020
2 parents 1c8a114 + aaae3ee commit 5a0ea66
Show file tree
Hide file tree
Showing 971 changed files with 74,313 additions and 1,424 deletions.
12 changes: 11 additions & 1 deletion .build/ModulePackage.targets
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<ViewSetBuildFolder>$(RootFolder)\_Build\_Website\_ViewSet</ViewSetBuildFolder>
<Bs4ViewSetBuildFolder>$(RootFolder)\_Build\_Website\_ViewSet-BootStrap4</Bs4ViewSetBuildFolder>
<LegacyViewSetBuildFolder>$(RootFolder)\_Build\_Website\_ViewSet-Legacy</LegacyViewSetBuildFolder>
<Porto5ViewSetBuildFolder>$(RootFolder)\_Build\_Website\_ViewSet-Porto5</Porto5ViewSetBuildFolder>
<ModulesBuildFolder>$(RootFolder)\_Build\_Website\_Modules</ModulesBuildFolder>
<DebugBuildFolder>$(RootFolder)\_Build\_Website\_Debug</DebugBuildFolder>
<InstallFolder>$(RootFolder)\_Install</InstallFolder>
Expand Down Expand Up @@ -75,6 +76,7 @@
<HotcakesViewsInclude Include="..\..\Portals\_default\HotcakesViews\_default\**\*.*" Exclude="..\..\**\*.uk-UA.resx;..\..\**\*.manifest" />
<Bootstrap4ViewsInclude Include="..\..\Portals\_default\HotcakesViews\Bootstrap4\**\*.*" Exclude="..\..\**\*.uk-UA.resx;..\..\**\*.manifest" />
<LegacyViewsInclude Include="..\..\Portals\_default\HotcakesViews\_default-Legacy\**\*.*" Exclude="..\..\**\*.uk-UA.resx;..\..\**\*.manifest" />
<Porto5ViewsInclude Include="..\..\Portals\_default\HotcakesViews\Porto5\**\*.*" Exclude="..\..\**\*.uk-UA.resx;..\..\**\*.manifest" />
<PackageTxtInclude Include="**\License.txt;**\ReleaseNotes.txt" />
</ItemGroup>

Expand All @@ -101,10 +103,11 @@
<!-- Copy file to Core Build Folder -->
<Copy SourceFiles="@(CoreInclude)" DestinationFolder="$(CoreBuildFolder)\%(RecursiveDir)" />

<!-- Copy file to ViewSet Build Folder -->
<!-- Copy files to ViewSet Build Folder -->
<Copy SourceFiles="@(HotcakesViewsInclude)" DestinationFolder="$(ViewSetBuildFolder)\%(RecursiveDir)" />
<Copy SourceFiles="@(Bootstrap4ViewsInclude)" DestinationFolder="$(Bs4ViewSetBuildFolder)\%(RecursiveDir)" />
<Copy SourceFiles="@(LegacyViewsInclude)" DestinationFolder="$(LegacyViewSetBuildFolder)\%(RecursiveDir)" />
<Copy SourceFiles="@(Porto5ViewsInclude)" DestinationFolder="$(Porto5ViewSetBuildFolder)\%(RecursiveDir)" />

<!-- Copy file to Modules Build Folder -->
<Copy SourceFiles="@(InstallInclude)" DestinationFolder="$(ModulesBuildFolder)\%(RecursiveDir)" />
Expand Down Expand Up @@ -155,6 +158,12 @@
</CreateItem>
<Zip Files="@(HotcakesLegacyViewsContent)" WorkingDirectory="$(LegacyViewSetBuildFolder)" ZipFileName="$(ModulesBuildFolder)\LegacyViews.$(Extension)" ParallelCompression="False" />

<!-- Create Porto5Views zip -->
<CreateItem Include="$(Porto5ViewSetBuildFolder)\**\*.*">
<Output TaskParameter="Include" ItemName="Porto5ViewsContent" />
</CreateItem>
<Zip Files="@(Porto5ViewsContent)" WorkingDirectory="$(Porto5ViewSetBuildFolder)" ZipFileName="$(ModulesBuildFolder)\Porto5Views.$(Extension)" ParallelCompression="False" />

<!-- Create the Install package -->
<CreateItem Include="$(ModulesBuildFolder)\**\*.*">
<Output TaskParameter="Include" ItemName="OutputContent" />
Expand All @@ -167,6 +176,7 @@
<RemoveDir Directories ="$(ViewSetBuildFolder)" />
<RemoveDir Directories ="$(Bs4ViewSetBuildFolder)" />
<RemoveDir Directories ="$(LegacyViewSetBuildFolder)" />
<RemoveDir Directories ="$(Porto5ViewSetBuildFolder)" />
<RemoveDir Directories ="$(ModulesBuildFolder)" />

<!-- Create packages with debug symbols -->
Expand Down
4 changes: 2 additions & 2 deletions Build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

<!-- Version Number -->
<PropertyGroup Condition=" '$(BUILD_NUMBER)' == '' ">
<Version>03.03.00</Version>
<Version>03.04.01</Version>
<FileVersion>01.00.00</FileVersion>
<InformationalVersion>01.00.00</InformationalVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(BUILD_NUMBER)' != '' ">
<!-- Build Server Number -->
<Version>03.03.00</Version>
<Version>03.04.01</Version>
<FileVersion>$(BUILD_NUMBER)</FileVersion>
<InformationalVersion>$(BUILD_NUMBER)</InformationalVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: CLSCompliant(false)]
[assembly: ComVisible(false)]

[assembly: AssemblyVersion("3.03.00")]
[assembly: AssemblyVersion("3.04.01")]
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
@using Hotcakes.Modules.Core.AppCode
@using Hotcakes.Commerce.Storage;
@model Hotcakes.Modules.Core.Areas.AdminContent.Models.FileManagerViewModel

@{
ViewBag.Title = "Browse Files";
Layout = "../Shared/_PopupLayout.cshtml";
}

@section HeadContent
{
<script type="text/javascript">
$(document).ready(function () {
$('.trashdir').click(function() {
if (window.confirm('Are you sure?\n\nThe directory AND everything in it will be deleted forever!\n\nTHERE IS NO UNDO FOR THIS DELETE'))
{
return true;
}
return false;
});
$('.trashfile').click(function () {
if (window.confirm('Are you sure?\n\nDelete this file forever!\n\nTHERE IS NO UNDO FOR THIS DELETE')) {
return true;
}
return false;
});
$('.selectfile').click(function () {
var filepluspath = $(this).attr('data-file');
//alert("selected file: " + filepluspath);
window.opener.SetImage(filepluspath);
});
});
</script>
}

@helper RenderDeleteDir(string path)
{
if (DiskStorage.FileManagerIsSystemPath(path))
{
<text>&nbsp;</text>
}
else
{
<form action="@Url.Content("~/DesktopModules/Hotcakes/API/mvc/filebrowser/deletedirectory")" method="post">
<input type="hidden" name="path" value="@Model.Path" />
<input type="hidden" name="deletepath" value="@path" />
<input type="image" src="@Url.Content("~/DesktopModules/Hotcakes/Core/Admin/Images/TrashCan.png")" alt="Delete Directory" class="trashdir" />
</form>
}
}
@helper RenderDeleteFile(string filename)
{
<form action="@Url.Content("~/DesktopModules/Hotcakes/API/mvc/filebrowser/deletefile")" method="post">
<input type="hidden" name="path" value="@Model.Path" />
<input type="hidden" name="filename" value="@filename" />
<input type="image" src="@Url.Content("~/DesktopModules/Hotcakes/Core/Admin/Images/TrashCan.png")" alt="Delete File" class="trashfile" />
</form>
}

@section nav {
<div class="controlarea1">
<form action="@Url.Content("~/DesktopModules/Hotcakes/API/mvc/filebrowser/upload")" method="post" enctype="multipart/form-data">
<h3>Upload Files</h3>
<input type="file" size="10" name="postedfile" multiple="multiple" /><br />
<input type="image" src="@Url.Content("~/DesktopModules/Hotcakes/Core/Admin/Images/buttons/upload.png")" alt="Upload File" />
<input type="hidden" name="path" value="@Model.Path" />
</form>
</div>
<div class="controlarea1">
<form action="@Url.Content("~/DesktopModules/Hotcakes/API/mvc/filebrowser/createdirectory")" method="post">
<h3>Add New Directory</h3>
<input type="text" name="newdirectoryname" size="10" /><br />
<input type="image" src="@Url.Content("~/DesktopModules/Hotcakes/Core/Admin/Images/buttons/submit.png")" alt="Add New Directory" />
<input type="hidden" name="path" value="@Model.Path" />
</form>
</div>
}
<h1>Browse Files</h1>
@Html.Raw(ViewBag.BreadCrumbsFinal)
<hr />
<table width="100%" class="liststyle1">
@if (Model.AllowParentPath)
{
<tr>
<td style="width:32px;"><a href="@Url.Content("~/DesktopModules/Hotcakes/API/mvc/filebrowser?path=" + Model.ParentPath)"><img src="@Url.Content("~/DesktopModules/Hotcakes/Core/Admin/Images/fileicons/folder_up_32.png")" alt="Up One Level" /></a></td>
<td class="listitem"><a href="@Url.Content("~/DesktopModules/Hotcakes/API/mvc/filebrowser?path=" + Model.ParentPath)">&laquo; Up One Level</a></td>
<td class="listitem" style="width:50px;">&nbsp;</td>
<td class="listitem" style="width:50px;">&nbsp;</td>
</tr>
}
@foreach (string d in Model.Directories)
{
<tr>
<td style="width:32px;"><a href="@Url.Content("~/DesktopModules/Hotcakes/API/mvc/filebrowser?path=" + Model.ChildPath(d))"><img src="@Url.Content("~/DesktopModules/Hotcakes/Core/Admin/Images/fileicons/folder_32.png")" alt="@d" /></a></td>
<td class="listitem"><a href="@Url.Content("~/DesktopModules/Hotcakes/API/mvc/filebrowser?path=" + Model.ChildPath(d))">@d</a></td>
<td class="listitem" style="width:50px;">@RenderDeleteDir(Model.ChildPath(d))</td>
<td class="listitem" style="width:50px;">&nbsp;</td>
</tr>
}
@foreach (string f in Model.Files)
{
var path = Url.Content(Model.PreviewUrl(f));
<tr>
<td style="width:32px;">
<img src="@Url.Content(Html.FileIconUrl(@f))" class="shadowed" alt="@f" />
</td>
<td class="listitem">
<a href="@path" class="selectfile" data-file="@Model.RelativeFileUrl(f)" alt="@f">@f</a>
</td>
<td class="listitem" style="width:50px;">@RenderDeleteFile(f)</td>
<td class="listitem" style="width:50px;">
<a href="#" class="selectfile" data-file="@Model.RelativeFileUrl(f)"><img src="@Url.Content("~/DesktopModules/Hotcakes/Core/Admin/Images/buttons/select.png")" alt="SELECT" /></a>
</td>
</tr>
}
</table>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!DOCTYPE html>
<html>
<head>
<title>@ViewBag.Title</title>
<link href="@Url.Content("~/DesktopModules/Hotcakes/Core/Admin/styles.css")" rel="stylesheet" type="text/css" />
@Html.Raw(ViewBag.JqueryInclude)
@if (IsSectionDefined("HeadContent"))
{
@RenderSection("HeadContent", false)
}
</head>
<body id="pagebody">
<div id="popup-wrapper">
<div id="main-content">
<table>
<tr>
<td>@RenderSection("nav")</td>
<td>@RenderBody()</td>
</tr>
</table>

</div>
</div>
@RenderSection("EndOfForm", false)
</body>
</html>

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@model Hotcakes.Modules.Core.Models.SingleCategoryViewModel
<div class="hc-categoryrotator">
<div class="hc-content-block">
<a href="@Model.LinkUrl" title="@Model.AltText">
@if (!string.IsNullOrEmpty(Model.IconUrl))
{
<img src="@Model.IconUrl" alt="@Model.AltText" />
}
<br />
<span>@Model.Name</span>
</a>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@model Hotcakes.Modules.Core.Areas.ContentBlocks.Models.FeaturedProductsViewModel

<div class="hc-record-grid hc-product-grid clearfix">
@foreach (var p in Model.Items.Take(3))
{
<div class="hc-wrap3">
@Html.Partial("_RenderSingleProduct", p)
</div>
}
</div>


Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
@model Hotcakes.Modules.Core.Areas.ContentBlocks.Models.ImageRotatorViewModel
@using Hotcakes.Modules.Core.AppCode
@Html.RegisterViewScript("ImageRotator.js")
@if (Model.Images.Count > 0)
{
<div class="hc-imagerotator @Model.CssClass">
<ul id="@(Model.CssId)" >
@for (int i = 0; i < Model.Images.Count; i++)
{
var img = Model.Images[i];
<li @if (i == 0)
{ <text>class="show"</text> }><a href="@img.Url" @if (img.NewWindow)
{ <text> target="_blank"</text> }>
<img style="height:@(Model.Height)px;width:@(Model.Width)px;" src="@img.ImageUrl" alt="@img.Caption" />
</a></li>
}
</ul>
</div>
<script type="text/javascript">
$(document).ready(function() {
StartRotator('@(Model.CssId)', @(Model.Pause));
});
</script>
<style type="text/css">
#@(Model.CssId) {
@if (Model.Height > 0)
{
<text>height: @(Model.Height)px;</text>
}
@if (Model.Width > 0)
{
<text>width: @(Model.Width)px;</text>
}
position:relative;
margin:0;padding:0;
}
#@(Model.CssId) li {
list-style:none;
float:left;
position:absolute;
margin:0;padding:0;
}
#@(Model.CssId) li.show {
z-index:500;
}
</style>
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@model Hotcakes.Commerce.Catalog.Product
<div class="hc-productrotator">
<div class="hc-content-block">
@Html.Action("RenderSingleProduct", "Products", new { Area = "", product = Model })
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
@model Hotcakes.Modules.Core.Areas.ContentBlocks.Models.RssFeedViewModel
<div class="hc-rssfeedviewer">
<div class="hc-content-block">
@if (Model.ShowTitle)
{
<h4>@Model.Channel.Title</h4>
}
@if (Model.ShowDescription)
{
@Html.Raw(Model.Channel.Description)
}
<ul>
@foreach (var item in Model.Channel.GetChannelItems(Model.MaxItems))
{
<li><a href="@Html.Raw(item.Link)">@Html.Raw(item.Title)</a><br />
@Html.Raw(item.Description)</li>
}
</ul>
</div>
</div>

Loading

0 comments on commit 5a0ea66

Please sign in to comment.