Author: deepak
Date: Thu Oct 27 18:27:13 2016
New Revision: 1766864
URL: http://svn.apache.org/viewvc?rev=1766864&view=rev
Log:
Improved: Improper UI of View and Edit button bar on shipment page, this was
broken on flatgray theme.
(OFBIZ-7486)
Thanks Avnindra and Yash for your contribution.
Modified:
ofbiz/trunk/applications/product/template/shipment/ShipmentTabBar.ftl
Modified: ofbiz/trunk/applications/product/template/shipment/ShipmentTabBar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/ShipmentTabBar.ftl?rev=1766864&r1=1766863&r2=1766864&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/shipment/ShipmentTabBar.ftl
(original)
+++ ofbiz/trunk/applications/product/template/shipment/ShipmentTabBar.ftl Thu
Oct 27 18:27:13 2016
@@ -23,22 +23,26 @@ under the License.
<#if shipmentId?has_content>
<div class="button-bar tab-bar">
<ul>
- <li<#if selected="ViewShipment"> class="selected"</#if>><a
href="<@ofbizUrl>ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonView}</a></li>
- <li<#if selected="EditShipment"> class="selected"</#if>><a
href="<@ofbizUrl>EditShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a></li>
- <#if (shipment.shipmentTypeId)?? && shipment.shipmentTypeId =
"PURCHASE_RETURN">
- <li<#if selected="AddItemsFromInventory">
class="selected"</#if>><a
href="<@ofbizUrl>AddItemsFromInventory?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li>
- </#if>
- <#if (shipment.shipmentTypeId)?? && shipment.shipmentTypeId =
"SALES_SHIPMENT">
- <li<#if selected="EditShipmentPlan"> class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentPlan?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductShipmentPlan}</a></li>
- <li<#if selected="AddItemsFromOrder"> class="selected"</#if>><a
href="<@ofbizUrl>AddItemsFromOrder?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li>
- <li<#if selected="EditShipmentItems"> class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentItems?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductItems}</a></li>
- <li<#if selected="EditShipmentPackages"> class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentPackages?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductPackages}</a></li>
- <li<#if selected="EditShipmentRouteSegments">
class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentRouteSegments?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductRouteSegments}</a></li>
- </#if>
- <#if (shipment.shipmentTypeId)?? &&
shipment.shipmentTypeId='PURCHASE_SHIPMENT'>
- <li<#if selected="EditShipmentPlan"> class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentPlan?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li>
- <li<#if selected="ViewShipmentReceipts"> class="selected"</#if>><a
href="<@ofbizUrl>ViewShipmentReceipts?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductShipmentReceipts}</a></li>
- </#if>
+ <li>
+ <ul>
+ <li<#if selected="ViewShipment"> class="selected"</#if>><a
href="<@ofbizUrl>ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonView}</a></li>
+ <li<#if selected="EditShipment"> class="selected"</#if>><a
href="<@ofbizUrl>EditShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a></li>
+ <#if (shipment.shipmentTypeId)?? && shipment.shipmentTypeId =
"PURCHASE_RETURN">
+ <li<#if selected="AddItemsFromInventory">
class="selected"</#if>><a
href="<@ofbizUrl>AddItemsFromInventory?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li>
+ </#if>
+ <#if (shipment.shipmentTypeId)?? && shipment.shipmentTypeId =
"SALES_SHIPMENT">
+ <li<#if selected="EditShipmentPlan">
class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentPlan?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductShipmentPlan}</a></li>
+ <li<#if selected="AddItemsFromOrder">
class="selected"</#if>><a
href="<@ofbizUrl>AddItemsFromOrder?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li>
+ <li<#if selected="EditShipmentItems">
class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentItems?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductItems}</a></li>
+ <li<#if selected="EditShipmentPackages">
class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentPackages?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductPackages}</a></li>
+ <li<#if selected="EditShipmentRouteSegments">
class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentRouteSegments?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductRouteSegments}</a></li>
+ </#if>
+ <#if (shipment.shipmentTypeId)?? &&
shipment.shipmentTypeId='PURCHASE_SHIPMENT'>
+ <li<#if selected="EditShipmentPlan">
class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentPlan?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li>
+ <li<#if selected="ViewShipmentReceipts">
class="selected"</#if>><a
href="<@ofbizUrl>ViewShipmentReceipts?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductShipmentReceipts}</a></li>
+ </#if>
+ </ul>
+ </li>
</ul>
<br />
</div>
