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">
