svn commit: r1508738 - in /ofbiz/trunk/framework/webtools: config/WebtoolsUiLabels.xml webapp/webtools/main.ftl widget/Menus.xml

[hansbak]

Author: hansbak
Date: Wed Jul 31 06:26:37 2013
New Revision: 1508738

URL: http://svn.apache.org/r1508738
Log:
make component list the top level menu item of 'artifacts' because loading 
fast. move the 'take some time' message on the lower level menu iem now renamed 
 to 'atifact search' 

Modified:
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
    ofbiz/trunk/framework/webtools/widget/Menus.xml

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1508738&r1=1508737&r2=1508738&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Wed Jul 31 
06:26:37 2013
@@ -813,15 +813,20 @@
     </property>
     <property key="WebtoolsArtifactInfo">
         <value xml:lang="de">OFBiz Elemente-Info</value>
-        <value xml:lang="en">Artifact Info (may take some time to load)</value>
-        <value xml:lang="fr">Information sur les éléments d'OFBiz (cela peut 
prendre un certain temps à charger)</value>
+        <value xml:lang="en">Artifact Info</value>
+        <value xml:lang="fr">Information sur les éléments d'OFBiz</value>
         <value xml:lang="it">Informazioni sugli artefatti</value>
         <value xml:lang="ja">OFBiz要素情報</value>
         <value xml:lang="pt">Info do Artefato</value>
-        <value xml:lang="vi">Thông tin Nhân tạo (đợi chút thời 
gian)</value>
+        <value xml:lang="vi">Thông tin Nhân tạo</value>
         <value xml:lang="zh">人工程序信息</value>
         <value xml:lang="zh_TW">人工程式資訊</value>
     </property>
+    <property key="WebtoolsArtifactInfoTimeToLoad">
+        <value xml:lang="en">(may take some time to load)</value>
+        <value xml:lang="fr">(cela peut prendre un certain temps à 
charger)</value>
+        <value xml:lang="vi">(đợi chút thời gian)</value>
+    </property>
     <property key="WebtoolsAsync">
         <value xml:lang="de">Asynchron</value>
         <value xml:lang="en">ASYNC</value>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl?rev=1508738&r1=1508737&r2=1508738&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl Wed Jul 31 06:26:37 
2013
@@ -41,7 +41,7 @@ under the License.
         <li><a 
href="<@ofbizUrl>ViewComponents</@ofbizUrl>">${uiLabelMap.WebtoolsViewComponents}</a></li>
         <#if security.hasPermission("ARTIFACT_INFO_VIEW", session)>
           <li><h3>${uiLabelMap.WebtoolsGeneralArtifactInfoTools}</h3></li>
-          <li><a href="<@ofbizUrl>ArtifactInfo</@ofbizUrl>" 
target="_blank">${uiLabelMap.WebtoolsArtifactInfo}</a></li>
+          <li><a href="<@ofbizUrl>ViewComponents</@ofbizUrl>" 
target="_blank">${uiLabelMap.WebtoolsArtifactInfo}</a></li>
           <li><a href="<@ofbizUrl>entityref</@ofbizUrl>" 
target="_blank">${uiLabelMap.WebtoolsEntityReference} - 
${uiLabelMap.WebtoolsEntityReferenceInteractiveVersion}</a></li>
           <li><a 
href="<@ofbizUrl>ServiceList</@ofbizUrl>">${uiLabelMap.WebtoolsServiceReference}</a></li>
         </#if>

Modified: ofbiz/trunk/framework/webtools/widget/Menus.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=1508738&r1=1508737&r2=1508738&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/Menus.xml Wed Jul 31 06:26:37 2013
@@ -28,7 +28,7 @@ under the License.
             <link target="FindUtilCache"/>
         </menu-item>
         <menu-item name="artifact" title="${uiLabelMap.WebtoolsArtifactInfo}">
-            <link target="ArtifactInfo"/>
+            <link target="ViewComponents"/>
         </menu-item>
         <menu-item name="entity" title="${uiLabelMap.WebtoolsEntityEngine}">
             <link target="entitymaint"/>
@@ -142,12 +142,12 @@ under the License.
 
     <menu name="artifactTabBar" extends="CommonTabBarMenu" 
extends-resource="component://common/widget/CommonMenus.xml"
           selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="artifactInfo" 
title="${uiLabelMap.WebtoolsArtifactInfo}">
-            <link target="ArtifactInfo"/>
-        </menu-item>
         <menu-item name="viewents" 
title="${uiLabelMap.WebtoolsViewComponents}">
             <link target="ViewComponents"/>
         </menu-item>
+        <menu-item name="artifactInfo" 
title="${uiLabelMap.WebtoolsArtifactInfo} ${uiLabelMap.CommonSearch} 
${uiLabelMap.WebtoolsArtifactInfoTimeToLoad}">
+            <link target="ArtifactInfo"/>
+        </menu-item>
         <menu-item name="labels" title="${uiLabelMap.WebtoolsLabelManager}">
             <link target="SearchLabels"/>
         </menu-item>