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

Jump to bottom

Issues/issue 145 #265

Merged
merged 2 commits into from
May 19, 2020
Merged

Issues/issue 145 #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80ba23a
Only show product sort when there is more than one option
WillStrohl May 19, 2020
9bf734f
Resolved issues w/ radcombobox removal in all settings views
WillStrohl May 19, 2020
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
13 changes: 8 additions & 5 deletions DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyViewSet/Views/Shared/_Pager.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,14 @@
<div class="clearfix">
@if (ViewData["sortByList"] != null)
{
<div class="hc-sort">
<label>@Localization.GetString("SortBy")</label>
@Html.DropDownList("sortOrderSelect", (IEnumerable<SelectListItem>)ViewData["sortByList"], new { onchange = "window.open(this.options[this.selectedIndex].value, '_top')" })
</div>

var sortList = (IEnumerable<SelectListItem>) ViewData["sortByList"];
if (sortList.Count() > 1)
{
<div class="hc-sort">
<label>@Localization.GetString("SortBy")</label>
@Html.DropDownList("sortOrderSelect", (IEnumerable<SelectListItem>) ViewData["sortByList"], new {onchange = "window.open(this.options[this.selectedIndex].value, '_top')"})
</div>
}
}
@if (Model.TotalPages > 1)
{
Expand Down
13 changes: 8 additions & 5 deletions DevSamples/MyViewSet/Portals/_default/HotcakesViews/SocialSpokes/Views/Shared/_Pager.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,14 @@
<div class="clearfix">
@if (ViewData["sortByList"] != null)
{
<div class="hc-sort">
<label>@Localization.GetString("SortBy")</label>
@Html.DropDownList("sortOrderSelect", (IEnumerable<SelectListItem>)ViewData["sortByList"], new { onchange = "window.open(this.options[this.selectedIndex].value, '_top')" })
</div>

var sortList = (IEnumerable<SelectListItem>) ViewData["sortByList"];
if (sortList.Count() > 1)
{
<div class="hc-sort">
<label>@Localization.GetString("SortBy")</label>
@Html.DropDownList("sortOrderSelect", (IEnumerable<SelectListItem>) ViewData["sortByList"], new {onchange = "window.open(this.options[this.selectedIndex].value, '_top')"})
</div>
}
}
@if (Model.TotalPages > 1)
{
Expand Down
3 changes: 1 addition & 2 deletions Website/DesktopModules/Hotcakes/Cart/Settings.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
</div>
<div class="dnnFormItem">
<dnn:LabelControl ID="ViewSelectionLabel" ControlName="ViewComboBox" Suffix=":" runat="server" />
<asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"
EnableLoadOnDemand="False" ShowMoreResultsBox="false" EnableVirtualScrolling="false"/>
<asp:DropDownList ID="ViewComboBox" runat="server"/>
</div>
</fieldset>
</div>
18 changes: 18 additions & 0 deletions Website/DesktopModules/Hotcakes/CategoryMenu/App_LocalResources/Settings.ascx.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,22 @@
<data name="ViewSelectionLabel.Text" xml:space="preserve">
<value>Select a view</value>
</data>
<data name="ModeField_ShowAll.Text" xml:space="preserve">
<value>Show All Categories</value>
</data>
<data name="ModeField_ShowAllParent.Text" xml:space="preserve">
<value>Show All Categories for Current Parent</value>
</data>
<data name="ModeField_ShowChildrenPeerParents.Text" xml:space="preserve">
<value>Show Children, Peers, and Parents</value>
</data>
<data name="ModeField_ShowChildrenSelected.Text" xml:space="preserve">
<value>Show Children of Selected Category</value>
</data>
<data name="ModeField_ShowRootOnly.Text" xml:space="preserve">
<value>Show Root Categories Only</value>
</data>
<data name="ModeField_ShowSelected.Text" xml:space="preserve">
<value>Show Selected Categories</value>
</data>
</root>
31 changes: 12 additions & 19 deletions Website/DesktopModules/Hotcakes/CategoryMenu/Settings.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,29 @@
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
<asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"/>
<asp:DropDownList ID="ViewComboBox" runat="server"/>
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="MenuTitleLabel" controlname="TitleField" suffix=":" runat="server" />
<asp:TextBox ID="TitleField" runat="server" Width="225px"></asp:TextBox>
<asp:TextBox ID="TitleField" runat="server"/>
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="ModeFieldLabel" controlname="ModeField" suffix=":" runat="server" />
<asp:DropDownList ID="ModeField" runat="server" AutoPostBack="True" Width="225px">
<Items>
<asp:ListItem Value="0" Text="Show Root Categories Only" />
<asp:ListItem Value="1" Text="Show All Categories" />
<asp:ListItem Value="2" Text="Show Children, Peers and Parents" />
<asp:ListItem Value="3" Text="Show All Categories for Current Parent" />
<asp:ListItem Value="4" Text="Show Selected Categories" />
<asp:ListItem Value="5" Text="Show Children of Selected Category" />
</Items>
</asp:DropDownList>
<asp:DropDownList ID="ModeField" runat="server" AutoPostBack="True"/>
</div>
<asp:Panel ID="pnlSelectedCategories" runat="server" Visible="False">
<dnn:labelcontrol id="lblSelectCategories" suffix=":" runat="server" />
<table>
<tr>
<td>
<asp:Label runat="server" ID="lblAvailableCategories"></asp:Label></td>
<asp:Label runat="server" ID="lblAvailableCategories"/></td>
<td></td>
<td>
<asp:Label runat="server" ID="lblSelectedCategories"></asp:Label></td>
<asp:Label runat="server" ID="lblSelectedCategories"/></td>
</tr>
<tr>
<td>
<asp:ListBox ID="lstCategories" Width="200px" runat="server" SelectionMode="Multiple"></asp:ListBox>
<asp:ListBox ID="lstCategories" runat="server" SelectionMode="Multiple" CssClass="hcListBox"/>
</td>
<td>
<div class="dnnFormItem">
Expand All @@ -54,14 +45,16 @@
</div>
</td>
<td>
<asp:ListBox ID="lstSelectedCategories" Width="200px" runat="server" SelectionMode="Multiple"></asp:ListBox>
<asp:ListBox ID="lstSelectedCategories" runat="server" SelectionMode="Multiple" CssClass="hcListBox"/>
</td>
</tr>
</table>
</asp:Panel>
<asp:Panel ID="pnlSelectedChildren" runat="server" Visible="False">
<dnn:labelcontrol id="lblSelectParent" controlname="ModeField" suffix=":" runat="server" />
<asp:DropDownList ID="ddlParentCategories" runat="server" Width="225px" />
<div class="dnnFormItem">
<dnn:labelcontrol id="lblSelectParent" controlname="ModeField" suffix=":" runat="server" />
<asp:DropDownList ID="ddlParentCategories" runat="server"/>
</div>
</asp:Panel>
<div class="dnnFormItem">
<dnn:labelcontrol id="HomeLinkFieldLabel" controlname="HomeLinkField" runat="server" />
Expand All @@ -77,7 +70,7 @@
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="MaximumDepthLabel" controlname="MaximumDepth" suffix=":" runat="server" />
<asp:TextBox ID="MaximumDepth" runat="server"></asp:TextBox>
<asp:TextBox ID="MaximumDepth" runat="server"/>
</div>
</fieldset>
</div>
Expand Down
8 changes: 8 additions & 0 deletions Website/DesktopModules/Hotcakes/CategoryMenu/Settings.ascx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ private void LoadData()

TitleField.Text = Convert.ToString(ModuleSettings["Title"]);

ModeField.Items.Clear();
ModeField.Items.Add(new ListItem(LocalizeString("ModeField_ShowRootOnly"), "0"));
ModeField.Items.Add(new ListItem(LocalizeString("ModeField_ShowAll"), "1"));
ModeField.Items.Add(new ListItem(LocalizeString("ModeField_ShowChildrenPeerParents"), "2"));
ModeField.Items.Add(new ListItem(LocalizeString("ModeField_ShowAllParent"), "3"));
ModeField.Items.Add(new ListItem(LocalizeString("ModeField_ShowSelected"), "4"));
ModeField.Items.Add(new ListItem(LocalizeString("ModeField_ShowChildrenSelected"), "5"));

var mode = ModuleSettings["CategoryMenuMode"] != null ? ModuleSettings["CategoryMenuMode"].ToString() : "0";
if (ModeField.Items.FindByValue(mode) != null)
{
Expand Down
8 changes: 4 additions & 4 deletions Website/DesktopModules/Hotcakes/CategoryViewer/Settings.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
</div>
<div class="dnnFormItem">
<dnn:LabelControl ID="CategorySelectionLabel" ControlName="CategoryComboBox" Suffix=":" runat="server" />
<asp:DropDownList ID="CategoryComboBox" runat="server" Width="250px" Height="150px"/>
<asp:DropDownList ID="CategoryComboBox" runat="server"/>
</div>
<div class="dnnFormItem">
<dnn:LabelControl ID="ViewSelectionLabel" ControlName="ViewComboBox" Suffix=":" runat="server" />
<asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px" />
<asp:DropDownList ID="ViewComboBox" runat="server"/>
</div>
<div class="dnnFormItem">
<dnn:LabelControl ID="ProductPageSizeLabel" ControlName="ProductPageSizeTextBox" Suffix=":" runat="server" />
<asp:TextBox ID="ProductPageSizeTextBox" CssClass="dnnFormLabel" runat="server" />
</div>
<div class="dnnFormItem">
<dnn:LabelControl ID="PreContentColumnLabel" ControlName="txtPreContentColumnId" Suffix=":" runat="server" />
<asp:DropDownList ID="ddlPreContentColumnId" runat="server" Width="250px" MaxHeight="150px"/>
<asp:DropDownList ID="ddlPreContentColumnId" runat="server"/>
</div>
<div class="dnnFormItem">
<dnn:LabelControl ID="PostContentColumnLabel" ControlName="txtPostContentColumnId" Suffix=":" runat="server" />
<asp:DropDownList ID="ddlPostContentColumnId" runat="server" Width="250px" MaxHeight="150px"/>
<asp:DropDownList ID="ddlPostContentColumnId" runat="server"/>
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="ShowManufactures" controlname="ShowManufacturesCheckBox" suffix=":" runat="server" />
Expand Down
9 changes: 4 additions & 5 deletions Website/DesktopModules/Hotcakes/Checkout/Settings.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,31 @@
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
<asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"
EnableLoadOnDemand="False" ShowMoreResultsBox="false" EnableVirtualScrolling="false" />
<asp:DropDownList ID="ViewComboBox" runat="server"/>
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="ReceiptViewLabel" controlname="ReceiptViewContentLabel" suffix=":" runat="server" />
<asp:Label ID="ReceiptViewContentLabel" CssClass="dnnFormLabel" runat="server" Text="" />
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="ReceiptViewSelectionLabel" controlname="ReceiptViewComboBox" suffix=":" runat="server" />
<asp:DropDownList ID="ReceiptViewComboBox" runat="server" Width="250px" Height="150px" />
<asp:DropDownList ID="ReceiptViewComboBox" runat="server"/>
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="PaymentErrorViewLabel" controlname="PaymentErrorViewContentLabel" suffix=":" runat="server" />
<asp:Label ID="PaymentErrorViewContentLabel" CssClass="dnnFormLabel" runat="server" Text="" />
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="PaymentErrorViewSelectionLabel" controlname="PaymentErrorViewComboBox" suffix=":" runat="server" />
<asp:DropDownList ID="PaymentErrorViewComboBox" runat="server" Width="250px" Height="150px" />
<asp:DropDownList ID="PaymentErrorViewComboBox" runat="server"/>
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="PayPalViewLabel" controlname="PayPalViewContentLabel" suffix=":" runat="server" />
<asp:Label ID="PayPalViewContentLabel" CssClass="dnnFormLabel" runat="server" Text="" />
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="PayPalViewSelectionLabel" controlname="PayPalViewComboBox" suffix=":" runat="server" />
<asp:DropDownList ID="PayPalViewComboBox" runat="server" Width="250px" Height="150px" />
<asp:DropDownList ID="PayPalViewComboBox" runat="server"/>
</div>
</fieldset>
</div>
4 changes: 2 additions & 2 deletions Website/DesktopModules/Hotcakes/ContentBlocks/Settings.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
<asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"/>
<asp:DropDownList ID="ViewComboBox" runat="server"/>
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="ContentBlocksLabel" controlname="ContentBlocksValueLabel" suffix=":" runat="server" />
<asp:Label ID="ContentBlocksValueLabel" CssClass="dnnFormLabel" runat="server" Text="" />
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="ContentBlocksSelectionLabel" controlname="ContentBlocksComboBox" suffix=":" runat="server" />
<asp:DropDownList ID="ContentBlocksComboBox" runat="server" Width="250px" Height="150px"/>
<asp:DropDownList ID="ContentBlocksComboBox" runat="server"/>
</div>
</fieldset>
</div>
1 change: 0 additions & 1 deletion Website/DesktopModules/Hotcakes/Core/Controllers/CategoryController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
using Hotcakes.Commerce.Content;
using Hotcakes.Commerce.Extensions;
using Hotcakes.Commerce.Search;
using Hotcakes.Commerce.Social;
using Hotcakes.Commerce.Storage;
using Hotcakes.Commerce.Urls;
using Hotcakes.Commerce.Utilities;
Expand Down
12 changes: 12 additions & 0 deletions Website/DesktopModules/Hotcakes/Core/Controls/App_LocalResources/ProductPicker.ascx.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,16 @@
<data name="VendorLabel.Text" xml:space="preserve">
<value>Vendor</value>
</data>
<data name="Available.HeaderText" xml:space="preserve">
<value>Available for Sale</value>
</data>
<data name="Name.HeaderText" xml:space="preserve">
<value>Name</value>
</data>
<data name="SitePrice.HeaderText" xml:space="preserve">
<value>Site Price</value>
</data>
<data name="SKU.HeaderText" xml:space="preserve">
<value>SKU</value>
</data>
</root>
42 changes: 19 additions & 23 deletions Website/DesktopModules/Hotcakes/Core/Controls/ProductPicker.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,19 @@
<fieldset>
<div class="dnnFormItem">
<dnn:labelcontrol id="SearchLabel" controlname="FilterField" suffix=":" runat="server" />
<asp:TextBox ID="FilterField" runat="server" Width="160px"></asp:TextBox>
<asp:TextBox ID="FilterField" runat="server" />
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="ManufacturerLabel" controlname="ManufacturerFilter" suffix=":" runat="server" />
<asp:DropDownList ID="ManufacturerFilter" runat="server" AutoPostBack="True"
OnSelectedIndexChanged="ManufacturerFilter_SelectedIndexChanged">
</asp:DropDownList>
<dnn:labelcontrol id="ManufacturerLabel" controlname="ManufacturerFilter" suffix=":" runat="server" />
<asp:DropDownList ID="ManufacturerFilter" runat="server" AutoPostBack="True" OnSelectedIndexChanged="ManufacturerFilter_SelectedIndexChanged"/>
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="VendorLabel" controlname="VendorFilter" suffix=":" runat="server" />
<asp:DropDownList ID="VendorFilter" runat="server" AutoPostBack="True"
OnSelectedIndexChanged="VendorFilter_SelectedIndexChanged">
</asp:DropDownList>
<asp:DropDownList ID="VendorFilter" runat="server" AutoPostBack="True" OnSelectedIndexChanged="VendorFilter_SelectedIndexChanged"/>
</div>
<div class="dnnFormItem">
<dnn:labelcontrol id="CategoryLabel" controlname="CategoryFilter" suffix=":" runat="server" />
<asp:DropDownList ID="CategoryFilter" runat="server" AutoPostBack="True"
OnSelectedIndexChanged="CategoryFilter_SelectedIndexChanged">
</asp:DropDownList>
<asp:DropDownList ID="CategoryFilter" runat="server" AutoPostBack="True" OnSelectedIndexChanged="CategoryFilter_SelectedIndexChanged"/>
</div>
<div class="dnnFormItem">
<dnn:labelcontrol controlname="btnSearch" runat="server" />
Expand All @@ -42,11 +36,13 @@
</fieldset>
</asp:Panel>
<div class="right" style="width: 50%">
<asp:GridView CellPadding="2" ID="rgProducts" runat="server" AllowPaging="True" PageSize="5"
AutoGenerateColumns="False" Width="450px" AllowCustomPaging="True" GridLines="Horizontal"
OnNeedDataSource="rgProducts_OnNeedDataSource" DataKeyField="Bvin">
<asp:GridView ID="rgProducts" runat="server" AllowPaging="True" PageSize="5" CssClass="dnnGrid" Width="100%"
AutoGenerateColumns="False" AllowCustomPaging="True" GridLines="Horizontal" DataKeyNames="Bvin" OnPageIndexChanging="rgProducts_PageIndexChanging">
<HeaderStyle CssClass="dnnGridHeader"/>
<RowStyle CssClass="dnnGridRow"/>
<AlternatingRowStyle CssClass="dnnGridAltRow" />
<Columns>
<asp:TemplateColumn UniqueName="MultiSelect">
<asp:TemplateField ItemStyle-Width="10%">
<HeaderTemplate>
<div class="chkSelectAll">
<asp:CheckBox ID="chkSelectAll" runat="server" />
Expand All @@ -57,15 +53,15 @@
<asp:CheckBox ID="chkSelected" runat="server" />
</div>
</ItemTemplate>
</asp:TemplateColumn>
<asp:BoundColumn DataField="sku" HeaderText="SKU" />
<asp:BoundColumn DataField="ProductName" HeaderText="Name" />
<asp:BoundColumn DataField="SitePrice" DataFormatString="{0:c}" HeaderText="Site Price" UniqueName="SitePrice" />
<asp:TemplateColumn HeaderText="Available for Sale" UniqueName="Inventory">
</asp:TemplateField>
<asp:BoundField DataField="Sku" HeaderText="SKU" />
<asp:BoundField DataField="ProductName" HeaderText="Name" />
<asp:BoundField DataField="SitePrice" DataFormatString="{0:c}" HeaderText="SitePrice" />
<asp:TemplateField HeaderText="Available">
<ItemTemplate>
<%# Convert.ToBoolean(Eval("IsAvailableForSale")) ? "Yes" : "No" %>
</ItemTemplate>
</asp:TemplateColumn>
<asp:Label ID="lblAvailabile" runat="server" Text='<%#ParseProductAvailability(DataBinder.Eval(Container.DataItem, "IsAvailableForSale"))%>'/>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
</div>
Expand Down
Loading