svn commit: r823806 - in /ofbiz/trunk/framework/webtools: config/ webapp/webtools/WEB-INF/ widget/

Fri, 09 Oct 2009 23:47:29 -0700 

Author: buscob
Date: Sat Oct 10 06:46:57 2009
New Revision: 823806

URL: http://svn.apache.org/viewvc?rev=823806&view=rev
Log:
Added TabBars menus for the WebTools application. (OFBIZ-3020)
The WebTools main screen is still untouched so that all screens can be reached 
in the same way as before.
When we are OK with the new screens grouping under menus we will remove the 
main screen as it is now.

Modified:
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml
    ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
    ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
    ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml
    ofbiz/trunk/framework/webtools/widget/LogScreens.xml
    ofbiz/trunk/framework/webtools/widget/Menus.xml
    ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
    ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
    ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=823806&r1=823805&r2=823806&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Sat Oct 10 
06:46:57 2009
@@ -41,7 +41,7 @@
         <value xml:lang="de">Entität Synch. ID</value>
         <value xml:lang="en">Entity Sync Id</value>
         <value xml:lang="fr">Réf. de synchro. d'entités</value>
-        <value xml:lang="it">Codice Entità Sincr.</value>
+        <value xml:lang="it">Codice entità Sincr.</value>
         <value xml:lang="ro">Cod Entitate Sincr.</value>
         <value 
xml:lang="th">รหัสสิ่งที่เกิดขึ้นพร้อมกัน</value>
         <value xml:lang="zh">实体同步标识</value>
@@ -204,7 +204,7 @@
         <value xml:lang="en">Framework Web Tools</value>
         <value xml:lang="es">Framework Herramientas Web</value>
         <value xml:lang="fr">Outils web du Framework</value>
-        <value xml:lang="it">Applicazione strumenti web</value>
+        <value xml:lang="it">Strumenti del Framework</value>
         <value xml:lang="ro">Aplicatie Instrumente Web</value>
         <value 
xml:lang="th">โครงสร้างของเครื่องมือเว็บ</value>
         <value xml:lang="zh">Web工具</value>
@@ -217,6 +217,11 @@
         <value 
xml:lang="th">ซ่อนการแก้ไขข้อมูล</value>
         <value xml:lang="zh">编辑缓存</value>
     </property>
+    <property key="PageTitleEntityEoModelBundle">
+        <value xml:lang="en">Entity Eo Model Bundle</value>
+        <value xml:lang="it">Entità Eo Model Bundle</value>
+        <value xml:lang="zh">实体EoModel绑定</value>
+    </property>
     <property key="PageTitleEntityExport">
         <value xml:lang="en">XML Data Export</value>
         <value xml:lang="fr">Export de données XML</value>
@@ -256,11 +261,6 @@
         <value 
xml:lang="th">นำเข้าข้อมูลผู้ตรวจ</value>
         <value xml:lang="zh">XML数据导入读取程序</value>
     </property>
-    <property key="PageTitleEntityEoModelBundle">
-        <value xml:lang="en">Entity Eo Model Bundle</value>
-        <value xml:lang="it">Entità Eo Model Bundle</value>
-        <value xml:lang="zh">实体EoModel绑定</value>
-    </property>
     <property key="PageTitleEntitySQLProcessor">
         <value xml:lang="de">Entitäten SQL Prozessor</value>
         <value xml:lang="en">Entity SQL Processor</value>
@@ -368,15 +368,6 @@
         <value 
xml:lang="th">รายงานเหตุการณ์ที่เกิดขึ้นต่อเนื่องกัน</value>
         <value xml:lang="zh">线程列表</value>
     </property>
-    <property key="WebtoolsAbsoluteFileNameOrUrl">
-        <value xml:lang="de">Absoluter Dateiname oder URL</value>
-        <value xml:lang="en">Absolute Filename or URL</value>
-        <value xml:lang="fr">Nom de fichier absolu ou URL</value>
-        <value xml:lang="it">Nome file assoluto o URL</value>
-        <value xml:lang="ro">Nume file absolut sau URL</value>
-        <value 
xml:lang="th">ชื่อไฟล์ที่สมบูรณ์หรือ
 URL</value>
-        <value xml:lang="zh">绝对文件名或网址</value>
-    </property>
     <property key="WebtoolsAbsoluteFTLFilename">
         <value xml:lang="de">Absoluter Dateiname der FreeMarker Vorlagedatei 
