svn commit: r771075 - in /ofbiz/branches/release09.04: ./ applications/product/widget/ca
Locked
svn commit: r771075 - in /ofbiz/branches/release09.04: ./ applications/product/widget/ca
 
|
Author: jleroux
Date: Sun May 3 16:23:28 2009 New Revision: 771075 URL: http://svn.apache.org/viewvc?rev=771075&view=rev Log: "Applied fix from trunk for revision: 771073 " ------------------------------------------------------------------------ r771073 | jleroux | 2009-05-03 18:19:04 +0200 (dim., 03 mai 2009) | 4 lines I missed some files in the 1st commit for BizznessTime theme. I will do 2 commits to not push (backport) the new BizznessTime theme as default in R9.04 as long as we are not sure of its quality in trunk. Putting it as default in trunk should help to strengthen it (hoping reports from users) ------------------------------------------------------------------------ Added: ofbiz/branches/release09.04/framework/bi/webapp/bi/main.ftl - copied unchanged from r771073, ofbiz/trunk/framework/bi/webapp/bi/main.ftl Modified: ofbiz/branches/release09.04/ (props changed) ofbiz/branches/release09.04/applications/product/widget/catalog/CommonScreens.xml ofbiz/branches/release09.04/framework/bi/widget/BiScreens.xml ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml ofbiz/branches/release09.04/framework/webtools/webapp/webtools/main.ftl Propchange: ofbiz/branches/release09.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 3 16:23:28 2009 @@ -1 +1 @@ -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997 +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073 Modified: ofbiz/branches/release09.04/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/widget/catalog/CommonScreens.xml?rev=771075&r1=771074&r2=771075&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/branches/release09.04/applications/product/widget/catalog/CommonScreens.xml Sun May 3 16:23:28 2009 @@ -229,7 +229,7 @@ <screen name="leftbar"> <section> <widgets> - <container style="left"> + <container style="left" id="leftSection"> <include-screen name="keywordsearchbox"/> <include-screen name="sidecatalogs"/> <include-screen name="sidedeepcategory"/> Modified: ofbiz/branches/release09.04/framework/bi/widget/BiScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/bi/widget/BiScreens.xml?rev=771075&r1=771074&r2=771075&view=diff ============================================================================== --- ofbiz/branches/release09.04/framework/bi/widget/BiScreens.xml (original) +++ ofbiz/branches/release09.04/framework/bi/widget/BiScreens.xml Sun May 3 16:23:28 2009 @@ -141,108 +141,28 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.BusinessIntelligenceIntegratedFramework}</label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote1} - </label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote2} - ${uiLabelMap.BusinessIntelligenceNote3} - </label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote4} - ${uiLabelMap.BusinessIntelligenceNote5} - </label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote6} - ${uiLabelMap.BusinessIntelligenceNote7} - ${uiLabelMap.BusinessIntelligenceNote8} - ${uiLabelMap.BusinessIntelligenceNote9} - </label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote10} - </label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote11} - ${uiLabelMap.BusinessIntelligenceNote12} - </label> - </container> - <container> - <label style="h3"> - ${uiLabelMap.BusinessIntelligenceCurrentStatus} - </label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote13} - ${uiLabelMap.BusinessIntelligenceNote14} - ${uiLabelMap.BusinessIntelligenceNote15} - </label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote16} - ${uiLabelMap.BusinessIntelligenceNote17} - </label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote18} - </label> - </container> - <container> - <label style="h3"> - ${uiLabelMap.BusinessIntelligenceQuickStartGuide} - </label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote19} - ${uiLabelMap.BusinessIntelligenceNote20} - </label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote21} - ${uiLabelMap.BusinessIntelligenceNote22} - ${uiLabelMap.BusinessIntelligenceNote23} - ${uiLabelMap.BusinessIntelligenceNote24} - ${uiLabelMap.BusinessIntelligenceNote25} - </label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote26} - ${uiLabelMap.BusinessIntelligenceNote27} - ${uiLabelMap.BusinessIntelligenceNote28} - </label> - </container> - <container> - <link target="quickInitDataWarehouse" text="${uiLabelMap.BusinessIntelligenceQuickInitDataWarehouse}" style="buttontext"> - <parameter param-name="fromDate"/> - <parameter param-name="thruDate"/> - </link> - <label> (${uiLabelMap.CommonFromDate} ${fromDate} ${uiLabelMap.CommonThruDate} ${thruDate})</label> - </container> - <container> - <label> - ${uiLabelMap.BusinessIntelligenceNote29} - ${uiLabelMap.BusinessIntelligenceNote30} - ${uiLabelMap.BusinessIntelligenceNote31} - </label> + <container style="screenlet"> + <container> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://bi/webapp/bi/main.ftl"/></html> + </platform-specific> + </widgets> + </section> + </container> + <container style="screenlet-body"> + <link target="quickInitDataWarehouse" text="${uiLabelMap.BusinessIntelligenceQuickInitDataWarehouse}" style="buttontext"> + <parameter param-name="fromDate"/> + <parameter param-name="thruDate"/> + </link> + <label style="note"> (${uiLabelMap.CommonFromDate} ${fromDate} ${uiLabelMap.CommonThruDate} ${thruDate})</label> + <label style="note"> + ${uiLabelMap.BusinessIntelligenceNote29} + ${uiLabelMap.BusinessIntelligenceNote30} + ${uiLabelMap.BusinessIntelligenceNote31} + </label> + </container> </container> </decorator-section> </decorator-screen> Modified: ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml?rev=771075&r1=771074&r2=771075&view=diff ============================================================================== --- ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml Sun May 3 16:23:28 2009 @@ -564,6 +564,19 @@ <value xml:lang="zh">ä»»ä½ç½ç«</value> <value xml:lang="zh_CN">ä»»æç½ç«</value> </property> + <property key="CommonApplications"> + <value xml:lang="de">Anwendungen</value> + <value xml:lang="en">Applications</value> + <value xml:lang="es">Aplicaciones</value> + <value xml:lang="fr">Applications</value> + <value xml:lang="hi_IN">à¤à¤ªà¥à¤ªà¥à¤²à¤¿à¤à¥à¤¶à¤¨à¥à¤¸</value> + <value xml:lang="it">Applicazioni</value> + <value xml:lang="nl">Toepassingen</value> + <value xml:lang="pt">Aplicações</value> + <value xml:lang="ru">ÐÑименениÑ</value> + <value xml:lang="zh">åºç¨</value> + <value xml:lang="zh_CN">æç¨</value> + </property> <property key="CommonApply"> <value xml:lang="ar">تطبÙÙ</value> <value xml:lang="de">Anwenden</value> @@ -4857,6 +4870,19 @@ <value xml:lang="zh">ä¸ä¸ä¸ª</value> <value xml:lang="zh_CN">å</value> </property> + <property key="CommonPrimaryApps"> + <value xml:lang="de">Primäranwendungen</value> + <value xml:lang="en">Primary Apps</value> + <value xml:lang="es">Apps primario</value> + <value xml:lang="fr">Applications principales</value> + <value xml:lang="hi_IN">पà¥à¤°à¤¾à¤¥à¤®à¤¿à¤ à¤à¤ªà¥à¤ªà¥à¤²à¤¿à¤à¥à¤¶à¤¨à¥à¤¸</value> + <value xml:lang="it">Apps primario</value> + <value xml:lang="nl">Primaire Apps</value> + <value xml:lang="pt">Apps preliminar</value> + <value xml:lang="ru">ÐÑновнÑе пÑименениÑ</value> + <value xml:lang="zh">主è¦åºç¨</value> + <value xml:lang="zh_CN">主è¦æç¨</value> + </property> <property key="CommonPrint"> <value xml:lang="ar">Ùسخ</value> <value xml:lang="de">Drucken</value> @@ -5582,6 +5608,19 @@ <value xml:lang="th">à¹à¸à¸¥à¸³à¸à¸±à¸à¸à¸µà¹à¸ªà¸à¸</value> <value xml:lang="zh">æ¯ç§</value> </property> + <property key="CommonSecondaryApps"> + <value xml:lang="de">Sekundäranwendungen</value> + <value xml:lang="en">Secondary Apps</value> + <value xml:lang="es">Apps secundario</value> + <value xml:lang="fr">Applications secondaires</value> + <value xml:lang="hi_IN">दà¥à¤µà¤¿à¤¤à¥à¤¯à¤ à¤à¤ªà¥à¤ªà¥à¤²à¤¿à¤à¥à¤¶à¤¨à¥à¤¸</value> + <value xml:lang="it">Apps secondario</value> + <value xml:lang="nl">Secundaire Apps</value> + <value xml:lang="pt">Apps secundário</value> + <value xml:lang="ru">ÐÑоÑиÑнÑе пÑименениÑ</value> + <value xml:lang="zh">éå±åºç¨</value> + <value xml:lang="zh_CN">é屬æç¨</value> + </property> <property key="CommonSecondly"> <value xml:lang="ar">ثاÙÙا</value> <value xml:lang="de">Zweiter</value> Modified: ofbiz/branches/release09.04/framework/webtools/webapp/webtools/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/webtools/webapp/webtools/main.ftl?rev=771075&r1=771074&r2=771075&view=diff ============================================================================== --- ofbiz/branches/release09.04/framework/webtools/webapp/webtools/main.ftl (original) +++ ofbiz/branches/release09.04/framework/webtools/webapp/webtools/main.ftl Sun May 3 16:23:28 2009 @@ -16,30 +16,6 @@ specific language governing permissions and limitations under the License. --> - -<#-- TODO: Remove embedded style during UI refactor --> -<style type="text/css"> -.webToolList { -list-style-type: none; -margin-left: 1em; -} -.webToolList li { -padding: 0 1em 0 1em; -} -.webToolList h3 { -padding: 1em 0 0 0; -margin-left: -1em; -} -.webToolList li a { -color: #000099; -font-weight: bold; -text-decoration: none; -} -.webToolList li a:hover { -text-decoration: underline; -} -</style> - <div class="screenlet"> <div class="screenlet-title-bar"> <ul> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |