Skip to content

Commit

Permalink
Button and grid cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@JosephMDavis
JosephMDavis committed Oct 15, 2018
1 parent 70db25e commit d103177
Show file tree
Hide file tree
Showing 19 changed files with 154 additions and 231 deletions.
8 changes: 8 additions & 0 deletions WebStore.UI/WebStore.UI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
</Reference>
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\..\mojoPortal-RepoTest\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System">
<EmbedInteropTypes>False</EmbedInteropTypes>
Expand Down Expand Up @@ -545,30 +546,37 @@
<ProjectReference Include="..\..\mojoPortal-RepoTest\mojoPortal.Business.WebHelpers\mojoPortal.Business.WebHelpers.csproj">
<Project>{4ead30ec-4f97-4f38-8530-1b7eddb8fc8e}</Project>
<Name>mojoPortal.Business.WebHelpers</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\mojoPortal-RepoTest\mojoPortal.Business\mojoPortal.Business.csproj">
<Project>{8582d51e-126b-4d64-b080-07ad8245b38f}</Project>
<Name>mojoPortal.Business</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\mojoPortal-RepoTest\mojoPortal.Net\mojoPortal.Net.csproj">
<Project>{30916752-1a97-49ca-95d6-81a5f784eeb5}</Project>
<Name>mojoPortal.Net</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\mojoPortal-RepoTest\mojoPortal.Web.Controls\mojoPortal.Web.Controls.csproj">
<Project>{a2dcd1e2-a5c3-4e37-a5f2-093659bc1c38}</Project>
<Name>mojoPortal.Web.Controls</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\mojoPortal-RepoTest\mojoPortal.Web.Editor\mojoPortal.Web.Editor.csproj">
<Project>{4f6dda2c-c9b8-45b2-aada-3ff922317661}</Project>
<Name>mojoPortal.Web.Editor</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\mojoPortal-RepoTest\mojoPortal.Web.Framework\mojoPortal.Web.Framework.csproj">
<Project>{e0d12031-bfdd-4069-9024-8b00a2aa6dbc}</Project>
<Name>mojoPortal.Web.Framework</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\mojoPortal-RepoTest\Web\mojoPortal.Web.csproj">
<Project>{8e511d65-4779-4689-82d4-811d3fe6866e}</Project>
<Name>mojoPortal.Web</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\WebStore.Business\WebStore.Business.csproj">
<Project>{58B4BA40-343B-4B4A-8A7B-AB92D2D60BBC}</Project>
Expand Down
19 changes: 9 additions & 10 deletions WebStore.UI/WebStore/AdminCartBrowser.aspx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<%@ Page Language="C#" AutoEventWireup="false" MasterPageFile="~/App_MasterPages/layout.Master" CodeBehind="AdminCartBrowser.aspx.cs" Inherits="WebStore.UI.AdminCartBrowserPage" %>

<asp:Content ContentPlaceHolderID="leftContent" ID="MPLeftPane" runat="server" />
<asp:Content ContentPlaceHolderID="mainContent" ID="MPContent" runat="server">
<asp:content contentplaceholderid="leftContent" id="MPLeftPane" runat="server" />
<asp:content contentplaceholderid="mainContent" id="MPContent" runat="server">
<portal:OuterWrapperPanel ID="pnlOuterWrap" runat="server">
<mp:CornerRounderTop id="ctop1" runat="server" />
<portal:InnerWrapperPanel ID="pnlInnerWrap" runat="server" CssClass="panelwrapper cart">
Expand Down Expand Up @@ -48,15 +48,14 @@
</mp:mojoGridView>

<div class="settingrow">
<br /><asp:HyperLink ID="lnkAddNew" runat="server" />
<br /><asp:HyperLink ID="lnkAddNew" runat="server" SkinID="AddButton" />
</div>
<portal:mojoCutePager ID="pgrCart" runat="server" />
<br class="clear" />
<div class="settingrow">
<asp:CheckBox ID="chkOnlyAnonymous" runat="server" />
<portal:mojoButton ID="btnDelete" runat="server" />
<asp:TextBox ID="txtDaysOld" runat="server" CssClass="smalltextbox" /> <asp:Literal ID="litDays" runat="server" />