für den Datenfilter (optional)</value>
         <value xml:lang="en">Absolute Filename of FreeMarker template file to 
filter data by (optional)</value>
@@ -386,6 +377,15 @@
         <value 
xml:lang="th">ชื่อไฟล์ทั้งหมดของไฟล์
 FreeMarker template 
มีการกรองข้อมูลโดย(ทางเลือก)</value>
         <value 
xml:lang="zh">用于过滤数据的FreeMarker模板文件的绝对文件名（可选）</value>
     </property>
+    <property key="WebtoolsAbsoluteFileNameOrUrl">
+        <value xml:lang="de">Absoluter Dateiname oder URL</value>
+        <value xml:lang="en">Absolute Filename or URL</value>
+        <value xml:lang="fr">Nom de fichier absolu ou URL</value>
+        <value xml:lang="it">Nome file assoluto o URL</value>
+        <value xml:lang="ro">Nume file absolut sau URL</value>
+        <value 
xml:lang="th">ชื่อไฟล์ที่สมบูรณ์หรือ
 URL</value>
+        <value xml:lang="zh">绝对文件名或网址</value>
+    </property>
     <property key="WebtoolsAbsolutePath">
         <value xml:lang="de">Absoluter Verzeichnispfad</value>
         <value xml:lang="en">Absolute directory path</value>
@@ -509,9 +509,9 @@
     </property>
     <property key="WebtoolsCacheDebugTools">
         <value xml:lang="de">Cache &amp; Debug Tools</value>
-        <value xml:lang="en">Cache &amp; Debug Tools</value>
+        <value xml:lang="en">Cache &amp; Debug</value>
         <value xml:lang="fr">Cache et outils de débogage</value>
-        <value xml:lang="it">Strumenti di Debug e Cache</value>
+        <value xml:lang="it">Cache e Debug</value>
         <value xml:lang="ro">Instrumente de Debug si Cache</value>
         <value xml:lang="th">Cache &amp; 
เครื่องมือตรวจสอบจุดบกพร่อง</value>
         <value xml:lang="zh">缓存和调试工具</value>
@@ -754,6 +754,10 @@
         <value xml:lang="th">เงื่อนไข</value>
         <value xml:lang="zh">条件</value>
     </property>
+    <property key="WebtoolsConfiguration">
+        <value xml:lang="en">Configuration</value>
+        <value xml:lang="it">Configurazione</value>
+    </property>
     <property key="WebtoolsCount">
         <value xml:lang="de">Anzahl</value>
         <value xml:lang="en">Count</value>
@@ -1397,14 +1401,14 @@
         <value xml:lang="th">สำหรับ Entity</value>
         <value xml:lang="zh">实体</value>
     </property>
-    <property key="WebtoolsFormat">
-        <value xml:lang="de">Format</value>
-        <value xml:lang="en">Format</value>
-        <value xml:lang="fr">Format</value>
-        <value xml:lang="it">Formato</value>
-        <value xml:lang="ro">Format</value>
-        <value xml:lang="th">รูปแบบ</value>
-        <value xml:lang="zh">格式</value>
+    <property key="WebtoolsForSomethingInteresting">
+        <value xml:lang="de">Um etwas Interessantes zu sehen sollten Sie sich 
anmelden; versuchen Sie: admin, Passwort: ofbiz</value>
+        <value xml:lang="en">For something interesting make sure you are 
logged in, try username: admin, password: ofbiz</value>
+        <value xml:lang="fr">Pour quelque chose d'intéressant assurez-vous 
que vous avez ouvert une session. Essayez avec l'identifiant de connexion : 
admin, et le mot de passe : ofbiz</value>
+        <value xml:lang="it">Per accedere all'applicazione devi essere 
autenticato, prova con Nome utente:admin, Password:ofbiz</value>
+        <value xml:lang="ro">Daca  esti interesat, trebuie sa ai 
autentificare, incearca cu cu Nume utilizator :admin, Pasword :ofbiz</value>
+        <value 
xml:lang="th">เพื่อความแน่ใจคุณควรเข้าสู่ระบบโดยใช้
 ชื่อผูใช้: admin, รหัสผ่าน: ofbiz</value>
+        <value 
xml:lang="zh">如果你对其中的某些功能感兴趣，请先登录，可以尝试使用用户名：admin、密码：ofbiz登录</value>
     </property>
     <property key="WebtoolsForUseWithFrequency">
         <value xml:lang="de">mit der Frequenz nutzen</value>
