From adffaces-commits-return-1350-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Tue Nov 28 20:40:39 2006
Return-Path: <adffaces-commits-return-1350-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org
Received: (qmail 21760 invoked from network); 28 Nov 2006 20:40:38 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 28 Nov 2006 20:40:38 -0000
Received: (qmail 54145 invoked by uid 500); 28 Nov 2006 20:40:44 -0000
Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org
Received: (qmail 54134 invoked by uid 500); 28 Nov 2006 20:40:44 -0000
Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:adffaces-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:adffaces-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:adffaces-commits@incubator.apache.org>
List-Id: <adffaces-commits.incubator.apache.org>
Reply-To: adffaces-dev@incubator.apache.org
Delivered-To: mailing list adffaces-commits@incubator.apache.org
Received: (qmail 54125 invoked by uid 99); 28 Nov 2006 20:40:44 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Nov 2006 12:40:44 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Nov 2006 12:40:34 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id CFF3E1A9846; Tue, 28 Nov 2006 12:39:56 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r480195 - in /incubator/adffaces/trunk/trinidad:
 trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
 trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
Date: Tue, 28 Nov 2006 20:39:56 -0000
To: adffaces-commits@incubator.apache.org
From: jwaldman@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061128203956.CFF3E1A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jwaldman
Date: Tue Nov 28 12:39:55 2006
New Revision: 480195

URL: http://svn.apache.org/viewvc?view=rev&rev=480195
Log:
fix portal bug in base-desktop.xss where we were using PortalHeader* instead of the correct PortalHeading*.
I'm on a branch, so let's see where this gets checked in to.

Modified:
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml?view=diff&rev=480195&r1=480194&r2=480195
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml Tue Nov 28 12:39:55 2006
@@ -22,7 +22,9 @@
   <!-- you can use EL to get the skin. This allows the skin to change between
        requests. -->
   <skin-family>#{prefs.proxy.skinFamily}</skin-family>
-
+  <!--
+  <output-mode>portlet</output-mode>
+  -->
   <!--  Uncomment any of these to enable them -->
   <!-- accessibility-mode>inaccessible</accessibility-mode -->  
 </trinidad-config>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss?view=diff&rev=480195&r1=480194&r2=480195
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss Tue Nov 28 12:39:55 2006
@@ -3601,24 +3601,25 @@
     <includeStyle selector=".AFHeaderLevelOne"/>  
   </style>
   
-  <style selector=".PortletHeader1">
+  <style selector=".PortletHeading1">
     <includeStyle selector=".AFHeaderLevelOne"/>  
   </style>
   
-  <style selector=".PortletHeader2">
+  <style selector=".PortletHeading2">
     <includeStyle selector=".AFHeaderLevelTwo"/>  
   </style>  
   
-  <style selector=".PortletHeader3">
+  <style selector=".PortletHeading3">
     <includeStyle selector=".AFHeaderLevelThreePlus"/>  
   </style> 
   
-  <style selector=".PortletHeader4">
+  <style selector=".PortletHeading4">
     <includeStyle selector=".AFHeaderLevelThreePlus"/>  
   </style>
   
   <style selector=".PortletSubHeaderColor">
-    <includeStyle selector="af|panelBox::header"/>
+    <includeStyle name="AFBoxBackground"/>
+    <includeStyle name="AFPanelBoxBody"/>
   </style>
   
   <style selector=".PortletSubHeaderLink">
@@ -3729,7 +3730,7 @@
   </style>
   
   <style selector=".portlet-form-input-field">
-    <includeStyle name="AFLabel"/>
+    <includeStyle selector="af|inputText::content"/>  
   </style>   
   
   <style selector=".portlet-form-button">