<asp:CheckBox ID="chkOnlyAnonymous" runat="server" />
<portal:mojoButton ID="btnDelete" runat="server" SkinID="DeleteButtonSmall" />
<asp:TextBox ID="txtDaysOld" runat="server" CssClass="smalltextbox" /> <asp:Literal ID="litDays" runat="server" />
</div>

</portal:InnerBodyPanel>
Expand All @@ -65,6 +64,6 @@
</portal:InnerWrapperPanel>
<mp:CornerRounderBottom id="cbottom1" runat="server" />
</portal:OuterWrapperPanel>
</asp:Content>
<asp:Content ContentPlaceHolderID="rightContent" ID="MPRightPane" runat="server" />
<asp:Content ContentPlaceHolderID="pageEditContent" ID="MPPageEdit" runat="server" />
</asp:content>
<asp:content contentplaceholderid="rightContent" id="MPRightPane" runat="server" />
<asp:content contentplaceholderid="pageEditContent" id="MPPageEdit" runat="server" />
142 changes: 70 additions & 72 deletions WebStore.UI/WebStore/AdminDiscountEdit.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,79 +2,77 @@

<asp:Content ContentPlaceHolderID="leftContent" ID="MPLeftPane" runat="server" />
<asp:Content ContentPlaceHolderID="mainContent" ID="MPContent" runat="server">
<mp:CornerRounderTop id="ctop1" runat="server" EnableViewState="false" />
<asp:Panel id="pnl1" runat="server" CssClass="panelwrapper ">
<div class="modulecontent">
<div class="settingrow">
<mp:SiteLabel id="lblDiscountCode" runat="server" ForControl="txtDiscountCode" CssClass="settinglabel" ConfigKey="DiscountCodeLabel" ResourceFile="WebStoreResources" />
<asp:TextBox ID="txtDiscountCode" runat="server" CssClass="forminput widetextbox" MaxLength="255" />
</div>
<div class="settingrow">
<mp:SiteLabel id="lblDescription" runat="server" ForControl="txtDescription" CssClass="settinglabel" ConfigKey="DiscountDescriptionLabel" ResourceFile="WebStoreResources" />
<asp:TextBox ID="txtDescription" runat="server" CssClass="forminput widetextbox" MaxLength="255" />
</div>
<div class="settingrow">
<mp:SiteLabel id="lblValidityStartDate" runat="server" ForControl="dpBeginDate" CssClass="settinglabel" ConfigKey="DiscountValidityStartDateLabel" ResourceFile="WebStoreResources" />
<mp:DatePickerControl id="dpBeginDate" runat="server" ShowTime="True" CssClass="forminput" SkinID="AdminDiscount"></mp:DatePickerControl>
</div>
<div class="settingrow">
<mp:SiteLabel id="lblValidityEndDate" runat="server" ForControl="dpEndDate" CssClass="settinglabel" ConfigKey="DiscountValidityEndDateLabel" ResourceFile="WebStoreResources" />
<mp:DatePickerControl id="dpEndDate" runat="server" ShowTime="True" CssClass="forminput" ></mp:DatePickerControl>
<asp:Label ID="lblLeaveBlankForNoEndDate" runat="server" />
</div>
<div class="settingrow">
<mp:SiteLabel id="lblUseCountLabel" runat="server" CssClass="settinglabel" ConfigKey="DiscountUseCountLabel" ResourceFile="WebStoreResources" />
<asp:Label ID="lblCountOfUse" runat="server" />
</div>
<div class="settingrow">
<mp:SiteLabel id="SiteLabel2" runat="server" ForControl="ckAllowOtherDiscounts" CssClass="settinglabel" ConfigKey="AllowOtherDiscountsLabel" ResourceFile="WebStoreResources" />
<asp:CheckBox ID="ckAllowOtherDiscounts" runat="server" CssClass="forminput" />
</div>
<div class="settingrow">
<mp:SiteLabel id="lblMaxCount" runat="server" ForControl="txtMaxCount" CssClass="settinglabel" ConfigKey="DiscountMaxCountLabel" ResourceFile="WebStoreResources" />
<asp:TextBox ID="txtMaxCount" runat="server" CssClass="forminput normaltextbox" MaxLength="50" Text="0" />
<asp:Label ID="lblZeroIsUnlimitedUse" runat="server" />
</div>
<div class="settingrow">
<mp:SiteLabel id="lblMinOrderAmount" runat="server" ForControl="txtMinOrderAmount" CssClass="settinglabel" ConfigKey="DiscountMinOrderAmountLabel" ResourceFile="WebStoreResources" />
<asp:TextBox ID="txtMinOrderAmount" runat="server" CssClass="forminput normaltextbox" MaxLength="50" Text="0" />
<asp:Label ID="lblZeroMeansNoMinimum" runat="server" />
</div>
<div class="settingrow">
<mp:SiteLabel id="lblAbsoluteDiscount" runat="server" ForControl="txtAbsoluteDiscount" CssClass="settinglabel" ConfigKey="DiscountAbsoluteDiscountLabel" ResourceFile="WebStoreResources" />
<asp:TextBox ID="txtAbsoluteDiscount" runat="server" CssClass="forminput normaltextbox" MaxLength="50" Text="0" />
</div>
<div class="settingrow">
<mp:SiteLabel id="lblPercentageDiscount" runat="server" ForControl="txtPercentageDiscount" CssClass="settinglabel" ConfigKey="DiscountPercentageDiscountLabel" ResourceFile="WebStoreResources" />
<asp:TextBox ID="txtPercentageDiscount" runat="server" CssClass="forminput normaltextbox" MaxLength="50" Text="0" />
</div>
<div>
<asp:ValidationSummary ID="vSummary" runat="server" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqDiscountCode" runat="server" ControlToValidate="txtDiscountCode"
Display="None" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqDescription" runat="server" ControlToValidate="txtDescription"
Display="None" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqBeginDate" runat="server" ControlToValidate="dpBeginDate"
Display="None" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqMaxUseCount" runat="server" ControlToValidate="txtMaxCount"
Display="None" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqMinOrderAmount" runat="server" ControlToValidate="txtMinOrderAmount"
Display="None" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqDiscountAmount" runat="server" ControlToValidate="txtAbsoluteDiscount"
Display="None" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqPercentDiscount" runat="server" ControlToValidate="txtPercentageDiscount"
Display="None" ValidationGroup="Discount" />
<portal:mojoLabel ID="lblError" runat="server" CssClass="txterror warning" />
<asp:Panel ID="pnl1" runat="server" CssClass="panelwrapper ">
<div class="modulecontent">
<div class="settingrow">
<mp:sitelabel id="lblDiscountCode" runat="server" forcontrol="txtDiscountCode" cssclass="settinglabel" configkey="DiscountCodeLabel" resourcefile="WebStoreResources" />
<asp:TextBox ID="txtDiscountCode" runat="server" CssClass="forminput widetextbox" MaxLength="255" />
</div>
<div class="settingrow">
<mp:sitelabel id="lblDescription" runat="server" forcontrol="txtDescription" cssclass="settinglabel" configkey="DiscountDescriptionLabel" resourcefile="WebStoreResources" />
<asp:TextBox ID="txtDescription" runat="server" CssClass="forminput widetextbox" MaxLength="255" />
</div>
<div class="settingrow">
<mp:sitelabel id="lblValidityStartDate" runat="server" forcontrol="dpBeginDate" cssclass="settinglabel" configkey="DiscountValidityStartDateLabel" resourcefile="WebStoreResources" />
<mp:datepickercontrol id="dpBeginDate" runat="server" showtime="True" cssclass="forminput" skinid="AdminDiscount"></mp:datepickercontrol>
</div>
<div class="settingrow">
<mp:sitelabel id="lblValidityEndDate" runat="server" forcontrol="dpEndDate" cssclass="settinglabel" configkey="DiscountValidityEndDateLabel" resourcefile="WebStoreResources" />
<mp:datepickercontrol id="dpEndDate" runat="server" showtime="True" cssclass="forminput"></mp:datepickercontrol>
<asp:Label ID="lblLeaveBlankForNoEndDate" runat="server" />
</div>
<div class="settingrow">
<mp:sitelabel id="lblUseCountLabel" runat="server" cssclass="settinglabel" configkey="DiscountUseCountLabel" resourcefile="WebStoreResources" />
<asp:Label ID="lblCountOfUse" runat="server" />
</div>
<div class="settingrow">
<mp:sitelabel id="SiteLabel2" runat="server" forcontrol="ckAllowOtherDiscounts" cssclass="settinglabel" configkey="AllowOtherDiscountsLabel" resourcefile="WebStoreResources" />
<asp:CheckBox ID="ckAllowOtherDiscounts" runat="server" CssClass="forminput" />
</div>
<div class="settingrow">
<mp:sitelabel id="lblMaxCount" runat="server" forcontrol="txtMaxCount" cssclass="settinglabel" configkey="DiscountMaxCountLabel" resourcefile="WebStoreResources" />
<asp:TextBox ID="txtMaxCount" runat="server" CssClass="forminput normaltextbox" MaxLength="50" Text="0" />
<asp:Label ID="lblZeroIsUnlimitedUse" runat="server" />
</div>
<div class="settingrow">
<mp:sitelabel id="lblMinOrderAmount" runat="server" forcontrol="txtMinOrderAmount" cssclass="settinglabel" configkey="DiscountMinOrderAmountLabel" resourcefile="WebStoreResources" />
<asp:TextBox ID="txtMinOrderAmount" runat="server" CssClass="forminput normaltextbox" MaxLength="50" Text="0" />
<asp:Label ID="lblZeroMeansNoMinimum" runat="server" />
</div>
<div class="settingrow">
<mp:sitelabel id="lblAbsoluteDiscount" runat="server" forcontrol="txtAbsoluteDiscount" cssclass="settinglabel" configkey="DiscountAbsoluteDiscountLabel" resourcefile="WebStoreResources" />
<asp:TextBox ID="txtAbsoluteDiscount" runat="server" CssClass="forminput normaltextbox" MaxLength="50" Text="0" />
</div>
<div class="settingrow">
<mp:sitelabel id="lblPercentageDiscount" runat="server" forcontrol="txtPercentageDiscount" cssclass="settinglabel" configkey="DiscountPercentageDiscountLabel" resourcefile="WebStoreResources" />
<asp:TextBox ID="txtPercentageDiscount" runat="server" CssClass="forminput normaltextbox" MaxLength="50" Text="0" />
</div>
<div>
<asp:ValidationSummary ID="vSummary" runat="server" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqDiscountCode" runat="server" ControlToValidate="txtDiscountCode"
Display="None" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqDescription" runat="server" ControlToValidate="txtDescription"
Display="None" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqBeginDate" runat="server" ControlToValidate="dpBeginDate"
Display="None" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqMaxUseCount" runat="server" ControlToValidate="txtMaxCount"
Display="None" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqMinOrderAmount" runat="server" ControlToValidate="txtMinOrderAmount"
Display="None" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqDiscountAmount" runat="server" ControlToValidate="txtAbsoluteDiscount"
Display="None" ValidationGroup="Discount" />
<asp:RequiredFieldValidator ID="reqPercentDiscount" runat="server" ControlToValidate="txtPercentageDiscount"
Display="None" ValidationGroup="Discount" />
<portal:mojolabel id="lblError" runat="server" cssclass="txterror warning" />

