Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java?view=diff&rev=451772&r1=451771&r2=451772 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java Sun Oct 1 10:26:55 2006 @@ -28,11 +28,12 @@ */ public final class SkinSelectors { - private SkinSelectors(){} - - // General skin selector constants - public static final String STATE_PREFIX = "p_AF"; + public static final String DEFAULT_NAMESPACE = "af"; + public static final String ICON_SUFFIX = "-icon"; + public static final String STATE_PREFIX = "p_AF"; + private SkinSelectors(){} + /* The selectors are sorted by component, alphabetically. * * The selectors not linked to any specific components like aliases are @@ -955,24 +956,100 @@ // // // ============================ Style classes ============================ // - public static final String AF_PROCESS_TRAIN_ACTIVE_STYLE_CLASS = - "af|train::step-active"; - public static final String AF_PROCESS_TRAIN_DISABLED_STYLE_CLASS = - "af|train::step-disabled"; - public static final String AF_PROCESS_TRAIN_LINK_STYLE_CLASS = - "af|train::link"; - public static final String AF_PROCESS_TRAIN_STYLE_CLASS = - "af|train"; - public static final String AF_PROCESS_TRAIN_SUB_START_STYLE_CLASS = - "af|train::sub-start"; - public static final String AF_PROCESS_TRAIN_UNVISITED_STYLE_CLASS = - "af|train::step-unvisited"; - public static final String AF_PROCESS_TRAIN_VISITED_STYLE_CLASS = - "af|train::step-visited"; - // -= Simon =- - // FIXME: That name is inconsistent - public static final String TRAIN_SUB_RIGHT_STYLE_CLASS = - "af|train::sub-end"; + // Root class + public static final String AF_TRAIN_ROOT_STYLE_CLASS = + DEFAULT_NAMESPACE + "|train"; + + // Joins + public static final String AF_TRAIN_JOIN_STYLE_CLASS = + AF_TRAIN_ROOT_STYLE_CLASS + "::join"; + public static final String AF_TRAIN_OVERFLOW_JOIN_STYLE_CLASS = + AF_TRAIN_ROOT_STYLE_CLASS + "::join-overflow"; + public static final String AF_TRAIN_PARENT_JOIN_STYLE_CLASS = + AF_TRAIN_ROOT_STYLE_CLASS + "::join-parent"; + + // Links + public static final String AF_TRAIN_LINK_STYLE_CLASS = + AF_TRAIN_ROOT_STYLE_CLASS + "::link"; + + // Overflow start + public static final String AF_TRAIN_OVERFLOW_START_STYLE_CLASS = + AF_TRAIN_ROOT_STYLE_CLASS + "::overflow-start"; + public static final String AF_TRAIN_OVERFLOW_START_CONTENT_STYLE_CLASS = + AF_TRAIN_OVERFLOW_START_STYLE_CLASS + "-content"; + public static final String AF_TRAIN_OVERFLOW_START_ICON_STYLE_CLASS = + AF_TRAIN_OVERFLOW_START_STYLE_CLASS + "-icon-cell"; + + // Overflow end + public static final String AF_TRAIN_OVERFLOW_END_STYLE_CLASS = + AF_TRAIN_ROOT_STYLE_CLASS + "::overflow-end"; + public static final String AF_TRAIN_OVERFLOW_END_CONTENT_STYLE_CLASS = + AF_TRAIN_OVERFLOW_END_STYLE_CLASS + "-content"; + public static final String AF_TRAIN_OVERFLOW_END_ICON_STYLE_CLASS = + AF_TRAIN_OVERFLOW_END_STYLE_CLASS + "-icon-cell"; + + // Parent start + public static final String AF_TRAIN_PARENT_START_STYLE_CLASS = + AF_TRAIN_ROOT_STYLE_CLASS + "::parent-start"; + public static final String AF_TRAIN_PARENT_START_CONTENT_STYLE_CLASS = + AF_TRAIN_OVERFLOW_START_STYLE_CLASS + "-content"; + public static final String AF_TRAIN_PARENT_START_ICON_STYLE_CLASS = + AF_TRAIN_OVERFLOW_START_STYLE_CLASS + "-icon-cell"; + + // Parent end + public static final String AF_TRAIN_PARENT_END_STYLE_CLASS = + AF_TRAIN_ROOT_STYLE_CLASS + "::parent-end"; + public static final String AF_TRAIN_PARENT_END_CONTENT_STYLE_CLASS = + AF_TRAIN_OVERFLOW_END_STYLE_CLASS + "-content"; + public static final String AF_TRAIN_PARENT_END_ICON_STYLE_CLASS = + AF_TRAIN_OVERFLOW_END_STYLE_CLASS + "-icon-cell"; + + // Stops + public static final String AF_TRAIN_STOP_STYLE_CLASS = + AF_TRAIN_ROOT_STYLE_CLASS + "::stop"; + public static final String AF_TRAIN_STOP_CONTENT_STYLE_CLASS = + AF_TRAIN_STOP_STYLE_CLASS + "-content"; + public static final String AF_TRAIN_STOP_ICON_STYLE_CLASS = + AF_TRAIN_STOP_STYLE_CLASS + "-icon-cell"; + + // ================================ Icons ================================ // + // Overflow start icons + public static final String AF_TRAIN_OVERFLOW_START_DISABLED_ICON_NAME = + AF_TRAIN_OVERFLOW_START_STYLE_CLASS + ":disabled" + ICON_SUFFIX; + public static final String AF_TRAIN_OVERFLOW_START_READ_ONLY_ICON_NAME = + AF_TRAIN_OVERFLOW_START_STYLE_CLASS + ":read-only" + ICON_SUFFIX; + public static final String AF_TRAIN_OVERFLOW_START_UNVISITED_ICON_NAME = + AF_TRAIN_OVERFLOW_START_STYLE_CLASS + ":unvisited" + ICON_SUFFIX; + public static final String AF_TRAIN_OVERFLOW_START_VISITED_ICON_NAME = + AF_TRAIN_OVERFLOW_START_STYLE_CLASS + ":visited" + ICON_SUFFIX; + + // Overflow end icons + public static final String AF_TRAIN_OVERFLOW_END_DISABLED_ICON_NAME = + AF_TRAIN_OVERFLOW_END_STYLE_CLASS + ":disabled" + ICON_SUFFIX; + public static final String AF_TRAIN_OVERFLOW_END_READ_ONLY_ICON_NAME = + AF_TRAIN_OVERFLOW_END_STYLE_CLASS + ":read-only" + ICON_SUFFIX; + public static final String AF_TRAIN_OVERFLOW_END_UNVISITED_ICON_NAME = + AF_TRAIN_OVERFLOW_END_STYLE_CLASS + ":unvisited" + ICON_SUFFIX; + public static final String AF_TRAIN_OVERFLOW_END_VISITED_ICON_NAME = + AF_TRAIN_OVERFLOW_END_STYLE_CLASS + ":visited" + ICON_SUFFIX; + + // Parent train icons + public static final String AF_TRAIN_PARENT_START_ICON_NAME = + AF_TRAIN_PARENT_START_STYLE_CLASS + ICON_SUFFIX; + public static final String AF_TRAIN_PARENT_END_ICON_NAME = + AF_TRAIN_PARENT_END_STYLE_CLASS + ICON_SUFFIX; + + // Stop icons + public static final String AF_TRAIN_STOP_ACTIVE_ICON_NAME = + AF_TRAIN_STOP_STYLE_CLASS + ":selected" + ICON_SUFFIX; + public static final String AF_TRAIN_STOP_DISABLED_ICON_NAME = + AF_TRAIN_STOP_STYLE_CLASS + ":disabled" + ICON_SUFFIX; + public static final String AF_TRAIN_STOP_READ_ONLY_ICON_NAME = + AF_TRAIN_STOP_STYLE_CLASS + ":read-only" + ICON_SUFFIX; + public static final String AF_TRAIN_STOP_UNVISITED_ICON_NAME = + AF_TRAIN_STOP_STYLE_CLASS + ":unvisited" + ICON_SUFFIX; + public static final String AF_TRAIN_STOP_VISITED_ICON_NAME = + AF_TRAIN_STOP_STYLE_CLASS + ":visited" + ICON_SUFFIX; // //
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=451772&r1=451771&r2=451772 ============================================================================== --- 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 Sun Oct 1 10:26:55 2006 @@ -2436,66 +2436,112 @@ <!-- Train Styles --> - - <style name="af|train"/> - <style name="AFTrainStation"> - <includeStyle name="AFDefaultFont"/> + <!-- Aliases --> + <style name="AFTrainContent"/> + <style name="AFTrainIconCell"/> + <style name="AFTrainJoin"/> + + <!-- Selectors --> + <style selector="af|train"/> + + <!-- Station selectors --> + <style selector="af|train::stop"> </style> - - <style selector="af|train::step-active"> - <includeStyle name="AFTrainStation"/> - <includeStyle name="AFDarkBorder"/> + + <style selector="af|train::stop-icon-cell"> + <includeStyle name="AFTrainIconCell"/> + </style> + + <style selector="af|train::stop-content"> + <includeStyle name="AFTrainContent"/> + </style> + + <style selector="af|train::stop:selected"> <includeStyle name="AFDarkForeground"/> <property name="font-weight">bold</property> </style> - - <style selector="af|train::step-visited"> - <includeStyle name="AFTrainStation"/> - <includeStyle name="DarkExtraAccentForeground"/> - <includeProperty name="MediumExtraAccentBackground" - propertyName="background-color" - localPropertyName="border-color"/> - </style> - - <style selector="af|train::visited af|train::link"> + + <style selector="af|train::stop:visited"> <includeStyle name="DarkExtraAccentForeground"/> </style> - <style selector="af|train::step-disabled"> - <includeStyle name="AFTrainStation"/> + <style selector="af|train::stop:disabled"> <includeStyle name="MediumExtraAccentForeground"/> - <includeProperty name="LightExtraAccentBackground" - propertyName="background-color" - localPropertyName="border-color"/> </style> - <style selector="af|train::step-unvisited"> - <includeStyle name="AFTrainStation"/> - <includeStyle name="AFDarkBorder"/> + <style selector="af|train::stop:unvisited"> <includeStyle name="AFDarkForeground"/> </style> - - <style selector="af|train::step-visited af|train::link"> - <includeStyle name="AFDarkForeground"/> + + <style selector="af|train::overflow-start"> + </style> + + <style selector="af|train::overflow-start-icon-cell"> + <includeStyle name="AFTrainIconCell"/> + </style> + + <style selector="af|train::overflow-start-content"> + <includeStyle name="AFTrainContent"/> + </style> + + <style selector="af|train::overflow-end"> </style> - - <style selector="af|train::sub-start"> - <includeStyle name="AFDarkBorder"/> - <property name="border-style">solid</property> - <property name="border-width">2px 2px 0px 0px</property> - <property name="padding">0pt</property> + <style selector="af|train::overflow-end-icon-cell"> + <includeStyle name="AFTrainIconCell"/> </style> - <style selector="af|train::sub-end"> - <includeStyle name="AFDarkBorder"/> - <property name="border-style">solid</property> - <property name="border-width">2px 0px 0px 2px</property> - <property name="padding">0pt</property> + <style selector="af|train::overflow-end-content"> + <includeStyle name="AFTrainContent"/> </style> + <style selector="af|train::parent-start"> + </style> + + <style selector="af|train::parent-start-icon-cell"> + <includeStyle name="AFTrainIconCell"/> + </style> + + <style selector="af|train::parent-start-content"> + <includeStyle name="AFTrainContent"/> + </style> + + <style selector="af|train::parent-end"> + </style> + + <style selector="af|train::parent-end-icon-cell"> + <includeStyle name="AFTrainIconCell"/> + </style> + + <style selector="af|train::parent-end-content"> + <includeStyle name="AFTrainContent"/> + </style> + <style selector="af|train::link"> + <includeStyle name="AFLinkForeground"/> + </style> + + <style selector="af|train::stop:disabled af|train::link"> + <includeStyle name="AFDisabledLinkForeground"/> + </style> + + <style selector="af|train::stop:visited af|train::link"> + <includeStyle name="AFDarkForeground"/> + <includeStyle name="DarkExtraAccentForeground"/> + </style> + + <style selector="af|train::join"> + <includeStyle name="AFTrainJoin"/> + </style> + + <style selector="af|train::join-overflow"> + <includeStyle name="AFTrainJoin"/> + </style> + + <style selector="af|train::join-parent"> + <includeStyle name="AFTrainJoin"/> + </style> <!-- Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss?view=diff&rev=451772&r1=451771&r2=451772 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss Sun Oct 1 10:26:55 2006 @@ -146,6 +146,34 @@ </style> <!-- + train Styles + --> + <style name="AFTrainContent"> + <property name="border-top-style">solid</property> + <property name="border-top-width">2px;</property> + </style> + + <style selector="af|train::stop.p_AFVisited"> + <includeProperty name="MediumExtraAccentBackground" + propertyName="background-color" + localPropertyName="border-color"/> + </style> + + <style selector="af|train::stop:selected"> + <includeStyle name="AFDarkBorder"/> + </style> + + <style selector="af|train::stop:disabled"> + <includeProperty name="LightExtraAccentBackground" + propertyName="background-color" + localPropertyName="border-color"/> + </style> + + <style selector="af|train::stop:unvisited"> + <includeStyle name="AFDarkBorder"/> + </style> + + <!-- treeTable Styles -->
