Author: dmaliarevich Date: 2008-04-01 09:15:11 -0400 (Tue, 01 Apr 2008) New Revision: 7240 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/style.css trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java Log: http://jira.jboss.com/jira/browse/JBIDE-1588, CSS STYLES ADDED Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/style.css =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/style.css 2008-04-01 13:00:16 UTC (rev 7239) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/style.css 2008-04-01 13:15:11 UTC (rev 7240) @@ -6,52 +6,34 @@ vertical-align: middle; } -.rich-pmenu-group-disabled { +.rich-pmenu-disabled-element { color: #B1ADA7; } -.dr-pmenu-top-group-div { +.rich-pmenu-top-group-div, .rich-pmenu-group-div { border-color: #C4C0B9; border: 1px solid; margin-bottom: 3px; padding: 1px; - border-color: #C4C0B9; -} - -.dr-pmenu-top-self-div { - border-top: 1px solid; - margin-bottom: 3px; - padding: 1px; - border-color: #C4C0B9; -} - -.dr-pmenu-group { cursor: pointer; } -.dr-pmenu-top-group { +.rich-pmenu-top-group { background-color: #D4CFC7; font-family: Arial, Verdana, sans-serif; font-size: 11px; font-weight: bold; background-position: left top; background-repeat: repeat-x; - cursor: pointer; height: 20px; padding: 2px 1px 2px 2px; width: 100%; } -.dr-pmenu-selected-item { - font-style: italic; -} -.dr-pmenu-group-self-label { +.rich-pmenu-top-group-self-label, .rich-pmenu-group-self-label { padding-left: 5px; width: 100%; -} - -.rich-pmenu-group-self-label { font-family: Arial, Verdana, sans-serif; font-size: 11px; font-weight: bold; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2008-04-01 13:00:16 UTC (rev 7239) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2008-04-01 13:15:11 UTC (rev 7240) @@ -46,6 +46,19 @@ private static final String STYLE = "style"; //$NON-NLS-1$ private static final String STYLE_CLASS = "styleClass"; //$NON-NLS-1$ + /* + * rich:panelMenuGroup css styles + */ + private static final String CSS_TOP_GROUP_DIV = "rich-pmenu-top-group-div"; //$NON-NLS-1$ + private static final String CSS_TOP_GROUP = "rich-pmenu-top-group"; //$NON-NLS-1$ + private static final String CSS_TOP_GROUP_ICON = "rich-pmenu-top-group-self-icon"; //$NON-NLS-1$ + private static final String CSS_TOP_GROUP_LABEL = "rich-pmenu-top-group-self-label"; //$NON-NLS-1$ + private static final String CSS_GROUP_DIV = "rich-pmenu-group-div"; //$NON-NLS-1$ + private static final String CSS_GROUP = "rich-pmenu-group"; //$NON-NLS-1$ + private static final String CSS_GROUP_ICON = "rich-pmenu-group-self-icon"; //$NON-NLS-1$ + private static final String CSS_GROUP_LABEL = "rich-pmenu-group-self-label"; //$NON-NLS-1$ + private static final String CSS_DISABLED_ELEMENT = "rich-pmenu-disabled-element"; //$NON-NLS-1$ + private static final String NAME_COMPONENT = "panelMenuGroup"; //$NON-NLS-1$ private static final String PANEL_MENU_END_TAG = ":panelMenu"; //$NON-NLS-1$ private static final String PANEL_MENU_GROUP_END_TAG = ":panelMenuGroup"; //$NON-NLS-1$ @@ -231,77 +244,73 @@ table.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, "0"); //$NON-NLS-1$ table.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, "0"); //$NON-NLS-1$ - nsIDOMElement tableBody = visualDocument + nsIDOMElement tableBodyRow = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TR); - table.appendChild(tableBody); + table.appendChild(tableBodyRow); nsIDOMElement column1 = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TD); - column1.setAttribute(COMPONENT_ATTR_VPE_USER_TOGGLE_ID, String - .valueOf(activeChildId)); - tableBody.appendChild(column1); + column1.setAttribute(COMPONENT_ATTR_VPE_USER_TOGGLE_ID, activeChildId); + tableBodyRow.appendChild(column1); - nsIDOMElement img1 = visualDocument + nsIDOMElement columnn1_img = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_IMG); - column1.appendChild(img1); - ComponentUtil.setImg(img1, PANEL_MENU_GROUP_ICON_SPACER_PATH); - img1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - "rich-pmenu-group-icon"); //$NON-NLS-1$ + column1.appendChild(columnn1_img); + ComponentUtil.setImg(columnn1_img, PANEL_MENU_GROUP_ICON_SPACER_PATH); nsIDOMElement column2 = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TD); - tableBody.appendChild(column2); + tableBodyRow.appendChild(column2); column2.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "width: 100%;"); //$NON-NLS-1$ nsIDOMText name = visualDocument.createTextNode(pmg_label); column2.appendChild(name); - column2.setAttribute(COMPONENT_ATTR_VPE_USER_TOGGLE_ID, String - .valueOf(activeChildId)); + column2.setAttribute(COMPONENT_ATTR_VPE_USER_TOGGLE_ID, activeChildId); nsIDOMElement column3 = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TD); - column3.setAttribute(COMPONENT_ATTR_VPE_USER_TOGGLE_ID, String - .valueOf(activeChildId)); - tableBody.appendChild(column3); + column3.setAttribute(COMPONENT_ATTR_VPE_USER_TOGGLE_ID, activeChildId); + tableBodyRow.appendChild(column3); - nsIDOMElement img2 = visualDocument + nsIDOMElement column3_img = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_IMG); - column3.appendChild(img2); - img2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - "rich-pmenu-group-icon"); //$NON-NLS-1$ - ComponentUtil.setImg(img2, PANEL_MENU_GROUP_ICON_SPACER_PATH); + column3.appendChild(column3_img); + ComponentUtil.setImg(column3_img, PANEL_MENU_GROUP_ICON_SPACER_PATH); - setIcon(pageContext, parent, sourceParentElement, sourceElement, img1, - img2, expanded, disabled); + setIcon(pageContext, parent, sourceParentElement, sourceElement, columnn1_img, + column3_img, expanded, disabled); boolean childOfPanelMenu = parent.getNodeName().endsWith( PANEL_MENU_END_TAG); if (childOfPanelMenu) { + + columnn1_img.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_TOP_GROUP_ICON + SPACE + CSS_GROUP_ICON); + column2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_TOP_GROUP_LABEL + SPACE + CSS_GROUP_LABEL); + column3_img.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_TOP_GROUP_ICON + SPACE + CSS_GROUP_ICON); + styleClass = CSS_TOP_GROUP + SPACE + CSS_GROUP; + if (attrPresents(pm_topGroupClass)) { - styleClass = "dr-pmenu-group-self-label dr-pmenu-top-group" //$NON-NLS-1$ - + SPACE + pm_topGroupClass; - } else { - styleClass = "dr-pmenu-group-self-label dr-pmenu-top-group"; //$NON-NLS-1$ - } - + styleClass = SPACE + pm_topGroupClass; + } if (attrPresents(pm_topGroupStyle)) { style += pm_topGroupStyle; } - div.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - "dr-pmenu-top-group-div"); //$NON-NLS-1$ + div.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_TOP_GROUP_DIV + SPACE + CSS_GROUP_DIV); } else { + + columnn1_img.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_GROUP_ICON); + column2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_GROUP_LABEL); + column3_img.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_GROUP_ICON); + styleClass = CSS_GROUP; + if (attrPresents(pm_groupClass)) { - styleClass = "dr-pmenu-group-self-label dr-pmenu-group rich-pmenu-group-self-label" //$NON-NLS-1$ - + SPACE + pm_groupClass; - } else { - styleClass = "dr-pmenu-group-self-label dr-pmenu-group rich-pmenu-group-self-label"; //$NON-NLS-1$ - } + styleClass = SPACE + pm_groupClass; + } if (attrPresents(pm_groupStyle)) { style += pm_groupStyle; } - div.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - "dr-pmenu-top-self-div"); //$NON-NLS-1$ + div.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_GROUP_DIV); } if (attrPresents(pmg_style)) { @@ -316,19 +325,19 @@ if (disabled) { if (attrPresents(pm_disabledGroupClass)) { - disableClass += SPACE + pm_disabledGroupClass; + disableClass += pm_disabledGroupClass; } if (attrPresents(pmg_disabledClass)) { disableClass += SPACE + pmg_disabledClass; } - disableClass += SPACE + "rich-pmenu-group-disabled"; //$NON-NLS-1$ + disableClass += SPACE + CSS_DISABLED_ELEMENT; styleClass += SPACE + disableClass; if (attrPresents(pm_disabledGroupStyle)) { disabledStyle += pm_disabledGroupStyle; } if (attrPresents(pmg_disabledStyle)) { - disabledStyle += pmg_disabledStyle; + disabledStyle += SPACE + pmg_disabledStyle; } style += SPACE + disabledStyle; } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2008-04-01 13:00:16 UTC (rev 7239) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2008-04-01 13:15:11 UTC (rev 7240) @@ -38,12 +38,26 @@ private static final String STYLE = "style"; //$NON-NLS-1$ private static final String STYLE_CLASS = "styleClass"; //$NON-NLS-1$ + /* + * rich:panelMenuItem css styles + */ + public static final String CSS_TOP_ITEM = "rich-pmenu-top-item"; //$NON-NLS-1$ + public static final String CSS_TOP_ITEM_ICON = "rich-pmenu-top-item-icon"; //$NON-NLS-1$ + public static final String CSS_TOP_ITEM_LABEL = "rich-pmenu-top-item-label"; //$NON-NLS-1$ + public static final String CSS_ITEM = "rich-pmenu-item"; //$NON-NLS-1$ + public static final String CSS_ITEM_ICON = "rich-pmenu-item-icon"; //$NON-NLS-1$ + public static final String CSS_ITEM_LABEL = "rich-pmenu-item-label"; //$NON-NLS-1$ + public static final String CSS_ITEM_SELECTED = "rich-pmenu-item-selected"; //$NON-NLS-1$ + public static final String CSS_DISABLED_ELEMENT = "rich-pmenu-disabled-element"; //$NON-NLS-1$ - private static final String PANEL_MENU_ITEM_CLASS = "dr-pmenu-item"; //$NON-NLS-1$ - private static final String PANEL_MENU_NOWARP_CLASS = "dr-pmenu-nowrap"; //$NON-NLS-1$ - private static final String PANEL_MENU_LABLE_CLASS = "dr-pmenu-group-self-label"; //$NON-NLS-1$ - private static final String PANEL_MENU_DIV = "dr-pmenu-top-self-div"; //$NON-NLS-1$ - private static final String DISABLED_CLASS_NAME = "dr-pmenu-item-disabled"; //$NON-NLS-1$ + /* + * rich:panelMenuItem default css styles + */ + private static final String DR_ITEM_CLASS = "dr-pmenu-item"; //$NON-NLS-1$ + private static final String DR_NOWARP_CLASS = "dr-pmenu-nowrap"; //$NON-NLS-1$ + private static final String DR_LABEL_CLASS = "dr-pmenu-group-self-label"; //$NON-NLS-1$ + private static final String DR_TOP_DIV = "dr-pmenu-top-self-div"; //$NON-NLS-1$ + private static final String DR_DISABLED_CLASS_NAME = "dr-pmenu-item-disabled"; //$NON-NLS-1$ private static final String IMG_POINTS_SRC = "/panelMenuItem/points.gif"; //$NON-NLS-1$ private static final String IMG_SPACER_SRC = "/panelMenuItem/spacer.gif"; //$NON-NLS-1$ @@ -112,7 +126,7 @@ readPanelMenuItemAttributes(sourceElement); nsIDOMElement parentDiv = visualDocument.createElement("div"); //$NON-NLS-1$ - parentDiv.setAttribute("CLASS", PANEL_MENU_DIV); //$NON-NLS-1$ + parentDiv.setAttribute("CLASS", DR_TOP_DIV); //$NON-NLS-1$ parentVisualElement.appendChild(parentDiv); nsIDOMElement div = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_DIV); @@ -129,7 +143,7 @@ div.appendChild(table); table.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - PANEL_MENU_ITEM_CLASS); + DR_ITEM_CLASS); table.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, NO_SIZE_VALUE); table.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, @@ -145,13 +159,13 @@ .createElement(HtmlComponentUtil.HTML_TAG_TD); tr.appendChild(tdNowrap); tdNowrap.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - PANEL_MENU_NOWARP_CLASS); + DR_NOWARP_CLASS); nsIDOMElement tdLable = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TD); tr.appendChild(tdLable); tdLable.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - PANEL_MENU_LABLE_CLASS); + DR_LABEL_CLASS); tdLable.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "element.style"); //$NON-NLS-1$ @@ -187,13 +201,13 @@ sourceParentElement, pm_iconTopDisabledItem, pmi_iconDisabled); setItemClassAndStyle(table, pm_disabledItemClass, - pmi_disabledClass, DISABLED_CLASS_NAME, + pmi_disabledClass, DR_DISABLED_CLASS_NAME, pm_disabledItemStyle, pmi_disabledStyle); } else { setIcon(pageContext, imgPoints, sourceElement, sourceParentElement, pm_iconTopItem, pmi_icon); setItemClassAndStyle(table, pm_topItemClass, - pmi_styleClass, PANEL_MENU_ITEM_CLASS, + pmi_styleClass, DR_ITEM_CLASS, pm_topItemStyle, pmi_style); } setIconPosition(pm_iconItemTopPosition, td, tdNowrap, @@ -206,13 +220,13 @@ sourceParentElement, pm_iconDisabledItem, pmi_iconDisabled); setItemClassAndStyle(table, pm_disabledItemClass, - pmi_disabledClass, DISABLED_CLASS_NAME, + pmi_disabledClass, DR_DISABLED_CLASS_NAME, pm_disabledItemStyle, pmi_disabledStyle); } else { setIcon(pageContext, imgPoints, sourceElement, sourceParentElement, pm_iconItem, pmi_icon); setItemClassAndStyle(table, pm_itemClass, pmi_styleClass, - PANEL_MENU_ITEM_CLASS, pm_itemStyle, pmi_style); + DR_ITEM_CLASS, pm_itemStyle, pmi_style); } setIconPosition(pm_iconItemPosition, td, tdNowrap, imgPoints, imgSpacer2); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java 2008-04-01 13:00:16 UTC (rev 7239) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java 2008-04-01 13:15:11 UTC (rev 7240) @@ -93,6 +93,11 @@ public static final String TOP_ITEM_STYLE = "topItemStyle"; //$NON-NLS-1$ public static final String ITEM_CLASS = "itemClass"; //$NON-NLS-1$ public static final String ITEM_STYLE = "itemStyle"; //$NON-NLS-1$ + + /* + * rich:panelMenu css styles + */ + public static final String CSS_PANEL_MENU = "rich-panel-menu"; //$NON-NLS-1$ private static final String PANEL_MENU_GROUP_END = ":panelMenuGroup"; //$NON-NLS-1$ private static final String PANEL_MENU_ITEM_END = ":panelMenuItem"; //$NON-NLS-1$