Author: theute Date: 2011-09-12 18:59:10 -0400 (Mon, 12 Sep 2011) New Revision: 7361 Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/IconWindowPortlet.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/UIPortalApplicationSkin.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPortalComponent/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/background/AddDashboard.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/background/IconClose.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/GateinLogo.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/GateinLogo.jpg epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/ToolbarContainer.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/UseIcon.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle1.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIInfoBar/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/background/HomeIcon.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIForms/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIForms/UIForm/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/background/QuickSearch.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/background/QuickSearchHover.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabPane/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/GrayTabStyle.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/NormalTabStyle.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/SelectTab.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/BlueLargeToolbar.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/GrayLine2x2.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/HeaderToolbar.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/IconLargeToolBar.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/LargeToolBar.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/LargeToolbar_.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/LightToolbar.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/SeparateLine2x1.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/NormalGroup.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/SelectedGroup.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/applicationregistry/webui/component/UIApplicationRegistryPortlet/SimpleSkin/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/AddIcon.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/BinIcon.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/BreadcumbsBar.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/BreadcumbsBar_.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/EditIcon.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/IconLargeToolBar.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/SmallGroup.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleStylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/background/NavDownArrow_ar.gif epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/NavDownArrowHover.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/DefaultContainerIcon.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/Earth.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/DarkGrayButton.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/BlueRoundedStyle.png Removed: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/BGDecoratorCenter1x18.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/DefaultTheme.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MDefaultTheme.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacBlack.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacGray.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacGreen.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacTheme.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerBlue.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerGreen.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerOrange.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerPink.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerViolet.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowBlue.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowGreen.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowOrange.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowPink.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowViolet.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MVistaBlue.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MVistaTheme.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacBlack.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacGray.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacGreen.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacTheme.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/Resize17x19.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ResizeArea17x15.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ResizeArea18x18.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ResizeArea18x18.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerGreen.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerOrange.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerPink.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerViolet.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundCornerBlue.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowBlue.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowGreen.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowOrange.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowPink.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowViolet.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/SimpleStyle.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/VistaBlue.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/VistaTheme.png epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/icons/SimpleIcons.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIBreadcumb/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIBreadcumb/background/HomeIcon.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIPortalApplicationSkin.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/AddDashboard.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/IconClose.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/GateinLogo.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/GateinLogo.jpg epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/ToolbarContainer.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/UseIcon.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/CollapseAllIcon.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/CollapseIcon.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/Dotted.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/ExpandAllIcon.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/ExpandIcon.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/LastNode.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/NullItem.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/RootTree.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/SitemapItemBoxTitle150x1.gif epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/default_sitemap.gif epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/Button.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/BgContainerBlock.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/BottomVTabSimpleStyle224x1.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/ContainerIcon.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/LineBlock.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/Pen.png epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortalBackground4x4.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecoratorHidden.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/close.png epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/BlueRoundedStyle.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/DefaultContainerIcon.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/Earth.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/ViewBlockBar.png epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/MidlePopupCategory.gif Modified: epp/portal/branches/EPP_5_2_Branch/component/scripting/src/test/resources/UIPortalApplication.gtmpl epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/resources/tomcat/simpleDeployableSkin.xml epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIHomePagePortlet/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/background/NavDownArrow.gif epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/Todo.xml epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserInfoPortlet.gtmpl epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationManagement.gtmpl epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UINavigationPortlet.java epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/NavDownArrow.gif epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/src/main/webapp/groovy/webui/component/UISampleDownloadUpload.gtmpl epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/UIGadget.js epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIAdminToolbar.js epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalControl.js epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIHorizontalTabs.js epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/background/ViewPage.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/background/ToolbarContainer.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UILoginForm/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/LightBlueStyle.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle1.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/PopupCategory.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupMessage/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/background/PortalComposer.gif epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIAccessGroup.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIGroupSelector.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIListPermissionSelector.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIPermissionSelector.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIUserMembershipSelector.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UIForgetPasswordWizard.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIAddGroupNavigation.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBrowser.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UISiteBody.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIAccountSettingForm.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UILanguageSelector.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UISkinSelector.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIMaskWorkspace.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIPopupWindow.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIFormInputThemeSelector.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIFormTabPane.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIItemThemeSelector.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl Log: JBEPP-1158: DOM Optimization Modified: epp/portal/branches/EPP_5_2_Branch/component/scripting/src/test/resources/UIPortalApplication.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/scripting/src/test/resources/UIPortalApplication.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/component/scripting/src/test/resources/UIPortalApplication.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -92,33 +92,17 @@ <div class="$uicomponent.skin" id="UIPortalApplication" style="!height: 100%;"> <div class="AjaxLoadingMask" id="AjaxLoadingMask" style="display: none; margin: auto;"> - <div class="LoadingContainer"> - <div class="CenterLoadingContainer"> - <div class="LoadingText"><%=_ctx.appRes("UIPortalApplication.label.Loading")%></div> - <div class="LoadingProgressBar"><span></span></div> + <div class="LoadingContainer"> + <div class="LoadingText"><%=_ctx.appRes("UIPortalApplication.label.Loading")%></div> + <span class="LoadingProgressBar"></span> + + <div class="UIAction"> + <a href="javascript:ajaxAbort();" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIPortalApplication.label.Abort")%></a> + </div> + + </div> + </div> - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="javascript:ajaxAbort();" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIPortalApplication.label.Abort")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> - </div> - - </div> - </div> - </div> - <%uicomponent.renderChildren();%> </div> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/resources/tomcat/simpleDeployableSkin.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/resources/tomcat/simpleDeployableSkin.xml 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/resources/tomcat/simpleDeployableSkin.xml 2011-09-12 22:59:10 UTC (rev 7361) @@ -1 +1 @@ -<Context path="/simpleDeployableSkin" docBase="../../../../../examples/skins/simpleskin/src/main/webapp/" debug="0" reloadable="true" crossContext="true"/> +<Context path="/simpleDeployableSkin" docBase="../../../../../../examples/skins/simpleskin/src/main/webapp/" debug="0" reloadable="true" crossContext="true"/> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-09-12 22:59:10 UTC (rev 7361) @@ -53,22 +53,22 @@ <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> - <!-- Skin for HomePagePortlet --> <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> + + <!-- Skin for OrganizationPortlet --> + <portlet-skin> + <application-name>exoadmin</application-name> + <portlet-name>OrganizationPortlet</portlet-name> + <skin-name>SimpleSkin</skin-name> + <css-path>/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleStylesheet.css</css-path> </portlet-skin> - - + <!-- Simple window style --> <window-style> <style-name>Simple</style-name> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,3 +1,8 @@ + +/** FONTS **/ + +/* Font attributes for the normal fragment font. +Used for the display of non-accentuated information */ .portlet-font { color: #000000; font-family: Verdana, Arial, Helvetica, sans-serif; @@ -19,7 +24,7 @@ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; font-size: 12px; font-style: normal; - color: #336699; + color: #058bb6; } /* Help messages, general additional information, etc. */ @@ -70,16 +75,17 @@ } .portlet-section-selected { - background-color: #CBD4E6; + background-color: #d9d8d9; } .portlet-section-subheader { font-weight: bold; - font-size: 10px; + padding: 5px 0px; } .portlet-section-footer { font-size: 11px; + border-top: 1px solid #F2F2F2; } /* Text that belongs to the table but does not fall in one of the other categories @@ -94,40 +100,45 @@ /* Table header */ .portlet-table-header { - background-color: #eef; - padding: 0 5px 5px 5px; + background-color: #e9e8ed; + padding: 0 0px 0px 5px; font-weight: bold; color: #333333; font-size: 12px; border-bottom: 1px solid #d5d5d5; + line-height: 20px; } /* Normal text in a table cell */ -.portlet-table-body {} +.portlet-table-body { + padding: 10px; +} /* Text in every other row in the table */ .portlet-table-alternate { - background-color: #E6E8E5; + background-color: #e7e6eb; border-bottom: 1px solid #d5d5d5; + padding: 5px 10px; } /* Text in a selected cell range */ .portlet-table-selected { color: #000; - font-size: 12px; - background-color: #CBD4E6; + background-color: #dddddd; + padding: 5px 10px; } /* Text of a subheading */ .portlet-table-subheader { font-weight: bold; - color: #000; + color: #777777; font-size: 12px; + padding: 5px; } /* Table footer */ .portlet-table-footer { - padding: 5px 5px 0 5px; + padding: 5px; font-weight: bold; color: #333333; font-size: 12px; @@ -143,7 +154,6 @@ /** FORMS **/ .portlet-form-label { - font-size: 10px; color: #333333; } @@ -155,14 +165,15 @@ /* Form Button Style */ .portlet-form-button { - font-size: 10px; - font-weight: bold; - color: #FFFFFF; - background-color: #5078aa; - border-top: 1px solid #97B7C6; - border-left: 1px solid #97B7C6; - border-bottom: 1px solid #254869; - border-right: 1px solid #254869; + font-size: 11px; + color: #5c5c5c; + background-color: #cfcfcf; + border-top: 1px solid #dadada; + border-left: 1px solid #dadada; + border-bottom: 1px solid #9a9a9a; + border-right: 1px solid #9a9a9a; + line-height: 22px; + padding: 0px 20px; } /* Text that appears beside a context dependent action icon */ @@ -204,60 +215,110 @@ /** MENUS **/ /*General menu settings such as background color, margins, etc. */ -.portlet-menu {} +.portlet-menu { +} /* Normal, unselected menu item. */ .portlet-menu-item { - color: #242424; - text-decoration: none; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; + background: #dddddd; + color: #2e2e2e; + text-decoration: none; } /* Selected menu item. */ -.portlet-menu-item-selected {} +.portlet-menu-item-selected { + background: #dddddd; + color: #058bb6; +} .portlet-menu-item-hover { - color: #5699B7; - text-decoration: none; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; + background: #dddddd; + color: #058bb6; + text-decoration: none; } /* Selected menu item when the mouse hovers over it. */ -.portlet-menu-item-hover-selected {} +.portlet-menu-item-hover-selected { + background: #dddddd; + color: #058bb6; +} /* Normal, unselected menu item that has sub-menus. */ -.portlet-menu-cascade-item {} +.portlet-menu-cascade-item { + background: #e9e8ed; + color: #636363; + text-decoration: none; +} /* Selected sub-menu item that has sub-menus */ -.portlet-menu-cascade-item-selected {} +.portlet-menu-cascade-item-selected { + background: #e9e8ed; + color: #252525; + text-decoration: none; +} -.porlet-menu-cascade {} +.porlet-menu-cascade { + background: #e9e8ed; + color: #636363; + text-decoration: none; +} -.portlet-menu-cascade-item-hover {} +.portlet-menu-cascade-item-hover { + background: #e9e8ed; + color: #252525; + text-decoration: none; +} -.portlet-menu-cascade-item-hover-selected {} +.portlet-menu-cascade-item-hover-selected { + background: #e9e8ed; + color: #252525; + text-decoration: none; +} -.portlet-menu-separator {} +.portlet-menu-separator { +} .portlet-menu-cascade-separator {} -.portlet-menu-content {} +.portlet-menu-content { + background: #f6f6f6; + color: #717171; + text-decoration: none; +} -.portlet-menu-content-selected {} +.portlet-menu-content-selected { + background: #f6f6f6; + color: #272727; + text-decoration: none; +} -.portlet-menu-content-hover {} +.portlet-menu-content-hover { + background: #f6f6f6; + color: #272727; + text-decoration: none; +} -.portlet-menu-content-hover-selected {} +.portlet-menu-content-hover-selected { + background: #f6f6f6; + color: #272727; + text-decoration: none; +} -.portlet-menu-indicator {} +.portlet-menu-indicator { + color: #8b8b8b; +} -.portlet-menu-indicator-selected {} +.portlet-menu-indicator-selected { + color: #606060; +} -.portlet-menu-indicator-hover {} +.portlet-menu-indicator-hover { + color: #606060; +} -.portlet-menu-indicator-hover-selected {} +.portlet-menu-indicator-hover-selected { + color: #606060; +} .portlet-menu-description {} Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,3482 +0,0 @@ - -/*-------------------------- 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 20px; -} - -.DefaultTheme .OverArrowDownIcon { - background-position: center 116px; -} - -.DefaultTheme .MinimizedIcon { - background-position: center 44px; -} - -.DefaultTheme .OverMinimizedIcon { - background-position: center 140px; -} - -.DefaultTheme .MaximizedIcon { - background-position: center 68px; -} - -.DefaultTheme .OverMaximizedIcon { - background-position: center 164px; -} - -.DefaultTheme .RestoreIcon { - background-position: center 92px; -} - -.DefaultTheme .OverRestoreIcon { - background-position: center 188px; -} - -.DefaultTheme .NormalIcon { - background-position: center 92px; -} - -.DefaultTheme .OverNormalIcon { - background-position: center 188px; -} - - -.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: 18px; line-height: 18px; - 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-position: left top; /* orientation=lt */ - background-position: 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; - width: 100%; -} - -.DefaultTheme .WindowBarLeft { - padding-left: 12px; - background-image: url('background/DefaultTheme.png'); - background-repeat: no-repeat; - background-position: left -148px; -} - -.DefaultTheme .WindowBarRight { - padding-right: 11px; - 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; -} - -.DefaultTheme .WindowBarCenter .FixHeight { - height: 21px; - padding-top: 8px; -} - -.DefaultTheme .MiddleDecoratorLeft { - padding-left: 12px; - background: url('background/MDefaultTheme.png') repeat-y left; -} - -.DefaultTheme .MiddleDecoratorRight { - padding-right: 11px; - background: url('background/MDefaultTheme.png') repeat-y right; -} - -.DefaultTheme .MiddleDecoratorCenter { - background: #ffffff; -} - -.DefaultTheme .BottomDecoratorLeft { - padding-left: 12px; - background-image: url('background/DefaultTheme.png'); - background-repeat: no-repeat; - background-position: left -60px; -} - -.DefaultTheme .BottomDecoratorRight { - padding-right: 11px; - 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; -} - -.DefaultTheme .BottomDecoratorCenter .FixHeight { - height: 30px; -} - -/*-------------------------- 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; - width: 100%; -} - -.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; -} - -.MacTheme .BottomDecoratorCenter .FixHeight { - 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; -} - -.MacTheme .WindowBarCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.MacGray .BottomDecoratorCenter .FixHeight { - 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; -} - -.MacGray .WindowBarCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.MacBlack .BottomDecoratorCenter .FixHeight { - 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; -} - -.MacBlack .WindowBarCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.MacGreenSteel .BottomDecoratorCenter .FixHeight { - 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; -} - -.MacGreenSteel .WindowBarCenter .FixHeight { - 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; -} - -.VistaTheme .BottomDecoratorCenter .FixHeight { - height: 24px; -} - -.VistaTheme .WindowBarCenter .PortletName { - font-weight: bold; - line-height: 22px; - overflow: hidden; - white-space: nowrap; - width: 100%; -} - -.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; -} - -.VistaTheme .WindowBarCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.VistaBlue .BottomDecoratorCenter .FixHeight { - 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; -} - -.VistaBlue .WindowBarCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.RoundConerBlue .WindowBarCenter .FixHeight { - 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; -} - -.RoundConerBlue .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.RoundConerViolet .WindowBarCenter .FixHeight { - 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; -} - -.RoundConerViolet .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.RoundConerOrange .WindowBarCenter .FixHeight { - 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; -} - -.RoundConerOrange .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.RoundConerPink .WindowBarCenter .FixHeight { - 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; -} - -.RoundConerPink .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.RoundConerGreen .WindowBarCenter .FixHeight { - 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; -} - -.RoundConerGreen .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.ShadowBlue .WindowBarCenter .FixHeight { - 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; -} - -.ShadowBlue .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.ShadowViolet .WindowBarCenter .FixHeight { - 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; -} - -.ShadowViolet .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.ShadowOrange .WindowBarCenter .FixHeight { - 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; -} - -.ShadowOrange .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.ShadowPink .WindowBarCenter .FixHeight { - 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; -} - -.ShadowPink .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.ShadowGreen .WindowBarCenter .FixHeight { - 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; -} - -.ShadowGreen .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.SimpleBlue .WindowBarCenter .FixHeight { - 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; -} - -.SimpleBlue .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.SimpleViolet .WindowBarCenter .FixHeight { - 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; -} - -.SimpleViolet .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.SimpleOrange .WindowBarCenter .FixHeight { - 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; -} - -.SimpleOrange .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.SimplePink .WindowBarCenter .FixHeight { - 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; -} - -.SimplePink .BottomDecoratorCenter .FixHeight { - 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; - width: 100%; -} - -.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; -} - -.SimpleGreen .WindowBarCenter .FixHeight { - 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; -} - -.SimpleGreen .BottomDecoratorCenter .FixHeight { - height: 19px; -} - -.UIPortlet .SimpleGreen .BottomDecoratorCenter { - height: 18px; -} Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/BGDecoratorCenter1x18.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/DefaultTheme.png =================================================================== (Binary files differ) Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/IconWindowPortlet.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/IconWindowPortlet.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MDefaultTheme.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacBlack.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacGray.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacGreen.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MMacTheme.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerBlue.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerGreen.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerOrange.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerPink.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MRoundConerViolet.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowBlue.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowGreen.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowOrange.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowPink.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MShadowViolet.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MVistaBlue.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MVistaTheme.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacBlack.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacGray.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacGreen.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/MacTheme.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/Resize17x19.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ResizeArea17x15.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ResizeArea18x18.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ResizeArea18x18.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerGreen.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerOrange.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerPink.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundConerViolet.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/RoundCornerBlue.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowBlue.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowGreen.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowOrange.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowPink.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/ShadowViolet.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/SimpleStyle.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/VistaBlue.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/background/VistaTheme.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/icons/SimpleIcons.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIBreadcumb/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIBreadcumb/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIBreadcumb/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,28 +0,0 @@ - -.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: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIBreadcumb/background/HomeIcon.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIPortalApplicationSkin.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIPortalApplicationSkin.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIPortalApplicationSkin.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,157 +0,0 @@ - -@import url(/eXoResources/skin/DefaultSkin/portal/webui/component/control/Stylesheet.css); -@import url(/eXoResources/skin/DefaultSkin/portal/webui/component/customization/Stylesheet.css); -@import url(/eXoResources/skin/DefaultSkin/portal/webui/component/view/Stylesheet.css); -@import url(/eXoResources/skin/DefaultSkin/portal/webui/component/widget/Stylesheet.css); -@import url(/eXoResources/skin/DefaultSkin/webui/component/Stylesheet.css); -@import url(UIBreadcumb/Stylesheet.css); -@import url(UIToolbarContainer/Stylesheet.css); -@import url(UITabPaneDashboard/Stylesheet.css); - -div { - padding: 0px; margin: 0px; - outline: none; -} - -table { - width: 100%; - padding: 0px; margin: 0px; - border-spacing: 0px; - border-collapse: collapse; -} - -th, td { - padding: 0px; margin: 0px; - vertical-align: top; -} - -img { - padding: 0px; margin: 0px; border: none; vertical-align: middle; -} - -form { - padding: 0px; margin: 0px; -} - -html { - margin: 0px; padding: 0px; - *overflow-x: hidden; -} - -body { - background: #eeeeee; - margin: 0px; padding: 0px; - font-family: Tahoma,Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - overflow-x: hidden; -} - -a { - text-decoration: none; - color: black; -} - -.UIWorkingWorkspace { - width: 1017px; - background: white; -} - -.UIPageBody .BLPagebody { - display: none; -} -/*###############################################################################################*/ - -.OverflowContainer { - overflow: hidden; - width: 100%; -} - -.LeftBlock { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ -} - -.RightBlock { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ -} - -.ClearFix:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - -.ClearFix { - !display: inline-block; - !zoom: 1; - !display: block; -} - -.InlineContainer { - overflow: hidden; -} - -.InlineLeft { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ -} - -.InlineRight { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ -} - -.AjaxLoadingMask { - width: 180px; height: 110px; - background: white; - border: 1px solid #66667e; - padding: 1px; -} - -.AjaxLoadingMask .LoadingContainer { - height: 108px; - background: #ffffff; - border: solid 1px #a8a9bb; -} - -.AjaxLoadingMask .LoadingText { - text-align: center; - padding: 10px 0px 5px 0px; -} - -.AjaxLoadingMask .LoadingProgressBar { - width: 32px; height: 40px; - background: url('../../../background/LoadingProgress.gif') no-repeat center; - margin: auto; -} - -.AjaxLoadingMask .UIAction .ActionButton{ - float: none; -} - -.FloatLeft { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ -} - -.FloatRight { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ -} - -.ClearLeft { - clear: left; /* orientation=lt */ - clear: right; /* orientation=rt */ -} - -.ClearRight { - clear: right; /* orientation=lt */ - clear: left; /* orientation=rt */ -} - -.ClearBoth { - clear: both; -} \ No newline at end of file Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,97 +0,0 @@ -#UITabbedDashboardPortlet { - padding: 0 8px; -} - -.UITabPaneDashboard { - background: #f9f9f9; - border-bottom: 1px solid #e5e5e5; - padding: 0px 9px; -} - -.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; -} Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/AddDashboard.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/IconClose.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,151 +0,0 @@ - -.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 .UITab a:hover { - color: #9fc5ff; -} - -.UIToolbarContainer .UIHorizontalTabs .TabsContainer { - height: 30px; /* orientation=lt */ - height: auto; /* orientation=rt */ -} - -.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 .MenuItem .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 30px; /* orientation=lt */ - padding: 0px 30px 0px 25px; /* orientation=rt */ - 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 */ -} - -/**********************************/ - -.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: 83px; - height: 30px; -} \ No newline at end of file Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/GateinLogo.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/GateinLogo.jpg =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/ToolbarContainer.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/background/UseIcon.gif =================================================================== (Binary files differ) Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/UIPortalApplicationSkin.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/UIPortalApplicationSkin.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/UIPortalApplicationSkin.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +1,175 @@ +/** + * 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(/eXoResources/skin/DefaultSkin/portal/webui/component/control/Stylesheet.css); +@import url(/eXoResources/skin/DefaultSkin/portal/webui/component/customization/Stylesheet.css); +@import url(/eXoResources/skin/DefaultSkin/portal/webui/component/view/Stylesheet.css); +@import url(/eXoResources/skin/DefaultSkin/portal/webui/component/widget/Stylesheet.css); + +@import url(view/Stylesheet.css); + +div { + padding: 0px; margin: 0px; + outline: none; +} + +table { + width: 100%; + padding: 0px; margin: 0px; + border-spacing: 0px; + border-collapse: collapse; +} + +th, td { + padding: 0px; margin: 0px; + vertical-align: top; +} + +img { + padding: 0px; margin: 0px; border: none; vertical-align: middle; +} + +form { + padding: 0px; margin: 0px; +} + +html { + margin: 0px; padding: 0px; + *overflow-x: hidden; +} + +body { + background: #eeeeee; + margin: 0px; padding: 0px; + font-family: Tahoma,Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + overflow-x: hidden; +} + +a { + text-decoration: none; + color: black; +} + +.UIWorkingWorkspace { + width: 1017px; + background: white; +} + +.UIPageBody .BLPagebody { + display: none; +} +/*###############################################################################################*/ + +.OverflowContainer { + overflow: hidden; + width: 100%; +} + +.LeftBlock { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ +} + +.RightBlock { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ +} + +.ClearFix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} + +.ClearFix { + !display: inline-block; + !zoom: 1; + !display: block; +} + +.InlineContainer { + overflow: hidden; +} + +.InlineLeft { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ +} + +.InlineRight { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ +} + +.AjaxLoadingMask { + width: 180px; height: 110px; + background: white; + border: 1px solid #66667e; + padding: 1px; +} + +.AjaxLoadingMask .LoadingContainer { + height: 108px; + background: #ffffff; + border: solid 1px #a8a9bb; +} + +.AjaxLoadingMask .LoadingText { + text-align: center; + padding: 10px 0px 5px 0px; +} + +.AjaxLoadingMask .LoadingProgressBar { + width: 32px; height: 40px; + background: url('../../../background/LoadingProgress.gif') no-repeat center; + margin: auto; +} + +.AjaxLoadingMask .UIAction .ActionButton{ + float: none; +} + +.FloatLeft { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ +} + +.FloatRight { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ +} + +.ClearLeft { + clear: left; /* orientation=lt */ + clear: right; /* orientation=rt */ +} + +.ClearRight { + clear: right; /* orientation=lt */ + clear: left; /* orientation=rt */ +} + +.ClearBoth { + clear: both; +} \ No newline at end of file Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +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. + */ +@import url(UIPage/Stylesheet.css); +@import url(UIToolbarContainer/Stylesheet.css); +@import url(UITabPaneDashboard/Stylesheet.css); + Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIPage/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +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. + */ + +/*##############################-Page Layout Decorator-################################*/ + + +.UIPageBody .PageLayoutDecorator { + margin: 0px 2px auto 2px; + overflow: hidden; +} + +.UIPageBody .VIEW-PAGEBODY .UIPage { + padding: 0 8px; +} + + +.UIPage .UIRowContainer { + padding: 0px; +} + +.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 Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +1,37 @@ + +.UITabPaneDashboard { + background-color: #F0F0F0; + border-bottom: 1px solid #e5e5e5; + -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 Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/background/AddDashboard.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/background/AddDashboard.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/background/IconClose.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UITabPaneDashboard/background/IconClose.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +1,180 @@ +/** + * 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,.UIToolbarContainer .UIHorizontalTabs { + height: 30px; +} + +.UIToolbarContainer .NormalContainerBlock .ToolbarContainer { + background: #232d36; + height: 30px; + border: none; +} + +.UIToolbarContainer .ToolbarContainer .TBIcon { + padding: 0px 15px 0px 35px; /* orientation=lt */ + padding: 0px 35px 0px 15px; /* orientation=rt */ + color: #fff; +} + + +.UIToolbarContainer .UIHorizontalTabs .TabsContainer { + height: 30px; /* orientation=lt */ + height: auto; /* orientation=rt */ +} + +.UIToolbarContainer .UIHorizontalTabs .UITab { + background: none; + font-weight: normal; +} + +/****************************/ + +.UIToolbarContainer .MenuItemContainer { + border: 1px solid #e7e6eb; + background: #e7e6eb; +} + +.UIToolbarContainer .TitleBar { + color: #232d36; + background: #cccccc; + font-weight: normal; +} + +.UIToolbarContainer .MenuItem { + background: none; +} + +.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 */ +} + +.UIToolbarContainer .MenuItem a { + padding: 0px 25px 0px 30px; /* orientation=lt */ + padding: 0px 30px 0px 25px; /* orientation=rt */ + color: #232d36; +} + +.UIToolbarContainer .ItemIcon { + background-position: 5px center; /* orientation=lt */ + background-position: 95% center; /* orientation=rt */ +} + +/**********************************/ + +.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 .SiteIcon { + background: url('background/ToolbarContainer.gif') no-repeat 0px -97px; /* orientation=lt */ + background: url('background/ToolbarContainer.gif') no-repeat 100% -97px; /* orientation=rt */ +} + +.UIToolbarContainer .SitesIcon { + background: url('background/ToolbarContainer.gif') no-repeat 5px -97px; /* orientation=lt */ + background: url('background/ToolbarContainer.gif') no-repeat 100% -97px; /* 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 */ + 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 */ +} + +.UIStarToolBarPortlet .UITab { + float: none; /* orientation=rt */ +} + +/***************UIUserToolBarPortlet*****************/ + +.UIToolbarContainer .UIUserToolbarPortlet .UIHorizontalTabs .TabsContainer { + width: 400px; /* orientation=rt */ +} + +.UIToolbarContainer .UIAdminToolbarPortlet { + width: 200px; /* orientation=rt */ +} + +.UIToolbarContainer .UIAdminToolbarPortlet .UIHorizontalTabs .UITab { + float: none; /* orientation=rt */ +} \ No newline at end of file Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/GateinLogo.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/GateinLogo.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/GateinLogo.jpg =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/GateinLogo.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/ToolbarContainer.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/ToolbarContainer.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/UseIcon.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/view/UIToolbarContainer/background/UseIcon.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +1,28 @@ +/** + * 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(UIBreadcumbs/Stylesheet.css); +@import url(UISearch/Stylesheet.css); +@import url(UITree/Stylesheet.css); +@import url(UITabSystem/Stylesheet.css); +@import url(UISelector/Stylesheet.css); +@import url(UIBarDecorator/Stylesheet.css); +@import url(UIToolbar/Stylesheet.css); + Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +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. + */ + +@import url(UIAction/Stylesheet.css); +@import url(UIBarStyle/Stylesheet.css); Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +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 .LightBlueStyle { + background: url('background/SimpleStyle1.gif') repeat-x center; +} Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle1.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle1.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBarDecorator/UIBarStyle/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +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. + */ + +/*###########################-BarStyle2-###########################*/ + +.UIBarStyle .BarStyle2 .LeftBar { + background: #e7e7e7; + height: 36px; + border: 1px solid #dedede; +} + +.UIBarStyle .BarStyle2 .RightBar { + background: none; + height: 36px; +} + +.UIBarStyle .BarStyle2 .MiddleBar { + height: 36px; + line-height: 36px; + background: none; +} Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +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 .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 Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/background/HomeIcon.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIBreadcumbs/background/HomeIcon.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +1,79 @@ +/** + * 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 .QuickSet .SearchTitle { + color: #565656; +} + +.UISearch .UISearchForm .QuickSet .AdvancedSearchIcon { + width: 24px; height: 24px; + background: url('/eXoResources/skin/DefaultSkin/skinIcons/24x24/icons/AdvancedSearch.gif') no-repeat; + float: left; +} + +.UISearch .UISearchForm .QuickSet .AdvancedSearch { + float: right; + margin-right: 10px; color: black; font-weight: normal; +} + +.UISearch .UISearchForm .QuickSet .SimpleSearchIcon { + background: url('background/QuickSearch.gif') no-repeat; /* orientation=lt */ + background: url('background/QuickSearch-rt.gif') no-repeat; /* orientation=rt */ +} + +.UISearch .UISearchForm .QuickSet .SimpleSearchIcon:hover { + background: url('background/QuickSearchHover.gif') no-repeat; /* orientation=lt */ + background: url('background/QuickSearchHover-rt.gif') no-repeat; /* orientation=rt */ +} + +.UISearch .UISearchForm .QuickSet a:hover{ + color: blue; +} + +.UISearch .UISearchForm .QuickSet .UIForm { + background-color: transparent; + border: none; +} + +.UISearch .UISearchForm .QuickSet select { + border: 1px solid #cccccc; + color: #565656; + height: 20px; +} + +.UISearch .UISearchForm .QuickSet input { + border: 1px solid #cccccc; +} + +.UIFormTabPane .UISearch .UISearchForm .QuickSet select { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + margin-top: 8px; + padding-left: 4px; /* orientation=lt */ + padding-right: 4px; /* orientation=rt */ + border: 1px solid #b7b7b7; + width: 120px; +} + +.UIFormTabPane .UISearch .UISearchForm .QuickSet input { + float: left; + margin: 3px 5px 0px 0px; + border: 1px solid #b7b7b7; + width: 185px; +} \ No newline at end of file Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/background/QuickSearch.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/background/QuickSearch.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/background/QuickSearchHover.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISearch/background/QuickSearchHover.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +1,20 @@ +/** + * 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(UIItemSelector/Stylesheet.css); Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +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 .RightColumnBigItemStyle .ItemListContainer .ItemListTitle { + background: url('/gatein-sample-skin/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/BreadcumbsBar.gif') repeat-x; +} \ No newline at end of file Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +1,20 @@ +/** + * 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(UITabs/Stylesheet.css); Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +1,79 @@ +/** + * 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 { + background: url('background/NormalTabStyle.gif') repeat-x center top; +} + + +/*###########################-- NormalTabStyle --############################*/ + + +.UIHorizontalTabs .NormalTabStyle .NormalTab .LeftTab { + 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 { + 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 { + background: url('background/NormalTabStyle.gif') repeat-x center -47px; + text-align: right; /* orientation=rt */ + white-space: nowrap; /* orientation=rt */ + color: #9e9e9e; +} + + +.UIHorizontalTabs .NormalTabStyle .HighlightTab .LeftTab { + 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 { + background: url('background/NormalTabStyle.gif') no-repeat right -72px; /* orientation=lt */ + background: url('background/NormalTabStyle-rt.gif') no-repeat right -72px; /* orientation=rt */ +} + +.UIHorizontalTabs .NormalTabStyle .HighlightTab .MiddleTab { + line-height: 24px; + background: url('background/NormalTabStyle.gif') repeat-x center -96px; + cursor: pointer; + padding: 0px 4px; +} + +.UIHorizontalTabs .NormalTabStyle .SelectedTab .LeftTab { + 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 { + 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 { + background: url('background/NormalTabStyle.gif') repeat-x center -94px; + text-align: right; /* orientation=rt */ + white-space: nowrap; /* orientation=rt */ + color: #565656; +} Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/GrayTabStyle.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/GrayTabStyle.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/NormalTabStyle.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/NormalTabStyle.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/SelectTab.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITabSystem/UITabs/background/SelectTab.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +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 .LargeToolbar .LeftToolbar { + background: url('background/LargeToolBar.gif') repeat-x left top; + border: 1px solid #dedede; +} + +.UIToolbar .LargeToolbar .RightToolbar { + background: none; +} + +.UIToolbar .LargeToolbar .MiddleToolbar { + background: none; +} + +.UIToolbar .LargeToolbar .UserButton { + padding-top: 4px; +} + +.UIToolbar .LargeToolbar .GroupButton { + padding-top: 4px; +} + +.UIToolbar .LargeToolbar .MembershipButton { + padding-top: 4px; +} + +.UIToolbar .LargeToolbar .UserManagementIcon { + background: url('background/IconLargeToolBar.gif') no-repeat left top; +} + +.UIToolbar .LargeToolbar .GroupManagementIcon { + width: 54px; + background: url('background/IconLargeToolBar.gif') no-repeat -32px top; +} + +.UIToolbar .LargeToolbar .MembershipManagementIcon { + background: url('background/IconLargeToolBar.gif') no-repeat -86px top; +} + +/* + * minh.js.exo +*/ + +/*#################################- LightToolbar -##############################*/ + + +.UIToolbar .LightToolbar .LeftBar { + background: url('background/LightToolbar.gif') no-repeat left top; +} + +.UIToolbar .LightToolbar .RightBar { + background: url('background/LightToolbar.gif') no-repeat right top; +} + +.UIToolbar .LightToolbar .MiddleBar { + background: url('background/LightToolbar.gif') repeat-x bottom; +} + +/*#################################- HeaderToolbar-##############################*/ + + +.UIToolbar .HeaderToolbar .LeftBar { + background: url('background/HeaderToolbar.gif') no-repeat left top; +} + +.UIToolbar .HeaderToolbar .RightBar { + background: url('background/HeaderToolbar.gif') no-repeat right top; +} + +.UIToolbar .HeaderToolbar .CenterBar { + background: url('background/HeaderToolbar.gif') repeat-x left -31px; +} + Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/BlueLargeToolbar.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/BlueLargeToolbar.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/GrayLine2x2.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/GrayLine2x2.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/HeaderToolbar.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/HeaderToolbar.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/IconLargeToolBar.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/IconLargeToolBar.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/LargeToolBar.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/LargeToolBar.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/LargeToolbar_.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/LargeToolbar_.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/LightToolbar.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/LightToolbar.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/SeparateLine2x1.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UIToolbar/background/SeparateLine2x1.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/Stylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +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 .Node .NodeSelected { + color: #565656; +} + +/** ################# Icons ###################*/ + +.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 */ +} + +.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 */ +} + Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/NormalGroup.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/NormalGroup.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/SelectedGroup.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/webui/component/UITree/background/SelectedGroup.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,4 +1,6 @@ -@import url(SimpleSkin/UIPortalApplicationSkin.css); -@import url(PortletThemes/Stylesheet.css); +@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(/eXoResources/skin/PortletThemes/Stylesheet.css); @import url(Portlet/Stylesheet.css); Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/AddIcon.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/AddIcon.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/BinIcon.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/BinIcon.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/BreadcumbsBar.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/BreadcumbsBar.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/BreadcumbsBar_.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/BreadcumbsBar_.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/EditIcon.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/EditIcon.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/IconLargeToolBar.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/IconLargeToolBar.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/SmallGroup.gif =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleSkin/background/SmallGroup.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleStylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleStylesheet.css (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/exoadmin/organization/webui/component/UIOrganizationPortlet/SimpleStylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -0,0 +1,310 @@ +/** + * 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. + */ + +.UIWindow .UIOrganizationPortlet { + overflow: visible; +} + +.UIOrganizationPortlet { + overflow: auto; + background: white; +} + +.UIOrganizationPortlet .OrganizationPortletContainer { + padding: 7px; + width: auto; +} + +.UIOrganizationPortlet .UIGroupManagement .UITrees .NodeIcon { + white-space:nowrap; +} + +.UIOrganizationPortlet .UIGroupManagement .UIFormGrid { + width: auto; + margin: auto; +} + +.UIOrganizationPortlet .UIToolbar .LargeToolbar { + width: 100%; + margin: 0px 0px 5px 0px; +} + +.UIOrganizationPortlet .UIToolbar .LargeToolbar .SelectButtonLabel { + color: #565656; +} + +.UIOrganizationPortlet .UISearch { + width: 100%; + margin: 0px auto; +} + +.UIOrganizationPortlet .UIToolbar .LargeToolbar .ButtonLabel { + padding-left: 0px; +} + +.UIOrganizationPortlet .UIGroupManagement .UIBreadcumbs .LeftBreadcumbsBar { + padding: 0px 0px 0px 5px; + background: url('SimpleSkin/background/BreadcumbsBar.gif') repeat-x left top; + border: 1px solid #dedede; +} + +.UIOrganizationPortlet .UIGroupManagement .UIBreadcumbs .RightBreadcumbsBar { + padding: 0px 5px 0px 0px; + background: none; + height: 21px; +} + +.UIOrganizationPortlet .UIGroupManagement .UIBreadcumbs .BreadcumbsInfoBar { + height: 21px; + line-height: 21px; + vertical-align: middle; + background: none; + padding: 0px; +} + +.UIOrganizationPortlet .ManagementIconContainer { + padding-top: 4px; + margin-left: 5px; + text-align: center; +} + +.UIOrganizationPortlet .UIFormWithTitle { + width: auto; + margin: auto; +} + +.UIOrganizationPortlet .UIGroupManagement .GroupDetail .UITabPane { + height:auto; +} + +.UIOrganizationPortlet .UIForm .UIFormInputSet { + background: white; + height: 280px; width: auto; + border: solid 1px #dedede; + padding: 20px 0px; + color: #565656; +} + +.UIOrganizationPortlet .UIPersonalInfo .UIItemSelector .ItemDetailList { + height: 320px; +} + +.UIOrganizationPortlet .UIPersonalInfo .UIItemSelector .ItemList { + height: 300px; +} + +.UIOrganizationPortlet .UIPersonalInfo .UIFormInputSet { + border: none; + height: auto; +} + +.UIOrganizationPortlet .UIUserManagement .UIGrid { + margin: 1px auto; +} + +/*#######################- UIUserInfo - #####################*/ + +.UIOrganizationPortlet .UIUserManagement .UIUserInfo { + width: auto; +} + +.UIOrganizationPortlet .PersonalInfoIcon { + float: left; + width: 32px; height: 32px; + background: url('/eXoResources/skin/SimpleSkin/skinIcons/32x32/icons/PersonalInfo.gif'); +} + +.UIOrganizationPortlet .HomeInfoIcon { + float: left; + width: 32px; height: 32px; + background: url('/eXoResources/skin/SimpleSkin/skinIcons/32x32/icons/HomeInfo.gif'); +} + +.UIOrganizationPortlet .BusinessInfoIcon { + float: left; + width: 32px; height: 32px; + background: url('/eXoResources/skin/SimpleSkin/skinIcons/32x32/icons/BusinessInfo.gif'); +} + +.UIOrganizationPortlet .UIUserManagement .UISearchForm { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + height: auto; + width: 100%; +} + +.UIOrganizationPortlet .UISearch .UISearchForm .QuickSet { + width: auto; + _width: 450px; /* orientation=rt */ +} + +.UIOrganizationPortlet .UIUserManagement a.Refresh16x16Icon { + float: right; + width: 20px; height: 20px; + margin: 10px; +} + +/*####################### UIGroupManagement #################################*/ + +.UIOrganizationPortlet .UIGroupManagement { + width: 100%; + margin: auto; +} + +.UIOrganizationPortlet .UIGroupManagement .UITrees { + border: 1px solid #dedede; + border-top: none; + background: #f7f7f7; +} + +.UIOrganizationPortlet .UIGroupManagement .UIGroupInfoContainer .HorizontalLayout { + border: 1px solid #dedede; + border-top: none; + background: #f7f7f7; +} + +.UIOrganizationPortlet .UIGroupManagement .TreeContainer { + height: 218px; +} + +.UIOrganizationPortlet .UIGroupManagement .TitleBar{ + background: url('SimpleSkin/background/BreadcumbsBar.gif') repeat-x bottom; + height: 21px; + line-height: 21px; + border: 1px #dedede solid; + font-weight: bold; + padding-left: 15px; /* orientation=lt */ + padding-right: 15px; /* orientation=rt */ + color: #424242; +} + +.UIOrganizationPortlet .UIGroupManagement .TitleBar .Title { + color: #424242; + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + font-weight: bold; + line-height: 21px; +} + +.UIOrganizationPortlet .UIGroupManagement .UIBreadcumbs { + padding:0px; +} + +.UIOrganizationPortlet .UIGroupManagement .UITabPane { + width: 99.0%; + float: none; margin: auto; + height: auto; +} + +.UIOrganizationPortlet .UIGroupManagement .UIBreadcumbs .HomeIcon { + background: url('SimpleSkin/background/SmallGroup.gif') no-repeat center; + margin: 3px 5px 0px 0px; +} + +.UIOrganizationPortlet .UIGroupManagement .GroupPanel { + overflow: hidden; + padding-top: 3px; + height: auto; +} + +.UIOrganizationPortlet .UIGroupManagement .GroupNavigation { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + width: 220px; +} + +.UIOrganizationPortlet .UIGroupManagement .GroupNavigationContainer { + width: 100%; +} + +.UIOrganizationPortlet .UIGroupManagement .GroupNavigation .TreeActionIcon { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ + margin: 3px 10px 0px 0px; /* orientation=lt */ + margin: 3px 0px 0px 10px; /* orientation=rt */ +} + +.UIOrganizationPortlet .UIGroupManagement .GroupNavigation .RemoveGroupIcon { + width: 16px; height: 16px; + background: url('SimpleSkin/background/BinIcon.gif') no-repeat center; +} + +.UIOrganizationPortlet .UIGroupManagement .GroupNavigation .AddGroupIcon { + width: 16px; height: 16px; + background: url('SimpleSkin/background/AddIcon.gif') no-repeat center; +} + +.UIOrganizationPortlet .UIGroupManagement .GroupNavigation .EditGroupIcon { + width: 16px; height: 16px; + background: url('SimpleSkin/background/EditIcon.gif') no-repeat center; +} + +.UIOrganizationPortlet .UIGroupManagement .GroupDetail { + margin-left: 228px; /* orientation=lt */ + margin-right: 228px; /* orientation=rt */ + height:100%; +} + +.UIOrganizationPortlet .UIGroupManagement .UIGroupMembershipForm { + padding: 5px 0px 0px 0px; + height: 100%; +} + +.UIOrganizationPortlet .UIGroupForm .HorizontalLayout { + height: 198px; +} + +.UIOrganizationPortlet .UIGroupMembershipForm .UIForm select { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ +} + +.UIOrganizationPortlet .UIGroupInfo .UIGroupMembershipForm a.Icon { + background-position: left top; + background-repeat: no-repeat; + float: left; + margin-left: 4px; + height: 24px; width: 24px; +} + +.UIOrganizationPortlet .UIGroupInfo .UIGroupMembershipForm .SearchIcon { + margin-top: 3px; +} + +.UIOrganizationPortlet .UIGroupInfo .ListUserForSearch { + padding: 10px; +} + +.UIOrganizationPortlet .SelectUserIcon { + background: url('/eXoResources/skin/SimpleSkin/skinIcons/16x16/icons/SelectIcon.gif') center; +} + +.UIOrganizationPortlet .UIGroupManagement .UIGroupMembershipForm td.FieldComponent { + width: 278px; +} + +/*####################### UIMemberShipManagement #################################*/ + +.UIOrganizationPortlet .UIMembershipTypeForm { + padding-top: 10px; +} + +.UIOrganizationPortlet .UIMembershipTypeForm .UIFormGrid { + width: auto; +} \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIHomePagePortlet/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIHomePagePortlet/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIHomePagePortlet/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,12 +1,11 @@ -.UIWorkingWorkspace { - width: 1017px; -} - .UIWindow .UIHomePagePortlet { margin: 0px; - padding: 10px; } +.UIWindow .UIHomePagePortlet .TRContainer { + width: 210px; +} + .UIHomePagePortlet { background: white; } Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,309 +1,202 @@ - -/** - * Created by The eXo Platform SARL - * Modifier : Nguyen Ngoc Thuy - * April 23, 2007 - * version: $Id$ - */ - -.UINavigationPortlet { - border-bottom: 1px solid #e5e5e5; -} - -.UINavigationPortlet .UINavigationBar { - white-space: nowrap; -} - -.UINavigationPortlet .UINavigationBar .UIHorizontalTabs { - height: 30px; -} - -.UINavigationPortlet .UINavigationBar .UIHorizontalTabs .TabsContainer { - float: none; - !position: relative; - height: 30px; -} - -.UINavigationPortlet .UINavigationBar .LeftNavigationBar { -} - -.UINavigationPortlet .UINavigationBar .RightNavigationBar { -} - -.UINavigationPortlet .UINavigationBar .MiddleNavigationBar { - padding: 0px 24px; - background: #f9f9f9; -} - -.UINavigationPortlet .UITab a.TabLabel { - display: block; - padding: 0px 0px 0px 20px; /* orientation=lt */ - padding: 0px 20px 0px 0px; /* orientation=rt */ - background-position: left; /* orientation=lt */ - background-position: right; /* orientation=rt */ -} - -.UINavigationPortlet .UITab a.DefaultPageIcon { - background: none; - padding: 0px; -} - -/*###########################--NavigationTabTab--############################*/ - -.UINavigationPortlet .UITab .NormalNavigationTab { - line-height: 230px; - margin: 0px 8px 0px 0px; -} - -.UINavigationPortlet .UITab .NormalNavigationTab .LeftTab { - line-height: 30px; -} - -.UINavigationPortlet .UITab .NormalNavigationTab .RightTab { - line-height: 30px; -} - -.UINavigationPortlet .UITab .NormalNavigationTab .MiddleTab { - line-height: 30px; - text-align: center; - padding: 0px 10px; -} - -.UINavigationPortlet .UITab .NormalNavigationTab .TabIcon { - line-height: 27px; -} - -.UINavigationPortlet .UITab .NormalNavigationTab a { - color: #565656; - font-weight: normal; -} - -.UINavigationPortlet .UITab .NormalNavigationTab .DropDownArrowIcon { - padding-right: 12px; /* orientation=lt */ - padding-left: 12px; /* orientation=rt */ - background: url('background/NavDownArrow.gif') no-repeat right; /* orientation=lt */ - background: url('background/NavDownArrow.gif') no-repeat left; /* orientation=rt */ - cursor: pointer; -} - -/*###############-Hightlight Navigation Tab -################*/ - -.UINavigationPortlet .UITab .HighlightNavigationTab { - line-height: 30px; - margin: 0px 8px 0px 0px; -} - -.UINavigationPortlet .UITab .HighlightNavigationTab .LeftTab { - line-height: 30px; -} - -.UINavigationPortlet .UITab .HighlightNavigationTab .RightTab { - line-height: 30px; -} - -.UINavigationPortlet .UITab .HighlightNavigationTab .MiddleTab { - height: 30px; - text-align: center; - padding: 0px 10px; -} - -.UINavigationPortlet .UITab .HighlightNavigationTab .TabIcon { - color: #000; - line-height: 27px; - border-bottom:3px solid #E5E5E5; -} - -.UINavigationPortlet .UITab .HighlightNavigationTab a { - color: #000; - font-weight: normal; -} - -.UINavigationPortlet .UITab .HighlightNavigationTab .DropDownArrowIcon { - padding-right: 12px; /* orientation=lt */ - padding-left: 12px; /* orientation=rt */ - background: url('background/NavDownArrow.gif') no-repeat right; /* orientation=lt */ - background: url('background/NavDownArrow.gif') no-repeat left; /* orientation=rt */ - cursor: pointer; -} - -/*###############-Selected Navigation Tab-################*/ - -.UINavigationPortlet .UITab .SelectedNavigationTab { - line-height: 30px; - margin: 0px 8px 0px 0px; -} - - -.UINavigationPortlet .UITab .SelectedNavigationTab .LeftTab { - line-height: 30px; -} - -.UINavigationPortlet .UITab .SelectedNavigationTab .RightTab { - line-height: 30px; -} - -.UINavigationPortlet .UITab .SelectedNavigationTab .MiddleTab { - line-height: 30px; - text-align: center; - padding: 0px 10px; -} - -.UINavigationPortlet .UITab .SelectedNavigationTab .TabIcon { - color: #000; - line-height: 27px; - border-bottom: 3px solid #E5E5E5; -} - -.UINavigationPortlet .UITab .SelectedNavigationTab a { - color: #000; -} - -.UINavigationPortlet .UITab .SelectedNavigationTab .DropDownArrowIcon { - padding-right: 12px; /* orientation=lt */ - padding-left: 12px; /* orientation=rt */ - background: url('background/NavDownArrow.gif') no-repeat right center; /* orientation=lt */ - background: url('background/NavDownArrow.gif') no-repeat left center; /* orientation=rt */ - cursor: pointer; -} - -.UINavigationPortlet .MenuItemContainer { - white-space: nowrap; - border: solid #b7b7b7 1px; /*fix for IE*/ - text-align: left; /* orientation=lt */ - text-align: right; /* orientation=rt */ -} - -.UINavigationPortlet .MenuItemContainer .MenuItemDecorator { - border: 1px solid #fcfcfc; - background: white; - padding-bottom: 6px; -} - -.UINavigationPortlet .MenuItemContainer .MenuItem { - border-bottom: 1px solid #fff; - 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 { - line-height: 24px; - width: auto; - background: #c7c7c7; - color: #3e8df0; -} - -.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; -} - -.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 */ } -/*============ Scroll Buttons =====================*/ - -.UINavigationPortlet .ScrollButtons { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - padding-top: 10px; - display: none; -} - -.UINavigationPortlet .ScrollLeftButton { - cursor: pointer; - background: url('background/Button.gif') no-repeat left -15px; /* orientation=lt */ - background: url('background/Button-rt.gif') no-repeat right -15px; /* orientation=rt */ - width: 10px; - height: 15px; - padding-left: 12px; /* orientation=lt */ - padding-right: 12px; /* orientation=rt */ - margin: 0px 5px; -} - -.UINavigationPortlet .ScrollRightButton { - cursor: pointer; - background: url('background/Button.gif') no-repeat right -15px; /* orientation=lt */ - background: url('background/Button-rt.gif') no-repeat left -15px; /* orientation=rt */ - width: 10px; - height: 15px; -} - -.UINavigationPortlet .DisableScrollLeftButton { - cursor: pointer; - background: url('background/Button.gif') no-repeat left -30px; /* orientation=lt */ - background: url('background/Button-rt.gif') no-repeat right -30px; /* orientation=rt */ - width: 10px; - height: 15px; - padding-left: 12px; /* orientation=lt */ - padding-right: 12px; /* orientation=rt */ - margin: 0px 5px; -} - -.UINavigationPortlet .DisableScrollRightButton { - cursor: pointer; - background: url('background/Button.gif') no-repeat right -30px; /* orientation=lt */ - background: url('background/Button-rt.gif') no-repeat left -30px; /* orientation=rt */ - width: 10px; - height: 15px; -} - -.UINavigationPortlet .HighlightScrollLeftButton { - cursor: pointer; - background: url('background/Button.gif') no-repeat left top; /* orientation=lt */ - background: url('background/Button-rt.gif') no-repeat right top; /* orientation=rt */ - width: 10px; - height: 15px; - padding-left: 12px; /* orientation=lt */ - padding-right: 12px; /* orientation=rt */ - margin: 0px 5px; -} - -.UINavigationPortlet .HighlightScrollRightButton { - cursor: pointer; - background: url('background/Button.gif') no-repeat right top; /* orientation=lt */ - background: url('background/Button-rt.gif') no-repeat left top; /* orientation=rt */ - width: 10px; - height: 15px; -} - -/***********GroupNavigation*************/ - -.UINavigationPortlet .GroupNavigation { - background: #f9f9f9; -} - +.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 */ +} + Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/background/NavDownArrow.gif =================================================================== (Binary files differ) Copied: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/background/NavDownArrow_ar.gif (from rev 7355, portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/background/NavDownArrow_ar.gif) =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,118 +0,0 @@ - -/** - * 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: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/CollapseAllIcon.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/CollapseIcon.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/Dotted.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/ExpandAllIcon.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/ExpandIcon.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/LastNode.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/NullItem.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/RootTree.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/SitemapItemBoxTitle150x1.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UISiteMap/background/default_sitemap.gif =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/Todo.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/Todo.xml 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/Todo/Todo.xml 2011-09-12 22:59:10 UTC (rev 7361) @@ -98,52 +98,32 @@ height: 15px; } - .UIAction .ActionContainer { - width: auto; - margin: auto; - } - .UIAction .ActionButton { - display: block; - float: __BIDI_START_EDGE__; + display: inline-block; margin: 0px 3px; cursor: pointer; } - - .UIAction .SimpleStyle {} - - .UIAction .SimpleStyle .ButtonLeft { - background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif') no-repeat left top; - padding: 0px 0px 0px 10px; - height: 21px; - } - - .UIAction .SimpleStyle .ButtonRight { - background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif') no-repeat right top; - padding: 0px 10px 0px 0px ; - height: 21px; - } - - .UIAction .SimpleStyle .ButtonMiddle { - line-height: 21px; - background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif') repeat-x bottom; + + .UIAction .SimpleStyle { + line-height: 20px; + background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif') repeat-x center; text-align: center; padding: 0px 12px; - height: 21px; + white-space: nowrap; + border: 1px solid #c9c9c9; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; + color: #313131; + margin: 0px 6px; + white-space: nowrap; + text-decoration: none; + font-size: 12px; } - - .UIAction .SimpleStyle a { - color: #353535; - margin: 0px 6px; - white-space: nowrap; - font-size: 11px; - text-decoration: none; - display: block; + + .UIAction .SimpleStyle:hover { + color: #1273df; } - - .UIAction .SimpleStyle a:hover { - color: #1273df; - } </style> <script type="text/javascript"> @@ -253,24 +233,10 @@ </div> -<div class="UIAction"> - <table class="ActionContainer"> - <tbody><tr> - <td> - <div class="ActionButton SimpleStyle" onclick="save();"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);">__MSG_save__</a> - </div> - </div> - </div> - </div> - </td> - </tr> - </tbody></table> - </div> - </div> + <div class="UIAction"> + <a href="javascript:void(0);" onclick="save();" class="ActionButton SimpleStyle">__MSG_save__</a> + </div> + </div> ]]> </Content> </Module> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -18,12 +18,7 @@ JavascriptManager jsManager = pcontext.getJavascriptManager(); jsManager.importJavascript("eXo.webui.UITabbedDashboard"); %> -<div id="$uicomponent.id" class="UITabPaneDashboard"> - <div class="LtTabDashboard"> - <div class="RtTabDashboard"> - <div class="CtTabDashboard"> - <div class="UIHorizontalTabs"> - <div class="TabsContainer ClearFix"> +<div id="$uicomponent.id" class="UITabPaneDashboard UIHorizontalTabs ClearFix"> <% int i = 0; for(UserNode node : nodes){ @@ -36,45 +31,20 @@ String param = node.getName(); if(node.getURI().equals(selectedNode.getURI())){ %> - <div class="UITab GrayTabStyle"> - <div class="SelectedTab"> - <div class="LeftTab"> - <div class="RightTab"> - <div class="MiddleTab"> - <% - String ondblclick = "eXo.webui.UITabbedDashboard.showEditLabelInput(this,\"" + param + "\",this.innerHTML)"; - %> - <span ondblclick='$ondblclick'>$tabLabel</span> - <a href="<%= uicomponent.url("DeleteTab",param); %>"> - <img class="CloseIcon" src="/eXoResources/skin/sharedImages/Blank.gif" alt="DEL" /> - </a> - </div> - </div> - </div> - </div> + <div class="UITab SelectedTab"> + <% + String ondblclick = "eXo.webui.UITabbedDashboard.showEditLabelInput(this,\"" + param + "\",this.innerHTML)"; + %> + <span ondblclick='$ondblclick'>$tabLabel</span> + <a href="<%= uicomponent.url("DeleteTab",param); %>" class="CloseIcon" title="DEL"></a> </div> <%}else{ %> - <div class="UITab GrayTabStyle"> - <div class="NormalTab"> - <div class="LeftTab"> - <div class="RightTab"> - <div class="MiddleTab"> - <a href="<%= nodeURL.toString()%>"><span>$tabLabel</span></a> - <a href="<%= uicomponent.url("DeleteTab",param); %>"> - <img class="CloseIcon" src="/eXoResources/skin/sharedImages/Blank.gif" alt="DEL" /> - </a> - </div> - </div> - </div> - </div> - </div> + <div class="UITab NormalTab"> + <a href="<%= nodeURL.toString()%>" class="Tablabel">$tabLabel</a> + <a href="<%= uicomponent.url("DeleteTab",param); %>" class="CloseIcon" title="DEL" ></a> + + </div> <%} %> <% } %> - <div class="AddDashboard" onclick="eXo.webui.UITabbedDashboard.createTabDashboard(this)"><span></span></div> - </div> - </div> - - </div> - </div> - </div> + <a class="AddDashboard" onclick="eXo.webui.UITabbedDashboard.createTabDashboard(this)"></a> </div> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -27,37 +27,29 @@ if (selectedNav != null) { editorLabel = _ctx.appRes("UIAdminToolbarPortlet.action." + selectedNav.getKey().getTypeName() + ".Editor"); } - String accountSetting = "javascript:if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'AccountSettings', true));" -%> -<div class="UIAdminToolbarPortlet" id="$uicomponent.id" > - <div class="UIHorizontalTabs"> - <div class="TabsContainer" > - <div class="UITab NormalToolbarTab"> - <div class=""> - <a class="EditorIcon TBIcon" href="#">$editorLabel</a> - </div> - <div class="MenuItemContainer" style="display:none;"> - <div class="SubBlock"> - <% if(userCouldEditNavigation){ %> - <div class="MenuItem"> - <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'PageCreationWizard', true))" title="" class="ItemIcon AddPageIcon">$addPageLabel</a> - </div> - <% } %> - - <% if(userCouldEditPage){ %> - <div class="MenuItem"> - <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditCurrentPage', true))" title="" class="ItemIcon EditPageIcon">$editPageLabel</a> - </div> - <% } %> - - <% if(userCouldEditPortal){ %> - <div class="MenuItem"> - <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditInline', true))" title="" class="ItemIcon EditSiteIcon">$editSiteLayout</a> - </div> - <% } %> - </div> - </div> - </div> - </div> - </div> -</div> \ No newline at end of file + String accountSetting = "javascript:if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'AccountSettings', true));" +%> +<ul class="UIAdminToolbarPortlet UIHorizontalTabs" id="$uicomponent.id" > + <li class="UITab NormalToolbarTab portlet-menu-item"> + <a class="EditorIcon TBIcon" href="#">$editorLabel</a> + <ul class="MenuItemContainer portlet-menu-cascade" style="display:none;"> + <% if(userCouldEditNavigation){ %> + <li class="MenuItem portlet-menu-cascade-item"> + <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'PageCreationWizard', true))" title="" class="ItemIcon AddPageIcon">$addPageLabel</a> + </li> + <% } %> + + <% if(userCouldEditPage){ %> + <li class="MenuItem portlet-menu-cascade-item"> + <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditCurrentPage', true))" title="" class="ItemIcon EditPageIcon">$editPageLabel</a> + </li> + <% } %> + + <% if(userCouldEditPortal){ %> + <li class="MenuItem portlet-menu-cascade-item"> + <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditInline', true))" title="" class="ItemIcon EditSiteIcon">$editSiteLayout</a> + </li> + <% } %> + </ul> + </li> +</ul> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -9,24 +9,19 @@ String changeLanguageAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ChangeLanguage', true));"; String accountSetting = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'AccountSettings', true));"; String changeSkinAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ChangeSkin', true));"; -%> -<div class="UIStarToolBarPortlet" id="$uicomponent.id" > - <div class="UIHorizontalTabs"> - <div class="TabsContainer"> - <div class="UITab" style="width: 83px"> - <div class=""></div> - <div class="MenuItemContainer" style="display:none;"> - <div class="MenuItem" onclick="$changeLanguageAction"> - <a href="#" class="ChangeLanguageIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.ChangeLanguage")%></a> - </div> - <div class="MenuItem" onclick="$changeSkinAction"> - <a href="#" class="ChangeSkinIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.ChangeSkin")%></a> - </div> - <div class="MenuItem" onclick="eXo.portal.logout();"> - <a href="#" class="SignOutIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.Logout")%></a> - </div> - </div> - </div> - </div> - </div> -</div> \ No newline at end of file +%> +<ul class="UIStarToolBarPortlet UIHorizontalTabs" id="$uicomponent.id" > + <li class="UITab portlet-menu-item" style="width: 83px"> + <ul class="MenuItemContainer portlet-menu-cascade" style="display:none;"> + <li class="MenuItem portlet-menu-cascade-item" onclick="$changeLanguageAction"> + <a href="#" class="ChangeLanguageIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.ChangeLanguage")%></a> + </li> + <li class="MenuItem portlet-menu-cascade-item" onclick="$changeSkinAction"> + <a href="#" class="ChangeSkinIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.ChangeSkin")%></a> + </li> + <li class="MenuItem portlet-menu-cascade-item" onclick="eXo.portal.logout();"> + <a href="#" class="SignOutIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.Logout")%></a> + </li> + </ul> + </li> +</ul> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserInfoPortlet.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserInfoPortlet.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserInfoPortlet.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -5,16 +5,16 @@ def rcontext = _ctx.getRequestContext(); String accountSetting = "javascript:if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'AccountSettings', true));" -%> -<div class="UIUserInfoPortlet" id="$uicomponent.id"> - <div class="Name"> +%> +<ul class="UIUserInfoPortlet" id="$uicomponent.id"> + <li class="Name"> <% if(rcontext.getRemoteUser() != null) { - EntityEncoder encoder = EntityEncoder.FULL; - fullName = encoder.encode(uicomponent.getUser().getFullName()); + EntityEncoder encoder = EntityEncoder.FULL; + fullName = encoder.encode(uicomponent.getUser().getFullName()); %> <a href="$accountSetting"><%=fullName%></a> <%} else {%> <span></span> <%}%> - </div> -</div> + </li> +</li> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -21,15 +21,13 @@ PortalURL nodeURL = nodeurl(); void renderDashboards(PortalURL nodeURL, PortalRequestContext pcontext, Collection nodes) { print """ - <div style="display:none" class="MenuItemContainer"> - <div class="SubBlock"> + <ul style="display:none" class="MenuItemContainer"> """; for(UserNode node : nodes) { renderPageNode(nodeURL, pcontext, node); } print """ - </div> - </div> + </ul> """ ; } @@ -67,33 +65,27 @@ } print """ - <div class="MenuItem $tabStyleNavigation" $getNodeURL> - <div class="$clazz"> + <li class="MenuItem $clazz $tabStyleNavigation" $getNodeURL> """; if(node.pageRef != null) { print """<a class="ItemIcon $icon" href="$href" $title>$label</a>"""; } else { print """<a class="ItemIcon $icon" href="#" $title>$label</a>"""; } - print """ - </div> - """ ; if(hasChild) { print """ - <div class="MenuItemContainer"> - <div class="SubBlock"> + <ul class="MenuItemContainer"> """ ; for(UserNode child : node.getChildren()) { renderPageNode(nodeURL, pcontext, child); } print """ - </div> - </div> + </ul> """ ; } print """ - </div> + </li> """ ; } %> @@ -103,31 +95,19 @@ if(userNodes.size() < 1) { String createDashboardLink = nodeURL.setResource(new NavigationResource(SiteType.USER, rcontext.getRemoteUser(), null)).toString(); %> - <div class="UIUserToolBarDashboardPortlet" id="$uicomponent.id"> - <div class="UIHorizontalTabs"> - <div class="TabsContainer"> - <div class="UITab NormalToolbarTab"> - <div class=""> - <a class="DashboardIcon TBIcon" href="<%= createDashboardLink%>">Dashboard</a> - </div> - </div> - </div> - </div> - </div> + <ul class="UIUserToolBarDashboardPortlet UIHorizontalTabs" id="$uicomponent.id"> + <li class="UITab NormalToolbarTab"> + <a class="DashboardIcon TBIcon" href="<%= createDashboardLink%>">Dashboard</a> + </li> + </ul> <% }else{ String link = nodeURL.setResource(new NavigationResource(SiteType.USER, rcontext.getRemoteUser(), null)).toString(); %> - <div class="UIUserToolBarDashboardPortlet" id="$uicomponent.id" > - <div class="UIHorizontalTabs"> - <div class="TabsContainer" > - <div class="UITab NormalToolbarTab"> - <div class=""> - <a class="DashboardIcon TBIcon" href="<%= link%>">Dashboard</a> - </div> - <% renderDashboards(nodeURL, pcontext, userNodes); %> - </div> - </div> - </div> - </div> + <ul class="UIUserToolBarDashboardPortlet UIHorizontalTabs" id="$uicomponent.id" > + <li class="UITab NormalToolbarTab"> + <a class="DashboardIcon TBIcon" href="<%= link%>">Dashboard</a> + <% renderDashboards(nodeURL, pcontext, userNodes); %> + </li> + </ul> <% } %> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -25,20 +25,16 @@ void renderGroupPageNavigation(UserNavigation navigation, PortalURL nodeURL) { def nodes = uicomponent.getNavigationNodes(navigation); - if(nodes.size() < 1) return ; - String navTitle = _ctx.appRes("UIPageNavigation.label.titleBar") ; - def ownerId = navigation.getKey().getName(); - navTitle = navTitle.replace("{0}", OrganizationUtils.getGroupLabel(ownerId)); + if(nodes.size() < 1) return ; + String navTitle = _ctx.appRes("UIPageNavigation.label.titleBar") ; + def ownerId = navigation.getKey().getName(); + navTitle = navTitle.replace("{0}", OrganizationUtils.getGroupLabel(ownerId)); print """ - <div class="TitleBar portlet-menu-description"><div style="width: 99%" title="$ownerId">$navTitle</div></div> - <div class="SubBlock"> - """ ; - for(UserNode node : nodes) { - renderPageNode(node, nodeURL); - } - print """ - </div> - """ ; + <li class="TitleBar portlet-menu-description" title="$ownerId">$navTitle</li> + """ ; + for(UserNode node : nodes) { + renderPageNode(node, nodeURL); + } } void renderPageNode(UserNode node, PortalURL nodeURL) { @@ -66,58 +62,44 @@ MimeResponse res = _ctx.getRequestContext().getResponse(); ResourceURL resourceURL = res.createResourceURL(); resourceURL.setResourceID(res.encodeURL(groupId + "::" + node.getURI())); - getNodeURL = "exo:getNodeURL='" + resourceURL.toString() + "'"; - } - + getNodeURL = "exo:getNodeURL='" + resourceURL.toString() + "'"; + } + print """ - <div class="MenuItem $tabStyleNavigation portlet-menu-cascade-item" $getNodeURL> - <div class="$clazz"> + <li class="MenuItem $clazz $tabStyleNavigation portlet-menu-cascade-item" $getNodeURL> """; if(node.pageRef != null) { print """<a class="ItemIcon $icon" href="$actionLink" $title>$label</a>"""; } else { print """<a class="ItemIcon $icon" href="#" $title>$label</a>"""; } - print """ - </div> - """ ; if(hasChild) { - print """ - <div class="MenuItemContainer" style="position: absolute; display:none"> - <div class="SubBlock"> + print """ + <ul class="MenuItemContainer portlet-menu-cascade-separator" style="position: absolute; display:none"> """ ; - for(UserNode child : node.getChildren()) { - renderPageNode(child, nodeURL); - } - print """ - </div> - </div> - """ ; - - } - print """ - </div> - """ ; + for(UserNode child : node.getChildren()) { + renderPageNode(child, nodeURL); + } + print """ + </ul> + """ ; + + } + print """ + </li> + """ ; } - def currentPortal = pcontext.getPortalOwner(); + def currentPortal = pcontext.getPortalOwner(); %> -<div class="UIUserToolBarGroupPortlet" id="$uicomponent.id" > - <div class="UIHorizontalTabs"> - <div class="TabsContainer"> - <div class="UITab NormalToolbarTab"> - <div class=""> - <a class="GroupIcon TBIcon" href="<%=nodeURL.setResource(new NavigationResource(SiteType.PORTAL, currentPortal, "groupnavigation")).toString() %>" ><%=_ctx.appRes("UIUserToolBarGroupPortlet.header.group")%></a> - </div> - <% - if (!groupNavigations.isEmpty()) { - %> - <div style="display:none" class="MenuItemContainer"> - <% for(nav in groupNavigations) { - renderGroupPageNavigation(nav, nodeURL); - } %> - </div> - <% } %> - </div> - </div> - </div> -</div> +<ul class="UIUserToolBarGroupPortlet UIHorizontalTabs" id="$uicomponent.id" > + <li class="UITab NormalToolbarTab portlet-menu-item"> + <a class="GroupIcon TBIcon" href="<%=nodeURL.setResource(new NavigationResource(SiteType.PORTAL, currentPortal, "groupnavigation")).toString() %>"><%=_ctx.appRes("UIUserToolBarGroupPortlet.header.group")%></a> + <% if (!groupNavigations.isEmpty()) { %> + <ul style="display:none" class="MenuItemContainer portlet-menu-cascade"> + <% for(nav in groupNavigations) { + renderGroupPageNavigation(nav, nodeURL); + } %> + </ul> + <% } %> + </li> +</ul> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -13,7 +13,7 @@ import org.exoplatform.portal.config.model.PortalConfig; def rcontext = _ctx.getRequestContext() ; - JavascriptManager jsmanager = rcontext.getJavascriptManager(); + JavascriptManager jsmanager = rcontext.getJavascriptManager(); jsmanager.importJavascript('eXo.portal.UIPortalNavigation') ; jsmanager.importJavascript('eXo.portal.UIAdminToolbar') ; jsmanager.addCustomizedOnLoadScript('eXo.portal.UIAdminToolbar.onLoad("' + uicomponent.id + '");'); @@ -23,14 +23,13 @@ void renderPortalNavigations(PortalURL nodeURL) { print """ - <div style="position: absolute; display:none" class="MenuItemContainer"> - <div class="SubBlock"> + <ul style="position: absolute; display:none" class="MenuItemContainer portlet-menu-cascade"> """; boolean isCurrent = false; String clazz = ""; String href = "#"; - for(int i = 0; i < uicomponent.getAllPortalNames().size(); i++) { + for(int i = 0; i < uicomponent.getAllPortalNames().size(); i++) { String portalName = uicomponent.getAllPortalNames().get(i); if(portalName.equals(uicomponent.getCurrentPortal())) { isCurrent = true; @@ -45,37 +44,33 @@ EntityEncoder entityEncoder = EntityEncoder.FULL; label = uicomponent.getPortalLabel(portalName); label = entityEncoder.encode(label); - print """ - <div class="MenuItem portlet-menu-cascade-item"> - <div class="$clazz"> - <a href="$href" class="ItemIcon SiteIcon">$label</a> - </div> + print """ + <li class="MenuItem $clazz portlet-menu-cascade-item"> + <a href="$href" class="ItemIcon SiteIcon">$label</a> """; if(isCurrent) { renderCurrentPortal(nodeURL); } print """ - </div> + </li> """; } print """ - </div> - </div> + + </ul> """; - } + } void renderCurrentPortal(PortalURL nodeURL) { def nodes = _ctx.getRequestContext().getAttribute("nodes"); print """ - <div style="position: absolute; display:none" class="MenuItemContainer"> - <div class="SubBlock"> + <ul style="position: absolute; display:none" class="MenuItemContainer portlet-menu-cascade"> """; for(UserNode node : nodes) { renderPageNode(nodeURL, node); } print """ - </div> - </div> + </ul> """; } @@ -103,12 +98,11 @@ MimeResponse res = _ctx.getRequestContext().getResponse(); ResourceURL resourceURL = res.createResourceURL(); resourceURL.setResourceID(res.encodeURL(node.getURI())); - getNodeURL = "exo:getNodeURL='" + resourceURL.toString() + "'"; + getNodeURL = "exo:getNodeURL='" + resourceURL.toString() + "'"; } print """ - <div class="MenuItem $tabStyleNavigation portlet-menu-cascade-item" $getNodeURL> - <div class="$clazz"> + <li class="MenuItem $tabStyleNavigation $clazz portlet-menu-cascade-item" $getNodeURL> """; if(node.pageRef != null) { print """<a class="ItemIcon $icon" href="$href" $title>$label</a>"""; @@ -116,44 +110,35 @@ print """<a class="ItemIcon $icon" href="#" $title>$label</a>"""; } print """ - </div> + """ ; if(hasChild) { - print """ - <div class="MenuItemContainer portlet-menu-indicator" style="position: absolute; display:none"> - <div class="SubBlock"> + print """ + <ul class="MenuItemContainer portlet-menu-indicator" style="position: absolute; display:none"> """ ; for(UserNode child : node.getChildren()) { renderPageNode(nodeURL, child); - } - print """ - </div> - </div> - """ ; - - } + } + print """ + </ul> + """ ; + + } print """ - </div> - """ ; + </li> + """ ; } - def currentPortal = uicomponent.getCurrentPortal(); def navigation = uicomponent.getNavigation(SiteKey.portal(currentPortal)); def nodes = uicomponent.getNavigationNodes(navigation); - _ctx.getRequestContext().setAttribute("nodes", nodes); -%> - -<div class="UIUserToolBarSitePortlet" id="$uicomponent.id" > - <div class="UIHorizontalTabs"> - <div class="TabsContainer"> - <div class="UITab NormalToolbarTab"> - <div class=""> - <a class="SitesIcon TBIcon" href="<%= nodeURL.setResource(new NavigationResource(SiteType.PORTAL, currentPortal, "portalnavigation")).toString() %>"> - Site - </a> - </div> - <% renderPortalNavigations(nodeURL) %> - </div> - </div> - </div> -</div> + _ctx.getRequestContext().setAttribute("nodes", nodes); +%> + +<ul class="UIUserToolBarSitePortlet UIHorizontalTabs" id="$uicomponent.id" > + <li class="UITab NormalToolbarTab portlet-menu-item"> + <a class="SitesIcon TBIcon" href="<%= nodeURL.setResource(new NavigationResource(SiteType.PORTAL, currentPortal, "portalnavigation")).toString() %>"> + <%=_ctx.appRes("UIUserToolBarSitePortlet.header.site")%> + </a> + <% renderPortalNavigations(nodeURL) %> + </li> +</ul> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -9,21 +9,7 @@ if(uicomponent.userHasRightToAddNavigation()){ %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("AddNavigation")%>" class="ActionButton BlueButton"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".Action.Add")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("AddNavigation")%>" class="ActionButton DarkGrayButton"><%=_ctx.appRes(uicomponent.getId() + ".Action.Add")%></a> </div> <% } Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationManagement.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationManagement.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationManagement.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -24,33 +24,7 @@ uicomponent.renderChild(UINavigationNodeSelector.class); %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - - <td> - <div onclick="<%=uicomponent.event("AddRootNode")%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.addNode")%></a> - </div> - </div> - </div> - </div> - </td> - <td> - <div onclick="<%=uicomponent.event("Save")%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a> - </div> - </div> - </div> - </div> - </td> - - </tr> - </table> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("AddRootNode")%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.addNode")%></a> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Save")%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a> </div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -51,21 +51,7 @@ if(uicomponent.getPortalConfigs() != null && uicomponent.getPortalConfigs().size() > 0){ %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'CreatePortal', true))" class="ActionButton BlueButton"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.addNewPortal")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'CreatePortal', true))" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.addNewPortal")%></a> </div> <% } Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -37,21 +37,7 @@ <%// start render action%> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("Save")%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Save")%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a> </div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -418,86 +418,98 @@ 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('DefaultSkin/background/ControlIcon.gif') repeat-y left -92px; /* orientation=lt */ - background: url('DefaultSkin/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 .UIGadgetEditor .HorizontalLayout input { - width: 97%; -} \ No newline at end of file + overflow: hidden; +} + +.UIPortletManagement .ListCategory .ListItem { + background: #f7f7f7; + border-bottom: 1px solid #dddddd; +} + +.UIPortletManagement .ListCategory .Item { + display: block; + background: url('DefaultSkin/background/ControlIcon.gif') repeat-y left -92px; /* orientation=lt */ + background: url('DefaultSkin/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; + padding-top: 20px; text-align: center; +} + +.UIApplicationRegistryPortlet .UIGadgetManagement .PortletIcons img { + width: 150px; +} + +.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: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -108,32 +108,6 @@ background: url('background/MiniIcon-rt.gif') no-repeat right 2px; /* orientation=rt */ } -.UIManagement .UIAction .ButtonLeft { - background: url('background/Button.gif') no-repeat left top; - padding-left: 5px; -} - -.UIManagement .UIAction .ButtonRight { - background: url('background/Button.gif') no-repeat right top; - padding-right: 5px; -} - -.UIManagement .UIAction .ButtonMiddle { - background: url('background/Button.gif') repeat-x left -24px; - font-size: 11px; - line-height: 24px; - padding: 0px 10px; -} - -.UIManagement .UIAction .ButtonMiddle a { - font-weight: normal; -} - -.UIManagement .UIAction .ButtonMiddle a:hover { - color: #9b9b9b; -} - - /***********************UIAddGroupNavigation************************/ .UIAddGroupNavigation { Deleted: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/Button.gif =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UINavigationPortlet.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UINavigationPortlet.java 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UINavigationPortlet.java 2011-09-12 22:59:10 UTC (rev 7361) @@ -142,7 +142,7 @@ json.put("icon", node.getIcon()); ResourceURL rsURL = res.createResourceURL(); - rsURL.setResourceID(res.encodeURL(node.getURI())); + rsURL.setResourceID(node.getURI()); json.put("getNodeURL", rsURL.toString()); if (node.getPageRef() != null) Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -10,7 +10,7 @@ def rcontext = _ctx.getRequestContext(); JavascriptManager jsmanager = rcontext.getJavascriptManager(); - jsmanager.importJavascript('eXo.webui.UIHorizontalTabs'); + jsmanager.importJavascript('eXo.webui.UIHorizontalTabs'); jsmanager.importJavascript('eXo.portal.UIPortalNavigation'); jsmanager.addOnLoadJavascript('eXo.portal.UIPortalNavigation.onLoad'); jsmanager.addOnLoadJavascript('eXo.portal.UIPortalNavigation.loadScroll'); @@ -20,33 +20,15 @@ PortalURL nodeURL = nodeurl(); public void renderChildrenContainer(UserNode node, PortalURL nodeURL) { - print """ - <div class="MenuItemContainer" style="display: none;"> - <div class="MenuItemDecorator"> - <div class="LeftTopMenuDecorator"> - <div class="RightTopMenuDecorator"> - <div class="CenterTopMenuDecorator"><span></span></div> - </div> - </div> - <div class="LeftMiddleMenuDecorator"> - <div class="RightMiddleMenuDecorator"> - <div class="CenterMiddleMenuDecorator"> + print """ + <ul class="MenuItemContainer " style="display: none;"> """; for(child in node.getChildren()) { renderChildNode(child, nodeURL); } - print """ - </div> - </div> - </div> - <div class="LeftBottomMenuDecorator"> - <div class="RightBottomMenuDecorator"> - <div class="CenterBottomMenuDecorator"><span></span></div> - </div> - </div> - </div> - </div> - """; + print """ + </ul> + """; } public void renderChildNode(UserNode node, PortalURL nodeURL) { @@ -81,27 +63,18 @@ nodeURL.setAjax(uicomponent.isUseAjax()); actionLink = nodeURL.toString(); } - print """ - <div class="MenuItem $tabStyleNavigation" $getNodeURL> - <div class="$arrowIcon" title="$title"> - <div class="ItemIcon $icon"> - <a href="$actionLink">$label</a> - </div> - </div> + print """ + <li class="MenuItem $tabStyleNavigation $arrowIcon" title="$title" $getNodeURL> + <a class="ItemIcon $icon" href="$actionLink">$label</a> """; if (node.getChildren().size() > 0) { renderChildrenContainer(node, nodeURL); } - print "</div>"; + print "</li>"; } %> -<div class="UINavigationBar <%=uicomponent.getCssClassName()%>"> - <div class="LeftNavigationBar"> - <div class="RightNavigationBar"> - <div class="MiddleNavigationBar"> - <div class="UIHorizontalTabs"> - <div class="TabsContainer"> +<ul class="UINavigationBar UIHorizontalTabs <%=uicomponent.getCssClassName()%>" > <% MimeResponse res = _ctx.getRequestContext().getResponse(); @@ -119,63 +92,46 @@ if (node.getChildrenCount() > 0) { javax.portlet.ResourceURL resourceURL = res.createResourceURL(); resourceURL.setResourceID(res.encodeURL(node.getURI())); - %> - <div class="UITab" exo:getNodeURL="<%=resourceURL.toString() %>"> + %> + <li class="UITab $tabStyleNavigation" exo:getNodeURL="<%=resourceURL.toString() %>"> <% } else { %> - <div class="UITab"> - <% } %> - <div class="$tabStyleNavigation"> - <div class="LeftTab"> - <div class="RightTab"> - <div class="MiddleTab"> - <div class="TabIcon"> - <% - String arrowIcon = ""; - if (node.getChildrenCount() > 0) { - arrowIcon = "DropDownArrowIcon"; - } - String iconType = node.getIcon(); - if(iconType == null) iconType = "DefaultPageIcon"; - %> - <div class="$arrowIcon"> - <% - String label = node.getEncodedResolvedLabel(); - if(label.length() > 30) label = label.substring(0,29) + "..."; - if(node.getPageRef() != null) { - nodeURL.setNode(node); - nodeURL.setAjax(uicomponent.isUseAjax()); - print """ - <a class="TabLabel ${iconType}" href="$nodeURL">$label</a> - """; - } else {%> - <a class="TabLabel ${iconType}" href="javascript:void(0)">$label</a> - <%}%> - </div> - </div> - </div> - </div> - </div> - </div> + <li class="UITab $tabStyleNavigation"> + <% } + String arrowIcon = ""; + if (node.getChildrenCount() > 0) { + arrowIcon = "DropDownArrowIcon"; + } + String iconType = node.getIcon(); + if(iconType == null) iconType = "DefaultPageIcon"; + %> + <span class="$arrowIcon"> + <% + String label = node.getEncodedResolvedLabel(); + if(label.length() > 30) label = label.substring(0,29) + "..."; + if(node.getPageRef() != null) { + nodeURL.setNode(node); + nodeURL.setAjax(uicomponent.isUseAjax()); + print """ + <a class="TabIcon ${iconType}" href="$nodeURL">$label</a> + """; + } else {%> + <a class="TabIcon ${iconType}" href="javascript:void(0)">$label</a> + <%}%> + </span> <% /*Render Popup Menu*/ if (node.getChildren().size() > 0) { renderChildrenContainer(node, nodeURL); } %> - </div> + </li> <% } } } %> - <div class="ScrollButtons"> - <div class="ScrollLeftButton" title="<%= _ctx.appRes("UIPortalNavigation.Label.Previous") %>"> - <div class="ScrollRightButton" title="<%= _ctx.appRes("UIPortalNavigation.Label.Next") %>"><span></span></div> - </div> - </div> - </div> - </div> - </div> - </div> - </div> -</div> \ No newline at end of file + <li class="ScrollButtons"> + <a title="<%= _ctx.appRes("UIPortalNavigation.Label.Previous") %>" class="ScrollLeftButton"></a> + <a title="<%= _ctx.appRes("UIPortalNavigation.Label.Next") %>" class="ScrollRightButton"></a> + </li> +</ul> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/NavDownArrow.gif =================================================================== (Binary files differ) Copied: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/NavDownArrowHover.gif (from rev 7355, portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/NavDownArrowHover.gif) =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,3 +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. + */ /** * Created by The eXo Platform SARL @@ -6,224 +24,145 @@ * version: $Id$ */ +.UINavigationPortlet ul { + list-style:none; + padding:0px; + margin:0px; +} + .UINavigationPortlet { - background: #a3a3a3; - padding: 0; - border-top: 1px solid #fff; - border-bottom: 1px solid #fff; - border-left: 1px solid #b4b4b4; - border-right: 1px solid #b4b4b4; + background: #b6b6b6; + padding: 0px 8px; } .UINavigationPortlet .UINavigationBar { white-space: nowrap; -} - -.UINavigationPortlet .UINavigationBar .UIHorizontalTabs { - height: 30px; -} - -.UINavigationPortlet .UINavigationBar .UIHorizontalTabs .TabsContainer { - float: none; + background-color:#0e4aaa; + padding: 0 10px; + height: 33px; !position: relative; + -moz-border-radius-topleft: 5px; /* Firefox up to version 3.6 */ + -moz-border-radius-topright: 5px; + -webkit-border-top-left-radius: 5px; /* Safari, Chrome (before WebKit version 533) */ + -webkit-border-top-right-radius: 5px; + border-top-left-radius: 5px; /*Firefox 4; browsers with CSS3 support */ + border-top-right-radius: 5px; } -.UINavigationPortlet .UINavigationBar .LeftNavigationBar { - background: url('DefaultSkin/background/nav-bg.jpg') no-repeat left top; /* orientation=lt */ - background: url('DefaultSkin/background/nav-bg-rtl.jpg') no-repeat left top; /* orientation=rt */ - /*padding-left: 3px;*/ - height: 30px; +.UINavigationPortlet .UINavigationBar .UITab { + float:left;/* orientation=lt */ + float:right;/* orientation=rt */ + margin: 6px 10px 0 0; + font-weight:bold; + text-align:center; } - -.UINavigationPortlet .UINavigationBar .RightNavigationBar { - /*padding-right: 3px;*/ - background: none; - height: 29px; -} - -.UINavigationPortlet .UINavigationBar .MiddleNavigationBar { - height: 29px; - background: none; - padding: 0px 8px 0px 8px; -} - -.UINavigationPortlet .UITab a.TabLabel { - display: block; - padding: 0px 0px 0px 20px; /* orientation=lt */ - padding: 0px 20px 0px 0px; /* orientation=rt */ - background-position: left; /* orientation=lt */ - background-position: right; /* orientation=rt */ -} - -.UINavigationPortlet .UITab a.DefaultPageIcon { - background: none; - padding: 0px; -} - -/*###########################--NavigationTabTab--############################*/ - -.UINavigationPortlet .UITab .NormalNavigationTab { - line-height: 26px; - margin: 4px 8px 0px 0px; -} - -.UINavigationPortlet .UITab .NormalNavigationTab .LeftTab { +.UINavigationPortlet .UITab > span { + padding: 0 6px; + color: #f57a00; line-height: 21px; - padding-left: 11px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + display:block; + zoom:1; } -.UINavigationPortlet .UITab .NormalNavigationTab .RightTab { - line-height: 21px; - padding-right: 3px; +.UINavigationPortlet .UITab .DropDownArrowIcon { + padding: 0 19px 0 6px;/* orientation=lt */ + padding: 0 6px 0 19px;/* orientation=rt */ } -.UINavigationPortlet .UITab .NormalNavigationTab .MiddleTab { - line-height: 21px; - text-align: center; - padding: 1px 4px 0px 4px; +.UINavigationPortlet .UITab a.TabIcon { + display:block; + padding:0 0 0 21px;/* orientation=lt */ + padding:0 21px 0 0px;/* orientation=rt */ + background-position: right;/* orientation=rt */ } -.UINavigationPortlet .UITab .NormalNavigationTab .TabIcon { - color: #fff; - line-height: 21px; +.UINavigationPortlet .UITab > span a.DefaultPageIcon { + background:none; + padding:0; } -.UINavigationPortlet .UITab .NormalNavigationTab a { - color: #fff; -} -.UINavigationPortlet .UITab .NormalNavigationTab .DropDownArrowIcon { - padding-right: 16px; /* orientation=lt */ - padding-left: 16px; /* orientation=rt */ - background: none; /* orientation=lt */ - background: none; /* orientation=rt */ - cursor: pointer; -} +/*###############-Selected Navigation Tab-################*/ -/*###############-Hightlight Navigation Tab -################*/ - -.UINavigationPortlet .UITab .HighlightNavigationTab { - line-height: 29px; - /*margin: 0px 8px 0px 0px;*/ +.UINavigationPortlet .UINavigationBar .SelectedNavigationTab { + line-height: 26px; + background: url('DefaultSkin/background/NavigationTab.gif') no-repeat center -82px; + padding-bottom: 5px; } -.UINavigationPortlet .UITab .HighlightNavigationTab .LeftTab { - line-height: 29px; - padding-left: 3px; - background: #fff url('DefaultSkin/background/active-button-bg.gif') repeat-x 0 0; - border-left: 1px solid #000; +.UINavigationPortlet .SelectedNavigationTab > span { + background-color:#fff; } -.UINavigationPortlet .UITab .HighlightNavigationTab .RightTab { - line-height: 29px; - padding-right: 3px; - background: #fff url('DefaultSkin/background/active-button-bg.gif') repeat-x 0 0; - border-right: 1px solid #000; +.UINavigationPortlet .SelectedNavigationTab a { + color: #f57a00; } -.UINavigationPortlet .UITab .HighlightNavigationTab .MiddleTab { - height: 29px; - text-align: center; - padding: 1px 4px 0px 4px; - background: none; - margin-bottom: 0; +.UINavigationPortlet .SelectedNavigationTab .DropDownArrowIcon { + background:#fff url('DefaultSkin/background/NavDownArrowHover.gif') no-repeat right center; /* orientation=lt */ + background:#fff url('DefaultSkin/background/NavDownArrowHover.gif') no-repeat left center; /* orientation=rt */ } -.UINavigationPortlet .UITab .HighlightNavigationTab .TabIcon { - color: #fff; - line-height: 29px; -} +/*###########################-NormalNavigationTab--############################*/ -.UINavigationPortlet .UITab .HighlightNavigationTab a { - color: #3c3c3c; -} -.UINavigationPortlet .UITab .HighlightNavigationTab .DropDownArrowIcon { - padding-right: 0px; /* orientation=lt */ - padding-left: 0px; /* orientation=rt */ +.UINavigationPortlet .NormalNavigationTab .DropDownArrowIcon { background: url('DefaultSkin/background/NavDownArrow.gif') no-repeat right; /* orientation=lt */ background: url('DefaultSkin/background/NavDownArrow.gif') no-repeat left; /* orientation=rt */ - cursor: default; + cursor: pointer; } -/*###############-Selected Navigation Tab-################*/ +/*###########################-Hightlight-NavigationTabTab--############################*/ -.UINavigationPortlet .UITab .SelectedNavigationTab { - line-height: 29px; - /*margin: 0 8px 0px 0px;*/ +.UINavigationPortlet .HighlightNavigationTab .TabIcon ,.UINavigationPortlet .NormalNavigationTab .TabIcon{ + color: #fff; } - -.UINavigationPortlet .UITab .SelectedNavigationTab .LeftTab { - line-height: 29px; - padding-left: 3px; - background: #fff url('DefaultSkin/background/active-button-bg.gif') repeat-x 0 0; - border-left: 1px solid #000; +.UINavigationPortlet .HighlightNavigationTab > span { + background-color:#6D94C8; + margin-bottom: 5px; } -.UINavigationPortlet .UITab .SelectedNavigationTab .RightTab { - line-height: 29px; - padding-right: 3px; - background: #fff url('DefaultSkin/background/active-button-bg.gif') repeat-x 0 0; - border-right: 1px solid #000; -} -.UINavigationPortlet .UITab .SelectedNavigationTab .MiddleTab { - height: 29px; - text-align: center; - padding: 1px 4px 0px 4px; - background: none; - margin-bottom: 0; +.UINavigationPortlet .HighlightNavigationTab .DropDownArrowIcon { + background:#6D94C8 url('DefaultSkin/background/NavDownArrow.gif') no-repeat right center; /* orientation=lt */ + background:#6D94C8 url('DefaultSkin/background/NavDownArrow.gif') no-repeat left center; /* orientation=rt */ } -.UINavigationPortlet .UITab .SelectedNavigationTab .TabIcon { - color: #fff; - line-height: 29px; - padding-bottom:0; - background: none; -} +/*============ Submenu =====================*/ -.UINavigationPortlet .UITab .SelectedNavigationTab a { - color: #3c3c3c; -} - -.UINavigationPortlet .UITab .SelectedNavigationTab .DropDownArrowIcon { - padding-right: 16px; /* orientation=lt */ - padding-left: 16px; /* orientation=rt */ - background: none; /* orientation=lt */ - background: none; /* orientation=rt */ - cursor: pointer; - border-right: 1px solid white; -} - .UINavigationPortlet .MenuItemContainer { white-space: nowrap; border: solid #b7b7b7 1px; /*fix for IE*/ text-align: left; /* orientation=lt */ text-align: right; /* orientation=rt */ - z-index: 1; -} - -.UINavigationPortlet .MenuItemContainer .MenuItemDecorator { - border: 1px solid #fcfcfc; - background: white; - padding-bottom: 6px; + z-index: 1; + background: #FFF; + padding: 1px 1px 6px 1px; opacity: 0.9; - filter: alpha(opacity=90); } .UINavigationPortlet .MenuItemContainer .MenuItem { border-bottom: 1px solid #fff; cursor: pointer; line-height: 24px; - height: 24px; width: auto; + height: 24px; + width: auto; display: block; white-space: nowrap; font-weight: normal; - padding-left: 5px; /* orientation=lt */ - padding-right: 5px; /* orientation=rt */ + padding:0 5px; } +.UINavigationPortlet .MenuItemContainer .ArrowIcon{ + background: url('DefaultSkin/background/Button.gif') no-repeat right -46px; /* orientation=lt */ + background: url('DefaultSkin/background/Button-rt.gif') no-repeat left -46px; /* orientation=rt */ +} + + .UINavigationPortlet .MenuItemContainer .MenuItem a { padding: 0px 20px 0px 25px; /* orientation=lt */ padding: 0px 25px 0px 20px; /* orientation=rt */ @@ -237,11 +176,11 @@ .UINavigationPortlet .MenuItemContainer .SelectedItem { line-height: 24px; width: auto; - background: #c7c7c7; + background-color: #c7c7c7; color: #3e8df0; } -.UINavigationPortlet .MenuItemContainer .SelectedItem a { +.UINavigationPortlet .MenuItemContainer .SelectedItem a { color: #3e8df0; } @@ -258,115 +197,69 @@ } .UINavigationPortlet .MenuItemContainer .ItemIcon { - height: 24px; width: auto; -} - -.UINavigationPortlet .MenuItemContainer .MenuItem .ArrowIcon { height: 24px; width: auto; - background: url('DefaultSkin/background/Button.gif') no-repeat right -48px; /* orientation=lt */ - background: url('DefaultSkin/background/Button-rt.gif') no-repeat left -48px; /* orientation=rt */ -} + background-position: right;/* orientation=rt */ +} /*============ Scroll Buttons =====================*/ -.UINavigationPortlet .ScrollButtons { +.UINavigationPortlet .ScrollButtons { + margin: 10px 0 0 0; + display: none; + cursor:pointer; float: right; /* orientation=lt */ float: left; /* orientation=rt */ - padding-top: 10px; - display: none; + 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 { - cursor: pointer; background: url('DefaultSkin/background/Button.gif') no-repeat left -15px; /* orientation=lt */ background: url('DefaultSkin/background/Button-rt.gif') no-repeat right -15px; /* orientation=rt */ - width: 10px; - height: 15px; - padding-left: 12px; /* orientation=lt */ - padding-right: 12px; /* orientation=rt */ - margin: 0px 5px; + } .UINavigationPortlet .ScrollRightButton { - cursor: pointer; background: url('DefaultSkin/background/Button.gif') no-repeat right -15px; /* orientation=lt */ background: url('DefaultSkin/background/Button-rt.gif') no-repeat left -15px; /* orientation=rt */ - width: 10px; - height: 15px; } .UINavigationPortlet .DisableScrollLeftButton { - cursor: pointer; background: url('DefaultSkin/background/Button.gif') no-repeat left -30px; /* orientation=lt */ background: url('DefaultSkin/background/Button-rt.gif') no-repeat right -30px; /* orientation=rt */ - width: 10px; - height: 15px; - padding-left: 12px; /* orientation=lt */ - padding-right: 12px; /* orientation=rt */ - margin: 0px 5px; } .UINavigationPortlet .DisableScrollRightButton { - cursor: pointer; background: url('DefaultSkin/background/Button.gif') no-repeat right -30px; /* orientation=lt */ background: url('DefaultSkin/background/Button-rt.gif') no-repeat left -30px; /* orientation=rt */ - width: 10px; - height: 15px; } -.UINavigationPortlet .HighlightScrollLeftButton { - cursor: pointer; +.UINavigationPortlet .HighlightScrollLeftButton ,.UINavigationPortlet .ScrollLeftButton:hover{ background: url('DefaultSkin/background/Button.gif') no-repeat left top; /* orientation=lt */ background: url('DefaultSkin/background/Button-rt.gif') no-repeat right top; /* orientation=rt */ - width: 10px; - height: 15px; - padding-left: 12px; /* orientation=lt */ - padding-right: 12px; /* orientation=rt */ - margin: 0px 5px; } -.UINavigationPortlet .HighlightScrollRightButton { - cursor: pointer; +.UINavigationPortlet .HighlightScrollRightButton,.UINavigationPortlet .ScrollRightButton:hover { background: url('DefaultSkin/background/Button.gif') no-repeat right top; /* orientation=lt */ background: url('DefaultSkin/background/Button-rt.gif') no-repeat left top; /* orientation=rt */ - width: 10px; - height: 15px; } /***********GroupNavigation*************/ -.UINavigationPortlet .GroupNavigation .LeftNavigationBar { - background: #c7c3ad none no-repeat left top; -} -.UINavigationPortlet .GroupNavigation .RightNavigationBar { - background: #c7c3ad none no-repeat right top; +.UINavigationPortlet .GroupNavigation { + background-color:#ffa200; } -.UINavigationPortlet .GroupNavigation .MiddleNavigationBar { - background: #c7c3ad none repeat-x center bottom; -} - -.UINavigationPortlet .GroupNavigation .UITab .HighlightNavigationTab .LeftTab { - background: #fff none no-repeat left -152px; -} - -.UINavigationPortlet .GroupNavigation .UITab .HighlightNavigationTab .RightTab { - background: #fff none no-repeat right -174px;} - -.UINavigationPortlet .GroupNavigation .UITab .HighlightNavigationTab .MiddleTab { - background: #fff; -} - -.UINavigationPortlet .GroupNavigation .UITab .SelectedNavigationTab .LeftTab { - background: #fff none no-repeat left -28px; -} - -.UINavigationPortlet .GroupNavigation .UITab .SelectedNavigationTab .RightTab { - background: #fff none no-repeat right -55px; -} - -.UINavigationPortlet .GroupNavigation .UITab .SelectedNavigationTab .MiddleTab { - background: #fff none repeat-x; -} - +.UINavigationPortlet .GroupNavigation .HighlightNavigationTab > span { + background-color:#ffcf01; +} Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/src/main/webapp/groovy/webui/component/UISampleDownloadUpload.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/src/main/webapp/groovy/webui/component/UISampleDownloadUpload.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/src/main/webapp/groovy/webui/component/UISampleDownloadUpload.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -48,23 +48,8 @@ <tr> <td> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - - <div onclick="<%=uicomponent.event("Submit")%>" class="ActionButton LightBlueStyle" onmouseover="this.style.color = '#058ee6'" onmouseout="this.style.color='black'"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);">Save</a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> - </div> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Submit")%>" class="ActionButton LightBlueStyle">Save</a> + </div> </td> </tr> </table> Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/UIGadget.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/UIGadget.js 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/UIGadget.js 2011-09-12 22:59:10 UTC (rev 7361) @@ -99,7 +99,7 @@ } else { var gadgetControl = eXo.core.DOMUtil.findFirstDescendantByClass(uiGadget, "div", "GadgetControl"); gadgetControl.style.display = "block"; - var gadgetTitle = eXo.core.DOMUtil.findFirstDescendantByClass(gadgetControl, "div", "GadgetTitle") ; + var gadgetTitle = eXo.core.DOMUtil.findFirstDescendantByClass(gadgetControl, "span", "GadgetTitle") ; gadgetTitle.style.display = "block"; if (metadata && metadata.modulePrefs.title != null && metadata.modulePrefs.title.length > 0) gadgetTitle.innerHTML = metadata.modulePrefs.title; } Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIAdminToolbar.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIAdminToolbar.js 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIAdminToolbar.js 2011-09-12 22:59:10 UTC (rev 7361) @@ -19,8 +19,8 @@ function UIAdminToolbar() {} ; UIAdminToolbar.prototype.onLoad = function(baseId) { - var uiNavPortlet = document.getElementById(baseId) ; - var mainContainer = eXo.core.DOMUtil.findFirstDescendantByClass(uiNavPortlet, "div", "TabsContainer"); + var uiNavPortlet = document.getElementById(baseId).parentNode ; + var mainContainer = eXo.core.DOMUtil.findFirstDescendantByClass(uiNavPortlet, "ul", "UIHorizontalTabs"); if(mainContainer) eXo.portal.UIPortalNavigation.init(uiNavPortlet, mainContainer, 0, 0); } ; Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2011-09-12 22:59:10 UTC (rev 7361) @@ -637,19 +637,13 @@ UIPortal.prototype.toggleComposer = function(clickedEle) { var portalComposer = eXo.core.DOMUtil.findAncestorByClass(clickedEle, "UIPortalComposer"); - var middleBlock = eXo.core.DOMUtil.findFirstChildByClass(portalComposer, "div", "MLPortalComposer"); - var bottomBlock = eXo.core.DOMUtil.findFirstChildByClass(portalComposer, "div", "BLPortalComposer"); - var fakeBottom = eXo.core.DOMUtil.findFirstChildByClass(portalComposer, "div", "Bottom"); - if(middleBlock && middleBlock.style.display != "none") { - middleBlock.style.display = "none"; - bottomBlock.style.display = "none"; - fakeBottom.style.display = "block"; - eXo.core.DOMUtil.replaceClass(clickedEle, "ExpandIcon", "CollapseIcon"); + var content = eXo.core.DOMUtil.findFirstChildByClass(portalComposer, "div", "UIWindowContent"); + if(content && content.style.display != "none") { + content.style.display = "none"; + eXo.core.DOMUtil.replaceClass(clickedEle, "ExpandIcon", "CollapseIcon"); } else { - middleBlock.style.display = "block"; - bottomBlock.style.display = "block"; - fakeBottom.style.display = "none"; - eXo.core.DOMUtil.replaceClass(clickedEle, "CollapseIcon", "ExpandIcon"); + content.style.display = "block"; + eXo.core.DOMUtil.replaceClass(clickedEle, "CollapseIcon", "ExpandIcon"); } var requestStr = eXo.env.server.createPortalURL(portalComposer.id, "Toggle", true); ajaxAsyncGetRequest(requestStr); Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalControl.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalControl.js 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalControl.js 2011-09-12 22:59:10 UTC (rev 7361) @@ -183,7 +183,7 @@ ScrollManager.prototype.loadElements = function(elementClass, clean) { if (clean) this.cleanElements(); this.elements.clear(); - this.elements.pushAll(eXo.core.DOMUtil.findDescendantsByClass(this.mainContainer, "div", elementClass)); + this.elements.pushAll(eXo.core.DOMUtil.findDescendantsByClass(this.mainContainer, "li", elementClass)); }; /** * Calculates the available space for the elements, and inits the elements array like this : Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2011-09-12 22:59:10 UTC (rev 7361) @@ -50,7 +50,7 @@ var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace"); var uiNavPortlets = eXo.core.DOMUtil.findDescendantsByClass(uiWorkingWorkspace, "div", "UINavigationPortlet"); if (uiNavPortlets.length) { - var mainContainer = eXo.core.DOMUtil.findFirstDescendantByClass(uiNavPortlets[0], "div", "TabsContainer"); + var mainContainer = eXo.core.DOMUtil.findFirstDescendantByClass(uiNavPortlets[0], "ul", "UIHorizontalTabs"); eXo.portal.UIPortalNavigation.init(uiNavPortlets[0], mainContainer, 0, 0); for (var i = 1; i < uiNavPortlets.length; ++i) { uiNavPortlets[i].style.display = "none"; @@ -71,10 +71,10 @@ */ UIPortalNavigation.prototype.buildMenu = function(popupMenu) { var DOMUtil = eXo.core.DOMUtil; - var topContainer = DOMUtil.findFirstDescendantByClass(popupMenu, "div", "TabsContainer"); + var topContainer = DOMUtil.findFirstDescendantByClass(popupMenu, "ul", "UIHorizontalTabs"); topContainer.id = "PortalNavigationTopContainer"; // Top menu items - var topItems = DOMUtil.findDescendantsByClass(topContainer, "div", "UITab"); + var topItems = DOMUtil.findDescendantsByClass(topContainer, "li", "UITab"); for (var i = 0; i < topItems.length; i++) { var item = topItems[i]; item.onmouseover = eXo.portal.UIPortalNavigation.setTabStyleOnMouseOver ; @@ -88,7 +88,7 @@ /** * TODO: fix IE7; */ - var container = DOMUtil.findFirstDescendantByClass(item, "div", this.containerStyleClass); + var container = DOMUtil.findFirstDescendantByClass(item, "ul", this.containerStyleClass); if (container) { if (eXo.core.Browser.isIE6()) { container.style.width = item.offsetWidth + "px"; @@ -97,20 +97,19 @@ } } - var itemConts = DOMUtil.findDescendantsByClass(topContainer, "div", this.containerStyleClass); + var itemConts = DOMUtil.findDescendantsByClass(topContainer, "ul", this.containerStyleClass); for (var i = 0; i < itemConts.length; i++) { var cont = itemConts[i]; if(!cont.id) cont.id = DOMUtil.generateId("PortalNavigationContainer"); cont.resized = false; - var items = DOMUtil.findDescendantsByClass(cont, "div", this.tabStyleClass); + var items = DOMUtil.findDescendantsByClass(cont, "li", this.tabStyleClass); if(items.length == 0) cont.parentNode.removeChild(cont); for(var j = 0; j < items.length; j ++) { items[j].onmouseover = eXo.portal.UIPortalNavigation.onMenuItemOver; items[j].onmouseout = eXo.portal.UIPortalNavigation.onMenuItemOut; } } - }; /** * Sets the tab style on mouse over and mouse out @@ -132,31 +131,25 @@ //} UIPortalNavigation.prototype.generateContainer = function(data) { - var htmlFrags = "<div class='" + this.containerStyleClass + "' style='display: none;' id='"; + var htmlFrags = "<ul class='" + this.containerStyleClass + "' style='display: none;' id='"; htmlFrags += eXo.core.DOMUtil.generateId("PortalNavigationContainer") + "' resized='false'>"; - htmlFrags += "<div class='MenuItemDecorator'>"; - htmlFrags += "<div class='LeftTopMenuDecorator'><div class='RightTopMenuDecorator'>"; - htmlFrags += "<div class='CenterTopMenuDecorator'><span></span></div></div></div>"; - htmlFrags += "<div class='LeftMiddleMenuDecorator'><div class='RightMiddleMenuDecorator'>"; - htmlFrags += "<div class='CenterMiddleMenuDecorator'>"; + for (var i = 0; i < data.length; i++) { var node = data[i]; var actionLink = node.actionLink ? node.actionLink : "javascript:void(0);"; - htmlFrags += ("<div class='MenuItem " + (node.isSelected ? "SelectedItem'" : "NormalItem'")); + htmlFrags += ("<li class='MenuItem " + (node.hasChild ? "ArrowIcon " : "") + (node.isSelected ? "SelectedItem'" : "NormalItem'")); htmlFrags += (node.hasChild ? (" exo:getNodeURL='" + node.getNodeURL + "' ") : "" ); - htmlFrags += ("onmouseover='eXo.portal.UIPortalNavigation.onMenuItemOver(this)' onmouseout='eXo.portal.UIPortalNavigation.onMenuItemOut(this)'>"); - htmlFrags += ("<div class='" + (node.hasChild ? "ArrowIcon" : "") + "' title='" + node.label + "'>"); - htmlFrags += ("<div class='ItemIcon " + (node.icon ? node.icon : "DefaultPageIcon") + "'>"); - htmlFrags += ("<a href='" + actionLink + "'>" + (node.label.length > 40 ? node.label.substring(0,37) + "..." : node.label) + "</a>"); - htmlFrags += ("</div></div>"); + htmlFrags += ("onmouseover='eXo.portal.UIPortalNavigation.onMenuItemOver(this)' onmouseout='eXo.portal.UIPortalNavigation.onMenuItemOut(this)'"); + htmlFrags += ("' title='" + node.label + "'>"); + htmlFrags += ("<a class='ItemIcon " + (node.icon ? node.icon : "DefaultPageIcon") + "'" + + "href='" + actionLink + "'>" + (node.label.length > 40 ? node.label.substring(0,37) + "..." : node.label) + "</a>"); if (node.childs.length) { htmlFrags += eXo.portal.UIPortalNavigation.generateContainer(node.childs); } - htmlFrags += "</div>"; + htmlFrags += "</li>"; } - htmlFrags += "</div></div></div><div class='LeftBottomMenuDecorator'><div class='RightBottomMenuDecorator'>"; - htmlFrags += "<div class='CenterBottomMenuDecorator'><span></span></div></div></div></div></div>"; + htmlFrags += "</ul>"; return htmlFrags; }; @@ -169,7 +162,7 @@ eXo.portal.UIPortalNavigation.previousMenuItem = tab ; var getNodeURL = tab.getAttribute("exo:getNodeURL"); - var menuItemContainer = eXo.core.DOMUtil.findFirstDescendantByClass(tab, "div", eXo.portal.UIPortalNavigation.containerStyleClass); + var menuItemContainer = eXo.core.DOMUtil.findFirstDescendantByClass(tab, "ul", eXo.portal.UIPortalNavigation.containerStyleClass); if (getNodeURL && !menuItemContainer) { var jsChilds = ajaxAsyncGetRequest(getNodeURL,false) try { @@ -181,12 +174,12 @@ } var temp = document.createElement("div"); temp.innerHTML = eXo.portal.UIPortalNavigation.generateContainer(data); - tab.appendChild(eXo.core.DOMUtil.findFirstChildByClass(temp, "div", eXo.portal.UIPortalNavigation.containerStyleClass)); + tab.appendChild(eXo.core.DOMUtil.findFirstChildByClass(temp, "ul", eXo.portal.UIPortalNavigation.containerStyleClass)); } if (!eXo.portal.UIPortalNavigation.menuVisible) { var hideSubmenu = tab.getAttribute('hideSubmenu') ; - menuItemContainer = eXo.core.DOMUtil.findFirstDescendantByClass(tab, "div", eXo.portal.UIPortalNavigation.containerStyleClass); + menuItemContainer = eXo.core.DOMUtil.findFirstDescendantByClass(tab, "ul", eXo.portal.UIPortalNavigation.containerStyleClass); if (menuItemContainer && !hideSubmenu) { var DOMUtil = eXo.core.DOMUtil ; if(eXo.core.Browser.browserType == "ie") { @@ -197,7 +190,7 @@ for(var i = 0; i < uicomponents.length; i ++) { var navPortlet = DOMUtil.findFirstDescendantByClass(uicomponents[i], "div", "UINavigationPortlet") ; if(navPortlet && (navAncestor != navPortlet)) { - var tabsContainer = DOMUtil.findFirstDescendantByClass(navPortlet, "div", "TabsContainer"); + var tabsContainer = DOMUtil.findFirstDescendantByClass(navPortlet, "ul", "UIHorizontalTabs"); tabsContainer.style.position = "static" ; } } @@ -213,15 +206,11 @@ UIPortalNavigation.prototype.setTabStyleOnMouseOut = function(e, src) { var tab = src || this; - var tabChildren = eXo.core.DOMUtil.getChildrenByTagName(tab, "div") ; - if (tabChildren.length <= 0) { - return ; - } - if (tabChildren[0].className != "HighlightNavigationTab") { + if (!eXo.core.DOMUtil.hasClass(tab, "HighlightNavigationTab")) { // highlights the tab eXo.webui.UIHorizontalTabs.changeTabNavigationStyle(tab, true); } else { - if(tabChildren.length <= 1 || tabChildren[1].id != eXo.portal.UIPortalNavigation.currentOpenedMenu) { + if(tab.id != eXo.portal.UIPortalNavigation.currentOpenedMenu) { // de-highlights the tab if it doesn't have a submenu (cond 1) or its submenu isn't visible (cond 2) eXo.webui.UIHorizontalTabs.changeTabNavigationStyle(tab, false); } @@ -276,8 +265,8 @@ eXo.portal.UIPortalNavigation.superClass.setPosition(menuItemContainer, x, y, eXo.core.I18n.isRT()); eXo.portal.UIPortalNavigation.superClass.show(menuItemContainer); - menuItemContainer.style.width = menuItemContainer.offsetWidth - parseInt(DOMUtil.getStyle(menuItemContainer, "borderLeftWidth")) - - parseInt(DOMUtil.getStyle(menuItemContainer, "borderRightWidth")) + "px"; + menuItemContainer.style.width = menuItemContainer.offsetWidth - parseInt(DOMUtil.getStyle(menuItemContainer, "borderLeftWidth",true)) + - parseInt(DOMUtil.getStyle(menuItemContainer, "borderRightWidth",true)) + "px"; var posXinBrowser = eXo.core.Browser.findPosX(menuItemContainer); if(eXo.core.I18n.isLT()) { if(posXinBrowser + menuItemContainer.offsetWidth >= eXo.core.Browser.getBrowserWidth()) { @@ -357,7 +346,7 @@ for(var i = 0; i < uicomponents.length; i ++) { var navPortlet = DOMUtil.findFirstDescendantByClass(uicomponents[i], "div", "UINavigationPortlet") ; if(navPortlet) { - var tabsContainer = DOMUtil.findFirstDescendantByClass(navPortlet, "div", "TabsContainer"); + var tabsContainer = DOMUtil.findFirstDescendantByClass(navPortlet, "ul", "UIHorizontalTabs"); tabsContainer.style.position = "relative" ; } } @@ -373,7 +362,7 @@ var DOMUtil = eXo.core.DOMUtil; var getNodeURL = menuItem.getAttribute("exo:getNodeURL"); - var subContainer = DOMUtil.findFirstDescendantByClass(menuItem, "div", eXo.portal.UIPortalNavigation.containerStyleClass); + var subContainer = DOMUtil.findFirstDescendantByClass(menuItem, "ul", eXo.portal.UIPortalNavigation.containerStyleClass); if (getNodeURL && !subContainer) { var jsChilds = ajaxAsyncGetRequest(getNodeURL,false) try { @@ -381,17 +370,16 @@ } catch (e) { } if (!data || !data.length) { - var arrow = DOMUtil.findFirstChildByClass(menuItem, "div", "ArrowIcon"); - DOMUtil.removeClass(arrow, "ArrowIcon"); + DOMUtil.removeClass(menuItem, "ArrowIcon"); menuItem.removeAttribute("exo:getNodeURL"); return; } var temp = document.createElement("div"); temp.innerHTML = eXo.portal.UIPortalNavigation.generateContainer(data); - menuItem.appendChild(eXo.core.DOMUtil.findFirstChildByClass(temp, "div", eXo.portal.UIPortalNavigation.containerStyleClass)); + menuItem.appendChild(eXo.core.DOMUtil.findFirstChildByClass(temp, "ul", eXo.portal.UIPortalNavigation.containerStyleClass)); } - subContainer = DOMUtil.findFirstDescendantByClass(menuItem, "div", eXo.portal.UIPortalNavigation.containerStyleClass); + subContainer = DOMUtil.findFirstDescendantByClass(menuItem, "ul", eXo.portal.UIPortalNavigation.containerStyleClass); if (subContainer) { eXo.portal.UIPortalNavigation.superClass.pushVisibleContainer(subContainer.id); eXo.portal.UIPortalNavigation.showMenuItemContainer(menuItem, subContainer) ; @@ -400,7 +388,6 @@ subContainer.firstTime = true; } } - eXo.portal.UIPortalNavigation.cancelHideMenuContainer() ; }; /** * Shows a sub menu, uses the methods from superClass (eXo.webui.UIPopupMenu) @@ -423,7 +410,7 @@ UIPortalNavigation.prototype.onMenuItemOut = function(menuItem) { if (!menuItem || !menuItem.nodeName) menuItem = this; - var subContainer = eXo.core.DOMUtil.findFirstDescendantByClass(menuItem, "div", eXo.portal.UIPortalNavigation.containerStyleClass); + var subContainer = eXo.core.DOMUtil.findFirstDescendantByClass(menuItem, "ul", eXo.portal.UIPortalNavigation.containerStyleClass); if (subContainer) { eXo.portal.UIPortalNavigation.superClass.pushHiddenContainer(subContainer.id); eXo.portal.UIPortalNavigation.superClass.popVisibleContainer(); @@ -447,12 +434,11 @@ uiNav.scrollMgr = eXo.portal.UIPortalControl.newScrollManager("PortalNavigationTopContainer"); uiNav.scrollMgr.initFunction = uiNav.initScroll; // Adds the tab elements to the manager - var tabs = eXo.core.DOMUtil.findAncestorByClass(portalNav, "UIHorizontalTabs"); - uiNav.scrollMgr.mainContainer = tabs; - uiNav.scrollMgr.arrowsContainer = eXo.core.DOMUtil.findFirstDescendantByClass(tabs, "div", "ScrollButtons"); + uiNav.scrollMgr.mainContainer = portalNav; + uiNav.scrollMgr.arrowsContainer = eXo.core.DOMUtil.findFirstDescendantByClass(portalNav, "li", "ScrollButtons"); uiNav.scrollMgr.loadElements("UITab"); // Configures the arrow buttons - var arrowButtons = eXo.core.DOMUtil.findDescendantsByTagName(uiNav.scrollMgr.arrowsContainer, "div"); + var arrowButtons = eXo.core.DOMUtil.findDescendantsByTagName(uiNav.scrollMgr.arrowsContainer, "a"); if (arrowButtons.length == 2) { uiNav.scrollMgr.initArrowButton(arrowButtons[0], "left", "ScrollLeftButton", "HighlightScrollLeftButton", "DisableScrollLeftButton"); uiNav.scrollMgr.initArrowButton(arrowButtons[1], "right", "ScrollRightButton", "HighlightScrollRightButton", "DisableScrollRightButton"); Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2011-09-12 22:59:10 UTC (rev 7361) @@ -276,7 +276,7 @@ if(eXo.core.Browser.isIE6()) gadgetContainer.style.width = "99.5%"; var selectPopup = DOMUtil.findPreviousElementByTagName(uiContainer, "div"); - var closeButton = DOMUtil.findFirstDescendantByClass(selectPopup, "div", "CloseButton"); + var closeButton = DOMUtil.findFirstDescendantByClass(selectPopup, "a", "CloseButton"); closeButton.onclick = eXo.webui.UIDashboard.showHideSelectContainer; var colsContainer = DOMUtil.findFirstChildByClass(gadgetContainer, "div", "UIColumns"); @@ -307,7 +307,7 @@ if (iframe) { iframe.style.width = "99.9%" ; } - var minimizeButton = DOMUtil.findFirstDescendantByClass(gadgetControls[j], "div", "MinimizeAction") ; + var minimizeButton = DOMUtil.findFirstDescendantByClass(gadgetControls[j], "span", "MinimizeAction") ; if(canEdit) { eXo.webui.UIDashboard.init(gadgetControls[j], uiGadget); Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIHorizontalTabs.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIHorizontalTabs.js 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIHorizontalTabs.js 2011-09-12 22:59:10 UTC (rev 7361) @@ -38,12 +38,11 @@ if (clickedEle == null) return; if (!eXo.core.DOMUtil.hasClass(clickedEle, "UITab")) clickedEle = eXo.core.DOMUtil.findAncestorByClass(clickedEle, "UITab") ; - var tabStyle = eXo.core.DOMUtil.getChildrenByTagName(clickedEle, "div")[0] ; if(over) { - this.backupNavigationTabStyle = tabStyle.className ; - tabStyle.className = "HighlightNavigationTab" ; + this.backupNavigationTabStyle = clickedEle.className ; + clickedEle.className = "UITab HighlightNavigationTab" ; } else if (this.backupNavigationTabStyle){ - tabStyle.className = this.backupNavigationTabStyle ; + clickedEle.className = this.backupNavigationTabStyle ; } } /** Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIPopupWindow.js 2011-09-12 22:59:10 UTC (rev 7361) @@ -41,7 +41,7 @@ if(contentBlock && (eXo.core.Browser.getBrowserHeight() - 100 < contentBlock.offsetHeight)) { contentBlock.style.height = (eXo.core.Browser.getBrowserHeight() - 100) + "px"; } - var popupBar = DOMUtil.findFirstDescendantByClass(popup, 'div' ,'PopupTitle') ; + var popupBar = DOMUtil.findFirstDescendantByClass(popup, 'span' ,'PopupTitle') ; popupBar.onmousedown = this.initDND ; @@ -51,7 +51,7 @@ } if(isResizable) { - var resizeBtn = DOMUtil.findFirstDescendantByClass(popup, "div", "ResizeButton"); + var resizeBtn = DOMUtil.findFirstDescendantByClass(popup, "span", "ResizeButton"); resizeBtn.style.display = 'block' ; resizeBtn.onmousedown = this.startResizeEvt ; } @@ -250,7 +250,7 @@ if(!dragObject.uiWindowContent) return; if(eXo.core.Browser.browserType == "mozilla") { dragObject.uiWindowContent.style.overflow = "hidden" ; - var elements = eXo.core.DOMUtil.findDescendantsByClass(dragObject.uiWindowContent, "div" ,"PopupMessageBox") ; + var elements = eXo.core.DOMUtil.findDescendantsByClass(dragObject.uiWindowContent, "ul" ,"PopupMessageBox") ; for(var i = 0; i < elements.length; i++) { elements[i].style.overflow = "hidden" ; } @@ -264,7 +264,7 @@ var dragObject = dndEvent.dragObject ; if(eXo.core.Browser.browserType == "mozilla" && dragObject.uiWindowContent) { dragObject.uiWindowContent.style.overflow = "auto" ; - var elements = eXo.core.DOMUtil.findDescendantsByClass(dragObject.uiWindowContent, "div" ,"PopupMessageBox") ; + var elements = eXo.core.DOMUtil.findDescendantsByClass(dragObject.uiWindowContent, "ul" ,"PopupMessageBox") ; for(var i = 0; i < elements.length; i++) { elements[i].style.overflow = "auto" ; } Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2011-09-12 22:59:10 UTC (rev 7361) @@ -62,8 +62,6 @@ showEditLabelInput : function(selectedElement, nodeName, currentContent){ eXo.webui.UITabbedDashboard.backupElement = selectedElement; var prNode = selectedElement.parentNode; - var tabContainer = eXo.core.DOMUtil.findAncestorByClass(prNode, "TabsContainer"); - var addButton = eXo.core.DOMUtil.findFirstChildByClass(tabContainer, "div", "AddDashboard"); var inputElement = document.createElement("input"); inputElement.type = "text"; @@ -81,10 +79,9 @@ prNode.replaceChild(inputElement, selectedElement); inputElement.focus(); - //find Middle tab of MiddleTab var DOMUtil = eXo.core.DOMUtil; - var middleTab = DOMUtil.findAncestorByClass(inputElement, "MiddleTab"); - middleTab.className = "MiddleTab EditTab"; + var uiTab = DOMUtil.findAncestorByClass(inputElement, "UITab"); + DOMUtil.addClass(uiTab, "EditTab"); }, createDashboardPage : function(e){ @@ -113,7 +110,7 @@ //If user presses on ESCAPE button else if(keyNum == 27){ var inputElement = eXo.core.Browser.getEventSource(e); - var editingTabElement = eXo.core.DOMUtil.findAncestorByClass(inputElement, "UITab GrayTabStyle"); + var editingTabElement = eXo.core.DOMUtil.findAncestorByClass(inputElement, "UITab"); //Remove the editing tab editingTabElement.parentNode.removeChild(editingTabElement); @@ -125,7 +122,7 @@ e = window.event; } var inputElement = eXo.core.Browser.getEventSource(e); - var editingTabElement = eXo.core.DOMUtil.findAncestorByClass(inputElement, "UITab GrayTabStyle"); + var editingTabElement = eXo.core.DOMUtil.findAncestorByClass(inputElement, "UITab"); //Remove the editing tab editingTabElement.parentNode.removeChild(editingTabElement); @@ -134,11 +131,11 @@ createTabDashboard : function(addTabElement){ var DOMUtil = eXo.core.DOMUtil; var tabContainer = addTabElement.parentNode; - var tabElements = DOMUtil.findChildrenByClass(tabContainer, "div", "UITab GrayTabStyle"); + var tabElements = DOMUtil.findChildrenByClass(tabContainer, "div", "UITab"); var portletFrag = DOMUtil.findAncestorByClass(tabContainer, "PORTLET-FRAGMENT"); var selectedTabElement = DOMUtil.findFirstDescendantByClass(tabContainer, "div", "SelectedTab"); - var newTabElement = selectedTabElement.parentNode.cloneNode(true); + var newTabElement = selectedTabElement.cloneNode(true); tabContainer.insertBefore(newTabElement, addTabElement); var inputElement = document.createElement("input"); @@ -157,8 +154,8 @@ DOMUtil.findNextElementByTagName(inputElement, "a").href = "#"; inputElement.focus(); - //find Middle tab of MiddleTab - var middleTab = DOMUtil.findAncestorByClass(inputElement, "MiddleTab"); - middleTab.className = "MiddleTab EditTab"; + var DOMUtil = eXo.core.DOMUtil; + var uiTab = DOMUtil.findAncestorByClass(inputElement, "UITab"); + DOMUtil.addClass(uiTab, "EditTab"); } } \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -120,10 +120,6 @@ margin: auto; } -.AjaxLoadingMask .UIAction .ActionButton{ - float: none; -} - .FloatLeft { float: left; /* orientation=lt */ float: right; /* orientation=rt */ Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/control/UIWorkspace/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,49 +1,56 @@ - - -.UIWorkingWorkspace { - margin: 0px; - -/* - * minh.js.exo - * bug : right click with IE7 in ECM - */ -} - -.UIWorkingWorkspace { - width: 980px; - margin: auto; - background: #fff; -} - -.UIWorkingWorkspace .UIPageBody { - border-bottom:1px solid #B4B4B4; - border-left:1px solid #B4B4B4; - border-right:1px solid #B4B4B4; -} - -.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 + +.UIWorkingWorkspace { + margin: 0px; + +/* + * minh.js.exo + * bug : right click with IE7 in ECM + */ +} + +.UIWorkingWorkspace { + width: 980px; + margin: auto; + background: #fff; +} + +.UIWorkingWorkspace .UIPageBody { + border-bottom:1px solid #B4B4B4; + border-left:1px solid #B4B4B4; + border-right:1px solid #B4B4B4; +} + +.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; +} Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,629 +1,431 @@ - - -.UIWindow .UIDashboardPortlet { - margin: 0px; +.UIWindow .UIDashboardPortlet { + margin: 0px; +} + +.UIDashboardPortlet { + background: #fff; + border: none; + border-top: none; + height: 100%; +} + +.UIWindow .UIDashboard { + border: none; + margin: 0px; +} + +.UIDashboard { + height: 100%; +} + +.UIDashboard .DashboardContainer { + background: url('background/BgBottom.gif') no-repeat bottom left; + height: 100%; +} + +.UIDashboard .UIDashboardEditForm { + background: white; + padding: 10px; +} + +.UITabPaneDashboard { + /*padding: 0 9px; +*/ +} + +/*-------------------UITabPaneDashboard-------------------*/ + +.UITabPaneDashboard { + height: auto; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; + background-color: #ffcf01; + padding: 0px 9px; + margin: 0 9px; +} +.UITabPaneDashboard .UITab { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + height: 24px; + line-height: 24px; + padding:0px 6px 0px 9px;/* orientation=lt */ + padding:0px 9px 0px 6px;/* orientation=rt */ + margin: 4px 2px 0px 0px;/* orientation=lt */ + margin: 4px 0px 0px 2px;/* orientation=rt */ +} + +.UITabPaneDashboard .NormalTab { + background-color:#E6E6E6; +} + +.UITabPaneDashboard .SelectedTab { + background-color:#fff; +} + +.UITabPaneDashboard input { + font-size: 11px; + background-color:#fff; + text-align: left;/* orientation=lt */ + text-align: right;/* orientation=rt */ + height: 13px; + padding:0; +} + + +.UITabPaneDashboard .UITab .Tablabel, .UITabPaneDashboard span { + font-weight:normal; + line-height: 14px; +} + + +.UITabPaneDashboard .UITab .CloseIcon { + background: url('background/IconClose.gif') no-repeat center top; + width: 14px; + height: 13px; + cursor: pointer; + display:inline-block; + margin-left: 3px;/* orientation=lt */ + margin-right: 3px;/* orientation=rt */ + vertical-align: middle; +} + +.UITabPaneDashboard .SelectedTab .CloseIcon { + margin:0; +} + +.UITabPaneDashboard .AddDashboard { + background: url('background/AddDashboard.gif') no-repeat center center; + width: 34px; + height: 32px; + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + cursor: pointer; +} + +/*----------------------UIGadgetsSelectorForm-------------------*/ + +.UIDashboardSelectContainer { + height: 100%; +} + +.UIDashboardSelectContainer .DashboardControlBar { + height: 23px; + background: url('background/Dashboard.gif') repeat-x top; + border-bottom: 1px solid #b7b7b7; +} + +.UIDashboardSelectContainer .TitleBar { + color: black; + font-weight: bold; + line-height: 23px; + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + padding-left: 10px; /* orientation=lt */ + padding-right: 10px; /* orientation=rt */ +} + +.UIDashboardSelectContainer .CloseIcon { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ + background: url('background/Dashboard.gif') no-repeat left -180px; + height: 20px; + width: 20px; +} + +.UIDashboardSelectContainer .DashboardItemContainer .InputContainer { + padding: 4px 0px 4px 10px; + _padding: 0px 10px; + background: #ececec; +} + +.UIDashboardSelectContainer .DashboardItemContainer .InputContainer input { + margin: 0 3px 0 0px; + border: 1px solid #b8babf; + font-size: 11px; + width: 165px; +} + +.UIDashboardSelectContainer .DashboardItemContainer .GadgetItemsContainer { + border-top: 1px solid #b7b7b7; + font-weight: bold; +} + +.UIDashboardSelectContainer .DashboardItemContainer .TopItemContainer { + background: url('background/Dashboard.gif') repeat-x center -37px; + height: 11px; + padding: 1px; + border-bottom: 1px solid #b7b7b7; + display: none; +} + +.UIDashboardSelectContainer .DashboardItemContainer .UpArrowIcon { + background: url('background/Dashboard.gif') repeat-x center -98px; + height: 11px; width: 15px; + margin: auto; + cursor: pointer; +} + +.UIDashboardSelectContainer .DashboardItemContainer .DisableArrowIcon { + filter: alpha(opacity=30); + -moz-opacity: 0.3; +} + +.UIDashboardSelectContainer .DashboardItemContainer .MiddleItemContainer { + overflow: hidden; +} + +.UIDashboardSelectContainer .DashboardItemContainer .BottomItemContainer { + background: url('background/Dashboard.gif') repeat-x center -37px; + height: 11px; + padding: 1px; + border-top: 1px solid #b7b7b7; + display: none; +} + +.UIDashboardSelectContainer .DashboardItemContainer .DownArrowIcon { + background: url('background/Dashboard.gif') repeat-x center -114px; + height: 11px; width: 15px; + margin: auto; + cursor: pointer; +} + +.UIDashboardSelectContainer .DashboardItemContainer .DisableContainer { + background: url('background/Dashboard.gif') repeat-x center -23px; +} + +.UIDashboardSelectContainer .DashboardItemContainer .GadgetCategory { + padding: 10px; + text-transform: capitalize; +} + +.UIDashboardSelectContainer .GadgetCategory .GadgetTab .LeftCategoryTitleBar { + background: url('background/CategoryTitleBar.gif') repeat-x left top; + border: 1px solid #b8babf; +} + +.UIDashboardSelectContainer .GadgetCategory .GadgetTab .MiddleCategoryTitleBar { + height: 23px; + padding: 0px 8px; +} + +.UIDashboardSelectContainer .GadgetCategory .GadgetTab .ArrowIcon { + background: url('background/ArrowIcon.gif') no-repeat left -14px; /* orientation=lt */ + background: url('background/ArrowIcon.gif') no-repeat right -14px; /* orientation=rt */ + line-height: 23px; + overflow: hidden; + padding-left: 18px; /* orientation=lt */ + padding-right: 18px; /* orientation=rt */ + color: #000; + font-weight: normal; +} + +.UIDashboardSelectContainer .GadgetCategory .SelectedTab .ArrowIcon { + background: url('background/ArrowIcon.gif') no-repeat left 8px; /* orientation=lt */ + background: url('background/ArrowIcon.gif') no-repeat right 8px; /* orientation=rt */ +} + +.UIDashboardSelectContainer .GadgetCategory .ItemsContainer { + background: #fff url('background/BGItemsContainer.gif') repeat-x left 1px; + border: 1px solid #b8babf; + border-top: none; + padding: 8px 8px 4px 8px; +} + +.UIDashboardSelectContainer .GadgetCategory .UIGadget { + background: url('background/GadgetControl.gif') repeat-x left top; + margin: 0px 0px 4px 0px; + height: 18px; + line-height: 18px; + color: #676767; + padding: 0px; + background: #f2f2f3; +} + +.UIDashboard .UIDashboardSelectContainer .GadgetTitle { + width: 150px; + float: none; + margin: 0px !important; +} + +/*----------------------UIGadgetsContainer-------------------*/ + +.UIDashboard .UIDashboardContainer .NoGadget { + text-align: center; + font-size: 12px; font-weight: bold; + padding: 5px; color: #111; +} + +/*------------------UIDashboardContainer----------------*/ + +.UIDashboardContainer { + height: 100%; + background: #fff; +} + +.UIDashboardContainer .GadgetContainer { + overflow: auto; + height: 100%; + min-height: 400px; + _height: 400px; +} + +.UIDashboardContainer .GadgetContainer .ContainerControlBarL { + padding: 5px 10px; + height: 22px; +} + +.UIDashboardContainer .ContainerControlBarL .AddIcon { + background: url('background/Dashboard.gif') no-repeat left -200px; /* orientation=lt */ + background: url('background/Dashboard.gif') no-repeat right -200px; /* orientation=rt */ + padding-left: 30px; /* orientation=lt */ + padding-right: 30px; /* orientation=rt */ + width: 200px; /* orientation=rt */ + font-weight: bold; font-size: 12px; + display: block; + line-height: 22px; + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ +} + +.UIDashboardContainer .GadgetContainer .AddIcon a { + text-decoration: underline; + color: #292929; + cursor: pointer; +} + +.UIDashboardContainer .GadgetContainer .AddIcon a:hover { + text-decoration: none; +} + +.UIDashboardContainer .GadgetContainer .UIColumn { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + width: 325px; + padding: 2px; +} + +.UIDashboardContainer .UIGadget .GadgetMenuBar{ + text-align: left; /* orientation=lt */ + text-align: right; /* orientation=rt */ +} + +.UIDashboardContainer .UITarget { + background: #f2f2f3; + margin: 5px 5px 10px 5px; +} + +.UIDashboard .Dragging { + margin: 3px 0px 0px 3px; /* orientation=lt */ + margin: 3px 3px 0px 0px; /* orientation=rt */ +} + +.UIDashboard .UIPopupWindow { + width: 240px; +} + +#UIAddGadgetPopup { + width: 225px; +} + +#UIAddGadgetPopup .TopLeftCornerDecorator { + background: url('background/PortalComposer.gif') no-repeat left top; + padding-left: 7px; +} + +#UIAddGadgetPopup .TopCenterDecorator { + background: url('background/PortalComposer.gif') repeat-x left -34px; + height: 34px; + padding: 0px; +} + +#UIAddGadgetPopup .TopRightCornerDecorator { + background: url('background/PortalComposer.gif') no-repeat right top; + padding-right: 7px; +} + +#UIAddGadgetPopup .MiddleLeftSideDecorator { + background: url(background/MiddlePortalComposer.gif) repeat-y left top; + padding-left: 3px; +} + +#UIAddGadgetPopup .MiddleCenterDecorator { + background: #d8dae1 url(background/CenterMiddleWindow.gif) repeat-x left top; + padding: 4px; + padding-bottom: 0px; +} + +#UIAddGadgetPopup .MiddleRightSideDecorator { + background: url(background/MiddlePortalComposer.gif) repeat-y right top; + padding-right: 3px; +} + +#UIAddGadgetPopup .UIWindowContent { + border: 1px solid #bdbcbd; +} + +#UIAddGadgetPopup .PopupContent { + background: #fff; +} + +#UIAddGadgetPopup .ResizeButton { + background: url('background/ResizeBtn.gif') no-repeat right top; /* orientation=lt */ + background: url('background/ResizeBtn-rt.gif') no-repeat left top; /* orientation=rt */ + display: block; + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ + cursor: nw-resize; /* orientation=lt */ + cursor: ne-resize; /* orientation=rt */ +} + +#UIAddGadgetPopup .BottomLeftCornerDecorator { + border: 1px solid #a2a3a9; + border-top: none; + background: #d8dae1; +} + +#UIAddGadgetPopup .BottomCenterDecorator { + height: 0px; + background: none; +} + +#UIAddGadgetPopup .BottomRightCornerDecorator { + padding: 0px 6px 6px 6px; + background: none; +} + +#UIAddGadgetPopup .CloseButton { + background: url('background/TopExitBtn.gif') no-repeat left top; + width: 23px; + height: 17px; + margin-right: 0px; +} + +#UIAddGadgetPopup .PopupTitleIcon { + margin-left: 0px; +} + +#UIAddGadgetPopup .PopupTitle { + margin-left: 22px; +} + +/*----------------------Maximized-------------------*/ + +.Maximized .UIGadget { + padding: 5px; + margin: 0px; +} + +.Maximized .GadgetTitle { + color: #5b5b5b; + font-weight: bold; + cursor: move; + overflow: hidden; + white-space: nowrap; +} + +.Maximized iframe { + width: 100%; + _width: 98%; } - -.UIDashboardPortlet { - background: #fff; - border: none; - border-top: none; - height: 100%; -} - -.UIWindow .UIDashboard { - border: none; - margin: 0px; -} - -.UIDashboard { - height: 100%; -} - -.UIDashboard .DashboardContainer { - background: url('background/BgBottom.gif') no-repeat bottom left; - height: 100%; -} - -.UIDashboard .GadgetTitle { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - padding: 0px 5px; - color: #5b5b5b; - font-weight: normal; - cursor: move; - overflow: hidden; - white-space: nowrap; - width: 195px; - margin-right: 75px !important; /* orientation=lt */ - margin: 0px 0px 0px 75px !important; /* orientation=rt */ -} - -.UIDashboard .UIDashboardEditForm { - background: white; - padding: 10px; -} - -.UITabPaneDashboard { - /*padding: 0 9px;*/ -} - -.UITabPaneDashboard .LtTabDashboard { - background: #ffcf01 url('background/NavUser.gif') no-repeat left top; - padding-left: 3px; - _height: 32px; -} - -.UITabPaneDashboard .RtTabDashboard { - background: #ffcf01 url('background/NavUser.gif') no-repeat right top; - padding-right: 3px; - _height: 32px; -} - -.UITabPaneDashboard .CtTabDashboard { - background: #ffcf01 url('background/NavUser.gif') repeat-x center -32px; - padding: 0px 6px; - _height: 32px; -} - -.UITabPaneDashboard .UIHorizontalTabs { - padding: 1px 0px 4px 0px; -} - -.UITabPaneDashboard .UIHorizontalTabs .TabsContainer { - height: auto; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle { - margin: 3px 2px 0 0; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab, -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .MiddleTab, -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .MiddleTab { - padding: 0px 5px; - _padding: 4px 5px; - white-space:nowrap; - font-weight: normal; - line-height: 24px; -} - - - -.UITabPaneDashboard .UIHorizontalTabs .UITab .CloseIcon { - background: url('background/IconClose.gif') no-repeat center; - width: 16px; height: 16px; - cursor: pointer; -} - -.UITabPaneDashboard .UIHorizontalTabs .AddDashboard { - background: url('background/AddDashboard.gif') no-repeat bottom; - width: 34px; height: 24px; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - cursor: pointer; - margin-top: 3px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .LeftTab { - background: url(background/TabDashboard.gif) no-repeat left -48px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .RightTab { - background: url(background/TabDashboard.gif) no-repeat right -48px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab { - background: url(background/TabDashboard.gif) repeat-x left -72px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .LeftTab { - background: url(background/TabDashboard.gif) no-repeat left -48px; - padding-left: 4px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .RightTab { - background: url(background/TabDashboard.gif) no-repeat right -48px; - padding-right: 4px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .MiddleTab { - background: url(background/TabDashboard.gif) repeat-x left -72px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .LeftTab { - background: url(background/TabDashboard.gif) no-repeat left top; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .RightTab { - background: url(background/TabDashboard.gif) no-repeat right top; - padding-right: 4px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .MiddleTab { - background: url(background/TabDashboard.gif) repeat-x left -24px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .EditnewTab .LeftTab { - background: url(background/TabDashboard.gif) no-repeat left top; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .EditnewTab .RightTab { - background: url(background/TabDashboard.gif) no-repeat right top; - padding-right: 4px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .EditnewTab .MiddleTab { - background: url(background/TabDashboard.gif) repeat-x left -24px; - line-height: 22px; - vertical-align: middle; - padding-top: 0; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .EditTab { - _padding: 2px 5px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .MiddleTab span { - margin-top: 1px; -} - -.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle input { - font-size: 11px; - background: white; - padding: 0 !important; - text-align: left !important; - font-family: Tahoma !important; - margin: 0; - !height: 16px; - !line-height: 14px; - vertical-align: middle; -} - -/*----------------------UIGadgetsSelectorForm-------------------*/ - -.UIDashboardSelectContainer { - height: 100%; -} - -.UIDashboardSelectContainer .DashboardControlBar { - height: 23px; - background: url('background/Dashboard.gif') repeat-x top; - border-bottom: 1px solid #b7b7b7; -} - -.UIDashboardSelectContainer .TitleBar { - color: black; - font-weight: bold; - line-height: 23px; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - padding-left: 10px; /* orientation=lt */ - padding-right: 10px; /* orientation=rt */ -} - -.UIDashboardSelectContainer .CloseIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - background: url('background/Dashboard.gif') no-repeat left -180px; - height: 20px; - width: 20px; -} - -.UIDashboardSelectContainer .DashboardItemContainer { -} - -.UIDashboardSelectContainer .DashboardItemContainer .InputContainer { - padding: 4px 0px 4px 10px; - _padding: 0px 10px; - background: #ececec; -} - -.UIDashboardSelectContainer .DashboardItemContainer .InputContainer input { - margin: 0 3px 0 0px; - border: 1px solid #b8babf; - font-size: 11px; - width: 165px; -} - -.UIDashboardSelectContainer .DashboardItemContainer .GadgetItemsContainer { - border-top: 1px solid #b7b7b7; - font-weight: bold; -} - -.UIDashboardSelectContainer .DashboardItemContainer .TopItemContainer { - background: url('background/Dashboard.gif') repeat-x center -37px; - height: 11px; - padding: 1px; - border-bottom: 1px solid #b7b7b7; - display: none; -} - -.UIDashboardSelectContainer .DashboardItemContainer .UpArrowIcon { - background: url('background/Dashboard.gif') repeat-x center -98px; - height: 11px; width: 15px; - margin: auto; - cursor: pointer; -} - -.UIDashboardSelectContainer .DashboardItemContainer .DisableArrowIcon { - filter: alpha(opacity=30); - -moz-opacity: 0.3; -} - -.UIDashboardSelectContainer .DashboardItemContainer .MiddleItemContainer { - overflow: hidden; -} - -.UIDashboardSelectContainer .DashboardItemContainer .BottomItemContainer { - background: url('background/Dashboard.gif') repeat-x center -37px; - height: 11px; - padding: 1px; - border-top: 1px solid #b7b7b7; - display: none; -} - -.UIDashboardSelectContainer .DashboardItemContainer .DownArrowIcon { - background: url('background/Dashboard.gif') repeat-x center -114px; - height: 11px; width: 15px; - margin: auto; - cursor: pointer; -} - -.UIDashboardSelectContainer .DashboardItemContainer .DisableContainer { - background: url('background/Dashboard.gif') repeat-x center -23px; -} - -.UIDashboardSelectContainer .DashboardItemContainer .GadgetCategory { - padding: 10px; - text-transform: capitalize; -} - -.UIDashboardSelectContainer .GadgetCategory .GadgetTab .LeftCategoryTitleBar { - background: url('background/CategoryTitleBar.gif') repeat-x left top; - border: 1px solid #b8babf; -} - -.UIDashboardSelectContainer .GadgetCategory .GadgetTab .RightCategoryTitleBar { - -} - -.UIDashboardSelectContainer .GadgetCategory .GadgetTab .MiddleCategoryTitleBar { - height: 23px; - padding: 0px 8px; -} - -.UIDashboardSelectContainer .GadgetCategory .GadgetTab .ArrowIcon { - background: url('background/ArrowIcon.gif') no-repeat left -14px; /* orientation=lt */ - background: url('background/ArrowIcon.gif') no-repeat right -14px; /* orientation=rt */ - line-height: 23px; - overflow: hidden; - padding-left: 18px; /* orientation=lt */ - padding-right: 18px; /* orientation=rt */ - color: #000; - font-weight: normal; -} - -.UIDashboardSelectContainer .GadgetCategory .SelectedTab .ArrowIcon { - background: url('background/ArrowIcon.gif') no-repeat left 8px; /* orientation=lt */ - background: url('background/ArrowIcon.gif') no-repeat right 8px; /* orientation=rt */ -} - -.UIDashboardSelectContainer .GadgetCategory .ItemsContainer { - background: #fff url('background/BGItemsContainer.gif') repeat-x left 1px; - border: 1px solid #b8babf; - border-top: none; - padding: 8px 8px 4px 8px; -} - -.UIDashboardSelectContainer .GadgetCategory .UIGadget { - background: url('background/GadgetControl.gif') repeat-x left top; - margin: 0px 0px 4px 0px; - height: 18px; - line-height: 18px; - color: #676767; - padding: 0px; - background: #f2f2f3; -} - -.UIDashboard .UIDashboardSelectContainer .GadgetTitle { - width: 150px; - float: none; - margin: 0px !important; -} - -/*----------------------UIGadgetsContainer-------------------*/ - -.UIDashboard .UIDashboardContainer .NoGadget { - text-align: center; - font-size: 12px; font-weight: bold; - padding: 5px; color: #111; -} - -.UIDashboard .UIGadget { - padding: 5px 0px; -} - -.UIDashboard .UIGadget .GadgetControl { - float: none; - padding: 0px; - height: auto; width: auto; -} - -.UIDashboard .UIGadget .GadgetControl .LeftControlBar { - background: none; - padding: 0px; -} - -.UIDashboard .UIGadget .GadgetControl .RightControlBar { - background: none; - padding: 0px; -} - -.UIDashboard .UIGadget .GadgetControl .CenterControlBar { - background: url('background/BgTitleGadget.gif') repeat-x left top; - height: 23px; - line-height: 23px; - padding: 0 9px; - border: 1px solid #dbdbdb; - border-top: none; - cursor: move; -} - -.UIDashboard .UIGadget .GadgetControl .GadgetDragHandleArea { - display: none; -} - -.UIDashboard .UIGadget .TLGadget { - display: none; -} - -.UIDashboard .UIGadget .MLGadget { - background: #f2f2f3; - border: 1px solid #c3c3c3; - border-top: none; - padding: 3px; -} - -.UIDashboard .UIGadget .MRGadget { - background: white; - padding: 0 0 1px; -} - -.UIDashboard .UIGadget .BLGadget { - display: none; -} - -/*------------------UIDashboardContainer----------------*/ - -.UIDashboardContainer { - height: 100%; - background: #fff; -} - -.UIDashboardContainer .GadgetContainer { - overflow: auto; - height: 100%; - min-height: 400px; - _height: 400px; -} - -/**html .UIDashboardContainer .GadgetContainer { - height: 400px; -}*/ - -.UIDashboardContainer .GadgetContainer .ContainerControlBarL { - padding: 5px 10px; - height: 22px; -} - -.UIDashboardContainer .ContainerControlBarL .AddIcon { - background: url('background/Dashboard.gif') no-repeat left -200px; /* orientation=lt */ - background: url('background/Dashboard.gif') no-repeat right -200px; /* orientation=rt */ - padding-left: 30px; /* orientation=lt */ - padding-right: 30px; /* orientation=rt */ - width: 200px; /* orientation=rt */ - font-weight: bold; font-size: 12px; - display: block; - line-height: 22px; - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ -} - -.UIDashboardContainer .GadgetContainer .AddIcon a { - text-decoration: underline; - color: #292929; - cursor: pointer; -} - -.UIDashboardContainer .GadgetContainer .AddIcon a:hover { - text-decoration: none; -} - -.GadgetContainer .UIColumns { -} - -.GadgetContainer .UIColumn { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 325px; - padding: 2px; -} - -.UIDashboardContainer .UIGadget { - width: 320px; -} -.UIDashboardContainer .UIGadget .GadgetMenuBar{ - text-align: left; /* orientation=lt */ - text-align: right; /* orientation=rt */ -} - -.UIDashboardContainer .UITarget { - background: #f2f2f3; - margin: 5px 5px 10px 5px; -} - -.UIDashboard .Dragging { - margin: 3px 0px 0px 3px; /* orientation=lt */ - margin: 3px 3px 0px 0px; /* orientation=rt */ -} - -.UIDashboard .UIPopupWindow { - width: 240px; -} - -#UIAddGadgetPopup { - width: 225px; -} - -#UIAddGadgetPopup .TopLeftCornerDecorator { - background: url('background/PortalComposer.gif') no-repeat left top; - padding-left: 7px; -} - -#UIAddGadgetPopup .TopCenterDecorator { - background: url('background/PortalComposer.gif') repeat-x left -34px; - height: 34px; - padding: 0px; -} - -#UIAddGadgetPopup .TopRightCornerDecorator { - background: url('background/PortalComposer.gif') no-repeat right top; - padding-right: 7px; -} - -#UIAddGadgetPopup .MiddleLeftSideDecorator { - background: url(background/MiddlePortalComposer.gif) repeat-y left top; - padding-left: 3px; -} - -#UIAddGadgetPopup .MiddleCenterDecorator { - background: #d8dae1 url(background/CenterMiddleWindow.gif) repeat-x left top; - padding: 4px; - padding-bottom: 0px; -} - -#UIAddGadgetPopup .MiddleRightSideDecorator { - background: url(background/MiddlePortalComposer.gif) repeat-y right top; - padding-right: 3px; -} - -#UIAddGadgetPopup .UIWindowContent { - border: 1px solid #bdbcbd; -} - -#UIAddGadgetPopup .PopupContent { - background: #fff; -} - -#UIAddGadgetPopup .ResizeButton { - background: url('background/ResizeBtn.gif') no-repeat right top; /* orientation=lt */ - background: url('background/ResizeBtn-rt.gif') no-repeat left top; /* orientation=rt */ - display: block; - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - cursor: nw-resize; /* orientation=lt */ - cursor: ne-resize; /* orientation=rt */ -} - -#UIAddGadgetPopup .BottomLeftCornerDecorator { - border: 1px solid #a2a3a9; - border-top: none; - background: #d8dae1; -} - -#UIAddGadgetPopup .BottomCenterDecorator { - height: 0px; - background: none; -} - -#UIAddGadgetPopup .BottomRightCornerDecorator { - padding: 0px 6px 6px 6px; - background: none; -} - -#UIAddGadgetPopup .CloseButton { - background: url('background/TopExitBtn.gif') no-repeat left top; - width: 23px; - height: 17px; - margin-right: 0px; -} - -#UIAddGadgetPopup .PopupTitleIcon { - margin-left: 0px; -} - -#UIAddGadgetPopup .PopupTitle { - margin-left: 22px; -} -/*----------------------Maximized-------------------*/ - -.Maximized .UIGadget { - padding: 5px; - margin: 0px; -} - -.Maximized .UIGadget .GadgetControl { - float: none; - padding: 0px; - height: auto; width: auto; -} - -.Maximized .UIGadget .GadgetControl .LeftControlBar { - background: none; - padding: 0px; -} - -.Maximized .UIGadget .GadgetControl .RightControlBar { - background: none; - padding: 0px; -} - -.Maximized .UIGadget .GadgetControl .CenterControlBar { - background: url('background/BgTitleGadget.gif') repeat-x left top; - height: 23px; - line-height: 23px; - padding: 0 9px; - border: 1px solid #dbdbdb; - border-top: none; -} - -.Maximized .UIGadget .GadgetControl .GadgetDragHandleArea { - display: none; -} - -.Maximized .UIGadget .TLGadget { - display: none; -} - -.Maximized .UIGadget .MLGadget { - background: #f2f2f3; - border: 1px solid #c3c3c3; - border-top: none; - padding: 3px; -} - -.Maximized .UIGadget .MRGadget { - background: white; - padding: 0 0 1px; -} - -.Maximized .UIGadget .BLGadget { - display: none; -} - -.Maximized .GadgetTitle { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - padding: 0px 5px; - color: #5b5b5b; - font-weight: bold; - cursor: move; - overflow: hidden; - white-space: nowrap; -} - -.Maximized iframe { - width: 100%; - _width: 98%; -} \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -18,38 +18,30 @@ } .UIGadget .GadgetControl { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 100px; height: 20px; - padding-right: 6px; /* orientation=lt */ - padding-left: 6px; /* orientation=rt */ + background: url('/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIDashboard/background/BgTitleGadget.gif') repeat-x left top; + height: 23px; + line-height: 23px; + padding: 0 9px; + border: 1px solid #dbdbdb; + border-top: none; + cursor: move; + text-align: left; } -.UIGadget .GadgetControl .LeftControlBar { - background: url('background/Gadget.png') no-repeat left top; /* orientation=lt */ - background: url('background/Gadget-rt.png') no-repeat right top; /* orientation=rt */ - padding-left: 23px; /* orientation=lt */ - padding-right: 23px; /* orientation=rt */ +.UIGadget .GadgetTitle { + padding: 0px 5px; + color: #5b5b5b; + font-weight: normal; + cursor: move; + overflow: hidden; + white-space: nowrap; + width: auto; + margin-right: 75px !important; /* orientation=lt */ + margin: 0px 0px 0px 75px !important; /* orientation=rt */ } -.UIGadget .GadgetControl .RightControlBar{ - background: url('background/Gadget.png') no-repeat right top; /* orientation=lt */ - background: url('background/Gadget-rt.png') no-repeat left top; /* orientation=rt */ - padding-right: 4px; /* orientation=lt */ - padding-left: 4px; /* orientation=rt */ -} - -.UIGadget .GadgetControl .CenterControlBar { - height: 19px; - background: url('background/Gadget.png') repeat-x center -19px; -} - .UIGadget .GadgetControl .GadgetDragHandleArea { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 13px; height: 13px; cursor: move; - margin: 3px 3px 0px 3px; background: url('background/Gadget.png') left -78px; } @@ -84,50 +76,13 @@ background-position: 65px top; } -.UIGadget .TLGadget { - background: url('background/Gadget.png') no-repeat left -38px; - padding-left: 8px; +.UIGadget .GadgetApplication { + background: #f2f2f3; + border: 1px solid #c3c3c3; + border-top: none; + padding: 3px; } -.UIGadget .TRGadget { - background: url('background/Gadget.png') no-repeat right -38px; - padding-right: 8px; -} - -.UIGadget .TCGadget { - background: url('background/Gadget.png') repeat-x center -43px; - height: 5px; -} - -.UIGadget .MLGadget { - background: url('background/MiddleGadget.png') repeat-y left; - padding-left: 6px; -} - -.UIGadget .MRGadget { - background: url('background/MiddleGadget.png') repeat-y right; - padding-right: 6px; -} - -.UIGadget .MCGadget { - background: white; -} - -.UIGadget .BLGadget { - background: url('background/Gadget.png') no-repeat left -58px; - padding-left: 9px; -} - -.UIGadget .BRGadget { - background: url('background/Gadget.png') no-repeat right -68px; - padding-right: 9px; -} - -.UIGadget .BCGadget { - background: url('background/Gadget.png') repeat-x center -48px; - height: 10px; -} - .UIGadget iframe { width: 299px; } Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,123 +1,62 @@ -/*##############################-Page Layout Decorator-################################*/ - -.LAYOUT-BLOCK .PageLayoutDecorator { - cursor: move; -} - -.UIPageBody .PageLayoutDecorator { - padding: 0px; - margin: 0px 2px auto 2px; -} - -.UIPageBody .PageLayoutDecorator .MiddlePageBG { +/*##############################-Page Layout Decorator-################################*/ + +.LAYOUT-BLOCK .PageLayoutDecorator { + cursor: move; + background: white; +} + +.PageLayoutDecorator { + padding: 0px; +} + +.PageLayoutDecorator .LeftPage { + background: url('background/ViewPage.gif') no-repeat left top; /* orientation=lt */ + background: url('background/ViewPage-rt.gif') no-repeat right top; /* orientation=rt */ + padding: 0px 0px 0px 143px; /* orientation=lt */ + padding: 0px 143px 0px 0px; /* orientation=rt */ +} + +.PageLayoutDecorator .RightPage { + background: url('background/ViewPage.gif') no-repeat right -468px; /* orientation=lt */ + background: url('background/ViewPage-rt.gif') no-repeat left -468px; /* orientation=rt */ + padding: 0px 40px 0px 0px; /* orientation=lt */ + padding: 0px 0px 0px 40px; /* orientation=rt */ +} + +.PageLayoutDecorator .CenterPage { + height: 230px; line-height: 98px; + background: url('background/ViewPage.gif') repeat-x center -235px; + color: #525252; text-align: center; + font-weight: bold; + padding: 0px; white-space: nowrap; +} + + +.UIPageBody .VIEW-PAGEBODY .UIPage { + +} + +.UIPageBody .VIEW-PAGEBODY .UIPage .UIComponentBlock { 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: 0px 1px; -} - -.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; - display: none; -} - -.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; -} \ No newline at end of file + height: 100%; +} + + + +.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; +} Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/background/ViewPage.gif =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,221 +1,120 @@ -.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 { +.UIPortal .LAYOUT-PORTAL { background: white; - border-top: 1px solid #91bcdd; + padding: 8px; + _padding: 8px 0px; /* orientation=rt */ + margin: auto; + _margin: 0px; /* orientation=rt */ + _width: 99%; /* orientation=rt */ } -.UIPortlet .SelectedContainerBlock .LeftContainerBlock { - background: url('background/BgContainerBlock.gif') no-repeat left top; - padding-left: 1px; +.DragAndDropPreview { + width: auto; height: 80px; + background: url('background/DragAndDropPreview4x4.gif'); + border: 1px solid #c4c4c4; + margin: 0px 12px 10px 12px; } -.UIPortlet .SelectedContainerBlock .RightContainerBlock { - background: url('background/BgContainerBlock.gif') no-repeat right top; - padding: 4px; -} +/************** style for EDITION-BLOCK *****************/ -.UIPortlet .NewLayer { - background: #d1dce5; - filter: alpha(opacity=80); - opacity: 0.8; - width: 100%; height: 100%; +.EDITION-BLOCK .CONTROL-BLOCK { + position: absolute; + top: -5px; + left: 4px; /* orientation=lt */ + right: 4px; /* orientation=rt */ + white-space: nowrap; } -/*##############################- 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 { - height: 100%; - /* - 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 { +.EDITION-BLOCK .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 { +.EDITION-BLOCK .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 */ + margin: 3px 0px 0px 2px; /* orientation=lt */ + margin: 3px 2px 0px 0px; /* orientation=rt */ + display: block; } -.UIContainer .LAYOUT-CONTAINER .UITableColumnContainer { - background: none; - border: none; - margin: auto; -} - -.UIContainer .EditContainerIcon { +.EDITION-BLOCK .EditIcon { float: left; /* orientation=lt */ float: right; /* orientation=rt */ width: 22px; height: 16px; background: url('background/Pen.gif') no-repeat top; - margin: 4px 2px 0px 0px; /* orientation=lt */ - margin: 4px 0px 0px 2px; /* orientation=rt */ + margin: 2px 2px 0px 0px; /* orientation=lt */ + margin: 2px 0px 0px 2px; /* orientation=rt */ } -.UIContainer .DeleteContainerIcon { +.EDITION-BLOCK .DeleteIcon { 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 */ + margin: 2px 0px 0px 0px; /* orientation=lt */ + margin: 2px 0px 0px 0px; /* orientation=rt */ } -.UIContainer .ContainerIcon { +.EDITION-BLOCK .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; + margin: 0px 0px 0px 5px; /* orientation=lt */ + margin: 0px 5px 0px 0px; /* orientation=rt */ + background: url('background/DefaultContainerIcon.gif') no-repeat left 3px; /* orientation=lt */ + background: url('background/DefaultContainerIcon.gif') no-repeat right 1px; /* 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 */ +.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; } -.DragAndDropPreview { - width: auto; height: 80px; - background: url('background/DragAndDropPreview4x4.gif'); - border: 1px solid #c4c4c4; - margin: 0px 12px 10px 12px; +.UIColumnContainer .ArrowDownIcon { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + width: 22px; height: 16px; + background: url('background/ArrowDown.gif') no-repeat center top; + margin: 3px 0px 0px 2px; /* orientation=lt */ + margin: 3px 2px 0px 0px; /* orientation=rt */ } -.PortletBlockDecorator { +.EDITION-BLOCK .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: 19px; + 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; +} +/****************** edit Application *********************/ +.UIPortlet .LAYOUT-BLOCK { + padding: 2px; } +.UIPortlet .CONTROL-PORTLET .Login { + background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/ToolIcons/Key.gif') no-repeat center; +} + +/****************** edit Container *********************/ .EdittingContainer { padding: 3px; } @@ -224,44 +123,54 @@ background: white; border: 1px dashed #a2a2a2; height: 100%; + padding: 2px; } +.EdittingContainer .OverContainerBlock { + border: 1px solid #b8babf; + background: white; + height: 100%; + padding: 2px; +} -.EdittingContainer .NormalContainerBlock .LeftContainerBlock, -.EdittingContainer .OverContainerBlock .NormalContainerBlock .LeftContainerBlock { - background: none; +.EdittingContainer .LAYOUT-BLOCK .UIRowContainer { + min-height: 86px; + _height: 86px; } -.EdittingContainer .NormalContainerBlock .RightContainerBlock, -.EdittingContainer .OverContainerBlock .NormalContainerBlock .RightContainerBlock { - padding: 2px; - background: none; +.EdittingContainer .VIEW-BLOCK .EmptyContainer { + height: 82px; } -.UIContainer .UIPortlet { - padding: 0px; +.EdittingContainer .LAYOUT-CONTAINER .UIContainer { + _height: 100%; + /* + fix bug dragdrop in IE6 + */ } -.UIPortletMask { - opacity: 0; - filter: alpha(opacity=0); - background: #ffffff; +/*##############################- PortletLayoutDecorator -################################*/ + +.PortletLayoutDecorator { } -.EdittingContainer .OverContainerBlock { - border: 1px solid #b8babf; - background: none; - height: 100%; +.PortletLayoutDecorator .LPortletLayoutDecorator { + background: url('background/PortletLayoutDecorator.gif') no-repeat left top; + padding: 0px 0px 0px 12px; } -.EdittingContainer .OverContainerBlock .LeftContainerBlock { - background: white; +.PortletLayoutDecorator .RPortletLayoutDecorator { + background: url('background/PortletLayoutDecorator.gif') no-repeat right top; + padding-right: 12px; } -.EdittingContainer .OverContainerBlock .RightContainerBlock { - background: none; - padding: 2px; +.PortletLayoutDecorator .CPortletLayoutDecorator { + background: url('background/PortletLayoutDecorator.gif') repeat-x center -89px; + height: 69px; + padding: 10px 0; } +/*############### End Decorator ###################################################*/ + .ProtectedContainer .ProtectedContent { opacity: 0.3; filter: alpha(opacity=80); @@ -269,6 +178,21 @@ padding: 6px 10px; } +.ProtectedPortlet .PortletLayoutDecorator { + background: white; +} + +.ProtectedPortlet .PortletLayoutDecorator .LPortletLayoutDecorator { + opacity: 0.3; + filter: alpha(opacity=30); +} + +.UIPortletMask { + opacity: 0; + filter: alpha(opacity=0); + background: #ffffff; +} + .UIPageBodyMask { opacity: 0; filter: alpha(opacity=0); Deleted: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/BgContainerBlock.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/BottomVTabSimpleStyle224x1.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/ContainerIcon.gif =================================================================== (Binary files differ) Copied: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/DefaultContainerIcon.gif (from rev 7355, portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/DefaultContainerIcon.gif) =================================================================== (Binary files differ) Copied: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/Earth.gif (from rev 7355, portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/Earth.gif) =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/LineBlock.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/Pen.png =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortalBackground4x4.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecoratorHidden.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/close.png =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -2,7 +2,14 @@ .UIToolbarContainer { padding: 0px; height: auto; + position:relative; + z-index:4; } +.UIToolbarContainer ul { + padding:0; + margin:0; + list-style:none; +} .UIToolbarContainer .UserInfoPortletTDContainer { float: right; /* orientation=lt */ @@ -21,7 +28,7 @@ } .UIToolbarContainer .ToolbarContainer .TRContainer { - height: 30px; + height: 32px; } .UIToolbarContainer .UIContainer { @@ -40,7 +47,7 @@ border-bottom: 1px solid #dedede; } -.UIToolbarContainer .ToolbarContainer a { +.UIToolbarContainer .ToolbarContainer .TBIcon { display: block; padding: 0px 5px 0px 35px; /* orientation=lt */ padding: 0px 35px 0px 5px; /* orientation=rt */ @@ -52,7 +59,7 @@ color: #058ee6; } -.UIToolbarContainer .UIHorizontalTabs .TabsContainer { +.UIToolbarContainer .UIHorizontalTabs { height: 32px; /* orientation=lt */ height: auto; /* orientation=rt */ float: left; /* orientation=lt */ @@ -98,9 +105,13 @@ position: absolute; border: 1px solid #9e9fa3; display: none; - z-index: 1; + z-index: 1; } + .UIToolbarContainer .MenuItemContainer li{ + display:block; +} + .UIToolbarContainer .TitleBar { background: #cdd7e0; height: 23px; @@ -113,27 +124,35 @@ filter: alpha(opacity=90); } +.UIToolbarContainer .ArrowIcon { + background: url('background/ToolbarContainer.gif') no-repeat right -452px; /* orientation=lt */ + background: url('background/ToolbarContainer-rt.gif') no-repeat -5px -452px; /* orientation=rt */ +} + .UIToolbarContainer .MenuItem { - background: #f5f9fa; - opacity: 0.9; - filter: alpha(opacity=90); + background-color: #f5f9fa; height: 28px; line-height: 28px; width: 100%; + opacity: 0.9; + filter: alpha(opacity=90); } +*+html .UIToolbarContainer .MenuItem { + height: auto; + width: auto; +} + .UIToolbarContainer .MenuItem .MenuItemHover { background-color: #a4a4a4; } -.UIToolbarContainer .MenuItem .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-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 { @@ -149,8 +168,8 @@ } .UIToolbarContainer .SiteIcon { - background: url('background/ToolbarContainer.gif') no-repeat 5px -96px; /* orientation=lt */ - background: url('background/ToolbarContainer.gif') no-repeat 100% -96px; /* orientation=rt */ + background: url('background/ToolbarContainer.gif') no-repeat 5px -98px; /* orientation=lt */ + background: url('background/ToolbarContainer.gif') no-repeat 100% -98px; /* orientation=rt */ } .UIToolbarContainer .SitesIcon { @@ -240,19 +259,15 @@ color: #3e8df0; } -.UIToolbarContainer .UIAdminToolbarPortlet .UIHorizontalTabs .UITab { +.UIToolbarContainer .UIAdminToolbarPortlet .UITab { background: none; padding: 0px; } -.UIToolbarContainer .UIUserToolbarPortlet .UIHorizontalTabs .TabsContainer { - width: 400px; /* orientation=rt */ +.UIToolbarContainer .UIAdminToolbarPortlet .UIHorizontalTabs .UITab { + float: none; /* orientation=rt */ } -.UIToolbarContainer .UIAdminToolbarPortlet { - width: 200px; /* orientation=rt */ +.UIUserToolBarSitePortlet .ItemIcon { + background-position: 97% center; /* orientation=rt */ } - -.UIToolbarContainer .UIAdminToolbarPortlet .UIHorizontalTabs .UITab { - float: none; /* orientation=rt */ -} Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/background/ToolbarContainer.gif =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UILoginForm/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UILoginForm/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/widget/UILoginForm/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -3,8 +3,11 @@ margin: auto; padding: 30px 17px 30px 10px; /* orientation=lt */ padding: 30px 10px 30px 17px; /* orientation=rt */ - background: #ebebeb; -} + background: #EBEBEB; + border-radius: 5px 5px 5px 5px; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; +} /*##############################- LoginBox Style-################################*/ @@ -84,29 +87,6 @@ padding: 0px 0px 0px 10px; /* orientation=rt */ } -.UILoginForm .UIForm .SimpleStyle .ButtonLeft { - background: url('background/Login.gif') no-repeat left -150px; - padding-left: 5px; -} - -.UILoginForm .UIForm .SimpleStyle .ButtonRight { - background: url('background/Login.gif') no-repeat right -150px; - padding-right: 5px; -} - -.UILoginForm .UIForm .SimpleStyle .ButtonMiddle { - background: url('background/Login.gif') repeat-x center -150px; - line-height: 22px; -} - -.UILoginForm .UIForm .SimpleStyle .ButtonMiddle a { - color: #3f3f3f; -} - -.UILoginForm .UIForm .SimpleStyle .ButtonMiddle a:hover { - color: #058EE6; -} - /* ============================End LoginDecorator============================== */ /* * minh.js.exo @@ -169,9 +149,21 @@ .UILoginForm .UIForm .VerticalLayout .UIAction { padding: 15px 0px 0px 56px; /* orientation=lt */ - padding: 15px 56px 0px 0px; /* orientation=rt */ + padding: 15px 56px 0px 0px; /* orientation=rt */ + text-align: left; /* orientation=lt */ + text-align: right; /* orientation=rt */ +} + +.UILoginForm .UIAction .SimpleStyle { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} + +.UILoginForm .UIAction .SimpleStyle a { + color: #3f3f3f; +} + +.UILoginForm .UIAction .SimpleStyle a:hover { + color: #058EE6; } - -.UILoginForm .UIForm .VerticalLayout .UIAction .ActionContainer { - margin: 0px; -} Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,123 +1,120 @@ -.UIAction { - padding: 8px 0px; -} - -.UIAction .ActionContainer { - width: auto; - margin: auto; -} - -.UIAction .ActionButton { - display: block; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 0px 3px; - cursor: pointer; -} - -.UIAction a { -} - -.UIAction a:hover { - color: #058ee6; -} - - -.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/LightBlueStyle.gif') no-repeat left top; - padding: 0px 0px 0px 3px; -} - -.UIAction .LightBlueStyle .ButtonRight { - background: url('background/LightBlueStyle.gif') no-repeat right top; - padding: 0px 3px 0px 0px ; -} - -.UIAction .LightBlueStyle .ButtonMiddle { - line-height: 22px; text-align: center; - background: url('background/LightBlueStyle.gif') repeat-x bottom; - white-space: nowrap; - display: table-cell; - padding: 0px 12px; -} - -/*##############################-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.SimpleStyle { - color: #313131; - margin: 0px 6px; - white-space: nowrap; -} - -.UIAction a:hover.SimpleStyle { - color: #1273df; -} - -/*************************SimpleStyle1********************/ - -.UIAction .SimpleStyle1 .ButtonLeft { - background: transparent url(background/SimpleStyle1.gif) no-repeat left top; - padding-left: 3px; -} - -.UIAction .SimpleStyle1 .ButtonRight { - background: transparent url(background/SimpleStyle1.gif) no-repeat right top; - padding-right: 3px; -} - -.UIAction .SimpleStyle1 .ButtonMiddle { - background: transparent url(background/SimpleStyle1.gif) repeat-x left -20px; - line-height: 20px; - padding: 0px 4px; -} - -.UIAction .SimpleStyle1 .ButtonMiddle .PageProfileIcon { - background: transparent url(background/PageProfileIcon.gif) no-repeat left; /* orientation=lt */ - background: transparent url(background/PageProfileIcon.gif) no-repeat right; /* orientation=rt */ - line-height: 20px; - padding-left: 22px; /* orientation=lt */ - padding-right: 22px; /* orientation=rt */ -} - -.UIAction .SimpleStyle1 .ButtonMiddle .ViewAsBlockIcon { - background: transparent url(background/ViewAsBlockIcon.gif) no-repeat left; /* orientation=lt */ - background: transparent url(background/ViewAsBlockIcon.gif) no-repeat right; /* orientation=rt */ - line-height: 20px; - padding-left: 22px; /* orientation=lt */ - padding-right: 22px; /* orientation=rt */ +.UIAction { + padding: 8px 0px; + text-align: center; } + +.UIAction .ActionButton { + display: inline-block; + margin: 0px 3px; + cursor: pointer; +} + +.UIAction a { + display: inline-block; +} + +.UIAction .ActionButton:hover { + color: #058ee6; +} + +.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 { + line-height: 19px; text-align: center; + background: url('background/LightBlueStyle.gif') repeat-x center; + white-space: nowrap; + padding: 0px 12px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + border: 1px solid #8a8a8a; + border-bottom: 1px solid #5d5d5d; +} + +/*##############################-SimpleStyle ActionButton-################################*/ + +.UIAction .SimpleStyle { +} + +.UIAction .SimpleStyle { + line-height: 20px; + background: url('background/SimpleStyle.gif') repeat-x center; + text-align: center; + padding: 0px 12px; + white-space: nowrap; + border: 1px solid #c9c9c9; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; +} + +.UIAction a.SimpleStyle { + color: #313131; + margin: 0px 6px; + white-space: nowrap; +} + +.UIAction .SimpleStyle:hover { + color: #1273df; +} + +/********************** DarkGrayButton **********************/ + +.UIAction .DarkGrayButton { + font-weight: normal; + background: url('background/DarkGrayButton.gif') repeat-x left center; + font-size: 11px; + line-height: 22px; + padding: 0px 10px; + border: 1px solid #e2e2e2; + border-bottom: 1px solid #d9d9d9; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} + +.UIAction .DarkGrayButton:hover { + color: #9b9b9b; +} + + +/*************************SimpleStyle1********************/ + +.UIAction .SimpleStyle1 { + background: transparent url(background/SimpleStyle1.gif) repeat-x center; + line-height: 20px; + padding: 0px 4px; + border: 1px solid #b8babf; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} + +.UIAction .SimpleStyle1 .PageProfileIcon { + background: transparent url(background/PageProfileIcon.gif) no-repeat left; /* orientation=lt */ + background: transparent 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 .ViewAsBlockIcon { + background: transparent url(background/ViewAsBlockIcon.gif) no-repeat left; /* orientation=lt */ + background: transparent 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; +} Copied: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/DarkGrayButton.gif (from rev 7355, portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/DarkGrayButton.gif) =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/LightBlueStyle.gif =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle.gif =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/SimpleStyle1.gif =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,106 +1,67 @@ -.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; +.UIInfoBar { } + +/*######################-Blue Rounded Style-######################*/ + +.UIInfoBar .BlueRoundedStyle { + padding: 0px 3px; margin: 0px; + background: url('background/BlueRoundedStyle.png') repeat-x center; + height: 19px; line-height: 19px; + border: 1px solid #b8babf; + -moz-border-radius: 0 0 5px 0; + -webkit-border-radius: 0 0 5px 0; + border-radius: 0 0 5px 0; + -moz-box-shadow: 1px 0px rgba(255, 255, 255, 0.6), -1px 0px rgba(255, 255, 255, 0.6), + 0px 1px rgba(255, 255, 255, 0.6), 0px -1px rgba(255, 255, 255, 0.6), + 2px 2px 2px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 1px 0px rgba(255, 255, 255, 0.6), -1px 0px rgba(255, 255, 255, 0.6), + 0px 1px rgba(255, 255, 255, 0.6), 0px -1px rgba(255, 255, 255, 0.6), + 2px 2px 2px rgba(0, 0, 0, 0.3); + box-shadow: 1px 0px rgba(255, 255, 255, 0.6), -1px 0px rgba(255, 255, 255, 0.6), + 0px 1px rgba(255, 255, 255, 0.6), 0px -1px rgba(255, 255, 255, 0.6), + 2px 2px 2px rgba(0, 0, 0, 0.3); +} + +/*######################-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: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/BlueRoundedStyle.gif =================================================================== (Binary files differ) Copied: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/BlueRoundedStyle.png (from rev 7355, portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/BlueRoundedStyle.png) =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/DefaultContainerIcon.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/Earth.gif =================================================================== (Binary files differ) Deleted: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/background/ViewBlockBar.png =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,199 +1,170 @@ -.UIMaskWorkspace { - border: none; - width: 650px; -} - -.UIMaskWorkspace .TopLeftDecorator { - background: url('background/MaskWorkspace.png') no-repeat left top; - padding: 0px 0px 0px 13px; -} - -.UIMaskWorkspace .TopRightDecorator { - background: url('background/MaskWorkspace.png') no-repeat right -13px; - padding: 0px 13px 0px 0px; -} - -.UIMaskWorkspace .TopLeftDecorator .TopCenterDecorator { - height: 13px; - background: url('background/MaskWorkspace.png') repeat-x center -26px; -} - -.UIMaskWorkspace .MiddleLeftDecorator { - background: url('background/MiddleMaskWorkspace.png') repeat-y left top; - padding: 0px 0px 0px 10px; -} - -.UIMaskWorkspace .MiddleRightDecorator { - background: url('background/MiddleMaskWorkspace.png') repeat-y right top; - padding: 0px 11px 0px 0px; -} - -.UIMaskWorkspace .MaskContainer { - background: #f5f5f5; -} - -.UIMaskWorkspace .BottomLeftDecorator { - background: url('background/MaskWorkspace.png') no-repeat left -39px; - padding: 0px 0px 0px 13px; -} - -.UIMaskWorkspace .BottomRightDecorator { - padding: 0px 13px 0px 0px; - background: url('background/MaskWorkspace.png') no-repeat right -52px; -} - -.UIMaskWorkspace .BottomLeftDecorator .BottomCenterDecorator { - height: 13px; - background: url('background/MaskWorkspace.png') repeat-x center -65px; -} - -.UIMaskWorkspace .UIAddApplication .UIItemSelector .ItemDetailList { - margin-right: 0px; /* orientation=lt */ - margin-left: 0px; /* orientation=rt */ - height: auto; -} - -/*********************************** UITabContent ************************************/ - -.UIMaskWorkspace .UIFormTabPane { - padding: 10px; -} - -.UIMaskWorkspace .UITabContent { - overflow-y: auto; - overflow-x: hidden; - margin: auto; - height: 275px; -} - -.UIMaskWorkspace .UIForm .HorizontalLayout .SelectedIconInfo .UIFormInputSet { - margin: auto; -} - -.UIMaskWorkspace .UIAccessGroup .PublicCheck .UIFormGrid td.FieldComponent { - _padding: 0px; -} - -/*********************************** End UITabContent ************************************/ - -.UIMaskWorkspace .IconLayout { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 3px 5px 0px 5px; -} - -.UIMaskWorkspace .UIFormWithTitle { - width: 550px; - margin: auto; - padding: 50px 0px; -} - -.UIMaskWorkspace .UIFormInputSet .UIFormGrid .SelectGroup { - background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/SmallGroup.gif') no-repeat center; - height: 22px; - width: 22px; -} - -/**********************************UITabSelector*****************************************/ - -.UIMaskWorkspace .UITabPane .TabPaneContent .WorkingArea .CSSContent { - border: 1px solid #d5d5d5; - padding: 0px; -} - -.UIMaskWorkspace .UITabPane .TabPaneContent .CSSContent .UITabContent { - height: auto; - border: 1px solid white; - border-top: none; - margin: auto; - overflow: hidden; -} - -/************************************ Select Permission *******************************/ - -.UIGroupSelector { - padding: 10px; -} - -.UIGroupSelector .SelectedGroupPath { - padding: 5px 0px; -} - -.UIGroupSelector .UIBreadcumbs { - border: 1px solid white; - padding: 0px; -} - -.UIGroupSelector .UIBreadcumbs .LeftBreadcumbsBar { - background: white; - border: 1px solid #b7b7b7; -} - -.UIGroupSelector .UIBreadcumbs .RightBreadcumbsBar { - background: white; -} - -.UIGroupSelector .UIBreadcumbs .BreadcumbsInfoBar { - background: white; -} - -.UIGroupSelector .UIBreadcumbs .BCHome16x16Icon { - width: 16px; height: 16px; - background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/SmallGroup.gif') no-repeat left center; -} - -.UIGroupSelector .UIBreadcumbs a.Selected { - color: #058ee6; -} - -.UIGroupSelector .GroupSelector { - padding: 10px; - background: #f4f4f4; - border: 1px solid #e4e4e4; -} - -.UIGroupSelector .TitleGroupSelector { - background: url('background/ThGridRepeatBg1x19.jpg') repeat-x; - line-height: 19px; height: 19px; - border: 1px solid #b7b7b7; - border-bottom: 1px solid #cfcfcf; - padding: 0px 10px; -} - -.UIGroupSelector .LeftGroupSelector { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 220px; height: 210px; - border: 1px solid white; -} - -.UIGroupSelector .RightGroupSelector { - margin-left: 225px; /* orientation=lt */ - margin-right: 225px; /* orientation=rt */ - height: 210px; - border: 1px solid white; -} - -.UIGroupSelector .RightGroupSelector .Content { - border: 1px solid #b7b7b7; border-top: none; - height: 170px; - color: #058ee6; - padding: 10px; - background: white; -} - -.UIGroupSelector .RightGroupSelector .Content div { - padding: 3px 0px; -} - -.UIGroupSelector .RightGroupSelector .Content span { - color: #2c2c2c; -} - -/**************************************Container Form*************************************/ -/**************************************ExoMessageDecorator*************************************/ - -.UIMaskWorkspace .UIIFramePortlet .ExoMessageDecorator .UIPopupMessages .UITabContentContainer { - border: none; -} +.UIMaskWorkspace { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + border: solid 8px #c5c5c5; + width: 650px; + -moz-box-shadow: 0px 0px 5px #909090; + -webkit-box-shadow: 0px 0px 5px #909090; + box-shadow: 0px 0px 5px #909090; + background: #c5c5c5; +} + +.UIMaskWorkspace .MaskContainer { + background: #f5f5f5; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} + + +.UIMaskWorkspace .UIAddApplication .UIItemSelector .ItemDetailList { + margin-right: 0px; /* orientation=lt */ + margin-left: 0px; /* orientation=rt */ + height: auto; +} + +/*********************************** UITabContent ************************************/ + +.UIMaskWorkspace .UIFormTabPane { + padding: 10px; +} + +.UIMaskWorkspace .UITabContent { + overflow-y: auto; + overflow-x: hidden; + margin: auto; + height: 275px; +} + +.UIMaskWorkspace .UIForm .HorizontalLayout .SelectedIconInfo .UIFormInputSet { + margin: auto; +} + +.UIMaskWorkspace .UIAccessGroup .PublicCheck .UIFormGrid td.FieldComponent { + _padding: 0px; +} + +/*********************************** End UITabContent ************************************/ + +.UIMaskWorkspace .IconLayout { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + margin: 3px 5px 0px 5px; +} + +.UIMaskWorkspace .UIFormWithTitle { + width: 550px; + margin: auto; + padding: 50px 0px; +} + +.UIMaskWorkspace .UIFormInputSet .UIFormGrid .SelectGroup { + background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/SmallGroup.gif') no-repeat center; + height: 22px; + width: 22px; +} + +/**********************************UITabSelector*****************************************/ + +.UIMaskWorkspace .UITabPane .TabPaneContent .WorkingArea .CSSContent { + border: 1px solid #d5d5d5; + padding: 0px; +} + +.UIMaskWorkspace .UITabPane .TabPaneContent .CSSContent .UITabContent { + height: auto; + border: 1px solid white; + border-top: none; + margin: auto; + overflow: hidden; +} + +/************************************ Select Permission *******************************/ + +.UIGroupSelector { + padding: 10px; +} + +.UIGroupSelector .SelectedGroupPath { + padding: 5px 0px; +} + +.UIGroupSelector .UIBreadcumbs { + border: 1px solid white; + padding: 0px; +} + +.UIGroupSelector .UIBreadcumbs .LeftBreadcumbsBar { + background: white; + border: 1px solid #b7b7b7; +} + +.UIGroupSelector .UIBreadcumbs .RightBreadcumbsBar { + background: white; +} + +.UIGroupSelector .UIBreadcumbs .BreadcumbsInfoBar { + background: white; +} + +.UIGroupSelector .UIBreadcumbs .BCHome16x16Icon { + width: 16px; height: 16px; + background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/SmallGroup.gif') no-repeat left center; +} + +.UIGroupSelector .UIBreadcumbs a.Selected { + color: #058ee6; +} + +.UIGroupSelector .GroupSelector { + padding: 10px; + background: #f4f4f4; + border: 1px solid #e4e4e4; +} + +.UIGroupSelector .TitleGroupSelector { + background: url('background/ThGridRepeatBg1x19.jpg') repeat-x; + line-height: 19px; height: 19px; + border: 1px solid #b7b7b7; + border-bottom: 1px solid #cfcfcf; + padding: 0px 10px; +} + +.UIGroupSelector .LeftGroupSelector { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + width: 220px; height: 210px; + border: 1px solid white; +} + +.UIGroupSelector .RightGroupSelector { + margin-left: 225px; /* orientation=lt */ + margin-right: 225px; /* orientation=rt */ + height: 210px; + border: 1px solid white; +} + +.UIGroupSelector .RightGroupSelector .Content { + border: 1px solid #b7b7b7; border-top: none; + height: 170px; + color: #058ee6; + padding: 10px; + background: white; +} + +.UIGroupSelector .RightGroupSelector .Content div { + padding: 3px 0px; +} + +.UIGroupSelector .RightGroupSelector .Content span { + color: #2c2c2c; +} + +/**************************************Container Form*************************************/ +/**************************************ExoMessageDecorator*************************************/ + +.UIMaskWorkspace .UIIFramePortlet .ExoMessageDecorator .UIPopupMessages .UITabContentContainer { + border: none; +} Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -10,68 +10,25 @@ width: 120px; top: 15px; left: -85px; /* orientation=lt */ - right: -85px; /* orientation=rt */ + right: -85px; /* orientation=rt */ + border: 1px solid #787878; + box-shadow: 1px 1px 2px #787878; /* orientation=lt */ + -moz-box-shadow: 1px 1px 2px #787878; /* orientation=lt */ + -webkit-box-shadow: 1px 1px 2px #787878; /* orientation=lt */ + box-shadow: -1px 1px 2px #787878; /* orientation=rt */ + -moz-box-shadow: -1px 1px 2px #787878; /* orientation=rt */ + -webkit-box-shadow: -1px 1px 2px #787878; /* orientation=rt */ + margin-top: 8px; + background: #ffffff; } -.UIPopupCategory .PopupCategoryDecorator { +.UIPopupCategory .PopupCategoryDecorator { + background: url('background/PopupCategory.gif') no-repeat 88% top; /* orientation=lt */ + background: url('background/PopupCategory-rt.gif') no-repeat 8px top; /* orientation=rt */ + margin-top: -11px; + padding: 15px 4px 4px; } -.UIPopupCategory .PopupCategoryDecorator .PopupCategoryTL { - background: url('background/PopupCategory.gif') no-repeat left top; /* orientation=lt */ - background: url('background/PopupCategory-rt.gif') no-repeat right top; /* orientation=rt */ - padding-left: 6px; /* orientation=lt */ - padding-right: 6px; /* orientation=rt */ -} - -.UIPopupCategory .PopupCategoryDecorator .PopupCategoryTC { - height: 16px; - background: url('background/PopupCategory.gif') repeat-x left -39px; -} - -.UIPopupCategory .PopupCategoryDecorator .PopupCategoryTR { - background: url('background/PopupCategory.gif') no-repeat right -16px; /* orientation=lt */ - background: url('background/PopupCategory-rt.gif') no-repeat left -16px; /* orientation=rt */ - padding-right: 35px; /* orientation=lt */ - padding-left: 35px; /* orientation=rt */ -} - -.UIPopupCategory .PopupCategoryDecorator .PopupCategoryML { - background: url('background/MidlePopupCategory.gif') repeat-y left; /* orientation=lt */ - background: url('background/MidlePopupCategory-rt.gif') repeat-y right; /* orientation=rt */ - padding-left: 6px; /* orientation=lt */ - padding-right: 6px; /* orientation=rt */ -} - -.UIPopupCategory .PopupCategoryDecorator .PopupCategoryMC { - background: #efefef; -} - -.UIPopupCategory .PopupCategoryDecorator .PopupCategoryMR { - background: url('background/MidlePopupCategory.gif') repeat-y right; /* orientation=lt */ - background: url('background/MidlePopupCategory-rt.gif') repeat-y left; /* orientation=rt */ - padding-right: 8px; /* orientation=lt */ - padding-left: 8px; /* orientation=rt */ -} - -.UIPopupCategory .PopupCategoryDecorator .PopupCategoryBL { - background: url('background/PopupCategory.gif') no-repeat left -32px; /* orientation=lt */ - background: url('background/PopupCategory-rt.gif') no-repeat right -32px; /* orientation=rt */ - padding-left: 6px; /* orientation=lt */ - padding-right: 6px; /* orientation=rt */ -} - -.UIPopupCategory .PopupCategoryDecorator .PopupCategoryBC { - height: 7px; - background: url('background/PopupCategory.gif') repeat-x left -55px; -} - -.UIPopupCategory .PopupCategoryDecorator .PopupCategoryBR { - background: url('background/PopupCategory.gif') no-repeat right -32px; /* orientation=lt */ - background: url('background/PopupCategory-rt.gif') no-repeat left -32px; /* orientation=rt */ - padding-right: 8px; /* orientation=lt */ - padding-left: 8px; /* orientation=rt */ -} - .UIPopupCategory .CategoryItem .Icon { width: 16px; height: 16px; @@ -95,15 +52,14 @@ } .UIPopupCategory .CategoryItem:hover { - background: #cbcff2; - color: #2569dc; -} - -.UIPopupCategory .CategoryItem .CategoryItemLabel { - padding-left: 18px; /* orientation=lt */ - padding-right: 18px; /* orientation=rt */ - height: 22px; - line-height: 22px; - background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow.gif') no-repeat left center; /* orientation=lt */ - background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow-rt.gif') no-repeat right center; /* orientation=rt */ -} \ No newline at end of file + color: #2569dc; + border-bottom: 1px #cdcdcd solid; + cursor: pointer; + display: block; + padding-left: 18px; /* orientation=lt */ + padding-right: 18px; /* orientation=rt */ + height: 22px; + line-height: 22px; + background: #cbcff2 url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow.gif') no-repeat left center; /* orientation=lt */ + background: #cbcff2 url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow-rt.gif') no-repeat right center; /* orientation=rt */ +} Deleted: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/MidlePopupCategory.gif =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/PopupCategory.gif =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupMessage/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupMessage/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupMessage/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,12 +1,5 @@ -.UIPopupMessages { -} -.UIPopupMessages .UIHorizontalTabs { - height: 31px; - background: url('background/MessageTabBar.gif') repeat-x bottom; -} - .UIPopupMessages .UIHorizontalTabs .TabsContainer { height: 31px; } @@ -15,10 +8,11 @@ border: none; } -.UIPopupMessages .PopupMessageBox { +.UIPopupMessages ul { padding: 5px; height: 200px; overflow: auto; + margin: 0px; } .UIPopupMessages .WarningMessage .MessageContainer { @@ -41,126 +35,41 @@ border-bottom: 1px dotted #c3c3c3; } -.UIPopupMessages .PopupMessageContainer .PopupIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 16px; height: 16px; - margin-top: 5px; +.UIPopupMessages .MessageContainer .PopupIcon { + display: block; + line-height: 16px; + padding: 5px 0 5px 22px; } -.UIPopupMessages .PopupMessageContainer .InfoMessageIcon { - background: url(/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/Info.gif) no-repeat top; +.UIPopupMessages .MessageContainer .InfoMessageIcon { + background: url(/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/Info.gif) no-repeat left 7px; } -.UIPopupMessages .PopupMessageContainer .WarningMessageIcon { - background: url(/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/Warning.gif) no-repeat top; +.UIPopupMessages .MessageContainer .WarningMessageIcon { + background: url(/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/Warning.gif) no-repeat left 7px; } -.UIPopupMessages .PopupMessageContainer .ErrorMessageIcon { - background: url(/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/Error.gif) no-repeat top; +.UIPopupMessages .MessageContainer .ErrorMessageIcon { + background: url(/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/Error.gif) no-repeat left 7px; } -.UIPopupMessages .PopupMessageContainer .PopupMessage { - line-height: 16px; - vertical-align: middle; - padding: 5px 0px; - margin-left: 25px; /* orientation=lt */ - margin-right: 25px; /* orientation=rt */ +.UIPopupMessages .UIHorizontalTabs{ + background: url(background/MessageTabBar.gif) repeat-x center bottom; + height: 31px; } -.UIPopupMessages .MessageActionBar { -} - /***************************Begin PoupWindow ExoMessage**********************************/ -.UIPopupWindow .ExoMessageDecorator { - overflow: hidden;/*Fix for IE*/ -} - -.UIPopupWindow .ExoMessageDecorator .TopLeftCornerDecorator { - background: url('background/ExoMessageDecorator.png') no-repeat left top; - padding-left: 6px; - height: 31px; -} - -.UIPopupWindow .ExoMessageDecorator .TopRightCornerDecorator { - background: url('background/ExoMessageDecorator.png') no-repeat right -31px; - padding-right: 6px; - height: 31px; -} - -.UIPopupWindow .ExoMessageDecorator .TopCenterDecorator { - background: url('background/ExoMessageDecorator.png') repeat-x center -62px; - height: 26px; -} - -.UIPopupWindow .ExoMessageDecorator .PopupTitle { - background: none; - text-align: left; /* orientation=lt */ - text-align: right; /* orientation=rt */ -} - -.UIPopupWindow .ExoMessageDecorator .PopupTitleIcon { - width: 16px; height: 16px; +.ExoMessageDecorator .OverflowContainer .PopupTitleIcon { + width: 16px; + height: 16px; background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/Message.gif') no-repeat; float: left; /* orientation=lt */ float: right; /* orientation=rt */ - margin: 4px 0px 0px 4px; /* orientation=lt */ - margin: 4px 4px 0px 0px; /* orientation=rt */ + margin: 4px 0px 0px 8px; /* orientation=lt */ + margin: 4px 8px 0px 0px; /* orientation=rt */ } -.UIPopupWindow .ExoMessageDecorator .MiddleLeftSideDecorator { - background: url('background/MiddleExoMessage.png') repeat-y left; - padding-left: 4px; - height: 100%; -} - -.UIPopupWindow .ExoMessageDecorator .MiddleRightSideDecorator { - background: url('background/MiddleExoMessage.png') repeat-y right; - padding-right: 4px; -} - -.UIPopupWindow .ExoMessageDecorator .MiddleCenterDecorator { - background: #e1e1e1; - padding: 6px 7px; -} - -.UIPopupWindow .ExoMessageDecorator .UIWindowContent { - padding: 0px; margin: 0px; - border: none; -} - -.UIPopupWindow .ExoMessageDecorator .PopupContent { - background: none; -} - -.UIPopupWindow .ExoMessageDecorator .UIWindowContent .Content { - padding: 0px; margin: 0px; - border: none; -} - -.UIPopupWindow .ExoMessageDecorator .BottomLeftCornerDecorator { - background: url('background/ExoMessageDecorator.png') no-repeat left -93px; - padding-left: 6px; -} - -.UIPopupWindow .ExoMessageDecorator .BottomRightCornerDecorator { - background: url('background/ExoMessageDecorator.png') no-repeat right -99px; - padding-right: 6px; -} - -.UIPopupWindow .ExoMessageDecorator .BottomCenterDecorator { - background: url('background/ExoMessageDecorator.png') repeat-x center -105px; - height: 6px; -} - -.UIPopupWindow .ExoMessageDecorator .UITabContentContainer { +.ExoMessageDecorator .UITabContentContainer { background: white; } - -.UIPopupWindow .ExoMessageDecorator .UITabContentContainer .UITabContent { - height: auto; - background: none; - border: none; - padding: 0px; -} Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,300 +1,249 @@ -.UIPopupWindow { - position: absolute; - visibility: hidden; -} - -.UIPopupWindow .PopupTitleIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 5px 0px 0px 3px; /* orientation=lt */ - margin: 5px 3px 0px 0px; /* orientation=rt */ - width: 16px; height: 16px; - background: url('background/PopupWindow.gif') no-repeat left bottom; -} - -.UIPopupWindow .PopupTitleIconRight { - float: right; - margin: 5px 3px 0px 0px; - width: 19px; height: 16px; - background: url('background/PopupWindow.gif') no-repeat left bottom; -} - -.UIPopupWindow .PopupTitle { - margin: 4px 26px 0px 26px; - line-height: 16px; - vertical-align: middle; - cursor: move; - color: #000; -} - -.UIPopupWindow .CloseButton { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - margin: 5px 3px 0px 0px; /* orientation=lt */ - margin: 5px 0px 0px 3px; /* orientation=rt */ - cursor: pointer; - width: 23px; height: 17px; - background: url('background/CloseIcon.gif') no-repeat right top; -} - -.UIPopupWindow .BackButton { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - margin: 5px 3px 0px 0px; /* orientation=lt */ - margin: 5px 0px 0px 3px; /* orientation=rt */ - cursor: pointer; - width: 18px; height: 18px; - background: url('background/Back.gif') no-repeat right bottom; -} - -.UIPopupWindow .TopLeftCornerDecorator { - background: url('background/TopPopup.png') no-repeat left top; - padding-left: 8px; -} - -.UIPopupWindow .TopCenterDecorator { - background: url('background/TopPopup.png') repeat-x left -66px; - height: 28px; - padding-top: 5px; -} - -.UIPopupWindow .TopRightCornerDecorator { - background: url('background/TopPopup.png') no-repeat right -33px; - padding-right: 8px; -} - -.UIPopupWindow .MiddleLeftSideDecorator { - background: url('background/MiddlePopup.png') repeat-y left top; - padding-left: 8px; -} - -.UIPopupWindow .MiddleCenterDecorator { - background: #e1e1e1; - padding: 0px 3px 5px 3px; -} - -.UIPopupWindow .MiddleRightSideDecorator { - background: url('background/MiddlePopup.png') repeat-y right top; - padding-right: 8px; - } - -.UIPopupWindow .UIWindowContent { - border: 1px solid #bdbcbd; -} - -.UIPopupWindow .PopupContent { - width: 100%; - background: #f7f7f7; - overflow: auto; -} - -.UIPopupWindow .ResizeButton { - background: url('background/ResizeBtn.gif') no-repeat right top; /* orientation=lt */ - background: url('background/ResizeBtn-rt.gif') no-repeat left top; /* orientation=rt */ - display: block; - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - cursor: nw-resize; /* orientation=lt */ - cursor: ne-resize; /* orientation=rt */ - position: absolute; - bottom: 8px; - right: 8px; /* orientation=lt */ - left: 8px; /* orientation=rt */ -} - -.UIPopupWindow .BottomLeftCornerDecorator { - background: url('background/BottomPopup.png') no-repeat left top; - padding-left: 7px; -} - -.UIPopupWindow .BottomCenterDecorator { - background: url('background/BottomPopup.png') repeat-x left -14px; - height: 7px; -} - -.UIPopupWindow .BottomRightCornerDecorator { - background: url('background/BottomPopup.png') no-repeat right -7px; - padding-right: 7px; -} - -.UIPopupWindow .Content .UIPageBrowser { - padding: 7px 4px 0px 8px; - width: 96%; - margin: auto; -} - -/************************** UIPortalComposer **************************/ - -.UIPortalComposer { -} - -.UIPortalComposer .TLPortalComposer { - background: transparent url(background/PortalComposer.gif) no-repeat left top; - padding-left: 7px; -} - -.UIPortalComposer .TRPortalComposer { - background: transparent url(background/PortalComposer.gif) no-repeat right top; - padding-right: 7px; -} - -.UIPortalComposer .TCPortalComposer { - background: transparent url(background/PortalComposer.gif) repeat-x left -34px; - height: 34px; -} - -.UIPortalComposer .CollapseIcon { - background: url(background/ExpandIcon.gif) no-repeat left; /* orientation=lt */ - background: url(background/ExpandIcon-rt.gif) no-repeat right; /* orientation=rt */ - width: 16px; - height: 14px; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 8px 5px; - cursor: pointer; -} - -.UIPortalComposer .ExpandIcon { - background: url(background/GrayDownIcon.gif) no-repeat left; /* orientation=lt */ - background: url(background/GrayDownIcon.gif) no-repeat right; /* orientation=rt */ - width: 16px; - height: 14px; - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - margin: 8px 5px; - cursor: pointer; -} - -.UIPortalComposer .CloseButton { - background: url(background/CloseIcon.gif) no-repeat right bottom; /* orientation=lt */ - background: url(background/CloseIcon-rt.gif) no-repeat left bottom; /* orientation=rt */ - width: 23px; +.UIPopupWindow { + position: absolute; + visibility: hidden; + background: #E1E1E1; + border: 1px solid #CACACA; + box-shadow: 0 0 5px #AFAFAF; +} + +.UIPopupWindow .PopupTitleIcon { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + margin: 5px 0px 0px 8px; /* orientation=lt */ + margin: 5px 8px 0px 0px; /* orientation=rt */ + width: 16px; + height: 16px; + background: url('background/PopupWindow.gif') no-repeat left bottom; +} + +.UIPopupWindow .PopupTitleIconRight { + float: right; + margin: 5px 3px 0px 0px; + width: 19px; height: 16px; + background: url('background/PopupWindow.gif') no-repeat left bottom; +} + +.UIPopupWindow .PopupTitle { + margin: 0px 30px 0px; + line-height: 26px; + vertical-align: middle; + cursor: move; + color: #000; + display: block; +} + +.UIPopupWindow .CloseButton { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ + margin: 5px 8px 0px 0px; /* orientation=lt */ + margin: 5px 0px 0px 8px; /* orientation=rt */ + cursor: pointer; + width: 23px; height: 17px; + background: url('background/CloseIcon.gif') no-repeat right top; +} + +.UIPopupWindow .BackButton { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ + margin: 5px 3px 0px 0px; /* orientation=lt */ + margin: 5px 0px 0px 3px; /* orientation=rt */ + cursor: pointer; + width: 18px; height: 18px; + background: url('background/Back.gif') no-repeat right bottom; +} + +.UIPopupWindow .UIWindowContent { + border: 1px solid #bdbcbd; + background: #EBEBEB; + -moz-border-radius: 0px; + -webkit-border-radius: 0px; + border-radius: 0px; + margin: 5px 8px 8px 8px; +} + +.UIPopupWindow .PopupContent { + width: 100%; + background: #f7f7f7; + overflow: auto; +} + +.UIPopupWindow .ResizeButton { + background: url('background/ResizeBtn.gif') no-repeat right top; /* orientation=lt */ + background: url('background/ResizeBtn-rt.gif') no-repeat left top; /* orientation=rt */ + display: block; + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ + cursor: nw-resize; /* orientation=lt */ + cursor: ne-resize; /* orientation=rt */ +} + +.UIPopupWindow > .OverflowContainer{ + background: #e1e1e1; + height: 25px; +} + +.UIPopupWindow .Content .UIPageBrowser { + padding: 7px 4px 0px 8px; + width: 96%; + margin: auto; +} + +/************************** UIPortalComposer **************************/ + +.UIPortalComposer { + border: 1px solid #A2A3A9; + border-top: none; + background: #ececec; +} + +.UIPortalComposer .CollapseIcon { + background: url(background/ExpandIcon.gif) no-repeat left; /* orientation=lt */ + background: url(background/ExpandIcon-rt.gif) no-repeat right; /* orientation=rt */ + width: 16px; + height: 14px; + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + margin: 8px 5px; + cursor: pointer; +} + +.UIPortalComposer .ExpandIcon { + background: url(background/GrayDownIcon.gif) no-repeat left; /* orientation=lt */ + background: url(background/GrayDownIcon.gif) no-repeat right; /* orientation=rt */ + width: 16px; + height: 14px; + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + margin: 8px 5px; + cursor: pointer; +} + +.UIPortalComposer .CloseButton { + background: url(background/CloseIcon.gif) no-repeat right bottom; /* orientation=lt */ + background: url(background/CloseIcon-rt.gif) no-repeat left bottom; /* orientation=rt */ + width: 23px; height: 17px; float: right; /* orientation=lt */ float: left; /* orientation=rt */ - margin: 6px 0px 0px 2px; /* orientation=lt */ - margin: 6px 2px 0px 0px; /* orientation=rt */ -} - -.UIPortalComposer .SaveButton { + margin: 6px 5px 0px 2px; /* orientation=lt */ + margin: 6px 2px 0px 5px; /* orientation=rt */ +} + +.UIPortalComposer .SaveButton { background: url(background/EdittedSaveIcon.gif) no-repeat right bottom; /* orientation=lt */ background: url(background/EdittedSaveIcon-rt.gif) no-repeat left bottom; /* orientation=rt */ - cursor: pointer; - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - height: 17px; + cursor: pointer; + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ + height: 17px; margin: 6px 0px 0px 2px; /* orientation=lt */ - margin: 6px 2px 0px 0px; /* orientation=rt */ - width: 23px; -} - -.UIPortalComposer .BackButton { - background: url(background/BackIcon.gif) no-repeat right bottom; /* orientation=lt */ - background: url(background/BackIcon-rt.gif) no-repeat left bottom; /* orientation=rt */ - width: 23px; + margin: 6px 2px 0px 0px; /* orientation=rt */ + width: 23px; +} + +.UIPortalComposer .BackButton { + background: url(background/BackIcon.gif) no-repeat right bottom; /* orientation=lt */ + background: url(background/BackIcon-rt.gif) no-repeat left bottom; /* orientation=rt */ + width: 23px; height: 17px; float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - margin: 6px 0px 0px 0px; -} - -.UIPortalComposer .EdittedSaveButton { + float: left; /* orientation=rt */ + margin: 6px 0px 0px 0px; +} + +.UIPortalComposer .EdittedSaveButton { background: url(background/SaveIcon.gif) no-repeat right bottom; /* orientation=lt */ - background: url(background/SaveIcon-rt.gif) no-repeat left bottom; /* orientation=rt */ - cursor: pointer; - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ + background: url(background/SaveIcon-rt.gif) no-repeat left bottom; /* orientation=rt */ + cursor: pointer; + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ height: 17px; margin: 6px 0px 0px 2px; /* orientation=lt */ - margin: 6px 2px 0px 0px; /* orientation=rt */ - width: 23px; -} - -.UIPortalComposer .PopupTitle { - background: none; - margin: 0px 42px 0px 26px; /* orientation=lt */ - margin: 0px 26px 0px 42px; /* orientation=rt */ - text-align: left; /* orientation=lt */ - text-align: right; /* orientation=rt */ - color: #000; - font-size: 12px; - font-family: arial; - cursor: move; - line-height: 30px; - height: 30px; -} - -.UIPortalComposer .MLPortalComposer { - background: url(background/MiddlePortalComposer.gif) repeat-y left top; - padding-left: 3px; -} - -.UIPortalComposer .MRPortalComposer { - background: url(background/MiddlePortalComposer.gif) repeat-y right top; - padding-right: 3px; -} - -.UIPortalComposer .MCPortalComposer { - background: #d8dae1 url(background/CenterMiddleWindow.gif) repeat-x left top; - padding: 4px; - padding-bottom: 0px; -} - -.UIPortalComposer .BLPortalComposer { - border: 1px solid #a2a3a9; - border-top: none; - background: #d8dae1; -} - -.UIPortalComposer .BRPortalComposer { - padding: 0px 6px 6px 6px; -} - -.UIPortalComposer .BCPortalComposer { - background: #ececec; - border: 1px solid #bbbcc2; - height: 50px; -} + margin: 6px 2px 0px 0px; /* orientation=rt */ + width: 23px; +} -.UIPortalComposer .BCPortalComposer { +.UIPortalComposer .PopupTitle { + background: none; + margin: 0px 42px 0px 0px; /* orientation=lt */ + margin: 0px 0px 0px 42px; /* orientation=rt */ + text-align: left; /* orientation=lt */ + text-align: right; /* orientation=rt */ + color: #000; + font-size: 12px; + font-family: arial; + cursor: move; + line-height: 30px; + height: 30px; + display: block; +} +.UIPortalComposer .Bottom { + border-bottom: 1px solid #a2a3a9; } - -.UIPortalComposer .Bottom { - border-bottom: 1px solid #a2a3a9; -} - -.UIPortalComposer .UIWindowContent { - border: none; -} - -.UIPortalComposer .PopupContent { - background: none; -} - -.UIPortalComposer .UITabPane { - height: auto; -} - -.UIPortalComposer .UITabPane .TabPaneContent { - padding: 0px; -} - -.UIPortalComposer .UIHorizontalTabs .TabsContainer { - background: url(background/CenterHorizontalTabs.gif) repeat-x left bottom; - height: 25px; -} - -.UIPortalComposer .UITabPane .UITabContentContainer { -} - -.UIPortalComposer .UITabPane .UITabContentContainer .UITabContent { - background: none; - border: none; -} - -.UIPortalComposer .ResizeButton { - width: 13px; height: 13px; - margin: 0; -} \ No newline at end of file + +.UIPortalComposer .UIWindowContent{ + border: none; + margin: 5px 4px 8px; +} + +.UIPortalComposer .PopupContent { + background: none; +} + +.UIPortalComposer .UITabPane { + height: auto; +} + +.UIPortalComposer .UITabPane .TabPaneContent { + padding: 0px; +} + +.UIPortalComposer .UIHorizontalTabs .TabsContainer { + background: url(background/CenterHorizontalTabs.gif) repeat-x left bottom; + height: 25px; +} + +.UIPortalComposer .UITabPane .UITabContentContainer { +} + +.UIPortalComposer .UITabPane .UITabContentContainer .UITabContent { + background: none; + border: none; +} + +.UIPortalComposer .ResizeButton { + width: 13px; + height: 13px; + margin: 0px 0px 5px 0px; +} + +.UIPortalComposer > .OverflowContainer{ + background: url(background/PortalComposer.gif) repeat-x left -34px; + height: 30px; +} + +.ExoMessageDecorator{ + -moz-border-radius: 5px 5px 0px 0px; + -webkit-border-radius: 5px 5px 0px 0px; + border-radius: 5px 5px 0px 0px; +} + +.ExoMessageDecorator .OverflowContainer{ + background: #f3f3f3; + height: 26px; + padding-top: 5px; + -moz-border-radius: 5px 5px 0px 0px; + -webkit-border-radius: 5px 5px 0px 0px; + border-radius: 5px 5px 0px 0px; +} + +.ExoMessageDecorator .UIWindowContent{ + border: none; + background: #e1e1e1; +} + +.ExoMessageDecorator .PopupContent{ + background: none; +} Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/background/PortalComposer.gif =================================================================== (Binary files differ) Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -37,71 +37,44 @@ .UIPageBody .UIPortalWarning { font-family: tahoma; font-size: 12px; + margin: 30px auto; + width: 500px; + -moz-border-radius: 4px 4px 4px 4px; + -webkit-border-radius: 4px 4px 4px 4px; + border-radius: 4px 4px 4px 4px; + background: none repeat scroll 0 0 white; + border: 1px solid #d1d1d1; + padding: 1px 1px 40px 1px; } -.UIPageBody .UIPortalWarning .LeftTopWarning { - background: url('/eXoResources/skin/sharedImages/LeftTopWarning7x58.gif') no-repeat left top; - height: 40px; - padding-left: 7px; +.UIPageBody .UIPortalWarning ul{ + padding: 0px; + list-style: none; } -.UIPageBody .UIPortalWarning .RightTopWarning { - background: url('/eXoResources/skin/sharedImages/RightTopWarning7x58.gif') no-repeat right top; - height: 40px; - padding-right: 7px; -} - -.UIPageBody .UIPortalWarning .CenterTopWaring { - background: url('/eXoResources/skin/sharedImages/CenterTopWarning1x58.gif') repeat-x top; - height: 40px; - line-height: 40px; -} - -.UIPageBody .UIPortalWarning .CenterTopWaring .TitleWaring { - background: url('/eXoResources/skin/sharedImages/WarningIcon.gif') no-repeat left center; - padding-left: 50px; +.UIPageBody .UIPortalWarning .TitleWaring { + background:#dee0ee url('/eXoResources/skin/sharedImages/WarningIcon.gif') no-repeat 22px center;/* orientation=lt */ + background:#dee0ee url('/eXoResources/skin/sharedImages/WarningIcon.gif') no-repeat 95% center;/* orientation=rt */ + padding-left: 70px;/* orientation=lt */ + padding-right: 70px;/* orientation=rt */ font-size: 15px; font-weight: bold; line-height: 40px; text-align: left; /* orientation=lt */ text-align: right; /* orientation=rt */ - margin-left: 20px; /* orientation=lt */ - margin-right: 20px; /* orientation=rt */ + -moz-border-radius: 4px 4px 0px 0px; + -webkit-border-radius: 4px 4px 0px 0px; + border-radius: 4px 4px 0px 0px; + margin: 0px 0px 30px 0px; } -.UIPageBody .UIPortalWarning .LeftMiddleWarning { - background: white url('/eXoResources/skin/sharedImages/LeftMiddleWarning7x1.gif') repeat-y left; - padding-left: 7px; -} - -.UIPageBody .UIPortalWarning .RightMiddleWarning { - background: url('/eXoResources/skin/sharedImages/RightMiddleWarning7x1.gif') repeat-y right; - text-align: left; - padding: 30px 30px 50px 30px; -} - -.UIPageBody .UIPortalWarning .RightMiddleWarning .Icon { +.UIPageBody .UIPortalWarning .Icon { background: url('/eXoResources/skin/sharedImages/BlueNextArrow.gif') no-repeat left 5px; /* orientation=lt */ - background: url('/eXoResources/skin/sharedImages/BlueNextArrow.gif') no-repeat right 5px; /* orientation=rt */ + background: url('/eXoResources/skin/sharedImages/BlueNextArrow-rt.gif') no-repeat right 5px; /* orientation=rt */ padding: 6px 0px 6px 20px; /* orientation=lt */ padding: 6px 20px 6px 0px; /* orientation=rt */ text-align: left; /* orientation=lt */ text-align: right; /* orientation=rt */ + margin-left: 50px;/* orientation=lt */ + margin-right: 50px;/* orientation=rt */ } - -.UIPageBody .UIPortalWarning .LeftBottomWarning { - background: url('/eXoResources/skin/sharedImages/LeftBottomWarning7x7.gif') no-repeat left center; - height: 7px; - padding-left: 7px; -} - -.UIPageBody .UIPortalWarning .RightBottomWarning { - background: url('/eXoResources/skin/sharedImages/RightBottomWarning7x7.gif') no-repeat right center; - height: 7px; - padding-right: 7px; -} - -.UIPageBody .UIPortalWarning .CenterBottomWaring { - background: url('/eXoResources/skin/sharedImages/CenterBottomWarning1x7.gif') repeat-x center; - height: 7px; -} \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -141,18 +141,11 @@ padding-left: 7px; /* orientation=rt */ } .UIWizard .UIWizardContent .UIAction { - padding: 8px 0 0; + padding: 8px 0 0; + text-align: right; /* orientation=lt */ + text-align: left; /* orientation=rt */ } -.UIWizard .WizardControlBar .UIAction .ActionButton { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ -} - -.UIWizard .WizardControlBar .UIAction .ActionContainer { - width: 100%; -} - /*========================== Start UIWizard Welcome ==============================*/ .UIWizard .UIWizardWelcome { Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,3 +1,30 @@ +/****************************************************************************** + * JBoss by Red Hat * + * Copyright 2010, 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. * + ******************************************************************************/ + +/** FONTS **/ + +/* Font attributes for the normal fragment font. +Used for the display of non-accentuated information */ .portlet-font { color: #000000; font-size: 11px; @@ -78,19 +105,16 @@ .portlet-section-subheader { font-weight: bold; - font-size: 10px; line-height: 18px; } .portlet-section-footer { - font-size: 11px; line-height: 18px; } /* Text that belongs to the table but does not fall in one of the other categories (e.g. explanatory or help text that is associated with the section. */ .portlet-section-text { - font-size: 12px; font-style: italic; line-height: 18px; } @@ -127,7 +151,6 @@ /* Text in a selected cell range */ .portlet-table-selected { color: #000; - font-size: 12px; background-color: #CBD4E6; line-height: 18px; } @@ -149,7 +172,6 @@ /** FORMS **/ .portlet-form-label { - font-size: 10px; color: #333333; line-height: 18px; } @@ -165,7 +187,7 @@ .portlet-form-button { line-height: 18px; text-align: center; - background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/LightBlueStyle.gif') repeat-x center -24px; + background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/LightBlueStyle.gif') repeat-x center; white-space: nowrap; display: table-cell; padding: 0 12px; @@ -200,7 +222,6 @@ /* Text for a form field */ .portlet-form-field { - font-size: 10px; color: #000; /*margin-top: 10px;*/ line-height: 18px; } @@ -216,101 +237,89 @@ .portlet-menu-item { color: #242424; text-decoration: none; - font-size: 12px; - line-height: 18px; background: #F5F9FA; } /* Selected menu item. */ .portlet-menu-item-selected { - line-height: 18px; background: #F5F9FA; + color: #058ee6; } .portlet-menu-item-hover { - color: #058ee6; - text-decoration: none; - font-size: 12px; - line-height: 18px; + color: #058ee6; + text-decoration: none; background: #F5F9FA; } /* Selected menu item when the mouse hovers over it. */ .portlet-menu-item-hover-selected { - line-height: 18px; background: #F5F9FA; + color: #058ee6; } /* Normal, unselected menu item that has sub-menus. */ .portlet-menu-cascade-item { - line-height: 18px; + color: #585858; } /* Selected sub-menu item that has sub-menus */ .portlet-menu-cascade-item-selected { - line-height: 18px; + color: #058ee6; } .porlet-menu-cascade { - line-height: 18px; } .portlet-menu-cascade-item-hover { - line-height: 18px; color: #058ee6; } .portlet-menu-cascade-item-hover-selected { - line-height: 18px; + color: #058ee6; } .portlet-menu-separator { - line-height: 18px; } .portlet-menu-cascade-separator { - line-height: 18px; } .portlet-menu-content { - line-height: 18px; + color: #878787; } .portlet-menu-content-selected { - line-height: 18px; + color: #058ee6; } .portlet-menu-content-hover { - line-height: 18px; color: #058ee6; } .portlet-menu-content-hover-selected { - line-height: 18px; + color: #058ee6; } .portlet-menu-indicator { - line-height: 18px; + color: #bebebe; } .portlet-menu-indicator-selected { - line-height: 18px; + color: #058ee6; } .portlet-menu-indicator-hover { - line-height: 18px; color: #058ee6; } .portlet-menu-indicator-hover-selected { - line-height: 18px; + color: #058ee6; } .portlet-menu-description { - line-height: 18px; } .portlet-menu-caption { - line-height: 18px; } Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-09-12 22:59:10 UTC (rev 7361) @@ -78,7 +78,6 @@ color: #333333; overflow: hidden; white-space: nowrap; - width: 100%; } .DefaultTheme .WindowBarLeft { @@ -99,9 +98,6 @@ background-image: url('background/DefaultTheme.png'); background-repeat: repeat-x; background-position: left -90px; -} - -.DefaultTheme .WindowBarCenter .FixHeight { height: 21px; padding-top: 8px; } @@ -138,9 +134,6 @@ background-image: url('background/DefaultTheme.png'); background-repeat: repeat-x; background-position: left top; -} - -.DefaultTheme .BottomDecoratorCenter .FixHeight { height: 30px; } @@ -162,7 +155,6 @@ line-height: 17px; overflow: hidden; white-space: nowrap; - width: 100%; } .MacTheme .WindowBarCenter .PortletIcon { @@ -270,9 +262,6 @@ background-image: url('background/MacTheme.png'); background-repeat: repeat-x; background-position: center top; -} - -.MacTheme .BottomDecoratorCenter .FixHeight { height: 23px; line-height: 23px; } @@ -294,9 +283,6 @@ background-image: url('background/MacTheme.png'); background-repeat: repeat-x; background-position: center -69px; -} - -.MacTheme .WindowBarCenter .FixHeight { height: 19px; padding-top: 4px; } @@ -319,7 +305,6 @@ line-height: 17px; overflow: hidden; white-space: nowrap; - width: 100%; } .MacGray .WindowBarCenter .PortletIcon { @@ -428,9 +413,6 @@ background-image: url('background/MacGray.png'); background-repeat: repeat-x; background-position: left top; -} - -.MacGray .BottomDecoratorCenter .FixHeight { height: 24px; line-height: 24px; } @@ -452,9 +434,6 @@ background-image: url('background/MacGray.png'); background-repeat: repeat-x; background-position: center -72px; -} - -.MacGray .WindowBarCenter .FixHeight { height: 19px; padding-top: 4px; } @@ -477,7 +456,6 @@ line-height: 17px; overflow: hidden; white-space: nowrap; - width: 100%; } .MacBlack .WindowBarCenter .PortletIcon { @@ -586,9 +564,6 @@ background-image: url('background/MacBlack.png'); background-repeat: repeat-x; background-position: left top; -} - -.MacBlack .BottomDecoratorCenter .FixHeight { height: 24px; line-height: 24px; } @@ -610,9 +585,6 @@ background-image: url('background/MacBlack.png'); background-repeat: repeat-x; background-position: center -72px; -} - -.MacBlack .WindowBarCenter .FixHeight { height: 19px; padding-top: 4px; } @@ -635,7 +607,6 @@ line-height: 17px; overflow: hidden; white-space: nowrap; - width: 100%; } .MacGreenSteel .WindowBarCenter .PortletIcon { @@ -744,9 +715,6 @@ background-image: url('background/MacGreen.png'); background-repeat: repeat-x; background-position: left top; -} - -.MacGreenSteel .BottomDecoratorCenter .FixHeight { height: 24px; line-height: 24px; } @@ -768,9 +736,6 @@ background-image: url('background/MacGreen.png'); background-repeat: repeat-x; background-position: center -72px; -} - -.MacGreenSteel .WindowBarCenter .FixHeight { height: 19px; padding-top: 4px; } @@ -892,9 +857,6 @@ background-image: url('background/VistaTheme.png'); background-repeat: repeat-x; background-position: left top; -} - -.VistaTheme .BottomDecoratorCenter .FixHeight { height: 24px; } @@ -903,7 +865,6 @@ line-height: 22px; overflow: hidden; white-space: nowrap; - width: 100%; } .VistaTheme .WindowBarLeft { @@ -924,9 +885,6 @@ background-image: url('background/VistaTheme.png'); background-repeat: repeat-x; background-position: left -72px; -} - -.VistaTheme .WindowBarCenter .FixHeight { height: 24px; padding-top: 5px; } @@ -952,7 +910,6 @@ line-height: 22px; overflow: hidden; white-space: nowrap; - width: 100%; } .VistaBlue .WindowBarCenter .PortletIcon { @@ -1057,9 +1014,6 @@ background-image: url('background/VistaBlue.png'); background-repeat: repeat-x; background-position: left top; -} - -.VistaBlue .BottomDecoratorCenter .FixHeight { height: 27px; } @@ -1081,9 +1035,6 @@ background-image: url('background/VistaBlue.png'); background-repeat: repeat-x; background-position: left -81px; -} - -.VistaBlue .WindowBarCenter .FixHeight { height: 27px; padding-top: 8px; } @@ -1129,7 +1080,6 @@ line-height: 19px; overflow: hidden; white-space: nowrap; - width: 100%; } .RoundConerBlue .ArrowDownIcon { @@ -1189,9 +1139,6 @@ .RoundConerBlue .WindowBarCenter { background: url('background/RoundCornerBlue.png') repeat-x; background-position: left -90px; -} - -.RoundConerBlue .WindowBarCenter .FixHeight { height: 22px; padding-top: 10px; } @@ -1231,9 +1178,6 @@ .RoundConerBlue .BottomDecoratorCenter { background: url('background/RoundCornerBlue.png') repeat-x; background-position: top; -} - -.RoundConerBlue .BottomDecoratorCenter .FixHeight { height: 30px; } @@ -1276,7 +1220,6 @@ line-height: 19px; overflow: hidden; white-space: nowrap; - width: 100%; } .RoundConerViolet .ArrowDownIcon { @@ -1336,9 +1279,6 @@ .RoundConerViolet .WindowBarCenter { background: url('background/RoundConerViolet.png') repeat-x; background-position: left -90px; -} - -.RoundConerViolet .WindowBarCenter .FixHeight { height: 22px; padding-top: 10px; } @@ -1382,9 +1322,6 @@ .RoundConerViolet .BottomDecoratorCenter { background: url('background/RoundConerViolet.png') repeat-x; background-position: top; -} - -.RoundConerViolet .BottomDecoratorCenter .FixHeight { height: 30px; } @@ -1428,7 +1365,6 @@ line-height: 19px; overflow: hidden; white-space: nowrap; - width: 100%; } .RoundConerOrange .ArrowDownIcon { @@ -1488,9 +1424,6 @@ .RoundConerOrange .WindowBarCenter { background: url('background/RoundConerOrange.png') repeat-x; background-position: left -90px; -} - -.RoundConerOrange .WindowBarCenter .FixHeight { height: 22px; padding-top: 10px; } @@ -1534,9 +1467,6 @@ .RoundConerOrange .BottomDecoratorCenter { background: url('background/RoundConerOrange.png') repeat-x; background-position: top; -} - -.RoundConerOrange .BottomDecoratorCenter .FixHeight { height: 30px; } @@ -1580,7 +1510,6 @@ line-height: 19px; overflow: hidden; white-space: nowrap; - width: 100%; } .RoundConerPink .ArrowDownIcon { @@ -1640,9 +1569,6 @@ .RoundConerPink .WindowBarCenter { background: url('background/RoundConerPink.png') repeat-x; background-position: left -90px; -} - -.RoundConerPink .WindowBarCenter .FixHeight { height: 22px; padding-top: 10px; } @@ -1686,9 +1612,6 @@ .RoundConerPink .BottomDecoratorCenter { background: url('background/RoundConerPink.png') repeat-x; background-position: top; -} - -.RoundConerPink .BottomDecoratorCenter .FixHeight { height: 30px; } @@ -1732,7 +1655,6 @@ line-height: 19px; overflow: hidden; white-space: nowrap; - width: 100%; } .RoundConerGreen .ArrowDownIcon { @@ -1792,9 +1714,6 @@ .RoundConerGreen .WindowBarCenter { background: url('background/RoundConerGreen.png') repeat-x; background-position: left -90px; -} - -.RoundConerGreen .WindowBarCenter .FixHeight { height: 22px; padding-top: 10px; } @@ -1838,9 +1757,6 @@ .RoundConerGreen .BottomDecoratorCenter { background: url('background/RoundConerGreen.png') repeat-x; background-position: top; -} - -.RoundConerGreen .BottomDecoratorCenter .FixHeight { height: 30px; } @@ -1884,7 +1800,6 @@ line-height: 16px; overflow: hidden; white-space: nowrap; - width: 100%; } .ShadowBlue .ArrowDownIcon { @@ -1945,9 +1860,6 @@ background-image: url('background/ShadowBlue.png'); background-repeat: repeat-x; background-position: center -84px; -} - -.ShadowBlue .WindowBarCenter .FixHeight { height: 20px; padding-top: 9px; } @@ -1988,9 +1900,6 @@ background-image: url('background/ShadowBlue.png'); background-repeat: repeat-x; background-position: center top; -} - -.ShadowBlue .BottomDecoratorCenter .FixHeight { height: 28px; } @@ -2034,7 +1943,6 @@ line-height: 16px; overflow: hidden; white-space: nowrap; - width: 100%; } .ShadowViolet .ArrowDownIcon { @@ -2095,9 +2003,6 @@ background-image: url('background/ShadowViolet.png'); background-repeat: repeat-x; background-position: center -84px; -} - -.ShadowViolet .WindowBarCenter .FixHeight { height: 20px; padding-top: 9px; } @@ -2138,9 +2043,6 @@ background-image: url('background/ShadowViolet.png'); background-repeat: repeat-x; background-position: center top; -} - -.ShadowViolet .BottomDecoratorCenter .FixHeight { height: 28px; } @@ -2184,7 +2086,6 @@ line-height: 16px; overflow: hidden; white-space: nowrap; - width: 100%; } .ShadowOrange .ArrowDownIcon { @@ -2245,9 +2146,6 @@ background-image: url('background/ShadowOrange.png'); background-repeat: repeat-x; background-position: center -84px; -} - -.ShadowOrange .WindowBarCenter .FixHeight { height: 19px; padding-top: 10px; } @@ -2288,9 +2186,6 @@ background-image: url('background/ShadowOrange.png'); background-repeat: repeat-x; background-position: center top; -} - -.ShadowOrange .BottomDecoratorCenter .FixHeight { height: 28px; } @@ -2335,7 +2230,6 @@ line-height: 16px; overflow: hidden; white-space: nowrap; - width: 100%; } .ShadowPink .ArrowDownIcon { @@ -2396,9 +2290,6 @@ background-image: url('background/ShadowPink.png'); background-repeat: repeat-x; background-position: center -84px; -} - -.ShadowPink .WindowBarCenter .FixHeight { height: 19px; padding-top: 10px; } @@ -2439,9 +2330,6 @@ background-image: url('background/ShadowPink.png'); background-repeat: repeat-x; background-position: center top; -} - -.ShadowPink .BottomDecoratorCenter .FixHeight { height: 28px; } @@ -2486,7 +2374,6 @@ line-height: 16px; overflow: hidden; white-space: nowrap; - width: 100%; } .ShadowGreen .ArrowDownIcon { @@ -2547,9 +2434,6 @@ background-image: url('background/ShadowGreen.png'); background-repeat: repeat-x; background-position: center -84px; -} - -.ShadowGreen .WindowBarCenter .FixHeight { height: 20px; padding-top: 9px; } @@ -2590,9 +2474,6 @@ background-image: url('background/ShadowGreen.png'); background-repeat: repeat-x; background-position: center top; -} - -.ShadowGreen .BottomDecoratorCenter .FixHeight { height: 28px; } @@ -2634,7 +2515,6 @@ color: #333333; overflow: hidden; white-space: nowrap; - width: 100%; } .SimpleBlue .ArrowDownIcon { @@ -2688,9 +2568,6 @@ .SimpleBlue .WindowBarCenter { background: #b0c0f5; -} - -.SimpleBlue .WindowBarCenter .FixHeight { height: 18px; line-height: 18px; } @@ -2729,9 +2606,6 @@ border: 1px solid #4a67b1; border-top: none; background: white url('background/BGDecoratorCenter1x18.gif') repeat-x; -} - -.SimpleBlue .BottomDecoratorCenter .FixHeight { height: 19px; } @@ -2773,7 +2647,6 @@ color: #333333; overflow: hidden; white-space: nowrap; - width: 100%; } .SimpleViolet .ArrowDownIcon { @@ -2827,9 +2700,6 @@ .SimpleViolet .WindowBarCenter { background: #c4a6ff; -} - -.SimpleViolet .WindowBarCenter .FixHeight { height: 18px; line-height: 18px; } @@ -2866,15 +2736,9 @@ border: 1px solid #5700a9; border-top: none; background: url('background/BGDecoratorCenter1x18.gif') repeat-x; -} - -.SimpleViolet .BottomDecoratorCenter .FixHeight { height: 19px; } -.UIPortlet .SimpleViolet .BottomDecoratorCenter { - height: 18px; -} /*------------------------------ SimpleOrange -----------------------------------*/ @@ -2914,7 +2778,6 @@ color: #333333; overflow: hidden; white-space: nowrap; - width: 100%; } .SimpleOrange .ArrowDownIcon { @@ -2968,9 +2831,6 @@ .SimpleOrange .WindowBarCenter { background: #ffd1a8; -} - -.SimpleOrange .WindowBarCenter .FixHeight { height: 18px; line-height: 18px; } @@ -3007,16 +2867,9 @@ border: 1px solid #b27a49; border-top: none; background: url('background/BGDecoratorCenter1x18.gif') repeat-x; -} - -.SimpleOrange .BottomDecoratorCenter .FixHeight { height: 19px; } -.UIPortlet .SimpleOrange .BottomDecoratorCenter { - height: 18px; -} - /*------------------------------ SimplePink -----------------------------------*/ .SimplePink .WindowBarCenter .WindowPortletInfo { @@ -3055,7 +2908,6 @@ color: #333333; overflow: hidden; white-space: nowrap; - width: 100%; } .SimplePink .ArrowDownIcon { @@ -3109,9 +2961,6 @@ .SimplePink .WindowBarCenter { background: #fdd8f9; -} - -.SimplePink .WindowBarCenter .FixHeight { height: 18px; line-height: 18px; } @@ -3148,16 +2997,9 @@ border: 1px solid #9a5591; border-top: none; background: url('background/BGDecoratorCenter1x18.gif') repeat-x; -} - -.SimplePink .BottomDecoratorCenter .FixHeight { height: 19px; } -.UIPortlet .SimplePink .BottomDecoratorCenter { - height: 18px; -} - /*------------------------------ SimpleGreen -----------------------------------*/ .SimpleGreen .WindowBarCenter .WindowPortletInfo { @@ -3197,7 +3039,6 @@ color: #333333; overflow: hidden; white-space: nowrap; - width: 100%; } .SimpleGreen .ArrowDownIcon { @@ -3251,9 +3092,6 @@ .SimpleGreen .WindowBarCenter { background: #a3d0ff; -} - -.SimpleGreen .WindowBarCenter .FixHeight { height: 18px; line-height: 18px; } @@ -3291,12 +3129,5 @@ border: 1px solid #4c717e; border-top: none; background: url('background/BGDecoratorCenter1x18.gif') repeat-x; -} - -.SimpleGreen .BottomDecoratorCenter .FixHeight { height: 19px; } - -.UIPortlet .SimpleGreen .BottomDecoratorCenter { - height: 18px; -} Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIAccessGroup.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIAccessGroup.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIAccessGroup.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -11,23 +11,9 @@ %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIFormPopupWindow.class).getId();%>');" class="ActionButton SimpleStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="Icon SmallGroup16x16Icon"> - <a href="javascript:void(0);">Select Access Group</a> - </div> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <span onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIFormPopupWindow.class).getId();%>');" class="ActionButton SimpleStyle"> + <a href="javascript:void(0);" class="Icon SmallGroup16x16Icon">Select Access Group</a> + </span> </div> </div> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIGroupSelector.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIGroupSelector.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIGroupSelector.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -34,21 +34,7 @@ </div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("SelectGroup");%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIGroupSelector.action.done")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("SelectGroup");%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIGroupSelector.action.done")%></a> </div> </div> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIListPermissionSelector.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIListPermissionSelector.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIListPermissionSelector.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -23,23 +23,9 @@ uicomponent.renderChild(UIFormPopupWindow.class); %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIFormPopupWindow.class).getId();%>');" class="ActionButton SimpleStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="Icon SmallGroup16x16Icon"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIListPermissionSelector.action.addPermission")%></a> - </div> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <span onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIFormPopupWindow.class).getId();%>');" class="ActionButton SimpleStyle"> + <a href="javascript:void(0);" class="Icon SmallGroup16x16Icon"><%=_ctx.appRes("UIListPermissionSelector.action.addPermission")%></a> + </span> </div> <%}%> </div> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIPermissionSelector.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIPermissionSelector.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIPermissionSelector.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -42,46 +42,27 @@ <% if(uicomponent.isEditable()) { %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <%/*Click on this action button will pop up the permission selector*/%> - <% - String deletePermissionEvent = "#"; - String css = "FloatBlockHidden ActionButton SimpleStyle"; - if(permission.getExpression() != null && permission.getExpression().length() > 0) { - deletePermissionEvent = uiForm.event("DeletePermission", uicomponent.getId(), ""); - css = "ActionButton SimpleStyle"; - } - %> - <div onclick="<%=deletePermissionEvent%>" class="<%=css%>"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="DeletePermissionIcon"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.DeletePermission")%></a> - </div> - </div> - </div> - </div> - </div> - <div onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIPopupWindow.class).getId();%>', true);" class="ActionButton SimpleStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="SelectPermissionIcon"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.SelectPermission")%></a> - </div> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + + <%/*Click on this action button will pop up the permission selector*/%> + <% + String deletePermissionEvent = "#"; + String css = "FloatBlockHidden ActionButton SimpleStyle"; + if(permission.getExpression() != null && permission.getExpression().length() > 0) { + deletePermissionEvent = uiForm.event("DeletePermission", uicomponent.getId(), ""); + css = "ActionButton SimpleStyle"; + } + %> + + <span onclick="<%=deletePermissionEvent%>" class="<%=css%>"> + <a href="javascript:void(0);" class="DeletePermissionIcon"><%=_ctx.appRes(uicomponent.getId() + ".action.DeletePermission")%></a> + </span> + <span onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIPopupWindow.class).getId();%>', true);" class="ActionButton SimpleStyle"> + <a href="javascript:void(0);" class="SelectPermissionIcon"><%=_ctx.appRes(uicomponent.getId() + ".action.SelectPermission")%></a> + </span> + </div> <% } %> </div> <%/*End UIToolbarContentContainer*/%> </div> -</div> \ No newline at end of file +</div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIUserMembershipSelector.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIUserMembershipSelector.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/organization/webui/component/UIUserMembershipSelector.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -55,21 +55,7 @@ <% if(uicomponent.isAdminRole()) { %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td - <div onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIPopupWindow.class).getId();%>');" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.SelectPermission")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="javascript: eXo.webui.UIPopupWindow.show('<%=uicomponent.getChild(UIPopupWindow.class).getId();%>');" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.SelectPermission")%></a> </div> <% }%> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UIForgetPasswordWizard.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UIForgetPasswordWizard.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UIForgetPasswordWizard.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -33,23 +33,9 @@ %> </table> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <%for(action in uicomponent.getActions()) { %> - <div onclick="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle" > - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action." + action)%></a> - </div> - </div> - </div> - </div> - <%} %> - </td> - </tr> - </table> + <%for(action in uicomponent.getActions()) { %> + <a href="javascript:void(0);" onclick="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action." + action)%></a> + <%} %> </div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -41,30 +41,8 @@ </table> <div class="ForgetPass"><a href="<%= uicomponent.event("ForgetPassword") %>"><%=_ctx.appRes("UILoginForm.label.forgot")%></a></div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="login(this);" id="UIPortalLoginFormAction" class="ActionButton SimpleStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="#"><%=_ctx.appRes("UILoginForm.label.Signin");%></a> - </div> - </div> - </div> - </div> - <div onclick="<%=uicomponent.event("Close");%>" class="ActionButton SimpleStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UILoginForm.label.Discard")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="login(this);" id="UIPortalLoginFormAction" class="ActionButton SimpleStyle"><%=_ctx.appRes("UILoginForm.label.Signin");%></a> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Close");%>" class="ActionButton SimpleStyle"><%=_ctx.appRes("UILoginForm.label.Discard")%></a> </div> </div> </form> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -28,43 +28,24 @@ String unmaxiTitle = _ctx.appRes("UIGadget.tooltip.Unmaximize"); %> <div class="UIGadget" id="$id" style="left: $posX; top: $posY; z-Index: $zIndex; width: 100%" > - <div class="GadgetControl" style="visibility: visible;"> - <div class="LeftControlBar"> - <div class="RightControlBar"> - <div class="CenterControlBar ClearFix"> - <div class="CloseGadget IconControl" onclick="eXo.gadget.UIGadget.deleteGadget(this)" onmousedown="event.cancelBubble=true;" title="<%=_ctx.appRes("UIGadget.tooltip.deleteGadget")%>"><span></span></div> - <div class="<%=view.equals(uicomponent.HOME_VIEW) ? "MaximizeGadget" : "RestoreGadget";%> IconControl" - onclick="eXo.gadget.UIGadget.maximizeGadget(this)" onmousedown="event.cancelBubble=true;" - title="<%=view.equals(uicomponent.HOME_VIEW) ? maxiTitle : unmaxiTitle%>"><span></span></div> - <div class="<%=isMini ? "RestoreGadget": "MinimizeGadget";%> MinimizeAction IconControl" - onclick="eXo.gadget.UIGadget.minimizeGadget(this)" onmousedown="event.cancelBubble=true;" style="display:none;" - title="<%=isMini ? unminiTitle : miniTitle%>" miniTitle="$miniTitle" unminiTitle="$unminiTitle"><span></span></div> - <% if(uicomponent.isSettingUserPref()) { %> - <div class="EditGadget IconControl" onclick="eXo.gadget.UIGadget.editGadget('$id')" onmousedown="event.cancelBubble=true;" title="<%=_ctx.appRes("UIGadget.tooltip.editGadget")%>"><span></span></div> - <% } %> - <div class="GadgetDragHandleArea"><span></span></div> - <div class="GadgetTitle" style="display: none; float: none; width: auto; margin-right: 75px"><%= uicomponent.getApplicationName() %></div> - </div> - </div> - </div> + <div class="GadgetControl ClearFix" style="visibility: visible;"> + <span class="CloseGadget IconControl" onclick="eXo.gadget.UIGadget.deleteGadget(this)" onmousedown="event.cancelBubble=true;" title="<%=_ctx.appRes("UIGadget.tooltip.deleteGadget")%>"></span> + <span class="<%=view.equals(uicomponent.HOME_VIEW) ? "MaximizeGadget" : "RestoreGadget";%> IconControl" + onclick="eXo.gadget.UIGadget.maximizeGadget(this)" onmousedown="event.cancelBubble=true;" + title="<%=view.equals(uicomponent.HOME_VIEW) ? maxiTitle : unmaxiTitle%>"></span> + <span class="<%=isMini ? "RestoreGadget": "MinimizeGadget";%> MinimizeAction IconControl" + onclick="eXo.gadget.UIGadget.minimizeGadget(this)" onmousedown="event.cancelBubble=true;" style="display:none;" + title="<%=isMini ? unminiTitle : miniTitle%>" miniTitle="$miniTitle" unminiTitle="$unminiTitle"></span> + <% if(uicomponent.isSettingUserPref()) { %> + <span class="EditGadget IconControl" onclick="eXo.gadget.UIGadget.editGadget('$id')" onmousedown="event.cancelBubble=true;" title="<%=_ctx.appRes("UIGadget.tooltip.editGadget")%>"></span> + <% } %> + <span class="GadgetDragHandleArea" style="display: none;"></span> + <span class="GadgetTitle" style="display: <%=isLossData ? "block" : "none"; %> ; float: none; width: auto; margin-right: 75px"><%= uicomponent.getApplicationName() %></span> </div> - <div class="ClearBoth"><span></span></div> - <div class="GadgetApplication" style="display:<%= Boolean.parseBoolean(uicomponent.getProperties().get("minimized")) ? "none": "block"; %>"> - <div class="TLGadget"> - <div class="TRGadget"> - <div class="TCGadget"><span></span></div> - </div> - </div> - <div class="MLGadget"> - <div class="MRGadget"> - <div id="content-$id" class="MCGadget"></div> - </div> - </div> - <div class="BLGadget"> - <div class="BRGadget"> - <div class="BCGadget"><span></span></div> - </div> - </div> + <div class="GadgetApplication" id="content-$id" style="display:<%= Boolean.parseBoolean(uicomponent.getProperties().get("minimized")) ? "none": "block"; %>"> + <% if(isLossData) {%> + <%=_ctx.appRes("UIGadget.message.isLossData")%> + <% } %> </div> <div class="UIMask" style="display: none; border:solid 1px red"><span></span></div> -</div> \ No newline at end of file +</div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -24,260 +24,223 @@ %> <div class="UIPortlet <%=hasPermission?"":"ProtectedPortlet"%>" id="UIPortlet-$portletId" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);" style="top: 0px; left:0px;"> - <div class="UIComponentBlock"> - - <%if(portalMode == uiPortalApp.CONTAINER_BLOCK_EDIT_MODE || portalMode == uiPortalApp.APP_BLOCK_EDIT_MODE) { %> - <div class="LAYOUT-BLOCK LAYOUT-PORTLET"> - <div class="PortletLayoutDecorator"> - <%/*Begin Middle Portlet Layout Decorator*/%> - <div class="LPortletLayoutDecorator"> - <div class="RPortletLayoutDecorator"> - <div class="CPortletLayoutDecorator"> - <div class="FixHeight"> - <% - if(hasPermission) { - print uicomponent.getDisplayTitle(); - } else print "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; - %> - </div> - </div> - </div> + <div class="UIComponentBlock"> + + <%if(portalMode == uiPortalApp.CONTAINER_BLOCK_EDIT_MODE || portalMode == uiPortalApp.APP_BLOCK_EDIT_MODE) { %> + <div class="LAYOUT-BLOCK LAYOUT-PORTLET"> + <div class="PortletLayoutDecorator"> + <%/*Begin Middle Portlet Layout Decorator*/%> + <div class="LPortletLayoutDecorator"> + <div class="RPortletLayoutDecorator"> + <div class="CPortletLayoutDecorator"> + <% + if(hasPermission) { + print uicomponent.getDisplayTitle(); + } else print "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; + %> </div> - </div> </div> - <%} else { %> - <div class="VIEW-BLOCK VIEW-PORTLET" id="VIEW-${portletId}"> - <%} %> - <% - } - - if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) { - if(uicomponent.getShowInfoBar()) { - String title = uicomponent.getDisplayTitle(); - if(title == null || title.trim().length() < 1) - title = portletId; - /*Begin Window Portlet Bar*/ - String visibility = "visible"; - String appDisplay = "block"; - String appZIndex = ""; - String windowWidth = uicomponent.getWidth(); - if(windowWidth!= null && !windowWidth.contains("%") && !windowWidth.contains("px")) windowWidth += "px"; - String windowHeight = uicomponent.getHeight(); - if(windowHeight != null && !windowHeight.contains("%") && !windowHeight.contains("px")) windowHeight += "px"; - String cssStyle = "style=\""; - cssStyle += "visibility: "+ visibility +";"; - cssStyle += "display: "+ appDisplay +";"; - cssStyle += "z-index: "+ appZIndex +";"; - cssStyle += "width: "+ windowWidth +";"; - //cssStyle += "height: "+ windowHeight +";"; - cssStyle += "\""; - String theme = uicomponent.getSuitedTheme(null); - %> - <div class="UIWindow $theme UIDragObject UIResizeObject" id="UIWindow-${portletId}" ${cssStyle} > - <div class="WindowBarLeft"> - <div class="WindowBarRight"> - <div class="WindowBarCenter"> - <div class="FixHeight ClearFix"> - <% - - String restoreDown = _ctx.appRes("UIPortlet.tooltip.MaximizeRestore"); - String restore = _ctx.appRes("UIPortlet.tooltip.MinimizeRestore"); - String miniTooltip = _ctx.appRes("UIPortlet.tooltip.Minimize"); - String maxiTooltip = _ctx.appRes("UIPortlet.tooltip.Maximize"); - String renderMaxi = maxiTooltip; - String renderMini = miniTooltip; - if(windowState == WindowState.MAXIMIZED) { - renderMaxi = restoreDown; - } else if(windowState == WindowState.MINIMIZED) { - renderMini = restore; - } - if(uicomponent.getShowWindowState()) { - String maximizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'maximized');"; - String minimizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'minimized');"; - String maximizedMode = "Maximized"; - String minimizedMode = "Minimized"; - if(windowState == WindowState.MAXIMIZED) { - maximizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'normal');"; - maximizedMode = "Normal"; - } else if(windowState == WindowState.MINIMIZED) { - minimizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'normal');"; - minimizedMode = "Normal"; - } - %> - <div class="ControlIcon ${maximizedMode}Icon" title="$renderMaxi" onclick="$maximizedAction" onmouseover="$onControlOver" onmouseout="$onControlOut"><span></span> - <div style="display:none">{"normalTitle":"$maxiTooltip","modeTitle":"$restoreDown"}</div> - </div> - <div class="ControlIcon ${minimizedMode}Icon" title="$renderMini" onclick="$minimizedAction" onmouseover="$onControlOver" onmouseout="$onControlOut"><span></span> - <div style="display:none">{"normalTitle":"$miniTooltip","modeTitle":"$restore"}</div> - </div> - <%} - - List supportModes = uicomponent.getSupportModes(); - if(uicomponent.getShowPortletMode() && supportModes.size() > 0) { - String showCategory = "eXo.webui.UIPopupSelectCategory.show(this, event);" - %> - <div class="ControlIcon ArrowDownIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.PortletMode");%>" onclick="$showCategory" onmouseover="$onControlOver" onmouseout="$onControlOut"> - <% /*Begin Popup Menu*/ %> - <div style="position: relative; width: 100%"> - <div class="UIPopupCategory" style="display: none;"> - <div class="PopupCategoryDecorator"> - <div class="PopupCategoryTL"> - <div class="PopupCategoryTR"> - <div class="PopupCategoryTC"><span></span></div> - </div> - </div> - <div class="PopupCategoryML"> - <div class="PopupCategoryMR"> - <div class="PopupCategoryMC"> - <% - for(String mode in supportModes) { - if(mode.equals("edit") && rcontext.getRemoteUser()==null) continue; - String actionLink = uicomponent.event("ChangePortletMode", mode); - String modeLabel = _ctx.appRes("PortletMode.label." + mode); - String upper = mode.charAt(0).toString(); - mode = mode.replaceFirst(upper, upper.toUpperCase()); - %> - <a class="CategoryItem" href="$actionLink" title="$modeLabel"> - <div class="CategoryItemLabel" >$modeLabel</div> - </a> - <% - } - if(supportModes != null && supportModes.size() > 0 && !supportModes.contains("view")) { - String modeLabel = _ctx.appRes("PortletMode.label.view"); - %> - <a class="CategoryItem" href="<%=uicomponent.event("ChangePortletMode", "view")%>" title="$modeLabel"> - <div class="CategoryItemLabel">$modeLabel</div> - </a> - <%}%> - </div> - </div> - </div> - <div class="PopupCategoryBL"> - <div class="PopupCategoryBR"> - <div class="PopupCategoryBC"><span></span></div> - </div> - </div> - </div> - </div> - </div> - <% /*End Popup Menu*/ %> - </div> - <%}%> - - <% - /*TODO: modify: dang.tung - fixed icon themes*/ - String portletIcon = uicomponent.getIcon(); - if(portletIcon == null) portletIcon = "PortletIcon"; - %> - <div class="$portletIcon WindowPortletIcon NovaPortletIcon WindowPortletInfo"><div class="PortletName"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div></div> - + + </div> + </div> + <%} else { %> + <div class="VIEW-BLOCK VIEW-PORTLET" id="VIEW-${portletId}"> + <%} %> +<% + } + + if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) { + if(uicomponent.getShowInfoBar()) { + String title = uicomponent.getDisplayTitle(); + if(title == null || title.trim().length() < 1) + title = portletId; + /*Begin Window Portlet Bar*/ + String visibility = "visible"; + String appDisplay = "block"; + String appZIndex = ""; + String windowWidth = uicomponent.getWidth(); + if(windowWidth!= null && !windowWidth.contains("%") && !windowWidth.contains("px")) windowWidth += "px"; + String windowHeight = uicomponent.getHeight(); + if(windowHeight != null && !windowHeight.contains("%") && !windowHeight.contains("px")) windowHeight += "px"; + String cssStyle = "style=\""; + cssStyle += "visibility: "+ visibility +";"; + cssStyle += "display: "+ appDisplay +";"; + cssStyle += "z-index: "+ appZIndex +";"; + cssStyle += "width: "+ windowWidth +";"; + //cssStyle += "height: "+ windowHeight +";"; + cssStyle += "\""; + String theme = uicomponent.getSuitedTheme(null); + %> + <div class="UIWindow $theme UIDragObject UIResizeObject" id="UIWindow-${portletId}" ${cssStyle} > + <div class="WindowBarLeft"> + <div class="WindowBarRight"> + <div class="WindowBarCenter ClearFix"> + <% + + String restoreDown = _ctx.appRes("UIPortlet.tooltip.MaximizeRestore"); + String restore = _ctx.appRes("UIPortlet.tooltip.MinimizeRestore"); + String miniTooltip = _ctx.appRes("UIPortlet.tooltip.Minimize"); + String maxiTooltip = _ctx.appRes("UIPortlet.tooltip.Maximize"); + String renderMaxi = maxiTooltip; + String renderMini = miniTooltip; + if(windowState == WindowState.MAXIMIZED) { + renderMaxi = restoreDown; + } else if(windowState == WindowState.MINIMIZED) { + renderMini = restore; + } + if(uicomponent.getShowWindowState()) { + String maximizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'maximized');"; + String minimizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'minimized');"; + String maximizedMode = "Maximized"; + String minimizedMode = "Minimized"; + if(windowState == WindowState.MAXIMIZED) { + maximizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'normal');"; + maximizedMode = "Normal"; + } else if(windowState == WindowState.MINIMIZED) { + minimizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'normal');"; + minimizedMode = "Normal"; + } + %> + <div class="ControlIcon ${maximizedMode}Icon" title="$renderMaxi" onclick="$maximizedAction" onmouseover="$onControlOver" onmouseout="$onControlOut"><span></span> + <div style="display:none">{"normalTitle":"$maxiTooltip","modeTitle":"$restoreDown"}</div> + </div> + <div class="ControlIcon ${minimizedMode}Icon" title="$renderMini" onclick="$minimizedAction" onmouseover="$onControlOver" onmouseout="$onControlOut"><span></span> + <div style="display:none">{"normalTitle":"$miniTooltip","modeTitle":"$restore"}</div> </div> - </div> - </div> - </div> - <%/*End Window Portlet Bar*/ %> - - <div class="MiddleDecoratorLeft"> - <div class="MiddleDecoratorRight"> - <div class="MiddleDecoratorCenter"> - <div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>" style="width: 100%"> - <div class="PORTLET-FRAGMENT UIResizableBlock UIApplication" style="width: 100%; height: $windowHeight;"> - <% - if(windowState != WindowState.MINIMIZED) { - if(hasPermission) println portletContent; - else println "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; - } - %> - </div> + <%} + + List supportModes = uicomponent.getSupportModes(); + if(uicomponent.getShowPortletMode() && supportModes.size() > 0) { + String showCategory = "eXo.webui.UIPopupSelectCategory.show(this, event);" + %> + <div class="ControlIcon ArrowDownIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.PortletMode");%>" onclick="$showCategory" onmouseover="$onControlOver" onmouseout="$onControlOut" style="position: relative;"> + <% /*Begin Popup Menu*/ %> + <div class="UIPopupCategory" style="display: none;"> + <div class="PopupCategoryDecorator"> + <% + for(String mode in supportModes) { + if(mode.equals("edit") && rcontext.getRemoteUser()==null) continue; + String actionLink = uicomponent.event("ChangePortletMode", mode); + String modeLabel = _ctx.appRes("PortletMode.label." + mode); + String upper = mode.charAt(0).toString(); + mode = mode.replaceFirst(upper, upper.toUpperCase()); + %> + <a class="CategoryItem" href="$actionLink" title="$modeLabel"> + $modeLabel + </a> + <% + } + if(supportModes != null && supportModes.size() > 0 && !supportModes.contains("view")) { + String modeLabel = _ctx.appRes("PortletMode.label.view"); + %> + <a class="CategoryItem" href="<%=uicomponent.event("ChangePortletMode", "view")%>" title="$modeLabel"> + $modeLabel + </a> + <%}%> + </div> + </div> + <% /*End Popup Menu*/ %> </div> - </div> - </div> - </div> - - <%//Begin Bottom Decorator %> - <div class="BottomDecoratorLeft"> - <div class="BottomDecoratorRight"> - <div class="BottomDecoratorCenter"> - <div class="FixHeight ClearFix"> - <div class="ResizeArea" title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div> - <div class="Information"><%=_ctx.appRes("UIPortlet.lable.information");%></div> - </div> - </div> - </div> - </div> - </div> - <%//End Bottom Decorator %> - <% - } else { - if(windowState != WindowState.MINIMIZED) { - String windowWidth = uicomponent.getWidth(); - if(windowWidth!= null && !windowWidth.contains("%") && !windowWidth.contains("px")) windowWidth += "px"; - String windowHeight = uicomponent.getHeight(); - if(windowHeight != null && !windowHeight.contains("%") && !windowHeight.contains("px")) windowHeight += "px"; - String cssStyle = "style=\""; - cssStyle += "width: "+ windowWidth +";"; - cssStyle += "height: "+ windowHeight +";"; - cssStyle += "\""; - %> - <div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>"> - <div class="PORTLET-FRAGMENT" ${cssStyle}> - <% - if(hasPermission) println portletContent; - else println "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; + <%}%> + + <% + /*TODO: modify: dang.tung - fixed icon themes*/ + String portletIcon = uicomponent.getIcon(); + if(portletIcon == null) portletIcon = "PortletIcon"; %> + <div class="$portletIcon WindowPortletIcon NovaPortletIcon WindowPortletInfo PortletName"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + </div> - </div> - <% - } - } - } - if(uiPortalApp.isEditing()) { - if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) { - %> - <div class="UIPortletMaskParent" style="height: 0px;position:relative;"> - <div class="UIPortlet-$portletId UIPortletMask" style="position: absolute;"><span></span></div> </div> </div> - <%} %> + <%/*End Window Portlet Bar*/ %> - <div class="EDITION-BLOCK EDITION-PORTLET" style="display: none;"> - <div style="position: relative; z-index: 999;"> - <div style="position: absolute; top: -86px;"> - <div class="NewLayer"><span></span></div> - <div class="CONTROL-PORTLET CONTROL-BLOCK" style="position: absolute; top: -6px;"> - <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UIPortlet.tooltip.DragControl");%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String portletIcon = uicomponent.getIcon(); - if(portletIcon == null) portletIcon = "PortletIcon"; - - String title = uicomponent.getDisplayTitle(); - if(title.length() > 30) title = title.substring(0,27) + "..."; - %> - <div class="PortletIcon $portletIcon"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <a href="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>;" class="EditPortletPropertiesIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a> - <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeletePortletIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a> - <%}%> - </div> - </div> - </div> - </div> - </div> - </div> - <%/*End InfoBar*/ %> + <div class="MiddleDecoratorLeft"> + <div class="MiddleDecoratorRight"> + <div class="MiddleDecoratorCenter"> + <div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>" style="width: 100%"> + <div class="PORTLET-FRAGMENT UIResizableBlock UIApplication" style="width: 100%; height: $windowHeight;"> + <% + if(windowState != WindowState.MINIMIZED) { + if(hasPermission) println portletContent; + else println "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; + } + %> + </div> </div> </div> </div> </div> - + + <%//Begin Bottom Decorator %> + <div class="BottomDecoratorLeft"> + <div class="BottomDecoratorRight"> + <div class="BottomDecoratorCenter ClearFix"> + <div class="ResizeArea" title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div> + <div class="Information"><%=_ctx.appRes("UIPortlet.lable.information");%></div> + </div> + </div> + </div> </div> +<%//End Bottom Decorator %> +<% + } else { + if(windowState != WindowState.MINIMIZED) { + String windowWidth = uicomponent.getWidth(); + if(windowWidth!= null && !windowWidth.contains("%") && !windowWidth.contains("px")) windowWidth += "px"; + String windowHeight = uicomponent.getHeight(); + if(windowHeight != null && !windowHeight.contains("%") && !windowHeight.contains("px")) windowHeight += "px"; + String cssStyle = "style=\""; + cssStyle += "width: "+ windowWidth +";"; + cssStyle += "height: "+ windowHeight +";"; + cssStyle += "\""; +%> + <div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>"> + <div class="PORTLET-FRAGMENT" ${cssStyle}> + <% + if(hasPermission) println portletContent; + else println "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; + %> + </div> + </div> +<% + } + } +} + if(uiPortalApp.isEditing()) { + if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) { +%> + <div class="UIPortletMaskParent" style="height: 0px;position:relative;"> + <div class="UIPortlet-$portletId UIPortletMask" style="position: absolute;"><span></span></div> + </div> + </div> + <%} %> + + <div class="EDITION-BLOCK EDITION-PORTLET" style="display: none;position: relative; z-index: 999;"> + <div style="position: absolute; top: -86px;"> + <div class="NewLayer"><span></span></div> + <div class="CONTROL-PORTLET CONTROL-BLOCK UIInfoBar"> + <%/*Begin InfoBar*/%> + <div class="BlueRoundedStyle ClearFix"> + <div class="DragControlArea" title="<%=_ctx.appRes("UIPortlet.tooltip.DragControl");%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> + <% + String portletIcon = uicomponent.getIcon(); + if(portletIcon == null) portletIcon = "PortletIcon"; + + String title = uicomponent.getDisplayTitle(); + if(title.length() > 30) title = title.substring(0,27) + "..."; + %> + <div class="PortletIcon $portletIcon"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <a href="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a> + <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a> + <%}%> + </div> + <%/*End InfoBar*/ %> + </div> + </div> + </div> + </div> </div> <%}%> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -29,9 +29,7 @@ id="${uicomponent.id}" ${cssStyle} onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> - <div class="NormalContainerBlock"> - <div class="LeftContainerBlock"> - <div class="RightContainerBlock UIComponentBlock"> + <div class="NormalContainerBlock UIComponentBlock"> <% int portalMode = uiPortalApp.getModeState(); @@ -42,90 +40,64 @@ <div class="VIEW-CONTAINER VIEW-BLOCK"> <%} %> <%if(hasPermission) {%> - <div class="UIRowContainer <%=(portalMode != UIPortalApplication.NORMAL_MODE && uicomponent.getChildren().size() == 0) ? "EmptyContainer" : ""%>"> - <div> + <div class="UIRowContainer <%=(portalMode != UIPortalApplication.NORMAL_MODE && uicomponent.getChildren().size() == 0) ? "EmptyContainer" : ""%>"> + <div> <%uicomponent.renderChildren();%> </div> - </div> + </div> <%} else out.print("<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>");%> </div> <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> - <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> - <div style="position: relative;"> + <div class="EDITION-BLOCK EDITION-CONTAINER" style="position: relative; display: none;"> + <div style="position: absolute; top: -86px;"> <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> - <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> + <div class="CONTROL-CONTAINER CONTROL-BLOCK UIInfoBar" style="position: absolute; top: -6px;"> <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UIColumnContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String showCategory = "eXo.webui.UIPopupSelectCategory.show(this, event)"; - String strTitle = uicomponent.getTitle() != null ? - ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : - _ctx.appRes("UIColumnContainer.title.Container"); - %> - <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <div class="ControlIcon ArrowDownIcon" onclick="$showCategory" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertColumn") %>"> - <% /*Begin Popup Menu*/ %> - <div style="position: relative; width: 100%"> - <div class="UIPopupCategory" style="display: none;"> - <div class="PopupCategoryDecorator"> - <div class="PopupCategoryTL"> - <div class="PopupCategoryTR"> - <div class="PopupCategoryTC"><span></span></div> - </div> - </div> - <div class="PopupCategoryML"> - <div class="PopupCategoryMR"> - <div class="PopupCategoryMC"> - <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_BEFORE) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertLeft") %>"> - <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertLeft") %></div> - </a> - <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_AFTER) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertRight") %>"> - <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertRight") %></div> - </a> - </div> - </div> - </div> - <div class="PopupCategoryBL"> - <div class="PopupCategoryBR"> - <div class="PopupCategoryBC"><span></span></div> - </div> - </div> - </div> - </div> - </div> - <% /*End Popup Menu*/ %> - </div> - <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a> - <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a> - - <%}%> - + <div class="BlueRoundedStyle FixHeight ClearFix"> + + <span class="DragControlArea" title="<%=_ctx.appRes("UIColumnContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"></span> + <% + String showCategory = "eXo.webui.UIPopupSelectCategory.show(this, event)"; + String strTitle = uicomponent.getTitle() != null ? + ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : + _ctx.appRes("UIColumnContainer.title.Container"); + %> + <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <div class="ControlIcon ArrowDownIcon" onclick="$showCategory" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertColumn") %>"> + <% /*Begin Popup Menu*/ %> + <div style="position: relative; width: 100%"> + <div class="UIPopupCategory" style="display: none;"> + <div class="PopupCategoryDecorator"> + + <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_BEFORE) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertLeft") %>"> + <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertLeft") %></div> + </a> + <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_AFTER) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertRight") %>"> + <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertRight") %></div> + </a> + + </div> </div> </div> + <% /*End Popup Menu*/ %> </div> - </div> + <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a> + <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a> + + <%}%> + </div> - </div> <%/*End InfoBar*/ %> </div> </div> - </div> + </div> <%} %> - - </div> - </div> + </div> </div> - Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -29,9 +29,7 @@ id="${uicomponent.id}" ${cssStyle} onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> - <div class="NormalContainerBlock"> - <div class="LeftContainerBlock"> - <div class="RightContainerBlock UIComponentBlock"> + <div class="NormalContainerBlock UIComponentBlock"> <% int portalMode = uiPortalApp.getModeState(); @@ -42,8 +40,8 @@ <div class="VIEW-CONTAINER VIEW-BLOCK"> <%} %> <%if(hasPermission) {%> - <div> - <div class="UIRowContainer <%=(portalMode != UIPortalApplication.NORMAL_MODE && uicomponent.getChildren().size() == 0) ? "EmptyContainer" : ""%>"> + <div class="UIRowContainer <%=(portalMode != UIPortalApplication.NORMAL_MODE && uicomponent.getChildren().size() == 0) ? "EmptyContainer" : ""%>"> + <div> <%uicomponent.renderChildren();%> </div> </div> @@ -51,47 +49,29 @@ </div> <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> - <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> - <div style="position: relative;"> - <div style="position: absolute; top: -86px;"> - - <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> - <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> - <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String strTitle = uicomponent.getTitle() != null ? - ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : - _ctx.appRes("UIContainer.title.Container"); - %> - <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <a href="<%=uicomponent.event("EditContainer")%>" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> - <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> - <%}%> - - </div> - </div> - </div> - </div> - </div> - </div> - <%/*End InfoBar*/ %> - </div> - - </div> + <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;position: relative;"> + <div style="position: absolute; top: -86px;"> + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> + <div class="CONTROL-CONTAINER CONTROL-BLOCK UIInfoBar"> + <%/*Begin InfoBar*/%> + + <div class="BlueRoundedStyle ClearFix"> + <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> + <% + String strTitle = uicomponent.getTitle() != null ? + ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : + _ctx.appRes("UIContainer.title.Container"); + %> + <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a> + <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> + <%}%> + </div> + <%/*End InfoBar*/ %> </div> </div> - <%} %> - - </div> - </div> - </div> -</div> - + </div> + <%} %> + </div> +</div> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -20,10 +20,7 @@ id="${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> - <div class="NormalContainerBlock"> - <div class="LeftContainerBlock"> - <div class="RightContainerBlock UIComponentBlock"> - + <div class="NormalContainerBlock UIComponentBlock"> <% int portalMode = uiPortalApp.getModeState(); String style = ""; @@ -39,10 +36,10 @@ <%} %> <div> <%if(hasPermission) {%> - <table class="UITableColumnContainer" style="margin: 0px auto; $style"> + <table class="UITableColumn" style="margin: 0px auto; $style"> <tr class="TRContainer"> <% for(uiChild in uicomponent.getChildren()) {%> - <td class="${uiChild.id}TDContainer TDContainer"><% uicomponent.renderUIComponent(uiChild) %></td> + <td class="${uiChild.id}TDContainer TDContainer" <% if(uiChild.getWidth()) { %> width="<%= uiChild.getWidth(); %>" <% } %>><% uicomponent.renderUIComponent(uiChild) %></td> <% } %> </tr> </table> @@ -52,46 +49,28 @@ <%/*Debug On IE -----For DND */%> <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> - <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> - <div style="position: relative;"> - <div style="position: absolute; top: -86px;"> - - <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> - <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> - <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String strTitle = uicomponent.getTitle() != null ? - ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : - _ctx.appRes("UIContainer.title.Container"); - %> - <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> - <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> - <%}%> - </div> - </div> - </div> - </div> - </div> - </div> - <%/*End InfoBar*/ %> - </div> - - </div> + <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none; position: relative;"> + <div style="position: absolute; top: -86px;"> + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> + <div class="CONTROL-CONTAINER CONTROL-BLOCK UIInfoBar"> + <%/*Begin InfoBar*/%> + <div class="BlueRoundedStyle ClearFix"> + <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> + <% + String strTitle = uicomponent.getTitle() != null ? + ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : + _ctx.appRes("UIContainer.title.Container"); + %> + <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> + <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> + <%}%> </div> + <%/*End InfoBar*/ %> </div> - <%} %> - </div> </div> + <%} %> </div> - -</div> \ No newline at end of file +</div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -19,11 +19,8 @@ <div class="UIContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%> <%=hasPermission?"":"ProtectedContainer"%>" id="${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" - onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> - <div class="NormalContainerBlock"> - <div class="LeftContainerBlock"> - <div class="RightContainerBlock UIComponentBlock"> - + onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> + <div class="NormalContainerBlock UIComponentBlock"> <% int portalMode = uiPortalApp.getModeState(); String style = ""; @@ -42,56 +39,38 @@ <table class="UITableColumnContainer" style="table-layout: fixed; margin: 0px auto; $style"> <tr class="TRContainer"> <% for(uiChild in uicomponent.getChildren()) {%> - <td class="${uiChild.id}TDContainer TDContainer"><% uicomponent.renderUIComponent(uiChild) %></td> + <td class="${uiChild.id}TDContainer TDContainer" <% if(uiChild.getWidth()) { %> width="<%= uiChild.getWidth(); %>" <% } %>><% uicomponent.renderUIComponent(uiChild) %></td> <% } %> - </tr> - </table> + </tr> + </table> <%} else {print "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>";}%> </div> </div> <%/*Debug On IE -----For DND */%> <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> - <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> - <div style="position: relative;"> - <div style="position: absolute; top: -86px;"> - - <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> - <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> - <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String strTitle = uicomponent.getTitle() != null ? - ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : - _ctx.appRes("UIContainer.title.Container"); - %> - <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> - <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> - <%}%> - </div> - </div> - </div> - </div> - </div> - </div> - <%/*End InfoBar*/ %> - </div> - - </div> + <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;position: relative;"> + <div style="position: absolute; top: -86px;"> + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> + <div class="CONTROL-CONTAINER CONTROL-BLOCK UIInfoBar"> + <%/*Begin InfoBar*/%> + <div class="BlueRoundedStyle ClearFix"> + <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> + <% + String strTitle = uicomponent.getTitle() != null ? + ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : + _ctx.appRes("UIContainer.title.Container"); + %> + <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a> + <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"></a> + <%}%> </div> + <%/*End InfoBar*/ %> </div> - <%} %> - </div> </div> - </div> - -</div> \ No newline at end of file + <%} %> + </div> +</div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -48,40 +48,26 @@ </div> <%/*Debug On IE -----For DND */%> - <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> - <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> - <div style="position: relative;"> - <div style="position: absolute; top: -86px;"> - - <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> - <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> - <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String strTitle = uicomponent.getTitle() != null ? - ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : - _ctx.appRes("UIContainer.title.Container"); - %> - <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> - <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> - <%}%> - </div> - </div> - </div> - </div> - </div> - </div> - <%/*End InfoBar*/ %> + <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> + <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;position: relative;"> + <div style="position: absolute; top: -86px;"> + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> + <div class="CONTROL-CONTAINER CONTROL-BLOCK UIInfoBar"> + <%/*Begin InfoBar*/%> + <div class="BlueRoundedStyle"> + <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> + <% + String strTitle = uicomponent.getTitle() != null ? + ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : + _ctx.appRes("UIContainer.title.Container"); + %> + <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> + <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> + <%}%> </div> - + <%/*End InfoBar*/ %> </div> </div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIAddGroupNavigation.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIAddGroupNavigation.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIAddGroupNavigation.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -8,21 +8,7 @@ uicomponent.renderChild(UIVirtualList.class); %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("Close")%>" class="ActionButton DarkGrayButton"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("word.cancel")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Close")%>" class="ActionButton DarkGrayButton"><%=_ctx.appRes("word.cancel")%></a> </div> <% uicomponent.renderChild(UIPopupWindow.class); %> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -5,73 +5,33 @@ %> <div class="UIPageBody" id="${uicomponent.id}"> <div class="UIComponent UIComponentBlock"> - <%if(portalMode == UIPortalApplication.APP_BLOCK_EDIT_MODE || portalMode == UIPortalApplication.CONTAINER_BLOCK_EDIT_MODE) {%> - <div class="LAYOUT-BLOCK LAYOUT-PAGEBODY DragControlArea" onmousedown="if(eXo.portal.portalMode == <%=UIPortalApplication.APP_BLOCK_EDIT_MODE%>){eXo.portal.PortalDragDrop.init.call(this, event);} return false"> - <div class="PageLayoutDecorator" onmouseover="if(eXo.portal.portalMode == <%=UIPortalApplication.APP_BLOCK_EDIT_MODE%>){this.style.cursor ='move';} else this.style.cursor ='default';"> + <div class="LAYOUT-BLOCK LAYOUT-PAGEBODY DragControlArea PageLayoutDecorator" onmouseover="if(eXo.portal.portalMode == <%=UIPortalApplication.APP_BLOCK_EDIT_MODE%>){this.style.cursor ='move';} else this.style.cursor ='default';" onmousedown="if(eXo.portal.portalMode == <%=UIPortalApplication.APP_BLOCK_EDIT_MODE%>){eXo.portal.PortalDragDrop.init.call(this, event);} return false"> <%/*Begin Top Decorator*/%> - <div class="TopLeftPage"> - <div class="TopRightPage"> - <div class="TopCenterPage"> + <div class="LeftPage"> + <div class="RightPage"> + <div class="CenterPage"> <%=_ctx.appRes("UIPage.label.pageContent")%> </div> </div> - </div> - - <%/*Begin Middle Decorator*/%> - <div class="MiddleLeftPage"> - <div class="MiddleRightPage"> - <div class="MiddlePageBG"> - <div class="FixBug"><span></span></div> - </div> - </div> - </div> - - <%/*Begin Bottom Decorator*/%> - <div class="BottomLeftPage"> - <div class="BottomRightPage"> - <div class="BottomCenterPage"> - <div class="FixBug"><span></span></div> - </div> - </div> - </div> - - </div> + </div> </div> <%} else {%> <div class="VIEW-PAGEBODY VIEW-BLOCK DragControlArea" id="PAGEBODY-VIEW-BLOCK"> <% if(uicomponent.getUIComponent() == null){ %> - <div class="Empty"> - <div class="UIPortalWarning"> - <div class="LeftTopWarning"> - <div class="RightTopWarning"> - <div class="CenterTopWaring"> - <div class="TitleWaring"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine1")%></div> - </div> - </div> - </div> - <div class="LeftMiddleWarning"> - <div class="RightMiddleWarning"> - <div class="WarningContent"> - <div class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine2")%></div> - <div class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine3")%></div> - <div class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine4")%></div> - </div> - </div> - </div> - <div class="LeftBottomWarning"> - <div class="RightBottomWarning"> - <div class="CenterBottomWaring"><span></span></div> - </div> - </div> + <div class="UIPortalWarning Empty"> + + <h3 class="TitleWaring"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine1")%></h3> + + <ul> + <li class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine2")%></li> + <li class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine3")%></li> + <li class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine4")%></li> + </ul> + </div> - </div> + <% } else { uicomponent.renderChildren(); }%> - <div class="BLPagebody"> - <div class="BRPagebody"> - <div class="BMPagebody"><span></span></div> - </div> - </div> <%if(portalMode != UIPortalApplication.NORMAL_MODE) {%> <div class="MaskParent" style="height: 0px;position:relative;"> @@ -85,5 +45,5 @@ <div class="CONTROL-PAGEBODY CONTROL-BLOCK" style="display: none"><span></span></div> </div> <%} %> - </div> </div> +</div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBrowser.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBrowser.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBrowser.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -8,21 +8,7 @@ <%if(uicomponent.isShowAddNewPage()) {%> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("AddNew")%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.addNewPage")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("AddNew")%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action.addNewPage")%></a> </div> <%}%> </div> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSelector.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -70,58 +70,26 @@ </div> </div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <% - String clearPageEvent = "javascript:void(0);"; - String css = "FloatBlockHidden ActionButton SimpleStyle"; - def uiForm = uicomponent.getAncestorOfType(UIForm.class); - createPageEvent = uiForm.event("CreatePage"); - if(page != null) { - clearPageEvent = uiForm.event("ClearPage"); - css = "ActionButton SimpleStyle"; - } - %> - <div onclick="<%=clearPageEvent%>" class="<%=css%>"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="DustBin16x16Icon Icon" title="<%=_ctx.appRes(uicomponent.getId()+".label.clearPage")%>"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".label.clearPage")%></a> - </div> - </div> - </div> - </div> - </div> - <% if(page == null) { %> - <div onclick="<%=createPageEvent%>" class="ActionButton SimpleStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="GreenPlusPage16x16Icon Icon" title="<%=_ctx.appRes(uicomponent.getId()+".label.createPage")%>"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".label.createPage")%></a> - </div> - </div> - </div> - </div> - </div> - <% } %> - - <div class="ActionButton SimpleStyle" onclick="<%=uicomponent.event("OpenSelectPagePopUp")%>"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="Icon SelectPageIcon" title="<%=_ctx.appRes(uicomponent.getId()+".label.searchandSelectPage")%>"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId()+".label.searchandSelectPage")%></a> - </div> - </div> - </div> - </div> - </div> - - </td> - </tr> - </table> + <% + String clearPageEvent = "javascript:void(0);"; + String css = "FloatBlockHidden ActionButton SimpleStyle"; + def uiForm = uicomponent.getAncestorOfType(UIForm.class); + createPageEvent = uiForm.event("CreatePage"); + if(page != null) { + clearPageEvent = uiForm.event("ClearPage"); + css = "ActionButton SimpleStyle"; + } + %> + <span onclick="<%=clearPageEvent%>" class="<%=css%>" title="<%=_ctx.appRes(uicomponent.getId()+".label.clearPage")%>"> + <a href="javascript:void(0);" class="DustBin16x16Icon Icon"><%=_ctx.appRes(uicomponent.getId() + ".label.clearPage")%></a> + </span> + <% if(page == null) { %> + <span onclick="<%=createPageEvent%>" class="ActionButton SimpleStyle" title="<%=_ctx.appRes(uicomponent.getId()+".label.createPage")%>"> + <a href="javascript:void(0);" class="GreenPlusPage16x16Icon Icon"><%=_ctx.appRes(uicomponent.getId() + ".label.createPage")%></a> + </span> + <% } %> + <span class="ActionButton SimpleStyle" onclick="<%=uicomponent.event("OpenSelectPagePopUp")%>" title="<%=_ctx.appRes(uicomponent.getId()+".label.searchandSelectPage")%>"> + <a href="javascript:void(0);" class="Icon SelectPageIcon"><%=_ctx.appRes(uicomponent.getId()+".label.searchandSelectPage")%></a> + </span> </div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UISiteBody.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UISiteBody.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/page/UISiteBody.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -3,68 +3,30 @@ UIPortalApplication uiPortalApp = _ctx.getRequestContext().getUIApplication(); int portalMode = uiPortalApp.getModeState(); %> -<div class="UISiteBody" id="${uicomponent.id}"> - <div class="UIComponent UIComponentBlock"> - +<div class="UISiteBody" id="${uicomponent.id}"> + <div class="UIComponent UIComponentBlock"> <%if(portalMode == UIPortalApplication.APP_BLOCK_EDIT_MODE || portalMode == UIPortalApplication.CONTAINER_BLOCK_EDIT_MODE) {%> - <div class="LAYOUT-BLOCK LAYOUT-SITEBODY DragControlArea"> - <div class="PageLayoutDecorator"> - <%/*Begin Top Decorator*/%> - <div class="TopLeftPage"> - <div class="TopRightPage"> - <div class="TopCenterPage"> - <%=_ctx.appRes("UIPage.label.pageContent")%> - </div> - </div> - </div> - - <%/*Begin Middle Decorator*/%> - <div class="MiddleLeftPage"> - <div class="MiddleRightPage"> - <div class="MiddlePageBG"> - <div class="FixBug"><span></span></div> - </div> - </div> - </div> - - <%/*Begin Bottom Decorator*/%> - <div class="BottomLeftPage"> - <div class="BottomRightPage"> - <div class="BottomCenterPage"> - <div class="FixBug"><span></span></div> - </div> - </div> - </div> - - </div> + <div class="LAYOUT-BLOCK LAYOUT-SITEBODY DragControlArea PageLayoutDecorator"> + <%/*Begin Top Decorator*/%> + <div class="LeftPage"> + <div class="RightPage"> + <div class="CenterPage"> + <%=_ctx.appRes("UIPage.label.pageContent")%> + </div> + </div> + </div> </div> <%} else {%> <div class="VIEW-SITEBODY VIEW-BLOCK" id="SITEBODY-VIEW-BLOCK"> <% if(uicomponent.getUIComponent() == null){ %> - <div class="Empty"> - <div class="UIPortalWarning"> - <div class="LeftTopWarning"> - <div class="RightTopWarning"> - <div class="CenterTopWaring"> - <div class="TitleWaring"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine1")%></div> - </div> - </div> - </div> - <div class="LeftMiddleWarning"> - <div class="RightMiddleWarning"> - <div class="WarningContent"> - <div class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine2")%></div> - <div class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine3")%></div> - <div class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine4")%></div> - </div> - </div> - </div> - <div class="LeftBottomWarning"> - <div class="RightBottomWarning"> - <div class="CenterBottomWaring"><span></span></div> - </div> - </div> - </div> + <div class="UIPortalWarning Empty"> + + <h3 class="TitleWaring"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine1")%></h3> + <ul> + <li class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine2")%></li> + <li class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine3")%></li> + <li class="Icon"><%=_ctx.appRes("UIPageBody.msg.pageNotFoundLine4")%></li> + </ul> </div> <% } else { uicomponent.renderChildren(); } %> </div> @@ -75,5 +37,5 @@ </div> <div class="UISiteBodyMask" style="position:absolute; display:none;"><span></span></div> <%} %> - </div> + </div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIAccountSettingForm.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIAccountSettingForm.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIAccountSettingForm.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -59,22 +59,8 @@ </div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <%for(action in uicomponent.getActions()) { %> - <div onclick="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle" > - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action." + action)%></a> - </div> - </div> - </div> - </div> - <%} %> - </td> - </tr> - </table> + <%for(action in uicomponent.getActions()) { %> + <a href="javascript:void(0);" onclick="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".action." + action)%></a> + <%} %> </div> </div> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UILanguageSelector.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UILanguageSelector.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UILanguageSelector.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -78,30 +78,8 @@ </div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="javascript:eXo.portal.UIPortal.changeLanguage('<%=uicomponent.url("Save");%>');" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="#"><%=_ctx.appRes("UIChangeLanguage.action.save");%></a> - </div> - </div> - </div> - </div> - <div onclick="<%=uicomponent.event("Close");%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIChangeLanguage.action.close");%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <a href="javascript:void(0);" onclick="javascript:eXo.portal.UIPortal.changeLanguage('<%=uicomponent.url("Save");%>');" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIChangeLanguage.action.save");%></a> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Close");%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIChangeLanguage.action.close");%></a> </div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -8,87 +8,38 @@ rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopup.setAlign('$popupId', 2, 5, 5);"); %> <div class="UIPopupWindow UIDragObject UIPortalComposer" exo:minWidth="200" exo:minHeight="200" id="$uicomponent.id" style="width: 320px; display: block;"> - <div class="TLPortalComposer"> - <div class="TRPortalComposer"> - <div class="TCPortalComposer"> - <div class="OverflowContainer"> - <div class="<%=uicomponent.isCollapsed ? "CollapseIcon" : "ExpandIcon"%>" onclick="eXo.portal.UIPortal.toggleComposer(this)"><span></span></div> - <% if(uicomponent.isShowControl) { %> - <a class="CloseButton" title="<%=_ctx.appRes("word.abort")%>" href="<%=uicomponent.event("CloseComposer")%>"><span></span></a> - <% if (uicomponent.isUsedInWizard()) { %> - <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.url("Finish")%>" onclick="eXo.core.DOMUtil.disableOnClick(this);" ><span></span></a> - <a class="BackButton"" title="<%=_ctx.appRes("word.back")%>" href="<%=uicomponent.event("Back")%>"> - <span></span> - </a> - <% } else {%> - <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.event("Finish")%>"><span></span></a> - <% } - } %> - <div class="PopupTitle"><%=_ctx.appRes(popupId + ".title."+ popupId)%></div> - </div> - </div> - </div> + <div class="OverflowContainer ClearFix"> + <span class="<%=uicomponent.isCollapsed ? "CollapseIcon" : "ExpandIcon"%>" onclick="eXo.portal.UIPortal.toggleComposer(this)"></span> + <% if(uicomponent.isShowControl) { %> + <a class="CloseButton" title="<%=_ctx.appRes("word.abort")%>" href="<%=uicomponent.event("CloseComposer")%>"><span></span></a> + <% if (uicomponent.isUsedInWizard()) { %> + <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.url("Finish")%>" onclick="eXo.core.DOMUtil.disableOnClick(this);" ></a> + <a class="BackButton" title="<%=_ctx.appRes("word.back")%>" href="<%=uicomponent.event("Back")%>"></a> + <% } else {%> + <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.event("Finish")%>"></a> + <% } + } %> + <span class="PopupTitle"><%=_ctx.appRes(popupId + ".title."+ popupId)%></span> </div> - - <div class="MLPortalComposer" style="display: <%=uicomponent.isCollapsed ? "none": "block"%>"> - <div class="MRPortalComposer"> - <div class="MCPortalComposer"> - <div class="UIWindowContent"> - <div style="width: 100%;"> - <div class="PopupContent" style="height: 390px"> - <div class="Component"><% uicomponent.renderChildren(); %></div> - </div> - </div> - </div> - </div> + + <div class="UIWindowContent" style="display: <%=uicomponent.isCollapsed ? "none": "block"%>" > + <div class="PopupContent Component" style="height: 390px"> + <% uicomponent.renderChildren(); %> </div> - </div> - - <div class="BLPortalComposer" style="display: <%=uicomponent.isCollapsed ? "none": "block"%>"> - <div class="BRPortalComposer"> - <div class="BCPortalComposer"> - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - - <div onclick="<%= uicomponent.event("ViewProperties") %>;" class="ActionButton SimpleStyle1"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="PageProfileIcon"> - <a href="javascript:void(0);"><%=_ctx.appRes(popupId + ".action.ViewProperties")%></a> - </div> - </div> - </div> - </div> - </div> - - <% String changeEditMode = uicomponent.event("SwitchMode", null, null); %> - <div onclick="$changeEditMode" class="ActionButton SimpleStyle1" onmouseover="this.style.color = '#058ee6'" onmouseout="this.style.color='black'"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <div class="ViewAsBlockIcon"> - <a href="javascript:void(0);"><%=_ctx.appRes(popupId + ".action.SwitchMode")%></a> - </div> - </div> - </div> - </div> - </div> - - </td> - </tr> - </table> - </div> - <div class="ResizeButton"><span></span></div> - </div> + + <div class="UIAction" style="display: <%=uicomponent.isCollapsed ? "none": "block"%>"> + <span onclick="<%= uicomponent.event("ViewProperties") %>;eXo.portal.UIPortal.changeComposerSaveButton()" class="ActionButton SimpleStyle1"> + <a href="javascript:void(0);" class="PageProfileIcon"><%=_ctx.appRes(popupId + ".action.ViewProperties")%></a> + </span> + <% String changeEditMode = uicomponent.event("SwitchMode", null, null); %> + <span onclick="$changeEditMode" class="ActionButton SimpleStyle1" onmouseover="this.style.color = '#058ee6'" onmouseout="this.style.color='black'"> + <a href="javascript:void(0);" class="ViewAsBlockIcon"><%=_ctx.appRes(popupId + ".action.SwitchMode")%></a> + </span> </div> + <span class="ResizeButton"></span> </div> - <div class="Bottom" style="display: none;"><span></span></div> - </div> <script language="javascript"> eXo.portal.portalMode = <%=uicomponent.getPortalMode();%>; eXo.portal.hasEditted = <%=uicomponent.isEditted;%>; -</script> \ No newline at end of file +</script> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -92,38 +92,30 @@ %> </div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> + <%for(action in uicomponent.getActions()) { String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action); String link = uicomponent.event(action); if(uicomponent.hasEditMode() && (selTabId.equals("") || selTabId.equals("EditMode")) && action.contains("Save")) { %> - <div onclick="$link" class="ActionButton LightBlueStyle" style="display : none;"> + <%if(action.contains("Close")) { + String closeLabel = _ctx.appRes("word.close"); + %> + <a style="display: none;" class="ActionButton LightBlueStyle" href="$link" id="$action" closeLabel="$closeLabel" cancelLabel="$actionLabel"><%=(uicomponent.hasEditMode() && (selTabId.equals("") || selTabId.equals("EditMode"))) ? closeLabel : actionLabel%></a> <%} else {%> - <div onclick="$link" class="ActionButton LightBlueStyle"> + <a style="display: none;" class="ActionButton LightBlueStyle" href="$link" id="$action" >$actionLabel</a> <%}%> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <%if(action.contains("Close")) { - String closeLabel = _ctx.appRes("word.close"); - %> - <div class="ButtonMiddle" id="$action" closeLabel="$closeLabel" cancelLabel="$actionLabel"> - <a href="javascript:void(0);"><%=(uicomponent.hasEditMode() && (selTabId.equals("") || selTabId.equals("EditMode"))) ? closeLabel : actionLabel%></a> - </div> - <%} else {%> - <div class="ButtonMiddle" id="$action" > - <a href="javascript:void(0);">$actionLabel</a> - </div> + <%} else {%> + <%if(action.contains("Close")) { + String closeLabel = _ctx.appRes("word.close"); + %> + <a class="ActionButton LightBlueStyle" href="$link" id="$action" closeLabel="$closeLabel" cancelLabel="$actionLabel"><%=(uicomponent.hasEditMode() && (selTabId.equals("") || selTabId.equals("EditMode"))) ? closeLabel : actionLabel%></a> + <%} else {%> + <a class="ActionButton LightBlueStyle" href="$link" id="$action" >$actionLabel</a> <%}%> - </div> - </div> - </div> + <%}%> <%}%> - </td> - </tr> - </table> + </div> </div> @@ -138,10 +130,10 @@ var workingArea = DOMUtil.findAncestorByClass(comp, "WorkingArea"); var horLayout = DOMUtil.findFirstChildByClass(workingArea, "div", "HorizontalLayout"); var uiAction = DOMUtil.findFirstChildByClass(horLayout, "div", "UIAction"); - var buttons = DOMUtil.findDescendantsByClass(uiAction, "div", "ButtonMiddle"); + var buttons = DOMUtil.findChildrenByClass(uiAction, "a", "ActionButton"); for (var i = 0; i < buttons.length; i++) { if (buttons[i].id.indexOf("Save") >= 0) { - DOMUtil.findAncestorByClass(buttons[i], "ActionButton").style.display = "none"; + buttons[i].style.display = "none"; } if (buttons[i].id.indexOf("Close") >= 0) { buttons[i].innerHTML = buttons[i].getAttribute("closeLabel"); @@ -154,10 +146,10 @@ var workingArea = DOMUtil.findAncestorByClass(comp, "WorkingArea"); var horLayout = DOMUtil.findFirstChildByClass(workingArea, "div", "HorizontalLayout"); var uiAction = DOMUtil.findFirstChildByClass(horLayout, "div", "UIAction"); - var buttons = DOMUtil.findDescendantsByClass(uiAction, "div", "ButtonMiddle"); + var buttons = DOMUtil.findChildrenByClass(uiAction, "a", "ActionButton"); for (var i = 0; i < buttons.length; i++) { if (buttons[i].id.indexOf("Save") >= 0) { - DOMUtil.findAncestorByClass(buttons[i], "ActionButton").style.display = "block"; + buttons[i].style.display = "inline-block"; } if (buttons[i].id.indexOf("Close") >= 0) { buttons[i].innerHTML = buttons[i].getAttribute("cancelLabel"); Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UISkinSelector.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UISkinSelector.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UISkinSelector.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -31,31 +31,9 @@ </div> </div> - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="javascript:eXo.portal.UIPortal.changeSkin('<%=uicomponent.url("Save");%>');" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="#"><%=_ctx.appRes("UIChangeSkin.action.save");%></a> - </div> - </div> - </div> - </div> - <div onclick="<%=uicomponent.event("Close");%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIChangeSkin.action.close");%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <div class="UIAction"> + <a href="javascript:void(0);" onclick="javascript:eXo.portal.UIPortal.changeSkin('<%=uicomponent.url("Save");%>');" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIChangeSkin.action.save");%></a> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Close");%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIChangeSkin.action.close");%></a> </div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIMaskWorkspace.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIMaskWorkspace.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIMaskWorkspace.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -24,23 +24,5 @@ rcontext.getJavascriptManager().addOnResizeJavascript("eXo.portal.UIMaskWorkspace.resetPosition") ; %> <div class="UIMaskWorkspace" id="$maskId" style="display: none;"> - <div class="TopLeftDecorator" > - <div class="TopRightDecorator"> - <div class="TopCenterDecorator"><span></span></div> - </div> - </div> - - <div class="MiddleLeftDecorator"> - <div class="MiddleRightDecorator"> - <div class="MaskContainer"> - <%uicomponent.renderChildren();%> - </div> - </div> - </div> - - <div class="BottomLeftDecorator"> - <div class="BottomRightDecorator"> - <div class="BottomCenterDecorator"><span></span></div> - </div> - </div> + <div class="MaskContainer"><%uicomponent.renderChildren();%></div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -1,8 +1,8 @@ <!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <% - import org.exoplatform.portal.application.PortalRequestContext ; + import org.exoplatform.portal.application.PortalRequestContext ; import org.exoplatform.webui.core.UIComponent; import java.util.Iterator; import org.exoplatform.portal.webui.portal.UIPortal ; @@ -11,93 +11,91 @@ EntityEncoder encoder = EntityEncoder.FULL; - def rcontext = _ctx.getRequestContext() ; - String docBase = rcontext.getRequestContextPath() ; - String skin = uicomponent.getSkin(); - def portalSkins = uicomponent.getPortalSkins() ; - def portletSkins = uicomponent.getPortletSkins() ; - def scriptsPaths = uicomponent.getJavascriptURLs(); - def lang = uicomponent.getLocale().getLanguage(); - def title = encoder.encode(rcontext.getTitle()); - def metaInformation = rcontext.getMetaInformation(); + def rcontext = _ctx.getRequestContext() ; + String docBase = rcontext.getRequestContextPath() ; + String skin = uicomponent.getSkin(); + def portalSkins = uicomponent.getPortalSkins() ; + def portletSkins = uicomponent.getPortletSkins() ; + def scriptsPaths = uicomponent.getJavascriptURLs(); + def lang = uicomponent.getLocale().getLanguage(); + def title = rcontext.getTitle(); + def metaInformation = rcontext.getMetaInformation(); %> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="$lang" lang="$lang" dir="$dir"> - <head id="head"> - <title><%=title%></title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <% - if(metaInformation!= null) { - Iterator<String> keys = metaInformation.keySet().iterator(); - while(keys.hasNext()) { - String metaName = keys.next(); - String metaContent = metaInformation.get(metaName); - %> - <meta name="<%=metaName%>" content="<%=metaContent%>" /> - <% } } %> - - <link rel="shortcut icon" type="image/x-icon" href="<%=docBase%>/favicon.ico" /> - <%for(skinConfig in portalSkins) { - def url = skinConfig.createURL(); - url.setOrientation(orientation); - %> - <link id="${skinConfig.id}" rel="stylesheet" type="text/css" href="$url" /> - <%}%> - <%for(portletSkin in portletSkins) { - def url = portletSkin.createURL(); - url.setOrientation(orientation); - %> - <link id="${portletSkin.id}" rel="stylesheet" type="text/css" href= "$url" /> - <%}%> - <script type="text/javascript"> - <% - // This variable must be used only to initialize other variables otherwise - // please use eXo.env.portal.context or eXo.env.portal.context instead - // Those 2 last variables cannot be used to initialize variables because - // we cannot be sure that they will be initialized before initializing your script - %> - var currentContext = '<%=docBase%>' ; - </script> - <%if(org.exoplatform.commons.utils.PropertyManager.isDevelopping()) { - for(path in scriptsPaths) { %> - <script type="text/javascript" src="<%=path%>"></script> - <%}%> - <script type="text/javascript"> - eXo.developing = true ; - </script> + <head id="head"> + <title><%=title%></title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <% + if(metaInformation!= null) { + Iterator<String> keys = metaInformation.keySet().iterator(); + while(keys.hasNext()) { + String metaName = keys.next(); + String metaContent = metaInformation.get(metaName); + %> + <meta name="<%=metaName%>" content="<%=metaContent%>" /> + <% } } %> + + <link rel="shortcut icon" type="image/x-icon" href="<%=docBase%>/favicon.ico" /> + <%for(skinConfig in portalSkins) { + def url = skinConfig.createURL(); + url.setOrientation(orientation); + %> + <link id="${skinConfig.id}" rel="stylesheet" type="text/css" href="$url" /> + <%}%> + <%for(portletSkin in portletSkins) { + def url = portletSkin.createURL(); + url.setOrientation(orientation); + %> + <link id="${portletSkin.id}" rel="stylesheet" type="text/css" href= "$url" /> + <%}%> + <script type="text/javascript"> + // This variable must be used only to initialize other variables otherwise + // please use eXo.env.portal.context or eXo.env.portal.context instead + // Those 2 last variables cannot be used to initialize variables because + // we cannot be sure that they will be initialized before initializing your script + var currentContext = '<%=docBase%>' ; + </script> + <%if(org.exoplatform.commons.utils.PropertyManager.isDevelopping()) { + for(path in scriptsPaths) { %> + <script type="text/javascript" src="<%=path%>"></script> + <%}%> + <script type="text/javascript"> + eXo.developing = true ; + </script> - <%} else {%> - <script type="text/javascript" src="<%=docBase%>/javascript/merged.js"></script> - <% - for(path in scriptsPaths) { - if(path.startsWith("http") || path.startsWith("https")) {%> - <script type="text/javascript" src="<%=path%>"></script> - <%} - } - }%> - <script type="text/javascript"> - eXo.env.portal.context = "<%=docBase%>" ; - <%if(rcontext.getAccessPath() == 0) {%>eXo.env.portal.accessMode = "public" ;<%} - else - {%>eXo.env.portal.accessMode = "private" ;<%}%> - eXo.env.portal.portalName = "<%=rcontext.getPortalOwner()%>" ; - eXo.env.server.context = "<%=docBase%>" ; - eXo.env.server.portalBaseURL = "<%=rcontext.getRequest().getRequestURI()%>" ; - eXo.env.server.portalURLTemplate = "<%=uicomponent.getPortalURLTemplate()%>" ; - eXo.env.client.skin = "$skin" ; - <% - UIPortal portal = uicomponent.findFirstComponentOfType(UIPortal.class); - String sessionAliveLevel = (portal == null ? null : portal.sessionAlive) ; - boolean canKeepState = sessionAliveLevel == null ? false : !sessionAliveLevel.equals(PortalProperties.SESSION_NEVER) ; - %> - eXo.portal.portalMode = <%= uicomponent.getModeState() %>; - eXo.session.level = "$sessionAliveLevel"; - eXo.session.canKeepState = $canKeepState; - eXo.session.isOpen = $uicomponent.isSessionOpen ; - eXo.session.itvTime = ${((PortalRequestContext)rcontext).getRequest().getSession().getMaxInactiveInterval()} ; - </script> - <script type="text/javascript" src="/eXoResources/javascript/eXo/i18n/I18NMessage.js"></script> - <script type="text/javascript" src="/eXoResources/javascript/eXo/i18n/MessageResource_<%=lang%>.js"></script> + <%} else {%> + <script type="text/javascript" src="<%=docBase%>/javascript/merged.js"></script> + <% + for(path in scriptsPaths) { + if(path.startsWith("http") || path.startsWith("https")) {%> + <script type="text/javascript" src="<%=path%>"></script> + <%} + } + }%> + <script type="text/javascript"> + eXo.env.portal.context = "<%=docBase%>" ; + <%if(rcontext.getAccessPath() == 0) {%>eXo.env.portal.accessMode = "public" ;<%} + else + {%>eXo.env.portal.accessMode = "private" ;<%}%> + eXo.env.portal.portalName = "<%=rcontext.getPortalOwner()%>" ; + eXo.env.server.context = "<%=docBase%>" ; + eXo.env.server.portalBaseURL = "<%=rcontext.getRequest().getRequestURI()%>" ; + eXo.env.server.portalURLTemplate = "<%=uicomponent.getPortalURLTemplate()%>" ; + eXo.env.client.skin = "$skin" ; + <% + UIPortal portal = uicomponent.findFirstComponentOfType(UIPortal.class); + String sessionAliveLevel = (portal == null ? null : portal.sessionAlive) ; + boolean canKeepState = sessionAliveLevel == null ? false : !sessionAliveLevel.equals(PortalProperties.SESSION_NEVER) ; + %> + eXo.portal.portalMode = <%= uicomponent.getModeState() %>; + eXo.session.level = "$sessionAliveLevel"; + eXo.session.canKeepState = $canKeepState; + eXo.session.isOpen = <%=uicomponent.isSessionOpen()%> ; + eXo.session.itvTime = ${((PortalRequestContext)rcontext).getRequest().getSession().getMaxInactiveInterval()} ; + </script> + <script type="text/javascript" src="/eXoResources/javascript/eXo/i18n/I18NMessage.js"></script> + <script type="text/javascript" src="/eXoResources/javascript/eXo/i18n/MessageResource_<%=lang%>.js"></script> <% def headerElements = rcontext.getExtraMarkupHeadersAsStrings(); @@ -111,39 +109,24 @@ %> </head> - <body style="height: 100%;"> - <% - /*Hide All Popup Menu when click on document*/ - rcontext.getJavascriptManager().addOnLoadJavascript('eXo.core.DOMUtil.hideElements'); - //rcontext.getJavascriptManager().addOnResizeJavascript('eXo.core.UIMaskLayer.resizeMaskLayer'); - %> + <body style="height: 100%;"> + <% + /*Hide All Popup Menu when click on document*/ + rcontext.getJavascriptManager().addOnLoadJavascript('eXo.core.DOMUtil.hideElements'); + //rcontext.getJavascriptManager().addOnResizeJavascript('eXo.core.UIMaskLayer.resizeMaskLayer'); + %> <div class="$uicomponent.skin" id="UIPortalApplication" style="!height: 100%;"> - + <div class="AjaxLoadingMask" id="AjaxLoadingMask" style="display: none; margin: auto;"> - <div class="LoadingContainer"> - <div class="CenterLoadingContainer"> - <div class="LoadingText"><%=_ctx.appRes("UIPortalApplication.label.Loading")%></div> - <div class="LoadingProgressBar"><span></span></div> - - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="javascript:ajaxAbort();" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIPortalApplication.label.Abort")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> - </div> - - </div> - </div> - </div> + <div class="LoadingContainer"> + <div class="LoadingText"><%=_ctx.appRes("UIPortalApplication.label.Loading")%></div> + <span class="LoadingProgressBar"></span> + + <div class="UIAction"> + <a href="javascript:ajaxAbort();" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIPortalApplication.label.Abort")%></a> + </div> + + </div> + </div> + Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIConfirmation.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -41,95 +41,49 @@ void printMessage(String message, String messageType) { - println "<div class=\"UITabContent\">"; - println " <div class=\"PopupMessageBox\">"; - println " <div class=\"$messageType\">"; - println " <div class=\"PopupMessageContainer\">"; - println " <div class=\"MessageContainer\">"; - println " <div class=\"PopupIcon ${messageType}Icon\"><span></span></div>"; - println " <div class=\"PopupMessage\">"; + println " <ul class=\"UITabContent PopupMessageBox $messageType\">"; + println " <li class=\"MessageContainer\">"; + println " <span class=\"PopupIcon ${messageType}Icon\">"; println message; - println " </div>"; - println " <div style=\"clear:left\"><span></span></div>"; - println " </div>"; - println " </div>"; - println " </div>"; - println " </div>"; - println "</div>"; - } + println " </span>"; + println " </li>"; + println " </ul>"; + } void printAction(List actions) { for(act in actions) { - println "<td>"; - println " <div onclick="+uicomponent.event("Click", act.getEventId())+" class=\"ActionButton LightBlueStyle\">"; - println " <div class=\"ButtonLeft\">"; - println " <div class=\"ButtonRight\">"; - println " <div class=\"ButtonMiddle\">"; - println " <a href=\"javascript:void(0);\"> ${act.getActionKey()} </a>"; - println " </div>"; - println " </div>"; - println " </div>"; - println " </div>"; - println "</td>"; + println " <a href=\"javascript:void(0);\" onclick="+uicomponent.event("Click", act.getEventId())+" class=\"ActionButton LightBlueStyle\"> ${act.getActionKey()} </a>"; } } %> - <div class="UIPopupWindow UIDragObject" id="$popupId" style="width: 550px; display: none;"> - <div class="ExoMessageDecorator"> - <div class="TopLeftCornerDecorator"> - <div class="TopRightCornerDecorator"> - <div class="TopCenterDecorator"> - <div class="OverflowContainer"> - <div class="PopupTitleIcon"><span></span></div> - <div class="CloseButton" title="<%=_ctx.appRes("UIConfirmation.Close")%>" onclick="<%=uicomponent.event("Close")%>"><span></span></div> - <div class="PopupTitle"><%= _ctx.appRes("UIConfirmation.title.exoMessages") %></div> - </div> + <div class="UIPopupWindow UIDragObject ExoMessageDecorator" id="$popupId" style="width: 550px; display: none;"> + <div class="OverflowContainer ClearFix"> + <span class="PopupTitleIcon"></span> + <a class="CloseButton" title="<%=_ctx.appRes("UIConfirmation.Close")%>" onclick="<%=uicomponent.event("Close")%>"></a> + <span class="PopupTitle"><%= _ctx.appRes("UIConfirmation.title.exoMessages") %></span> + </div> + + <div class="UIWindowContent"> + <div class="PopupContent UIPopupMessages"> + <div class="UIHorizontalTabs"> + <div class="TabsContainer"> + <% + boolean flag = true + flag = printTab(message, "Warning", flag); + %> </div> </div> - </div> - - <div class="MiddleLeftSideDecorator"> - <div class="MiddleRightSideDecorator"> - <div class="MiddleCenterDecorator"> - <div class="UIWindowContent"> - <div class="PopupContent"> - <div class="UIPopupMessages"> - <div class="UIHorizontalTabs"> - <div class="TabsContainer"> - <% - boolean flag = true - flag = printTab(message, "Warning", flag); - %> - </div> - </div> - <div class="UITabContentContainer"> - <% - printMessage(message, "ErrorMessage"); - %> - </div> - <div class="MessageActionBar"> - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <% - printAction(actions); - %> - </tr> - </table> - </div> - </div> - </div> - </div> - </div> - </div> + <div class="UITabContentContainer"> + <% + printMessage(message, "ErrorMessage"); + %> </div> - </div> - <div><span></span></div> - <div class="BottomLeftCornerDecorator"> - <div class="BottomRightCornerDecorator"> - <div class="BottomCenterDecorator"><span></span></div> + <div class="UIAction MessageActionBar"> + <% + printAction(actions); + %> </div> </div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -48,15 +48,11 @@ style = ""; isSelected = true; } - println "<div class=\"UITabContent\" $style>"; - println " <div class=\"PopupMessageBox\">"; - println " <div class=\"$messType\">"; - println " <div class=\"PopupMessageContainer\">"; + println " <ul class=\"UITabContent PopupMessageBox $messType\" $style>"; for(mess in messages) { if(mess.messageKey == null) continue; - println " <div class=\"MessageContainer\">"; - println " <div class=\"PopupIcon ${messType}Icon\"><span></span></div>"; - println " <div class=\"PopupMessage\">"; + println " <li class=\"MessageContainer\">"; + println " <span class=\"PopupIcon ${messType}Icon\">"; String msgValue = _ctx.appRes(mess.messageKey); Object[] msgArguments = mess.getMessageAruments(); if(msgArguments != null && msgArguments.length > 0) { @@ -72,96 +68,49 @@ } EntityEncoder encoder = EntityEncoder.FULL; msgValue = encoder.encode(msgValue); - println msgValue; - println " </div>"; - println " <div style=\"clear:left\"><span></span></div>"; - println " </div>"; - } - println " </div>"; - println " </div>"; - println " </div>"; - println " </div>"; - return isSelected; + println msgValue; + + println " </span>"; + println " </li>"; + } + println " </ul>"; + return isSelected; } %> - <div class="UIPopupWindow UIDragObject" id="$popupId" style="width: 550px; display: none;"> - <div class="ExoMessageDecorator"> - <div class="TopLeftCornerDecorator"> - <div class="TopRightCornerDecorator"> - <div class="TopCenterDecorator"> - <div class="OverflowContainer"> - <div class="PopupTitleIcon"><span></span></div> - <div class="CloseButton" title="<%=_ctx.appRes("UIPopupMessages.Close")%>" onclick="<%=uicomponent.event("Close")%>"><span></span></div> - <div class="PopupTitle"><%=_ctx.appRes("UIPopupMessages.title.exoMessages")%></div> - </div> - </div> - </div> + <div class="UIPopupWindow UIDragObject ExoMessageDecorator" id="$popupId" style="width: 550px; display: none;"> + <div class="OverflowContainer ClearFix"> + <span class="PopupTitleIcon"></span> + <a class="CloseButton" title="<%=_ctx.appRes("UIPopupMessages.Close")%>" onclick="<%=uicomponent.event("Close")%>"></a> + <span class="PopupTitle"><%=_ctx.appRes("UIPopupMessages.title.exoMessages")%></span> </div> - <div class="MiddleLeftSideDecorator"> - <div class="MiddleRightSideDecorator"> - <div class="MiddleCenterDecorator"> - - <div class="UIWindowContent"> - <div class="PopupContent"> - <div class="UIPopupMessages"> - - <div class="UIHorizontalTabs"> - <div class="TabsContainer"> - <% - boolean flag = false; - flag = printTab(errors, "Error", flag); - flag = printTab(warnings, "Warning", flag); - flag = printTab(infos, "Info", flag); - %> - </div> - </div> - - <div class="UITabContentContainer"> - <% - flag = false; - flag = printMessages(errors, "ErrorMessage", flag); - flag = printMessages(warnings, "WarningMessage", flag); - flag = printMessages(infos, "InfoMessage", flag); - %> - </div> - <div class="MessageActionBar"> - - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("Close")%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIPopupMessages.button.ok")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> - </div> - - </div> - - </div> - </div> + <div class="UIWindowContent"> + <div class="PopupContent UIPopupMessages"> + <div class="UIHorizontalTabs"> + <div class="TabsContainer"> + <% + boolean flag = false; + flag = printTab(errors, "Error", flag); + flag = printTab(warnings, "Warning", flag); + flag = printTab(infos, "Info", flag); + %> </div> - </div> - </div> + + <div class="UITabContentContainer"> + <% + flag = false; + flag = printMessages(errors, "ErrorMessage", flag); + flag = printMessages(warnings, "WarningMessage", flag); + flag = printMessages(infos, "InfoMessage", flag); + %> + </div> + <div class="UIAction MessageActionBar"> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Close")%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIPopupMessages.button.ok")%></a> + </div> + </div> </div> - <div><span></span></div> - <div class="BottomLeftCornerDecorator"> - <div class="BottomRightCornerDecorator"> - <div class="BottomCenterDecorator"><span></span></div> - </div> - </div> - </div> </div> <% rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.init('$popupId', false, null, null, $uicomponent.showMask);"); Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIPopupWindow.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIPopupWindow.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIPopupWindow.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -32,40 +32,17 @@ if(uicomponent.isShow()) show = "block"; %> -<div class="UIPopupWindow UIDragObject" exo:minWidth="200" exo:minHeight="200" id="$popupId" style="$widthStyle display: $show;"> - <div class="NormalStyle"> - <div class="TopLeftCornerDecorator"> - <div class="TopRightCornerDecorator"> - <div class="TopCenterDecorator"> - <div class="OverflowContainer"> - <div class="PopupTitleIcon"><span></span></div> - <%if( true) {%> - <!-- <div class="CloseButton" title="Close Window" onclick="<%=uicomponent.event("ClosePopup")%>"><span></span></div> --> - <div class="CloseButton" title="<%=_ctx.appRes("UIPopupWindow.Close")%>" onclick="<%=uicomponent.event(uicomponent.getCloseEvent())%>"><span></span></div> - <% } else { %> - <div class="PopupTitleIconRight"><span></span></div> - <% } %> - <div class="PopupTitle"><%=_ctx.appRes(rsId + ".title."+ title)%></div> - </div> - </div> - </div> - </div> - <div class="MiddleLeftSideDecorator"> - <div class="MiddleRightSideDecorator"> - <div class="MiddleCenterDecorator"> - <div class="UIWindowContent"> - <div style="width: 100%;"><div class="PopupContent" style="$heightStyle"><% uicomponent.renderChildren(); %></div></div> - </div> - </div> - </div> - </div> - <div><span></span></div> - <div class="BottomLeftCornerDecorator"> - <div class="BottomRightCornerDecorator"> - <div class="BottomCenterDecorator"> - <div class="ResizeButton"><span></span></div> - </div> - </div> - </div> +<div class="UIPopupWindow UIDragObject NormalStyle" exo:minWidth="200" exo:minHeight="200" id="$popupId" style="$widthStyle display: $show;"> + <div class="OverflowContainer ClearFix"> + <span class="PopupTitleIcon"></span> + <%if (showCloseButton) {%> + <a class="CloseButton" title="<%=_ctx.appRes("UIPopupWindow.Close")%>" onclick="<%=uicomponent.event(uicomponent.getCloseEvent())%>"></a> + <% } else { %> + <div class="PopupTitleIconRight"><span></span></div> + <% } %> + <span class="PopupTitle"><%=_ctx.appRes(rsId + ".title."+ title)%></span> </div> -</div> \ No newline at end of file + <div class="UIWindowContent"> + <div class="PopupContent" style="$heightStyle"><% uicomponent.renderChildren(); %></div> + </div> +</div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -61,62 +61,28 @@ <div class="ActionBar"> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <% if (uicomponent.isShowActions()) { %> - <div onclick="<%=uicomponent.event("Abort", "");%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".label.abort")%></a> - </div> - </div> - </div> - </div> - <% - String action = "next"; - if(step == children.size()){ - action = "done"; - actionLink = uicomponent.event("ViewStep" + String.valueOf(step+1), ""); - } else { - actionLink = uicomponent.url("ViewStep" + String.valueOf(step+1)); - } - %> - - <div onclick="$actionLink" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <%=_ctx.appRes(uicomponent.getId() + ".label."+action)%> - </div> - </div> - </div> - </div> - - <% - int showBack = step; - if (uicomponent.getClass().getName().contains("Edit")) showBack++; - if(showBack > 2) { - actionLink = uicomponent.url("ViewStep" + String.valueOf(step-1)); - String display = "LightBlueStyle"; - %> - <div onclick="$actionLink" class="ActionButton $display"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <%=_ctx.appRes(uicomponent.getId() + ".label.back")%> - </div> - </div> - </div> - </div> - <% } %> - - - <%} // End if (step != 3)%> - </td> - </tr> - </table> + <% if (uicomponent.isShowActions()) { %> + <a href="javascript:void(0);" onclick="<%=uicomponent.event("Abort", "");%>" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".label.abort")%></a> + <% + String action = "next"; + if(step == children.size()){ + action = "done"; + actionLink = uicomponent.event("ViewStep" + String.valueOf(step+1), ""); + } else { + actionLink = uicomponent.url("ViewStep" + String.valueOf(step+1)); + } + %> + <a href="javascript:void(0);" onclick="$actionLink" class="ActionButton LightBlueStyle"><%=_ctx.appRes(uicomponent.getId() + ".label."+action)%></a> + <% + int showBack = step; + if (uicomponent.getClass().getName().contains("Edit")) showBack++; + if(showBack > 2) { + actionLink = uicomponent.url("ViewStep" + String.valueOf(step-1)); + String display = "LightBlueStyle"; + %> + <a onclick="$actionLink" class="ActionButton $display"><%=_ctx.appRes(uicomponent.getId() + ".label.back")%></a> + <% } %> + <%} // End if (step != 3)%> </div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -27,26 +27,12 @@ %> </table> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <% for(action in uicomponent.getActions()) { - String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action); - String link = uicomponent.event(action); - %> - <div onclick="$link" class="ActionButton LightBlueStyle" onmouseover="this.style.color = '#058ee6'" onmouseout="this.style.color='black'"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);">$actionLabel</a> - </div> - </div> - </div> - </div> - <%}%> - </td> - </tr> - </table> + <% for(action in uicomponent.getActions()) { + String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action); + String link = uicomponent.event(action); + %> + <a href="javascript:void(0);" onclick="$link" class="ActionButton LightBlueStyle">$actionLabel</a> + <%}%> </div> </div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIFormInputThemeSelector.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIFormInputThemeSelector.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIFormInputThemeSelector.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -11,7 +11,7 @@ def uiParentComponent = uicomponent.getParent() ; %> <div class="UIItemSelector UIFormInputThemeSelector" id="$uicomponent.id"> - <div class="LeftColumnStyle"> + <div class="LeftColumnStyle ClearFix"> <div class="ItemListContainer"><%uicomponent.renderChild(UIItemThemeSelector.class);%></div> <div class="ItemDetailList"> <div class="ItemDetailTitle"> @@ -20,7 +20,6 @@ <div class="SetDefault" onclick="eXo.webui.UIFormInputThemeSelector.setDefaultTheme(this,'DefaultTheme')"> <a href="#"><%= _ctx.appRes(uiParentComponent.getId() + "." + uicomponent.getId() + ".title.SetDefault") %></a> </div> - <div class="ClearBoth"><span></span></div> </div> <div class="DetailView"> <% @@ -31,16 +30,13 @@ <div class="UIThemeSelector $selectedThemeName"> <div class="WindowBarLeft"> <div class="WindowBarRight"> - <div class="WindowBarCenter"> - <div class="FixHeight"> + <div class="WindowBarCenter ClearFix"> <div class="ControlIcon MaximizedIcon"><span></span></div> <div class="ControlIcon RestoreIcon"><span></span></div> <div class="ControlIcon MinimizedIcon"><span></span></div> - <div class="PortletIcon WindowPortletIcon WindowPortletInfo"> - <div class="PortletName">Title</div> + <div class="PortletIcon WindowPortletIcon WindowPortletInfo PortletName"> + Title </div> - <div class="ClearBoth"><span></span></div> - </div> </div> </div> </div> @@ -55,13 +51,10 @@ <div class="BottomDecoratorLeft"> <div class="BottomDecoratorRight"> - <div class="BottomDecoratorCenter"> - <div class="FixHeight"> - <div class="ResizeArea" title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div> + <div class="BottomDecoratorCenter ClearFix"> + <div class="ResizeArea" title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div> <div class="Information">Done</div> - <div class="ClearRight"><span></span></div> - </div> - </div> + </div> </div> </div> @@ -70,6 +63,5 @@ </div> </div> - <div class="ClearLeft"></div> </div> </div> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIFormTabPane.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIFormTabPane.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIFormTabPane.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -55,26 +55,12 @@ <%}%> </div> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <%for(action in uicomponent.getActions()) { - String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action); - String link = uicomponent.event(action); - %> - <div onclick="$link" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);">$actionLabel</a> - </div> - </div> - </div> - </div> - <%}%> - </td> - </tr> - </table> + <%for(action in uicomponent.getActions()) { + String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action); + String link = uicomponent.event(action); + %> + <a href="javascript:void(0);" onclick="$link" class="ActionButton LightBlueStyle">$actionLabel</a> + <%}%> </div> </div> <%uiform.end()%> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -37,26 +37,12 @@ <%//Rerender this component with the new structure%> <%// start render action%> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <% for(action in uicomponent.getActions()) { - String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action) - String link = uicomponent.event(action); - %> - <div onclick="$link" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:window.scroll(0,0);">$actionLabel</a> - </div> - </div> - </div> - </div> - <%}%> - </td> - </tr> - </table> + <% for(action in uicomponent.getActions()) { + String actionLabel = _ctx.appRes(uicomponent.getName() + ".action." + action) + String link = uicomponent.event(action); + %> + <a href="javascript:window.scroll(0,0);" onclick="$link" class="ActionButton LightBlueStyle">$actionLabel</a> + <%}%> </div> <%// end render action%> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIItemThemeSelector.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIItemThemeSelector.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/UIItemThemeSelector.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -22,15 +22,12 @@ <div class="WindowBarLeft"> <div class="WindowBarRight"> - <div class="WindowBarCenter"> - <div class="FixHeight"> - <div class="ControlIcon MaximizedIcon"><span></span></div> - <div class="ControlIcon RestoreIcon"><span></span></div> - <div class="ControlIcon MinimizedIcon"><span></span></div> - <div class="PortletIcon WindowPortletIcon WindowPortletInfo"> - <div class="PortletName">Title</div> - </div> - <div class="ClearBoth"><span></span></div> + <div class="WindowBarCenter ClearFix"> + <div class="ControlIcon MaximizedIcon"><span></span></div> + <div class="ControlIcon RestoreIcon"><span></span></div> + <div class="ControlIcon MinimizedIcon"><span></span></div> + <div class="PortletIcon WindowPortletIcon WindowPortletInfo PortletName"> + Title </div> </div> </div> @@ -46,12 +43,9 @@ <div class="BottomDecoratorLeft"> <div class="BottomDecoratorRight"> - <div class="BottomDecoratorCenter"> - <div class="FixHeight"> - <div class="ResizeArea" title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div> - <div class="Information">Done</div> - <div class="ClearRight"><span></span></div> - </div> + <div class="BottomDecoratorCenter ClearFix"> + <div class="ResizeArea" title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div> + <div class="Information">Done</div> </div> </div> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -142,33 +142,19 @@ %> <%if(actions != null && actions.length > 0) { %> <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <%for(i in 0..actions.length -1) { - if(actionValues != null && actionValues.length > 0) { - if(actionValues[i] != null) { %> - <div class="ActionButton LightBlueStyle" onclick="javascript:eXo.webui.UIForm.submitEvent('<%=formName%>','<%=actions[i]%>','&objectId=<%=actionValues[i]%>');"> - <%} else { %> - <div class="ActionButton LightBlueStyle" onclick="javascript:eXo.webui.UIForm.submitForm('<%=formName%>','<%=actions[i]%>', true);"> - <% - } - } else { - %> - <div class="ActionButton LightBlueStyle" onclick="javascript:eXo.webui.UIForm.submitForm('<%=formName%>','<%=actions[i]%>', true);"> - <%}%> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes(formName + ".action." + actions[i])%></a> - </div> - </div> - </div> - </div> - <%} %> - </td> - </tr> - </table> + <%for(i in 0..actions.length -1) { + if(actionValues != null && actionValues.length > 0) { + if(actionValues[i] != null) { %> + <a href="javascript:void(0);" class="ActionButton LightBlueStyle" onclick="javascript:eXo.webui.UIForm.submitEvent('<%=formName%>','<%=actions[i]%>','&objectId=<%=actionValues[i]%>');"><%=_ctx.appRes(formName + ".action." + actions[i])%></a> + <%} else { %> + <a href="javascript:void(0);" class="ActionButton LightBlueStyle" onclick="javascript:eXo.webui.UIForm.submitForm('<%=formName%>','<%=actions[i]%>', true);"><%=_ctx.appRes(formName + ".action." + actions[i])%></a> + <% + } + } else { + %> + <a href="javascript:void(0);" class="ActionButton LightBlueStyle" onclick="javascript:eXo.webui.UIForm.submitForm('<%=formName%>','<%=actions[i]%>', true);"><%=_ctx.appRes(formName + ".action." + actions[i])%></a> + <%}%> + <%} %> </div> <%} %> </div> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl 2011-09-12 22:09:39 UTC (rev 7360) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl 2011-09-12 22:59:10 UTC (rev 7361) @@ -137,23 +137,9 @@ </div> <% if(isMulti) { %> <div class="UIAction"> - <table class="ActionContainer" align="center"> - <tr> - <td align="center"> - <%for(String action : uicomponent.getActions()){%> - <a href="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <%=uiform.getLabel(action)%> - </div> - </div> - </div> - </a> - <%}%> - </td> - </tr> - </table> + <%for(String action : uicomponent.getActions()){%> + <a href="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle"><%=uiform.getLabel(action)%></a> + <%}%> </div> <% } %> <%uicomponent.renderChild(UIPopupWindow.class);%>