@@ -1415,14 +1419,14 @@
         <value 
xml:lang="th">สำหรับใช้กับความบ่อย</value>
         <value xml:lang="zh">使用频率</value>
     </property>
-    <property key="WebtoolsForSomethingInteresting">
-        <value xml:lang="de">Um etwas Interessantes zu sehen sollten Sie sich 
anmelden; versuchen Sie: admin, Passwort: ofbiz</value>
-        <value xml:lang="en">For something interesting make sure you are 
logged in, try username: admin, password: ofbiz</value>
-        <value xml:lang="fr">Pour quelque chose d'intéressant assurez-vous 
que vous avez ouvert une session. Essayez avec l'identifiant de connexion : 
admin, et le mot de passe : ofbiz</value>
-        <value xml:lang="it">Per accedere all'applicazione devi essere 
autenticato, prova con Nome utente:admin, Password:ofbiz</value>
-        <value xml:lang="ro">Daca  esti interesat, trebuie sa ai 
autentificare, incearca cu cu Nume utilizator :admin, Pasword :ofbiz</value>
-        <value 
xml:lang="th">เพื่อความแน่ใจคุณควรเข้าสู่ระบบโดยใช้
 ชื่อผูใช้: admin, รหัสผ่าน: ofbiz</value>
-        <value 
xml:lang="zh">如果你对其中的某些功能感兴趣，请先登录，可以尝试使用用户名：admin、密码：ofbiz登录</value>
+    <property key="WebtoolsFormat">
+        <value xml:lang="de">Format</value>
+        <value xml:lang="en">Format</value>
+        <value xml:lang="fr">Format</value>
+        <value xml:lang="it">Formato</value>
+        <value xml:lang="ro">Format</value>
+        <value xml:lang="th">รูปแบบ</value>
+        <value xml:lang="zh">格式</value>
     </property>
     <property key="WebtoolsFreeMemory">
         <value xml:lang="de">FREI</value>
@@ -1500,6 +1504,10 @@
         <value xml:lang="th">นำเข้า</value>
         <value xml:lang="zh">导入</value>
     </property>
+    <property key="WebtoolsImportExport">
+        <value xml:lang="en">Import/Export</value>
+        <value xml:lang="it">Importazione/Esportazione</value>
+    </property>
     <property key="WebtoolsImportFile">
         <value xml:lang="de">Datei importieren</value>
         <value xml:lang="en">Import File</value>
@@ -1652,6 +1660,13 @@
         <value xml:lang="th">ประเภทจาวา</value>
         <value xml:lang="zh">Java类型</value>
     </property>
+    <property key="WebtoolsJavaVersionIs5">
+        <value xml:lang="en">Note: certain things only work in Java 5. Java 
Version is ${javaVer}; is Java 5 ?</value>
+        <value xml:lang="fr">Note: certaines choses ne fonctionnent qu'avec 
Java 5. La version de Java est: ${javaVer}; c'est Java 5 ?</value>
+        <value xml:lang="it">Nota: certe cose funzionano solo con Java 5. 
Versione Java è ${javaVer}; è Java 5 ?</value>
+        <value xml:lang="th">หมายเหตุ: 
การทำงานบางอย่างจะต้องทำใน 
Java 5. Java เวอร์ชันที่${javaVer};  Java 5 ?</value>
+        <value xml:lang="zh">注意：某些程序只能运行在Java 
5下。Java版本是${javaVer}；是Java 5吗？</value>
+    </property>
     <property key="WebtoolsJob">
         <value xml:lang="en">Job</value>
         <value xml:lang="fr">Job</value>
@@ -1726,6 +1741,12 @@
         <value xml:lang="it">Tutte le lingue</value>
         <value xml:lang="zh">全部语言</value>
     </property>
+    <property key="WebtoolsLabelManagerClearCacheAfterFixingDuplicateLabels">
+        <value xml:lang="de">Cache nach der Korrektur der Label-Dubletten 
löschen</value>
+        <value xml:lang="en">Clear Cache After Fixing Duplicated Labels</value>
+        <value xml:lang="fr">Purgez les caches après avoir supprimé les 
traductions dupliquées</value>
+        <value xml:lang="zh">解决重复标签后清除缓存</value>
+    </property>
     <property key="WebtoolsLabelManagerComponentName">
         <value xml:lang="de">OFBiz Komponente</value>
         <value xml:lang="en">Component Name</value>
