You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bi...@apache.org on 2008/06/16 17:43:12 UTC
svn commit: r668202 - in /ofbiz/trunk: applications/accounting/widget/ap/
applications/accounting/widget/ar/ applications/content/widget/content/
applications/humanres/widget/ applications/marketing/widget/
applications/marketing/widget/sfa/ specialpur...
Author: bibryam
Date: Mon Jun 16 08:43:11 2008
New Revision: 668202
URL: http://svn.apache.org/viewvc?rev=668202&view=rev
Log:
Replaced col-right style with opposed from my previous commit and other places. Thanks to Adrian for pointing out.
Modified:
ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml
ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
ofbiz/trunk/applications/humanres/widget/Menus.xml
ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml
ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
ofbiz/trunk/specialpurpose/bi/widget/BiMenus.xml
ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseMenus.xml
ofbiz/trunk/specialpurpose/oagis/widget/Menus.xml
ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl
Modified: ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/Menus.xml?rev=668202&r1=668201&r2=668202&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/Menus.xml Mon Jun 16 08:43:11 2008
@@ -26,11 +26,11 @@
<menu-item name="payments" title="${uiLabelMap.AccountingPaymentsMenu}"><link target="findPayments"/></menu-item>
<menu-item name="findVendors" title="${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}"><link target="findVendors"/></menu-item>
<menu-item name="reports" title="${uiLabelMap.AccountingReports}"><link target="listReports"/></menu-item>
- <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
+ <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed">
<condition><not><if-empty field-name="userLogin"/></not></condition>
<link target="logout"/>
</menu-item>
- <menu-item name="Login" title="${uiLabelMap.PageTitleLogin}" align-style="col-right" selected-style="selected">
+ <menu-item name="Login" title="${uiLabelMap.PageTitleLogin}" align-style="opposed">
<condition><if-empty field-name="userLogin"/></condition>
<link target="${checkLoginUrl}"/>
</menu-item>
Modified: ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml?rev=668202&r1=668201&r2=668202&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml Mon Jun 16 08:43:11 2008
@@ -26,11 +26,11 @@
<menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}"><link target="findInvoices"/></menu-item>
<menu-item name="payments" title="${uiLabelMap.AccountingPaymentsMenu}"><link target="findPayments"/></menu-item>
<menu-item name="reports" title="${uiLabelMap.AccountingReports}"><link target="ListReports"/></menu-item>
- <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
+ <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed">
<condition><not><if-empty field-name="userLogin"/></not></condition>
<link target="logout"/>
</menu-item>
- <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="col-right" selected-style="selected">
+ <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="opposed">
<condition><if-empty field-name="userLogin"/></condition>
<link target="${checkLoginUrl}"/>
</menu-item>
Modified: ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?rev=668202&r1=668201&r2=668202&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Mon Jun 16 08:43:11 2008
@@ -33,11 +33,11 @@
<menu-item name="CMS" title="${uiLabelMap.ContentCMS}"><link target="CMSContentFind"/></menu-item>
<menu-item name="CompDoc" title="${uiLabelMap.ContentCompDoc}"><link target="FindCompDoc"/></menu-item>
- <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
+ <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed">
<condition><not><if-empty field-name="userLogin"/></not></condition>
<link target="logout"/>
</menu-item>
- <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="col-right" selected-style="selected">
+ <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="opposed">
<condition><if-empty field-name="userLogin"/></condition>
<link target="${checkLoginUrl}"/>
</menu-item>
Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=668202&r1=668201&r2=668202&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Mon Jun 16 08:43:11 2008
@@ -34,11 +34,11 @@
<menu-item name="PayGrade" title="${uiLabelMap.HumanResPayGrade}"><link target="FindPayGrades"/></menu-item>
<menu-item name="PerfReview" title="${uiLabelMap.HumanResPerfReview}"><link target="FindPerfReviews"/></menu-item>
<menu-item name="Leave" title="${uiLabelMap.HumanResEmplLeave}"><link target="FindEmplLeaves"/></menu-item>
- <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
+ <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed">
<condition><not><if-empty field-name="userLogin"/></not></condition>
<link target="logout"/>
</menu-item>
- <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="col-right" selected-style="selected">
+ <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="opposed">
<condition><if-empty field-name="userLogin"/></condition>
<link target="${checkLoginUrl}"/>
</menu-item>
Modified: ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml?rev=668202&r1=668201&r2=668202&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml Mon Jun 16 08:43:11 2008
@@ -27,11 +27,11 @@
<menu-item name="Segment" title="${uiLabelMap.Segment}"><link target="FindSegmentGroup"/></menu-item>
<menu-item name="ContactList" title="${uiLabelMap.ContactList}"><link target="FindContactLists"/></menu-item>
<menu-item name="Reports" title="${uiLabelMap.MarketingReports}"><link target="MarketingReport"/></menu-item>
- <menu-item name="Logout" title="Logout" align-style="col-right" selected-style="selected">
+ <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed">
<condition><not><if-empty field-name="userLogin"/></not></condition>
<link target="logout"/>
</menu-item>
- <menu-item name="Login" title="Login" align-style="col-right" selected-style="selected">
+ <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="opposed">
<condition><if-empty field-name="userLogin"/></condition>
<link target="${checkLoginUrl}"/>
</menu-item>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=668202&r1=668201&r2=668202&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Mon Jun 16 08:43:11 2008
@@ -29,11 +29,11 @@
<menu-item name="Documents" title="${uiLabelMap.SfaDocuments}"><link target=""/></menu-item>
<menu-item name="Forecast" title="${uiLabelMap.SfaForecasts}"><link target="FindSalesForecast"/></menu-item>
<menu-item name="Opportunities" title="${uiLabelMap.SfaOpportunities}"><link target="FindOpportunity"/></menu-item>
- <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
+ <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed">
<condition><not><if-empty field-name="userLogin"/></not></condition>
<link target="logout"/>
</menu-item>
- <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="col-right" selected-style="selected">
+ <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="opposed">
<condition><if-empty field-name="userLogin"/></condition>
<link target="${checkLoginUrl}"/>
</menu-item>
Modified: ofbiz/trunk/specialpurpose/bi/widget/BiMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/widget/BiMenus.xml?rev=668202&r1=668201&r2=668202&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/widget/BiMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/bi/widget/BiMenus.xml Mon Jun 16 08:43:11 2008
@@ -23,11 +23,11 @@
<menu-item name="main" title="${uiLabelMap.CommonMain}"><link target="main"/></menu-item>
<menu-item name="reportbuilder" title="${uiLabelMap.BusinessIntelligenceReportBuilder}"><link target="ReportBuilderSelectStarSchema"/></menu-item>
- <menu-item name="Logout" title="Logout" align-style="col-right" selected-style="selected">
+ <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed">
<condition><not><if-empty field-name="userLogin"/></not></condition>
<link target="logout"/>
</menu-item>
- <menu-item name="Login" title="Login" align-style="col-right" selected-style="selected">
+ <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="opposed">
<condition><if-empty field-name="userLogin"/></condition>
<link target="${checkLoginUrl}"/>
</menu-item>
Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseMenus.xml?rev=668202&r1=668201&r2=668202&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseMenus.xml Mon Jun 16 08:43:11 2008
@@ -22,11 +22,11 @@
default-selected-style="selected" selected-menuitem-context-field-name="headerItem">
<menu-item name="googlebase" title="${uiLabelMap.GoogleBaseExportToGoogle}"><link target="advancedsearch"/></menu-item>
- <menu-item name="Logout" title="Logout" align-style="col-right" selected-style="selected">
+ <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed">
<condition><not><if-empty field-name="userLogin"/></not></condition>
<link target="logout"/>
</menu-item>
- <menu-item name="Login" title="Login" align-style="col-right" selected-style="selected">
+ <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="opposed">
<condition><if-empty field-name="userLogin"/></condition>
<link target="${checkLoginUrl}"/>
</menu-item>
Modified: ofbiz/trunk/specialpurpose/oagis/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/Menus.xml?rev=668202&r1=668201&r2=668202&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/widget/Menus.xml Mon Jun 16 08:43:11 2008
@@ -26,11 +26,11 @@
<menu-item name="main" title="${uiLabelMap.CommonMain}"><link target="main"/></menu-item>
<menu-item name="MessageInfos" title="${uiLabelMap.OagisMessageInfo}"><link target="FindMessageInfo"/></menu-item>
<menu-item name="MessageErrorInfos" title="${uiLabelMap.OagisMessageErrorInfo}"><link target="FindMessageErrorInfo"/></menu-item>
- <menu-item name="Logout" title="Logout" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
+ <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed">
<condition><not><if-empty field-name="userLogin"/></not></condition>
<link target="logout"/>
</menu-item>
- <menu-item name="Login" title="Login" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
+ <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="opposed">
<condition><if-empty field-name="userLogin"/></condition>
<link target="${checkLoginUrl}"/>
</menu-item>
Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl?rev=668202&r1=668201&r2=668202&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl Mon Jun 16 08:43:11 2008
@@ -27,9 +27,9 @@
<div class="row">
<div class="col"><a href="<@o...@ofbizUrl>" class="${selectedLeftClassMap.main?default(unselectedLeftClassName)}">${uiLabelMap.CommonMain}</a></div>
<#if requestAttributes.userLogin?has_content>
- <div class="col-right"><a href="<@o...@ofbizUrl>" class="${selectedRightClassMap.logout?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div>
+ <div class="opposed"><a href="<@o...@ofbizUrl>" class="${selectedRightClassMap.logout?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div>
<#else>
- <div class="col-right"><a href='<@o...@ofbizUrl>' class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>${uiLabelMap.CommonLogin}</a></div>
+ <div class="opposed"><a href='<@o...@ofbizUrl>' class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>${uiLabelMap.CommonLogin}</a></div>
</#if>
<div class="col-fill"> </div>
</div>