Skip to content

Commit

Permalink
Minor changes - admin panel
Browse files Browse the repository at this point in the history
  • Loading branch information
GrandNode committed Mar 3, 2017
1 parent f6b14ff commit cffa7ea
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

<script>
$(document).ready(function () {
$('#interactiveform-edit').show();
$("#interactiveform-edit").kendoTabStrip({
animation: {
open: {
Expand All @@ -17,7 +18,7 @@
});
</script>

<div id="interactiveform-edit">
<div id="interactiveform-edit" style="display:none">
<ul>
<li @Html.RenderSelectedTabIndex(0, GetSelectedTabIndex())>
@T("Admin.Promotions.InteractiveForms.Info")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<script type="text/javascript">
$(document).ready(function () {
$('#attribute-edit').show();
$("#attribute-edit").kendoTabStrip({
animation: {
open: {
Expand All @@ -16,7 +17,7 @@
});
</script>

<div id="attribute-edit">
<div id="attribute-edit" style="display:none">
<ul>
<li @Html.RenderSelectedTabIndex(0, GetSelectedTabIndex())>
@T("Admin.Promotions.InteractiveForms.Attribute.Info")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
@T("Admin.Orders.Products.GiftCards")<text>:</text>
@for (int i = 0; i < item.PurchasedGiftCardIds.Count; i++)
{
<a href="@Url.Action("Edit", "GiftCard", new { id = item.PurchasedGiftCardIds[i] })">@item.PurchasedGiftCardIds[i]</a>
<a href="@Url.Action("Edit", "GiftCard", new { id = item.PurchasedGiftCardIds[i] })">@T("Admin.Orders.Products.GiftCard.View")</a>
if (i != item.PurchasedGiftCardIds.Count - 1)
{
<text>,</text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -779,4 +779,7 @@
<LocaleResource Name="Admin.Configuration.Stores.Fields.DefaultWarehouse.Hint">
<Value>This property allows a store owner to specify a default warehouse for a store.</Value>
</LocaleResource>
<LocaleResource Name="Admin.Orders.Products.GiftCard.View">
<Value>View</Value>
</LocaleResource>
</Language>
Original file line number Diff line number Diff line change
Expand Up @@ -570,9 +570,6 @@
<LocaleResource Name="Account.RewardPoints">
<Value>Reward points</Value>
</LocaleResource>
<LocaleResource Name="Account.ShoppingCart">
<Value>Shopping Cart</Value>
</LocaleResource>
<LocaleResource Name="Account.YourAddress">
<Value>Your Address</Value>
</LocaleResource>
Expand Down Expand Up @@ -11122,6 +11119,9 @@
<LocaleResource Name="Admin.Orders.Products.GiftCards">
<Value>Gift card(s)</Value>
</LocaleResource>
<LocaleResource Name="Admin.Orders.Products.GiftCard.View">
<Value>View</Value>
</LocaleResource>
<LocaleResource Name="Admin.Orders.Products.License">
<Value>License file (optional):</Value>
</LocaleResource>
Expand Down Expand Up @@ -16589,7 +16589,7 @@
<Value>Vendor</Value>
</LocaleResource>
<LocaleResource Name="ShoppingCart">
<Value>Shopping Cart</Value>
<Value>Cart</Value>
</LocaleResource>
<LocaleResource Name="ShoppingCart.AddToCart">
<Value>Add to cart</Value>
Expand Down

0 comments on commit cffa7ea

Please sign in to comment.