@@ -1733,12 +1754,6 @@
         <value xml:lang="it">Nome Componente</value>
         <value xml:lang="zh">组件名称</value>
     </property>
-    <property key="WebtoolsLabelManagerClearCacheAfterFixingDuplicateLabels">
-        <value xml:lang="de">Cache nach der Korrektur der Label-Dubletten 
löschen</value>
-        <value xml:lang="en">Clear Cache After Fixing Duplicated Labels</value>
-        <value xml:lang="fr">Purgez les caches après avoir supprimé les 
traductions dupliquées</value>
-        <value xml:lang="zh">解决重复标签后清除缓存</value>
-    </property>
     <property key="WebtoolsLabelManagerFileName">
         <value xml:lang="de">Label-Datei</value>
         <value xml:lang="en">File Name</value>
@@ -1800,18 +1815,18 @@
         <value xml:lang="it">La label ${key} esiste già nel file 
${fileName}</value>
         <value 
xml:lang="zh">在文件${fileName}中已经存在标签${key}</value>
     </property>
-    <property key="WebtoolsLabelManagerOnlyNotUsedLabels">
-        <value xml:lang="de">Nur ungenutzte Labels</value>
-        <value xml:lang="en">Only Not Used Labels</value>
-        <value xml:lang="it">Solo traduzioni non usate</value>
-        <value xml:lang="zh">仅限没有使用过的标签</value>
-    </property>
     <property key="WebtoolsLabelManagerOnlyMissingTranslations">
         <value xml:lang="de">Nur fehlende Übersetzungen</value>
         <value xml:lang="en">Only Missing Translations</value>
         <value xml:lang="it">Solo traduzioni mancanti</value>
         <value xml:lang="zh">仅限缺少的翻译</value>
     </property>
+    <property key="WebtoolsLabelManagerOnlyNotUsedLabels">
+        <value xml:lang="de">Nur ungenutzte Labels</value>
+        <value xml:lang="en">Only Not Used Labels</value>
+        <value xml:lang="it">Solo traduzioni non usate</value>
+        <value xml:lang="zh">仅限没有使用过的标签</value>
+    </property>
     <property key="WebtoolsLabelManagerReferences">
         <value xml:lang="de">Referenzen</value>
         <value xml:lang="en">References</value>
@@ -2225,13 +2240,6 @@
         <value xml:lang="th">หมายเหตุ: Foreign keys 
อาจจะสร้างเฉพาะในการ 
ตรวจสอบ/อัพเดท ฐานข้อมูล 
การดำเนินการถ้า check-fks-on-start 
และทางเลือกอื่นๆในแหล่งข้อมูลที่ติดตั้งในการทำ</value>
         <value 
xml:lang="zh">注意：如果设置了数据源元素的check-fks-on-start（启动时检查外键）和其它选项，可能会创建外键。</value>
     </property>
-    <property key="WebtoolsJavaVersionIs5">
-        <value xml:lang="en">Note: certain things only work in Java 5. Java 
Version is ${javaVer}; is Java 5 ?</value>
-        <value xml:lang="fr">Note: certaines choses ne fonctionnent qu'avec 
Java 5. La version de Java est: ${javaVer}; c'est Java 5 ?</value>
-        <value xml:lang="it">Nota: certe cose funzionano solo con Java 5. 
Versione Java è ${javaVer}; è Java 5 ?</value>
-        <value xml:lang="th">หมายเหตุ: 
การทำงานบางอย่างจะต้องทำใน 
Java 5. Java เวอร์ชันที่${javaVer};  Java 5 ?</value>
-        <value xml:lang="zh">注意：某些程序只能运行在Java 
5下。Java版本是${javaVer}；是Java 5吗？</value>
-    </property>
     <property key="WebtoolsNotePerformanceResultsMayVary">
         <value xml:lang="en">NOTE: These performance results may vary a great 
deal for different databases, JDBC drivers, JTA implementations (transaction 
managers), connection pools, local vs. remote deployment configurations, and 
hardware (app server hardware, database server hardware, network 
connections).</value>
         <value xml:lang="fr">NOTE: Ces résultats d'exécution peuvent 
