[jbosstools-commits] JBoss Tools SVN: r10511 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: resources/menuItem and 1 other directories.

Author: dmaliarevich Date: 2008-09-26 10:49:16 -0400 (Fri, 26 Sep 2008) New Revision: 10511 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/menuGroup.css trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/menuItem.css trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDropDownMenuTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuGroupTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuItemTemplate.java Log: JBIDE-2497, html div positions and styles were updated. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/menuGroup.css =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/menuGroup.css 2008-09-26 14:22:47 UTC (rev 10510) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/menuGroup.css 2008-09-26 14:49:16 UTC (rev 10511) @@ -32,30 +32,28 @@ } .rich-menu-item-icon-enabled { border:0pt solid transparent; - padding:2px 36px 2px 2px; + padding:2px 10px 2px 2px; } .rich-menu-item-icon-selected { } .rich-menu-list-border { font-family:Arial,Verdana,sans-serif; - /*background-color:#F1EEE9;*/ - background-color:#C4C0B9; + background-color:#F1EEE9; + background-color:#F1EEE9; border-color:#C4C0B9; border:1px solid; } .rich-menu-list-bg { - background-image:url(list-bg.png); - border-left-color:#F1EEE9; - border-right-color:#F1EEE9; - border-top-color:#F1EEE9; - background:transparent none repeat-y scroll left center; + background-image:url(list-bg.png); + border-left-color:#C4C0B9; + border-right-color:#C4C0B9; + border-top-color:#C4C0B9; border-left-style:solid; border-left-width:1px; border-right-style:solid; border-right-width:1px; border-top-style:solid; border-top-width:1px; - } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/menuItem.css =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/menuItem.css 2008-09-26 14:22:47 UTC (rev 10510) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/menuItem.css 2008-09-26 14:49:16 UTC (rev 10511) @@ -5,7 +5,8 @@ } .rich-menu-item-icon { - + border:0pt solid transparent; + padding:2px 10px 2px 2px; } .rich-menu-item-disabled { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDropDownMenuTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDropDownMenuTemplate.java 2008-09-26 14:22:47 UTC (rev 10510) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDropDownMenuTemplate.java 2008-09-26 14:49:16 UTC (rev 10511) @@ -51,8 +51,8 @@ private static final String CSS_RICH_LABEL_TEXT_DECOR = "rich-label-text-decor"; //$NON-NLS-1$ private static final String CSS_RICH_MENU_LIST_BORDER = "rich-menu-list-border"; //$NON-NLS-1$ private static final String CSS_RICH_MENU_LIST_BG = "rich-menu-list-bg"; //$NON-NLS-1$ - private static final String CSS_RICH_DDEMENU_LIST_DIV_STYLE = "position: relative; z-index: 100;"; //$NON-NLS-1$ - private static final String CSS_RICH_DDEMENU_BORDER_DIV_STYLE = "position: relative; z-index: 2;"; //$NON-NLS-1$ + private static final String CSS_RICH_DDEMENU_LIST_DIV_STYLE = "position: relative; z-index: 100; display: table;"; //$NON-NLS-1$ + private static final String CSS_RICH_DDEMENU_BORDER_DIV_STYLE = "position: relative; z-index: 2; display: table;"; //$NON-NLS-1$ /* * rich:dropDownMenu attributes names @@ -168,14 +168,20 @@ /* * Setting css styles */ + String cssListDivStyle = EMPTY; + String cssListBorderDivStyle = EMPTY; String cssLabelDivStyle = EMPTY; - String cssListBorderDivStyle = EMPTY; - cssLabelDivStyle += SPACE + CSS_RICH_DDEMENU_LIST_DIV_STYLE; + cssListDivStyle += SPACE + CSS_RICH_DDEMENU_LIST_DIV_STYLE; cssListBorderDivStyle += SPACE + CSS_RICH_DDEMENU_BORDER_DIV_STYLE; - ddmListDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, cssLabelDivStyle); + if (attrPresents(ddm_style)) { + cssLabelDivStyle += SPACE + ddm_style; + } + + ddmListDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, cssListDivStyle); ddmListBorderDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, cssListBorderDivStyle); + ddmLabelDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, cssLabelDivStyle); /* * Encoding label value Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuGroupTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuGroupTemplate.java 2008-09-26 14:22:47 UTC (rev 10510) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuGroupTemplate.java 2008-09-26 14:49:16 UTC (rev 10511) @@ -59,8 +59,8 @@ private static final String CSS_RICH_MENU_ITEM_ICON_SELECTED = "rich-menu-item-icon-selected"; //$NON-NLS-1$ private static final String CSS_RICH_MENU_LIST_BORDER = "rich-menu-list-border"; //$NON-NLS-1$ private static final String CSS_RICH_MENU_LIST_BG = "rich-menu-list-bg"; //$NON-NLS-1$ - private static final String CSS_RICH_LIST_FOLDER_DIV_STYLE = "position: relative; z-index: 100;"; //$NON-NLS-1$ - private static final String CSS_RICH_LIST_BORDER_DIV_STYLE = "position: relative; z-index: 2;"; //$NON-NLS-1$ + private static final String CSS_RICH_LIST_FOLDER_DIV_STYLE = "position: relative; z-index: 100; display: table;"; //$NON-NLS-1$ + private static final String CSS_RICH_LIST_BORDER_DIV_STYLE = "position: relative; z-index: 2; display: table;"; //$NON-NLS-1$ /* * rich:menuGroup attributes names @@ -180,6 +180,13 @@ /* * Setting css styles */ + String topDivStyle = EMPTY; + + if (attrPresents(mg_style)) { + topDivStyle += SPACE + mg_style; + } + + grTopDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, topDivStyle); grFolderDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, CSS_RICH_LIST_FOLDER_DIV_STYLE); grListBorderDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, CSS_RICH_LIST_BORDER_DIV_STYLE); @@ -213,8 +220,12 @@ * Create spacer image */ ComponentUtil.setImg(grImg, SPACER_IMG_PATH); - grImgSpan.appendChild(grImg); } + /* + * Add image to span + */ + grImgSpan.appendChild(grImg); + } String menuGroupId = (String) sourceNode.getUserData(MENU_GROUP_ID); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuItemTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuItemTemplate.java 2008-09-26 14:22:47 UTC (rev 10510) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuItemTemplate.java 2008-09-26 14:49:16 UTC (rev 10511) @@ -150,6 +150,17 @@ itemLabelSpan.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, labelSpanClass); /* + * Setting css styles + */ + String topDivStyle = EMPTY; + + if (attrPresents(mi_style)) { + topDivStyle += SPACE + mi_style; + } + + itemTopDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, topDivStyle); + + /* * Encode label and icon value */ Attr valueAttr = sourceElement.getAttributeNode(HtmlComponentUtil.HTML_VALUE_ATTR); @@ -184,6 +195,7 @@ * Add image to span */ itemIconImgSpan.appendChild(itemIconImg); + } /*