</div>
<div class="settingrow">
<mp:SiteLabel id="SiteLabel1" runat="server" CssClass="settinglabel" ConfigKey="spacer" />
<portal:mojoButton ID="btnSave" runat="server" ValidationGroup="Discount" />
<portal:mojoButton ID="btnDelete" runat="server" CausesValidation="false" />
</div>
</div>
</asp:Panel>
<mp:CornerRounderBottom id="cbottom1" runat="server" EnableViewState="false" />
</div>
<div class="settingrow">
<mp:sitelabel id="SiteLabel1" runat="server" cssclass="settinglabel" configkey="spacer" />
<portal:mojobutton id="btnSave" runat="server" validationgroup="Discount" skinid="SaveButton" />
<portal:mojobutton id="btnDelete" runat="server" causesvalidation="false" skinid="DeleteButtonSmall" />
</div>
</div>
</asp:Panel>
</asp:Content>
<asp:Content ContentPlaceHolderID="rightContent" ID="MPRightPane" runat="server" />
<asp:Content ContentPlaceHolderID="pageEditContent" ID="MPPageEdit" runat="server" />
18 changes: 0 additions & 18 deletions WebStore.UI/WebStore/AdminDiscountEdit.aspx.designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion WebStore.UI/WebStore/AdminDiscounts.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<portal:mojoCutePager ID="pgrDiscounts" runat="server" />
<br class="clear" />
<div class="settingrow">
<asp:HyperLink ID="lnkNewDiscount" runat="server" />
<asp:HyperLink ID="lnkNewDiscount" runat="server" SkinID="AddButton" />
</div>
</portal:InnerBodyPanel>
</portal:OuterBodyPanel>
Expand Down
10 changes: 5 additions & 5 deletions WebStore.UI/WebStore/AdminDownloadTerms.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Columns>
<asp:TemplateField>
<ItemTemplate>
<asp:Button ID="btnEdit" runat="server" CommandName="Edit" CssClass="buttonlink" Text='<%# Resources.WebStoreResources.DownloadTermsGridEditButton %>' />
<asp:Button ID="btnEdit" runat="server" CommandName="Edit" SkinID="ButtonLink" Text='<%# Resources.WebStoreResources.DownloadTermsGridEditButton %>' />
</ItemTemplate>
<EditItemTemplate>
</EditItemTemplate>
Expand Down Expand Up @@ -59,18 +59,18 @@
</div>
<div class="forminput">
<asp:Button ID="btnGridUpdate" runat="server" Text='<%# Resources.WebStoreResources.DownloadTermsGridUpdateButton %>'
CommandName="Update" />
CommandName="Update" SkinID="SaveButton" />
<asp:Button ID="btnGridDelete" runat="server" Text='<%# Resources.WebStoreResources.DownloadTermsGridDeleteButton %>'
CommandName="Delete" />
CommandName="Delete" SkinID="DeleteButtonSmall"/>
<asp:Button ID="btnGridCancel" runat="server" Text='<%# Resources.WebStoreResources.DownloadTermsGridCancelButton %>'
CommandName="Cancel" />
CommandName="Cancel" SkinId="LinkButton"/>
</div>
</EditItemTemplate>
</asp:TemplateField>
</Columns>
</mp:mojoGridView>
<div class="settingrow">
<portal:mojoButton ID="btnAddNew" runat="server" />
<portal:mojoButton ID="btnAddNew" runat="server" SkinID="AddButton" />
</div>
<portal:mojoCutePager ID="pgrDownloadTerms" runat="server" />
<portal:EmptyPanel id="EmptyPanel1" runat="server" CssClass="cleared" SkinID="cleared"></portal:EmptyPanel>
Expand Down
2 changes: 1 addition & 1 deletion WebStore.UI/WebStore/AdminOffer.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</Columns>
</mp:mojoGridView>
<div class="settingrow">
<asp:HyperLink ID="lnkAddNew" runat="server" />
<asp:HyperLink ID="lnkAddNew" runat="server" SkinID="AddButton" />
</div>
<portal:mojoCutePager ID="pgrOffer" runat="server" />
<portal:EmptyPanel id="EmptyPanel1" runat="server" CssClass="cleared" SkinID="cleared"></portal:EmptyPanel>
Expand Down
Loading

0 comments on commit d103177

Please sign in to comment.