small display adjustments and missing label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1128866 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/applications/product/config/ProductUiLabels.xml b/applications/product/config/ProductUiLabels.xml
index 40c5e8f..4ee33b0 100644
--- a/applications/product/config/ProductUiLabels.xml
+++ b/applications/product/config/ProductUiLabels.xml
@@ -7600,6 +7600,9 @@
<value xml:lang="en">Find Category</value>
<value xml:lang="th">ค้นหาหมวดหมู่</value>
</property>
+ <property key="PageTitleFindCatalog">
+ <value xml:lang="en">Find Catalog</value>
+ </property>
<property key="PageTitleFindConfigItems">
<value xml:lang="de">Konfigurationsposition suchen</value>
<value xml:lang="en">Find Config Items</value>
diff --git a/applications/product/widget/catalog/CatalogMenus.xml b/applications/product/widget/catalog/CatalogMenus.xml
index a1e343d..c13e97f 100644
--- a/applications/product/widget/catalog/CatalogMenus.xml
+++ b/applications/product/widget/catalog/CatalogMenus.xml
@@ -498,7 +498,7 @@
<parameter param-name="product_id" from-field="productId"/>
</link>
</menu-item>
- <menu-item name="ProductBarCode" title="${uiLabelMap.ProductProductPage}">
+ <menu-item name="ProductBarCode" title="${uiLabelMap.ProductBarcode}">
<condition>
<not><if-empty field="product"/></not>
</condition>
diff --git a/applications/product/widget/catalog/CommonScreens.xml b/applications/product/widget/catalog/CommonScreens.xml
index 4a6a9dc..ead657f 100644
--- a/applications/product/widget/catalog/CommonScreens.xml
+++ b/applications/product/widget/catalog/CommonScreens.xml
@@ -381,12 +381,15 @@
</condition>
<widgets>
<include-menu name="ImageManagementTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
- <decorator-section-include name="body"/>
+ <container style="h1">
+ <label text=" "/>
+ </container>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
</fail-widgets>
</section>
+ <decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
</widgets>
diff --git a/applications/product/widget/catalog/PromoScreens.xml b/applications/product/widget/catalog/PromoScreens.xml
index 81d1e91..6bb65d5 100644
--- a/applications/product/widget/catalog/PromoScreens.xml
+++ b/applications/product/widget/catalog/PromoScreens.xml
@@ -38,12 +38,12 @@
<condition><not><if-empty field="productPromoId"/></not></condition>
<widgets>
<include-menu name="PromoTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
- <container>
- <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productPromo.promoName} [${uiLabelMap.CommonId}:${productPromoId}] ${${extraFunctionName}}</label>
- </container>
<container style="button-bar">
<link target="EditProductPromo" text="${uiLabelMap.ProductNewProductPromo}" style="buttontext"/>
</container>
+ <container>
+ <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productPromo.promoName} [${uiLabelMap.CommonId}:${productPromoId}] ${${extraFunctionName}}</label>
+ </container>
</widgets>
</section>
