svn commit: r892160 [3/3] - in /ofbiz/trunk/specialpurpose/ofbizwebsite: config/OfbizUiLabels.xml data/OfbizData.xml webapp/ofbiz/WEB-INF/controller.xml widget/OfbizScreens.xml

[hansbak-2]

Modified: ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/controller.xml?rev=892160&r1=892159&r2=892160&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/controller.xml Fri Dec 18 07:08:54 2009
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
     <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
 
-    <description>OFBiz: OFBiz Thai for Thai people.</description>
+    <description>OFBiz : The Apache Open for Business Project</description>
 
     <!-- default request; call into CMS -->
     <default-request request-uri="main"/>
@@ -33,31 +33,6 @@
         <response name="success" type="view" value="home"/>
         <response name="error" type="view" value="error"/>
     </request-map>
-    <!-- End of Request Mappings -->
-
-    <request-map uri="product">
-        <security https="false" auth="false"/>
-        <response name="success" type="view" value="product"/>
-        <response name="error" type="view" value="error"/>
-    </request-map>
-    
-    <request-map uri="service">
-        <security https="false" auth="false"/>
-        <response name="success" type="view" value="service"/>
-        <response name="error" type="view" value="error"/>
-    </request-map>
-    
-    <request-map uri="course">
-        <security https="false" auth="false"/>
-        <response name="success" type="view" value="course"/>
-        <response name="error" type="view" value="error"/>
-    </request-map>
-    
-    <request-map uri="contact">
-        <security https="false" auth="false"/>
-        <response name="success" type="view" value="contact"/>
-        <response name="error" type="view" value="error"/>
-    </request-map>
     
     <request-map uri="setSessionLocale">
         <security https="false" auth="false"/>
@@ -65,10 +40,7 @@
         <response name="success" type="view-last" value="home"/>
         <response name="error" type="request" value="home"/>
     </request-map>
+    <!-- End of Request Mappings -->
     
     <view-map name="home" type="screen" page="component://ofbiz/widget/OfbizScreens.xml#home"/>
-    <view-map name="product" type="screen" page="component://ofbiz/widget/OfbizScreens.xml#product"/>
-    <view-map name="service" type="screen" page="component://ofbiz/widget/OfbizScreens.xml#service"/>
-    <view-map name="course" type="screen" page="component://ofbiz/widget/OfbizScreens.xml#course"/>
-    <view-map name="contact" type="screen" page="component://ofbiz/widget/OfbizScreens.xml#contact"/>
 </site-conf>

Modified: ofbiz/trunk/specialpurpose/ofbizwebsite/widget/OfbizScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ofbizwebsite/widget/OfbizScreens.xml?rev=892160&r1=892159&r2=892160&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ofbizwebsite/widget/OfbizScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ofbizwebsite/widget/OfbizScreens.xml Fri Dec 18 07:08:54 2009
@@ -37,55 +37,7 @@
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <content content-id="OFBIZ_HOME_TH"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
-    <screen name="product">
-        <section>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                        
-                        <content content-id="OFBIZ_PRODUCT_TH"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
-    <screen name="service">
-        <section>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                        
-                        <content content-id="OFBIZ_SERVICE_TH"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
-    <screen name="course">
-        <section>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                        
-                        <content content-id="OFBIZ_COURSE_TH"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
-    <screen name="contact">
-        <section>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                        
-                        <content content-id="OFBIZ_CONTACT_TH"/>
+                        <content content-id="OFBIZ_HOME_EN"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>