Skip to content

Commit

Permalink
Merge pull request HotcakesCommerce#299 from HotcakesCommerce/develop…
Browse files Browse the repository at this point in the history 
…ment

Development
  • Loading branch information
Will Strohl authored Jun 12, 2020
2 parents f085234 + c08267f commit aaae3ee
Show file tree
Hide file tree
Showing 9 changed files with 116 additions and 68 deletions.
4 changes: 2 additions & 2 deletions Build.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

<!-- Version Number -->
<PropertyGroup Condition=" '$(BUILD_NUMBER)' == '' ">
<Version>03.04.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.04.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
View file
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.04.00")]
[assembly: AssemblyVersion("3.04.01")]
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]
Expand Down
4 changes: 2 additions & 2 deletions GlobalAssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

[assembly: System.Reflection.AssemblyCopyright("Copyright © 2020. All rights reserved.")]
[assembly: System.Reflection.AssemblyConfiguration("Release")]
[assembly: System.Reflection.AssemblyVersion("03.04.00")]
[assembly: System.Reflection.AssemblyVersion("03.04.01")]
[assembly: System.Reflection.AssemblyFileVersion("01.00.00")]
[assembly: System.Reflection.AssemblyInformationalVersion("01.00.00")]

Expand All @@ -22,7 +22,7 @@ internal sealed partial class ThisAssembly {

internal const string AssemblyConfiguration = "Release";

internal const string AssemblyVersion = "03.04.00";
internal const string AssemblyVersion = "03.04.01";

internal const string AssemblyFileVersion = "01.00.00";

Expand Down
34 changes: 23 additions & 11 deletions WebDeploy/HCCCMS.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@
<webslicettl>0</webslicettl>
<cultureCode />
<content type="DNNHTML" version="08.00.00">
<![CDATA[&lt;h1 class=&quot;text-center&quot; style=&quot; margin-top: 1em;&quot;&gt;Hotcakes Commerce CMS&lt;/h1&gt;
<![CDATA[&lt;h1 class=&quot;text-center&quot; style=&quot;margin-top: 1em;&quot;&gt;Hotcakes Commerce CMS&lt;/h1&gt;
&lt;h2 class=&quot;text-center&quot;&gt;[Tab.Home.Header.NextSteps]&lt;/h2&gt;]]>
</content>
<modulesettings>
Expand Down Expand Up @@ -622,11 +622,11 @@
<cultureCode />
<content type="DNNHTML" version="08.00.00">
<![CDATA[&lt;div class=&quot;gray-container&quot;&gt;&lt;a href=&quot;/DesktopModules/Hotcakes/Core/Admin/SetupWizard/SetupWizard.aspx?step=0&quot;&gt;
&lt;img alt=&quot;wizard icon&quot; class=&quot;icon&quot; src=&quot;/portals/0/Images/wizard-icon.png&quot; /&gt;&lt;/a&gt;
&lt;img alt=&quot;&quot; class=&quot;icon&quot; src=&quot;/portals/0/Images/wizard-icon.png&quot; /&gt;&lt;/a&gt;
&lt;h2&gt;[Tab.Home.Step1.Header]&lt;/h2&gt;
&lt;h3&gt;&lt;a href=&quot;/DesktopModules/Hotcakes/Core/Admin/SetupWizard/SetupWizard.aspx?step=0&quot;&gt;Hotcakes Wizard&lt;/a&gt;&lt;/h3&gt;
&lt;p&gt;[Tab.Home.Step1.Description]&lt;/p&gt;
&lt;a href=&quot;/DesktopModules/Hotcakes/Core/Admin/SetupWizard/SetupWizard.aspx?step=0&quot;&gt;&lt;img alt=&quot;wizard sample&quot; class=&quot;sample&quot; src=&quot;/portals/0/Images/wizard-sample.png&quot; /&gt;&lt;/a&gt;
&lt;a href=&quot;/DesktopModules/Hotcakes/Core/Admin/SetupWizard/SetupWizard.aspx?step=0&quot;&gt;&lt;img alt=&quot;&quot; class=&quot;sample&quot; src=&quot;/portals/0/Images/wizard-sample.png&quot; /&gt;&lt;/a&gt;
&lt;/div&gt;]]>
</content>
<modulesettings>
Expand Down Expand Up @@ -689,15 +689,15 @@
<cultureCode />
<content type="DNNHTML" version="08.00.00">
<![CDATA[&lt;div class=&quot;darkgray-container&quot;&gt;&lt;a href=&quot;/DesktopModules/Hotcakes/Core/Admin/catalog/default.aspx&quot;&gt;
&lt;img alt=&quot;products icon&quot; class=&quot;icon&quot; src=&quot;/portals/0/Images/products-icon.png&quot; /&gt;&lt;/a&gt;
&lt;img alt=&quot;&quot; class=&quot;icon&quot; src=&quot;/portals/0/Images/products-icon.png&quot; /&gt;&lt;/a&gt;

&lt;h2&gt;[Tab.Home.Step2.Header]&lt;/h2&gt;

&lt;h3&gt;&lt;a href=&quot;/DesktopModules/Hotcakes/Core/Admin/catalog/default.aspx&quot;&gt;Sample Products&lt;/a&gt;&lt;/h3&gt;
&lt;h3&gt;&lt;a href=&quot;/DesktopModules/Hotcakes/Core/Admin/catalog/default.aspx&quot;&gt;[Tab.Home.Step2.SampleProducts]&lt;/a&gt;&lt;/h3&gt;

&lt;p&gt;[Tab.Home.Step2.Description]&lt;/p&gt;

&lt;a href=&quot;/DesktopModules/Hotcakes/Core/Admin/catalog/default.aspx&quot;&gt;&lt;img alt=&quot;products sample&quot; class=&quot;sample&quot; src=&quot;/portals/0/Images/products-sample.png&quot; /&gt;&lt;/a&gt;
&lt;a href=&quot;/DesktopModules/Hotcakes/Core/Admin/catalog/default.aspx&quot;&gt;&lt;img alt=&quot;&quot; class=&quot;sample&quot; src=&quot;/portals/0/Images/products-sample.png&quot; /&gt;&lt;/a&gt;
&lt;/div&gt;]]>
</content>
<modulesettings>
Expand Down Expand Up @@ -760,8 +760,8 @@
<cultureCode />
<content type="DNNHTML" version="08.00.00">
<![CDATA[&lt;div class=&quot;blue-container&quot;&gt;
&lt;img src=&quot;/portals/0/Images/enjoy-icon.png&quot; class=&quot;icon&quot; alt=&quot;products icon&quot; /&gt;
&lt;h2&gt;Step 3&lt;/h2&gt;
&lt;img src=&quot;/portals/0/Images/enjoy-icon.png&quot; class=&quot;icon&quot; alt=&quot;&quot; /&gt;
&lt;h2&gt;[Tab.Home.Step3.Header]&lt;/h2&gt;
&lt;h3&gt;[Tab.Home.StepEnjoy.Header]&lt;/h3&gt;
&lt;img src=&quot;/portals/0/Images/store.png&quot; class=&quot;sample&quot; alt=&quot;Hotcakes Commerce CMS&quot; /&gt;
&lt;/div&gt;]]>
Expand Down Expand Up @@ -826,7 +826,7 @@
&lt;div class=&quot;span6&quot;&gt;
&lt;img alt=&quot;Hotcakes Commerce&quot; class=&quot;icon&quot; src=&quot;/portals/0/Images/hc-logo-white.png&quot; /&gt;
&lt;h2&gt;[Tab.Home.HccCloud.Header]&lt;/h2&gt;
&lt;a class=&quot;btn&quot; href=&quot;https://upendoventures.com/Shop/Product/Hotcakes-Commerce-Cloud?utm_source=hcc&amp;utm_medium=cms&amp;utm_campaign=330&quot; target=&quot;_blank&quot;&gt;Hotcakes Cloud&lt;/a&gt;
&lt;a class=&quot;btn&quot; href=&quot;https://upendoventures.com/Shop/Product/Hotcakes-Commerce-Cloud?utm_source=hcc&amp;utm_medium=cms&amp;utm_campaign=340&quot; target=&quot;_blank&quot;&gt;Hotcakes Cloud&lt;/a&gt;
&lt;/div&gt;
&lt;div class=&quot;span6&quot;&gt;
&lt;img alt=&quot;Hotcakes Commerce&quot; class=&quot;sample&quot; src=&quot;/portals/0/Images/mac-laptop.png&quot; /&gt;
Expand Down Expand Up @@ -896,7 +896,7 @@
&lt;p&gt;[Tab.Home.SeeHow.Description]&lt;/p&gt;
&lt;/div&gt;
&lt;div class=&quot;span5&quot;&gt;
&lt;a class=&quot;btn&quot; href=&quot;https://hotcakes.org/Product?utm_source=hcc&amp;utm_medium=cms&amp;utm_campaign=330&quot; target=&quot;_blank&quot;&gt;[Tab.Home.SeeHow.Link.Text]&lt;/a&gt;
&lt;a class=&quot;btn&quot; href=&quot;https://mmmcommerce.com/Product?utm_source=hcc&amp;utm_medium=cms&amp;utm_campaign=340&quot; target=&quot;_blank&quot;&gt;[Tab.Home.SeeHow.Link.Text]&lt;/a&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
Expand Down Expand Up @@ -961,7 +961,19 @@
<webslicettl>0</webslicettl>
<cultureCode />
<content type="DNNHTML" version="08.00.00">
<![CDATA[&lt;div class=&quot;row-fluid question-container&quot;&gt;&lt;div class=&quot;span3&quot;&gt;&lt;a href=&quot;https://hotcakes.org/Community?utm_source=hcc&amp;utm_medium=cms&amp;utm_campaign=330&quot; target=&quot;_blank&quot;&gt;&lt;img alt=&quot;&quot; class=&quot;icon&quot; src=&quot;/portals/0/Images/question-icon.png&quot; /&gt;&lt;/a&gt;&lt;/div&gt;&lt;div class=&quot;span9&quot;&gt;&lt;h2&gt;[Tab.Home.GetHelp.Header]&lt;/h2&gt;&lt;p&gt;[Tab.Home.GetHelp.Para1]&lt;/p&gt;&lt;p&gt;[Tab.Home.GetHelp.Para2]&lt;/p&gt;&lt;a class=&quot;btn&quot; href=&quot;https://upendoventures.com/Support?utm_source=hcc&amp;utm_medium=cms&amp;utm_campaign=330&quot; target=&quot;_blank&quot;&gt;[Tab.Home.GetHelp.Link.Text]&lt;/a&gt;&lt;/div&gt;&lt;/div&gt;]]>
<![CDATA[&lt;div class=&quot;row-fluid question-container&quot;&gt;
&lt;div class=&quot;span3&quot;&gt;
&lt;a href=&quot;https://hotcakes.org/Community?utm_source=hcc&amp;utm_medium=cms&amp;utm_campaign=340&quot; target=&quot;_blank&quot;&gt;
&lt;img alt=&quot;&quot; class=&quot;icon&quot; src=&quot;/portals/0/Images/question-icon.png&quot; /&gt;
&lt;/a&gt;
&lt;/div&gt;
&lt;div class=&quot;span9&quot;&gt;
&lt;h2&gt;[Tab.Home.GetHelp.Header]&lt;/h2&gt;
&lt;p&gt;[Tab.Home.GetHelp.Para1]&lt;/p&gt;
&lt;p&gt;[Tab.Home.GetHelp.Para2]&lt;/p&gt;
&lt;a class=&quot;btn&quot; href=&quot;https://upendoventures.com/Support?utm_source=hcc&amp;utm_medium=cms&amp;utm_campaign=340&quot; target=&quot;_blank&quot;&gt;[Tab.Home.GetHelp.Link.Text]&lt;/a&gt;
&lt;/div&gt;
&lt;/div&gt;]]>
</content>
<modulesettings>
<modulesetting>
Expand Down
6 changes: 6 additions & 0 deletions WebDeploy/HCCCMS.template.en-US.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,12 @@ Fax: (555) 555-4564</value>
<data name="Tab.Home.Step2.Description" xml:space="preserve">
<value>Don't know what products to add yet? Add some samples in 1-click!</value>
</data>
<data name="Tab.Home.Step2.SampleProducts" xml:space="preserve">
<value>Sample Products</value>
</data>
<data name="Tab.Home.Step3.Header" xml:space="preserve">
<value>Step 3</value>
</data>
<data name="Tab.Home.StepEnjoy.Header" xml:space="preserve">
<value>Enjoy building your new online store!</value>
</data>
Expand Down
31 changes: 8 additions & 23 deletions Website/DesktopModules/Hotcakes/Core/Admin/AppCode/MenuProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,18 @@
using DotNetNuke.Common.Utilities;
using DotNetNuke.Services.Localization;
using Hotcakes.Commerce;
using Hotcakes.Commerce.Globalization;
using Hotcakes.Modules.Core.AppCode;

namespace Hotcakes.Modules.Core.Admin.AppCode
{
[Serializable]
public class MenuProvider
{
protected static string LocalResourceFile
{
get
{
string language = System.Threading.Thread.CurrentThread.CurrentCulture.ToString();
if (System.Web.HttpContext.Current.Request.Cookies["language"] != null)
{
language = string.Concat(".", HttpContext.Current.Request.Cookies["language"].Value);
}

if (language.ToLower() == ".en-us")
{
language = string.Empty;
}

return (string.Format("~/DesktopModules/Hotcakes/Core/Admin/App_LocalResources/AdminControlBar{0}.resx", language));
}
}

private const string localResourceFile =
"~/DesktopModules/Hotcakes/Core/Admin/App_LocalResources/AdminControlBar.resx";
private const string _MenuFileVirtualPath = "~/DesktopModules/Hotcakes/Core/Admin/Menu.xml";

private static ILocalizationHelper localization { get; set; }
private static List<MenuItem> _menuItems;

public static List<MenuItem> MenuItems
Expand Down Expand Up @@ -159,18 +143,19 @@ public static bool IsCurrent(MenuItem mi, string url)

private static List<MenuItem> ParseXml(XElement el)
{
string LocalizedFile = LocalResourceFile;

if (!el.HasElements)
{
return new List<MenuItem>();
}

localization = Factory.Instance.CreateLocalizationHelper(localResourceFile);

return el.Elements()
.Select(e => new MenuItem
{
Name = e.GetAttributeValue("Name"),
//Localize Text String that Loaded from Menu.xml
Text = Localization.GetString(e.GetAttributeValue("Text"), LocalizedFile),
Text = localization.GetString(e.GetAttributeValue("Text")),
BaseUrl = e.GetAttributeValue("BaseUrl"),
Url = e.GetAttributeValue("Url"),
PermissionToken = e.GetAttributeValue("Permission"),
Expand Down
Loading

0 comments on commit aaae3ee

Please sign in to comment.