gatein-commits September 2011

gatein-commits@lists.jboss.org

1 participants
305 discussions

gatein SVN: r7324 - in portal/branches/dom: portlet/web/src/main/webapp/groovy/portal/webui/component and 1 other directories.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2011-09-07 04:43:20 -0400 (Wed, 07 Sep 2011) New Revision: 7324 Modified: portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl portal/branches/dom/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css Log: Small problem after merge temlate optimization Modified: portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl =================================================================== --- portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl 2011-09-07 08:42:14 UTC (rev 7323) +++ portal/branches/dom/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl 2011-09-07 08:43:20 UTC (rev 7324) @@ -37,7 +37,7 @@ <%// start render action%> <div class="UIAction"> - <a href="javascript:void(0);" onclick="ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'CreatePortal', true))" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Save")%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a> </div> </div> Modified: portal/branches/dom/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl =================================================================== --- portal/branches/dom/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl 2011-09-07 08:42:14 UTC (rev 7323) +++ portal/branches/dom/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl 2011-09-07 08:43:20 UTC (rev 7324) @@ -65,7 +65,7 @@ } print """ <li class="MenuItem $tabStyleNavigation $arrowIcon" title="$title" $getNodeURL> - <a class="ItemIcon $icon" onclick="$actionLink">$label</a> + <a class="ItemIcon $icon" href="$actionLink">$label</a> """; if (node.getChildren().size() > 0) { Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css =================================================================== --- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-07 08:42:14 UTC (rev 7323) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-07 08:43:20 UTC (rev 7324) @@ -160,7 +160,7 @@ } .EdittingContainer .LAYOUT-CONTAINER .UIContainer { - height: 100%; + _height: 100%; /* fix bug dragdrop in IE6 */

12 years, 10 months

1
0
0 / 0

gatein SVN: r7323 - portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2011-09-07 04:42:14 -0400 (Wed, 07 Sep 2011) New Revision: 7323 Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css Log: [DOM] Clean CSS for BLPagebody, BRPagebody, BMPagebody Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css =================================================================== --- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css 2011-09-07 08:40:38 UTC (rev 7322) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css 2011-09-07 08:42:14 UTC (rev 7323) @@ -33,14 +33,16 @@ background: #b5b6b6; } - +.UIWorkingWorkspace .UIPageBody { + background: #DEDFDF; +} .UIWorkingWorkspace .UIPageBody .VIEW-PAGEBODY{ -background: #b5b6b6; + background: #b5b6b6; -moz-border-radius:0px 0px 9px 9px; -webkit-border-radius:0px 0px 9px 9px; border-radius:0px 0px 9px 9px; - padding: 0px 8px 8px; + padding: 0px 8px 8px; } .MaskLayer {

12 years, 10 months

1
0
0 / 0

gatein SVN: r7322 - in portal/branches/dom: web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer and 1 other directory.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2011-09-07 04:40:38 -0400 (Wed, 07 Sep 2011) New Revision: 7322 Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css Log: [DOM] Improve css for Admin toolbar Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-09-07 08:40:38 UTC (rev 7322) @@ -27,7 +27,7 @@ border: none; } -.UIToolbarContainer .ToolbarContainer a { +.UIToolbarContainer .ToolbarContainer .TBIcon { padding: 0px 15px 0px 35px; /* orientation=lt */ padding: 0px 35px 0px 15px; /* orientation=rt */ color: #fff; Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css =================================================================== --- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-09-07 08:40:38 UTC (rev 7322) @@ -64,7 +64,7 @@ border-right: 1px solid white; } -.UIToolbarContainer .ToolbarContainer a { +.UIToolbarContainer .ToolbarContainer .TBIcon { display: block; padding: 0px 5px 0px 35px; /* orientation=lt */ padding: 0px 35px 0px 5px; /* orientation=rt */ @@ -165,8 +165,11 @@ } .UIToolbarContainer .MenuItem a { - padding-right: 25px; /* orientation=lt */ - padding-left: 25px; /* orientation=rt */ + display: block; + padding: 0px 25px 0px 35px; /* orientation=lt */ + padding: 0px 35px 0px 25px; /* orientation=rt */ + white-space: nowrap; + color: #3e3e3e; } .UIToolbarContainer .ItemIcon {

12 years, 10 months

1
0
0 / 0

gatein SVN: r7321 - in portal/branches/dom: examples/skins/simpleskin/src/main/webapp/skin and 49 other directories.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2011-09-07 04:38:53 -0400 (Wed, 07 Sep 2011) New Revision: 7321 Removed: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/BGDecoratorCenter1x18.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/DefaultTheme.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MDefaultTheme.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacBlack.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacGray.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacGreen.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacTheme.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerBlue.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerGreen.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerOrange.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerPink.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerViolet.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowBlue.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowGreen.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowOrange.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowPink.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowViolet.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MVistaBlue.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MVistaTheme.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacBlack.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacGray.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacGreen.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacTheme.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/Resize17x19.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ResizeArea17x15.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ResizeArea18x18.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ResizeArea18x18.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerGreen.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerOrange.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerPink.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerViolet.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundCornerBlue.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowBlue.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowGreen.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowOrange.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowPink.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowViolet.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/SimpleStyle.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/VistaBlue.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/VistaTheme.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/icons/SimpleIcons.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIBreadcumb/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIBreadcumb/background/HomeIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/AddDashboard.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/IconClose.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/GateinLogo.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/GateinLogo.jpg portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/ToolbarContainer.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/UseIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/background/BgPagebody.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/background/BottomDecoratorHome.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/background/ViewPage.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/background/ViewPageRepeat.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/ArrowDown.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/BgContainerBlock.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/BottomVTabSimpleStyle224x1.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/Close.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/ContainerIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/DragAndDropPreview4x4.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/DragBg2x2.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/LineBlock.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/Pen.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/Pen.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/PortalBackground4x4.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecorator.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecoratorHidden.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/close.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/EditIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/LightBlueStyle.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/PageProfileIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/ViewAsBlockIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/background/BarStyle2.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/background/NormalBarStyle.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/background/SmoothNavy40Style.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/background/TitleBar.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBoxDecorator/ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/BlueRoundedStyle.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/DefaultContainerIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/Earth.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/PolygonNavyBlueStyle.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/SmoothStyle26.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/ViewBlockBar.png portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIForms/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIForms/UIForm/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/background/DashboardLayout.jpg portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/background/ItemList.jpg portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/background/ItemSelector.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/background/SelectedItem.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/background/TemplateContainer.jpg portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabPane/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/MessageTabDialog.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/NormalTabStyle_.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/TabEditInline.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/BlueUpLevelArrow.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/Dotted.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/NullItemIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/OverBlueUpLevelArrow.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/SmallGrayMinus.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/SmallGrayPlus.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/AppRegistryControl.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/BlueDownArrow.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/BlueNextArrow.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/ControlIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/CopyIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/Repeat-Y16x2.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleStylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/CollapseAllIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/CollapseIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/Dotted.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/ExpandAllIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/ExpandIcon.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/LastNode.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/NullItem.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/RootTree.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/SitemapItemBoxTitle150x1.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/default_sitemap.gif Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle1.gif portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleStylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIHomePagePortlet/Stylesheet.css portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css portal/branches/dom/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css Log: Clean CSS code for SimpleSkin Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-09-07 08:38:53 UTC (rev 7321) @@ -53,28 +53,13 @@ <css-path>/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css</css-path> </portlet-skin> - <portlet-skin> - <application-name>web</application-name> - <portlet-name>SiteMapPortlet</portlet-name> - <skin-name>SimpleSkin</skin-name> - <css-path>/skin/webPortlet/webui/component/UISiteMap/Stylesheet.css</css-path> - </portlet-skin> -  <portlet-skin> <application-name>web</application-name> <portlet-name>HomePagePortlet</portlet-name> <skin-name>SimpleSkin</skin-name> <css-path>/skin/webPortlet/webui/component/UIHomePagePortlet/Stylesheet.css</css-path> - </portlet-skin> - -  - <portlet-skin> - <application-name>exoadmin</application-name> - <portlet-name>ApplicationRegistryPortlet</portlet-name> - <skin-name>SimpleSkin</skin-name> - <css-path>/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleStylesheet.css</css-path> - </portlet-skin> + </portlet-skin>  <portlet-skin> Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,3346 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -/*-------------------------- DefaultTheme ---------------------------*/ - -.DefaultTheme .WindowBarCenter .WindowPortletInfo { - margin-right: 80px; /* orientation=lt */ - margin-left: 80px; /* orientation=rt */ -} - -.DefaultTheme .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 24px; - height: 17px; - cursor: pointer; - background-image: url('background/DefaultTheme.png'); -} - -.DefaultTheme .ArrowDownIcon { - background-position: center 18px; -} - -.DefaultTheme .OverArrowDownIcon { - background-position: center 114px; -} - -.DefaultTheme .MinimizedIcon { - background-position: center 42px; -} - -.DefaultTheme .OverMinimizedIcon { - background-position: center 138px; -} - -.DefaultTheme .MaximizedIcon { - background-position: center 66px; -} - -.DefaultTheme .OverMaximizedIcon { - background-position: center 162px; -} - -.DefaultTheme .RestoreIcon { - background-position: center 90px; -} - -.DefaultTheme .OverRestoreIcon { - background-position: center 186px; -} - -.DefaultTheme .NormalIcon { - background-position: center 90px; -} - -.DefaultTheme .OverNormalIcon { - background-position: center 186px; -} - - -.UIPageDesktop .DefaultTheme .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 18px; height: 18px; - cursor: nw-resize; - background: url('background/ResizeArea18x18.gif') no-repeat left top; /* orientation=lt */ - background: url('background/ResizeArea18x18-rt.gif') no-repeat right top; /* orientation=rt */ -} - -.DefaultTheme .Information { - height: 20px; line-height: 20px; - vertical-align: middle; font-size: 10px; - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ -} - -.DefaultTheme .WindowBarCenter .WindowPortletIcon { - background: url('background/IconWindowPortlet.gif') no-repeat left top; /* orientation=lt */ - background: url('background/IconWindowPortlet-rt.gif') no-repeat right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; - line-height: 16px; -} - -.DefaultTheme .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - overflow: hidden; - white-space: nowrap; -} - -.DefaultTheme .WindowBarLeft { - padding-left: 8px; - background-image: url('background/DefaultTheme.png'); - background-repeat: no-repeat; - background-position: left -148px; -} - -.DefaultTheme .WindowBarRight { - padding-right: 8px; - background-image: url('background/DefaultTheme.png'); - background-repeat: no-repeat; - background-position: right -119px; -} - -.DefaultTheme .WindowBarCenter { - background-image: url('background/DefaultTheme.png'); - background-repeat: repeat-x; - background-position: left -90px; - height: 20px; - padding-top: 7px; -} - -.DefaultTheme .MiddleDecoratorLeft { - padding-left: 8px; - background: url('background/MDefaultTheme.png') repeat-y left; -} - -.DefaultTheme .MiddleDecoratorRight { - padding-right: 8px; - background: url('background/MDefaultTheme.png') repeat-y right; -} - -.DefaultTheme .MiddleDecoratorCenter { - background: #ffffff; -} - -.DefaultTheme .BottomDecoratorLeft { - padding-left: 8px; - background-image: url('background/DefaultTheme.png'); - background-repeat: no-repeat; - background-position: left -60px; -} - -.DefaultTheme .BottomDecoratorRight { - padding-right: 8px; - background-image: url('background/DefaultTheme.png'); - background-repeat: no-repeat; - background-position: right -30px; -} - -.DefaultTheme .BottomDecoratorCenter { - background-image: url('background/DefaultTheme.png'); - background-repeat: repeat-x; - background-position: left top; - height: 26px; -} - -/*-------------------------- MacTheme ---------------------------*/ - -.MacTheme .WindowBarCenter .WindowPortletInfo { - margin: 0px 70px 0px 0px; /* orientation=lt */ - margin: 0px 0px 0px 70px; /* orientation=rt */ -} - -.MacTheme .WindowBarCenter .WindowPortletIcon { - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.MacTheme .WindowBarCenter .PortletName { - font-weight: bold; - line-height: 17px; - overflow: hidden; - white-space: nowrap; -} - -.MacTheme .WindowBarCenter .PortletIcon { - background: url('/eXoSkinMac/skin/MacSkin/skinIcons/16x16/icons/DefaultPortletIcon.png') no-repeat left top; /* orientation=lt */ - background: url('/eXoSkinMac/skin/MacSkin/skinIcons/16x16/icons/DefaultPortletIcon.png') no-repeat right top; /* orientation=rt */ -} - -.MacTheme .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 21px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/MacTheme.png'); -} - -.MacTheme .ArrowDownIcon { - background-position: center 18px; -} - -.MacTheme .OverArrowDownIcon { - background-position: center 98px; -} - -.MacTheme .MinimizedIcon { - background-position: center 37px; -} - -.MacTheme .OverMinimizedIcon { - background-position: center 118px; -} - -.MacTheme .MaximizedIcon { - background-position: center 57px; -} - -.MacTheme .OverMaximizedIcon { - background-position: center 138px; -} - -.MacTheme .NormalIcon { - background-position: center 78px; -} - -.MacTheme .OverNormalIcon { - background-position: center 158px; -} - -.MacTheme .RestoreIcon { - background-position: center 78px; -} - -.MacTheme .OverRestoreIcon { - background-position: center 158px; -} - -.MacTheme .BackgroundIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 4px 2px 0px 2px; -} - -.UIPageDesktop .MacTheme .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 15px; - cursor: nw-resize; - background: url('background/ResizeArea17x15.png') no-repeat right top; /* orientation=lt */ - background: url('background/ResizeArea17x15-rt.png') no-repeat left top; /* orientation=rt */ -} - -.MacTheme .Information { - height: 16px; line-height: 14px; vertical-align: middle; - font-size: 10px; - margin-right: 18px; - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.MacTheme .MiddleDecoratorLeft { - background: url('background/MMacTheme.png') repeat-y left; - padding: 0px 0px 0px 5px; -} - -.MacTheme .MiddleDecoratorRight { - padding: 0px 5px 0px 0px; - background: url('background/MMacTheme.png') repeat-y right; -} - -.MacTheme .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .MacTheme .MiddleDecoratorCenter { - height: 100%; -} - -.MacTheme .BottomDecoratorLeft { - background-image: url('background/MacTheme.png'); - background-repeat: no-repeat; - background-position: left -46px; - padding: 0px 0px 0px 5px; -} - -.MacTheme .BottomDecoratorRight { - background-image: url('background/MacTheme.png'); - background-repeat: no-repeat; - background-position: right -23px; - padding: 0px 5px 0px 0px; -} - -.MacTheme .BottomDecoratorCenter { - background-image: url('background/MacTheme.png'); - background-repeat: repeat-x; - background-position: center top; - height: 23px; line-height: 23px; -} - -.MacTheme .WindowBarLeft { - background-image: url('background/MacTheme.png'); - background-repeat: no-repeat; - background-position: left -115px; - padding: 0px 0px 0px 12px; -} - -.MacTheme .WindowBarRight { - background-image: url('background/MacTheme.png'); - background-repeat: no-repeat; - background-position: right -92px; - padding: 0px 12px 0px 0px; -} - -.MacTheme .WindowBarCenter { - background-image: url('background/MacTheme.png'); - background-repeat: repeat-x; - background-position: center -69px; - height: 19px; - padding-top: 4px; -} - -/*-------------------------- MacGray ---------------------------*/ - -.MacGray .WindowBarCenter .WindowPortletInfo { - margin: 0px 70px 0px 0px; /* orientation=lt */ - margin: 0px 0px 0px 70px; /* orientation=rt */ -} - -.MacGray .WindowBarCenter .WindowPortletIcon { - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.MacGray .WindowBarCenter .PortletName { - font-weight: bold; - line-height: 17px; - overflow: hidden; - white-space: nowrap; -} - -.MacGray .WindowBarCenter .PortletIcon { - background: url('/eXoSkinMac/skin/MacSkin/skinIcons/16x16/icons/DefaultPortletIcon.png') no-repeat left top; /* orientation=lt */ - background: url('/eXoSkinMac/skin/MacSkin/skinIcons/16x16/icons/DefaultPortletIcon.png') no-repeat right top; /* orientation=rt */ -} - -.MacGray .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 21px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/MacGray.png'); -} - -.MacGray .ArrowDownIcon { - background-position: center 20px; -} - -.MacGray .OverArrowDownIcon { - background-position: center 100px; -} - -.MacGray .MinimizedIcon { - background-position: center 37px; -} - -.MacGray .OverMinimizedIcon { - background-position: center 120px; -} - -.MacGray .MaximizedIcon { - background-position: center 57px; -} - -.MacGray .OverMaximizedIcon { - background-position: center 140px; -} - -.MacGray .NormalIcon { - background-position: center 78px; -} - -.MacGray .OverNormalIcon { - background-position: center 160px; -} - -.MacGray .RestoreIcon { - background-position: center 78px; -} - -.MacGray .OverRestoreIcon { - background-position: center 160px; -} - -.MacGray .BackgroundIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 4px 2px 0px 2px; -} - -.UIPageDesktop .MacGray .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 15px; - cursor: nw-resize; - background: url('background/ResizeArea17x15.png') no-repeat; -} - -.MacGray .Information { - height: 16px; line-height: 14px; vertical-align: middle; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.MacGray .MiddleDecoratorLeft { - background: url('background/MMacGray.png') repeat-y left; - padding: 0px 0px 0px 8px; -} - -.MacGray .MiddleDecoratorRight { - padding: 0px 8px 0px 0px; - background: url('background/MMacGray.png') repeat-y right; -} - -.MacGray .MiddleDecoratorCenter { - background: #ffffff; -} - -.MacGray .MiddleDecoratorCenter { - height:100%; -} - -.MacGray .BottomDecoratorLeft { - background-image: url('background/MacGray.png'); - background-repeat: no-repeat; - background-position: left -48px; - padding: 0px 0px 0px 9px; -} - -.MacGray .BottomDecoratorRight { - padding: 0px 9px 0px 0px; - background-image: url('background/MacGray.png'); - background-repeat: no-repeat; - background-position: right -24px; -} - -.MacGray .BottomDecoratorCenter { - background-image: url('background/MacGray.png'); - background-repeat: repeat-x; - background-position: left top; - height: 24px; line-height: 24px; -} - -.MacGray .WindowBarLeft { - padding: 0px 0px 0px 9px; - background-image: url('background/MacGray.png'); - background-repeat: no-repeat; - background-position: left -118px; -} - -.MacGray .WindowBarRight { - padding: 0px 9px 0px 0px; - background-image: url('background/MacGray.png'); - background-repeat: no-repeat; - background-position: right -95px; -} - -.MacGray .WindowBarCenter { - background-image: url('background/MacGray.png'); - background-repeat: repeat-x; - background-position: center -72px; - height: 19px; - padding-top: 4px; -} - -/*-------------------------- MacBlack ---------------------------*/ - -.MacBlack .WindowBarCenter .WindowPortletInfo { - margin: 0px 70px 0px 0px; /* orientation=lt */ - margin: 0px 0px 0px 70px; /* orientation=rt */ -} - -.MacBlack .WindowBarCenter .WindowPortletIcon { - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.MacBlack .WindowBarCenter .PortletName { - font-weight: bold; - line-height: 17px; - overflow: hidden; - white-space: nowrap; -} - -.MacBlack .WindowBarCenter .PortletIcon { - background: url('/eXoSkinMac/skin/MacSkin/skinIcons/16x16/icons/DefaultPortletIcon.png') no-repeat left top; /* orientation=lt */ - background: url('/eXoSkinMac/skin/MacSkin/skinIcons/16x16/icons/DefaultPortletIcon.png') no-repeat right top; /* orientation=rt */ -} - -.MacBlack .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 21px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/MacBlack.png'); -} - -.MacBlack .ArrowDownIcon { - background-position: center 20px; -} - -.MacBlack .OverArrowDownIcon { - background-position: center 100px; -} - -.MacBlack .MinimizedIcon { - background-position: center 37px; -} - -.MacBlack .OverMinimizedIcon { - background-position: center 120px; -} - -.MacBlack .MaximizedIcon { - background-position: center 57px; -} - -.MacBlack .OverMaximizedIcon { - background-position: center 140px; -} - -.MacBlack .NormalIcon { - background-position: center 78px; -} - -.MacBlack .OverNormalIcon { - background-position: center 160px; -} - -.MacBlack .RestoreIcon { - background-position: center 78px; -} - -.MacBlack .OverRestoreIcon { - background-position: center 160px; -} - -.MacBlack .BackgroundIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 4px 2px 0px 2px; -} - -.UIPageDesktop .MacBlack .ResizeArea { - float: left; /* orientation=rt */ - float: right; /* orientation=lt */ - width: 17px; height: 15px; - cursor: nw-resize; - background: url('background/ResizeArea17x15.png') no-repeat; -} - -.MacBlack .Information { - height: 16px; line-height: 14px; vertical-align: middle; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.MacBlack .MiddleDecoratorLeft { - background: url('background/MMacBlack.png') repeat-y left; - padding: 0px 0px 0px 8px; -} - -.MacBlack .MiddleDecoratorRight { - padding: 0px 8px 0px 0px; - background: url('background/MMacBlack.png') repeat-y right; -} - -.MacBlack .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .MacBlack .MiddleDecoratorCenter { - height: 100%; -} - -.MacBlack .BottomDecoratorLeft { - background-image: url('background/MacBlack.png'); - background-repeat: no-repeat; - background-position: left -48px; - padding: 0px 0px 0px 9px; -} - -.MacBlack .BottomDecoratorRight { - padding: 0px 9px 0px 0px; - background-image: url('background/MacBlack.png'); - background-repeat: no-repeat; - background-position: right -24px; -} - -.MacBlack .BottomDecoratorCenter { - background-image: url('background/MacBlack.png'); - background-repeat: repeat-x; - background-position: left top; - height: 24px; line-height: 24px; -} - -.MacBlack .WindowBarLeft { - padding: 0px 0px 0px 9px; - background-image: url('background/MacBlack.png'); - background-repeat: no-repeat; - background-position: left -118px; -} - -.MacBlack .WindowBarRight { - padding: 0px 9px 0px 0px; - background-image: url('background/MacBlack.png'); - background-repeat: no-repeat; - background-position: right -95px; -} - -.MacBlack .WindowBarCenter { - background-image: url('background/MacBlack.png'); - background-repeat: repeat-x; - background-position: center -72px; - height: 19px; - padding-top: 4px; -} - -/*-------------------------- MacGreenSteel ---------------------------*/ - -.MacGreenSteel .WindowBarCenter .WindowPortletInfo { - margin: 0px 70px 0px 0px; /* orientation=lt */ - margin: 0px 0px 0px 70px; /* orientation=rt */ -} - -.MacGreenSteel .WindowBarCenter .WindowPortletIcon { - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.MacGreenSteel .WindowBarCenter .PortletName { - font-weight: bold; - line-height: 17px; - overflow: hidden; - white-space: nowrap; -} - -.MacGreenSteel .WindowBarCenter .PortletIcon { - background: url('/eXoSkinMac/skin/MacSkin/skinIcons/16x16/icons/DefaultPortletIcon.png') no-repeat left top; /* orientation=lt */ - background: url('/eXoSkinMac/skin/MacSkin/skinIcons/16x16/icons/DefaultPortletIcon.png') no-repeat right top; /* orientation=rt */ -} - -.MacGreenSteel .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 21px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/MacGreen.png'); -} - -.MacGreenSteel .ArrowDownIcon { - background-position: center 20px; -} - -.MacGreenSteel .OverArrowDownIcon { - background-position: center 100px; -} - -.MacGreenSteel .MinimizedIcon { - background-position: center 37px; -} - -.MacGreenSteel .OverMinimizedIcon { - background-position: center 120px; -} - -.MacGreenSteel .MaximizedIcon { - background-position: center 57px; -} - -.MacGreenSteel .OverMaximizedIcon { - background-position: center 140px; -} - -.MacGreenSteel .NormalIcon { - background-position: center 78px; -} - -.MacGreenSteel .OverNormalIcon { - background-position: center 160px; -} - -.MacGreenSteel .RestoreIcon { - background-position: center 78px; -} - -.MacGreenSteel .OverRestoreIcon { - background-position: center 160px; -} - -.MacGreenSteel .BackgroundIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 4px 2px 0px 2px; -} - -.UIPageDesktop .MacGreenSteel .ResizeArea { - float: left; /* orientation=rt */ - float: right; /* orientation=lt */ - width: 17px; height: 15px; - cursor: nw-resize; - background: url('background/ResizeArea17x15.png') no-repeat; -} - -.MacGreenSteel .Information { - height: 16px; line-height: 14px; vertical-align: middle; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.MacGreenSteel .MiddleDecoratorLeft { - background: url('background/MMacGreen.png') repeat-y left; - padding: 0px 0px 0px 8px; -} - -.MacGreenSteel .MiddleDecoratorRight { - padding: 0px 8px 0px 0px; - background: url('background/MMacGreen.png') repeat-y right; -} - -.MacGreenSteel .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .MacGreenSteel .MiddleDecoratorCenter { - height: 100%; -} - -.MacGreenSteel .BottomDecoratorLeft { - background-image: url('background/MacGreen.png'); - background-repeat: no-repeat; - background-position: left -48px; - padding: 0px 0px 0px 9px; -} - -.MacGreenSteel .BottomDecoratorRight { - padding: 0px 9px 0px 0px; - background-image: url('background/MacGreen.png'); - background-repeat: no-repeat; - background-position: right -24px; -} - -.MacGreenSteel .BottomDecoratorCenter { - background-image: url('background/MacGreen.png'); - background-repeat: repeat-x; - background-position: left top; - height: 24px; line-height: 24px; -} - -.MacGreenSteel .WindowBarLeft { - padding: 0px 0px 0px 9px; - background-image: url('background/MacGreen.png'); - background-repeat: no-repeat; - background-position: left -118px; -} - -.MacGreenSteel .WindowBarRight { - padding: 0px 9px 0px 0px; - background-image: url('background/MacGreen.png'); - background-repeat: no-repeat; - background-position: right -95px; -} - -.MacGreenSteel .WindowBarCenter { - background-image: url('background/MacGreen.png'); - background-repeat: repeat-x; - background-position: center -72px; - height: 19px; - padding-top: 4px; -} - -/*-------------------------------- VistaTheme -----------------------------*/ - -.VistaTheme .WindowBarCenter .WindowPortletInfo { - margin-right: 95px; /* orientation=lt */ - margin-left: 95px; /* orientation=rt */ - -} - -.VistaTheme .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 22px; -} - -.VistaTheme .WindowBarCenter .PortletIcon { - background: url('/eXoSkinVista/skin/VistaSkin/skinIcons/16x16/icons/PortletIcon.png') no-repeat left 3px; /* orientation=lt */ - background: url('/eXoSkinVista/skin/VistaSkin/skinIcons/16x16/icons/PortletIcon-rt.png') no-repeat right 3px; /* orientation=rt */ -} - -.VistaTheme .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 30px; - height: 20px; - cursor: pointer; - background-image: url('background/VistaTheme.png'); /* orientation=lt */ - background-image: url('background/VistaTheme-rt.png'); /* orientation=rt */ -} - -.VistaTheme .ArrowDownIcon { - background-position: center 20px; -} - -.VistaTheme .OverArrowDownIcon { - background-position: center 100px; -} - -.VistaTheme .MinimizedIcon { - background-position: center 40px; -} - -.VistaTheme .OverMinimizedIcon { - background-position: center 120px; -} - -.VistaTheme .MaximizedIcon { - background-position: center 60px; -} - -.VistaTheme .OverMaximizedIcon { - background-position: center 140px; -} - -.VistaTheme .NormalIcon { - background-position: center 80px; -} - -.VistaTheme .OverNormalIcon { - background-position: center 160px; -} - -.VistaTheme .RestoreIcon { - background-position: center 80px; -} - -.VistaTheme .OverRestoreIcon { - background-position: center 160px; -} - -.VistaTheme .Information { - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ - height: 18px; line-height: 18px; - font-size: 10px; -} - -.VistaTheme .MiddleDecoratorCenter { - background: #ffffff; - border: solid 1px #717171; -} - -.UIPageDesktop .VistaTheme .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 9px; height: 12px; - cursor: nw-resize; - background: url('/eXoSkinVista/skin/VistaSkin/skinIcons/16x16/icons/ResizeBG.gif') no-repeat bottom right; /* orientation=lt */ - background: url('/eXoSkinVista/skin/VistaSkin/skinIcons/16x16/icons/ResizeBG-rt.gif') no-repeat bottom left; /* orientation=rt */ -} - -.VistaTheme .MiddleDecoratorLeft { - padding-left:12px; - background: url('background/MVistaTheme.png') repeat-y left; -} - -.VistaTheme .MiddleDecoratorRight { - padding-right: 13px; - background: url('background/MVistaTheme.png') repeat-y right; -} - -.UIPageBody .MiddleDecoratorCenter { - background: #ffffff; -} - -.VistaTheme .BottomDecoratorLeft { - background-image: url('background/VistaTheme.png'); - background-repeat: no-repeat; - background-position: left -48px; - padding-left: 12px; -} - -.VistaTheme .BottomDecoratorRight { - background-image: url('background/VistaTheme.png'); - background-repeat: no-repeat; - background-position: right -24px; - padding-right: 13px; -} - -.VistaTheme .BottomDecoratorCenter { - background-image: url('background/VistaTheme.png'); - background-repeat: repeat-x; - background-position: left top; - height: 24px; -} - -.VistaTheme .WindowBarCenter .PortletName { - font-weight: bold; - line-height: 22px; - overflow: hidden; - white-space: nowrap; -} - -.VistaTheme .WindowBarLeft { - background-image: url('background/VistaTheme.png'); - background-repeat: no-repeat; - background-position: left -130px; - padding-left: 12px; -} - -.VistaTheme .WindowBarRight { - background-image: url('background/VistaTheme.png'); - background-repeat: no-repeat; - background-position: right -101px; - padding-right: 16px; -} - -.VistaTheme .WindowBarCenter { - background-image: url('background/VistaTheme.png'); - background-repeat: repeat-x; - background-position: left -72px; - height: 24px; - padding-top: 5px; -} - -/*-------------------------------- VistaBlue -----------------------------*/ - -.VistaBlue .WindowBarCenter .WindowPortletInfo { - margin-right: 95px; /* orientation=lt */ - margin-left: 95px; /* orientation=rt */ - -} - -.VistaBlue .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 20px; -} - -.VistaBlue .WindowBarCenter .PortletName { - font-weight: bold; - line-height: 22px; - overflow: hidden; - white-space: nowrap; -} - -.VistaBlue .WindowBarCenter .PortletIcon { - background: url('/eXoSkinVista/skin/VistaSkin/skinIcons/16x16/icons/PortletIcon.png') no-repeat left 3px; /* orientation=lt */ - background: url('/eXoSkinVista/skin/VistaSkin/skinIcons/16x16/icons/PortletIcon-rt.png') no-repeat right 3px; /* orientation=rt */ -} - -.VistaBlue .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 30px; height: 19px; - cursor: pointer; - background-image: url('background/VistaBlue.png'); -} - -.VistaBlue .ArrowDownIcon { - background-position: center 19px; -} - -.VistaBlue .OverArrowDownIcon { - background-position: center 99px; -} - -.VistaBlue .MinimizedIcon { - background-position: center 39px; -} - -.VistaBlue .OverMinimizedIcon { - background-position: center 119px; -} - -.VistaBlue .MaximizedIcon { - background-position: center 59px; -} - -.VistaBlue .OverMaximizedIcon { - background-position: center 139px; -} - -.VistaBlue .NormalIcon { - background-position: center 79px; -} - -.VistaBlue .OverNormalIcon { - background-position: center 159px; -} - -.VistaBlue .RestoreIcon { - background-position: center 79px; -} - -.VistaBlue .OverRestoreIcon { - background-position: center 159px; -} - -.VistaBlue .Information { - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ - height: 18px; line-height: 18px; - font-size: 10px; -} - -.VistaBlue .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .VistaBlue .MiddleDecoratorCenter { - height: 100%; -} - -.UIPageDesktop .VistaBlue .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 9px; height: 12px; - cursor: nw-resize; - background: url('/eXoSkinVista/skin/VistaSkin/skinIcons/16x16/icons/ResizeBG.gif') no-repeat bottom right; -} - -.VistaBlue .MiddleDecoratorLeft { - padding-left: 15px; - background: url('background/MVistaBlue.png') repeat-y left; -} - -.VistaBlue .MiddleDecoratorRight { - padding-right: 18px; - background: url('background/MVistaBlue.png') repeat-y right; -} - -.UIPortlet .VistaBlue .MiddleDecoratorRight { - padding-right: 16px; -} - -.VistaBlue .BottomDecoratorLeft { - background-image: url('background/VistaBlue.png'); - background-repeat: no-repeat; - background-position: left -54px; - padding-left: 15px; -} - -.VistaBlue .BottomDecoratorRight { - background-image: url('background/VistaBlue.png'); - background-repeat: no-repeat; - background-position: right -27px; - padding-right: 15px; -} - -.VistaBlue .BottomDecoratorCenter { - background-image: url('background/VistaBlue.png'); - background-repeat: repeat-x; - background-position: left top; - height: 27px; -} - -.VistaBlue .WindowBarLeft { - background-image: url('background/VistaBlue.png'); - background-repeat: no-repeat; - background-position: left -151px; - padding-left: 15px; -} - -.VistaBlue .WindowBarRight { - background-image: url('background/VistaBlue.png'); - background-repeat: no-repeat; - background-position: right -116px; - padding-right: 15px; -} - -.VistaBlue .WindowBarCenter { - background-image: url('background/VistaBlue.png'); - background-repeat: repeat-x; - background-position: left -81px; - height: 27px; - padding-top: 8px; -} - -/*-------------------------- RoundConerBlue ---------------------------*/ - -.RoundConerBlue .WindowBarCenter .WindowPortletInfo { - margin-right: 70px; /* orientation=lt */ - margin-left: 70px; /* orientation=rt */ - -} - -.RoundConerBlue .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 20px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/RoundCornerBlue.png'); -} - -.RoundConerBlue .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.RoundConerBlue .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .RoundConerBlue .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.RoundConerBlue .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - line-height: 19px; - overflow: hidden; - white-space: nowrap; -} - -.RoundConerBlue .ArrowDownIcon { - background-position: center 21px; -} - -.RoundConerBlue .OverArrowDownIcon { - background-position: center 117px; -} - -.RoundConerBlue .MinimizedIcon { - background-position: center 45px; -} - -.RoundConerBlue .OverMinimizedIcon { - background-position: center 141px; -} - -.RoundConerBlue .MaximizedIcon { - background-position: center 69px; -} - -.RoundConerBlue .OverMaximizedIcon { - background-position: center 165px; -} - -.RoundConerBlue .RestoreIcon { - background-position: center 93px; -} - -.RoundConerBlue .OverRestoreIcon { - background-position: center 189px; -} - -.RoundConerBlue .NormalIcon { - background-position: center 93px; -} - -.RoundConerBlue .OverNormalIcon { - background-position: center 189px; -} - -.RoundConerBlue .WindowBarLeft { - padding-left: 12px; - background-image: url('background/RoundCornerBlue.png'); - background-repeat: no-repeat; - background-position: left -154px; -} - -.RoundConerBlue .WindowBarRight { - padding-right: 12px; - background-image: url('background/RoundCornerBlue.png'); - background-repeat: no-repeat; - background-position: right -122px; -} - -.RoundConerBlue .WindowBarCenter { - background: url('background/RoundCornerBlue.png') repeat-x; - background-position: left -90px; - height: 22px; - padding-top: 10px; -} - -.RoundConerBlue .MiddleDecoratorLeft { - padding-left: 13px; - background: url('background/MRoundConerBlue.png') repeat-y left; -} - -.RoundConerBlue .MiddleDecoratorRight { - padding-right: 13px; - background: url('background/MRoundConerBlue.png') repeat-y right; -} - -.RoundConerBlue .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .RoundConerBlue .MiddleDecoratorCenter { - height: 100%; -} - -.RoundConerBlue .BottomDecoratorLeft { - padding-left: 13px; - background-image: url('background/RoundCornerBlue.png'); - background-repeat: no-repeat; - background-position: left -60px; -} - -.RoundConerBlue .BottomDecoratorRight { - padding-right: 13px; - background-image: url('background/RoundCornerBlue.png'); - background-repeat: no-repeat; - background-position: right -30px; -} - -.RoundConerBlue .BottomDecoratorCenter { - background: url('background/RoundCornerBlue.png') repeat-x; - background-position: top; - height: 30px; -} - -/*------------------ RoundConerViolet -----------------*/ - -.RoundConerViolet .WindowBarCenter .WindowPortletInfo { - margin-right: 70px; /* orientation=lt */ - margin-left: 70px; /* orientation=rt */ - -} - -.RoundConerViolet .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 20px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/RoundConerViolet.png'); -} - -.RoundConerViolet .Information { - height: 18px; line-height: 18px; - font-size: 10px; - padding-left: 5px; - margin-right: 18px; -} - -.RoundConerViolet .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .RoundConerViolet .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.RoundConerViolet .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - line-height: 19px; - overflow: hidden; - white-space: nowrap; -} - -.RoundConerViolet .ArrowDownIcon { - background-position: center 21px; -} - -.RoundConerViolet .OverArrowDownIcon { - background-position: center 117px; -} - -.RoundConerViolet .MinimizedIcon { - background-position: center 45px; -} - -.RoundConerViolet .OverMinimizedIcon { - background-position: center 141px; -} - -.RoundConerViolet .MaximizedIcon { - background-position: center 69px; -} - -.RoundConerViolet .OverMaximizedIcon { - background-position: center 165px; -} - -.RoundConerViolet .RestoreIcon { - background-position: center 93px; -} - -.RoundConerViolet .OverRestoreIcon { - background-position: center 189px; -} - -.RoundConerViolet .NormalIcon { - background-position: center 93px; -} - -.RoundConerViolet .OverNormalIcon { - background-position: center 189px; -} - -.RoundConerViolet .WindowBarLeft { - padding-left: 13px; - background-image: url('background/RoundConerViolet.png'); - background-repeat: no-repeat; - background-position: left -153px; -} - -.RoundConerViolet .WindowBarRight { - padding-right: 13px; - background-image: url('background/RoundConerViolet.png'); - background-repeat: no-repeat; - background-position: right -121px; -} - -.RoundConerViolet .WindowBarCenter { - background: url('background/RoundConerViolet.png') repeat-x; - background-position: left -90px; - height: 22px; - padding-top: 10px; -} - -.UIPortlet .RoundConerViolet .WindowBarCenter { - height: 31px; -} - -.RoundConerViolet .MiddleDecoratorLeft { - padding-left: 13px; - background: url('background/MRoundConerViolet.png') repeat-y left; -} - -.RoundConerViolet .MiddleDecoratorRight { - padding-right: 13px; - background: url('background/MRoundConerViolet.png') repeat-y right; -} - -.RoundConerViolet .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .RoundConerViolet .MiddleDecoratorCenter { - height:100%; -} - -.RoundConerViolet .BottomDecoratorLeft { - padding-left: 13px; - background-image: url('background/RoundConerViolet.png'); - background-repeat: no-repeat; - background-position: left -60px; -} - -.RoundConerViolet .BottomDecoratorRight { - padding-right: 13px; - background-image: url('background/RoundConerViolet.png'); - background-repeat: no-repeat; - background-position: right -30px; -} - -.RoundConerViolet .BottomDecoratorCenter { - background: url('background/RoundConerViolet.png') repeat-x; - background-position: top; - height: 30px; -} - -/*------------------------------- RoundConerOrange ----------------------------------*/ - -.RoundConerOrange .WindowBarCenter .WindowPortletInfo { - margin-right: 70px; /* orientation=lt */ - margin-left: 70px; /* orientation=rt */ -} - -.RoundConerOrange .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 20px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/RoundConerOrange.png'); -} - -.RoundConerOrange .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.RoundConerOrange .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .RoundConerOrange .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.RoundConerOrange .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - line-height: 19px; - overflow: hidden; - white-space: nowrap; -} - -.RoundConerOrange .ArrowDownIcon { - background-position: center 21px; -} - -.RoundConerOrange .OverArrowDownIcon { - background-position: center 117px; -} - -.RoundConerOrange .MinimizedIcon { - background-position: center 45px; -} - -.RoundConerOrange .OverMinimizedIcon { - background-position: center 141px; -} - -.RoundConerOrange .MaximizedIcon { - background-position: center 69px; -} - -.RoundConerOrange .OverMaximizedIcon { - background-position: center 165px; -} - -.RoundConerOrange .RestoreIcon { - background-position: center 93px; -} - -.RoundConerOrange .OverRestoreIcon { - background-position: center 189px; -} - -.RoundConerOrange .NormalIcon { - background-position: center 93px; -} - -.RoundConerOrange .OverNormalIcon { - background-position: center 189px; -} - -.RoundConerOrange .WindowBarLeft { - padding-left: 13px; - background-image: url('background/RoundConerOrange.png'); - background-repeat: no-repeat; - background-position: left -153px; -} - -.RoundConerOrange .WindowBarRight { - padding-right: 13px; - background-image: url('background/RoundConerOrange.png'); - background-repeat: no-repeat; - background-position: right -121px; -} - -.RoundConerOrange .WindowBarCenter { - background: url('background/RoundConerOrange.png') repeat-x; - background-position: left -90px; - height: 22px; - padding-top: 10px; -} - -.UIPortlet .RoundConerOrange .WindowBarCenter { - height: 31px; -} - -.RoundConerOrange .MiddleDecoratorLeft { - padding-left: 13px; - background: url('background/MRoundConerOrange.png') repeat-y left; -} - -.RoundConerOrange .MiddleDecoratorRight { - padding-right: 13px; - background: url('background/MRoundConerOrange.png') repeat-y right; -} - -.RoundConerOrange .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .RoundConerOrange .MiddleDecoratorCenter { - height: 100%; -} - -.RoundConerOrange .BottomDecoratorLeft { - padding-left: 13px; - background-image: url('background/RoundConerOrange.png'); - background-repeat: no-repeat; - background-position: left -60px; -} - -.RoundConerOrange .BottomDecoratorRight { - padding-right: 13px; - background-image: url('background/RoundConerOrange.png'); - background-repeat: no-repeat; - background-position: right -30px; -} - -.RoundConerOrange .BottomDecoratorCenter { - background: url('background/RoundConerOrange.png') repeat-x; - background-position: top; - height: 30px; -} - -/*------------------------------- RoundConerPink ----------------------------------*/ - -.RoundConerPink .WindowBarCenter .WindowPortletInfo { - margin-right: 70px; /* orientation=lt */ - margin-left: 70px; /* orientation=rt */ -} - -.RoundConerPink .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 20px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/RoundConerPink.png'); -} - -.RoundConerPink .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.RoundConerPink .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .RoundConerPink .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.RoundConerPink .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - line-height: 19px; - overflow: hidden; - white-space: nowrap; -} - -.RoundConerPink .ArrowDownIcon { - background-position: center 21px; -} - -.RoundConerPink .OverArrowDownIcon { - background-position: center 117px; -} - -.RoundConerPink .MinimizedIcon { - background-position: center 45px; -} - -.RoundConerPink .OverMinimizedIcon { - background-position: center 141px; -} - -.RoundConerPink .MaximizedIcon { - background-position: center 69px; -} - -.RoundConerPink .OverMaximizedIcon { - background-position: center 165px; -} - -.RoundConerPink .RestoreIcon { - background-position: center 93px; -} - -.RoundConerPink .OverRestoreIcon { - background-position: center 189px; -} - -.RoundConerPink .NormalIcon { - background-position: center 93px; -} - -.RoundConerPink .OverNormalIcon { - background-position: center 189px; -} - -.RoundConerPink .WindowBarLeft { - padding-left: 13px; - background-image: url('background/RoundConerPink.png'); - background-repeat: no-repeat; - background-position: left -153px; -} - -.RoundConerPink .WindowBarRight { - padding-right: 13px; - background-image: url('background/RoundConerPink.png'); - background-repeat: no-repeat; - background-position: right -121px; -} - -.RoundConerPink .WindowBarCenter { - background: url('background/RoundConerPink.png') repeat-x; - background-position: left -90px; - height: 22px; - padding-top: 10px; -} - -.UIPortlet .RoundConerPink .WindowBarCenter { - height: 31px; -} - -.RoundConerPink .MiddleDecoratorLeft { - padding-left: 13px; - background: url('background/MRoundConerPink.png') repeat-y left; -} - -.RoundConerPink .MiddleDecoratorRight { - padding-right: 13px; - background: url('background/MRoundConerPink.png') repeat-y right; -} - -.RoundConerPink .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .RoundConerPink .MiddleDecoratorCenter { - height: 100%; -} - -.RoundConerPink .BottomDecoratorLeft { - padding-left: 13px; - background-image: url('background/RoundConerPink.png'); - background-repeat: no-repeat; - background-position: left -60px; -} - -.RoundConerPink .BottomDecoratorRight { - padding-right: 13px; - background-image: url('background/RoundConerPink.png'); - background-repeat: no-repeat; - background-position: right -30px; -} - -.RoundConerPink .BottomDecoratorCenter { - background: url('background/RoundConerPink.png') repeat-x; - background-position: top; - height: 30px; -} - -/*------------------------------- RoundConerGreen ----------------------------------*/ - -.RoundConerGreen .WindowBarCenter .WindowPortletInfo { - margin-right: 70px; /* orientation=lt */ - margin-left: 70px; /* orientation=rt */ -} - -.RoundConerGreen .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 20px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/RoundConerGreen.png'); -} - -.RoundConerGreen .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.RoundConerGreen .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .RoundConerGreen .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.RoundConerGreen .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - line-height: 19px; - overflow: hidden; - white-space: nowrap; -} - -.RoundConerGreen .ArrowDownIcon { - background-position: center 21px; -} - -.RoundConerGreen .OverArrowDownIcon { - background-position: center 117px; -} - -.RoundConerGreen .MinimizedIcon { - background-position: center 45px; -} - -.RoundConerGreen .OverMinimizedIcon { - background-position: center 141px; -} - -.RoundConerGreen .MaximizedIcon { - background-position: center 69px; -} - -.RoundConerGreen .OverMaximizedIcon { - background-position: center 165px; -} - -.RoundConerGreen .RestoreIcon { - background-position: center 93px; -} - -.RoundConerGreen .OverRestoreIcon { - background-position: center 189px; -} - -.RoundConerGreen .NormalIcon { - background-position: center 93px; -} - -.RoundConerGreen .OverNormalIcon { - background-position: center 189px; -} - -.RoundConerGreen .WindowBarLeft { - padding-left: 13px; - background-image: url('background/RoundConerGreen.png'); - background-repeat: no-repeat; - background-position: left -153px; -} - -.RoundConerGreen .WindowBarRight { - padding-right: 13px; - background-image: url('background/RoundConerGreen.png'); - background-repeat: no-repeat; - background-position: right -121px; -} - -.RoundConerGreen .WindowBarCenter { - background: url('background/RoundConerGreen.png') repeat-x; - background-position: left -90px; - height: 22px; - padding-top: 10px; -} - -.UIPortlet .RoundConerGreen .WindowBarCenter { - height: 31px; -} - -.RoundConerGreen .MiddleDecoratorLeft { - padding-left: 13px; - background: url('background/MRoundConerGreen.png') repeat-y left; -} - -.RoundConerGreen .MiddleDecoratorRight { - padding-right: 13px; - background: url('background/MRoundConerGreen.png') repeat-y right; -} - -.RoundConerGreen .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .RoundConerGreen .MiddleDecoratorCenter { - height: 100%; -} - -.RoundConerGreen .BottomDecoratorLeft { - padding-left: 13px; - background-image: url('background/RoundConerGreen.png'); - background-repeat: no-repeat; - background-position: left -60px; -} - -.RoundConerGreen .BottomDecoratorRight { - padding-right: 13px; - background-image: url('background/RoundConerGreen.png'); - background-repeat: no-repeat; - background-position: right -30px; -} - -.RoundConerGreen .BottomDecoratorCenter { - background: url('background/RoundConerGreen.png') repeat-x; - background-position: top; - height: 30px; -} - -/*-------------------------- ShadowBlue ---------------------------*/ - -.ShadowBlue .WindowBarCenter .WindowPortletInfo { - margin-right: 70px; /* orientation=lt */ - margin-left: 70px; /* orientation=rt */ -} - -.ShadowBlue .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 20px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/ShadowBlue.png'); -} - -.ShadowBlue .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.ShadowBlue .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .ShadowBlue .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.ShadowBlue .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - line-height: 16px; - overflow: hidden; - white-space: nowrap; -} - -.ShadowBlue .ArrowDownIcon { - background-position: center 20px; -} - -.ShadowBlue .OverArrowDownIcon { - background-position: center 116px; -} - -.ShadowBlue .MinimizedIcon { - background-position: center 44px; -} - -.ShadowBlue .OverMinimizedIcon { - background-position: center 140px; -} - -.ShadowBlue .MaximizedIcon { - background-position: center 68px; -} - -.ShadowBlue .OverMaximizedIcon { - background-position: center 164px; -} - -.ShadowBlue .RestoreIcon { - background-position: center 92px; -} - -.ShadowBlue .OverRestoreIcon { - background-position: center 188px; -} - -.ShadowBlue .NormalIcon { - background-position: center 92px; -} - -.ShadowBlue .OverNormalIcon { - background-position: center 188px; -} - -.ShadowBlue .WindowBarLeft { - padding-left: 11px; - background-image: url('background/ShadowBlue.png'); - background-repeat: no-repeat; - background-position: left -142px; -} - -.ShadowBlue .WindowBarRight { - padding-right: 10px; - background-image: url('background/ShadowBlue.png'); - background-repeat: no-repeat; - background-position: right -113px; -} - -.ShadowBlue .WindowBarCenter { - background-image: url('background/ShadowBlue.png'); - background-repeat: repeat-x; - background-position: center -84px; - height: 20px; - padding-top: 9px; -} - -.ShadowBlue .MiddleDecoratorLeft { - padding-left: 11px; - background: url('background/MShadowBlue.png') repeat-y left; -} - -.ShadowBlue .MiddleDecoratorRight { - padding-right: 10px; - background: url('background/MShadowBlue.png') repeat-y right; -} - -.ShadowBlue .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .ShadowBlue .MiddleDecoratorCenter { - height: 100%; -} - -.ShadowBlue .BottomDecoratorLeft { - padding-left: 11px; - background-image: url('background/ShadowBlue.png'); - background-repeat: no-repeat; - background-position: left -56px; -} - -.ShadowBlue .BottomDecoratorRight { - padding-right: 10px; - background-image: url('background/ShadowBlue.png'); - background-repeat: no-repeat; - background-position: right -28px; -} - -.ShadowBlue .BottomDecoratorCenter { - background-image: url('background/ShadowBlue.png'); - background-repeat: repeat-x; - background-position: center top; - height: 28px; -} - -/*------------------------------ ShadowViolet -----------------------------------*/ - -.ShadowViolet .WindowBarCenter .WindowPortletInfo { - margin-right: 70px; /* orientation=lt */ - margin-left: 70px; /* orientation=rt */ -} - -.ShadowViolet .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 20px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/ShadowViolet.png'); -} - -.ShadowViolet .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.ShadowViolet .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .ShadowViolet .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.ShadowViolet .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - line-height: 16px; - overflow: hidden; - white-space: nowrap; -} - -.ShadowViolet .ArrowDownIcon { - background-position: center 20px; -} - -.ShadowViolet .OverArrowDownIcon { - background-position: center 116px; -} - -.ShadowViolet .MinimizedIcon { - background-position: center 44px; -} - -.ShadowViolet .OverMinimizedIcon { - background-position: center 140px; -} - -.ShadowViolet .MaximizedIcon { - background-position: center 68px; -} - -.ShadowViolet .OverMaximizedIcon { - background-position: center 164px; -} - -.ShadowViolet .RestoreIcon { - background-position: center 92px; -} - -.ShadowViolet .OverRestoreIcon { - background-position: center 188px; -} - -.ShadowViolet .NormalIcon { - background-position: center 92px; -} - -.ShadowViolet .OverNormalIcon { - background-position: center 188px; -} - -.ShadowViolet .WindowBarLeft { - padding-left: 11px; - background-image: url('background/ShadowViolet.png'); - background-repeat: no-repeat; - background-position: left -142px; -} - -.ShadowViolet .WindowBarRight { - padding-right: 10px; - background-image: url('background/ShadowViolet.png'); - background-repeat: no-repeat; - background-position: right -113px; -} - -.ShadowViolet .WindowBarCenter { - background-image: url('background/ShadowViolet.png'); - background-repeat: repeat-x; - background-position: center -84px; - height: 20px; - padding-top: 9px; -} - -.ShadowViolet .MiddleDecoratorLeft { - padding-left: 11px; - background: url('background/MShadowViolet.png') repeat-y left; -} - -.ShadowViolet .MiddleDecoratorRight { - padding-right: 10px; - background: url('background/MShadowViolet.png') repeat-y right; -} - -.ShadowViolet .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .ShadowViolet .MiddleDecoratorCenter { - height: 100%; -} - -.ShadowViolet .BottomDecoratorLeft { - padding-left: 11px; - background-image: url('background/ShadowViolet.png'); - background-repeat: no-repeat; - background-position: left -56px; -} - -.ShadowViolet .BottomDecoratorRight { - padding-right: 10px; - background-image: url('background/ShadowViolet.png'); - background-repeat: no-repeat; - background-position: right -28px; -} - -.ShadowViolet .BottomDecoratorCenter { - background-image: url('background/ShadowViolet.png'); - background-repeat: repeat-x; - background-position: center top; - height: 28px; -} - -/*------------------------------ ShadowOrange -----------------------------------*/ - -.ShadowOrange .WindowBarCenter .WindowPortletInfo { - margin-right: 70px; /* orientation=lt */ - margin-left: 70px; /* orientation=rt */ -} - -.ShadowOrange .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 20px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/ShadowOrange.png'); -} - -.ShadowOrange .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.ShadowOrange .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .ShadowOrange .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.ShadowOrange .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - line-height: 16px; - overflow: hidden; - white-space: nowrap; -} - -.ShadowOrange .ArrowDownIcon { - background-position: center 20px; -} - -.ShadowOrange .OverArrowDownIcon { - background-position: center 116px; -} - -.ShadowOrange .MinimizedIcon { - background-position: center 44px; -} - -.ShadowOrange .OverMinimizedIcon { - background-position: center 140px; -} - -.ShadowOrange .MaximizedIcon { - background-position: center 68px; -} - -.ShadowOrange .OverMaximizedIcon { - background-position: center 164px; -} - -.ShadowOrange .RestoreIcon { - background-position: center 92px; -} - -.ShadowOrange .OverRestoreIcon { - background-position: center 188px; -} - -.ShadowOrange .NormalIcon { - background-position: center 92px; -} - -.ShadowOrange .OverNormalIcon { - background-position: center 188px; -} - -.ShadowOrange .WindowBarLeft { - padding-left: 11px; - background-image: url('background/ShadowOrange.png'); - background-repeat: no-repeat; - background-position: left -142px; -} - -.ShadowOrange .WindowBarRight { - padding-right: 10px; - background-image: url('background/ShadowOrange.png'); - background-repeat: no-repeat; - background-position: right -113px; -} - -.ShadowOrange .WindowBarCenter { - background-image: url('background/ShadowOrange.png'); - background-repeat: repeat-x; - background-position: center -84px; - height: 19px; - padding-top: 10px; -} - -.ShadowOrange .MiddleDecoratorLeft { - padding-left: 11px; - background: url('background/MShadowOrange.png') repeat-y left; -} - -.ShadowOrange .MiddleDecoratorRight { - padding-right: 10px; - background: url('background/MShadowOrange.png') repeat-y right; -} - -.ShadowOrange .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .ShadowOrange .MiddleDecoratorCenter { - height: 100%; -} - -.ShadowOrange .BottomDecoratorLeft { - padding-left: 11px; - background-image: url('background/ShadowOrange.png'); - background-repeat: no-repeat; - background-position: left -56px; -} - -.ShadowOrange .BottomDecoratorRight { - padding-right: 10px; - background-image: url('background/ShadowOrange.png'); - background-repeat: no-repeat; - background-position: right -28px; -} - -.ShadowOrange .BottomDecoratorCenter { - background-image: url('background/ShadowOrange.png'); - background-repeat: repeat-x; - background-position: center top; - height: 28px; -} - -/*------------------------------ ShadowPink -----------------------------------*/ - - -.ShadowPink .WindowBarCenter .WindowPortletInfo { - margin-right: 70px; /* orientation=lt */ - margin-left: 70px; /* orientation=rt */ -} - -.ShadowPink .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 20px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/ShadowPink.png'); -} - -.ShadowPink .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.ShadowPink .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .ShadowPink .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.ShadowPink .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - line-height: 16px; - overflow: hidden; - white-space: nowrap; -} - -.ShadowPink .ArrowDownIcon { - background-position: center 20px; -} - -.ShadowPink .OverArrowDownIcon { - background-position: center 116px; -} - -.ShadowPink .MinimizedIcon { - background-position: center 44px; -} - -.ShadowPink .OverMinimizedIcon { - background-position: center 140px; -} - -.ShadowPink .MaximizedIcon { - background-position: center 68px; -} - -.ShadowPink .OverMaximizedIcon { - background-position: center 164px; -} - -.ShadowPink .RestoreIcon { - background-position: center 92px; -} - -.ShadowPink .OverRestoreIcon { - background-position: center 188px; -} - -.ShadowPink .NormalIcon { - background-position: center 92px; -} - -.ShadowPink .OverNormalIcon { - background-position: center 188px; -} - -.ShadowPink .WindowBarLeft { - padding-left: 11px; - background-image: url('background/ShadowPink.png'); - background-repeat: no-repeat; - background-position: left -142px; -} - -.ShadowPink .WindowBarRight { - padding-right: 10px; - background-image: url('background/ShadowPink.png'); - background-repeat: no-repeat; - background-position: right -113px; -} - -.ShadowPink .WindowBarCenter { - background-image: url('background/ShadowPink.png'); - background-repeat: repeat-x; - background-position: center -84px; - height: 19px; - padding-top: 10px; -} - -.ShadowPink .MiddleDecoratorLeft { - padding-left: 11px; - background: url('background/MShadowPink.png') repeat-y left; -} - -.ShadowPink .MiddleDecoratorRight { - padding-right: 10px; - background: url('background/MShadowPink.png') repeat-y right; -} - -.ShadowPink .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .ShadowPink .MiddleDecoratorCenter { - height: 100%; -} - -.ShadowPink .BottomDecoratorLeft { - padding-left: 11px; - background-image: url('background/ShadowPink.png'); - background-repeat: no-repeat; - background-position: left -56px; -} - -.ShadowPink .BottomDecoratorRight { - padding-right: 10px; - background-image: url('background/ShadowPink.png'); - background-repeat: no-repeat; - background-position: right -28px; -} - -.ShadowPink .BottomDecoratorCenter { - background-image: url('background/ShadowPink.png'); - background-repeat: repeat-x; - background-position: center top; - height: 28px; -} - -/*------------------------------ ShadowGreen -----------------------------------*/ - - -.ShadowGreen .WindowBarCenter .WindowPortletInfo { - margin-right: 70px; /* orientation=lt */ - margin-left: 70px; /* orientation=rt */ -} - -.ShadowGreen .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 20px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; - background-image: url('background/ShadowGreen.png'); -} - -.ShadowGreen .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.ShadowGreen .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .ShadowGreen .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.ShadowGreen .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - line-height: 16px; - overflow: hidden; - white-space: nowrap; -} - -.ShadowGreen .ArrowDownIcon { - background-position: center 20px; -} - -.ShadowGreen .OverArrowDownIcon { - background-position: center 116px; -} - -.ShadowGreen .MinimizedIcon { - background-position: center 44px; -} - -.ShadowGreen .OverMinimizedIcon { - background-position: center 140px; -} - -.ShadowGreen .MaximizedIcon { - background-position: center 68px; -} - -.ShadowGreen .OverMaximizedIcon { - background-position: center 164px; -} - -.ShadowGreen .RestoreIcon { - background-position: center 92px; -} - -.ShadowGreen .OverRestoreIcon { - background-position: center 188px; -} - -.ShadowGreen .NormalIcon { - background-position: center 92px; -} - -.ShadowGreen .OverNormalIcon { - background-position: center 188px; -} - -.ShadowGreen .WindowBarLeft { - padding-left: 11px; - background-image: url('background/ShadowGreen.png'); - background-repeat: no-repeat; - background-position: left -142px; -} - -.ShadowGreen .WindowBarRight { - padding-right: 10px; - background-image: url('background/ShadowGreen.png'); - background-repeat: no-repeat; - background-position: right -113px; -} - -.ShadowGreen .WindowBarCenter { - background-image: url('background/ShadowGreen.png'); - background-repeat: repeat-x; - background-position: center -84px; - height: 20px; - padding-top: 9px; -} - -.ShadowGreen .MiddleDecoratorLeft { - padding-left: 11px; - background: url('background/MShadowGreen.png') repeat-y left; -} - -.ShadowGreen .MiddleDecoratorRight { - padding-right: 10px; - background: url('background/MShadowGreen.png') repeat-y right; -} - -.ShadowGreen .MiddleDecoratorCenter { - background: #ffffff; -} - -.UIPortlet .ShadowGreen .MiddleDecoratorCenter { - height: 100%; -} - -.ShadowGreen .BottomDecoratorLeft { - padding-left: 11px; - background-image: url('background/ShadowGreen.png'); - background-repeat: no-repeat; - background-position: left -56px; -} - -.ShadowGreen .BottomDecoratorRight { - padding-right: 10px; - background-image: url('background/ShadowGreen.png'); - background-repeat: no-repeat; - background-position: right -28px; -} - -.ShadowGreen .BottomDecoratorCenter { - background-image: url('background/ShadowGreen.png'); - background-repeat: repeat-x; - background-position: center top; - height: 28px; -} - -/*------------------------------ SimpleBlue -----------------------------------*/ - -.SimpleBlue .WindowBarCenter .WindowPortletInfo { - margin-right: 60px; /* orientation=lt */ - margin-left: 60px; /* orientation=rt */ -} - -.SimpleBlue .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 16px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; -} - -.SimpleBlue .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.SimpleBlue .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .SimpleBlue .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.SimpleBlue .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - overflow: hidden; - white-space: nowrap; -} - -.SimpleBlue .ArrowDownIcon { - background: url('background/SimpleStyle.gif') left 16px; -} - -.SimpleBlue .OverArrowDownIcon { - background: url('background/SimpleStyle.gif') right 16px; -} - -.SimpleBlue .MinimizedIcon { - background: url('background/SimpleStyle.gif') left 32px; -} - -.SimpleBlue .OverMinimizedIcon { - background: url('background/SimpleStyle.gif') right 32px; -} - -.SimpleBlue .MaximizedIcon { - background: url('background/SimpleStyle.gif') left 48px; -} - -.SimpleBlue .OverMaximizedIcon { - background: url('background/SimpleStyle.gif') right 48px; -} - -.SimpleBlue .RestoreIcon { - background: url('background/SimpleStyle.gif') left 64px; -} - -.SimpleBlue .OverRestoreIcon { - background: url('background/SimpleStyle.gif') right 64px; -} - -.SimpleBlue .NormalIcon { - background: url('background/SimpleStyle.gif') left 64px; -} - -.SimpleBlue .OverNormalIcon { - background: url('background/SimpleStyle.gif') right 64px; -} - -.SimpleBlue .WindowBarLeft { - border: 1px solid #3d589d; - border-bottom: none; -} - -.SimpleBlue .WindowBarRight { - border: 1px solid #d7e5f2; -} - -.SimpleBlue .WindowBarCenter { - background: #b0c0f5; - height: 18px; - line-height: 18px; -} - - -.SimpleBlue .MiddleDecoratorLeft { - border-left: 1px solid #3d589d; - border-right: 1px solid #3d589d; -} - -.SimpleBlue .MiddleDecoratorRight { - border: 2px solid #d7e5f2; - border-top: none; - border-bottom: none; -} - -.SimpleBlue .MiddleDecoratorCenter { - border: 1px solid #4a67b1; - border-bottom: none; - background: #ffffff; - padding: 1px; -} - -.SimpleBlue .BottomDecoratorLeft { - border-left: 1px solid #3d589d; - border-right: 1px solid #3d589d; - border-bottom: 1px solid #3d589d; -} - -.SimpleBlue .BottomDecoratorRight { - border: 2px solid #d7e5f2; - border-top: none; -} - -.SimpleBlue .BottomDecoratorCenter { - border: 1px solid #4a67b1; - border-top: none; - background: white url('background/BGDecoratorCenter1x18.gif') repeat-x; - height: 19px; -} - -/*------------------------------ SimpleViolet -----------------------------------*/ - -.SimpleViolet .WindowBarCenter .WindowPortletInfo { - margin-right: 60px; /* orientation=lt */ - margin-left: 60px; /* orientation=rt */ -} - -.SimpleViolet .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 16px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; -} - -.SimpleViolet .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.SimpleViolet .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .SimpleViolet .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.SimpleViolet .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - overflow: hidden; - white-space: nowrap; -} - -.SimpleViolet .ArrowDownIcon { - background: url('background/SimpleStyle.gif') left 80px; -} - -.SimpleViolet .OverArrowDownIcon { - background: url('background/SimpleStyle.gif') right 80px; -} - -.SimpleViolet .MinimizedIcon { - background: url('background/SimpleStyle.gif') left 96px; -} - -.SimpleViolet .OverMinimizedIcon { - background: url('background/SimpleStyle.gif') right 96px; -} - -.SimpleViolet .MaximizedIcon { - background: url('background/SimpleStyle.gif') left 112px; -} - -.SimpleViolet .OverMaximizedIcon { - background: url('background/SimpleStyle.gif') right 112px; -} - -.SimpleViolet .RestoreIcon { - background: url('background/SimpleStyle.gif') left 128px; -} - -.SimpleViolet .OverRestoreIcon { - background: url('background/SimpleStyle.gif') right 128px; -} - -.SimpleViolet .NormalIcon { - background: url('background/SimpleStyle.gif') left 128px; -} - -.SimpleViolet .OverNormalIcon { - background: url('background/SimpleStyle.gif') right 128px; -} - -.SimpleViolet .WindowBarLeft { - border: 1px solid #c41fdc; - border-bottom: none; -} - -.SimpleViolet .WindowBarRight { - border: 1px solid #ece7ff; -} - -.SimpleViolet .WindowBarCenter { - background: #c4a6ff; - height: 18px; - line-height: 18px; -} - -.SimpleViolet .MiddleDecoratorLeft { - border-left: 1px solid #c41fdc; - border-right: 1px solid #c41fdc; -} - -.SimpleViolet .MiddleDecoratorRight { - border: 2px solid #ece7ff; - border-top: none; - border-bottom: none; -} - -.SimpleViolet .MiddleDecoratorCenter { - border: 1px solid #5700a9; - border-bottom: none; - background: #ffffff; - padding: 1px; -} - -.SimpleViolet .BottomDecoratorLeft { - border: 1px solid #c41fdc; - border-top: none; -} - -.SimpleViolet .BottomDecoratorRight { - border: 2px solid #ece7ff; - border-top: none; -} - -.SimpleViolet .BottomDecoratorCenter { - border: 1px solid #5700a9; - border-top: none; - background: url('background/BGDecoratorCenter1x18.gif') repeat-x; - height: 19px; -} - -.UIPortlet .SimpleViolet .BottomDecoratorCenter { - height: 18px; -} - -/*------------------------------ SimpleOrange -----------------------------------*/ - -.SimpleOrange .WindowBarCenter .WindowPortletInfo { - margin-right: 60px; /* orientation=lt */ - margin-left: 60px; /* orientation=rt */ -} - -.SimpleOrange .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 16px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; -} - -.SimpleOrange .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.SimpleOrange .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .SimpleOrange .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.SimpleOrange .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - overflow: hidden; - white-space: nowrap; -} - -.SimpleOrange .ArrowDownIcon { - background: url('background/SimpleStyle.gif') left 144px; -} - -.SimpleOrange .OverArrowDownIcon { - background: url('background/SimpleStyle.gif') right 144px; -} - -.SimpleOrange .MinimizedIcon { - background: url('background/SimpleStyle.gif') left 160px; -} - -.SimpleOrange .OverMinimizedIcon { - background: url('background/SimpleStyle.gif') right 160px; -} - -.SimpleOrange .MaximizedIcon { - background: url('background/SimpleStyle.gif') left 192px; -} - -.SimpleOrange .OverMaximizedIcon { - background: url('background/SimpleStyle.gif') right 192px; -} - -.SimpleOrange .RestoreIcon { - background: url('background/SimpleStyle.gif') left 176px; -} - -.SimpleOrange .OverRestoreIcon { - background: url('background/SimpleStyle.gif') right 176px; -} - -.SimpleOrange .NormalIcon { - background: url('background/SimpleStyle.gif') left 176px; -} - -.SimpleOrange .OverNormalIcon { - background: url('background/SimpleStyle.gif') right 176px; -} - -.SimpleOrange .WindowBarLeft { - border: 1px solid #ffb27f; - border-bottom: none; -} - -.SimpleOrange .WindowBarRight { - border: 1px solid #fff1e5; -} - -.SimpleOrange .WindowBarCenter { - background: #ffd1a8; - height: 18px; - line-height: 18px; -} - -.SimpleOrange .MiddleDecoratorLeft { - border-left: 1px solid #ffb27f; - border-right: 1px solid #ffb27f; -} - -.SimpleOrange .MiddleDecoratorRight { - border: 2px solid #fff1e5; - border-top: none; - border-bottom: none; -} - -.SimpleOrange .MiddleDecoratorCenter { - border: 1px solid #b27a49; - border-bottom: none; - background: #ffffff; - padding: 1px; -} - -.SimpleOrange .BottomDecoratorLeft { - border: 1px solid #ffb27f; - border-top: none; -} - -.SimpleOrange .BottomDecoratorRight { - border: 2px solid #fff1e5; - border-top: none; -} - -.SimpleOrange .BottomDecoratorCenter { - border: 1px solid #b27a49; - border-top: none; - background: url('background/BGDecoratorCenter1x18.gif') repeat-x; - height: 19px; -} - -.UIPortlet .SimpleOrange .BottomDecoratorCenter { - height: 18px; -} - -/*------------------------------ SimplePink -----------------------------------*/ - -.SimplePink .WindowBarCenter .WindowPortletInfo { - margin-right: 60px; /* orientation=lt */ - margin-left: 60px; /* orientation=rt */ -} - -.SimplePink .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 16px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; -} - -.SimplePink .Information { - height: 18px; line-height: 18px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.SimplePink .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .SimplePink .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.SimplePink .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - overflow: hidden; - white-space: nowrap; -} - -.SimplePink .ArrowDownIcon { - background: url('background/SimpleStyle.gif') left 208px; -} - -.SimplePink .OverArrowDownIcon { - background: url('background/SimpleStyle.gif') right 208px; -} - -.SimplePink .MinimizedIcon { - background: url('background/SimpleStyle.gif') left 224px; -} - -.SimplePink .OverMinimizedIcon { - background: url('background/SimpleStyle.gif') right 224px; -} - -.SimplePink .MaximizedIcon { - background: url('background/SimpleStyle.gif') left 240px; -} - -.SimplePink .OverMaximizedIcon { - background: url('background/SimpleStyle.gif') right 240px; -} - -.SimplePink .RestoreIcon { - background: url('background/SimpleStyle.gif') left 256px; -} - -.SimplePink .OverRestoreIcon { - background: url('background/SimpleStyle.gif') right 256px; -} - -.SimplePink .NormalIcon { - background: url('background/SimpleStyle.gif') left 256px; -} - -.SimplePink .OverNormalIcon { - background: url('background/SimpleStyle.gif') right 256px; -} - -.SimplePink .WindowBarLeft { - border: 1px solid #b69db3; - border-bottom: none; -} - -.SimplePink .WindowBarRight { - border: 1px solid #fff1fd; -} - -.SimplePink .WindowBarCenter { - background: #fdd8f9; - height: 18px; - line-height: 18px; -} - -.SimplePink .MiddleDecoratorLeft { - border-left: 1px solid #b69db3; - border-right: 1px solid #b69db3; -} - -.SimplePink .MiddleDecoratorRight { - border: 2px solid #fff1fd; - border-top: none; - border-bottom: none; -} - -.SimplePink .MiddleDecoratorCenter { - border: 1px solid #9a5591; - border-bottom: none; - background: #ffffff; - padding: 1px; -} - -.SimplePink .BottomDecoratorLeft { - border: 1px solid #b69db3; - border-top: none; -} - -.SimplePink .BottomDecoratorRight { - border: 2px solid #fff1fd; - border-top: none; -} - -.SimplePink .BottomDecoratorCenter { - border: 1px solid #9a5591; - border-top: none; - background: url('background/BGDecoratorCenter1x18.gif') repeat-x; - height: 19px; -} - -.UIPortlet .SimplePink .BottomDecoratorCenter { - height: 18px; -} - -/*------------------------------ SimpleGreen -----------------------------------*/ - -.SimpleGreen .WindowBarCenter .WindowPortletInfo { - margin-right: 60px; /* orientation=lt */ - margin-left: 60px; /* orientation=rt */ -} - -.SimpleGreen .WindowBarCenter .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 16px; height: 16px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - cursor: pointer; -} - -.SimpleGreen .Information { - line-height: 18px; - width: 100px; - font-size: 10px; - margin-right: 18px; /* orientation=lt */ - margin-left: 18px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.SimpleGreen .WindowBarCenter .WindowPortletIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - height: 16px; -} - -.UIPageDesktop .SimpleGreen .ResizeArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 17px; height: 19px; - cursor: nw-resize; - background: url('background/Resize17x19.png') no-repeat; -} - -.SimpleGreen .WindowBarCenter .PortletName { - font-weight: bold; - color: #333333; - overflow: hidden; - white-space: nowrap; -} - -.SimpleGreen .ArrowDownIcon { - background: url('background/SimpleStyle.gif') left 272px; -} - -.SimpleGreen .OverArrowDownIcon { - background: url('background/SimpleStyle.gif') right 272px; -} - -.SimpleGreen .MinimizedIcon { - background: url('background/SimpleStyle.gif') left 288px; -} - -.SimpleGreen .OverMinimizedIcon { - background: url('background/SimpleStyle.gif') right 288px; -} - -.SimpleGreen .MaximizedIcon { - background: url('background/SimpleStyle.gif') left 304px; -} - -.SimpleGreen .OverMaximizedIcon { - background: url('background/SimpleStyle.gif') right 304px; -} - -.SimpleGreen .RestoreIcon { - background: url('background/SimpleStyle.gif') left 320px; -} - -.SimpleGreen .OverRestoreIcon { - background: url('background/SimpleStyle.gif') right 320px; -} - -.SimpleGreen .NormalIcon { - background: url('background/SimpleStyle.gif') left 320px; -} - -.SimpleGreen .OverNormalIcon { - background: url('background/SimpleStyle.gif') right 320px; -} - -.SimpleGreen .WindowBarLeft { - border: 1px solid #a0b9b6; - border-bottom: none; -} - -.SimpleGreen .WindowBarRight { - border: 1px solid #eaf4ff; -} - -.SimpleGreen .WindowBarCenter { - background: #a3d0ff; - height: 18px; - line-height: 18px; -} - - -.SimpleGreen .MiddleDecoratorLeft { - border-left: 1px solid #a0b9b6; - border-right: 1px solid #a0b9b6; -} - -.SimpleGreen .MiddleDecoratorRight { - border: 2px solid #eaf4ff; - border-top: none; - border-bottom: none; -} - -.SimpleGreen .MiddleDecoratorCenter { - background: #ffffff; - border: 1px solid #4c717e; - border-bottom: none; - padding: 1px; -} - -.SimpleGreen .BottomDecoratorLeft { - border: 1px solid #a0b9b6; - border-top: none; -} - -.SimpleGreen .BottomDecoratorRight { - background: #eaf4ff; - padding: 0px 2px 2px 2px; -} - -.SimpleGreen .BottomDecoratorCenter { - border: 1px solid #4c717e; - border-top: none; - background: url('background/BGDecoratorCenter1x18.gif') repeat-x; - height: 19px; -} - -.UIPortlet .SimpleGreen .BottomDecoratorCenter { - height: 18px; -} Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/BGDecoratorCenter1x18.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/DefaultTheme.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MDefaultTheme.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacBlack.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacGray.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacGreen.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacTheme.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerBlue.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerGreen.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerOrange.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerPink.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerViolet.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowBlue.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowGreen.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowOrange.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowPink.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowViolet.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MVistaBlue.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MVistaTheme.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacBlack.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacGray.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacGreen.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacTheme.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/Resize17x19.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ResizeArea17x15.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ResizeArea18x18.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ResizeArea18x18.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerGreen.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerOrange.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerPink.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerViolet.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundCornerBlue.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowBlue.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowGreen.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowOrange.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowPink.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowViolet.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/SimpleStyle.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/VistaBlue.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/VistaTheme.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/icons/SimpleIcons.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIBreadcumb/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIBreadcumb/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIBreadcumb/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,46 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.UIBreadcumbs { - padding: 0 40px; -} - -.UIBreadcumbs .LeftBreadcumbsBar { - background: none; -} - -.UIBreadcumbs .HomeIcon { - background: url('background/HomeIcon.gif') no-repeat left top; - width: 16px; - height: 16px; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 6px 5px 0 0; /* orientation=lt */ - margin: 6px 0 0 5px; /* orientation=rt */ -} - -.UIBreadcumbs .BreadcumbsInfoBar { - padding: 0; -} - -.UIBreadcumbs .RightBlackGridArrowIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 5px 0px 0px 0px; -} \ No newline at end of file Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIBreadcumb/background/HomeIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,38 +0,0 @@ - -.UITabPaneDashboard { - background-color: #F0F0F0; - border-bottom: 1px solid #e5e5e5; - padding: 0px 9px; - -moz-border-radius: 0; - -webkit-border-radius: 0; - border-radius: 0; - margin: 0 8px; -} -.UITabPaneDashboard .AddDashboard{ - background-image: url('background/AddDashboard.gif'); - width: 22px; -} - -.UITabPaneDashboard .UITab { - -moz-border-radius: 0px; - -webkit-border-radius: 0px; - border-radius: 0px; - background-color:#E6E6E6; - border:1px solid #DADADA; - height: 20px; - line-height: 20px; - margin-top: 5px; - margin-right: 4px;/* orientation=lt */ - margin-left: 4px;/* orientation=rt */ -} -.UITabPaneDashboard .UITab .Tablabel { - color:#999; -} - -.UITabPaneDashboard .UITab .CloseIcon { - background-image: url('background/IconClose.gif'); -} - -.UITabPaneDashboard .SelectedTab { - background-color:#fff; -} \ No newline at end of file Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/AddDashboard.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/IconClose.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,156 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.UIToolbarContainer .ToolbarContainer .TRContainer { - height: 30px; -} - -.UIToolbarContainer .NormalContainerBlock .ToolbarContainer { - background: #232d36; - height: 30px; - border: none; -} - -.UIToolbarContainer .ToolbarContainer a { - padding: 0px 15px 0px 35px; /* orientation=lt */ - padding: 0px 35px 0px 15px; /* orientation=rt */ - color: #fff; -} - - -.UIToolbarContainer .UIHorizontalTabs .UITab { - line-height: 30px; - background: none; - font-weight: normal; -} - - -/****************************/ - -.UIToolbarContainer .MenuItemContainer { - border: 1px solid #e7e6eb; - background: #e7e6eb; -} - -.UIToolbarContainer .TitleBar { - color: #232d36; - background: #cccccc; - font-weight: normal; - padding: 0px 5px; -} - -.UIToolbarContainer .MenuItem { - /*background: none;*/ -} - -.UIToolbarContainer .ArrowIcon { - background: url('background/ToolbarContainer.gif') no-repeat right bottom; /* orientation=lt */ - background: url('background/ToolbarContainer-rt.gif') no-repeat -5px bottom; /* orientation=rt */ -} - -.UIToolbarContainer .MenuItem a { - padding: 0px 25px 0px 32px; /* orientation=lt */ - padding: 0px 32px 0px 25px; /* orientation=rt */ - color: #232d36; -} - -.UIToolbarContainer .MenuItem:hover { - color: #000; - background-color: #d7d7d7; -} - -/**********************************/ - -.UIToolbarContainer .DashboardIcon { - background: url('background/ToolbarContainer.gif') no-repeat 5px -65px; /* orientation=lt */ - background: url('background/ToolbarContainer.gif') no-repeat 100% -65px; /* orientation=rt */ -} - -.UIToolbarContainer .SitesIcon { - background: url('background/ToolbarContainer.gif') no-repeat 5px -96px; /* orientation=lt */ - background: url('background/ToolbarContainer.gif') no-repeat 100% -96px; /* orientation=rt */ -} - -.UIToolbarContainer .GroupIcon { - background: url('background/ToolbarContainer.gif') no-repeat left -131px; /* orientation=lt */ - background: url('background/ToolbarContainer.gif') no-repeat 100% -131px; /* orientation=rt */ - margin-left: 10px; /* orientation=lt */ - margin-right: 10px; /* orientation=rt */ -} - -.UIToolbarContainer .EditorIcon { - background: url('background/ToolbarContainer.gif') no-repeat 5px -164px; /* orientation=lt */ - background: url('background/ToolbarContainer.gif') no-repeat 100% -164px; /* orientation=rt */ -} - -.UIToolbarContainer .AddPageIcon { - background: url('background/ToolbarContainer.gif') no-repeat 0px -320px; /* orientation=lt */ - background: url('background/ToolbarContainer.gif') no-repeat 100% -320px; /* orientation=rt */ -} - -.UIToolbarContainer .EditPageIcon { - background: url('background/ToolbarContainer.gif') no-repeat 0px -352px; /* orientation=lt */ - background: url('background/ToolbarContainer.gif') no-repeat 100% -352px; /* orientation=rt */ -} - -.UIToolbarContainer .EditSiteIcon { - background: url('background/ToolbarContainer.gif') no-repeat 0px -384px; /* orientation=lt */ - background: url('background/ToolbarContainer.gif') no-repeat 100% -384px; /* orientation=rt */ -} - -.UIToolbarContainer .ChangeLanguageIcon { - background: url('background/ToolbarContainer.gif') no-repeat 0px -192px; /* orientation=lt */ - background: url('background/ToolbarContainer.gif') no-repeat 100% -192px; /* orientation=rt */ -} - -.UIToolbarContainer .ChangeSkinIcon { - background: url('background/ToolbarContainer.gif') no-repeat 0px -224px; /* orientation=lt */ - background: url('background/ToolbarContainer.gif') no-repeat 100% -224px; /* orientation=rt */ -} - -.UIToolbarContainer .AccountSettingIcon { - background: url('background/ToolbarContainer.gif') no-repeat 5px -256px; /* orientation=lt */ - background: url('background/ToolbarContainer.gif') no-repeat 100% -256px; /* orientation=rt */ -} - -.UIToolbarContainer .SignOutIcon { - background: url('background/ToolbarContainer.gif') no-repeat 0px -288px; /* orientation=lt */ - background: url('background/ToolbarContainer.gif') no-repeat 100% -288px; /* orientation=rt */ -} - -.UIToolbarContainer .Name a { - background: url('background/UseIcon.gif') no-repeat left center; /* orientation=lt */ - background: url('background/UseIcon.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 10px 0px 25px; /* orientation=lt */ - padding: 0px 25px 0px 10px; /* orientation=rt */ - color: #fff; - line-height: 30px; -} - -.UIToolbarContainer .Name a:hover { - color: #9fc5ff; -} -/***************UIStarToolBarPortlet*****************/ - -.UIStarToolBarPortlet { - background: url('background/GateinLogo.jpg') no-repeat 10px 6px; /* orientation=lt */ - background: url('background/GateinLogo.jpg') no-repeat 23px 5px; /* orientation=rt */ - width: 64px; - height: 30px; -} \ No newline at end of file Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/GateinLogo.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/GateinLogo.jpg =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/ToolbarContainer.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/UseIcon.gif =================================================================== (Binary files differ) Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -16,8 +16,6 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ - -@import url(UIPortalComponent/Stylesheet.css); @import url(UIPage/Stylesheet.css); @import url(UIToolbarContainer/Stylesheet.css); @import url(UITabPaneDashboard/Stylesheet.css); Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,141 +1,43 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + /*##############################-Page Layout Decorator-################################*/ - -.LAYOUT-BLOCK .PageLayoutDecorator { - cursor: move; -} - + + .UIPageBody .PageLayoutDecorator { - padding: 0px; - margin: 0px 2px auto 2px; + margin: 0px 2px auto 2px; overflow: hidden; } -.UIPageBody .PageLayoutDecorator .MiddlePageBG { - background: white; - height: 80px; -} - -.UIPageBody .PageLayoutDecorator .TopLeftPage { - background: url('background/ViewPage.gif') no-repeat left -113px; /* orientation=lt */ - background: url('background/ViewPage-rt.gif') no-repeat right -113px; /* orientation=rt */ - padding: 0px 0px 0px 143px; /* orientation=lt */ - padding: 0px 143px 0px 0px; /* orientation=rt */ -} - -.UIPageBody .PageLayoutDecorator .TopRightPage { - background: url('background/ViewPage.gif') no-repeat right -226px; /* orientation=lt */ - background: url('background/ViewPage-rt.gif') no-repeat left -226px; /* orientation=rt */ - padding: 0px 47px 0px 0px; /* orientation=lt */ - padding: 0px 0px 0px 47px; /* orientation=rt */ -} - -.UIPageBody .PageLayoutDecorator .TopCenterPage { - height: 112px; line-height: 98px; - background: url('background/ViewPage.gif') repeat-x center top; - color: #525252; text-align: center; - font-weight: bold; - padding: 0px; white-space: nowrap; -} - -.UIPageBody .PageLayoutDecorator .MiddleLeftPage { - background: url('background/ViewPageRepeat.gif') repeat-y left; /* orientation=lt */ - background: url('background/ViewPageRepeat-rt.gif') repeat-y right; /* orientation=rt */ - padding: 0px 0px 0px 22px; /* orientation=lt */ - padding: 0px 22px 0px 0px; /* orientation=rt */ -} - -.UIPageBody .PageLayoutDecorator .MiddleRightPage { - background: url('background/ViewPageRepeat.gif') repeat-y right; /* orientation=lt */ - background: url('background/ViewPageRepeat-rt.gif') repeat-y left; /* orientation=rt */ - padding: 0px 23px 0px 0px; /* orientation=lt */ - padding: 0px 0px 0px 23px; /* orientation=rt */ -} - -.UIPageBody .PageLayoutDecorator .BottomLeftPage { - background: url('background/ViewPage.gif') no-repeat left -378px; /* orientation=lt */ - background: url('background/ViewPage-rt.gif') no-repeat right -378px; /* orientation=rt */ - padding: 0px 0px 0px 46px; /* orientation=lt */ - padding: 0px 46px 0px 0px; /* orientation=rt */ -} - -.UIPageBody .PageLayoutDecorator .BottomRightPage { - background: url('background/ViewPage.gif') no-repeat right -378px; /* orientation=lt */ - background: url('background/ViewPage-rt.gif') no-repeat left -378px; /* orientation=rt */ - padding: 0px 35px 0px 0px; /* orientation=lt */ - padding: 0px 0px 0px 35px; /* orientation=rt */ -} - -.UIPageBody .PageLayoutDecorator .BottomCenterPage { - line-height: 38px; - background: url('background/ViewPage.gif') repeat-x center -339px; -} - -.UIPageBody .PageLayoutDecorator .BottomCenterPage .FixBug { - height: 38px; -} - .UIPageBody .VIEW-PAGEBODY .UIPage { - padding: 8px; + padding: 0 8px; } -.UIPageBody .VIEW-PAGEBODY .UIPage .UIComponentBlock { - background: white; - height: 100%; -} -.UIPageBody .BLPagebody { - background: url('background/BgPagebody.gif') no-repeat left top; - padding-left: 6px; - height: 16px; -} - -.UIPageBody .BRPagebody { - background: url('background/BgPagebody.gif') no-repeat right top; - padding-right: 6px; - height: 16px; -} - -.UIPageBody .BMPagebody { - background: url('background/BgPagebody.gif') repeat-x center bottom; - height: 16px; -} - .UIPage .UIRowContainer { padding: 0px; } -.BottomDecoratorHome .BottomDecoratorLeft{ - background: url('background/BottomDecoratorHome.gif') no-repeat left; - padding-left: 7px; - height: 7px; -} - -.BottomDecoratorHome .BottomDecoratorRight{ - background: url('background/BottomDecoratorHome.gif') no-repeat right; - padding-right: 7px; - height: 7px; -} - -.BottomDecoratorHome .BottomDecoratorMiddle{ - background: white; - height: 7px; +.UIWorkingWorkspace .UIPageBody .VIEW-PAGEBODY { + -moz-border-radius:0; + -webkit-border-radius:0; + border-radius:0; + background: #fff; + padding:0; } \ No newline at end of file Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/background/BgPagebody.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/background/BottomDecoratorHome.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/background/ViewPage.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/background/ViewPageRepeat.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,317 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.UIPortlet .LAYOUT-BLOCK { - padding: 5px; -} - -.UIPortlet .CONTROL-PORTLET { - left: 0; /* orientation=lt */ - right: 0; /* orientation=rt */ -} - -.UIPortlet .CONTROL-PORTLET .Login { - background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/ToolIcons/Key.gif') no-repeat center; -} - -.UIPortlet .CONTROL-PORTLET .DragControlArea { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 7px; height: 13px; - margin: 5px 0px 0px 3px; /* orientation=lt */ - margin: 5px 3px 0px 0px; /* orientation=rt */ - background: url('background/DragBg2x2.gif'); - cursor: move; -} - -.UIPortlet .ViewPortletIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 16px; height: 16px; - margin: 4px 5px 0px 0px; /* orientation=lt */ - margin: 4px 0px 0px 5px; /* orientation=rt */ - background: url('background/BlueBoxLight.gif') no-repeat; - cursor: pointer; -} - -.UIPortlet .EditPortletPropertiesIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 20px; height: 20px; - background: url('background/Pen.gif') no-repeat top; - margin: 4px 0px 0px 5px; /* orientation=lt */ - margin: 4px 5px 0px 0px; /* orientation=rt */ -} - -.UIPortlet .DeletePortletIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 20px; height:20px; - background: url('background/Close.gif') no-repeat bottom; - margin: 0px 0px 0px 2px; /* orientation=lt */ - margin: 0px 2px 0px 0px; /* orientation=rt */ -} - -.UIPortlet .SelectedContainerBlock { - background: white; - border-top: 1px solid #91bcdd; -} - -.UIPortlet .SelectedContainerBlock .LeftContainerBlock { - background: url('background/BgContainerBlock.gif') no-repeat left top; - padding-left: 1px; -} - -.UIPortlet .SelectedContainerBlock .RightContainerBlock { - background: url('background/BgContainerBlock.gif') no-repeat right top; - padding: 4px; -} - -.UIPortlet .NewLayer { - background: #d1dce5; - filter: alpha(opacity=80); - opacity: 0.8; - width: 100%; height: 100%; -} - -/*##############################- PortletLayoutDecorator -################################*/ - -.PortletLayoutDecorator { -} - -.PortletLayoutDecorator .LPortletLayoutDecorator { - background: url('background/PortletLayoutDecorator.gif') no-repeat left top; - padding: 0px 0px 0px 12px; -} - -.PortletLayoutDecorator .RPortletLayoutDecorator { - background: url('background/PortletLayoutDecorator.gif') no-repeat right top; - padding-right: 12px; -} - -.PortletLayoutDecorator .CPortletLayoutDecorator { - background: url('background/PortletLayoutDecorator.gif') repeat-x center -89px; -} - -.PortletLayoutDecorator .FixHeight { - height: 69px; - padding: 10px 0; -} -.ProtectedPortlet .PortletLayoutDecorator { - background: white; -} -.ProtectedPortlet .PortletLayoutDecorator .LPortletLayoutDecorator { - opacity: 0.3; - filter: alpha(opacity=30); -} -/*############### End Decorator ###################################################*/ - -.LAYOUT-CONTAINER .UIContainer { - /* - fix bug dragdrop in IE6 - */ -} - -.LAYOUT-CONTAINER .TDContainer { - padding: 0px 2px; -} - -.UIContainer .LAYOUT-BLOCK .UIRowContainer { - min-height: 86px; - _height: 86px; -} - -.UIContainer .VIEW-BLOCK .EmptyContainer { - height: 82px; -} - -.UIContainer .NewLayer { - background: #93c0e2; - filter: alpha(opacity=40); - opacity: 0.4; - width: 100%; height: 100%; -} - -/* -.UIContainer .LAYOUT-CONTAINER { - background: #f5f5f5; - border: solid 1px #38acf3; - padding: 5px; - margin: 0px 1px; - min-height: 60px; -} - -* html .UIContainer .LAYOUT-CONTAINER { - height: 60px; -} - -.UIContainer .UIInfoBar .BlueRoundedStyle { - padding: 0px; margin: 0px; - height: 22px; -} -*/ - -.UIContainer .CONTROL-CONTAINER .DragControlArea { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 7px; height: 13px; - background: url('background/DragBg2x2.gif'); - cursor: move; - margin: 5px 0px 0px 2px; /* orientation=lt */ - margin: 5px 2px 0px 0px; /* orientation=rt */ -} - -.UIContainer .LAYOUT-CONTAINER .UITableColumnContainer { - background: none; - border: none; - margin: auto; -} - -.UIContainer .EditContainerIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 22px; height: 16px; - background: url('background/Pen.gif') no-repeat top; - margin: 4px 0px 0px 2px; /* orientation=lt */ - margin: 4px 2px 0px 0px; /* orientation=rt */ -} - -.UIContainer .DeleteContainerIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 22px; height: 16px; - background: url('background/Close.gif') no-repeat bottom; - margin: 4px 0px 0px 0px; /* orientation=lt */ - margin: 4px 0px 0px 0px; /* orientation=rt */ -} - -.UIContainer .ContainerIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - height: 16px; line-height: 16px; - padding-left: 24px; /* orientation=lt */ - padding-right: 24px; /* orientation=rt */ - margin: 3px 0px 0px 5px; /* orientation=lt */ - margin: 3px 5px 0px 0px; /* orientation=rt */ - background: url('background/DefaultContainerIcon.png') no-repeat; -} - -.UIColumnContainer .ControlIcon { - float: right;/* orientation=lt */ - float: left;/* orientation=rt */ - width: 28px; - height: 20px; - cursor: pointer; - background: url('/eXoResources/skin/PortletThemes/background/DefaultTheme.png') no-repeat center; -} - -.UIColumnContainer .EditContainerIcon { - margin-left: 0px; /* orientation=lt */ - margin-right: 0px; /* orientation=rt */ -} - -.UIColumnContainer .ArrowDownIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 22px; height: 16px; - background: url('background/ArrowDown.gif') no-repeat center top; - margin: 4px 0px 0px 2px; /* orientation=lt */ - margin: 4px 2px 0px 0px; /* orientation=rt */ -} - -.UIPortal .LAYOUT-PORTAL { - /* background: url('background/PortalBackground4x4.gif');*/ - background: white; - padding: 8px; - _padding: 8px 0px; /* orientation=rt */ - margin: auto; - _margin: 0px; /* orientation=rt */ - _width: 99%; /* orientation=rt */ -} - -.DragAndDropPreview { - width: auto; height: 80px; - background: url('background/DragAndDropPreview4x4.gif'); - border: 1px solid #c4c4c4; - margin: 0px 12px 10px 12px; -} - -.PortletBlockDecorator { - -} - -.EdittingContainer { - padding: 3px; -} - -.EdittingContainer .NormalContainerBlock { - background: white; - border: 1px dashed #a2a2a2; - height: 100%; -} - -.EdittingContainer .NormalContainerBlock .LeftContainerBlock, -.EdittingContainer .OverContainerBlock .NormalContainerBlock .LeftContainerBlock { - background: none; -} - -.EdittingContainer .NormalContainerBlock .RightContainerBlock, -.EdittingContainer .OverContainerBlock .NormalContainerBlock .RightContainerBlock { - padding: 2px; - background: none; -} - -.UIContainer .UIPortlet { - padding: 0px; -} - -.UIPortletMask { - opacity: 0; - filter: alpha(opacity=0); - background: #ffffff; -} - -.EdittingContainer .OverContainerBlock { - border: 1px solid #b8babf; - background: none; - height: 100%; -} - -.EdittingContainer .OverContainerBlock .LeftContainerBlock { - background: white; -} - -.EdittingContainer .OverContainerBlock .RightContainerBlock { - background: none; - padding: 2px; -} - -.ProtectedContainer .ProtectedContent { - opacity: 0.3; - filter: alpha(opacity=80); - height: 70px; - padding: 6px 10px; -} - -.UIPageBodyMask { - opacity: 0; - filter: alpha(opacity=0); - background: #ffffff; - cursor:move; -} Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/ArrowDown.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/BgContainerBlock.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/BottomVTabSimpleStyle224x1.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/Close.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/ContainerIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/DragAndDropPreview4x4.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/DragBg2x2.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/LineBlock.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/Pen.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/Pen.png =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/PortalBackground4x4.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecorator.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecoratorHidden.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/close.png =================================================================== (Binary files differ) Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,97 +1,37 @@ -#UITabbedDashboardPortlet { - padding: 0 8px; + +.UITabPaneDashboard { + background-color: #F0F0F0; + border-bottom: 1px solid #e5e5e5; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; + margin: 0 8px; } - -.UITabPaneDashboard { - background: #f0f0f0; - border-bottom: 1px solid #e5e5e5; - padding: 0px 9px; +.UITabPaneDashboard .AddDashboard{ + background-image: url('background/AddDashboard.gif'); + width: 22px; } -.UITabPaneDashboard .LtTabDashboard { - padding: 0; - background: none; -} - -.UITabPaneDashboard .RtTabDashboard { - padding: 0; - background: none; -} - -.UITabPaneDashboard .CtTabDashboard { - padding: 0; - background: none; -} - -.UITabPaneDashboard .UIHorizontalTabs { - padding: 5px 0px 4px 0px; -} - -.UITabPaneDashboard .UIHorizontalTabs .TabsContainer { - height: auto; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle { - margin: 0px 4px 0px 0px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab, -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .MiddleTab { - padding: 0px; -} - -.UITabPaneDashboard .UIHorizontalTabs .UITab span { - margin: 0px 10px; - font-weight: normal; -} - -.UITabPaneDashboard .UIHorizontalTabs .UITab .CloseIcon { - background: url('background/IconClose.gif') no-repeat left top; - width: 16px; - height: 16px; - cursor: pointer; -} - -.UITabPaneDashboard .UIHorizontalTabs .AddDashboard { - background: url('background/AddDashboard.gif') no-repeat left top; - width: 22px; height: 22px; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - cursor: pointer; - margin-top: 0px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .LeftTab { - background: #E6E6E6; - border: 1px solid #DADADA; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .RightTab { - background: none; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab { - background: none; - line-height: 20px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab span { - color: #999999; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .LeftTab { - background: #fff; - border: 1px solid #dadada; - padding: 0px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .RightTab { - background: #fff; - padding: 0px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .MiddleTab { - background: #fff; - padding: 0px; - line-height: 20px; -} +.UITabPaneDashboard .UITab { + -moz-border-radius: 0px; + -webkit-border-radius: 0px; + border-radius: 0px; + background-color:#E6E6E6; + border:1px solid #DADADA; + height: 20px; + line-height: 20px; + margin-top: 5px; + margin-right: 4px;/* orientation=lt */ + margin-left: 4px;/* orientation=rt */ +} +.UITabPaneDashboard .UITab .Tablabel { + color:#999; +} + +.UITabPaneDashboard .UITab .CloseIcon { + background-image: url('background/IconClose.gif'); +} + +.UITabPaneDashboard .SelectedTab { + background-color:#fff; +} \ No newline at end of file Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -17,39 +17,10 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -.UIToolbarContainer { - padding: 0px; - height: auto; -} - -.UIToolbarContainer .UserInfoPortletTDContainer { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ -} - -.UIToolbarContainer .LAYOUT-CONTAINER { - overflow: hidden; -} - -.UIToolbarContainer .LAYOUT-BLOCK .UIRowContainer { - height: auto; - min-height: inherit; - border: none; - background: none; -} - -.UIToolbarContainer .ToolbarContainer .TRContainer { +.UIToolbarContainer .ToolbarContainer .TRContainer,.UIToolbarContainer .UIHorizontalTabs { height: 30px; } -.UIToolbarContainer .UIContainer { - padding: 0px; -} - -.UIToolbarContainer .UITableColumnContainer { - margin: 0px; -} - .UIToolbarContainer .NormalContainerBlock .ToolbarContainer { background: #232d36; height: 30px; @@ -60,13 +31,8 @@ padding: 0px 15px 0px 35px; /* orientation=lt */ padding: 0px 35px 0px 15px; /* orientation=rt */ color: #fff; - display: block; - white-space: nowrap; } -.UIToolbarContainer .UITab a:hover { - color: #9fc5ff; -} .UIToolbarContainer .UIHorizontalTabs .TabsContainer { height: 30px; /* orientation=lt */ @@ -74,71 +40,32 @@ } .UIToolbarContainer .UIHorizontalTabs .UITab { - line-height: 30px; background: none; font-weight: normal; - padding-right: 2px; /* orientation=lt */ - padding-left: 2px; /* orientation=rt */ - text-align: left; /* orientation=lt */ - text-align: right; /* orientation=rt */ - float: none; - !float: left;/* orientation=rt */ - _float: none;/* orientation=rt */ - cursor: pointer; } -.UserToolBarSitePortletTDContainer { - position: relative; -} - -.UserToolBarGroupPortletTDContainer { - position: relative; -} - -.UserToolBarGroupPortletTDContainer { - position: relative; -} - -.UserToolBarDashboardPortletTDContainer { - position: relative; -} - -.AdminToolBarPortletTDContainer { - position: relative; -} - - /****************************/ .UIToolbarContainer .MenuItemContainer { border: 1px solid #e7e6eb; background: #e7e6eb; - position: absolute; - z-index: 1; } .UIToolbarContainer .TitleBar { color: #232d36; background: #cccccc; font-weight: normal; - height: 23px; - line-height: 23px; - opacity: 0.9; - padding: 0 5px; - white-space: nowrap; - filter: alpha(opacity=90); } .UIToolbarContainer .MenuItem { - background: none; - height: 28px; - line-height: 28px; - opacity: 0.9; - filter: alpha(opacity=90); - width: 100%; + background: none; } -.UIToolbarContainer .MenuItem .ArrowIcon { +.UIToolbarContainer .MenuItem:hover { + background-color: #d7d7d7; +} + +.UIToolbarContainer .ArrowIcon { background: url('background/ToolbarContainer.gif') no-repeat right bottom; /* orientation=lt */ background: url('background/ToolbarContainer-rt.gif') no-repeat -5px bottom; /* orientation=rt */ } @@ -149,11 +76,6 @@ color: #232d36; } -.UIToolbarContainer .MenuItem a:hover { - color: #000; - background-color: #d7d7d7; -} - .UIToolbarContainer .ItemIcon { background-position: 5px center; /* orientation=lt */ background-position: 95% center; /* orientation=rt */ @@ -167,7 +89,7 @@ } .UIToolbarContainer .SiteIcon { - background: url('background/ToolbarContainer.gif') no-repeat 5px -97px; /* orientation=lt */ + background: url('background/ToolbarContainer.gif') no-repeat 0px -97px; /* orientation=lt */ background: url('background/ToolbarContainer.gif') no-repeat 100% -97px; /* orientation=rt */ } @@ -226,11 +148,6 @@ .UIToolbarContainer .Name a { background: url('background/UseIcon.gif') no-repeat left center; /* orientation=lt */ background: url('background/UseIcon.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 10px 0px 25px; /* orientation=lt */ - padding: 0px 25px 0px 10px; /* orientation=rt */ - color: #fff; - cursor: pointer; - font-weight: bold; line-height: 30px; } @@ -242,28 +159,14 @@ .UIStarToolBarPortlet { background: url('background/GateinLogo.jpg') no-repeat 10px 6px; /* orientation=lt */ background: url('background/GateinLogo.jpg') no-repeat 23px 5px; /* orientation=rt */ - width: 64px; - height: 30px; } .UIStarToolBarPortlet .UITab { - height: 30px; float: none; /* orientation=rt */ } /***************UIUserToolBarPortlet*****************/ -.UIUserToolbarPortlet .MenuItemContainer .SelectedItem { - line-height: 24px; - width: auto; - background: #c7c7c7; - color: #3e8df0; -} -.UIToolbarContainer .UIAdminToolbarPortlet .UIHorizontalTabs .UITab { - background: none; - padding: 0px; -} - .UIToolbarContainer .UIUserToolbarPortlet .UIHorizontalTabs .TabsContainer { width: 400px; /* orientation=rt */ } Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,1734 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.Next16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueNextArrow.gif'); -} - -.BCHome16x16Icon { - width: 16px; height: 16px; - background: url('icons/Home.gif'); -} - -.DownArrow1Icon { - background: url('icons/BlueDownArrow.gif') no-repeat right; -} - -.NextArrow1Icon { - background: url('icons/BlueNextArrow.gif') no-repeat right; -} - -.RightBlackGridArrow16x16Icon { - width: 16px; height: 16px; - background: url('icons/BreadcumbsArrowIcon.gif'); /* orientation=lt */ - background: url('icons/BreadcumbsArrowIcon-rt.gif'); /* orientation=rt */ -} - -.DefaultContainer16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueContainer.gif'); -} - -.AddNewNodeIcon { - width: 16px; height: 16px; - background: url('icons/BlueCirclePlus.gif'); -} - -.BlueCirclePlusIcon { - width: 16px; height: 16px; - background: url('icons/BlueCirclePlus.gif'); -} - -.SelectPage16x16Icon { - width: 16px; height: 16px; - background: url('icons/SelectPage.gif'); -} - -.PermissionSettingIcon { - width: 17px; height: 17px; - background: url('icons/PermissionSetting.gif') no-repeat center; -} - -.PreviewIcon { - width: 16px; height: 16px; - background: url('icons/LightBulbOn.gif'); -} - -.SaveIcon { - background: url('icons/FloppyDisk.gif'); -} - -.OrangeBoxPage16x16Icon { - width: 16px; height: 16px; - background: url('icons/MiniOrangeBoxPage.gif'); -} - -.CancelIcon { - width: 16px; height: 16px; - background: url('icons/Cancel.gif'); -} - -.AddPage16x16Icon{ - width: 16px; height: 16px; - background: url('icons/AddPage.gif'); -} - -.GreenArrowPage16x16Icon { - width: 16px; height: 16px; - background: url('icons/GreenRightArrowPage.gif'); -} - -.GreenPlusPage16x16Icon { - width: 16px; height: 16px; - background: url('icons/GreenPlusPage.gif'); -} - -.SelectPageIcon { - width: 16px; height: 16px; - background: url('icons/SelectIcon.gif'); - margin: auto; -} - -.SelectPortalIcon { - width: 16px; height: 16px; margin: auto; - background: url('icons/SelectIcon.gif'); -} - -.SearchIcon { - width: 16px; - height: 16px; - margin: auto; - background: url('icons/SearchIcon.png') no-repeat left; /* orientation=lt */ - background: url('icons/SearchIcon-rt.png') no-repeat right; /* orientation=rt */ -} - -.DeletePortalIcon { - width: 16px; height: 16px; margin: auto; - background: url('icons/DustBin.gif'); -} - -.OnLightPage16x16Icon { - width: 16px; height: 16px; - background: url('icons/OrangeLightPage.gif'); -} - -.Save16x16Icon { - width: 16px; height: 16px; - background: url('icons/FloppyDisk.gif'); -} - -.Cancel16x16Icon { - width: 16px; height: 16px; - background: url('icons/RedCrossCircle.gif'); -} - -.Close16x16Icon { - width: 16px; height: 16px; - background: url('icons/RedCrossCircle.gif'); -} - -.Refresh16x16Icon { - width: 18px; height: 18px; - background: url('icons/RefreshIcon.gif'); -} - -.Update16x16Icon { - width: 16px; height: 16px; - background: url('icons/Refresh.gif'); -} - -.Back16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueBackArrow.gif'); -} - -.Copy16x16Icon { - width: 16px; height: 16px; - background: url('icons/CopyIcon.gif'); -} - -.CloseFolder16x16Icon { - width: 16px; height: 16px; - background: url('icons/CloseFolder.gif'); -} - -.OpenFolder16x16Icon { - width: 16px; height: 16px; - background: url('icons/OpenFolder.gif'); -} - -.Pencil16x16Icon { - width: 16px; height: 16px; - background: url('icons/Pencil.gif'); -} - -.DustBin16x16Icon { - width: 16px; height: 16px; - background: url('icons/DustBin.gif'); -} - -.Level116x16Icon { - width: 16px; height: 16px; - background: url('icons/SmallArrowBox.gif'); -} - -.Level216x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueSquare.gif'); -} - -.Level316x16Icon { - width: 16px; height: 16px; - background: url('icons/GreenMiniBox.gif'); -} - -.CircleInfo16x16Icon { - width: 16px; height: 16px; - background: url('icons/CircleInfo.gif'); -} - -.Lock16x16Icon { - width: 16px; height: 16px; - background: url('icons/Lock.gif'); -} - -.PastePalate16x16Icon { - width: 16px; height: 16px; - background: url('icons/PastePalate.gif'); -} - -.BlueNote16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueNote.gif'); -} - -.DoublePaper16x16Icon { - width: 16px; height: 16px; - background: url('icons/DoublePaper.gif'); -} - -.LoadingInfo16x16Icon { - width: 16px; height: 16px; - background: url('icons/LoadingInfo.gif'); -} - -.ScissorsEraser16x16Icon { - width: 16px; height: 16px; - background: url('icons/ScissorsEraser.gif'); -} - -.ScissorsEraserWarning16x16Icon { - width: 16px; height: 16px; - background: url('icons/ScissorsEraserWarning.gif'); -} - -.OrangeNote16x16Icon { - width: 16px; height: 16px; - background: url('icons/OrangeNote.gif'); -} - -/********************* Icon PortletIcon************************************/ - -.PortletIcon { - background: url('icons/Earth.gif') no-repeat left center; /* orientation=lt */ - background: url('icons/Earth.gif') no-repeat right center; /* orientation=rt */ -} - -.Organization { - background: url('icons/Earth.gif') no-repeat center; -} - -.Fast { - background: url('icons/EditIcon.gif') no-repeat center; -} - -.Account { - background: url('icons/UserAccount.gif') no-repeat center; -} - -.Registry-Portlet { - background: url('icons/RegistryPortlet.gif') no-repeat center; -} - -.Site { - background: url('icons/SiteMap.gif') no-repeat center; -} - -.Login { - background: url('icons/ToolIcons/Key.gif') no-repeat center; -} - -.Mail { - background: url('icons/OfficeIcons/Email.gif') no-repeat center; -} - -.Forum { - background: url('icons/ForumIcon.gif') no-repeat center; -} - -.ECMAdminIcon { - background: url('icons/ECMAdmin.gif') no-repeat center; -} - -.ExplorerIcon { - background: url('icons/JCRExplorer.gif') no-repeat center; -} - -.Dialog { - background: url('icons/DialogIcon.gif') no-repeat center; -} - -.Browse{ - background: url('icons/BrowseContent.gif') no-repeat center; -} - -.Workflow { - background: url('icons/WorkflowIcon.gif') no-repeat center; -} - -/*##############- Misc Icons -#############*/ - -.BlueArrowFloppy16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueArrowBlackFloppy.gif'); -} - -.BlueInfoBox16x16Icon { - width: 16px; height: 16px; - background: url('icons/Info.gif'); /* orientation=lt */ - background: url('icons/Info.gif') right center; /* orientation=rt */ -} - -.Config16x16Icon { - width: 16px; height: 16px; - background: url('icons/Config.gif'); -} - -.SelectPermissionIcon { - width: 16px; height: 16px; - background: url('icons/SelectPermission.gif'); -} - -.Node16x16Icon { - width: 16px; height: 16px; - background: url('icons/Node.gif'); -} - -.Level16x16Icon { - width: 16px; height: 16px; - background: url('icons/Level.gif'); -} - -.Feature16x16Icon { - width: 16px; height: 16px; - background: url('icons/Feature.gif'); -} - -.RSS16x16Icon { - width: 16px; height: 16px; - background: url('icons/RSS.gif'); -} - -.Earth16x16Icon { - width: 16px; height: 16px; - background: url('icons/Earth.gif'); -} - -.AdminView16x16Icon { - width: 16px; height: 16px; - background: url('icons/AdminView.gif'); -} - -.Briefcase16x16Icon { - width: 16px; height: 16px; - background: url('icons/Briefcase.gif'); -} - -.AddNode16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueCirclePlus.gif'); -} - -.EditIcon { - width: 16px; - height: 16px; - background: url('icons/EditIcon.gif'); /* orientation=lt */ - background: url('icons/EditIcon-rt.gif'); /* orientation=rt */ -} - -.Organization16x16Icon { - width: 16px; height: 16px; - background: url('icons/Organization.gif'); -} - -.UserRegistration16x16Icon { - width: 16px; height: 16px; - background: url('icons/UserRegistration.gif'); -} - -.Management16x16Icon { - width: 16px; height: 16px; - background: url('icons/Management.gif'); -} - -.PortalAdmin16x16Icon { - width: 16px; height: 16px; - background: url('icons/PortalAdmin.gif'); -} - -.Duplicate16x16Icon { - width: 16px; height: 16px; - background: url('icons/Duplicate.gif'); -} - -.Portal16x16Icon { - width: 16px; height: 16px; - background: url('icons/Portal.gif'); -} - -.Administration16x16Icon { - width: 16px; height: 16px; - background: url('icons/Monitor.gif'); -} - -.SiteMap16x16Icon { - width: 16px; height: 16px; - background: url('icons/SiteMap.gif'); -} - -.SearchPage16x16Icon { - width: 16px; height: 16px; - background: url('icons/SearchPage.gif'); -} - -.BlueCirclePlus16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueCirclePlus.gif'); -} - -.ShieldGreenPlus16x16Icon { - width: 16px; height: 16px; - background: url('icons/ShieldGreenPlus.gif'); -} - -.InfoMessage16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueSquare.gif'); -} - -.WarningMessageSquare16x16Icon { - width: 16px; height: 16px; - background: url('icons/YellowSquare.gif'); -} - -.ErrorMessage16x16Icon { - width: 16px; height: 16px; - background: url('icons/RedSquare.gif'); -} - -.DoubleBrownNoteIcon { - width: 16px; height: 16px; - background: url('icons/DoubleBrownNote.gif'); -} - -.Execute16x16Icon { - width: 16px; height: 16px; - background: url('icons/Execute.gif'); -} - -.OrangePencilSourceBox16x16Icon { - width: 16px; height: 16px; - background: url('icons/OrangePencilSourceBox.gif'); -} - -.Home16x16Icon { - width: 16px; height: 16px; - background: url('icons/Home.gif'); -} - -.ColorPen16x16Icon { - width: 16px; height: 16px; - background: url('icons/ColorPen.gif'); -} - -.NestedSquare16x16Icon { - width: 16px; height: 16px; - background: url('icons/NestedSquare.gif'); -} - -.VioletInfoWindow16x16Icon { - width: 16px; height: 16px; - background: url('icons/VioletInfoWindow.gif'); -} - -.PageTicker16x16Icon { - width: 16px; height: 16px; - background: url('icons/PageTicker.gif'); -} - -.GreenPlusPage16x16Icon { - width: 16px; height: 16px; - background: url('icons/GreenPlusPage.gif'); -} - -.BlackBorderSquareBlueBall16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlackBorderSquareBlueBall.gif'); -} - -.GreenPlusDataBox16x16Icon { - height: 16px; - width: 16px; - background: url('icons/GreenPlusDatabox.gif'); -} - -/* TODO: Change image'name to "BlueShapeLeftArrow" */ -.BlueBackArrow16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueBackArrow.gif'); - cursor: pointer; -} - -/* TODO: Change image'name to "BlueShapeRightArrow" */ -.BlueNextArrow16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueNextArrow.gif'); - cursor: pointer; -} - -.Remove16x16Icon { - width: 16px; height: 16px; - background: url('icons/DustBin.gif'); -} - -.GrayBackArrow16x16Icon { - width: 16px; height: 16px; - background: url('icons/GrayShapeLeftArrow.gif'); - cursor: pointer; -} - -.GrayNextArrow16x16Icon { - width: 16px; height: 16px; - background: url('icons/GrayShapeRightArrow.gif'); -} - -.BlueCircleLeftArrow16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueCircleLeftArrow.gif'); -} - -.BlueCircleRightArrow16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueCircleRightArrow.gif'); -} - -.BlueGridRightArrow16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueGridRightArrow.gif'); -} - -.GrayDoubleGridDownArrow16x16Icon { - width: 16px; height: 16px; - background: url('icons/GrayDoubleGridDownArrow.gif'); -} - -.GrayFillRightArrow16x16Icon { - width: 16px; height: 16px; - background: url('icons/GrayFillRightArrow.gif'); -} - -.BlueSquareRightArrow16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueSquareRightArrow.gif'); -} - -.DotArrowRight16x16Icon { - width: 16px; height: 16px; - background: url('icons/DotArrowRight.gif'); -} - -.BlackGridRightArrow16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlackGridRightArrow.gif'); -} - -.BlueCloseButton16x16Icon { - width: 16px; height: 16px; - background: url('icons/BlueCloseButton.gif'); -} - -.Logout16x16Icon { - width: 16px; height: 16px; - background: url('icons/RedLogoutIcon.gif'); -} - -.TreeNode16x16Icon { - width: 16px; height: 16px; - background: url('icons/TreeNodeIcon.gif'); -} - -.Scissors16x16Icon { - width: 16px; height: 16px; - background: url('icons/Scissors.gif'); -} - -.HotNews16x16Icon { - width: 16px; height: 16px; - background: url('icons/HotNews.gif'); -} - -.ArrowS1Down16x16Icon { - width: 22px; height: 17px; - background: url('icons/ArrowSLDown.gif') no-repeat center; -} - -.ArrowS1Up16x16Icon { - width: 16px; height: 16px; - background: url('icons/WhiteArrowUp.gif'); -} - -.Portlet16x16Icon { - width: 16px; height: 16px; - background: url('icons/DefaultPortletIcon.gif'); -} - -.Container16x16Icon { - width: 16px; height: 16px; - background: url('icons/DefaultContainerIcon.gif'); -} - -.SmallGroup16x16Icon { - width: 16px; height: 16px; - background: url('icons/SmallGroup.gif'); -} - -.DefaultPageIcon { - background: url('icons/DefaultNodeIcon.gif') no-repeat left center; /* orientation=lt */ - background: url('icons/DefaultNodeIcon.gif') no-repeat right center; /* orientation=rt */ -} - -/*##############################Icon Stylesheet for IconSelector##########################*/ -/*===========================Misc Icons Stylesheet=======================*/ - -.AcrobatFile { - background: url('icons/MiscIcons/AcrobatFile.gif') no-repeat center left; -} - -.AdminView { - background: url('icons/MiscIcons/AdminView.gif') no-repeat center left; -} - -.AllTags { - background: url('icons/MiscIcons/AllTags.gif') no-repeat center left; -} - -.AmericanExpressCard { - background: url('icons/MiscIcons/AmericanExpressCard.gif') no-repeat center left; -} - -.ApplicationGallery { - background: url('icons/MiscIcons/ApplicationGallery.gif') no-repeat center left; -} - -.ApplicationLink { - background: url('icons/MiscIcons/ApplicationLink.gif') no-repeat center left; -} - -.ApplicationList { - background: url('icons/MiscIcons/ApplicationList.gif') no-repeat center left; -} - -.ApplicationSize { - background: url('icons/MiscIcons/ApplicationSize.gif') no-repeat center left; -} - -.ApplicationTerminal { - background: url('icons/MiscIcons/ApplicationTerminal.gif') no-repeat center left; - -} - -.ApplicationWorldWide { - background: url('icons/MiscIcons/ApplicationWorldWide.png') no-repeat center left; -} - -.BlueInfo { - background: url('icons/MiscIcons/BlueInfo.gif') no-repeat center left; -} - -.Bomb { - background: url('icons/MiscIcons/Bomb.png') no-repeat center left; -} - -.BookmarkPage { - background: url('icons/MiscIcons/BookmarkPage.gif') no-repeat center left; -} - -.BreakLink { - background: url('icons/MiscIcons/BreakLink.gif') no-repeat center left; -} - -.Brick { - background: url('icons/MiscIcons/Brick.gif') no-repeat center left; -} - -.CategoryList { - background: url('icons/MiscIcons/CategoryList.gif') no-repeat center left; -} - -.Checkout { - background: url('icons/MiscIcons/Checkout.gif') no-repeat center left; -} - -.CheckPage { - background: url('icons/MiscIcons/CheckPage.gif') no-repeat center left; -} - -.ComponentsList { - background: url('icons/MiscIcons/ComponentsList.gif') no-repeat center left; -} - -.Config { - background: url('icons/MiscIcons/Config.gif') no-repeat center left; -} - -.CSS { - background: url('icons/MiscIcons/CSS.gif') no-repeat center left; -} - - -.DiskDrive { - background: url('icons/MiscIcons/DiskDrive.gif') no-repeat center left; -} - -.DownloadApplication { - background: url('icons/MiscIcons/DownloadApplication.gif') no-repeat center left; -} - -.DreamweaverApplication { - background: url('icons/MiscIcons/DreamweaverApplication.gif') no-repeat center left; -} - -.DynamicContentPage { - background: url('icons/MiscIcons/DynamicContentPage.gif') no-repeat center left; -} - -.Extension { - background: url('icons/MiscIcons/Extension.gif') no-repeat center left; -} - -.Factory { - background: url('icons/MiscIcons/Factory.gif') no-repeat center left; -} - -.Feature { - background: url('icons/MiscIcons/Feature.gif') no-repeat center left; -} - -.Flash { - background: url('icons/MiscIcons/Flash.gif') no-repeat center left; -} - -.FlashFile { - background: url('icons/MiscIcons/FlashFile.gif') no-repeat center left; -} - -.FolderLock { - background: url('icons/MiscIcons/FolderLock.gif') no-repeat center left; -} - -.FontFile { - background: url('icons/MiscIcons/FontFile.gif') no-repeat center left; -} - -.Glove { - background: url('icons/MiscIcons/Glove.gif') no-repeat center left; -} - -.Home { - background: url('icons/MiscIcons/Home.gif') no-repeat center left; -} - -.HTML { - background: url('icons/MiscIcons/HTML.gif') no-repeat center left; -} - -.Humer { - background: url('icons/MiscIcons/Humer.gif') no-repeat center left; -} - -.IconsView { - background: url('icons/MiscIcons/IconsView.gif') no-repeat center left; -} - -.ImageFrame { - background: url('icons/MiscIcons/ImageFrame.gif') no-repeat center left; -} - -.Images { - background: url('icons/MiscIcons/Images.gif') no-repeat center left; -} - -.ImagesFolder { - background: url('icons/MiscIcons/ImagesFolder.gif') no-repeat center left; -} - -.ImageSize { - background: url('icons/MiscIcons/ImageSize.gif') no-repeat center left; -} - -.ImagesList { - background: url('icons/MiscIcons/ImagesList.gif') no-repeat center left; -} - -.Info { - background: url('icons/MiscIcons/Info.png') no-repeat center left; -} - -.InstallerProgress { - background: url('icons/MiscIcons/InstallerProgress.gif') no-repeat center left; -} - -.JavaPge { - background: url('icons/MiscIcons/JavaPge.gif') no-repeat center left; -} - -.Layout { - background: url('icons/MiscIcons/Layout.gif') no-repeat center left; -} - -.Link { - background: url('icons/MiscIcons/Link.gif') no-repeat center left; -} - -.LockPage { - background: url('icons/MiscIcons/LockPage.gif') no-repeat center left; -} - -.MasterCard { - background: url('icons/MiscIcons/MasterCard.gif') no-repeat center left; -} - -.Music { - background: url('icons/MiscIcons/Music.gif') no-repeat center left; -} - -.MusicDownload { - background: url('icons/MiscIcons/MusicDownload.gif') no-repeat center left; -} - -.New { - background: url('icons/MiscIcons/New.gif') no-repeat center left; -} - -.PackagesList { - background: url('icons/MiscIcons/PackagesList.gif') no-repeat center left; -} - -.PageCategory { - background: url('icons/MiscIcons/PageCategory.gif') no-repeat center left; -} - -.PhotoshopFile { - background: url('icons/MiscIcons/PhotoshopFile.gif') no-repeat center left; -} - -.Printer { - background: url('icons/MiscIcons/Printer.gif') no-repeat center left; -} - -.Puzzle { - background: url('icons/MiscIcons/Puzzle.gif') no-repeat center left; -} - -.QuicktimeMovieFile { - background: url('icons/MiscIcons/QuicktimeMovieFile.gif') no-repeat center left; -} - -.Rainbow { - background: url('icons/MiscIcons/Rainbow.gif') no-repeat center left; -} - -.RefeshPage { - background: url('icons/MiscIcons/RefeshPage.gif') no-repeat center left; -} - -.RSS { - background: url('icons/MiscIcons/RSS.gif') no-repeat center left; -} - -.RSSFeed { - background: url('icons/MiscIcons/RSSFeed.gif') no-repeat center left; -} - -.SearchFolder { - background: url('icons/MiscIcons/SearchFolder.gif') no-repeat center left; -} - -.Security { - background: url('icons/MiscIcons/Security.gif') no-repeat center left; -} - -.Software { - background: url('icons/MiscIcons/Software.gif') no-repeat center left; -} - -.Speaker { - background: url('icons/MiscIcons/Speaker.gif') no-repeat center left; -} - -.Speaker2 { - background: url('icons/MiscIcons/Speaker2.gif') no-repeat center left; -} - -.StarAward { - background: url('icons/MiscIcons/StarAward.gif') no-repeat center left; -} - -.StarPage { - background: url('icons/MiscIcons/StarPage.gif') no-repeat center left; -} - -.Stats { - background: url('icons/MiscIcons/Stats.gif') no-repeat center left; -} - -.TagPage { - background: url('icons/MiscIcons/TagPage.gif') no-repeat center left; -} - -.TagSign { - background: url('icons/MiscIcons/TagSign.gif') no-repeat center left; -} - -.Ticket { - background: url('icons/MiscIcons/Ticket.gif') no-repeat center left; -} - -.TrueTypeFont { - background: url('icons/MiscIcons/TrueTypeFont.gif') no-repeat center left; -} - -.Tux { - background: url('icons/MiscIcons/Tux.gif') no-repeat center left; -} - -.Vector { - background: url('icons/MiscIcons/Vector.gif') no-repeat center left; -} - -.Version { - background: url('icons/MiscIcons/Version.gif') no-repeat center left; -} - -.VisaCard { - background: url('icons/MiscIcons/VisaCard.gif') no-repeat center left; -} - -.WeatherClouds { - background: url('icons/MiscIcons/WeatherClouds.gif') no-repeat center left; -} - -.WeatherCloudy { - background: url('icons/MiscIcons/WeatherCloudy.gif') no-repeat center left; -} - -.WeatherLightning { - background: url('icons/MiscIcons/WeatherLightning.gif') no-repeat center left; -} - -.WeatherRain { - background: url('icons/MiscIcons/WeatherRain.gif') no-repeat center left; -} - -.WeatherSnow { - background: url('icons/MiscIcons/WeatherSnow.gif') no-repeat center left; -} - -.WeatherSun { - background: url('icons/MiscIcons/WeatherSun.gif') no-repeat center left; -} - -.World { - background: url('icons/MiscIcons/World.gif') no-repeat center left; -} - -.XHTML { - background: url('icons/MiscIcons/XHTML.gif') no-repeat center left; -} - -.YellowStar { - background: url('icons/MiscIcons/YellowStar.png') no-repeat center left; -} - -/*===========================End Misc Icons Stylesheet=======================*/ -/*===========================Navigation Icons Stylesheet=======================*/ - -.BlackDownSolidArrow { - background: url('icons/NavigationIcons/BlackDownSolidArrow.gif') no-repeat center left; -} - -.BlackLeftSolidArrow { - background: url('icons/NavigationIcons/BlackLeftSolidArrow.gif') no-repeat center left; -} - -.BlackRightSolidArrow { - background: url('icons/NavigationIcons/BlackRightSolidArrow.gif') no-repeat center left; -} - -.BlackUpSolidArrow { - background: url('icons/NavigationIcons/BlackUpSolidArrow.gif') no-repeat center left; -} - -.BlueAquaBallBullet { - background: url('icons/NavigationIcons/BlueAquaBallBullet.gif') no-repeat center left; -} - -.BlueArrowIn { - background: url('icons/NavigationIcons/BlueArrowIn.gif') no-repeat center left; -} - -.BlueArrowInOut { - background: url('icons/NavigationIcons/BlueArrowInOut.gif') no-repeat center left; -} - -.BlueBallBullet { - background: url('icons/NavigationIcons/BlueBallBullet.gif') no-repeat center left; -} - -.BlueBranchArrow { - background: url('icons/NavigationIcons/BlueBranchArrow.gif') no-repeat center left; -} - -.BlueDividedArrow { - background: url('icons/NavigationIcons/BlueDividedArrow.gif') no-repeat center left; -} - -.BlueDownArrow { - background: url('icons/NavigationIcons/BlueDownArrow.gif') no-repeat center left; -} - -.BlueJoinArrow { - background: url('icons/NavigationIcons/BlueJoinArrow.gif') no-repeat center left; -} - -.BlueRedoArrow { - background: url('icons/NavigationIcons/BlueRedoArrow.gif') no-repeat center left; -} - -.BlueRotateRightArrow { - background: url('icons/NavigationIcons/BlueRotateRightArrow.gif') no-repeat center left; -} - -.BlueSquareBullet { - background: url('icons/NavigationIcons/BlueSquareBullet.gif') no-repeat center left; -} - -.BlueSwitchArrow { - background: url('icons/NavigationIcons/BlueSwitchArrow.gif') no-repeat center left; -} - -.BlueTriangleBullet { - background: url('icons/NavigationIcons/BlueTriangleBullet.gif') no-repeat center left; -} - -.BlueUndoArrow { - background: url('icons/NavigationIcons/BlueUndoArrow.gif') no-repeat center left; -} - -.BlueUpArrow { - background: url('icons/NavigationIcons/BlueUpArrow.gif') no-repeat center left; -} - -.Check { - background: url('icons/NavigationIcons/Check.png') no-repeat center left; -} - -.Check2 { - background: url('icons/NavigationIcons/Check2.gif') no-repeat center left; -} - -.Delete { - background: url('icons/NavigationIcons/Delete.gif') no-repeat center left; -} - -.Forward { - background: url('icons/NavigationIcons/Forward.gif') no-repeat center left; -} - -.GrassGreenBallBullet { - background: url('icons/NavigationIcons/GrassGreenBallBullet.gif') no-repeat center left; -} - -.GreenBallBullet { - background: url('icons/NavigationIcons/GreenBallBullet.gif') no-repeat center left; -} - -.GreenSquareBullet { - background: url('icons/NavigationIcons/GreenSquareBullet.gif') no-repeat center left; -} - -.GreenTriangleBullet { - background: url('icons/NavigationIcons/GreenTriangleBullet.gif') no-repeat center left; -} - -.GreyAquaBallBullet { - background: url('icons/NavigationIcons/GreyAquaBallBullet.gif') no-repeat center left; -} - -.GreyBallBullet { - background: url('icons/NavigationIcons/GreyBallBullet.gif') no-repeat center left; -} - -.GreyLeftShapeArrow { - background: url('icons/NavigationIcons/GreyLeftShapeArrow.gif') no-repeat center left; -} - -.GreySquareBullet { - background: url('icons/NavigationIcons/GreySquareBullet.gif') no-repeat center left; -} - -.GreyTriangleBullet { - background: url('icons/NavigationIcons/GreyTriangleBullet.gif') no-repeat center left; -} - -.RedAquaBallBullet { - background: url('icons/NavigationIcons/RedAquaBallBullet.gif') no-repeat center left; -} - -.RedBallBullet { - background: url('icons/NavigationIcons/RedBallBullet.gif') no-repeat center left; -} - -.RedSquareBullet { - background: url('icons/NavigationIcons/RedSquareBullet.gif') no-repeat center left; -} - -.RedTriangleBullet { - background: url('icons/NavigationIcons/RedTriangleBullet.gif') no-repeat center left; -} - -.Reply { - background: url('icons/NavigationIcons/Reply.gif') no-repeat center left; -} - -.RightShapeArrow { - background: url('icons/NavigationIcons/RightShapeArrow.gif') no-repeat center left; -} - -.YellowAquaBallBullet { - background: url('icons/NavigationIcons/YellowAquaBallBullet.gif') no-repeat center left; -} - -.YellowBallBullet { - background: url('icons/NavigationIcons/YellowBallBullet.gif') no-repeat center left; -} - -.YellowSquareBullet { - background: url('icons/NavigationIcons/YellowSquareBullet.gif') no-repeat center left; -} - -.YellowTriangleBullet { - background: url('icons/NavigationIcons/YellowTriangleBullet.gif') no-repeat center left; -} - -/*===========================End Navigation Icons Stylesheet=======================*/ -/*===========================Office Icons Stylesheet=======================*/ - -.AddressBook { - background: url('icons/OfficeIcons/AddressBook.gif') no-repeat center left; -} - -.ArticleDocument { - background: url('icons/OfficeIcons/ArticleDocument.gif') no-repeat center left; -} - -.At { - background: url('icons/OfficeIcons/At.png') no-repeat center left; -} - -.Attachment { - background: url('icons/OfficeIcons/Attachment.gif') no-repeat center left; -} - -.Book { - background: url('icons/OfficeIcons/Book.gif') no-repeat center left; -} - -.Chair { - background: url('icons/OfficeIcons/Chair.gif') no-repeat center left; -} - -.ChartBar { - background: url('icons/OfficeIcons/ChartBar.gif') no-repeat center left; -} - -.ChartLine { - background: url('icons/OfficeIcons/ChartLine.gif') no-repeat center left; -} - -.CoffeeCup { - background: url('icons/OfficeIcons/CoffeeCup.gif') no-repeat center left; -} - -.CoinsCurency { - background: url('icons/OfficeIcons/CoinsCurency.gif') no-repeat center left; -} - -.Computer { - background: url('icons/OfficeIcons/Computer.gif') no-repeat center left; -} - -.Conference { - background: url('icons/OfficeIcons/Conference.gif') no-repeat center left; -} - -.Date { - background: url('icons/OfficeIcons/Date.gif') no-repeat center left; -} - -.DocumentBox { - background: url('icons/OfficeIcons/DocumentBox.gif') no-repeat center left; -} - -.Door { - background: url('icons/OfficeIcons/Door.gif') no-repeat center left; -} - -.DreamweaverFile { - background: url('icons/OfficeIcons/DreamweaverFile.gif') no-repeat center left; -} - -.Email { - background: url('icons/OfficeIcons/Email.gif') no-repeat center left; -} - -.Envelope { - background: url('icons/OfficeIcons/Envelope.gif') no-repeat center left; -} - -.ExeFile { - background: url('icons/OfficeIcons/ExeFile.gif') no-repeat center left; -} - -.FloppyDisk { - background: url('icons/OfficeIcons/FloppyDisk.gif') no-repeat center left; -} - -.Folder1 { - background: url('icons/OfficeIcons/Folder1.gif') no-repeat center left; -} - -.Folder2 { - background: url('icons/OfficeIcons/Folder2.gif') no-repeat center left; -} - -.Folder3 { - background: url('icons/OfficeIcons/Folder3.gif') no-repeat center left; -} - -.Folder4 { - background: url('icons/OfficeIcons/Folder4.gif') no-repeat center left; -} - -.Folder5 { - background: url('icons/OfficeIcons/Folder5.gif') no-repeat center left; -} - -.HomePage { - background: url('icons/OfficeIcons/HomePage.gif') no-repeat center left; -} - -.HotNews { - background: url('icons/OfficeIcons/HotNews.gif') no-repeat center left; -} - -.IDCard { - background: url('icons/OfficeIcons/IDCard.gif') no-repeat center left; -} - -.IllustratorFile { - background: url('icons/OfficeIcons/IllustratorFile.gif') no-repeat center left; -} - -.IndesignFile { - background: url('icons/OfficeIcons/IndesignFile.gif') no-repeat center left; -} - -.Index { - background: url('icons/OfficeIcons/Index.gif') no-repeat center left; -} - -.Keyboard { - background: url('icons/OfficeIcons/Keyboard.gif') no-repeat center left; -} - -.Letter { - background: url('icons/OfficeIcons/Letter.gif') no-repeat center left; -} - -.MacOSXFolder { - background: url('icons/OfficeIcons/MacOSXFolder.gif') no-repeat center left; -} - -.Mail { - background: url('icons/OfficeIcons/Mail.gif') no-repeat center left; -} - -.Map { - background: url('icons/OfficeIcons/Map.gif') no-repeat center left; -} - -.Monitor { - background: url('icons/OfficeIcons/Monitor.gif') no-repeat center left; -} - -.Mouse { - background: url('icons/OfficeIcons/Mouse.gif') no-repeat center left; -} - -.Newspaper { - background: url('icons/OfficeIcons/Newspaper.gif') no-repeat center left; -} - -.Newspaper2 { - background: url('icons/OfficeIcons/Newspaper2.gif') no-repeat center left; -} - -.NotePage { - background: url('icons/OfficeIcons/NotePage.gif') no-repeat center left; -} - -.OpenBook { - background: url('icons/OfficeIcons/OpenBook.gif') no-repeat center left; -} - -.OpenEmail { - background: url('icons/OfficeIcons/OpenEmail.gif') no-repeat center left; -} - -.OpenFolder { - background: url('icons/OfficeIcons/OpenFolder.gif') no-repeat center left; -} - -.Page { - background: url('icons/OfficeIcons/Page.gif') no-repeat center left; -} - -.PaperList { - background: url('icons/OfficeIcons/PaperList.gif') no-repeat center left; -} - -.PastePalate { - background: url('icons/OfficeIcons/PastePalate.gif') no-repeat center left; -} - -.Picture { - background: url('icons/OfficeIcons/Picture.gif') no-repeat center left; -} - -.Purchase { - background: url('icons/OfficeIcons/Purchase.gif') no-repeat center left; -} - -.Script { - background: url('icons/OfficeIcons/Script.gif') no-repeat center left; -} - -.SearchPage { - background: url('icons/OfficeIcons/SearchPage.gif') no-repeat center left; -} - -.ShoppingBag { - background: url('icons/OfficeIcons/ShoppingBag.gif') no-repeat center left; -} - -.Sitemap { - background: url('icons/OfficeIcons/Sitemap.gif') no-repeat center left; -} - -.Stats2 { - background: url('icons/OfficeIcons/Stats2.gif') no-repeat center left; -} - -.Tag { - background: url('icons/OfficeIcons/Tag.gif') no-repeat center left; -} - -.Telephone { - background: url('icons/OfficeIcons/Telephone.gif') no-repeat center left; -} - -.TextFile { - background: url('icons/OfficeIcons/TextFile.gif') no-repeat center left; -} - -.YellowFolder { - background: url('icons/OfficeIcons/YellowFolder.gif') no-repeat center left; -} - -.YellowPen { - background: url('icons/OfficeIcons/YellowPen.gif') no-repeat center left; -} -.ZipFile { - background: url('icons/OfficeIcons/ZipFile.gif') no-repeat center left; -} - -/*===========================End Office Icons Stylesheet=======================*/ -/*===========================Tool Icons Stylesheet=======================*/ - -.Alarm { - background: url('icons/ToolIcons/Alarm.gif') no-repeat center left; -} - -.Anchor { - background: url('icons/ToolIcons/Anchor.gif') no-repeat center left; -} - -.Basketball { - background: url('icons/ToolIcons/Basketball.gif') no-repeat center left; -} - -.Bell { - background: url('icons/ToolIcons/Bell.gif') no-repeat center left; -} - -.Billards { - background: url('icons/ToolIcons/Billards.gif') no-repeat center left; -} - -.BlueActionWheel { - background: url('icons/ToolIcons/BlueActionWheel.gif') no-repeat center left; -} - -.BlueFlag { - background: url('icons/ToolIcons/BlueFlag.gif') no-repeat center left; -} - -.Box { - background: url('icons/ToolIcons/Box.gif') no-repeat center left; -} - -.BriefCase { - background: url('icons/ToolIcons/BriefCase.gif') no-repeat center left; -} - -.Calculator { - background: url('icons/ToolIcons/Calculator.gif') no-repeat center left; -} - -.Calendar { - background: url('icons/ToolIcons/Calendar.gif') no-repeat center left; - -} - -.Cart { - background: url('icons/ToolIcons/Cart.gif') no-repeat center left; -} - -.CD { - background: url('icons/ToolIcons/CD.gif') no-repeat center left; -} - -.Clock { - background: url('icons/ToolIcons/Clock.gif') no-repeat center left; -} - -.Component { - background: url('icons/ToolIcons/Component.gif') no-repeat center left; -} - -.CropTool { - background: url('icons/ToolIcons/CropTool.gif') no-repeat center left; -} - -.DeskPhone { - background: url('icons/ToolIcons/DeskPhone.gif') no-repeat center left; -} - -.EmptyBox { - background: url('icons/ToolIcons/EmptyBox.gif') no-repeat center left; -} - -.Entertainment { - background: url('icons/ToolIcons/Entertainment.gif') no-repeat center left; -} - -.FileBox { - background: url('icons/ToolIcons/FileBox.gif') no-repeat center left; -} - -.FirefoxBrowser { - background: url('icons/ToolIcons/FirefoxBrowser.gif') no-repeat center left; -} - -.FolderExport { - background: url('icons/ToolIcons/FolderExport.gif') no-repeat center left; -} - -.FolderImport { - background: url('icons/ToolIcons/FolderImport.gif') no-repeat center left; -} - -.Football { - background: url('icons/ToolIcons/Football.gif') no-repeat center left; -} - -.Gear { - background: url('icons/ToolIcons/Gear.gif') no-repeat center left; -} - -.Golf { - background: url('icons/ToolIcons/Golf.gif') no-repeat center left; -} - -.GrayWallet { - background: url('icons/ToolIcons/GrayWallet.gif') no-repeat center left; -} - -.GreenFlag { - background: url('icons/ToolIcons/GreenFlag.gif') no-repeat center left; -} - -.GreyFlag { - background: url('icons/ToolIcons/GreyFlag.gif') no-repeat center left; -} - -.HardDisk { - background: url('icons/ToolIcons/HardDisk.gif') no-repeat center left; -} - -.HourGlass { - background: url('icons/ToolIcons/HourGlass.gif') no-repeat center left; -} - -.Key { - background: url('icons/ToolIcons/Key.gif') no-repeat center left; -} - -.Light { - background: url('icons/ToolIcons/Light.gif') no-repeat center left; -} - -.Lock { - background: url('icons/ToolIcons/Lock.gif') no-repeat center left; -} - -.MacApplicationTool { - background: url('icons/ToolIcons/MacApplicationTool.gif') no-repeat center left; -} - -.MacMonitor { - background: url('icons/ToolIcons/MacMonitor.gif') no-repeat center left; -} - -.Magnifier { - background: url('icons/ToolIcons/Magnifier.gif') no-repeat center left; -} - -.MoveTool { - background: url('icons/ToolIcons/MoveTool.gif') no-repeat center left; -} - -.Movie { - background: url('icons/ToolIcons/Movie.gif') no-repeat center left; -} - -.Network { - background: url('icons/ToolIcons/Network.gif') no-repeat center left; -} - -.Paste { - background: url('icons/ToolIcons/Paste.gif') no-repeat center left; -} - -.PCMonitor { - background: url('icons/ToolIcons/PCMonitor.gif') no-repeat center left; -} - -.Pencil { - background: url('icons/ToolIcons/Pencil.gif') no-repeat center left; -} - -.Raquet { - background: url('icons/ToolIcons/Raquet.gif') no-repeat center left; -} - -.RedFlag { - background: url('icons/ToolIcons/RedFlag.gif') no-repeat center left; -} - -.Ruler { - background: url('icons/ToolIcons/Ruler.gif') no-repeat center left; -} - -.Search { - background: url('icons/ToolIcons/Search.png') no-repeat center left; -} - -.Shield { - background: url('icons/ToolIcons/Shield.png') no-repeat center left; -} - -.Shuttlecock { - background: url('icons/ToolIcons/Shuttlecock.gif') no-repeat center left; -} - -.Soccer { - background: url('icons/ToolIcons/Soccer.gif') no-repeat center left; -} - -.Sound { - background: url('icons/ToolIcons/Sound.gif') no-repeat center left; -} - -.Switcher { - background: url('icons/ToolIcons/Switcher.gif') no-repeat center left; -} - -.Tennis { - background: url('icons/ToolIcons/Tennis.gif') no-repeat center left; -} - -.ToolBoxOpen { - background: url('icons/ToolIcons/ToolBoxOpen.gif') no-repeat center left; -} - -.UnLock { - background: url('icons/ToolIcons/UnLock.gif') no-repeat center left; -} - -.VolumeControl { - background: url('icons/ToolIcons/VolumeControl.gif') no-repeat center left; -} - -.Wand { - background: url('icons/ToolIcons/Wand.gif') no-repeat center left; -} - -.Warning { - background: url('icons/ToolIcons/Warning.gif') no-repeat center left; -} - -.Webcam { - background: url('icons/ToolIcons/Webcam.gif') no-repeat center left; -} - -.Wrench { - background: url('icons/ToolIcons/Wrench.gif') no-repeat center left; -} - -.YellowBulb { - background: url('icons/ToolIcons/YellowBulb.gif') no-repeat center left; -} - -.YellowFlag { - background: url('icons/ToolIcons/YellowFlag.gif') no-repeat center left; -} - -/*===========================End Tool Icons Stylesheet=======================*/ -/*===========================User Icons Stylesheet=======================*/ - -.Comment { - background: url('icons/UserIcons/Comment.gif') no-repeat center left; -} - -.Contact { - background: url('icons/UserIcons/Contact.gif') no-repeat center left; -} - -.Eye { - background: url('icons/UserIcons/Eye.gif') no-repeat center left; -} - -.Finger { - background: url('icons/UserIcons/Finger.gif') no-repeat center left; -} - -.FolderHolder { - background: url('icons/UserIcons/FolderHolder.gif') no-repeat center left; -} - -.Hand { - background: url('icons/UserIcons/Hand.gif') no-repeat center left; -} - -.HandPoint { - background: url('icons/UserIcons/HandPoint.gif') no-repeat center left; -} - -.Help { - background: url('icons/UserIcons/Help.gif') no-repeat center left; -} - -.Personal { - background: url('icons/UserIcons/Personal.png') no-repeat center left; -} - -.Public { - background: url('icons/UserIcons/Public.gif') no-repeat center left; -} - -.User { - background: url('icons/UserIcons/User.gif') no-repeat center left; -} - -.VIPCard { - background: url('icons/UserIcons/VIPCard.gif') no-repeat center left; -} - -.Woman1 { - background: url('icons/UserIcons/Woman1.png') no-repeat center left; -} - -.Woman2 { - background: url('icons/UserIcons/Woman2.png') no-repeat center left; -} - -.Woman3 { - background: url('icons/UserIcons/Woman3.png') no-repeat center left; -} - -.Woman4 { - background: url('icons/UserIcons/Woman4.png') no-repeat center left; -} - -.Worker1 { - background: url('icons/UserIcons/Worker.png') no-repeat center left; -} - -.Worker2 { - background: url('icons/UserIcons/Worker2.png') no-repeat center left; -} - -.YellowComment { - background: url('icons/UserIcons/YellowComment.gif') no-repeat center left; -} - -.MoveUp16x16Icon { - background: url('icons/MoveUp.gif') no-repeat left center; /* orientation=lt */ - background: url('icons/MoveUp.gif') no-repeat right center; /* orientation=rt */ -} - -.MoveDown16x16Icon { - background: url('icons/MoveDown.gif') no-repeat left center; /* orientation=lt */ - background: url('icons/MoveDown.gif') no-repeat right center; /* orientation=rt */ -} - -/*===========================End User Icons Stylesheet=======================*/ Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/EditIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,20 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -@import url("16x16/Stylesheet.css"); Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -17,16 +17,12 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -@import url(../../skinIcons/Stylesheet.css); @import url(UIBreadcumbs/Stylesheet.css); @import url(UISearch/Stylesheet.css); @import url(UITree/Stylesheet.css); - -@import url(UIForms/Stylesheet.css); @import url(UITabSystem/Stylesheet.css); @import url(UISelector/Stylesheet.css); @import url(UIBarDecorator/Stylesheet.css); - @import url(UIToolbar/Stylesheet.css); Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,23 +1,21 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + @import url(UIAction/Stylesheet.css); @import url(UIBarStyle/Stylesheet.css); -@import url(UIBoxDecorator/Stylesheet.css); -@import url(UIInfoBar/Stylesheet.css); Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,133 +1,22 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.UIAction { - padding: 8px 0px; -} +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ -.UIAction .ActionContainer { - width: auto; - margin: auto; +.UIAction .LightBlueStyle { + background: url('background/SimpleStyle1.gif') repeat-x center; } - -.UIAction .ActionButton { - display: block; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 0px 3px; - cursor: pointer; -} - -.UIAction .ActionButton .Icon { - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - width: auto; - height: auto; - background-position: left center; /* orientation=lt */ - background-position: right center; /* orientation=rt */ - background-repeat: no-repeat; -} - -/*##############################-LightBlueStyle ActionButton-################################*/ - -.UIAction .LightBlueStyle .ButtonLeft { - background: url(background/SimpleStyle1.gif) no-repeat left top; - padding-left: 3px; -} - -.UIAction .LightBlueStyle .ButtonRight { - background: url(background/SimpleStyle1.gif) no-repeat right top; - padding-right: 3px; -} - -.UIAction .LightBlueStyle .ButtonMiddle { - background: url(background/SimpleStyle1.gif) repeat-x left -20px; - line-height: 20px; - padding: 0px 12px; - color: #565656; -} - -/*##############################-SimpleStyle ActionButton-################################*/ - -.UIAction .SimpleStyle { -} - -.UIAction .SimpleStyle .ButtonLeft { - background: url('background/SimpleStyle.gif') no-repeat left top; - padding: 0px 0px 0px 10px; -} - -.UIAction .SimpleStyle .ButtonRight { - background: url('background/SimpleStyle.gif') no-repeat right top; - padding: 0px 10px 0px 0px ; -} - -.UIAction .SimpleStyle .ButtonMiddle { - line-height: 21px; - background: url('background/SimpleStyle.gif') repeat-x bottom; - text-align: center; - padding: 0px 12px; - display: table-cell; - white-space: nowrap; -} - -.UIAction a { - color: #565656; - white-space: nowrap; -} - -.UIAction a:hover { - color: #9f9f9f; -} - -/*************************SimpleStyle1********************/ - -.UIAction .SimpleStyle1 .ButtonLeft { - background: url(background/SimpleStyle1.gif) no-repeat left top; - padding-left: 3px; -} - -.UIAction .SimpleStyle1 .ButtonRight { - background: url(background/SimpleStyle1.gif) no-repeat right top; - padding-right: 3px; -} - -.UIAction .SimpleStyle1 .ButtonMiddle { - background: url(background/SimpleStyle1.gif) repeat-x left -20px; - line-height: 20px; - padding: 0px 4px; -} - -.UIAction .SimpleStyle1 .ButtonMiddle .PageProfileIcon { - background: url(background/PageProfileIcon.gif) no-repeat left; /* orientation=lt */ - background: url(background/PageProfileIcon.gif) no-repeat right; /* orientation=rt */ - line-height: 20px; - padding-left: 22px; /* orientation=lt */ - padding-right: 22px; /* orientation=rt */ - white-space: nowrap; -} - -.UIAction .SimpleStyle1 .ButtonMiddle .ViewAsBlockIcon { - background: url(background/ViewAsBlockIcon.gif) no-repeat left; /* orientation=lt */ - background: url(background/ViewAsBlockIcon.gif) no-repeat right; /* orientation=rt */ - line-height: 20px; - padding-left: 22px; /* orientation=lt */ - padding-right: 22px; /* orientation=rt */ - white-space: nowrap; -} Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/LightBlueStyle.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/PageProfileIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif =================================================================== (Binary files differ) Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle1.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/ViewAsBlockIcon.gif =================================================================== (Binary files differ) Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,38 +1,32 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ /*###########################-BarStyle2-###########################*/ -.UIBarStyle .BarStyle2 { - height: 39px; -} - .UIBarStyle .BarStyle2 .LeftBar { background: #e7e7e7; - padding: 0px 0px 0px 6px; - height: 36px; + height: 36px; border: 1px solid #dedede; } .UIBarStyle .BarStyle2 .RightBar { background: none; - padding: 0px 6px 0px 0px; height: 36px; } @@ -41,69 +35,3 @@ line-height: 36px; background: none; } -/*###########################-SmoothNavy40Style-###########################*/ - -.UIBarStyle .SmoothNavy40Style { - height: 40px; -} - -.UIBarStyle .SmoothNavy40Style .LeftBar { - background: url('background/SmoothNavy40Style.gif') no-repeat top left; - padding: 0px 0px 0px 13px; -} - -.UIBarStyle .SmoothNavy40Style .RightBar { - background: url('background/SmoothNavy40Style.gif') no-repeat top right; - padding: 0px 14px 0px 0px; -} - -.UIBarStyle .SmoothNavy40Style .MiddleBar { - height: 40px; - line-height: 40px; - vertical-align: middle; - background: url('background/SmoothNavy40Style.gif') repeat-x bottom; -} - -/*============================== Title Bar ========================================*/ - -.UIBarStyle .TitleBar .LeftBar { - background: url('background/TitleBar.gif') no-repeat top left; - padding-left: 11px; - height: 30px; -} - -.UIBarStyle .TitleBar .RightBar { - padding-right: 11px; - background: url('background/TitleBar.gif') no-repeat top right; - height: 30px; -} - -.UIBarStyle .TitleBar .MiddleBar { - background: url('background/TitleBar.gif') repeat-x bottom; - padding-left: 8px; - height: 30px; line-height: 30px; - color: #058ee6; font-weight: bold; - font-size: 14px; font-family: arial; -} - -/*======================================== NormalBarStyle ==================================*/ - -.UIBarStyle .NormalBarStyle { - height: 38px; -} - -.UIBarStyle .NormalBarStyle .LeftBar { - background: url('background/NormalBarStyle.gif') no-repeat top left; - padding: 0px 0px 0px 6px; -} - -.UIBarStyle .NormalBarStyle .RightBar { - background: url('background/NormalBarStyle.gif') no-repeat top right; - padding: 0px 6px 0px 0px; -} - -.UIBarStyle .NormalBarStyle .MiddleBar { - background: url('background/NormalBarStyle.gif') repeat-x bottom; - height: 38px; - line-height: 38px; -} Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/background/BarStyle2.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/background/NormalBarStyle.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/background/SmoothNavy40Style.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/background/TitleBar.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,124 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.UIInfoBar { -} - -/*######################-Blue Rounded Style-######################*/ - -.UIInfoBar .BlueRoundedStyle { - padding: 0px; margin: 0px; -} - -.UIInfoBar .BlueRoundedStyle .LeftBar { - background: url('background/ViewBlockBar.png') no-repeat left top; /* orientation=lt */ - background: url('background/ViewBlockBar-rt.png') no-repeat left -26px; /* orientation=rt */ - padding-left: 5px; /* orientation=lt */ - padding-left: 9px; /* orientation=rt */ -} - -.UIInfoBar .BlueRoundedStyle .RightBar { - background: url('background/ViewBlockBar.png') no-repeat right -26px; /* orientation=lt */ - background: url('background/ViewBlockBar-rt.png') no-repeat right top; /* orientation=rt */ - padding-right: 9px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.UIInfoBar .BlueRoundedStyle .MiddleBar { - background: url('background/ViewBlockBar.png') repeat-x center -52px; -} - -.UIInfoBar .BlueRoundedStyle .FixHeight { - height: 26px; - white-space: nowrap; -} - -.UIInfoBar .BlueRoundedStyle .PortletIcon { - background: url('background/Earth.gif') no-repeat left center; /* orientation=lt */ - background: url('background/Earth.gif') no-repeat right center; /* orientation=rt */ - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - text-overflow: ellipsis; - width: auto; - line-height: 23px; - padding-left: 25px; /* orientation=lt */ - padding-right: 25px; /* orientation=rt */ - margin: 0px 0px 0px 6px; /* orientation=lt */ - margin: 0px 6px 0px 0px; /* orientation=rt */ - color: black; -} - -.UIInfoBar .BlueRoundedStyle .ContainerIcon { - background: url('background/DefaultContainerIcon.gif') no-repeat left center; /* orientation=lt */ - background: url('background/DefaultContainerIcon.gif') no-repeat right center; /* orientation=rt */ - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - text-overflow: ellipsis; - width: auto; - line-height: 23px; - padding-left: 25px; /* orientation=lt */ - padding-right: 25px; /* orientation=rt */ - margin: 0px 0px 0px 6px; /* orientation=lt */ - margin: 0px 6px 0px 0px; /* orientation=rt */ - height: auto; - color: black; -} - -/*######################-Polygon Navyblue Style-######################*/ - -.UIInfoBar .PolygonNavyBlueStyle { - height: 26px; -} - -.UIInfoBar .PolygonNavyBlueStyle .LeftBar { - background: url('background/PolygonNavyBlueStyle.gif') no-repeat left top; - padding: 0px 0px 0px 3px; -} - -.UIInfoBar .PolygonNavyBlueStyle .RightBar { - background: url('background/PolygonNavyBlueStyle.gif') no-repeat right top; - padding: 0px 3px 0px 0px; -} - -.UIInfoBar .PolygonNavyBlueStyle .MiddleBar { - height: 26px; - background: url('background/PolygonNavyBlueStyle.gif') repeat-x center bottom; - padding: 0px 0px 0px 2px; -} - -/*######################-Smooth Style 26 -######################*/ - -.UIInfoBar .SmoothStyle26 { - height: 26px; -} - -.UIInfoBar .SmoothStyle26 .LeftBar { - background: url('background/SmoothStyle26.gif') no-repeat left top; - padding: 0px 0px 0px 1px; -} - -.UIInfoBar .SmoothStyle26 .RightBar { - background: url('background/SmoothStyle26.gif') no-repeat right top; - padding: 0px 1px 0px 0px; -} - -.UIInfoBar .SmoothStyle26 .MiddleBar { - height: 26px; - background: url('background/SmoothStyle26.gif') repeat-x center bottom; -} Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/BlueRoundedStyle.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/DefaultContainerIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/Earth.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/PolygonNavyBlueStyle.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/SmoothStyle26.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/ViewBlockBar.png =================================================================== (Binary files differ) Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,55 +1,37 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.UIBreadcumbs { - padding: 0 40px; -} - -.UIBreadcumbs a { - line-height: 16px; -} - -.UIBreadcumbs a.Selected { - color: #777777; -} - -.UIBreadcumbs .LeftBreadcumbsBar { - background: none; -} - -.UIBreadcumbs .HomeIcon { - background: url('background/HomeIcon.gif') no-repeat left top; - width: 16px; - height: 16px; - line-height: 16px; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 0px 5px 0 0; /* orientation=lt */ - margin: 0px 0 0 5px; /* orientation=rt */ -} - -.UIBreadcumbs .BreadcumbsInfoBar { - padding-top: 6px; -} - -.UIBreadcumbs .RightBlackGridArrowIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 5px 0px 0px 0px; +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + + +.UIBreadcumbs .LeftBreadcumbsBar { + background: none; +} + +.UIBreadcumbs .HomeIcon { + background: url('background/HomeIcon.gif') no-repeat left top; + width: 16px; + height: 16px; + line-height: 16px; + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ +} + + +.UIBreadcumbs .RightBlackGridArrowIcon { + margin: 4px 0px 0px 0px; } \ No newline at end of file Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIForms/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIForms/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIForms/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,20 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -@import url(UIForm/Stylesheet.css); Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIForms/UIForm/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIForms/UIForm/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIForms/UIForm/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,206 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -/*####################- HorizontalLayout -#################*/ - -.UIForm .HorizontalLayout { - border: 1px solid #aeaeae; - background: #F7F7F7; - padding: 10px; -} - -.UIFormGrid { - width: auto; - margin: auto; -} - -.UIForm .UIFormGrid td.FieldLabel { - padding: 4px; - text-align: right; /* orientation=lt */ - text-align: left; /* orientation=rt */ - vertical-align: top; -} - -.UIForm .UIFormGrid td.FieldComponent { - padding: 4px; - *padding: 2px 0px 4px 4px; -} - -.UIForm .UIFormGrid td.NonEditableField { -} - -.UIForm .HorizontalLayout .MultiValueContainer { - margin-bottom: 5px; -} - -.UIForm .HorizontalLayout .MultiValueContainer .MultiFieldAction { - margin: 0px 3px; -} - -.UIForm .HorizontalLayout .FieldContainer .UIFormMultiValueInputSet { - float: left; - margin: 0px 10px 0px 5px; -} - -.UIForm .HorizontalLayout .UIFormInputSet { - padding: 10px; - margin: auto; -} - -.HorizontalLayout .UIForm .UIFormInputSet { - padding: 10px; margin: auto; -} - -.UIForm .HorizontalLayout .UIFormInputSet .Title { - margin: 10px 0px 0px 10px; /* orientation=lt */ - margin: 10px 10px 0px 0px; /* orientation=rt */ - color: #5f7fd6; -} - -.UIForm .HorizontalLayout .UIFormInputSet .ItemLabel { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - font-weight: bold; - width: 100px; -} - -.UIForm .HorizontalLayout .UIFormInputSet .ItemValue { - margin-left: 5px; /* orientation=lt */ - margin-right: 5px; /* orientation=rt */ - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - color: #2f76e2; -} - -.UIForm .HorizontalLayout .UIFormInputSet .ItemValueDescription { - margin-top: 10px; - height: 50px; - border: solid 1px gray; - background: white; -} - -.UIForm .HorizontalLayout input { - width: 235px; - font-size: 11px; - color: #565656; -} - -.UIForm .FieldComponent .FieldComponent input { - width: 200px; -} - -.UIForm .HorizontalLayout input.checkbox { - width: 16px; - margin: 0px; -} - -.UIForm .HorizontalLayout input.radio { - width: 15px; - margin-right: 5px; /* orientation=lt */ - margin-left: 5px; /* orientation=rt */ -} - -.UIForm .HorizontalLayout textarea { - width: 235px; height: 75px; - font-size: 11px; - border: 1px solid #b7b7b7; -} - -.UIForm .HorizontalLayout select { - width: 239px; - font-size: 11px; -} - -.HorizontalLayout .UIForm input { - width: 235px; - font-size: 11px; -} - -.HorizontalLayout .UIForm input.checkbox { - width: 16px; - margin: 0px; -} - -.HorizontalLayout .UIForm input.radio { - width: 15px; -} - -.HorizontalLayout .UIForm textarea { - width: 232px; height: 75px; - font-size: 11px; -} - -.HorizontalLayout .UIForm select { - width: 239px; - font-size: 11px; -} - -/*####################- VerticalLayout -#################*/ - -.UIForm .VerticalLayout { -} - -.UIForm .VerticalLayout label { - text-align: left; /* orientation=lt */ - text-align: right; /* orientation=rt */ - font-weight: bold; - margin-bottom: 15px; -} - -.UIForm .VerticalLayout input { - width: 170px; - border: 1px solid gray; - font-size: 11px; -} - -.UIForm .VerticalLayout input.checkbox { - width: auto; -} - -.UIForm .VerticalLayout textarea { - width: 170px; height: 75px; - border: 1px solid gray; - font-size: 11px; -} - -.UIForm .VerticalLayout select { - width: 170px; - font-size: 11px; -} - -/*####################- UIFormInputSet -#################*/ - -.UIFormInputSet .UIFormInputSetWithAction .UIFormGrid td { - padding: 0px 4px; -} - -/*####################- UIPermissionForm -#################*/ - -.UIPermissionForm .UIGroupSelector .RightGroupSelector .Content { - height: 160px; -} - -.UIPermissionForm .UIForm .HorizontalLayout .UIAccessGroup td.FieldLabel { - line-height: 16px; -} - -.UIPermissionForm .UIForm .UIAccessGroup .UIFormGrid td.FieldComponent { - padding: 4px; - *padding: 2px 0px 4px 4px; -} Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,46 +1,23 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.UISearch { - height: 39px; - line-height: 39px; - padding-bottom: 2px; -} +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ -.UISearch .UISearchForm { - height: 36px; line-height: 36px; -} - -.UISearch .UISearchForm .QuickSet { - overflow: hidden; - width: 100%; - padding-top: 9px; -} - .UISearch .UISearchForm .QuickSet .SearchTitle { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - font-weight: bold; - height: 20px; - line-height: 20px; - padding-left: 10px; /* orientation=lt */ - padding-right: 10px; /* orientation=rt */ color: #565656; } @@ -56,18 +33,12 @@ } .UISearch .UISearchForm .QuickSet .SimpleSearchIcon { - margin-left: 5px; /* orientation=lt */ - margin-right: 5px; /* orientation=rt */ - width: 24px; - height: 24px; background: url('background/QuickSearch.gif') no-repeat; /* orientation=lt */ background: url('background/QuickSearch-rt.gif') no-repeat; /* orientation=rt */ - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ } -.UISearch .UISearchForm .QuickSet .SimpleSearchIcon:hover { - background: url('background/QuickSearchHover.gif') no-repeat; /* orientation=lt */ +.UISearch .UISearchForm .QuickSet .SimpleSearchIcon:hover { + background: url('background/QuickSearchHover.gif') no-repeat; /* orientation=lt */ background: url('background/QuickSearchHover-rt.gif') no-repeat; /* orientation=rt */ } @@ -81,25 +52,13 @@ } .UISearch .UISearchForm .QuickSet select { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 115px; - padding: 1px; border: 1px solid #cccccc; - font-size: 11px; - color: #565656; + color: #565656; height: 20px; } .UISearch .UISearchForm .QuickSet input { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 0px 5px 0px 10px; /* orientation=lt */ - margin: 0px 10px 0px 5px; /* orientation=rt */ - padding-left: 4px; /* orientation=lt */ - padding-right: 4px; /* orientation=rt */ border: 1px solid #cccccc; - width: 180px; height: 16px; } .UIFormTabPane .UISearch .UISearchForm .QuickSet select { Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,687 +1,22 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.UIItemSelector { - margin: 2px 0px 2px 2px; /* orientation=lt */ - margin: 2px 2px 2px 0px; /* orientation=rt */ -} +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ -.UIItemSelector .ItemDetailList .TemplateContainer .PortalOfficeImage { - height: 222px; - background: url('background/TemplateContainer.jpg') no-repeat center -614px; -} - -.UIItemSelector .ItemDetailList .TemplateContainer .PortalDefaultImage { - height: 222px; - background: url('background/TemplateContainer.jpg') no-repeat center -392px; -} - -.UIItemSelector .ItemDetailList .TemplateContainer .PageDefaultImage { - height: 222px; - background: url('background/TemplateContainer.jpg') no-repeat center -392px; -} - -.UIItemSelector .ItemDetailList .TemplateContainer .PageDesktopImage { - height: 222px; - background: url('background/TemplateContainer.jpg') no-repeat center -836px; -} - -.UIItemSelector .ItemDetailList .TemplateContainer .ClassicPortalImage { - height: 222px; - background: url('background/TemplateContainer.jpg') no-repeat center -392px; - margin-top: 9px; -} - -.UIItemSelector .ItemDetailList .TemplateContainer .WebOSPortalImage { - height: 222px; - background: url('background/TemplateContainer.jpg') no-repeat center -170px; - margin-top: 9px; -} - -.UIItemSelector .ItemDetailList .TemplateContainer .BasicPortalImage { - height: 222px; - background: url('background/TemplateContainer.jpg') no-repeat center -1059px; - margin-top: 9px; -} - -.UIItemSelector .TemplateContainer .DefaultImage { - height: 222px; - background: url('background/TemplateContainer.jpg') no-repeat center -392px; -} - -.UIItemSelector .ItemDetailList .TemplateContainer .DesktopImage { - background: url('background/TemplateContainer.jpg') no-repeat center -836px; - height: 222px; -} - -.UIItemSelector .ItemDetailList .LayoutHolder .DesktopImage { - background: url('background/TemplateContainer.jpg') no-repeat top left; - height: 170px; - width: 270px; - margin: auto; -} - -.UIItemSelector .ItemDetailList .ItemDescription { - height: 100px; - background: white; - border: solid 1px #b7b7b7; - padding: 2px; -} - -.UIItemSelector .ItemDetailList .ItemDetail .ItemValueDescription { - width: 50%; height: 53px; - padding-left: 15px; /* orientation=lt */ - padding-right: 15px; /* orientation=rt */ - margin-top: 12px; - overflow: auto; - border: none; -} - -/*=================Right Column Style======================*/ - -.UIItemSelector .RightColumnStyle { - width: 99.5%; - overflow: hidden; -} - -.UIItemSelector .RightColumnStyle .ItemListContainer { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 220px; -} - -.UIItemSelector .ItemListContainer .ItemList { - border: 1px #c7c7c7 solid; - background: white url('background/ItemList.jpg') no-repeat right bottom; - height: 240px; - overflow: auto; -} - -.UIItemSelector .RightColumnStyle .ItemListContainer .ItemListBackground { - background: white url('background/ItemList.jpg') no-repeat right bottom; - height: 258px; -} - -.UIItemSelector .RightColumnStyle .ItemDetailList { - height: auto; - margin-right: 225px; /* orientation=lt */ - margin-left: 225px; /* orientation=rt */ - padding: 1px; -} - -.UIItemSelector .RightColumnStyle .ItemDetailList .ItemDetail { - height: 240px; - background: white; - border: 1px #C7C7C7 solid; -} - -.UIItemSelector .RightColumnStyle .ItemDetailList .ItemDetailTitle{ - height: 23px; -} - -.UIItemSelector .RightColumnStyle .ItemDetailList .ItemDetailContainer{ - background: #ffffff; -} - -.UIItemSelector .RightColumnStyle .ItemListTitle { - height: 23px; -} - -.UIItemSelector .RightColumnStyle .ItemListTitle .ArrowS1Down16x16Icon { - margin: 3px 0px 0px 4px; /* orientation=lt */ - margin: 3px 4px 0px 0px; /* orientation=rt */ - background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/MacSkin/GrayAquaDownArrow.png') no-repeat; - width: 18px; height: 18px; -} - -.UIItemSelector .RightColumnStyle .TitleIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 0px 5px 0px 5px; -} - -.UIItemSelector .RightColumnStyle .ItemDetailList .Title { - width: 300px; overflow: hidden; -} - -.UIItemSelector .RightColumnStyle .ItemListContainer .Title { - width: 143px; overflow: hidden; -} - -.UIItemSelector .RightColumnStyle .Title { - line-height: 22px; white-space: nowrap; - font-weight: bold; color: #5c5c5c; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ -} - -.UIItemSelector .RightColumnStyle .ItemListIcon { - width: 16px; height: 16px; - background: url('background/SelectedItem.gif') no-repeat left -418px; - -} - -.UIItemSelector .RightColumnStyle .ViewListIcon { - width: 16px; height: 16px; - background: url('background/SelectedItem.gif') no-repeat left -434px; - margin-top: 3px; -} - -/*##########################- Default Item -#########################*/ - -.UIItemSelector .RightColumnStyle .ItemList .Item { - height: 26px; - cursor: pointer; - border-bottom: 1px solid #dfdfdf; -} - -.UIItemSelector .RightColumnStyle .ItemList .Item .LeftItem { - height: 26px; - background: url('background/SelectedItem.gif') no-repeat left top; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat right top; /* orientation=rt */ - padding-left: 15px; /* orientation=lt */ - padding-right: 15px; /* orientation=rt */ -} - -.UIItemSelector .RightColumnStyle .ItemList .Item .RightItem { - height: 26px; line-height: 26px; -} - -.UIItemSelector .RightColumnStyle .ItemList .Item .ItemTitle { - height: 26px; line-height: 26px; - padding-left: 3px; /* orientation=lt */ - padding-right: 3px; /* orientation=rt */ -} - -/*###########################- Over Item (When mouse over on this item) -############################*/ - -.UIItemSelector .RightColumnStyle .ItemList .OverItem { - height: 26px; - cursor: pointer; - background: url('background/SelectedItem.gif') repeat-x left -104px; -} - -.UIItemSelector .RightColumnStyle .ItemList .OverItem .LeftItem { - background: url('background/SelectedItem.gif') no-repeat left -52px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat right -52px; /* orientation=rt */ - padding-left: 15px; /* orientation=lt */ - padding-right: 15px; /* orientation=rt */ -} - - -.UIItemSelector .RightColumnStyle .ItemList .OverItem .RightItem { - height: 26px; line-height: 26px; - background: url('background/SelectedItem.gif') repeat-x left -104px; -} - -.UIItemSelector .RightColumnStyle .ItemList .OverItem .ItemTitle { - height: 26px; line-height: 26px; - color: #f67a02; - padding-left: 3px; /* orientation=lt */ - padding-right: 3px; /* orientation=rt */ -} - -/*##########################- Selected Item (When Item is selected)-#########################*/ - -.UIItemSelector .RightColumnStyle .ItemList .SelectedItem { - height: 26px; - cursor: pointer; -} - -.UIItemSelector .RightColumnStyle .ItemList .SelectedItem .LeftItem { - background: url('background/SelectedItem.gif') no-repeat left -26px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat right -26px; /* orientation=rt */ - padding-left: 15px; /* orientation=lt */ - padding-right: 15px; /* orientation=rt */ -} - -.UIItemSelector .RightColumnStyle .ItemList .SelectedItem .RightItem { - height: 26px; line-height: 26px; - background: url('background/SelectedItem.gif') repeat-x left -78px; -} - -.UIItemSelector .RightColumnStyle .ItemList .SelectedItem .ItemTitle { - height: 26px; line-height: 26px; - color: #0575CA;; - padding-left: 3px; /* orientation=lt */ - padding-right: 3px; /* orientation=rt */ -} - -/*#######################################-----RightColumnBigItemStyle-----####################################*/ - - -.UIItemSelector .RightColumnBigItemStyle { - overflow: hidden; - width: 99.5%; -} - -.UIItemSelector .RightColumnBigItemStyle .ItemListContainer { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 210px; -} - -.UIItemSelector .RightColumnBigItemStyle .ItemListContainer .ItemList { - border: 1px #dedede solid; - background: white url('background/ItemList.jpg') no-repeat right bottom; - height: 290px; -} - -.UIItemSelector .RightColumnBigItemStyle .ItemDetailList { - border: 1px #dedede solid; - background: white; - padding: 1px; - margin-right: 220px; /* orientation=lt */ - margin-left: 220px; /* orientation=rt */ - height: 290px; -} - .UIItemSelector .RightColumnBigItemStyle .ItemListContainer .ItemListTitle { - font-size: 12px; text-align: center; - height: 19px; line-height: 19px; - border: solid 1px #dedede; - font-weight: bold; - color: #565656; - margin-bottom: 2px; background: url('/gatein-sample-skin/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/BreadcumbsBar.gif') repeat-x; -} - -.UIItemSelector .RightColumnBigItemStyle .ImageDecorator { - height: 230px; - padding: 5px; -} - -/*###########################- Item Default -#############################*/ -.UIItemSelector .RightColumnBigItemStyle .ItemList .Item { - margin: 13px 6px; - height: 32px; - cursor: pointer; -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .Item .UserAccountIcon { - height: 32px; - background: url('background/BigStyleUserAccountItem.gif') no-repeat; -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .Item .MembershipIcon { - height: 32px; - background: url('background/BigStyleMembershipItem.gif') no-repeat; -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .Item .UserProfileIcon { - height: 32px; - background: url('background/SelectedItem.gif') no-repeat left -130px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat right -130px; /* orientation=rt */ - padding-left: 30px; /* orientation=lt */ - padding-right: 30px; /* orientation=rt */ -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .Item .UserHomeInfoIcon { - height: 32px; - background: url('background/SelectedItem.gif') no-repeat left -162px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat right -162px; /* orientation=rt */ - padding-left: 30px; /* orientation=lt */ - padding-right: 30px; /* orientation=rt */ -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .Item .UserBusinessInfoIcon { - height: 32px; - background: url('background/SelectedItem.gif') no-repeat left -194px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat right -194px; /* orientation=rt */ - padding-left: 30px; /* orientation=lt */ - padding-right: 30px; /* orientation=rt */ -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .Item .ItemName { - height: 32px; line-height: 32px; - background: url('background/SelectedItem.gif') no-repeat right -322px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat left -322px; /* orientation=rt */ - padding-right: 15px; /* orientation=lt */ - padding-left: 15px; /* orientation=rt */ - color: #526791; -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .Item .ItemTitle { - height: 32px; line-height: 32px; - background: url('background/SelectedItem.gif') repeat-x left -386px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') repeat-x right -386px; /* orientation=rt */ - color: gray; - padding-left: 10px; /* orientation=lt */ - padding-right: 10px; /* orientation=rt */ -} - - -/*###########################- Item Selected -#############################*/ -.UIItemSelector .RightColumnBigItemStyle .ItemList .SelectedItem { - margin: 13px 6px; - height: 32px; - cursor: pointer; -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .SelectedItem .UserAccountIcon { - height: 32px; - background: url('background/BigStyleUserAccountSelected.gif') no-repeat left; /* orientation=lt */ - background: url('background/BigStyleUserAccountSelected-rt.gif') no-repeat right; /* orientation=rt */ - padding-left: 30px; /* orientation=lt */ - padding-right: 30px; /* orientation=rt */ -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .SelectedItem .MembershipIcon { - height: 32px; - background: url('background/BigStyleMembershipSelected.gif') no-repeat left; /* orientation=lt */ - background: url('background/BigStyleMembershipSelected-rt.gif') no-repeat right; /* orientation=rt */ - padding-left: 30px; /* orientation=lt */ - padding-right: 30px; /* orientation=rt */ -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .SelectedItem .UserProfileIcon { - height: 32px; - background: url('background/SelectedItem.gif') no-repeat left -226px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat right -226px; /* orientation=rt */ - padding-left: 30px; /* orientation=lt */ - padding-right: 30px; /* orientation=rt */ -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .SelectedItem .UserHomeInfoIcon { - height: 32px; - background: url('background/SelectedItem.gif') no-repeat left -258px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat right -258px; /* orientation=rt */ - padding-left: 30px; /* orientation=lt */ - padding-right: 30px; /* orientation=rt */ -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .SelectedItem .UserBusinessInfoIcon { - height: 32px; - background: url('background/SelectedItem.gif') no-repeat left -290px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat right -290px; /* orientation=rt */ -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .SelectedItem .ItemName { - height: 32px; line-height: 32px; - background: url('background/SelectedItem.gif') no-repeat right -354px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat left -354px; /* orientation=rt */ - padding-right: 15px; /* orientation=lt */ - padding-left: 15px; /* orientation=rt */ - color: black; -} - -.UIItemSelector .RightColumnBigItemStyle .ItemList .SelectedItem .ItemTitle { - height: 32px; line-height: 32px; - background: #d3d3eb; - font-weight: bold; color: #565656; - padding-left: 10px; /* orientation=lt */ - padding-right: 10px; /* orientation=rt */ -} - -/*#####################- End Item Selected && END BIG STYLE -#########################*/ - -/*###########################- LeftColumnStyle (The Item List is on the left side) -#########################*/ - -.UIItemSelector .LeftColumnStyle { - width: 99.5%; - overflow: hidden; -} - -.UIItemSelector .LeftColumnStyle .ItemListContainer { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 175px; -} - -.UIItemSelector .LeftColumnStyle .ItemListContainer .ItemList { - border: 1px #a4a4a4 solid; - background: white; -} - -.UIItemSelector .LeftColumnStyle .ItemDetailList { - height: auto; - margin-left: 180px; /* orientation=lt */ - margin-right: 180px; /* orientation=rt */ - padding: 1px; -} - -.UIItemSelector .LeftColumnStyle .ItemDetailList .ItemDetail { - height: 240px; - background: white; - border: 1px #a4a4a4 solid; -} - -.UIItemSelector .LeftColumnStyle .ItemDetailList .ItemDetailTitle{ - height: 22px; - -} - -.UIItemSelector .LeftColumnStyle .ItemListContainer .ItemListTitle { - height: 23px; -} - -.UIItemSelector .LeftColumnStyle .TitleIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 0px 5px 0px 5px; -} - -.UIItemSelector .LeftColumnStyle .Title { - line-height: 22px; - font-weight: bold; color: #5c5c5c; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ -} - -.UIItemSelector .LeftColumnStyle .ItemListIcon { - width: 16px; height: 16px; - background: url('background/SelectedItem.gif') no-repeat left -418px; -} - -.UIItemSelector .LeftColumnStyle .ViewListIcon { - width: 16px; height: 16px; - background: url('background/SelectedItem.gif') no-repeat left -434px; - margin-top: 3px; -} - -/*##########################- Default Item -#########################*/ - -.UIItemSelector .LeftColumnStyle .ItemList .Item { - height: 26px; - cursor: pointer; - border-bottom: 1px solid #dfdfdf; -} - -.UIItemSelector .LeftColumnStyle .ItemList .Item .LeftItem { - background: url('background/SelectedItem.gif') no-repeat left top; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat right top; /* orientation=rt */ - padding-left: 15px; /* orientation=lt */ - padding-right: 15px; /* orientation=rt */ - height: 26px; -} - -.UIItemSelector .LeftColumnStyle .ItemList .Item .RightItem { - height: 26px; line-height: 26px; -} - -.UIItemSelector .LeftColumnStyle .ItemList .Item .ItemTitle { - height: 26px; line-height: 24px; - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ - white-space: nowrap; - overflow: hidden; - width: 95%; -} - -.UIItemSelector .LeftColumnStyle .ItemList .Item .CenterItemTitle { - width: 96%; - overflow: hidden; - white-space: nowrap; -} - -/*###########################- Over Item (When mouse over on this item) -############################*/ - -.UIItemSelector .LeftColumnStyle .ItemList .OverItem { - height: 26px; - cursor: pointer; - border-bottom: 1px solid #dfdfdf; - background: url('background/SelectedItem.gif') repeat-x left -104px; -} - -.UIItemSelector .LeftColumnStyle .ItemList .OverItem .LeftItem { - background: url('background/SelectedItem.gif') no-repeat left -52px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat right -52px; /* orientation=rt */ - padding-left: 15px; /* orientation=lt */ - padding-right: 15px; /* orientation=rt */ -} - -.UIItemSelector .LeftColumnStyle .ItemList .OverItem .RightItem { - height: 26px; line-height: 26px; - background: url('background/SelectedItem.gif') repeat-x left -104px; -} - -.UIItemSelector .LeftColumnStyle .ItemList .OverItem .ItemTitle { - height: 26px; line-height: 24px; - color: #f67a02; - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ - white-space: nowrap; - overflow: hidden; - width: 95%; -} - -.UIItemSelector .LeftColumnStyle .ItemList .OverItem .CenterItemTitle { - width: 96%; - overflow: hidden; - white-space: nowrap; -} - -/*##########################- Selected Item (When Item is selected)-#########################*/ - -.UIItemSelector .LeftColumnStyle .ItemList .SelectedItem { - height: 26px; - cursor: pointer; - border-bottom: 1px solid #dfdfdf; -} - -.UIItemSelector .LeftColumnStyle .ItemList .SelectedItem .LeftItem { - background: url('background/SelectedItem.gif') no-repeat left -26px; /* orientation=lt */ - background: url('background/SelectedItem-rt.gif') no-repeat right -26px; /* orientation=rt */ - padding-left: 15px; /* orientation=lt */ - padding-right: 15px; /* orientation=rt */ - height: 26px; -} - -.UIItemSelector .LeftColumnStyle .ItemList .SelectedItem .RightItem { - height: 25px; line-height: 23px; - background: url('background/SelectedItem.gif') repeat-x left -78px; -} - -.UIItemSelector .LeftColumnStyle .ItemList .SelectedItem .ItemTitle { - height: 26px; - line-height: 24px; - color: #0575CA; - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ - white-space: nowrap; - overflow: hidden; - width: 95%; -} - -.UIItemSelector .LeftColumnStyle .ItemList .SelectedItem .CenterItemTitle { - width: 96%; - overflow: hidden; - white-space: nowrap; -} - -/*###########################- End LeftColumnItemList -#########################*/ -/*###########################- Layout Template -#########################*/ - -.UIItemSelector .EmptyLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/ItemSelector.gif') no-repeat top left; -} - -.UIItemSelector .DesktopLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/TemplateContainer.jpg') no-repeat top left; -} - -.UIItemSelector .DashboardLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/DashboardLayout.jpg') no-repeat center; -} - -.UIItemSelector .TwoColumnsLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/ItemSelector.gif') no-repeat left -170px; -} - -.UIItemSelector .ThreeColumnsLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/ItemSelector.gif') no-repeat left -340px; -} - -.UIItemSelector .TwoColumnsOneRowLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/ItemSelector.gif') no-repeat left -510px; -} - -.UIItemSelector .TwoColumnsTwoRowsLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/ItemSelector.gif') no-repeat left -680px; -} - -.UIItemSelector .TwoRowsLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/ItemSelector.gif') no-repeat left -850px; -} - -.UIItemSelector .ThreeRowsLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/ItemSelector.gif') no-repeat left -1020px; -} - -.UIItemSelector .OneRowTwoColumnsLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/ItemSelector.gif') no-repeat left -1190px; -} - -.UIItemSelector .TwoTabsLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/ItemSelector.gif') no-repeat left -1360px; -} - -.UIItemSelector .ThreeTabsLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/ItemSelector.gif') no-repeat left -1530px; -} - -.UIItemSelector .ThreeRowsTwoColumnsLayout { - width: 270px; height: 170px; - margin: auto; - background: url('background/ItemSelector.gif') no-repeat left -1700px; } \ No newline at end of file Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/background/DashboardLayout.jpg =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/background/ItemList.jpg =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/background/ItemSelector.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/background/SelectedItem.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/background/TemplateContainer.jpg =================================================================== (Binary files differ) Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -18,4 +18,3 @@ */ @import url(UITabs/Stylesheet.css); -@import url(UITabPane/Stylesheet.css); Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabPane/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabPane/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabPane/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,50 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.UITabPane { - height: 100%; -} - -.UITabPane .TabPaneContent { - padding: 8px; -} - -.UITabPane .UITabContentContainer { - border: solid 1px #cecece; - border-top: none; - background: white; -} - -.UITabPane .UITabContentContainer .UITabContent { - background: #f3f3f3; - border: solid 1px white; border-top: none; - padding: 10px; -} - -.UITabPane .UIForm .HorizontalLayout { - border: none; - background: none; - padding: 0px; -} - -.UITabPane .UIFormWithTitle .HorizontalLayout { - border: 1px solid #b7b7b7; - border-top: none; - padding: 10px; -} \ No newline at end of file Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,101 +1,55 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.UIHorizontalTabs { -} +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + .UIHorizontalTabs .CenterHorizontalTabs { - overflow-y: hidden; background: url('background/NormalTabStyle.gif') repeat-x center top; - padding: 0px 6px; } -.UIHorizontalTabs .TabsContainer { - height: 24px; -} -.UIHorizontalTabs .UITab { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - font-weight: bold; - text-align: center; - width: auto; -} - /*###########################-- NormalTabStyle --############################*/ -.UIHorizontalTabs .NormalTabStyle .NormalTab { - line-height: 24px; - margin-right: 1px; - color: #202020; - font-weight: normal; -} -.UIHorizontalTabs .NormalTabStyle .NormalTab a { - line-height: 24px; -} - .UIHorizontalTabs .NormalTabStyle .NormalTab .LeftTab { - padding-left: 12px; /* orientation=lt */ - padding-left: 3px; /* orientation=rt */ - line-height: 24px; background: url('background/NormalTabStyle.gif') no-repeat left -24px; /* orientation=lt */ background: url('background/NormalTabStyle-rt.gif') no-repeat left -24px; /* orientation=rt */ } .UIHorizontalTabs .NormalTabStyle .NormalTab .RightTab { - line-height: 24px; - padding-right: 3px; /* orientation=lt */ - padding-right: 12px; /* orientation=rt */ background: url('background/NormalTabStyle.gif') no-repeat right -24px; /* orientation=lt */ background: url('background/NormalTabStyle-rt.gif') no-repeat right -24px; /* orientation=rt */ } .UIHorizontalTabs .NormalTabStyle .NormalTab .MiddleTab { - line-height: 24px; background: url('background/NormalTabStyle.gif') repeat-x center -47px; - cursor: pointer; - padding: 0px 8px; text-align: right; /* orientation=rt */ - white-space: nowrap; /* orientation=rt */ + white-space: nowrap; /* orientation=rt */ color: #9e9e9e; } -.UIHorizontalTabs .NormalTabStyle .HighlightTab { - line-height: 24px; - margin-right: 1px; - color: #0666d2; - font-weight: normal; -} .UIHorizontalTabs .NormalTabStyle .HighlightTab .LeftTab { - line-height: 24px; - padding-left: 12px; /* orientation=lt */ - padding-left: 3px; /* orientation=rt */ background: url('background/NormalTabStyle.gif') no-repeat left -72px; /* orientation=lt */ background: url('background/NormalTabStyle-rt.gif') no-repeat left -72px; /* orientation=rt */ } .UIHorizontalTabs .NormalTabStyle .HighlightTab .RightTab { - line-height: 24px; - padding-right: 3px; /* orientation=lt */ - padding-right: 12px; /* orientation=rt */ background: url('background/NormalTabStyle.gif') no-repeat right -72px; /* orientation=lt */ background: url('background/NormalTabStyle-rt.gif') no-repeat right -72px; /* orientation=rt */ } @@ -107,247 +61,19 @@ padding: 0px 4px; } -.UIHorizontalTabs .NormalTabStyle .SelectedTab { - line-height: 24px; - margin-right: 1px; - color: #307dcc; -} - .UIHorizontalTabs .NormalTabStyle .SelectedTab .LeftTab { - line-height: 24px; - padding-left: 15px; /* orientation=lt */ - padding-left: 3px; /* orientation=rt */ background: url('background/NormalTabStyle.gif') no-repeat left -70px; /* orientation=lt */ background: url('background/NormalTabStyle-rt.gif') no-repeat left -70px; /* orientation=rt */ } .UIHorizontalTabs .NormalTabStyle .SelectedTab .RightTab { - line-height: 24px; - padding-right: 3px; /* orientation=lt */ - padding-right: 15px; /* orientation=rt */ background: url('background/NormalTabStyle.gif') no-repeat right -70px; /* orientation=lt */ background: url('background/NormalTabStyle-rt.gif') no-repeat right -70px; /* orientation=rt */ } .UIHorizontalTabs .NormalTabStyle .SelectedTab .MiddleTab { - line-height: 24px; background: url('background/NormalTabStyle.gif') repeat-x center -94px; - cursor: pointer; - font-weight: normal; - padding: 0px 8px; text-align: right; /* orientation=rt */ - white-space: nowrap; /* orientation=rt */ + white-space: nowrap; /* orientation=rt */ color: #565656; } - -/*###########################-- MessageTabDialog --############################*/ -/*==============================NormalTab for MessageTab=====================*/ - -.UIHorizontalTabs .MessageTabDialog { - padding-top: 1px; -} - -.UIHorizontalTabs .MessageTabDialog .NormalTab { - line-height: 31px; - margin-right: 1px; /* orientation=lt */ - margin-left: 1px; /* orientation=rt */ - color: #202020; font-weight: normal; - overflow: hidden; /* orientation=rt */ -} - -.UIHorizontalTabs .MessageTabDialog .NormalTab .LeftTab { - padding-left: 2px; /* orientation=lt */ - padding-right: 2px; /* orientation=rt */ - line-height: 31px; -} - -.UIHorizontalTabs .MessageTabDialog .NormalTab .RightTab { - line-height: 31px; -} - -.UIHorizontalTabs .MessageTabDialog .NormalTab .MiddleTab { - line-height: 31px; - cursor: pointer; - padding: 4px 8px 5px 4px; /* orientation=lt */ - padding: 4px 4px 5px 8px; /* orientation=rt */ - color: black; - font-weight: normal; -} - -.UIHorizontalTabs .MessageTabDialog .NormalTab div:hover{ - color: orange; -} - -.UIHorizontalTabs .MessageTabDialog .NormalTab .TabIcon { - padding-left: 30px; /* orientation=lt */ - padding-right: 30px; /* orientation=rt */ - line-height: 21px; -} - -.UIHorizontalTabs .MessageTabDialog .NormalTab .InfoIcon { - background: url('background/MessageTabDialog.gif') no-repeat left -105px; /* orientation=lt */ - background: url('background/MessageTabDialog.gif') no-repeat right -105px; /* orientation=rt */ -} - -.UIHorizontalTabs .MessageTabDialog .NormalTab .ErrorIcon { - background: url('background/MessageTabDialog.gif') no-repeat left -21px; /* orientation=lt */ - background: url('background/MessageTabDialog.gif') no-repeat right -21px; /* orientation=rt */ -} - -.UIHorizontalTabs .MessageTabDialog .NormalTab .WarningIcon { - background: url('background/MessageTabDialog.gif') no-repeat left -63px; /* orientation=lt */ - background: url('background/MessageTabDialog.gif') no-repeat right -63px; /* orientation=rt */ -} - -/*==============================Disable Tab for MessageTab=====================*/ - -.UIHorizontalTabs .MessageTabDialog .DisabledTab { - line-height: 31px; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - color: #202020; font-weight: normal; - overflow: hidden; /* orientation=rt */ -} - -.UIHorizontalTabs .MessageTabDialog .DisabledTab .LeftTab { - padding-left: 2px; /* orientation=lt */ - padding-right: 2px; /* orientation=rt */ - line-height: 31px; -} - -.UIHorizontalTabs .MessageTabDialog .DisabledTab .RightTab { - line-height: 31px; -} - -.UIHorizontalTabs .MessageTabDialog .DisabledTab .MiddleTab { - line-height: 31px; - cursor: pointer; - padding: 4px 8px 5px 4px; /* orientation=lt */ - padding: 4px 4px 5px 8px; /* orientation=rt */ - color: gray; - font-weight: normal; -} - -.UIHorizontalTabs .MessageTabDialog .DisabledTab .TabIcon { - padding-left: 30px; /* orientation=lt */ - padding-right: 30px; /* orientation=rt */ - line-height: 21px; -} - -.UIHorizontalTabs .MessageTabDialog .DisabledTab .InfoIcon { - background: url('background/MessageTabDialog.gif') no-repeat left -84px; /* orientation=lt */ - background: url('background/MessageTabDialog.gif') no-repeat right -84px; /* orientation=rt */ -} - -.UIHorizontalTabs .MessageTabDialog .DisabledTab .ErrorIcon { - background: url('background/MessageTabDialog.gif') no-repeat left top; /* orientation=lt */ - background: url('background/MessageTabDialog.gif') no-repeat right top; /* orientation=rt */ -} - -.UIHorizontalTabs .MessageTabDialog .DisabledTab .WarningIcon { - background: url('background/MessageTabDialog.gif') no-repeat left -42px; /* orientation=lt */ - background: url('background/MessageTabDialog.gif') no-repeat right -42px; /* orientation=rt */ -} - -/*==============================Selected Tab for MessageTab=====================*/ - -.UIHorizontalTabs .MessageTabDialog .SelectedTab { - line-height: 27px; - color: #058ee6; - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ - overflow: hidden; /* orientation=rt */ - } - -.UIHorizontalTabs .MessageTabDialog .SelectedTab .LeftTab { - line-height: 31px; - padding-left: 2px; /* orientation=lt */ - background: url('background/MessageTabDialog.gif') no-repeat left -126px; /* orientation=lt */ - background: url('background/MessageTabDialog-rt.gif') no-repeat left -126px; /* orientation=rt */ -} - -.UIHorizontalTabs .MessageTabDialog .SelectedTab .RightTab { - line-height: 31px; - padding-right: 2px; /* orientation=lt */ - background: url('background/MessageTabDialog.gif') no-repeat right -126px; /* orientation=lt */ - background: url('background/MessageTabDialog-rt.gif') no-repeat right -126px; /* orientation=rt */ -} - -.UIHorizontalTabs .MessageTabDialog .SelectedTab .MiddleTab { - line-height: 31px; - background: url('background/MessageTabDialog.gif') repeat-x center -156px; - cursor: pointer; - padding: 4px 8px 5px 4px; /* orientation=lt */ - padding: 4px 4px 5px 8px; /* orientation=rt */ - color: #058ee6; font-weight: normal; -} - -.UIHorizontalTabs .MessageTabDialog .SelectedTab div:hover{ - color: orange; -} - -.UIHorizontalTabs .MessageTabDialog .SelectedTab .TabIcon { - padding-left: 30px; /* orientation=lt */ - padding-right: 30px; /* orientation=rt */ - line-height: 21px; -} - -.UIHorizontalTabs .MessageTabDialog .SelectedTab .InfoIcon { - background: url('background/MessageTabDialog.gif') no-repeat left -105px; /* orientation=lt */ - background: url('background/MessageTabDialog.gif') no-repeat right -105px; /* orientation=rt */ - -} - -.UIHorizontalTabs .MessageTabDialog .SelectedTab .ErrorIcon { - background: url('background/MessageTabDialog.gif') no-repeat left -21px; /* orientation=lt */ - background: url('background/MessageTabDialog.gif') no-repeat right -21px; /* orientation=rt */ -} - -.UIHorizontalTabs .MessageTabDialog .SelectedTab .WarningIcon { - background: url('background/MessageTabDialog.gif') no-repeat left -63px; /* orientation=lt */ - background: url('background/MessageTabDialog.gif') no-repeat right -63px; /* orientation=rt */ -} - -/***************************** GrayTabStyle ************************/ -.UIHorizontalTabs .GrayTabStyle { - margin-right: 2px; /* orientation=lt */ - margin-left: 2px; /* orientation=rt */ -} - -.UIHorizontalTabs .GrayTabStyle .NormalTab .LeftTab { - background: url(background/TabEditInline.gif) no-repeat left top; - padding-left: 4px; - cursor: pointer; -} - -.UIHorizontalTabs .GrayTabStyle .NormalTab .RightTab { - background: url(background/TabEditInline.gif) no-repeat right top; - padding-right: 4px; -} - -.UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab { - background: url(background/TabEditInline.gif) repeat-x left -25px; - line-height: 25px; - color: #000; - padding: 0px 8px; - font-weight: normal; -} - -.UIHorizontalTabs .GrayTabStyle .SelectedTab .LeftTab { - background: url(background/TabEditInline.gif) no-repeat left -50px; - padding-left: 4px; - cursor: pointer; -} - -.UIHorizontalTabs .GrayTabStyle .SelectedTab .RightTab { - background: url(background/TabEditInline.gif) no-repeat right -50px; - padding-right: 4px; -} - -.UIHorizontalTabs .GrayTabStyle .SelectedTab .MiddleTab { - background: url(background/TabEditInline.gif) repeat-x left -75px; - line-height: 25px; - color: #000; - padding: 0px 8px; - font-weight: normal; -} \ No newline at end of file Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/MessageTabDialog.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/NormalTabStyle_.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/TabEditInline.gif =================================================================== (Binary files differ) Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,279 +1,91 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.UIToolbar .ToolbarContainer { -} +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ -.UIToolbar .Button { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - cursor: pointer; -} - -.UIToolbar .Button .ButtonLabel { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ -} - -.UIToolbar .HorizontalSeparator { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 2px; height: 30px; - background: none; - margin: 7px 10px 0px 10px; -} - -/*##############################- LargeToolbar style -#########################*/ - -.UIToolbar .LargeToolbar { - height: 64px; line-height: 64px; - margin-bottom: 3px; -} - .UIToolbar .LargeToolbar .LeftToolbar { - height: 64px; - line-height: 64px; background: url('background/LargeToolBar.gif') repeat-x left top; - padding-left: 8px; /* orientation=lt */ - padding-left: 94px; /* orientation=rt */ border: 1px solid #dedede; } .UIToolbar .LargeToolbar .RightToolbar { - height: 64px; - line-height: 64px; background: none; - padding-right: 94px; /* orientation=lt */ - padding-right: 8px; /* orientation=rt */ } .UIToolbar .LargeToolbar .MiddleToolbar { - height: 64px; - line-height: 64px; background: none; } -.UIToolbar .LargeToolbar a { - color: #9f9f9f; - font-weight: bold; - padding: 0px 3px 0px 3px; - cursor: pointer; - white-space: nowrap; - overflow: hidden; -} - -.UIToolbar .LargeToolbar a:hover{ - color: #565656; -} - -.UIToolbar .LargeToolbar .SelectButtonLabel { - line-height: 18px; - color: #565656; -} - -.UIToolbar .LargeToolbar .HorizontalSeparator { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 3px 8px 0px 10px; - width: 2px; height: 50px; -} - .UIToolbar .LargeToolbar .UserButton { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ padding-top: 4px; - cursor: pointer; - width: 130px; } .UIToolbar .LargeToolbar .GroupButton { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ padding-top: 4px; - cursor: pointer; - width: 140px; } .UIToolbar .LargeToolbar .MembershipButton { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ padding-top: 4px; - cursor: pointer; - width: 180px; } -.UIToolbar .LargeToolbar .ButtonLabel { - height: 18px; - line-height: 18px; - padding-left: 10px; -} - -.UIToolbar .LargeToolbar .ManagementIconContainer { - padding-top: 4px; - margin-left: 5px; -} - .UIToolbar .LargeToolbar .UserManagementIcon { - width: 32px; height: 32px; background: url('background/IconLargeToolBar.gif') no-repeat left top; - margin: auto; } .UIToolbar .LargeToolbar .GroupManagementIcon { - width: 54px; height: 32px; + width: 54px; background: url('background/IconLargeToolBar.gif') no-repeat -32px top; - margin: auto; } .UIToolbar .LargeToolbar .MembershipManagementIcon { - width: 32px; height: 32px; background: url('background/IconLargeToolBar.gif') no-repeat -86px top; - margin: auto; } -/*##############################- BlueLargeToolbar style -#########################*/ -.UIToolbar .BlueLargeToolbar { - height: 32px; -} - -.UIToolbar .BlueLargeToolbar .LeftToolbar { - background: url('background/BlueLargeToolbar.gif') no-repeat left top; - padding-left: 5px; - border-bottom: 1px solid #9a9a9a; -} - -.UIToolbar .BlueLargeToolbar .RightToolbar { - background: url('background/BlueLargeToolbar.gif') no-repeat right top; - padding-right: 5px; -} - -.UIToolbar .BlueLargeToolbar .MiddleToolbar { - height: 32px; - background: url('background/BlueLargeToolbar.gif') repeat-x center -61px; -} - -.UIToolbar .BlueLargeToolbar a { - color: #7e9bc9; font-weight: bold; - padding: 0px 5px 0px 5px; - cursor: pointer; -} - -.UIToolbar .BlueLargeToolbar a:hover { - color: #003c7f; -} - -.UIToolbar .BlueLargeToolbar .SelectItemButton .LablelIcon { - filter: alpha(opacity=100); - -moz-opacity: 1.0; -} - -.UIToolbar .BlueLargeToolbar .SelectItemButton .ButtonLabel { - line-height: 18px; - color: #003c7f; -} - -.UIToolbar .BlueLargeToolbar .HorizontalSeparator { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 2px 8px 0px 10px; - margin: 2px 10px 0px 8px; - width: 2px; - height: 22px; - background: url('background/BlueLargeToolbar.gif') no-repeat -6px top; -} - -.UIToolbar .BlueLargeToolbar .ManagementIconContainer { - padding-top: 4px; - margin-left: 5px; -} - -.UIToolbar .BlueLargeToolbar .ItemButton { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - padding-left: 35px; /* orientation=lt */ - padding-right: 35px; /* orientation=rt */ - margin: 0 10px; display: block; - background-image: url('background/BlueLargeToolbar.gif'); - background-repeat: no-repeat; - height: 26px; line-height: 26px; - color: #363636; -} - -.UIToolbar .BlueLargeToolbar .OrganizeIcon { - background-position: left -122px; /* orientation=lt */ - background-position: right -122px; /* orientation=rt */ -} - -.UIToolbar .BlueLargeToolbar .PorletIcon { - background-position: left -148px; /* orientation=lt */ - background-position: right -148px; /* orientation=rt */ -} - -.UIToolbar .BlueLargeToolbar .GadgetIcon { - background-position: left -174px; /* orientation=lt */ - background-position: right -174px; /* orientation=rt */ -} - /* * minh.js.exo */ /*#################################- LightToolbar -##############################*/ -.UIToolbar .LightToolbar { - height: 33px; - margin-top: 3px; -} .UIToolbar .LightToolbar .LeftBar { - padding-left: 3px; background: url('background/LightToolbar.gif') no-repeat left top; } .UIToolbar .LightToolbar .RightBar { - padding-right: 3px; background: url('background/LightToolbar.gif') no-repeat right top; } .UIToolbar .LightToolbar .MiddleBar { - height: 33px; line-height: 33px; background: url('background/LightToolbar.gif') repeat-x bottom; } /*#################################- HeaderToolbar-##############################*/ -.UIToolbar .HeaderToolbar { - height: 31px; -} .UIToolbar .HeaderToolbar .LeftBar { - padding-left: 7px; background: url('background/HeaderToolbar.gif') no-repeat left top; } .UIToolbar .HeaderToolbar .RightBar { - padding-right: 7px; background: url('background/HeaderToolbar.gif') no-repeat right top; } .UIToolbar .HeaderToolbar .CenterBar { - height: 31px; line-height: 31px; background: url('background/HeaderToolbar.gif') repeat-x left -31px; } Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,129 +1,36 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -.UITrees { - border: 1px solid #b7b7b7; - background: white; -} +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ -.UITrees .TreeContainer { - overflow-y: auto; - overflow-x: hidden; - width: 99.5%; -} -.UITrees a { - display: block; -} - -.UITrees a:hover { - color: #058ee6; -} - -.UITrees .LevelUpArrowIcon { - height: 20px; - margin-left: 10px; /* orientation=lt */ - margin-right: 10px; /* orientation=rt */ - background: url(background/BlueUpLevelArrow.gif) no-repeat 0 center; /* orientation=lt */ - background: url(background/BlueUpLevelArrow-rt.gif) no-repeat 0 center; /* orientation=rt */ -} - -.UITrees a.LevelUpArrowIcon:hover { - background: url(background/OverBlueUpLevelArrow.gif) no-repeat 0 center; /* orientation=lt */ - background: url(background/OverBlueUpLevelArrow-rt.gif) no-repeat 0 center; /* orientation=rt */ - margin-left: 10px; /* orientation=lt */ - margin-right: 10px; /* orientation=rt */ -} - -.UITrees .Node { - line-height: 19px; - padding-top: 7px; - margin-left: 15px; /* orientation=lt */ - margin-right: 15px; /* orientation=rt */ - white-space: nowrap; - background: url('background/Dotted.gif') repeat-y left; /* orientation=lt */ - background: url('background/Dotted-rt.gif') repeat-y right; /* orientation=rt */ - width: 100%; -} - -.UITrees .LastNode { - background: url('background/Dotted.gif') no-repeat left top; /* orientation=lt */ - background: url('background/Dotted-rt.gif') no-repeat right top; /* orientation=rt */ -} - -.UITrees .Node .NodeIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - width: 100%; - height: auto; - color: #565656; -} - -.UITrees .Node .ExpandIcon { - padding-left: 18px; /* orientation=lt */ - padding-right: 18px; /* orientation=rt */ - background: url('background/SmallGrayMinus.gif') no-repeat left top; /* orientation=lt */ - background: url('background/SmallGrayMinus-rt.gif') no-repeat right top; /* orientation=rt */ - width: 100%; height: auto; -} - -.UITrees .Node .CollapseIcon { - padding-left: 18px; /* orientation=lt */ - padding-right: 18px; /* orientation=rt */ - background: url('background/SmallGrayPlus.gif') no-repeat left top; /* orientation=lt */ - background: url('background/SmallGrayPlus-rt.gif') no-repeat right top; /* orientation=rt */ - width: 100%; - height: auto; -} - .UITrees .Node .NodeSelected { - font-weight: bold; color: #565656; - cursor: pointer; -} - -.UITrees .Node .NullItemIcon { - padding-left: 18px; /* orientation=lt */ - padding-right: 18px; /* orientation=rt */ - background: url('background/NullItemIcon.gif') no-repeat 6px top; /* orientation=lt */ - background: url('background/NullItemIcon-rt.gif') no-repeat 98.5% top; /* orientation=rt */ - -webkit-background: url('background/NullItemIcon-rt.gif') no-repeat 98.2% top; /* orientation=rt */ - width: 100%; height: auto; } /** ################# Icons ###################*/ -.UITrees .TreeContainer .GroupAdminIcon { +.UITrees .Node .GroupAdminIcon { background: url('background/NormalGroup.gif') no-repeat left top; /* orientation=lt */ background: url('background/NormalGroup-rt.gif') no-repeat right top; /* orientation=rt */ - padding-left: 25px; /* orientation=lt */ - padding-right: 25px; /* orientation=rt */ } -.UITrees .TreeContainer .PortalIcon { +.UITrees .Node .PortalIcon { background: url('background/SelectedGroup.gif') no-repeat left top; /* orientation=lt */ background: url('background/SelectedGroup.gif') no-repeat right top; /* orientation=rt */ - padding-left: 25px; /* orientation=lt */ - padding-right: 25px; /* orientation=rt */ } - - Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/BlueUpLevelArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/Dotted.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/NullItemIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/OverBlueUpLevelArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/SmallGrayMinus.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/SmallGrayPlus.gif =================================================================== (Binary files differ) Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -20,5 +20,5 @@ @import url(/eXoResources/skin/DefaultSkin/webui/component/Stylesheet.css); @import url(SimpleSkin/portal/webui/component/UIPortalApplicationSkin.css); @import url(SimpleSkin/webui/component/Stylesheet.css); -@import url(PortletThemes/Stylesheet.css); +@import url(/eXoResources/skin/PortletThemes/Stylesheet.css); @import url(Portlet/Stylesheet.css); Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/AppRegistryControl.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/BlueDownArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/BlueNextArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/ControlIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/CopyIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/Repeat-Y16x2.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleStylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleStylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleStylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,530 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -/** - * Created by The eXo Platform SARL - * Modifile : Nguyen Ngoc Thuy - * May 8, 2007 - * version: $Id$ - */ - -.UIWindow .UIApplicationRegistryPortlet { - overflow: visible; -} - -.UIApplicationRegistryPortlet { - overflow: auto; - background: white; -} - -.UIApplicationRegistryPortlet .CategoryContainer .EditIcon { - float: none; -} - -.UIApplicationRegistryPortlet .UIControlbar { - background: url('SimpleSkin/background/ControlIcon.gif') repeat-x center -222px; - border: 1px solid #b7b7b7; - height: 23px; line-height: 23px; - padding: 0px 10px; - margin: 5px 0px; -} - -.UIApplicationRegistryPortlet .UIControlbar .IconControl { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - cursor: pointer; - background-image: url('SimpleSkin/background/ControlIcon.gif'); /* orientation=lt */ - background-image: url('SimpleSkin/background/ControlIcon-rt.gif'); /* orientation=rt */ - background-repeat: no-repeat; - padding-left: 25px; /* orientation=lt */ - padding-right: 25px; /* orientation=rt */ - line-height: 23px; - margin: 0px 15px 0px 7px; /* orientation=lt */ - margin: 0px 7px 0px 15px; /* orientation=rt */ - width: auto; - height: auto; -} - -.UIApplicationRegistryPortlet .UIControlbar .AddNewIcon { - background-position: left top; /* orientation=lt */ - background-position: right top; /* orientation=rt */ -} - -.UIApplicationRegistryPortlet .AddIcon { - background: url('SimpleSkin/background/ControlIcon.gif') no-repeat left -247px; /* orientation=lt */ - background: url('SimpleSkin/background/ControlIcon-rt.gif') no-repeat right -247px; /* orientation=rt */ - width: 19px; - height: 20px; -} - -.UIApplicationRegistryPortlet .ReloadIcon { - background: url('SimpleSkin/background/ControlIcon.gif') no-repeat left -273px; /* orientation=lt */ - background: url('SimpleSkin/background/ControlIcon-rt.gif') no-repeat right -273px; /* orientation=rt */ - width: 19px; - height: 20px; -} - -.UIApplicationRegistryPortlet .UIControlbar .AddCategoryIcon { - background-position: left -46px; /* orientation=lt */ - background-position: right -46px; /* orientation=rt */ -} - -.UIApplicationRegistryPortlet .CreateNewIcon { - background: url('SimpleSkin/background/ControlIcon.gif') no-repeat left -25px; /* orientation=lt */ - background: url('SimpleSkin/background/ControlIcon-rt.gif') no-repeat right -25px; /* orientation=rt */ - width: 19px; - height: 20px; -} - -.UIApplicationRegistryPortlet .UIControlbar .ImportIcon { - background-position: left -69px; /* orientation=lt */ - background-position: right -69px; /* orientation=rt */ - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ -} - -.UIApplicationRegistryPortlet .CopyGadgetIcon { - background: url('SimpleSkin/background/ControlIcon.gif') repeat-x left -69px; /* orientation=lt */ - background: url('SimpleSkin/background/ControlIcon-rt.gif') repeat-x right -69px; /* orientation=rt */ - width: 23px; - height: 22px; -} - -.UIApplicationRegistryPortlet .AppRegistryContainer { - height: 100%; - border: 1px solid #b7b7b7; - background: url('SimpleSkin/background/Repeat-Y16x2.gif') repeat-y left top; /* orientation=lt */ - background: url('SimpleSkin/background/Repeat-Y16x2-rt.gif') repeat-y right top; /* orientation=rt */ -} - -.UIApplicationRegistryPortlet .AppRegistryContainer .AppRegistryControl { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 239px; -} - -.UIApplicationRegistryPortlet .AppRegistryContainer .ControlArea { - padding: 5px 2px 5px 5px; /* orientation=lt */ - padding: 5px 5px 5px 2px; /* orientation=rt */ -} - -.UIApplicationRegistryPortlet .AppRegistryControl .CategoryContent { - padding: 1px; - background: white; - border: 1px solid #d7d7d7; -} - -.UIApplicationRegistryPortlet .AppRegistryControl .Border { - border: 1px solid #d7d7d7; - padding: 1px; margin: 1px; -} - -.UIApplicationRegistryPortlet .AppRegistryControl .TitleCategory { - background: url('SimpleSkin/background/AppRegistryControl.gif') repeat-x left top; - height: 17px; - padding: 10px 5px 0px 5px; - color: white; - font-weight: bold; - letter-spacing: 2px; - text-transform: uppercase; -} - -.UIApplicationRegistryPortlet .CategoryContent .ListContent { - border: 1px solid #d7d7d7; - margin: 5px; -} - -.UIApplicationRegistryPortlet .CategoryContent .ItemContent { - line-height: 26px; - height: 26px; - background: url('SimpleSkin/background/AppRegistryControl.gif') no-repeat -453px bottom; - padding: 0px 5px; -} - -.UIApplicationRegistryPortlet .CategoryContent a.TabLabel:hover { - color: #058ee6; -} - -.UIApplicationRegistryPortlet .CategoryContent .SelectedItem .TabLabel { - color: #058ee6; -} - -.UIApplicationRegistryPortlet .CategoryContent a.TabLabel { - display: block; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - background: url('SimpleSkin/background/ControlIcon.gif') repeat-y left -92px; /* orientation=lt */ - background: url('SimpleSkin/background/ControlIcon-rt.gif') repeat-y right -92px; /* orientation=rt */ - padding: 0px 0px 0px 20px; /* orientation=lt */ - padding: 0px 20px 0px 0px; /* orientation=rt */ - cursor: pointer; - width: 160px; - overflow: hidden; - white-space: nowrap; -} - -.UIApplicationRegistryPortlet .CategoryContent .ControlIcon { - display: block; - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - margin: 3px; - filter: alpha(opacity=30); - -moz-opacity: 0.3; -} - -.UIApplicationRegistryPortlet .ListItem .SelectedItem a.TabLabel { - font-weight: bold; - padding-left: 3px; /* orientation=lt */ - padding-right: 3px; /* orientation=rt */ -} - -.UIApplicationRegistryPortlet .CategoryContent .ItemContent:hover { - background-color: #9d9d9d; -} - -.UIApplicationRegistryPortlet .CategoryContent .ItemContent:hover a { - color: white; -} - -.UIApplicationRegistryPortlet .UIVerticalSlideTabs { - margin: 1px 1px 1px 0px; -} - -.UIApplicationRegistryPortlet .UIVerticalSlideTabs a:hover { - color: #058ee6; -} - -.UIApplicationRegistryPortlet .UIVerticalSlideTabs .NormalTab a.TabLabel { - background: url('SimpleSkin/background/BlueNextArrow.gif') no-repeat left center; /* orientation=lt */ - background: url('SimpleSkin/background/BlueNextArrow-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0 0 0 18px; /* orientation=lt */ - padding: 0 18px 0 0; /* orientation=rt */ - display: block; -} - -.UIApplicationRegistryPortlet .UIVerticalSlideTabs .SelectedTab a.TabLabel { - background: url('SimpleSkin/background/BlueDownArrow.gif') no-repeat left center; - padding: 0 0 0 18px; /* orientation=lt */ - padding: 0 18px 0 0; /* orientation=rt */ - display: block; - width: 120px; overflow: hidden; - color: #626262; -} - -.UIApplicationRegistryPortlet .UIVerticalSlideTabs .NormalTab .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ -} - -.UIApplicationRegistryPortlet .UIVerticalSlideTabs .SelectedTab .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - filter: alpha(opacity=100); - -moz-opacity: 1.0; -} - -.UIApplicationRegistryPortlet .UIVerticalSlideTabs .UIVTabContent .ItemLabel { - background: url('SimpleSkin/background/ControlIcon.gif') no-repeat left -170px; /* orientation=lt */ - background: url('SimpleSkin/background/ControlIcon-rt.gif') no-repeat right -170px; /* orientation=rt */ - padding-left: 10px; /* orientation=lt */ - padding-right: 10px; /* orientation=rt */ - display: block; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - cursor: pointer; - width: 160px; - overflow: hidden; - white-space: nowrap; -} - -.UIApplicationRegistryPortlet .UIVerticalSlideTabs .VTabSimpleStyle .UIVTabContent { - padding: 5px; - margin: 0px; -} - -.UIApplicationRegistryPortlet .UIVTabContent .SelectedItem .ItemLabel { - background: url('SimpleSkin/background/ControlIcon.gif') no-repeat left -196px; /* orientation=lt */ - background: url('SimpleSkin/background/ControlIcon-rt.gif') no-repeat right -196px; /* orientation=rt */ - display: block; - color: #898989; -} - -.UIApplicationRegistryPortlet .UIVerticalSlideTabs .UIVTabContent .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - cursor: pointer; -} - -/**************************** AppWorkingArea *****************************/ - -.UIApplicationRegistryPortlet .AppWorkingArea { - margin-left: 260px; /* orientation=lt */ - margin-right: 260px; /* orientation=rt */ - padding: 10px; -} - -.UIApplicationRegistryPortlet .UIBreadcumb { - padding: 0px 10px; - border-bottom: 1px solid #b7b7b7; - height: 19px; - color: #4b4b4b; - font-weight: bold; -} - -.UIApplicationRegistryPortlet .UIBreadcumb .BreadcumbInfo { - width: 90%; - overflow: hidden; - height: 16px; - line-height: 16px; -} - -.UIApplicationRegistryPortlet .UIBreadcumb .RightBlackGridArrow16x16Icon { - background-position: center; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - height: 6px; - margin: 5px 0px 0px; -} - -.UIApplicationRegistryPortlet .UIBreadcumb .Selected { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - color: #535353; -} - -.UIApplicationRegistryPortlet .UIBreadcumb .ControlIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - margin: 0px 5px; - cursor: pointer; -} - -.UIApplicationRegistryPortlet .ApplicationContainer { - padding: 10px 0px; -} - -.UIApplicationRegistryPortlet .ApplicationContent { - margin-left: 90px; /* orientation=lt */ - margin-right: 90px; /* orientation=rt */ - padding: 15px 15px 15px 0px; /* orientation=lt */ - padding: 15px 0px 15px 15px; /* orientation=rt */ -} - -.UIApplicationRegistryPortlet .ApplicationContent table { - table-layout: fixed; - width: 99%; - line-height: 18px; -} - -.UIApplicationRegistryPortlet .ApplicationContent .RightLabel { - width: 78%; - overflow: hidden; - padding: 0px 4px; - vertical-align: middle; -} - -.UIApplicationRegistryPortlet .TitleBarApplication { - background: none; - font-weight: bold; font-size: 12px; color: #535353; -} - -.UIApplicationRegistryPortlet .ApplicationContentLabel { - line-height: 16px; - margin: auto; -} - -.UIApplicationRegistryPortlet .ApplicationContent .LeftLabel { - font-weight: bold; - font-size: 11px; - color: black; - text-align: right; /* orientation=lt */ - text-align: left; /* orientation=rt */ - word-wrap: break-word; -} - -.UIApplicationRegistryPortlet .ApplicationContentLabel .RightLabel { - padding: 0px 5px; -} - -.UIApplicationRegistryPortlet .PortletIcons { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 80px; - height: 80px; - cursor: pointer; - margin-top: 2px; -} - -.UIApplicationRegistryPortlet .UIFormWithTitle { - width: 480px; -} - -.UIApplicationRegistryPortlet .UIFormWithTitle .HintMessage { - font-style:italic; - padding:10px; - text-align:center; -} -/*******************************UIAcessPermissions******************************/ - -.UIApplicationRegistryPortlet .UIAcessPermissions { - margin: 20px 0px; - width: auto; - height: 100%; -} - -.UIApplicationRegistryPortlet .UIAcessPermissions .UIForm .HorizontalLayout { - padding: 0px; - border: none; - background: none; -} - -.UIApplicationRegistryPortlet .UIAcessPermissions .UIFormGrid { - width: 100%; -} - -.UIApplicationRegistryPortlet .UIAcessPermissions .PublicCheck .UIFormGrid { - width: auto; -} - -/**************************** UIOrganizerManagement ***************************/ - -.UIApplicationRegistryPortlet .UIAddApplicationForm .UIFormGrid { - width: 99%; -} - -.UIOrganizerManagement .UIFormInputSet .UIFormGrid { - width: 99%; -} - -.UIOrganizerManagement .UIFormInputSet .PublicCheck .UIFormGrid { - width: auto; -} - -.UIOrganizerManagement .UIAddApplicationForm .UIFormGrid td.text { - white-space: normal; -} -/***************************** UIPortletManagement ***************************/ - -.UIPortletManagement .ListCategory .CategoryLable { - background: url(SimpleSkin/background/ControlIcon.gif) no-repeat scroll 5px -170px; /* orientation=lt */ - background: url(SimpleSkin/background/ControlIcon-rt.gif) no-repeat scroll right -170px; /* orientation=rt */ - padding: 0px 0px 0px 15px; /* orientation=lt */ - padding: 0px 15px 0px 0px; /* orientation=rt */ - display: block; - line-height: 25px; - border-bottom: 1px solid #dddddd; -} - -.UIPortletManagement .SelectedCategory .CategoryLable { - background: #b7b7b7 url(SimpleSkin/background/ControlIcon.gif) no-repeat scroll 5px -196px; /* orientation=lt */ - background: #b7b7b7 url(SimpleSkin/background/ControlIcon-rt.gif) no-repeat scroll right -196px; /* orientation=rt */ - color: white; - font-weight: bold; - white-space: nowrap; - overflow: hidden; -} - -.UIPortletManagement .ListCategory .ListItem { - background: #f7f7f7; - border-bottom: 1px solid #dddddd; -} - -.UIPortletManagement .ListCategory .Item { - display: block; - background: url('SimpleSkin/background/ControlIcon.gif') repeat-y left -92px; /* orientation=lt */ - background: url('SimpleSkin/background/ControlIcon.gif') repeat-y right -92px; /* orientation=rt */ - padding-left: 20px; /* orientation=lt */ - padding-right: 20px; /* orientation=rt */ - cursor: pointer; - width: 160px; overflow: hidden; - white-space: nowrap; - line-height: 25px; -} - -.UIPortletManagement .UIVerticalSlideTabs .VTabSimpleStyle .UIVTabContent { - background: none; -} - -.UIPortletManagement .BoxContent { - padding: 1px; - border: 1px solid #d7d7d7; - margin: 1px; -} - -.UIPortletManagement .BoxContent .TitleCategory { - cursor: pointer; - text-transform: capitalize; -} - -.UIPortletManagement .UIGrid .FieldLable { - width: 30%; - text-align: right; -} - -.UIPortletManagement .UIGrid .FieldComponent { - padding: 4px 0px; -} - -/******************************** UIGadgetManagement ******************************/ -.UIApplicationRegistryPortlet .UIGadgetManagement .PortletIcons { - width: 150px; height: 120px; - padding-top: 20px; text-align: center; -} - -.UIApplicationRegistryPortlet .UIGadgetManagement .ApplicationContent { - margin-left: 150px; /* orientation=lt */ - margin-right: 150px; /* orientation=rt */ -} - -.UIApplicationRegistryPortlet .UIGadgetManagement .URL table { - width: 99%; - table-layout: fixed; -} - -.UIApplicationRegistryPortlet .UIGadgetManagement .URL .RightLabel { - overflow: hidden; -} - -.UIGadgetManagement .UIGadgetEditor table.UIFormGrid { - width: 99%; - table-layout: fixed; -} - -.UIGadgetManagement .UIGadgetEditor .HorizontalLayout textarea { - height: 250px; - padding: 0px; - width: 97%; - overflow: auto; -} - -.UIGadgetManagement .UIGadgetEditor td.FieldComponent { - width: 90%; -} - -.UIGadgetManagement .GadgetCategory .UIFormGrid { - width: 100%; -} - -.UIGadgetManagement .UIGadgetEditor .HorizontalLayout input { - width: 97%; -} - -.UIGadgetManagement .GadgetCategory .UIFormGrid { - width: 100%; -} Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleStylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleStylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleStylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -47,7 +47,6 @@ .UIOrganizationPortlet .UIToolbar .LargeToolbar .SelectButtonLabel { color: #565656; - line-height: 18px; } .UIOrganizationPortlet .UISearch { @@ -55,16 +54,7 @@ margin: 0px auto; } -.UIOrganizationPortlet .UIToolbar .LargeToolbar .HorizontalSeparator { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin-top: 3px; - width: 2px; - height: 50px; -} - .UIOrganizationPortlet .UIToolbar .LargeToolbar .ButtonLabel { - height: 18px; line-height: 18px; padding-left: 0px; } @@ -178,7 +168,6 @@ } .UIOrganizationPortlet .UIGroupManagement .UITrees { - width: 99%; border: 1px solid #dedede; border-top: none; background: #f7f7f7; @@ -190,7 +179,7 @@ background: #f7f7f7; } -.UIOrganizationPortlet .UIGroupManagement .UITrees .TreeContainer { +.UIOrganizationPortlet .UIGroupManagement .TreeContainer { height: 218px; } @@ -316,12 +305,6 @@ padding-top: 10px; } -.UIOrganizationPortlet .UIPageIterator { - height: 22px; - margin-top: 3px; - width: 99.5%; -} - -.UIOrganizationPortlet .UIMembershipManagement .UIGrid { - margin: auto; +.UIOrganizationPortlet .UIMembershipTypeForm .UIFormGrid { + width: auto; } \ No newline at end of file Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIHomePagePortlet/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIHomePagePortlet/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIHomePagePortlet/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,7 +1,3 @@ -.UIWorkingWorkspace { - width: 1017px; -} - .UIWindow .UIHomePagePortlet { margin: 0px; } Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,212 +1,202 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -/** - * Created by The eXo Platform SARL - * Modifier : Nguyen Ngoc Thuy - * April 23, 2007 - * version: $Id$ - */ - -.UINavigationPortlet { - border-bottom: 1px solid #e5e5e5; -} - -.UINavigationPortlet ul { - list-style:none; - padding:0px; - margin:0px; -} - -.UINavigationPortlet .UINavigationBar { - white-space: nowrap; - padding: 0px 24px; - background: #f9f9f9; - float: none; - !position: relative; - height: 30px; -} - -.UINavigationPortlet .UINavigationBar .UITab { - float:left;/* orientation=lt */ - float:right;/* orientation=rt */ - text-align:center; - font-weight:normal; -} - -.UINavigationPortlet .UITab a.TabIcon { - display: block; - padding-left: 23px;/* orientation=lt */ - padding-right: 23px;/* orientation=rt */ - line-height: 27px; - background-position: right ;/* orientation=rt */ -} - -.UINavigationPortlet .UITab > span a.DefaultPageIcon { - background: none; - padding: 0px; -} - -.UINavigationPortlet .SelectedNavigationTab .TabIcon { - font-weight:bold; -} - -.UINavigationPortlet .UITab > span { - display:block; - padding: 0px; - margin-right: 28px;/* orientation=lt */ - margin-left: 28px;/* orientation=rt */ -} - -.UINavigationPortlet .UITab .DropDownArrowIcon { - background: url('background/NavDownArrow.gif') no-repeat right center; /* orientation=lt */ - background: url('background/NavDownArrow_ar.gif') no-repeat left center; /* orientation=rt */ - padding: 0 17px 0 0px; /* orientation=lt */ - padding: 0 0px 0 17px; /* orientation=rt */ -} - -.UINavigationPortlet .HighlightNavigationTab > span,.UINavigationPortlet .SelectedNavigationTab > span { - border-bottom:3px solid #E5E5E5; -} - -/*============ Submenu =====================*/ - - -.UINavigationPortlet .MenuItemContainer { - white-space: nowrap; - border: solid #b7b7b7 1px; /*fix for IE*/ - text-align: left; /* orientation=lt */ - text-align: right; /* orientation=rt */ - padding: 1px 1px 6px 1px; - background-color: #FFF; -} - -.UINavigationPortlet .MenuItemContainer .MenuItem { - cursor: pointer; - line-height: 24px; - height: 24px; - width: auto; - display: block; - white-space: nowrap; - font-weight: normal; - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ -} - -.UINavigationPortlet .MenuItemContainer .MenuItem a { - padding: 0px 20px 0px 25px; /* orientation=lt */ - padding: 0px 25px 0px 20px; /* orientation=rt */ - display: block; -} - -.UINavigationPortlet .MenuItemContainer .MenuItem a:hover { - color: #3e8df0; -} - -.UINavigationPortlet .MenuItemContainer .SelectedItem { - background: #c7c7c7; -} - -.UINavigationPortlet .MenuItemContainer .SelectedItem a { - color: #3e8df0; -} - -.UINavigationPortlet .MenuItemContainer .SelectedItem .NormalItem a { - color: #000; -} - -.UINavigationPortlet .MenuItemContainer .SelectedItem .NormalItem a:hover { - color: #3e8df0; -} - -.UINavigationPortlet .MenuItemContainer .NormalItem .SelectedItem a { - color: #3e8df0; -} - -.UINavigationPortlet .MenuItemContainer .ItemIcon { - height: 24px; - width: auto; - background-position: right;/* orientation=rt */ -} - -.UINavigationPortlet .MenuItemContainer .MenuItem .ArrowIcon { - height: 24px; - width: auto; +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +/** + * Created by The eXo Platform SARL + * Modifier : Nguyen Ngoc Thuy + * April 23, 2007 + * version: $Id$ + */ + +.UINavigationPortlet { + border-bottom: 1px solid #e5e5e5; +} + +.UINavigationPortlet ul { + list-style:none; + padding:0px; + margin:0px; +} + +.UINavigationPortlet .UINavigationBar { + white-space: nowrap; + padding: 0px 24px; + background: #f9f9f9; + float: none; + !position: relative; + height: 30px; +} + +.UINavigationPortlet .UINavigationBar .UITab { + font-weight:normal; +} + +.UINavigationPortlet .UITab a.TabIcon { + display: block; + padding-left: 23px;/* orientation=lt */ + padding-right: 23px;/* orientation=rt */ + line-height: 27px; + background-position: right ;/* orientation=rt */ +} + +.UINavigationPortlet .UITab > span a.DefaultPageIcon { + background: none; + padding: 0px; +} + +.UINavigationPortlet .SelectedNavigationTab .TabIcon { + font-weight:bold; +} + +.UINavigationPortlet .UITab > span { + display:block; + padding: 0px; + margin-right: 28px;/* orientation=lt */ + margin-left: 28px;/* orientation=rt */ +} + +.UINavigationPortlet .UITab .DropDownArrowIcon { + background: url('background/NavDownArrow.gif') no-repeat right center; /* orientation=lt */ + background: url('background/NavDownArrow_ar.gif') no-repeat left center; /* orientation=rt */ + padding: 0 17px 0 0px; /* orientation=lt */ + padding: 0 0px 0 17px; /* orientation=rt */ +} + +.UINavigationPortlet .HighlightNavigationTab > span,.UINavigationPortlet .SelectedNavigationTab > span { + border-bottom:3px solid #E5E5E5; +} + +/*============ Submenu =====================*/ + + +.UINavigationPortlet .MenuItemContainer { + white-space: nowrap; + border: solid #b7b7b7 1px; /*fix for IE*/ + text-align: left; /* orientation=lt */ + text-align: right; /* orientation=rt */ + padding: 1px 1px 6px 1px; + background-color: #FFF; +} + +.UINavigationPortlet .MenuItemContainer .MenuItem { + cursor: pointer; + line-height: 24px; + height: 24px; + width: auto; + display: block; + white-space: nowrap; + font-weight: normal; + padding-left: 5px; /* orientation=lt */ + padding-right: 5px; /* orientation=rt */ +} + +.UINavigationPortlet .MenuItemContainer .MenuItem a { + padding: 0px 20px 0px 25px; /* orientation=lt */ + padding: 0px 25px 0px 20px; /* orientation=rt */ + display: block; +} + +.UINavigationPortlet .MenuItemContainer .MenuItem a:hover { + color: #3e8df0; +} + +.UINavigationPortlet .MenuItemContainer .ArrowIcon { background: url('background/Button.gif') no-repeat right -48px; /* orientation=lt */ background: url('background/Button-rt.gif') no-repeat left -48px; /* orientation=rt */ - display:block; } -/*============ Scroll Buttons =====================*/ - -.UINavigationPortlet .ScrollButtons { - margin: 10px 0 0 0; - display: none; - cursor:pointer; - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - height: 15px; - width: 20px; -} - -.UINavigationPortlet .ScrollButtons a { - display:block; - cursor:pointer; - width: 10px; - height: 15px; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ -} - -.UINavigationPortlet .ScrollLeftButton { - background: url('background/Button.gif') no-repeat left -15px; /* orientation=lt */ - background: url('background/Button-rt.gif') no-repeat right -15px; /* orientation=rt */ - -} - -.UINavigationPortlet .ScrollRightButton { - background: url('background/Button.gif') no-repeat right -15px; /* orientation=lt */ - background: url('background/Button-rt.gif') no-repeat left -15px; /* orientation=rt */ -} - -.UINavigationPortlet .DisableScrollLeftButton { - background: url('background/Button.gif') no-repeat left -30px; /* orientation=lt */ - background: url('background/Button-rt.gif') no-repeat right -30px; /* orientation=rt */ -} - -.UINavigationPortlet .DisableScrollRightButton { - background: url('background/Button.gif') no-repeat right -30px; /* orientation=lt */ - background: url('background/Button-rt.gif') no-repeat left -30px; /* orientation=rt */ -} - -.UINavigationPortlet .HighlightScrollLeftButton ,.UINavigationPortlet .ScrollLeftButton:hover{ - background: url('background/Button.gif') no-repeat left top; /* orientation=lt */ - background: url('background/Button-rt.gif') no-repeat right top; /* orientation=rt */ -} - -.UINavigationPortlet .HighlightScrollRightButton ,.UINavigationPortlet .ScrollRightButton:hover{ - background: url('background/Button.gif') no-repeat right top; /* orientation=lt */ - background: url('background/Button-rt.gif') no-repeat left top; /* orientation=rt */ -} - -/***********GroupNavigation*************/ - -.UINavigationPortlet .GroupNavigation { - background: #f9f9f9; -} \ No newline at end of file +.UINavigationPortlet .MenuItemContainer .SelectedItem { + background: #c7c7c7; +} + +.UINavigationPortlet .MenuItemContainer .SelectedItem a { + color: #3e8df0; +} + +.UINavigationPortlet .MenuItemContainer .SelectedItem .NormalItem a { + color: #000; +} + +.UINavigationPortlet .MenuItemContainer .SelectedItem .NormalItem a:hover { + color: #3e8df0; +} + +.UINavigationPortlet .MenuItemContainer .NormalItem .SelectedItem a { + color: #3e8df0; +} + +.UINavigationPortlet .MenuItemContainer .ItemIcon { + height: 24px; + width: auto; + background-position: right;/* orientation=rt */ +} + + +/*============ Scroll Buttons =====================*/ + +.UINavigationPortlet .ScrollButtons { + margin: 10px 0 0 0; + display: none; + cursor:pointer; + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ + height: 15px; + width: 20px; +} + +.UINavigationPortlet .ScrollButtons a { + display:block; + cursor:pointer; + width: 10px; + height: 15px; + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ +} + +.UINavigationPortlet .ScrollLeftButton { + background: url('background/Button.gif') no-repeat left -15px; /* orientation=lt */ + background: url('background/Button-rt.gif') no-repeat right -15px; /* orientation=rt */ + +} + +.UINavigationPortlet .ScrollRightButton { + background: url('background/Button.gif') no-repeat right -15px; /* orientation=lt */ + background: url('background/Button-rt.gif') no-repeat left -15px; /* orientation=rt */ +} + +.UINavigationPortlet .DisableScrollLeftButton { + background: url('background/Button.gif') no-repeat left -30px; /* orientation=lt */ + background: url('background/Button-rt.gif') no-repeat right -30px; /* orientation=rt */ +} + +.UINavigationPortlet .DisableScrollRightButton { + background: url('background/Button.gif') no-repeat right -30px; /* orientation=lt */ + background: url('background/Button-rt.gif') no-repeat left -30px; /* orientation=rt */ +} + +.UINavigationPortlet .HighlightScrollLeftButton ,.UINavigationPortlet .ScrollLeftButton:hover{ + background: url('background/Button.gif') no-repeat left top; /* orientation=lt */ + background: url('background/Button-rt.gif') no-repeat right top; /* orientation=rt */ +} + +.UINavigationPortlet .HighlightScrollRightButton ,.UINavigationPortlet .ScrollRightButton:hover{ + background: url('background/Button.gif') no-repeat right top; /* orientation=lt */ + background: url('background/Button-rt.gif') no-repeat left top; /* orientation=rt */ +} + Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/Stylesheet.css =================================================================== --- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,136 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -/** - * Cated by The eXo Platform SAS - * Modifile : Vu Duy Tu - * duytucntt(a)gmail.com - * January 10, 2007 - * version: $Id$ - */ - - -.UIWindow .UISitemapPortlet { - border: none; - margin: 0px; -} - -.UISitemapPortlet { -} - -.UISitemap { - background: #fff url('background/default_sitemap.gif') no-repeat 95% 90%; - padding: 10px 30px; - color: #4e4e4e; -} - -.UISitemap a { - color: #4e4e4e; -} - -.UISitemap .ClearFix:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - -.UISitemap .ClearFix { - !display: inline-block; - !zoom: 1; - !display: block; -} - -.UISitemap .CollapseAll { - background: url('background/CollapseAllIcon.gif') no-repeat left center; /* orientation=lt */ - background: url('background/CollapseAllIcon-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 20px; - cursor: pointer; -} - -.UISitemap .ExpandAll { - background: url('background/ExpandAllIcon.gif') no-repeat left center; /* orientation=lt */ - background: url('background/ExpandAllIcon-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 20px; - cursor: pointer; -} - -.UISitemap .SitemapContent { - background: url('background/RootTree.gif') no-repeat left top; /* orientation=lt */ - background: url('background/RootTree-rt.gif') no-repeat right top; /* orientation=rt */ - padding-top: 8px; - margin: 20px 0px; -} - -.UISitemap .SitemapContent .UISiteTree a { - display: block; -} - -.UISitemap .SitemapContent .UISiteTree a:hover { - color: #058bb6; -} - -.UISitemap .UISiteTree .Node { - line-height: 30px; - background: url('background/Dotted.gif') repeat-y 4px top; /* orientation=lt */ - background: url('background/Dotted-rt.gif') repeat-y 99.6% top; /* orientation=rt */ -} - -.UISitemap .UISiteTree .LastNode { - line-height: 26px; - background: url('background/LastNode.gif') no-repeat 4px top; /* orientation=lt */ - background: url('background/LastNode-rt.gif') no-repeat 99.6% top; /* orientation=rt */ -} - -.UISitemap .CollapseIcon { - background: url('background/CollapseIcon.gif') no-repeat left center; /* orientation=lt */ - background: url('background/CollapseIcon-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 0px 0px 32px; /* orientation=lt */ - padding: 0px 32px 0px 0px; /* orientation=rt */ - cursor: pointer; -} - -.UISitemap .ExpandIcon { - background: url('background/ExpandIcon.gif') no-repeat left center; /* orientation=lt */ - background: url('background/ExpandIcon-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 0px 0px 32px; /* orientation=lt */ - padding: 0px 32px 0px 0px; /* orientation=rt */ - cursor: pointer; -} - -.UISitemap .NullItem { - background: url('background/NullItem.gif') no-repeat left center; /* orientation=lt */ - background: url('background/NullItem-rt.gif') no-repeat right center; /* orientation=rt */ - padding: 0px 32px; -} - -.UISitemap .DefaultPageIcon { - padding: 0px 0px 0px 20px; /* orientation=lt */ - padding: 0px 20px 0px 0px; /* orientation=rt */ - background-position: left center; /* orientation=lt */ - background-position: right center; /* orientation=rt */ - width: auto; -} - -.UISitemap .ChildrenContainer { - padding-left: 31px; /* orientation=lt */ - padding-right: 31px; /* orientation=rt */ - float: none; -} \ No newline at end of file Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/CollapseAllIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/CollapseIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/Dotted.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/ExpandAllIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/ExpandIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/LastNode.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/NullItem.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/RootTree.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/SitemapItemBoxTitle150x1.gif =================================================================== (Binary files differ) Deleted: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/default_sitemap.gif =================================================================== (Binary files differ) Modified: portal/branches/dom/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css =================================================================== --- portal/branches/dom/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -484,9 +484,7 @@ /******************************** UIGadgetManagement ******************************/ .UIApplicationRegistryPortlet .UIGadgetManagement .PortletIcons { width: 150px; - padding: 10px 0px; - text-align: center; - height: auto; + padding-top: 20px; text-align: center; } .UIApplicationRegistryPortlet .UIGadgetManagement .PortletIcons img { Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css =================================================================== --- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css 2011-09-07 07:50:14 UTC (rev 7320) +++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css 2011-09-07 08:38:53 UTC (rev 7321) @@ -1,73 +1,71 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + + +.UIWorkingWorkspace { + margin: 0px; + +/* + * minh.js.exo + * bug : right click with IE7 in ECM + */ +} + +.UIWorkingWorkspace { + width: 980px; + margin: auto; + background: #b5b6b6; +} + - -.UIWorkingWorkspace { - margin: 0px; - -/* - * minh.js.exo - * bug : right click with IE7 in ECM - */ -} - -.UIWorkingWorkspace { - width: 980px; - margin: auto; - background: #b5b6b6; -} - -.UIWorkingWorkspace .UIPageBody { - background: #DEDFDF; -} - -.UIWorkingWorkspace .UIPageBody .VIEW-PAGEBODY{ -background: #b5b6b6; - -moz-border-radius:0px 0px 9px 9px; - -webkit-border-radius:0px 0px 9px 9px; - border-radius:0px 0px 9px 9px; - padding: 0px 8px 8px; -} - -.MaskLayer { - background: black; - text-align: center; - position: absolute; - overflow: auto; /* Fix for FF2 */ -} - -.WarningLayer { - width: 300px; height: 100px; - line-height: 100px; - text-align: center; - position: absolute; - opacity: 0.5 !important; - filter: alpha(opacity=50); -} - -.PreviewMode { - width: 160px; height: 160px; - background: url("background/PreviewModeImage146x156.png") no-repeat top right; /* orientation=lt */ - background: url("background/PreviewModeImageRTL146x156.png") no-repeat top left; /* orientation=rt */ - position: absolute; - cursor: pointer; - right: 0px; /* orientation=lt */ - left: 0px; /* orientation=rt */ - top: 0px; + +.UIWorkingWorkspace .UIPageBody .VIEW-PAGEBODY{ +background: #b5b6b6; + -moz-border-radius:0px 0px 9px 9px; + -webkit-border-radius:0px 0px 9px 9px; + border-radius:0px 0px 9px 9px; + padding: 0px 8px 8px; +} + +.MaskLayer { + background: black; + text-align: center; + position: absolute; + overflow: auto; /* Fix for FF2 */ +} + +.WarningLayer { + width: 300px; height: 100px; + line-height: 100px; + text-align: center; + position: absolute; + opacity: 0.5 !important; + filter: alpha(opacity=50); +} + +.PreviewMode { + width: 160px; height: 160px; + background: url("background/PreviewModeImage146x156.png") no-repeat top right; /* orientation=lt */ + background: url("background/PreviewModeImageRTL146x156.png") no-repeat top left; /* orientation=rt */ + position: absolute; + cursor: pointer; + right: 0px; /* orientation=lt */ + left: 0px; /* orientation=rt */ + top: 0px; } \ No newline at end of file

12 years, 10 months

1
0
0 / 0

gatein SVN: r7320 - portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-09-07 03:50:14 -0400 (Wed, 07 Sep 2011) New Revision: 7320 Removed: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/importer/ Log: removing empty dir

12 years, 10 months

1
0
0 / 0

gatein SVN: r7319 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-09-07 03:48:35 -0400 (Wed, 07 Sep 2011) New Revision: 7319 Removed: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/importer/ Log: remove empty dir

12 years, 10 months

1
0
0 / 0

gatein SVN: r7318 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2011-09-07 02:43:39 -0400 (Wed, 07 Sep 2011) New Revision: 7318 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayLanguageInPublicMode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_CreateNewPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_ChangeSiteConfigOFPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_ChangeContainerInPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_AddApplicationIntoContainerInLayoutOfPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_EditPortalConfig.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_37_ManageNavigationOfGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_46_MoreActionOnNodeInEditNavigationOfGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_47_EditNodePagePropertiesForGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_51_ManageGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_52_ManageTab.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_53_DragAndDropGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_54_AddNewpageForUser.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_55_EditPageForUser.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_56_ChangeSiteConfigWhenEditLayoutForUserPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_64_ChangeLanguageInPrivateMode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_65_ChangeSkin.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html Log: TESTVN-4136 - Daily tests on Portal Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -73,7 +73,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -108,7 +108,7 @@ </tr> <tr> <td>click</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -163,7 +163,7 @@ </tr> <tr> <td>click</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -218,7 +218,7 @@ </tr> <tr> <td>click</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayLanguageInPublicMode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayLanguageInPublicMode.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayLanguageInPublicMode.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -63,7 +63,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,7 +103,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -248,12 +248,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[contains(@onclick,'componentId=_')]</td> + <td>//div[contains(@onclick,'componentId=_')]//a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[contains(@onclick,"action=Close")]</td> + <td>//div[contains(@onclick,'componentId=_')]//a</td> <td></td> </tr> <tr> @@ -413,7 +413,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -438,7 +438,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -173,7 +173,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -198,7 +198,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -218,7 +218,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -243,7 +243,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -253,7 +253,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -303,7 +303,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete user Test_SNF_PRL_06?</td> + <td>Are you sure you want to delete Test_SNF_PRL_06 user?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -153,7 +153,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -328,7 +328,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete user Test_SNF_PRL_07?</td> + <td>Are you sure you want to delete Test_SNF_PRL_07 user?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -188,7 +188,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this group?</td> + <td>Are you sure you want to delete this group?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -173,7 +173,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete user john from group customers?</td> + <td>Are you sure you want to delete user john from group customers?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -178,7 +178,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this membership?</td> + <td>Are you sure you want to delete this membership?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -118,7 +118,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>This will automatically import all gadgets and portlets into new categories.</td> + <td>This action will automatically create categories and import all the gadgets and portlets on it.</td> <td></td> </tr> <tr> @@ -228,7 +228,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this category and all its applications?</td> + <td>Are you sure to delete this category and all applications on it?</td> <td></td> </tr> <tr> @@ -253,7 +253,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this category and all its applications?</td> + <td>Are you sure to delete this category and all applications on it?</td> <td></td> </tr> <tr> @@ -283,7 +283,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this category and all its applications?</td> + <td>Are you sure to delete this category and all applications on it?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,17 +48,17 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>echo</td> + <td>-- Go to Application Registry--</td> <td></td> </tr> <tr> - <td>echo</td> - <td>-- Go to Application Registry--</td> + <td>clickAndWait</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -233,7 +233,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this category and all its applications?</td> + <td>Are you sure to delete this category and all applications on it?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -228,7 +228,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this category and all its applications?</td> + <td>Are you sure to delete this category and all applications on it?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Portlets</td> + <td>link=Portlet</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Portlets</td> + <td>link=Portlet</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Gadgets</td> + <td>link=Gadget</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Gadgets</td> + <td>link=Gadget</td> <td></td> </tr> <tr> @@ -143,12 +143,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Click here to add this gadget to a category. </td> + <td>link=Click here to add into categories</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Click here to add this gadget to a category. </td> + <td>link=Click here to add into categories</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Gadgets</td> + <td>link=Gadget</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Gadgets</td> + <td>link=Gadget</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Click here to add this gadget to a category. </td> + <td>link=Click here to add into categories</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Click here to add this gadget to a category.</td> + <td>link=Click here to add into categories</td> <td></td> </tr> <tr> @@ -218,12 +218,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGadgetInfo']/div/div[3]</td> + <td>//div[@id='UIGadgetInfo']//div[@title='Refresh information']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIGadgetInfo']/div/div[3]</td> + <td>//div[@id='UIGadgetInfo']//div[@title='Refresh information']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -68,7 +68,7 @@ </tr> <tr> <td>echo</td> - <td>-- Click on link to move to another page--</td> + <td>-- Click on link to move to another page-- </td> <td></td> </tr> <tr> @@ -83,12 +83,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@href='/portal/private/classic/organization/management']</td> + <td>//div[@class='ClearFix']/a[text()='Users and groups management']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//a[@href='/portal/private/classic/organization/management']</td> + <td>//div[@class='ClearFix']/a[text()='Users and groups management']</td> <td></td> </tr> <tr> @@ -98,12 +98,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//li[4]/ul/li[2]/a</td> + <td>//div[4]/div/div[2]/div/div[2]/div/a</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//li[4]/ul/li[2]/a</td> + <td>//div[4]/div/div[2]/div/div[2]/div/a</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -108,7 +108,7 @@ </tr> <tr> <td>verifyNotVisible</td> - <td>//div[@id='UISiteMap']//a[text()='Applications Manager']</td> + <td>//div[@id='UISiteMap']//a[text()='Application Registry']</td> <td></td> </tr> <tr> @@ -118,7 +118,7 @@ </tr> <tr> <td>verifyNotVisible</td> - <td>//div[@id='UISiteMap']//a[text()='Pages Manager']</td> + <td>//div[@id='UISiteMap']//a[text()='Page Management']</td> <td></td> </tr> <tr> @@ -147,7 +147,7 @@ <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> + <td>verifyNotVisible</td> <td>//div[@id='UISiteMap']//a[text()='Blog']</td> <td></td> </tr> @@ -157,8 +157,8 @@ <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> - <td>//div[@id='UISiteMap']//a[text()='Red Hat']</td> + <td>verifyNotVisible</td> + <td>//div[@id='UISiteMap']//a[text()='Google']</td> <td></td> </tr> <tr> @@ -167,7 +167,7 @@ <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> + <td>verifyNotVisible</td> <td>//div[@id='UISiteMap']//a[text()='Facebook']</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_CreateNewPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_CreateNewPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_CreateNewPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[text()='Permission Settings']</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[text()='Permission Settings']</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> @@ -163,12 +163,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Edit Permission Settings</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Edit Permission Settings</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> @@ -228,12 +228,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> @@ -263,7 +263,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this portal?</td> + <td>Are you sure you want to delete this portal?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -88,12 +88,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[1]/div/div/div/div</td> + <td>//div[text()='Portal Templates']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[1]/div/div/div/div</td> + <td>//div[text()='Portal Templates']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Properties']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Properties']</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> @@ -168,42 +168,42 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Edit Permission Settings</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Edit Permission Settings</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/span[2]/a</td> + <td>link=Select Permission</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/span[2]/a</td> + <td>link=Select Permission</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[@id='PermissionSelector']//a[@title="Organization"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[@id='PermissionSelector']//a[@title="Organization"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td>//div[@id='PermissionSelector']//a[@title="manager"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td>//div[@id='PermissionSelector']//a[@title="manager"]</td> <td></td> </tr> <tr> @@ -248,7 +248,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this portal?</td> + <td>Are you sure you want to delete this portal?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -83,37 +83,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div/div/div</td> + <td>//div[text()='Portal Templates']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div/div/div</td> + <td>//div[text()='Portal Templates']</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//form[@id='UIPortalForm']/div[3]/div[1]/div[4]/div/div/div[1]/div[2]/div[2]/div/div/div</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//form[@id='UIPortalForm']/div[3]/div[1]/div[4]/div/div/div[1]/div[2]/div[2]/div/div/div</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>-- Choose Properties tab--</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Properties']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Properties']</td> <td></td> </tr> <tr> @@ -123,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> @@ -173,42 +163,42 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Edit Permission Settings</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Edit Permission Settings</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/span[2]/a</td> + <td>link=Select Permission</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/span[2]/a</td> + <td>link=Select Permission</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[@id='PermissionSelector']//a[@title="Organization"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[@id='PermissionSelector']//a[@title="Organization"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td>//div[@id='PermissionSelector']//a[@title="manager"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td>//div[@id='PermissionSelector']//a[@title="manager"]</td> <td></td> </tr> <tr> @@ -243,7 +233,7 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/Test_SNF_PRL_23/</td> + <td>http://localhost:8080/portal/Test_SNF_PRL_23/</td> <td></td> </tr> <tr> @@ -253,12 +243,12 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/</td> + <td>http://localhost:8080/portal/classic/</td> <td></td> </tr> <tr> @@ -288,7 +278,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this portal?</td> + <td>Are you sure you want to delete this portal?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_ChangeSiteConfigOFPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_ChangeSiteConfigOFPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_ChangeSiteConfigOFPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -243,12 +243,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[1]</td> + <td>//a[contains(@href,'Test_SNF_PRL_24')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[1]</td> + <td>//a[contains(@href,'Test_SNF_PRL_24')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> @@ -423,17 +423,17 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/Test_SNF_PRL_24/</td> + <td>http://localhost:8080/portal/Test_SNF_PRL_24/</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/</td> + <td>http://localhost:8080/portal/classic/</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_ChangeContainerInPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_ChangeContainerInPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_ChangeContainerInPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -243,12 +243,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=Test_SNF_PRL_25") and text()="Edit Layout"]</td> + <td>//a[contains(@href,'Test_SNF_PRL_25')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=Test_SNF_PRL_25") and text()="Edit Layout"]</td> + <td>//a[contains(@href,'Test_SNF_PRL_25')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> @@ -418,8 +418,8 @@ </tr> <tr> <td>dragAndDropToObject</td> - <td>//div/div/div[2]/div/div[2]/div/div</td> - <td>//div[4]/div/div[2]/div/div[2]/div</td> + <td>//div[@title="Hold this area to drag this container"]</td> + <td>//div[contains(text(),'Navigation Portlet')]</td> </tr> <tr> <td>echo</td> @@ -438,12 +438,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[3]/div/div/div[1]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td>link=Switch View Mode</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[3]/div/div/div[1]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td>link=Switch View Mode</td> <td></td> </tr> <tr> @@ -493,12 +493,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> @@ -523,12 +523,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=Test_SNF_PRL_25") and text()="Delete"]</td> + <td>//a[contains(@href,'Test_SNF_PRL_25')]/following-sibling::a[text()='Delete']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=Test_SNF_PRL_25") and text()="Delete"]</td> + <td>//a[contains(@href,'Test_SNF_PRL_25')]/following-sibling::a[text()='Delete']</td> <td></td> </tr> <tr> @@ -561,21 +561,6 @@ <td>link=Sign out</td> <td></td> </tr> -<tr> - <td>verifyElementPresent</td> - <td>//div/div/div[2]/div/div[2]/div/div</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[4]/div/div[2]/div/div[2]/div/div</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[4]/div/div[2]/div/div[2]/div/div</td> - <td></td> -</tr> </tbody></table> </body> </html> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -248,12 +248,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=Test_SNF_PRL_26") and text()="Edit Layout"]</td> + <td>//a[contains(@href,'Test_SNF_PRL_26')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=Test_SNF_PRL_26") and text()="Edit Layout"]</td> + <td>//a[contains(@href,'Test_SNF_PRL_26')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> @@ -298,6 +298,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/div[1]/div[1]</td> <td></td> </tr> @@ -378,12 +388,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> @@ -472,33 +482,33 @@ <td></td> </tr> <tr> - <td>echo</td> - <td>-- Delete application --</td> + <td>waitForElementPresent</td> + <td>link=Switch View Mode</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@class='PortletIcon AcrobatFile']</td> + <td>click</td> + <td>link=Switch View Mode</td> <td></td> </tr> <tr> - <td>mouseOver</td> - <td>//div[@class='PortletIcon AcrobatFile']</td> + <td>echo</td> + <td>-- Delete application --</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[text()='Test_SNF_PRL_26']/ancestor::div/a[@title='Delete Portlet']</td> + <td>//div[@class='PortletIcon AcrobatFile']</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//div[text()='Test_SNF_PRL_26']/ancestor::div/a[@title='Delete Portlet']</td> + <td>//div[@class='PortletIcon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[text()='Test_SNF_PRL_26']/ancestor::div/a[@title='Delete Portlet']</td> + <td>//div[4]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> <td></td> </tr> <tr> @@ -528,12 +538,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=Test_SNF_PRL_26") and text()="Delete"]</td> + <td>//a[contains(@href,'Test_SNF_PRL_26')]/following-sibling::a[text()='Delete']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=Test_SNF_PRL_26") and text()="Delete"]</td> + <td>//a[contains(@href,'Test_SNF_PRL_26')]/following-sibling::a[text()='Delete']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_AddApplicationIntoContainerInLayoutOfPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_AddApplicationIntoContainerInLayoutOfPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_AddApplicationIntoContainerInLayoutOfPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=classic") and text()="Edit Layout"]</td> + <td>//a[contains(@href,'classic')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=classic") and text()="Edit Layout"]</td> + <td>//a[contains(@href,'classic')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> @@ -153,6 +153,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_EditPortalConfig.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_EditPortalConfig.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_EditPortalConfig.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -273,12 +273,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"Test_SNF_PRL_28") and text()="Edit Portal's Config"]</td> + <td>//a[contains(@href,'Test_SNF_PRL_28') and contains(text(),'Edit Portal')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"Test_SNF_PRL_28") and text()="Edit Portal's Config"]</td> + <td>//a[contains(@href,'Test_SNF_PRL_28') and contains(text(),'Edit Portal')]</td> <td></td> </tr> <tr> @@ -398,7 +398,7 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/Test_SNF_PRL_28/</td> + <td>http://localhost:8080/portal/Test_SNF_PRL_28/</td> <td></td> </tr> <tr> @@ -408,7 +408,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> @@ -423,12 +423,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=Test_SNF_PRL_28") and text()="Delete"]</td> + <td>//a[contains(@href,'Test_SNF_PRL_28')]/following-sibling::a[text()='Delete']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=Test_SNF_PRL_28") and text()="Delete"]</td> + <td>//a[contains(@href,'Test_SNF_PRL_28')]/following-sibling::a[text()='Delete']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//a[@title='Up Level']</td> <td></td> </tr> <tr> @@ -98,12 +98,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -128,17 +128,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>open</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_29</td> + <td>http://localhost:8080/portal/classic/Test_SNF_PRL_29</td> <td></td> </tr> <tr> @@ -158,12 +158,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=classic") and text()="Edit Navigation"]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"objectId=classic") and text()="Edit Navigation"]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> @@ -248,12 +248,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -293,12 +293,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//a[@title='Up Level']</td> <td></td> </tr> <tr> @@ -98,12 +98,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -138,7 +138,7 @@ </tr> <tr> <td>open</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_30</td> + <td>http://localhost:8080/portal/classic/Test_SNF_PRL_30</td> <td></td> </tr> <tr> @@ -243,6 +243,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> </tr> @@ -328,12 +338,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> @@ -387,6 +397,11 @@ <td></td> </tr> <tr> + <td>mouseOver</td> + <td>//div[@title="Hold this area to drag this portlet"]</td> + <td></td> +</tr> +<tr> <td>waitForTextPresent</td> <td>Test_SNF_PRL_30</td> <td></td> @@ -528,12 +543,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[8]/div/a</td> + <td>css=div.LastNode.Node > div.NullItemIcon > a.NodeIcon.DefaultPageIcon</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[8]/div/a</td> + <td>css=div.LastNode.Node > div.NullItemIcon > a.NodeIcon.DefaultPageIcon</td> <td></td> </tr> <tr> @@ -583,12 +598,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Pages Manager</td> + <td>link=Page Management</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Pages Manager</td> + <td>link=Page Management</td> <td></td> </tr> <tr> @@ -648,12 +663,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"classic") and text()="Edit Navigation"]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"classic") and text()="Edit Navigation"]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> @@ -213,12 +213,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"classic") and text()="Edit Navigation"]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"classic") and text()="Edit Navigation"]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> @@ -288,8 +288,8 @@ </tr> <tr> <td>type</td> - <td>pageTitle</td> - <td>Page</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> + <td>Group Navigation</td> </tr> <tr> <td>waitForElementPresent</td> @@ -368,12 +368,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"classic") and text()="Edit Navigation"]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,"classic") and text()="Edit Navigation"]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -123,12 +123,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/input[1]</td> - <td></td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> + <td>Group Navigation</td> </tr> <tr> <td>type</td> - <td>//form[@id='UIPageSearchForm']/div[2]/input[1]</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> <td>Group Navigation</td> </tr> <tr> @@ -143,6 +143,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>//a[@title='Quick Search']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//a[@title='Quick Search']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//img[@title='Select Page']</td> <td></td> </tr> @@ -242,7 +252,7 @@ <td></td> </tr> <tr> - <td>mouseOver</td> + <td>click</td> <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[8]/div/a</td> <td></td> </tr> @@ -253,12 +263,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/a</td> + <td>link=Cut Node</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/a</td> + <td>link=Cut Node</td> <td></td> </tr> <tr> @@ -313,12 +323,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[6]/a</td> + <td>link=Clone Node</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[6]/a</td> + <td>link=Clone Node</td> <td></td> </tr> <tr> @@ -447,13 +457,18 @@ <td></td> </tr> <tr> + <td>click</td> + <td>css=a.NodeIcon.DefaultPageIcon</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_32']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic</td> + <td>/portal/classic</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -123,16 +123,26 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>pageTitle</td> - <td></td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> + <td>Community Management</td> </tr> <tr> <td>type</td> - <td>pageTitle</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> <td>Community Management</td> </tr> <tr> <td>waitForElementPresent</td> + <td>name=searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>name=searchOption</td> + <td>label=group</td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//a[@title='Quick Search']</td> <td></td> </tr> @@ -218,12 +228,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[8]/div/a</td> + <td>//a[@title='Test_SNF_PRL_33']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[8]/div/a</td> + <td>//a[@title='Test_SNF_PRL_33']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic</td> + <td>/portal/classic</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -122,19 +122,24 @@ <td></td> </tr> <tr> - <td>waitForText</td> - <td>link=Test_SNF_PRL_34</td> - <td>Test_SNF_PRL_34</td> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> + <td>Community Management</td> </tr> <tr> + <td>type</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> + <td>Community Management</td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>pageTitle</td> + <td>name=searchOption</td> <td></td> </tr> <tr> - <td>type</td> - <td>pageTitle</td> - <td>Community Management</td> + <td>select</td> + <td>name=searchOption</td> + <td>label=group</td> </tr> <tr> <td>waitForElementPresent</td> @@ -522,8 +527,8 @@ <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td> + <td>open</td> + <td>http://localhost:8080/portal/classic/Test_SNF_PRL_34</td> <td></td> </tr> <tr> @@ -557,11 +562,6 @@ <td></td> </tr> <tr> - <td>pause</td> - <td>10000</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>xpath=//a[@title='Test_SNF_PRL_34']</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic</td> + <td>/portal/classic</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -313,6 +313,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/div[1]/div[1]</td> <td>UIPortalApplication</td> </tr> @@ -388,17 +398,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[@class="PortletIcon PortletIcon"]</td> - <td>Calculator</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div[2]/div/a</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div[2]/div/a</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> @@ -568,17 +578,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> + <td>//div[text()='Test_SNF_PRL_35']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_35']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_35']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -588,7 +598,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure you want to delete this portlet?</td> + <td>Are you sure to delete this portlet?</td> <td></td> </tr> <tr> @@ -623,7 +633,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td> + <td>//div[3]/div/div/div/div/div/div/a</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -372,6 +372,11 @@ <td></td> </tr> <tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_37_ManageNavigationOfGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_37_ManageNavigationOfGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_37_ManageNavigationOfGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -38,7 +38,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -88,7 +88,7 @@ </tr> <tr> <td>mouseOver</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Edit Properties</td> + <td>//td/div[text()='Executive Board']/ancestor::tr/td/a[text()='Edit Properties']</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Edit Properties</td> + <td>//td/div[text()='Executive Board']/ancestor::tr/td/a[text()='Edit Properties']</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageNavigationForm']/div[2]/div/div/a</td> + <td>link=Save</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageNavigationForm']/div[2]/div/div/a</td> + <td>link=Save</td> <td></td> </tr> <tr> @@ -138,12 +138,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//li[2]/ul/li/a</td> + <td>link=New Staff</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//li[2]/ul/li[2]/a</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -158,12 +158,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//table[2]/tbody/tr/td[3]/a[2]</td> + <td>//td/div[text()='Executive Board']/ancestor::tr/td/a[text()='Edit Properties']</td> <td></td> </tr> <tr> <td>click</td> - <td>//table[2]/tbody/tr/td[3]/a[2]</td> + <td>//td/div[text()='Executive Board']/ancestor::tr/td/a[text()='Edit Properties']</td> <td></td> </tr> <tr> @@ -173,12 +173,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageNavigationForm']/div[2]/div/div/a</td> + <td>link=Save</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageNavigationForm']/div[2]/div/div/a</td> + <td>link=Save</td> <td></td> </tr> <tr> @@ -188,12 +188,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//li[4]/ul/li/a</td> + <td>link=New Staff</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//li[4]/ul/li[2]/a</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -133,12 +133,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]//a[@title='Finish']</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]//a[@title='Finish']</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -162,13 +162,18 @@ <td></td> </tr> <tr> + <td>verifyTextPresent</td> + <td>Administrators</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td> + <td>//td/div[text()='Administrators']/ancestor::tr/td/a[text()='Edit Navigation']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td> + <td>//td/div[text()='Administrators']/ancestor::tr/td/a[text()='Edit Navigation']</td> <td></td> </tr> <tr> @@ -213,7 +218,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure you want to delete this node?</td> + <td>Are you sure to delete this node?</td> <td></td> </tr> <tr> @@ -258,12 +263,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -288,7 +293,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Do you want to delete this page?</td> + <td>Are you sure to delete this page?</td> <td></td> </tr> <tr> @@ -303,12 +308,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -133,12 +133,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -248,6 +248,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> </tr> @@ -483,7 +493,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure you want to delete this Container?</td> + <td>Are you sure to delete this Container?</td> <td></td> </tr> <tr> @@ -518,7 +528,7 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/organization/Test_SNF_PRL_40</td> + <td>http://localhost:8080/portal/groups/:organization:management:executive-bo...</td> <td></td> </tr> <tr> @@ -543,22 +553,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//table[2]/tbody/tr/td[3]/a</td> + <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_SNF_PRL_40']</td> <td></td> </tr> <tr> <td>click</td> - <td>//table[2]/tbody/tr/td[3]/a</td> + <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_SNF_PRL_40']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_SNF_PRL_40']</td> + <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_SNF_PRL_40']</td> <td></td> </tr> <tr> <td>mouseDownRight</td> - <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_SNF_PRL_40']</td> + <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_SNF_PRL_40']</td> <td></td> </tr> <tr> @@ -578,7 +588,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure you want to delete this node?</td> + <td>Are you sure to delete this node?</td> <td></td> </tr> <tr> @@ -598,7 +608,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Pages Manager</td> + <td>link=Page Management</td> <td></td> </tr> <tr> @@ -618,12 +628,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -663,12 +673,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,12 +48,12 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -73,12 +73,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -133,17 +133,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>open</td> - <td>http://localhost:8080/portal/private/classic/administration/Test_SNF_PRL_41</td> + <td>http://localhost:8080/portal/classic/Test_SNF_PRL_41</td> <td></td> </tr> <tr> @@ -308,13 +308,13 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> - <td></td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> + <td><br /></td> </tr> <tr> <td>waitForElementPresent</td> @@ -338,13 +338,13 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td> - <td>Edit Navigation</td> + <td>//td/div[text()='Administrators']/ancestor::tr/td/a[text()='Edit Navigation']</td> + <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td> - <td>Edit Navigation</td> + <td>//td/div[text()='Administrators']/ancestor::tr/td/a[text()='Edit Navigation']</td> + <td></td> </tr> <tr> <td>echo</td> @@ -398,13 +398,13 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Pages Manager</td> + <td>link=Page Management</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> <td>pageTitle</td> - <td>Test_SNF_PRL_41</td> + <td></td> </tr> <tr> <td>type</td> @@ -412,13 +412,18 @@ <td>Test_SNF_PRL_41</td> </tr> <tr> + <td>select</td> + <td>name=searchOption</td> + <td>label=group</td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -458,16 +463,91 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> + <td>echo</td> + <td>- Return to default skin -</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Click Edit layout --</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Click Site's config from edit inline composer--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Site's Config</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Site's Config</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Make change something --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>skin</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>skin</td> + <td>label=Default</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Finish change in Site config's portal --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -73,12 +73,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -133,17 +133,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/administration/Test_SNF_PRL_42</td> + <td>http://localhost:8080/portal/groups/:platform:administrators/administrati...</td> <td></td> </tr> <tr> @@ -168,12 +168,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[3]/div/div/div[1]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td>link=Switch View Mode</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[3]/div/div/div[1]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td>link=Switch View Mode</td> <td></td> </tr> <tr> @@ -203,12 +203,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIPortalComposerTab']//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIPortalComposerTab']//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> @@ -258,12 +258,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> + <td></td> +</tr> +<tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> @@ -289,7 +294,7 @@ <tr> <td>waitForElementPresent</td> <td>height</td> - <td>100px</td> + <td></td> </tr> <tr> <td>type</td> @@ -313,12 +318,12 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_42</td> + <td>css=div.DragControlArea</td> + <td></td> </tr> <tr> <td>dragAndDropToObject</td> - <td>//div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div</td> + <td>css=div.DragControlArea</td> <td>//div[@class='LAYOUT-PORTAL LAYOUT-BLOCK']</td> </tr> <tr> @@ -353,17 +358,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_42</td> + <td>//div[text()='Test_SNF_PRL_42']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_42']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_42']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -378,12 +383,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -403,12 +408,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> + <td>link=Edit Navigation</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> + <td>link=Edit Navigation</td> <td></td> </tr> <tr> @@ -468,32 +473,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>searchTerm</td> + <td>pageTitle</td> <td></td> </tr> <tr> <td>type</td> - <td>searchTerm</td> + <td>pageTitle</td> <td>Test_SNF_PRL_42</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Title</td> + <td>name=searchOption</td> + <td>label=group</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -533,12 +533,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,12 +48,12 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -73,12 +73,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -133,17 +133,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/administration/Test_SNF_PRL_43</td> + <td>http://localhost:8080/portal/groups/:platform:administrators/administrati...</td> <td></td> </tr> <tr> @@ -203,6 +203,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/div[1]/div[1]</td> <td>UIPortalApplication</td> </tr> @@ -258,17 +268,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Calculator</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> @@ -288,22 +298,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Select Icon"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Select Icon"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> @@ -313,22 +323,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Decoration Themes"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Decoration Themes"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()="Pink Simple"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()="Pink Simple"]</td> <td></td> </tr> <tr> @@ -388,17 +398,12 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_43</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> + <td>//div[text()='Test_SNF_PRL_43']/preceding-sibling::div[@class='DragControlArea']</td> <td></td> </tr> <tr> <td>dragAndDropToObject</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> + <td>//div[text()='Test_SNF_PRL_43']/preceding-sibling::div[@class='DragControlArea']</td> <td>css=div[class='LAYOUT-BLOCK LAYOUT-PORTLET']</td> </tr> <tr> @@ -443,17 +448,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_43</td> + <td>//div[text()='Test_SNF_PRL_43']/following-sibling::a[@title='Delete Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_43']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_43']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -468,12 +473,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -493,13 +498,13 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> - <td>Edit Navigation</td> + <td>link=Edit Navigation</td> + <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> - <td>Edit Navigation</td> + <td>link=Edit Navigation</td> + <td></td> </tr> <tr> <td>echo</td> @@ -558,32 +563,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>searchTerm</td> + <td>pageTitle</td> <td></td> </tr> <tr> <td>type</td> - <td>searchTerm</td> + <td>pageTitle</td> <td>Test_SNF_PRL_43</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Title</td> + <td>name=searchOption</td> + <td>label=group</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -623,12 +623,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,12 +48,12 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -73,12 +73,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -133,17 +133,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/administration/Test_SNF_PRL_44</td> + <td>http://localhost:8080/portal/groups/:platform:administrators/administrati...</td> <td></td> </tr> <tr> @@ -203,12 +203,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> @@ -233,12 +233,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),"Applications")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),"Applications")]</td> <td></td> </tr> <tr> @@ -247,6 +247,11 @@ <td></td> </tr> <tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> @@ -293,22 +298,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div[2]/div/div[2]</td> - <td>Calculator</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -328,27 +328,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Container</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -368,12 +368,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalApplication']//a[@title="Finish"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalApplication']//a[@title="Finish"]</td> <td></td> </tr> <tr> @@ -393,13 +393,13 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td> - <td>Edit Navigation</td> + <td>//td/div[text()='Administrators']/ancestor::tr/td/a[text()='Edit Navigation']</td> + <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td> - <td>Edit Navigation</td> + <td>//td/div[text()='Administrators']/ancestor::tr/td/a[text()='Edit Navigation']</td> + <td></td> </tr> <tr> <td>echo</td> @@ -453,7 +453,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Pages Manager</td> + <td>link=Page Management</td> <td></td> </tr> <tr> @@ -478,12 +478,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -518,12 +518,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]//div[text()="Page Selector"]</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]//div[text()="Page Selector"]</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> @@ -137,33 +137,23 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/input</td> - <td></td> -</tr> -<tr> <td>type</td> - <td>//form[@id='UIPageSearchForm']/div[2]/input</td> - <td>New Account</td> + <td>//input[@id='pageTitle' and @value='Register']</td> + <td>Register</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>name=searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> <td>name=searchOption</td> - <td>label=group</td> + <td>label=portal</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -288,17 +278,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]//div[text()="Page Selector"]</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]//div[text()="Page Selector"]</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>echo</td> - <td>-- Choose new page for this node--</td> + <td>-- Select a page for ndoe--</td> <td></td> </tr> <tr> @@ -313,12 +303,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIRepeater']/table/tbody/tr[4]/td[5]/div/img</td> + <td>//tr[5]/td[5]/div/img</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIRepeater']/table/tbody/tr[4]/td[5]/div/img</td> + <td>//tr[5]/td[5]/div/img</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_46_MoreActionOnNodeInEditNavigationOfGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_46_MoreActionOnNodeInEditNavigationOfGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_46_MoreActionOnNodeInEditNavigationOfGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Edit Navigation</td> + <td>//td/div[text()='Executive Board']/ancestor::tr/td/a[text()='Edit Navigation']</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Edit Navigation</td> + <td>//td/div[text()='Executive Board']/ancestor::tr/td/a[text()='Edit Navigation']</td> <td></td> </tr> <tr> @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> @@ -153,22 +153,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//img[@title='Select Page']</td> + <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> <tr> <td>click</td> - <td>//img[@title='Select Page']</td> + <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> <tr> @@ -223,12 +223,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@title='Organization']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@title='Organization']</td> <td></td> </tr> <tr> @@ -242,13 +242,8 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='NavigationNodePopupMenu']/div/div[2]/div/div/div[7]/a</td> - <td></td> -</tr> -<tr> <td>click</td> - <td>//div[@id='NavigationNodePopupMenu']/div/div[2]/div/div/div[7]/a</td> + <td>//div[@id='NavigationNodePopupMenu']//a[contains(text(),'Paste Node')]</td> <td></td> </tr> <tr> @@ -258,17 +253,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[2]/div/div/div[3]/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[2]/div/div/div[3]/div/a</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@title='Test_SNF_PRL_46']</td> <td></td> </tr> <tr> @@ -278,12 +273,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/a</td> + <td>link=Cut Node</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/a</td> + <td>link=Cut Node</td> <td></td> </tr> <tr> @@ -293,12 +288,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@title='Organization']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@title='Organization']</td> <td></td> </tr> <tr> @@ -313,12 +308,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//html/body/div/div[2]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[4]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div[2]/div/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div[7]/a</td> + <td>//div[@id='NavigationNodePopupMenu']//a[contains(text(),'Paste Node')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//html/body/div/div[2]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[4]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div[2]/div/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div[7]/a</td> + <td>//div[@id='NavigationNodePopupMenu']//a[contains(text(),'Paste Node')]</td> <td></td> </tr> <tr> @@ -358,16 +353,26 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@class='LevelUpArrowIcon']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@class='LevelUpArrowIcon']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> + <td>//div[@id='UINavigationNodeSelector']//a[@class='LevelUpArrowIcon']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UINavigationNodeSelector']//a[@class='LevelUpArrowIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@class='HomeNode']</td> <td></td> </tr> @@ -378,12 +383,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Paste Node</td> + <td>//div[@id='NavigationNodePopupMenu']//a[contains(text(),'Paste Node')]</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Paste Node</td> + <td>//div[@id='UINavigationManagement']//a[contains(text(),'Paste Node')]</td> <td></td> </tr> <tr> @@ -392,13 +397,8 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> - <td></td> -</tr> -<tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>link=Test_SNF_PRL_46</td> <td></td> </tr> <tr> @@ -493,6 +493,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>css=a.NodeIcon.DefaultPageIcon</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>css=a.NodeIcon.DefaultPageIcon</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//a[@title='New Staff']</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_47_EditNodePagePropertiesForGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_47_EditNodePagePropertiesForGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_47_EditNodePagePropertiesForGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,15 +103,20 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> + <td>echo</td> + <td>-- Select a page for ndoe--</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Search and Select Page</td> <td></td> @@ -122,17 +127,37 @@ <td></td> </tr> <tr> + <td>type</td> + <td>//input[@id='pageTitle' and @value='Register']</td> + <td>Register</td> +</tr> +<tr> + <td>select</td> + <td>name=searchOption</td> + <td>label=portal</td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=Save</td> <td></td> </tr> @@ -163,12 +188,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[4]/div[2]/div/a</td> + <td>link=Test_SNF_PRL_47</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[4]/div[2]/div/a</td> + <td>link=Test_SNF_PRL_47</td> <td></td> </tr> <tr> @@ -208,12 +233,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_47']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_47']</td> <td></td> </tr> <tr> @@ -313,7 +338,7 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_47</td> + <td>http://localhost:8080/portal/groups/:platform:administrators/Test_SNF_PRL_47</td> <td></td> </tr> <tr> @@ -338,12 +363,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_47']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_47']</td> <td></td> </tr> <tr> @@ -438,7 +463,7 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_47</td> + <td>http://localhost:8080/portal/groups/:platform:administrators/Test_SNF_PRL_47</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,15 +103,20 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> + <td>echo</td> + <td>-- Select a page for ndoe--</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Search and Select Page</td> <td></td> @@ -122,43 +127,33 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> <td>type</td> - <td>searchTerm</td> - <td>New Account</td> + <td>//input[@id='pageTitle' and @value='Register']</td> + <td>Register</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Title</td> + <td>name=searchOption</td> + <td>label=portal</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//img[@title='Select Page']</td> <td></td> </tr> <tr> <td>click</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//img[@title='Select Page']</td> <td></td> </tr> <tr> @@ -193,12 +188,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[4]/div[2]/div/a</td> + <td>link=Test_SNF_PRL_48</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[4]/div[2]/div/a</td> + <td>link=Test_SNF_PRL_48</td> <td></td> </tr> <tr> @@ -238,12 +233,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_48']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_48']</td> <td></td> </tr> <tr> @@ -313,12 +308,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> @@ -368,17 +363,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> + <td></td> +</tr> +<tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> @@ -428,12 +428,12 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>css=div.DragControlArea</td> <td>Test_SNF_PRL_48</td> </tr> <tr> <td>dragAndDropToObject</td> - <td>//div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div</td> + <td>css=div.DragControlArea</td> <td>//a[@title='mix']</td> </tr> <tr> @@ -478,17 +478,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[@class="ContainerIcon"]</td> - <td>Test_SNF_PRL_48</td> + <td>//div[text()='Test_SNF_PRL_48']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_48']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_48']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -503,12 +503,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title="Finish"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title="Finish"]</td> <td></td> </tr> <tr> @@ -518,12 +518,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationManagement']/div[3]/table/tbody/tr/td[2]/div/div/div/div</td> + <td>link=Save</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationManagement']/div[3]/table/tbody/tr/td[2]/div/div/div/div</td> + <td>link=Save</td> <td></td> </tr> <tr> @@ -563,12 +563,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_48']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_48']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> @@ -127,43 +127,33 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> <td>type</td> - <td>searchTerm</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> <td>Community Management</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Title</td> + <td>name=searchOption</td> + <td>label=group</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//img[@title='Select Page']</td> <td></td> </tr> <tr> <td>click</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//img[@title='Select Page']</td> <td></td> </tr> <tr> @@ -197,13 +187,8 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[4]/div[2]/div/a</td> - <td></td> -</tr> -<tr> <td>clickAndWait</td> - <td>//div[4]/div[2]/div/a</td> + <td>link=Test_SNF_PRL_49</td> <td></td> </tr> <tr> @@ -243,12 +228,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_49']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_49']</td> <td></td> </tr> <tr> @@ -337,6 +322,11 @@ <td></td> </tr> <tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/div[1]/div[1]</td> <td>UIPortalApplication</td> @@ -393,17 +383,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td>Calculator</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> @@ -423,22 +413,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Select Icon"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Select Icon"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> @@ -448,22 +438,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Decoration Themes"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Decoration Themes"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()="Pink Simple"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()="Pink Simple"]</td> <td></td> </tr> <tr> @@ -523,8 +513,8 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_49</td> + <td>//div[text()='Test_SNF_PRL_49']/following-sibling::a[@title='Edit Portlet']</td> + <td></td> </tr> <tr> <td>waitForTextPresent</td> @@ -558,8 +548,8 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_49</td> + <td>//div[text()='Test_SNF_PRL_49']/following-sibling::a[@title='Edit Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -578,12 +568,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//td/div[2]/div/div/div/div</td> + <td>link=Switch View mode</td> <td></td> </tr> <tr> <td>click</td> - <td>//td/div[2]/div/div/div/div</td> + <td>link=Switch View mode</td> <td></td> </tr> <tr> @@ -653,17 +643,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_49</td> + <td>//div[text()='Test_SNF_PRL_49']/following-sibling::a[@title='Delete Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_49']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_49']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -678,12 +668,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title="Finish"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title="Finish"]</td> <td></td> </tr> <tr> @@ -743,12 +733,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_49']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_49']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> @@ -122,43 +122,33 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> <td>type</td> - <td>searchTerm</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> <td>Community Management</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Title</td> + <td>name=searchOption</td> + <td>label=group</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//img[@title='Select Page']</td> <td></td> </tr> <tr> <td>click</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//img[@title='Select Page']</td> <td></td> </tr> <tr> @@ -192,13 +182,8 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[4]/div[2]/div/a</td> - <td></td> -</tr> -<tr> <td>clickAndWait</td> - <td>//div[4]/div[2]/div/a</td> + <td>link=Test_SNF_PRL_50</td> <td></td> </tr> <tr> @@ -238,12 +223,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_50']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_50']</td> <td></td> </tr> <tr> @@ -287,16 +272,6 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/div[2]/div/div/div[1]</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/div[2]/div/div/div[1]</td> - <td></td> -</tr> -<tr> <td>waitForTextPresent</td> <td>User Management</td> <td></td> @@ -343,12 +318,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> @@ -373,12 +348,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),"Applications")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),"Applications")]</td> <td></td> </tr> <tr> @@ -388,6 +363,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> </tr> @@ -433,17 +418,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Calculator</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -463,27 +448,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Container</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -503,12 +488,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title="Finish"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title="Finish"]</td> <td></td> </tr> <tr> @@ -553,12 +538,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_50']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_50']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_51_ManageGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_51_ManageGadget.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_51_ManageGadget.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -158,17 +158,17 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>link=Gadgets</td> + <td>link=Gadget</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Gadgets</td> + <td>link=Gadget</td> <td></td> </tr> <tr> @@ -183,7 +183,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure you want to delete this gadget?</td> + <td>Are you sure to delete this gadget?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_52_ManageTab.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_52_ManageTab.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_52_ManageTab.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -68,27 +68,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/a</td> + <td>css=div.AddDashboard</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UITabPaneDashboard']/a</td> + <td>css=div.AddDashboard</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/input</td> - <td></td> -</tr> -<tr> <td>type</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/input</td> + <td>//input</td> <td>Test_SNF_PRL_52</td> </tr> <tr> <td>keyPress</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/input</td> + <td>//input</td> <td>\13</td> </tr> <tr> @@ -107,28 +102,23 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/span</td> - <td></td> -</tr> -<tr> <td>doubleClick</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/span</td> + <td>css=div.MiddleTab > span</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/input</td> + <td>//input</td> <td></td> </tr> <tr> <td>type</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/input</td> + <td>//input</td> <td>Test_SNF_PRL_52_edit</td> </tr> <tr> <td>keyPress</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/input</td> + <td>//input</td> <td>\13</td> </tr> <tr> @@ -142,33 +132,23 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/a</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>-- Delete tab--</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/a</td> + <td>clickAndWait</td> + <td>//div[2]/div/div/div/div/a/img</td> <td></td> </tr> <tr> - <td>click</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/a</td> - <td></td> -</tr> -<tr> <td>waitForConfirmationPresent</td> <td></td> <td></td> </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure you want to remove this dashboard?</td> + <td>Really want to remove this dashboard?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_53_DragAndDropGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_53_DragAndDropGadget.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_53_DragAndDropGadget.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_54_AddNewpageForUser.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_54_AddNewpageForUser.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_54_AddNewpageForUser.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>type</td> - <td>pageDisplayName</td> + <td>i18nizedLabel</td> <td>Test_SNF_PRL_54</td> </tr> <tr> @@ -93,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -123,116 +123,41 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_54</td> + <td>http://localhost:8080/portal/users/root/Test_SNF_PRL_54</td> <td></td> </tr> <tr> - <td>echo</td> - <td>-- Go to Page Management --</td> + <td>clickAndWait</td> + <td>link=Dashboard</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Page Management</td> + <td>//div[2]/div/div/div/div/a/img</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td>Test_SNF_PRL_54</td> -</tr> -<tr> - <td>type</td> - <td>searchTerm</td> - <td>Test_SNF_PRL_54</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> - <td>select</td> - <td>searchOption</td> - <td>label=Title</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-- Delete page --</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//img[@title='Delete Page']</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//img[@title='Delete Page']</td> - <td></td> -</tr> -<tr> <td>waitForConfirmationPresent</td> <td></td> <td></td> </tr> <tr> <td>assertConfirmation</td> - <td>Do you want to delete this page?</td> + <td>Really want to remove this dashboard?</td> <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> - <td></td> -</tr> -<tr> - <td>waitForTextNotPresent</td> - <td>Test_SNF_PRL_54</td> - <td></td> -</tr> -<tr> - <td>verifyTextNotPresent</td> - <td>Test_SNF_PRL_54</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_55_EditPageForUser.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_55_EditPageForUser.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_55_EditPageForUser.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>type</td> - <td>pageDisplayName</td> + <td>i18nizedLabel</td> <td>Test_SNF_PRL_55</td> </tr> <tr> @@ -93,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -123,17 +123,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_55</td> + <td>http://localhost:8080/portal/users/root/Test_SNF_PRL_55</td> <td></td> </tr> <tr> @@ -193,12 +193,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> @@ -223,12 +223,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),"Applications")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),"Applications")]</td> <td></td> </tr> <tr> @@ -238,6 +238,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> </tr> @@ -283,17 +293,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Calculator</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> @@ -313,22 +323,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Select Icon"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Select Icon"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> @@ -338,22 +348,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Decoration Themes"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Decoration Themes"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()="Pink Simple"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()="Pink Simple"]</td> <td></td> </tr> <tr> @@ -413,17 +423,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Calculator</td> + <td>//div[text()='Test_SNF_PRL_55']/following-sibling::a[@title='Delete Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_55']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_55']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -443,27 +453,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Container</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -483,12 +493,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -498,7 +508,7 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_55</td> + <td>http://localhost:8080/portal/users/root/Test_SNF_PRL_55</td> <td></td> </tr> <tr> @@ -527,72 +537,7 @@ <td></td> </tr> <tr> - <td>echo</td> - <td>-- Go to Page Management --</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> - <td>link=Page Management</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>link=Page Management</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>searchTerm</td> - <td>Test_SNF_PRL_55</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> - <td>select</td> - <td>searchOption</td> - <td>label=Title</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_56_ChangeSiteConfigWhenEditLayoutForUserPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_56_ChangeSiteConfigWhenEditLayoutForUserPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_56_ChangeSiteConfigWhenEditLayoutForUserPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -62,12 +62,12 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>click</td> <td>link=Add New Page</td> <td></td> </tr> <tr> - <td>click</td> + <td>waitForElementPresent</td> <td>link=Add New Page</td> <td></td> </tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>type</td> - <td>pageDisplayName</td> + <td>i18nizedLabel</td> <td>Test_SNF_PRL_56</td> </tr> <tr> @@ -93,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -123,17 +123,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_56</td> + <td>http://localhost:8080/portal/users/root/Test_SNF_PRL_56</td> <td></td> </tr> <tr> @@ -197,8 +197,13 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[text()='Properties']</td> + <td></td> +</tr> +<tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Properties']</td> <td></td> </tr> <tr> @@ -218,20 +223,30 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title="Finish"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title="Finish"]</td> <td></td> </tr> <tr> <td>echo</td> + <td>- https://issues.jboss.org/browse/GTNPORTAL-2070 -</td> + <td></td> +</tr> +<tr> + <td>echo</td> <td>-- Delete new tab</td> <td></td> </tr> <tr> + <td>clickAndWait</td> + <td>link=Dashboard</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='UITabPaneDashboard']/div/div/div/div/div/div[2]/div/div/div/div/a/img</td> <td></td> @@ -252,7 +267,102 @@ <td></td> </tr> <tr> + <td>echo</td> + <td>-- Edit Layout --</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Click Site's config from edit inline composer--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Site's Config</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Site's Config</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Make change something --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>locale</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>locale</td> + <td>label=English</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>skin</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>skin</td> + <td>label=Default</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Properties--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[text()='Properties']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[text()='Properties']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Finish change in Site config's portal --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']//a[@title="Finish"]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPortalComposer']//a[@title="Finish"]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>type</td> - <td>pageDisplayName</td> + <td>i18nizedLabel</td> <td>Test_SNF_PRL_57</td> </tr> <tr> @@ -93,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -123,12 +123,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -198,12 +198,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> @@ -253,12 +253,12 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> @@ -308,8 +308,8 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_57</td> + <td>//div[text()='Test_SNF_PRL_57']/following-sibling::a[@title='Edit Container']</td> + <td></td> </tr> <tr> <td>dragAndDropToObject</td> @@ -348,17 +348,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_57</td> + <td>//div[text()='Test_SNF_PRL_57']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_57']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_57']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -373,12 +373,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -93,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -123,17 +123,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>open</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_58</td> + <td>http://localhost:8080/portal/users/root/Test_SNF_PRL_58</td> <td></td> </tr> <tr> @@ -193,6 +193,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/div[1]/div[1]</td> <td>UIPortalApplication</td> </tr> @@ -258,17 +268,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Calculator</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> @@ -288,22 +298,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Select Icon"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Select Icon"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> @@ -313,22 +323,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Decoration Themes"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()="Decoration Themes"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()="Pink Simple"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()="Pink Simple"]</td> <td></td> </tr> <tr> @@ -388,13 +398,13 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_58</td> + <td>//div[text()='Test_SNF_PRL_58']/preceding-sibling::div[@class='DragControlArea']</td> + <td></td> </tr> <tr> <td>dragAndDropToObject</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> - <td>//div[@class='LPortletLayoutDecorator']</td> + <td>//div[text()='Test_SNF_PRL_58']/preceding-sibling::div[@class='DragControlArea']</td> + <td>//div[@class='LAYOUT-BLOCK LAYOUT-PORTLET']</td> </tr> <tr> <td>echo</td> @@ -438,17 +448,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>//div[text()='Test_SNF_PRL_58']/following-sibling::a[@title='Delete Portlet']</td> <td>Test_SNF_PRL_58</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_58']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_58']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -463,12 +473,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -93,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -123,17 +123,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_59</td> + <td>http://localhost:8080/portal/users/root/Test_SNF_PRL_59</td> <td></td> </tr> <tr> @@ -193,12 +193,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> @@ -223,12 +223,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),"Applications")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),"Applications")]</td> <td></td> </tr> <tr> @@ -238,6 +238,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> </tr> @@ -283,17 +293,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Calculator</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -313,27 +323,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),"Containers")]</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Container</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -353,12 +363,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -78,12 +78,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -113,47 +113,32 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>echo</td> - <td>-- Search by Owner typr</td> + <td>-- Search by Owner type is portal-</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>searchTerm</td> - <td>portal</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Owner type</td> + <td>name=searchOption</td> + <td>label=portal</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -163,92 +148,62 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>searchTerm</td> + <td>pageTitle</td> <td></td> </tr> <tr> <td>type</td> - <td>searchTerm</td> + <td>pageTitle</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>echo</td> - <td>-- Search by Owner id --</td> + <td>-- Search by Owner type is group --</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>searchTerm</td> - <td>classic</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Owner id</td> + <td>name=searchOption</td> + <td>label=group</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>Home Page</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>Home Page</td> - <td></td> -</tr> -<tr> <td>echo</td> - <td>-- Return to page list --</td> + <td>-- Return to Search by Owner type is portal-</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> + <td>select</td> + <td>name=searchOption</td> + <td>label=portal</td> </tr> <tr> - <td>type</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -208,12 +208,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -263,12 +263,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -317,13 +317,18 @@ <td></td> </tr> <tr> + <td>echo</td> + <td>-- Close popup--</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -222,13 +222,18 @@ <td>Test_SNF_PRL_62</td> </tr> <tr> + <td>select</td> + <td>name=searchOption</td> + <td>label=group</td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -278,12 +283,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -308,12 +313,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -353,12 +358,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,"action=Close")]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_64_ChangeLanguageInPrivateMode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_64_ChangeLanguageInPrivateMode.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_64_ChangeLanguageInPrivateMode.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_65_ChangeSkin.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_65_ChangeSkin.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_65_ChangeSkin.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> @@ -183,12 +183,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIAccountForm']/div[3]/div[2]/a[1]</td> + <td>link=Save</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIAccountForm']/div[3]/div[2]/a[1]</td> + <td>link=Save</td> <td></td> </tr> <tr> @@ -138,12 +138,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div[3]/div/div[2]/div/div/div/div/div/div[3]/div</td> + <td>//div[@id="UIAccountPortlet"]//a[text()="OK"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div[3]/div/div[2]/div/div/div/div/div/div[3]/div</td> + <td>//div[@id="UIAccountPortlet"]//a[text()="OK"]</td> <td></td> </tr> <tr> @@ -183,7 +183,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -243,40 +243,35 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIAccountChangePass']/div[2]/div/div/a[1]</td> + <td>//div[@class='UIForm UIAccountChangePass']//a[text()="Save"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIAccountChangePass']/div[2]/div/div/a[1]</td> + <td>//div[@class='UIForm UIAccountChangePass']//a[text()="Save"]</td> <td></td> </tr> <tr> <td>waitForTextPresent</td> - <td>The password has been changed.</td> + <td>The password has been changed. </td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>The password has been changed.</td> + <td>The password has been changed. </td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Close</td> - <td></td> -</tr> -<tr> <td>click</td> <td>link=Close</td> <td></td> @@ -318,7 +313,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -368,12 +363,12 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -393,12 +388,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UISearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UISearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr>

12 years, 10 months

1
0
0 / 0

gatein SVN: r7317 - portal/branches.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2011-09-06 22:33:38 -0400 (Tue, 06 Sep 2011) New Revision: 7317 Added: portal/branches/xss/ Log: Create a branch for XSS issues

12 years, 10 months

1
0
0 / 0

gatein SVN: r7316 - epp/portal/branches/EPP_5_1_0_GA_JBEPP-1114/webui/core/src/main/java/org/exoplatform/webui/form/validator.

by do-not-reply＠jboss.org

Author: tkobayas(a)redhat.com Date: 2011-09-06 21:04:35 -0400 (Tue, 06 Sep 2011) New Revision: 7316 Modified: epp/portal/branches/EPP_5_1_0_GA_JBEPP-1114/webui/core/src/main/java/org/exoplatform/webui/form/validator/DateTimeValidator.java Log: JBEPP-1114 DateTimeValidator has superflous code that breaks localized date timestamps Modified: epp/portal/branches/EPP_5_1_0_GA_JBEPP-1114/webui/core/src/main/java/org/exoplatform/webui/form/validator/DateTimeValidator.java =================================================================== --- epp/portal/branches/EPP_5_1_0_GA_JBEPP-1114/webui/core/src/main/java/org/exoplatform/webui/form/validator/DateTimeValidator.java 2011-09-06 20:55:01 UTC (rev 7315) +++ epp/portal/branches/EPP_5_1_0_GA_JBEPP-1114/webui/core/src/main/java/org/exoplatform/webui/form/validator/DateTimeValidator.java 2011-09-07 01:04:35 UTC (rev 7316) @@ -28,9 +28,6 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; /** * Created by The eXo Platform SARL @@ -45,9 +42,6 @@ { static private final String SPLIT_REGEX = "/|\\s+|:"; - static private final String DATETIME_REGEX = - "^(\\d{1,2}\\/\\d{1,2}\\/\\d{1,4})\\s*(\\s+\\d{1,2}:\\d{1,2}:\\d{1,2})?$"; - public void validate(UIFormInput uiInput) throws Exception { if (uiInput.getValue() == null || ((String)uiInput.getValue()).trim().length() == 0) @@ -79,24 +73,6 @@ { throw new MessageException(new ApplicationMessage("DateTimeValidator.msg.Invalid-input", args, ApplicationMessage.WARNING)); } - if (s.matches(DATETIME_REGEX) && isValidDateTime(s)) - return; - - throw new MessageException(new ApplicationMessage("DateTimeValidator.msg.Invalid-input", args, ApplicationMessage.WARNING)); } - private boolean isValidDateTime(String dateTime) - { - String[] arr = dateTime.split(SPLIT_REGEX, 7); - int valid = Integer.parseInt(arr[0]); - if (valid < 1 || valid > 12) - return false; - Calendar date = new GregorianCalendar(Integer.parseInt(arr[2]), valid - 1, 1); - if (Integer.parseInt(arr[1]) > date.getActualMaximum(Calendar.DAY_OF_MONTH)) - return false; - if (arr.length > 3 - && (Integer.parseInt(arr[3]) > 23 || Integer.parseInt(arr[4]) > 59 || Integer.parseInt(arr[5]) > 59)) - return false; - return true; - } }

12 years, 10 months

1
0
0 / 0

gatein SVN: r7315 - in components/wsrp/branches/clustering: consumer/src/main/java/org/gatein/wsrp/consumer/handlers and 13 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-09-06 16:55:01 -0400 (Tue, 06 Sep 2011) New Revision: 7315 Added: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/session/ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/session/InMemorySessionRegistry.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/session/SessionRegistry.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/spi/ConsumerRegistrySPI.java Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/SessionHandler.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerRegistry.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/spi/WSRPConsumerSPI.java components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/RegistrationInfoTestCase.java components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/protocol/v1/WSRP1ConsumerBaseTest.java components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/protocol/v2/WSRP2ConsumerBaseTest.java components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/support/MockWSRPConsumer.java components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/JCRMigrationService.java components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/mapping/ExportInfoMapping.java components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/BaseMapping.java Log: - Moved session state from SessionHandler to ConsumerRegistry and introduced SessionRegistry interface so that session information can be more easily distributed. - Introduced ConsumerRegistrySPI interface to gather SPI-related behavior and moved some methods from ConsumerRegistry to ConsumerRegistrySPI. - ProducerInfo now needs to have a ConsumerRegistrySPI instance set to be properly instantiated (instead of relying on setter). - WSRPConsumerImpl now uses the information held by the ConsumerRegistrySPI instance it gets from its ProducerInfo to retrieve MigrationService and SessionRegistry instances. Should lighten the objects up a little in addition to making them easier to distribute. - BaseMapping now needs to be parametrized by a second type representing an optional registry object to be used in toModel method so that ProducerInfo can properly get a ConsumerRegistry instance on creation. - Adapted test cases. Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, Red Hat Middleware, LLC, and individual * contributors as indicated by the @authors tag. See the * copyright.txt in the distribution for a full listing of * individual contributors. @@ -38,7 +38,7 @@ import org.gatein.wsrp.consumer.portlet.WSRPPortlet; import org.gatein.wsrp.consumer.portlet.info.WSRPEventInfo; import org.gatein.wsrp.consumer.portlet.info.WSRPPortletInfo; -import org.gatein.wsrp.consumer.registry.ConsumerRegistry; +import org.gatein.wsrp.consumer.spi.ConsumerRegistrySPI; import org.gatein.wsrp.servlet.UserAccess; import org.oasis.wsrp.v2.CookieProtocol; import org.oasis.wsrp.v2.EventDescription; @@ -124,7 +124,7 @@ private boolean isModifyRegistrationRequired; - private ConsumerRegistry registry; + private final ConsumerRegistrySPI registry; private static final String ERASED_LOCAL_REGISTRATION_INFORMATION = "Erased local registration information!"; private transient RegistrationInfo expectedRegistrationInfo; @@ -142,10 +142,11 @@ protected org.oasis.wsrp.v1.ResourceList resourceList;*/ - public ProducerInfo() + public ProducerInfo(ConsumerRegistrySPI consumerRegistry) { persistentEndpointInfo = new EndpointConfigurationInfo(); persistentRegistrationInfo = RegistrationInfo.createUndeterminedRegistration(this); + this.registry = consumerRegistry; } @Override @@ -193,16 +194,11 @@ return sb.toString(); } - public ConsumerRegistry getRegistry() + public ConsumerRegistrySPI getRegistry() { return registry; } - public void setRegistry(ConsumerRegistry registry) - { - this.registry = registry; - } - public String getKey() { return key; Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -51,12 +51,13 @@ import org.gatein.wsrp.consumer.handlers.InvocationDispatcher; import org.gatein.wsrp.consumer.handlers.ProducerSessionInformation; import org.gatein.wsrp.consumer.handlers.SessionHandler; +import org.gatein.wsrp.consumer.handlers.session.SessionRegistry; import org.gatein.wsrp.consumer.migration.ExportInfo; import org.gatein.wsrp.consumer.migration.ImportInfo; -import org.gatein.wsrp.consumer.migration.InMemoryMigrationService; import org.gatein.wsrp.consumer.migration.MigrationService; import org.gatein.wsrp.consumer.portlet.WSRPPortlet; import org.gatein.wsrp.consumer.portlet.info.WSRPPortletInfo; +import org.gatein.wsrp.consumer.spi.ConsumerRegistrySPI; import org.gatein.wsrp.consumer.spi.WSRPConsumerSPI; import org.gatein.wsrp.services.MarkupService; import org.gatein.wsrp.services.PortletManagementService; @@ -95,7 +96,6 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.SortedMap; @@ -115,8 +115,6 @@ private ProducerInfo producerInfo; - private transient MigrationService migrationService; - /** A registration data element used to indicate when no registration was required by the producer */ private final static RegistrationData REGISTRATION_NOT_NEEDED = WSRPTypeFactory.createDefaultRegistrationData(); @@ -143,20 +141,13 @@ private Set supportedUserScopes = WSRP_DEFAULT_USER_SCOPE; // todo: make it possible to support different user scopes private transient boolean started; - public WSRPConsumerImpl() + public WSRPConsumerImpl(ProducerInfo info) { - this(new ProducerInfo(), new InMemoryMigrationService()); - } - - public WSRPConsumerImpl(ProducerInfo info, MigrationService migrationService) - { ParameterValidation.throwIllegalArgExceptionIfNull(info, "ProducerInfo"); producerInfo = info; sessionHandler = new SessionHandler(this); dispatcher = new InvocationDispatcher(this); - - this.migrationService = migrationService; } public ProducerInfo getProducerInfo() @@ -836,7 +827,7 @@ } ExportInfo exportInfo = new ExportInfo(System.currentTimeMillis(), errorCodeToHandle, handleToState, exportContextHolder.value); - migrationService.add(exportInfo); + getConsumerRegistry().getMigrationService().add(exportInfo); return exportInfo; } catch (OperationNotSupported operationNotSupported) @@ -896,6 +887,11 @@ } } + private ConsumerRegistrySPI getConsumerRegistry() + { + return producerInfo.getRegistry(); + } + public void releaseExport(ExportInfo exportInfo) throws PortletInvokerException { ParameterValidation.throwIllegalArgExceptionIfNull(exportInfo, "ExportInfo to release"); @@ -1023,11 +1019,16 @@ public MigrationService getMigrationService() { - return migrationService; + return getConsumerRegistry().getMigrationService(); } public Version getWSRPVersion() { return producerInfo.getEndpointConfigurationInfo().getWSRPVersion(); } + + public SessionRegistry getSessionRegistry() + { + return getConsumerRegistry().getSessionRegistry(); + } } Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/SessionHandler.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/SessionHandler.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/SessionHandler.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, Red Hat Middleware, LLC, and individual * contributors as indicated by the @authors tag. See the * copyright.txt in the distribution for a full listing of * individual contributors. @@ -45,11 +45,9 @@ import javax.servlet.http.HttpSession; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; /** * Manages session informations on behalf of a consumer. @@ -66,9 +64,6 @@ /** The prefix used to isolate WSRP-related session information in the actual session object. */ private static final String SESSION_ID_PREFIX = "org.gatein.wsrp.session."; - /** session id -> ProducerSessionInformation */ - private Map<String, ProducerSessionInformation> sessionInfos = new ConcurrentHashMap<String, ProducerSessionInformation>(); // todo: thread-safe? - /** * Constructs a new SessionHandler. * @@ -316,7 +311,7 @@ { List<String> idsToRelease = new ArrayList<String>(); - Set<ProducerSessionInformation> uniqueInfos = new HashSet<ProducerSessionInformation>(sessionInfos.values()); + Set<ProducerSessionInformation> uniqueInfos = consumer.getSessionRegistry().getAll(); for (ProducerSessionInformation info : uniqueInfos) { @@ -339,7 +334,7 @@ for (String sessionId : sessionIds) { - ProducerSessionInformation info = sessionInfos.get(sessionId); + ProducerSessionInformation info = consumer.getSessionRegistry().get(sessionId); sessionId = info.removeSession(sessionId); if (sessionId != null) { @@ -383,7 +378,7 @@ */ void removeSessionId(String id) { - sessionInfos.remove(id); + consumer.getSessionRegistry().remove(id); } /** @@ -395,7 +390,7 @@ */ void addSessionMapping(String sessionID, ProducerSessionInformation producerSessionInformation) { - sessionInfos.put(sessionID, producerSessionInformation); + consumer.getSessionRegistry().put(sessionID, producerSessionInformation); } // End ProducerSessionInformation callbacks Added: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/session/InMemorySessionRegistry.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/session/InMemorySessionRegistry.java (rev 0) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/session/InMemorySessionRegistry.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -0,0 +1,57 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.wsrp.consumer.handlers.session; + +import org.gatein.wsrp.consumer.handlers.ProducerSessionInformation; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + +/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */ +public class InMemorySessionRegistry implements SessionRegistry +{ + private Map<String, ProducerSessionInformation> sessionInfos = new ConcurrentHashMap<String, ProducerSessionInformation>(); // todo: thread-safe? + + public Set<ProducerSessionInformation> getAll() + { + return new HashSet<ProducerSessionInformation>(sessionInfos.values()); + } + + public ProducerSessionInformation get(String sessionId) + { + return sessionInfos.get(sessionId); + } + + public ProducerSessionInformation remove(String sessionId) + { + return sessionInfos.remove(sessionId); + } + + public void put(String sessionId, ProducerSessionInformation sessionInformation) + { + sessionInfos.put(sessionId, sessionInformation); + } +} Added: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/session/SessionRegistry.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/session/SessionRegistry.java (rev 0) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/session/SessionRegistry.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -0,0 +1,40 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.wsrp.consumer.handlers.session; + +import org.gatein.wsrp.consumer.handlers.ProducerSessionInformation; + +import java.util.Set; + +/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */ +public interface SessionRegistry +{ + Set<ProducerSessionInformation> getAll(); + + ProducerSessionInformation get(String sessionId); + + ProducerSessionInformation remove(String sessionId); + + void put(String sessionId, ProducerSessionInformation sessionInformation); +} Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -33,7 +33,11 @@ import org.gatein.wsrp.consumer.ConsumerException; import org.gatein.wsrp.consumer.ProducerInfo; import org.gatein.wsrp.consumer.WSRPConsumerImpl; +import org.gatein.wsrp.consumer.handlers.session.InMemorySessionRegistry; +import org.gatein.wsrp.consumer.handlers.session.SessionRegistry; +import org.gatein.wsrp.consumer.migration.InMemoryMigrationService; import org.gatein.wsrp.consumer.migration.MigrationService; +import org.gatein.wsrp.consumer.spi.ConsumerRegistrySPI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,13 +54,14 @@ * @version $Revision: 12693 $ * @since 2.6 */ -public abstract class AbstractConsumerRegistry implements ConsumerRegistry +public abstract class AbstractConsumerRegistry implements ConsumerRegistrySPI { /** Gives access to the Portal's portlet invokers */ private FederatingPortletInvoker federatingPortletInvoker; private SessionEventBroadcaster sessionEventBroadcaster = SessionEventBroadcaster.NO_OP_BROADCASTER; - private MigrationService migrationService; + private MigrationService migrationService = new InMemoryMigrationService(); + private SessionRegistry sessionRegistry = new InMemorySessionRegistry(); private static final String CONSUMER_WITH_ID = "Consumer with id '"; private static final String RELEASE_SESSIONS_LISTENER = "release_sessions_listener_"; @@ -67,9 +72,27 @@ public void setConsumerCache(ConsumerCache consumers) { + if (consumers == null) + { + consumers = new InMemoryConsumerCache(); + } this.consumers = consumers; } + public void setSessionRegistry(SessionRegistry sessionRegistry) + { + if (sessionRegistry == null) + { + sessionRegistry = new InMemorySessionRegistry(); + } + this.sessionRegistry = sessionRegistry; + } + + public SessionRegistry getSessionRegistry() + { + return sessionRegistry; + } + public FederatingPortletInvoker getFederatingPortletInvoker() { return federatingPortletInvoker; @@ -77,6 +100,10 @@ public void setSessionEventBroadcaster(SessionEventBroadcaster sessionEventBroadcaster) { + if (sessionEventBroadcaster == null) + { + sessionEventBroadcaster = SessionEventBroadcaster.NO_OP_BROADCASTER; + } this.sessionEventBroadcaster = sessionEventBroadcaster; } @@ -87,6 +114,10 @@ public void setMigrationService(MigrationService migrationService) { + if (migrationService == null) + { + migrationService = new InMemoryMigrationService(); + } this.migrationService = migrationService; } @@ -100,7 +131,7 @@ } - ProducerInfo info = new ProducerInfo(); + ProducerInfo info = new ProducerInfo(this); info.setId(id); info.setExpirationCacheSeconds(expirationCacheSeconds); info.getEndpointConfigurationInfo().setWsdlDefinitionURL(wsdlURL); @@ -169,9 +200,9 @@ protected WSRPConsumer createConsumerFrom(ProducerInfo producerInfo) { // make sure we set the registry after loading from DB since registry is not persisted. - producerInfo.setRegistry(this); +// producerInfo.setRegistry(this); - final WSRPConsumerImpl consumer = new WSRPConsumerImpl(producerInfo, migrationService); + final WSRPConsumerImpl consumer = new WSRPConsumerImpl(producerInfo); // cache consumer consumers.putConsumer(producerInfo.getId(), consumer); Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerRegistry.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerRegistry.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerRegistry.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -25,10 +25,8 @@ import org.gatein.pc.federation.FederatingPortletInvoker; import org.gatein.wsrp.WSRPConsumer; -import org.gatein.wsrp.api.session.SessionEventBroadcaster; import org.gatein.wsrp.consumer.ConsumerException; import org.gatein.wsrp.consumer.ProducerInfo; -import org.gatein.wsrp.consumer.migration.MigrationService; import java.util.Collection; import java.util.List; @@ -75,18 +73,6 @@ void reloadConsumers(); - void start() throws Exception; - - void stop() throws Exception; - - void setSessionEventBroadcaster(SessionEventBroadcaster sessionEventBroadcaster); - - void setFederatingPortletInvoker(FederatingPortletInvoker federatingPortletInvoker); - - MigrationService getMigrationService(); - - void setMigrationService(MigrationService migrationService); - boolean containsConsumer(String id); Collection<String> getConfiguredConsumersIds(); Added: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/spi/ConsumerRegistrySPI.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/spi/ConsumerRegistrySPI.java (rev 0) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/spi/ConsumerRegistrySPI.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -0,0 +1,50 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.wsrp.consumer.spi; + +import org.gatein.pc.federation.FederatingPortletInvoker; +import org.gatein.wsrp.api.session.SessionEventBroadcaster; +import org.gatein.wsrp.consumer.handlers.session.SessionRegistry; +import org.gatein.wsrp.consumer.migration.MigrationService; +import org.gatein.wsrp.consumer.registry.ConsumerRegistry; + +/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */ +public interface ConsumerRegistrySPI extends ConsumerRegistry +{ + void setSessionEventBroadcaster(SessionEventBroadcaster sessionEventBroadcaster); + + void setFederatingPortletInvoker(FederatingPortletInvoker federatingPortletInvoker); + + MigrationService getMigrationService(); + + void setMigrationService(MigrationService migrationService); + + SessionRegistry getSessionRegistry(); + + void setSessionRegistry(SessionRegistry sessionRegistry); + + void start() throws Exception; + + void stop() throws Exception; +} Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/spi/WSRPConsumerSPI.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/spi/WSRPConsumerSPI.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/spi/WSRPConsumerSPI.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -28,6 +28,7 @@ import org.gatein.wsrp.WSRPConsumer; import org.gatein.wsrp.consumer.ProducerInfo; import org.gatein.wsrp.consumer.handlers.SessionHandler; +import org.gatein.wsrp.consumer.handlers.session.SessionRegistry; import org.gatein.wsrp.consumer.portlet.info.WSRPPortletInfo; import org.gatein.wsrp.services.MarkupService; import org.oasis.wsrp.v2.RegistrationContext; @@ -65,4 +66,6 @@ boolean supportsUserScope(String userScope); WSRPPortletInfo getPortletInfo(PortletInvocation invocation) throws PortletInvokerException; + + SessionRegistry getSessionRegistry(); } Modified: components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, Red Hat Middleware, LLC, and individual * contributors as indicated by the @authors tag. See the * copyright.txt in the distribution for a full listing of * individual contributors. @@ -72,15 +72,13 @@ protected void setUp() throws Exception { - info = new ProducerInfo(); + info = new ProducerInfo(new MockConsumerRegistry()); info.setId("test"); info.setKey("key"); serviceFactory = new BehaviorBackedServiceFactory(); EndpointConfigurationInfo eci = new EndpointConfigurationInfo(serviceFactory); info.setEndpointConfigurationInfo(eci); - - info.setRegistry(new MockConsumerRegistry()); } public void testSetRegistrationInfo() Modified: components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/RegistrationInfoTestCase.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/RegistrationInfoTestCase.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/RegistrationInfoTestCase.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, Red Hat Middleware, LLC, and individual * contributors as indicated by the @authors tag. See the * copyright.txt in the distribution for a full listing of * individual contributors. @@ -50,7 +50,7 @@ protected void setUp() throws Exception { - ProducerInfo pi = new ProducerInfo(); + ProducerInfo pi = new ProducerInfo(null); info = pi.getRegistrationInfo(); } Modified: components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -165,16 +165,16 @@ WSRPConsumer consumer = Mockito.spy(original); // force re-init of registry from "persistence" to ensure that the spy registry actually uses our spy consumer - ConsumerRegistry registrySpy = Mockito.spy(registry); + AbstractConsumerRegistry registrySpy = Mockito.spy(registry); Mockito.doReturn(consumer).when(registrySpy).getConsumer("foo"); - Mockito.doReturn(Collections.singletonList(consumer)).when((AbstractConsumerRegistry)registrySpy).getConsumers(false); + Mockito.doReturn(Collections.singletonList(consumer)).when(registrySpy).getConsumers(false); WSRPConsumer foo = registrySpy.getConsumer("foo"); assertTrue(foo.getProducerInfo().isActive()); assertEquals(consumer, foo); // start consumer and check that it's properly added to the FederatingPortletInvoker - ((AbstractConsumerRegistry)registrySpy).activateConsumer(foo); + registrySpy.activateConsumer(foo); assertEquals(consumer, registrySpy.getFederatingPortletInvoker().getFederatedInvoker("foo").getPortletInvoker()); // stop the consumer and then the registry and check that consumer.start has only been called once Modified: components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/protocol/v1/WSRP1ConsumerBaseTest.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/protocol/v1/WSRP1ConsumerBaseTest.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/protocol/v1/WSRP1ConsumerBaseTest.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, Red Hat Middleware, LLC, and individual * contributors as indicated by the @authors tag. See the * copyright.txt in the distribution for a full listing of * individual contributors. @@ -68,7 +68,7 @@ protected TestWSRPProducer producer = new TestWSRPProducerImpl(); /** . */ - protected WSRPConsumerImpl consumer = new WSRPConsumerImpl(); + protected WSRPConsumerImpl consumer = new WSRPConsumerImpl(new ProducerInfo(new MockConsumerRegistry())); private boolean strict = true; @@ -88,9 +88,6 @@ setRegistrationBehavior(null); registerAdditionalMarkupBehaviors(registry); - // use a fresh ConsumerRegistry - producerInfo.setRegistry(new MockConsumerRegistry()); - // use a fresh endpoint using a behavior-backed service factory producerInfo.setEndpointConfigurationInfo(new EndpointConfigurationInfo(new BehaviorBackedServiceFactory(registry))); Modified: components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/protocol/v2/WSRP2ConsumerBaseTest.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/protocol/v2/WSRP2ConsumerBaseTest.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/protocol/v2/WSRP2ConsumerBaseTest.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, Red Hat Middleware, LLC, and individual * contributors as indicated by the @authors tag. See the * copyright.txt in the distribution for a full listing of * individual contributors. @@ -68,7 +68,7 @@ protected TestWSRPProducer producer = new TestWSRPProducerImpl(); /** . */ - protected WSRPConsumerImpl consumer = new WSRPConsumerImpl(); + protected WSRPConsumerImpl consumer = new WSRPConsumerImpl(new ProducerInfo(new MockConsumerRegistry())); private boolean strict = true; @@ -88,9 +88,6 @@ setRegistrationBehavior(null); registerAdditionalMarkupBehaviors(registry); - // use a fresh ConsumerRegistry - producerInfo.setRegistry(new MockConsumerRegistry()); - // use a fresh endpoint using a behavior-backed service factory producerInfo.setEndpointConfigurationInfo(new EndpointConfigurationInfo(new BehaviorBackedServiceFactory(registry))); Modified: components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -30,8 +30,11 @@ import org.gatein.wsrp.consumer.ConsumerException; import org.gatein.wsrp.consumer.EndpointConfigurationInfo; import org.gatein.wsrp.consumer.ProducerInfo; +import org.gatein.wsrp.consumer.handlers.session.InMemorySessionRegistry; +import org.gatein.wsrp.consumer.handlers.session.SessionRegistry; +import org.gatein.wsrp.consumer.migration.InMemoryMigrationService; import org.gatein.wsrp.consumer.migration.MigrationService; -import org.gatein.wsrp.consumer.registry.ConsumerRegistry; +import org.gatein.wsrp.consumer.spi.ConsumerRegistrySPI; import java.util.ArrayList; import java.util.Collection; @@ -44,13 +47,15 @@ * @version $Revision: 12693 $ * @since 2.6 */ -public class MockConsumerRegistry implements ConsumerRegistry +public class MockConsumerRegistry implements ConsumerRegistrySPI { private Map<String, WSRPConsumer> consumers = new HashMap(3); public static final String MOCK_SERVICE_DESCRIPTION = "mock-service-description"; public static final String MOCK_MARKUP = "mock-markup"; public static final String CONSUMER1 = "inDB"; public static final String CONSUMER2 = "inDB2"; + private InMemorySessionRegistry sessionRegistry = new InMemorySessionRegistry(); + private InMemoryMigrationService migrationService = new InMemoryMigrationService(); /** * Creates a ConsumerRegistry containing 2 consumers with id '{@link #CONSUMER1}' and '{@link #CONSUMER2}' @@ -156,14 +161,24 @@ public MigrationService getMigrationService() { - return null; //To change body of implemented methods use File | Settings | File Templates. + return migrationService; } public void setMigrationService(MigrationService migrationService) { - //To change body of implemented methods use File | Settings | File Templates. + throw new UnsupportedOperationException(); } + public SessionRegistry getSessionRegistry() + { + return sessionRegistry; + } + + public void setSessionRegistry(SessionRegistry sessionRegistry) + { + throw new UnsupportedOperationException(); + } + public boolean containsConsumer(String id) { return consumers.containsKey(id); Modified: components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/support/MockWSRPConsumer.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/support/MockWSRPConsumer.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/support/MockWSRPConsumer.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -39,6 +39,7 @@ import org.gatein.wsrp.consumer.RefreshResult; import org.gatein.wsrp.consumer.handlers.ProducerSessionInformation; import org.gatein.wsrp.consumer.handlers.SessionHandler; +import org.gatein.wsrp.consumer.handlers.session.SessionRegistry; import org.gatein.wsrp.consumer.migration.ExportInfo; import org.gatein.wsrp.consumer.migration.ImportInfo; import org.gatein.wsrp.consumer.migration.MigrationService; @@ -65,7 +66,7 @@ public MockWSRPConsumer(String id) { - producerInfo = new ProducerInfo(); + producerInfo = new ProducerInfo(null); producerInfo.setId(id); producerInfo.setEndpointConfigurationInfo(new MockEndpointConfigurationInfo()); } @@ -105,6 +106,16 @@ throw new NotYetImplemented(); } + public SessionRegistry getSessionRegistry() + { + throw new NotYetImplemented(); + } + + public void setSessionRegistry(SessionRegistry sessionInfos) + { + throw new NotYetImplemented(); + } + public RegistrationContext getRegistrationContext() throws PortletInvokerException { throw new NotYetImplemented(); Modified: components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/JCRMigrationService.java =================================================================== --- components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/JCRMigrationService.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/JCRMigrationService.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -83,7 +83,7 @@ List<ExportInfo> exportInfos = new ArrayList<ExportInfo>(exportInfoMappings.size()); for (ExportInfoMapping eim : exportInfoMappings) { - exportInfos.add(eim.toModel(null)); + exportInfos.add(eim.toModel(null, null)); } persister.closeSession(false); @@ -115,7 +115,7 @@ { if (eim != null) { - return eim.toModel(null); + return eim.toModel(null, null); } else { Modified: components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/mapping/ExportInfoMapping.java =================================================================== --- components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/mapping/ExportInfoMapping.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/mapping/ExportInfoMapping.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -45,7 +45,7 @@ * @version $Revision$ */ @PrimaryType(name = ExportInfoMapping.NODE_NAME) -public abstract class ExportInfoMapping implements BaseMapping<ExportInfo> +public abstract class ExportInfoMapping implements BaseMapping<ExportInfo, Object> { public static final String NODE_NAME = "wsrp:exportinfo"; @@ -122,7 +122,7 @@ } } - public ExportInfo toModel(ExportInfo initial) + public ExportInfo toModel(ExportInfo initial, Object registry) { List<ExportedStateMapping> exportedStates = getExportedStates(); SortedMap<String, byte[]> states = new TreeMap<String, byte[]>(); Modified: components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java =================================================================== --- components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -194,7 +194,7 @@ persister.closeSession(true); - return new MappingToProducerInfoIterator(mappings.iterator()); + return new MappingToProducerInfoIterator(mappings.iterator(), this); } @Override @@ -207,7 +207,7 @@ if (pim != null) { - return pim.toModel(null); + return pim.toModel(null, this); } else { @@ -381,10 +381,12 @@ private static class MappingToProducerInfoIterator implements Iterator<ProducerInfo> { private Iterator<ProducerInfoMapping> mappings; + private final JCRConsumerRegistry registry; - public MappingToProducerInfoIterator(Iterator<ProducerInfoMapping> infoMappingIterator) + public MappingToProducerInfoIterator(Iterator<ProducerInfoMapping> infoMappingIterator, JCRConsumerRegistry jcrConsumerRegistry) { this.mappings = infoMappingIterator; + this.registry = jcrConsumerRegistry; } public boolean hasNext() @@ -394,7 +396,7 @@ public ProducerInfo next() { - return mappings.next().toModel(null); + return mappings.next().toModel(null, registry); } public void remove() Modified: components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java =================================================================== --- components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -33,6 +33,7 @@ import org.gatein.wsrp.consumer.EndpointConfigurationInfo; import org.gatein.wsrp.consumer.ProducerInfo; import org.gatein.wsrp.consumer.RegistrationInfo; +import org.gatein.wsrp.consumer.spi.ConsumerRegistrySPI; import org.gatein.wsrp.jcr.mapping.BaseMapping; /** @@ -40,7 +41,7 @@ * @version $Revision$ */ @PrimaryType(name = ProducerInfoMapping.NODE_NAME) -public abstract class ProducerInfoMapping implements BaseMapping<ProducerInfo> +public abstract class ProducerInfoMapping implements BaseMapping<ProducerInfo, ConsumerRegistrySPI> { public static final String NODE_NAME = "wsrp:producerinfo"; @@ -92,13 +93,13 @@ rim.initFrom(regInfo); } - public ProducerInfo toModel(ProducerInfo initial) + public ProducerInfo toModel(ProducerInfo initial, ConsumerRegistrySPI registry) { // todo: should probably use a ProducerInfo implementation backed by mapping at some point ProducerInfo info = initial; if (initial == null) { - info = new ProducerInfo(); + info = new ProducerInfo(registry); } // basic properties Modified: components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/BaseMapping.java =================================================================== --- components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/BaseMapping.java 2011-09-06 11:41:54 UTC (rev 7314) +++ components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/BaseMapping.java 2011-09-06 20:55:01 UTC (rev 7315) @@ -27,9 +27,9 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -public interface BaseMapping<T> +public interface BaseMapping<T, R> { void initFrom(T model); - T toModel(T initial); + T toModel(T initial, R registry); }

12 years, 10 months

1
0
0 / 0

← Newer
1
...
23
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits September 2011