beaucoup varier  pour différent bases de données, pilotes JDBC,  
implémentations  JTA (gestionnaire de transaction), pools de connection, 
configurations de déploiement locale ou à distance, et matériel (serveur 
d'application, base de données, serveur, connections réseaux).</value>
@@ -2788,9 +2796,9 @@
     </property>
     <property key="WebtoolsServiceEngineTools">
         <value xml:lang="de">"Dienste-Maschine"</value>
-        <value xml:lang="en">Service Engine Tools</value>
+        <value xml:lang="en">Service Engine</value>
         <value xml:lang="fr">Outils du moteur de services</value>
-        <value xml:lang="it">Strumenti per Engine Servizi</value>
+        <value xml:lang="it">Engine Servizi</value>
         <value xml:lang="ro">Instrumente pentru Engin Service</value>
         <value xml:lang="th">เครื่องมือ Service Engine 
</value>
         <value xml:lang="zh">服务引擎工具</value>
@@ -2934,6 +2942,10 @@
         <value xml:lang="th">ประเภทของ SQL</value>
         <value xml:lang="zh">SQL类型</value>
     </property>
+    <property key="WebtoolsStatistics">
+        <value xml:lang="en">Statistics</value>
+        <value xml:lang="it">Statistiche</value>
+    </property>
     <property key="WebtoolsStatsAvg">
         <value xml:lang="de">Mittelwert</value>
         <value xml:lang="en">Avg</value>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=823806&r1=823805&r2=823806&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml 
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sat 
Oct 10 06:46:57 2009
@@ -571,7 +571,7 @@
 
     <view-map name="EntityPerformanceTest" type="screen" 
page="component://webtools/widget/EntityScreens.xml#EntityPerformanceTest"/>
 
-    <view-map name="ServiceLog" type="screen" 
page="component://webtools/widget/ServiceScreens.xml#ServiceLog"/>
+    <view-map name="ServiceLog" type="screen" 
page="component://webtools/widget/LogScreens.xml#ServiceLog"/>
     <view-map name="ServiceList" type="screen" 
page="component://webtools/widget/ServiceScreens.xml#ServiceList"/>
     <view-map name="FindJob" type="screen" 
page="component://webtools/widget/ServiceScreens.xml#FindJob"/>
     <view-map name="serviceResult" type="screen" 
page="component://webtools/widget/ServiceScreens.xml#ServiceResult"/>

Modified: ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml?rev=823806&r1=823805&r2=823806&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml Sat Oct 10 
06:46:57 2009
@@ -31,7 +31,7 @@
                 <script 
location="component://webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonArtifactDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template 
location="component://webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl"/></html></platform-specific>
                     </decorator-section>

Modified: ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=823806&r1=823805&r2=823806&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Sat Oct 10 06:46:57 
2009
@@ -83,11 +83,9 @@
                 <set field="titleProperty" value="WebtoolsCertsX509"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonConfigurationDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template 
location="component://webtools/webapp/webtools/cert/viewbrowsercerts.ftl"/></html>
-                        </platform-specific>
+                        <platform-specific><html><html-template 
location="component://webtools/webapp/webtools/cert/viewbrowsercerts.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -148,4 +146,84 @@
         </section>
     </screen>
 
+    <screen name="CommonImportExportDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="importExport"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for WEBTOOLS, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="ENTITY_MAINT"/>
+                            </condition>
+                            <widgets>
+                                <include-menu name="importExportTabBar" 
location="component://webtools/widget/Menus.xml"/>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label 
style="h3">${uiLabelMap.WebtoolsPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="CommonArtifactDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="artifact"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for WEBTOOLS, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="ENTITY_MAINT"/>
+                            </condition>
+                            <widgets>
+                                <include-menu name="artifactTabBar" 
location="component://webtools/widget/Menus.xml"/>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label 
style="h3">${uiLabelMap.WebtoolsPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="CommonConfigurationDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="configuration"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for WEBTOOLS, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="ENTITY_MAINT"/>
+                            </condition>
+                            <widgets>
+                                <include-menu name="configurationTabBar" 
location="component://webtools/widget/Menus.xml"/>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label 
style="h3">${uiLabelMap.WebtoolsPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>

Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=823806&r1=823805&r2=823806&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Sat Oct 10 06:46:57 
2009
@@ -54,7 +54,7 @@
                 <set field="results" from-field="parameters.results"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonEntityDecorator" 
location="component://webtools/widget/CommonScreens.xml">
+                <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <screenlet 
title="${uiLabelMap.PageTitleEntityExportAll}">
                             <platform-specific>
@@ -76,7 +76,7 @@
                 <set field="messages" from-field="parameters.messages"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonEntityDecorator" 
location="component://webtools/widget/CommonScreens.xml">
+                <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <screenlet 
title="${uiLabelMap.PageTitleEntityImportDir}">
                             <platform-specific>
@@ -98,7 +98,7 @@
                 <set field="messages" from-field="parameters.messages"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonEntityDecorator" 
location="component://webtools/widget/CommonScreens.xml">
+                <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleEntityImport}">
                             <platform-specific>
@@ -120,7 +120,7 @@
                 <set field="messages" from-field="parameters.messages"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonEntityDecorator" 
location="component://webtools/widget/CommonScreens.xml">
+                <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <screenlet 
title="${uiLabelMap.PageTitleEntityImportReaders}">
                             <platform-specific>
@@ -354,7 +354,7 @@
                 <set field="tabButtonItem" value="entityEoModelBundle"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonEntityDecorator" 
location="component://webtools/widget/CommonScreens.xml">
+                <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <include-form name="EntityEoModelBundle" 
location="component://webtools/widget/EntityForms.xml"/>
                     </decorator-section>
@@ -409,7 +409,7 @@
                 <script 
location="component://webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonEntityDecorator" 
location="component://webtools/widget/CommonScreens.xml">
+                <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <screenlet 
title="${uiLabelMap.WebtoolsCheckUpdateDatabase}">
                             <platform-specific><html><html-template 
location="component://webtools/webapp/webtools/entity/xmldsdump.ftl"/></html></platform-specific>

Modified: ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml?rev=823806&r1=823805&r2=823806&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml Sat Oct 10 
06:46:57 2009
@@ -31,7 +31,7 @@
                 <script 
location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/LabelManager.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonArtifactDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <container style="h1">
                             <label 
text="${uiLabelMap.WebtoolsLabelManagerFindLabels}"/>

Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=823806&r1=823805&r2=823806&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Sat Oct 10 06:46:57 
2009
@@ -45,6 +45,25 @@
             </widgets>
         </section>
     </screen>
+    
+    <screen name="ServiceLog">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleServiceList"/>
+                <set field="tabButtonItem" value="serviceLog"/>
+                <script 
location="component://webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="log-decorator">
+                    <decorator-section name="body">
+                        <platform-specific>
+                            <html><html-template 
location="component://webtools/webapp/webtools/service/services.ftl"/></html>
+                        </platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>  
 
     <screen name="LogConfiguration">
          <section>

Modified: ofbiz/trunk/framework/webtools/widget/Menus.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=823806&r1=823805&r2=823806&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/Menus.xml Sat Oct 10 06:46:57 2009
@@ -21,48 +21,78 @@
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd";>
 
     <menu name="WebtoolsAppBar" title="${uiLabelMap.FrameworkWebTools}" 
extends="CommonAppBarMenu" 
extends-resource="component://common/widget/CommonMenus.xml">
-        <menu-item name="cache" title="${uiLabelMap.WebtoolsCacheMaintenance}">
+        <menu-item name="logging" title="${uiLabelMap.WebtoolsLogging}">
+            <link target="LogView"/>
+        </menu-item>
+        <menu-item name="cache" title="${uiLabelMap.WebtoolsCacheDebugTools}">
             <link target="FindUtilCache"/>
         </menu-item>
-        <menu-item name="entity" 
title="${uiLabelMap.WebtoolsEntityEngineTools}">
+        <menu-item name="artifact" title="${uiLabelMap.WebtoolsArtifactInfo}">
+            <link target="ArtifactInfo"/>
+        </menu-item>
+        <menu-item name="entity" title="${uiLabelMap.WebtoolsEntityEngine}">
             <link target="entitymaint"/>
         </menu-item>
         <menu-item name="service" 
title="${uiLabelMap.WebtoolsServiceEngineTools}">
             <link target="ServiceList"/>
         </menu-item>
-        <menu-item name="labels" title="${uiLabelMap.WebtoolsLabelManager}">
-            <link target="SearchLabels"/>
-        </menu-item>
-        <menu-item name="logging" title="${uiLabelMap.WebtoolsLogging}">
-            <link target="LogView"/>
+        <menu-item name="importExport" 
title="${uiLabelMap.WebtoolsImportExport}">
+            <link target="xmldsdump"/>
         </menu-item>
-<!--
-        <menu-item name="workflow" title="Workflow">
-            <link target="workflowMonitor"/>
+        <menu-item name="stats" title="${uiLabelMap.WebtoolsStatistics}">
+            <link target="StatsSinceStart"/>
         </menu-item>
--->
-        <menu-item name="data" title="${uiLabelMap.WebtoolsDataFileTools}">
-            <link target="viewdatafile"/>
+        <menu-item name="configuration" 
title="${uiLabelMap.WebtoolsConfiguration}">
+            <link target="myCertificates"/>
         </menu-item>
-        <menu-item name="ArtifactInfo" 
title="${uiLabelMap.WebtoolsArtifactInfo}">
-            <link target="ArtifactInfo"/>
+        <menu-item name="tests" title="Tests">
+            <link target="selenium"/>
         </menu-item>
+    </menu>
+
+    <menu name="configurationTabBar" extends="CommonTabBarMenu" 
extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="page.tabButtonItem">
         <menu-item name="tempexpr" 
title="${uiLabelMap.WebtoolsTemporalExpression}">
             <link target="findTemporalExpression"/>
         </menu-item>
-        <menu-item name="stats" 
title="${uiLabelMap.WebtoolsStatsSinceServerStart}">
-            <link target="StatsSinceStart"/>
+        <menu-item name="myCertificates" 
title="${uiLabelMap.WebtoolsMyCertificates}">
+            <link target="myCertificates"/>
         </menu-item>
     </menu>
 
+    <menu name="importExportTabBar" extends="CommonTabBarMenu" 
extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="page.tabButtonItem">
+        <menu-item name="data" title="${uiLabelMap.WebtoolsDataFileTools}">
+            <link target="viewdatafile"/>
+        </menu-item>
+        <menu-item name="modelInduceFromDb" 
title="${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}">
+            <link target="view/ModelInduceFromDb"/>
+        </menu-item>
+        <menu-item name="entityEoModelBundle" 
title="${uiLabelMap.WebtoolsExportEntityEoModelBundle}">
+            <link target="EntityEoModelBundle"/>
+        </menu-item>
+        <menu-item name="xmlDsDump" 
title="${uiLabelMap.PageTitleEntityExport}">
+            <link target="xmldsdump"/>
+        </menu-item>
+        <menu-item name="entityExportAll" 
title="${uiLabelMap.PageTitleEntityExportAll}">
+            <link target="EntityExportAll"/>
+        </menu-item>
+        <menu-item name="entityImport" 
title="${uiLabelMap.PageTitleEntityImport}">
+            <link target="EntityImport"/>
+        </menu-item>
+        <menu-item name="entityImportDir" 
title="${uiLabelMap.PageTitleEntityImportDir}">
+            <link target="EntityImportDir"/>
+        </menu-item>
+        <menu-item name="entityImportReaders" 
title="${uiLabelMap.PageTitleEntityImportReaders}">
+            <link target="EntityImportReaders"/>
+        </menu-item>
+    </menu>
+    
     <menu name="serviceTabBar" extends="CommonTabBarMenu" 
extends-resource="component://common/widget/CommonMenus.xml"
           selected-menuitem-context-field-name="page.tabButtonItem">
         <menu-item name="serviceList" 
title="${uiLabelMap.WebtoolsServiceReference}">
             <link target="ServiceList"/>
         </menu-item>
-        <menu-item name="serviceLog" title="${uiLabelMap.WebtoolsServiceLog}">
-            <link target="ServiceLog"/>
-        </menu-item>
         <menu-item name="findJob" title="${uiLabelMap.WebtoolsJobList}">
             <link target="FindJob"/>
         </menu-item>
@@ -79,14 +109,37 @@
 
     <menu name="LoggingTabBar" extends="CommonTabBarMenu" 
extends-resource="component://common/widget/CommonMenus.xml"
           selected-menuitem-context-field-name="logMenuItem">
-        <menu-item name="viewLog" title="${uiLabelMap.WebtoolsViewLog}">
+        <menu-item name="logView" title="${uiLabelMap.WebtoolsViewLog}">
             <link target="LogView"/>
         </menu-item>
+        <menu-item name="serviceLog" title="${uiLabelMap.WebtoolsServiceLog}">
+            <link target="ServiceLog"/>
+        </menu-item>
         <menu-item name="logConfiguration" 
title="${uiLabelMap.PageTitleLogConfiguration}">
             <link target="LogConfiguration"/>
         </menu-item>
     </menu>
 
+    <menu name="CacheTabBar" extends="CommonTabBarMenu" 
extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="logMenuItem">
+        <menu-item name="findUtilCache" 
title="${uiLabelMap.WebtoolsCacheMaintenance}">
+            <link target="FindUtilCache"/>
+        </menu-item>
+    </menu>
+
+    <menu name="artifactTabBar" extends="CommonTabBarMenu" 
extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="logMenuItem">
+        <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="labels" title="${uiLabelMap.WebtoolsLabelManager}">
+            <link target="SearchLabels"/>
+        </menu-item>
+    </menu>
+    
     <menu name="TempExprTabBar" extends="CommonTabBarMenu" 
extends-resource="component://common/widget/CommonMenus.xml"
           selected-menuitem-context-field-name="tabMenuItem">
         <menu-item name="findExpression" title="${uiLabelMap.CommonFind}">
@@ -123,30 +176,11 @@
         <menu-item name="entitySyncStatus" 
title="${uiLabelMap.WebtoolsEntitySyncStatus}">
             <link target="EntitySyncStatus"/>
         </menu-item>
-        <menu-item name="modelInduceFromDb" 
title="${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}">
-            <link target="view/ModelInduceFromDb"/>
-        </menu-item>
-        <menu-item name="entityEoModelBundle" 
title="${uiLabelMap.WebtoolsExportEntityEoModelBundle}">
-            <link target="EntityEoModelBundle"/>
-        </menu-item>
         <menu-item name="checkDb" 
title="${uiLabelMap.WebtoolsCheckUpdateDatabase}">
             <link target="view/checkdb"/>
         </menu-item>
-
-        <menu-item name="xmlDsDump" 
title="${uiLabelMap.PageTitleEntityExport}">
-            <link target="xmldsdump"/>
-        </menu-item>
-        <menu-item name="entityExportAll" 
title="${uiLabelMap.PageTitleEntityExportAll}">
-            <link target="EntityExportAll"/>
-        </menu-item>
-        <menu-item name="entityImport" 
title="${uiLabelMap.PageTitleEntityImport}">
-            <link target="EntityImport"/>
-        </menu-item>
-        <menu-item name="entityImportDir" 
title="${uiLabelMap.PageTitleEntityImportDir}">
-            <link target="EntityImportDir"/>
-        </menu-item>
-        <menu-item name="entityImportReaders" 
title="${uiLabelMap.PageTitleEntityImportReaders}">
-            <link target="EntityImportReaders"/>
+        <menu-item name="entityPerformanceTest" 
title="${uiLabelMap.WebtoolsPerformanceTests}">
+            <link target="EntityPerformanceTest"/>
         </menu-item>
     </menu>
 

Modified: ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscScreens.xml?rev=823806&r1=823805&r2=823806&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Sat Oct 10 06:46:57 
2009
@@ -27,7 +27,7 @@
                 <set field="titleProperty" value="WebtoolsViewComponents"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonArtifactDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template 
location="component://webtools/webapp/webtools/component/viewComponents.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -44,7 +44,7 @@
                 <script 
location="component://webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonImportExportDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template 
location="component://webtools/webapp/webtools/datafile/viewdatafile.ftl"/></html></platform-specific>
                     </decorator-section>

Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=823806&r1=823805&r2=823806&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Sat Oct 10 
06:46:57 2009
@@ -46,25 +46,6 @@
         </section>
     </screen>
 
-    <screen name="ServiceLog">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleServiceList"/>
-                <set field="tabButtonItem" value="serviceLog"/>
-                <script 
location="component://webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonServiceDecorator" 
location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template 
location="component://webtools/webapp/webtools/service/services.ftl"/></html>
-                        </platform-specific>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
     <screen name="FindJob">
         <section>
             <actions>

Modified: ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml?rev=823806&r1=823805&r2=823806&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml Sat Oct 10 
06:46:57 2009
@@ -29,7 +29,7 @@
                 <set field="title" value="${uiLabelMap[titleProperty]}" 
global="true"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonConfigurationDecorator" 
location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <condition>

Reply via email to