gatein SVN: r2361 - portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent.
by do-not-reply@jboss.org
Author: thanh.do
Date: 2010-03-25 04:48:27 -0400 (Thu, 25 Mar 2010)
New Revision: 2361
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css
Log:
GTNPORTAL-885:UI : Edit page has 2 different edit buttons
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2010-03-25 08:29:18 UTC (rev 2360)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2010-03-25 08:48:27 UTC (rev 2361)
@@ -17,98 +17,98 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-.UIPortlet .LAYOUT-BLOCK {
- padding: 5px;
-}
-
+.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;
-}
-
+ 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: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 20px; height: 20px;
- background: url('background/Pen.gif') no-repeat top;
- margin: 4px 3px 0px 5px; /* orientation=lt */
- margin: 4px 5px 0px 3px; /* orientation=rt */
-}
-
+ float: right; /* orientation=lt */
+ float: left; /* 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: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 20px; height:20px;
- background: url('background/Close.gif') no-repeat bottom;
- margin: 0px 4px 0px 0px; /* orientation=lt */
- margin: 0px 0px 0px 4px; /* orientation=rt */
-}
-
-.UIPortlet .SelectedContainerBlock {
- background: white;
- border-top: 1px solid #91bcdd;
-}
-
-.UIPortlet .SelectedContainerBlock .LeftContainerBlock {
- background: url('background/BgContainerBlock.gif') no-repeat left top;
- padding-left: 1px;
-}
-
-.UIPortlet .SelectedContainerBlock .RightContainerBlock {
- background: url('background/BgContainerBlock.gif') no-repeat right top;
- padding: 4px;
-}
-
-.UIPortlet .NewLayer {
- background: #d1dce5;
- filter: alpha(opacity=80);
- opacity: 0.8;
- width: 100%; height: 100%;
-}
-
-/*##############################- PortletLayoutDecorator -################################*/
-
-.PortletLayoutDecorator {
-}
-
-.PortletLayoutDecorator .LPortletLayoutDecorator {
- background: url('background/PortletLayoutDecorator.gif') no-repeat left top;
- padding: 0px 0px 0px 12px;
-}
-
-.PortletLayoutDecorator .RPortletLayoutDecorator {
- background: url('background/PortletLayoutDecorator.gif') no-repeat right top;
- padding-right: 12px;
-}
-
-.PortletLayoutDecorator .CPortletLayoutDecorator {
- background: url('background/PortletLayoutDecorator.gif') repeat-x center -89px;
-}
-
+ float: right; /* orientation=lt */
+ float: left; /* orientation=rt */
+ width: 20px; height:20px;
+ background: url('background/Close.gif') no-repeat bottom;
+ margin: 0px 0px 0px 2px; /* orientation=lt */
+ margin: 0px 2px 0px 0px; /* orientation=rt */
+}
+
+.UIPortlet .SelectedContainerBlock {
+ background: white;
+ border-top: 1px solid #91bcdd;
+}
+
+.UIPortlet .SelectedContainerBlock .LeftContainerBlock {
+ background: url('background/BgContainerBlock.gif') no-repeat left top;
+ padding-left: 1px;
+}
+
+.UIPortlet .SelectedContainerBlock .RightContainerBlock {
+ background: url('background/BgContainerBlock.gif') no-repeat right top;
+ padding: 4px;
+}
+
+.UIPortlet .NewLayer {
+ background: #d1dce5;
+ filter: alpha(opacity=80);
+ opacity: 0.8;
+ width: 100%; height: 100%;
+}
+
+/*##############################- PortletLayoutDecorator -################################*/
+
+.PortletLayoutDecorator {
+}
+
+.PortletLayoutDecorator .LPortletLayoutDecorator {
+ background: url('background/PortletLayoutDecorator.gif') no-repeat left top;
+ padding: 0px 0px 0px 12px;
+}
+
+.PortletLayoutDecorator .RPortletLayoutDecorator {
+ background: url('background/PortletLayoutDecorator.gif') no-repeat right top;
+ padding-right: 12px;
+}
+
+.PortletLayoutDecorator .CPortletLayoutDecorator {
+ background: url('background/PortletLayoutDecorator.gif') repeat-x center -89px;
+}
+
.PortletLayoutDecorator .FixHeight {
height: 69px;
padding: 10px 0;
@@ -119,178 +119,179 @@
.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 .EditPortletPropertiesIcon {
- float: left; /* orientation=lt */
- float: right; /* orientation=rt */
- width: 20px; height: 20px;
- background: url('background/Pen.png') no-repeat top;
- margin: 4px 3px 2px 5px;
-}
-
-.UIContainer .DeletePortletIcon {
- float: left; /* orientation=lt */
- float: right; /* orientation=rt */
- width: 20px; height:20px;
- background: url('background/close.png') no-repeat bottom;
- margin: 4px 4px 2px 0px; /* orientation=lt */
- margin: 4px 0px 2px 4px; /* orientation=rt */
-}
-
-.UIContainer .NewLayer {
- background: #93c0e2;
- filter: alpha(opacity=40);
- opacity: 0.4;
- width: 100%; height: 100%;
-}
-
-/*
-.UIContainer .LAYOUT-CONTAINER {
- background: #f5f5f5;
- border: solid 1px #38acf3;
- padding: 5px;
- margin: 0px 1px;
- min-height: 60px;
-}
-
-* html .UIContainer .LAYOUT-CONTAINER {
- height: 60px;
-}
-
-.UIContainer .UIInfoBar .BlueRoundedStyle {
- padding: 0px; margin: 0px;
- height: 22px;
-}
-*/
-
-.UIContainer .CONTROL-CONTAINER .DragControlArea {
- float: left; /* orientation=lt */
- float: right; /* orientation=rt */
- width: 7px; height: 13px;
- background: url('background/DragBg2x2.gif');
- cursor: move;
- margin: 5px 0px 0px 2px; /* orientation=lt */
- margin: 5px 2px 0px 0px; /* orientation=rt */
-}
-
-.UIContainer .LAYOUT-CONTAINER .UITableColumnContainer {
- background: none;
- border: none;
- margin: auto;
-}
-
-.UIContainer .EditContainerIcon {
- float: right; /* orientation=lt */
- float: left; /* 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 */
-}
-
-.UIContainer .DeleteContainerIcon {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 22px; height: 16px;
- background: url('background/Close.gif') no-repeat bottom;
- margin: 4px 0px 0px 0px; /* orientation=lt */
- margin: 4px 0px 0px 0px; /* orientation=rt */
-}
-
-.UIContainer .ContainerIcon {
- float: left; /* orientation=lt */
- float: right; /* orientation=rt */
- height: 16px; line-height: 16px;
- padding-left: 24px; /* orientation=lt */
- padding-right: 24px; /* orientation=rt */
- margin: 3px 0px 0px 5px; /* orientation=lt */
- margin: 3px 5px 0px 0px; /* orientation=rt */
- background: url('background/DefaultContainerIcon.png') no-repeat;
-}
-
-.UIPortal .LAYOUT-PORTAL {
- /* background: url('background/PortalBackground4x4.gif');*/
- background: white;
- padding: 8px;
- _padding: 8px 0px; /* orientation=rt */
- margin: auto;
- _margin: 0px; /* orientation=rt */
- _width: 99%; /* orientation=rt */
-}
-
-.DragAndDropPreview {
- width: auto; height: 80px;
- background: url('background/DragAndDropPreview4x4.gif');
- border: 1px solid #c4c4c4;
- margin: 0px 12px 10px 12px;
-}
-
-.PortletBlockDecorator {
-
}
+/*############### End Decorator ###################################################*/
-.EdittingContainer {
- padding: 3px;
-}
-
-.EdittingContainer .NormalContainerBlock {
- background: white;
- border: 1px dashed #a2a2a2;
-}
-
-.EdittingContainer .NormalContainerBlock .LeftContainerBlock, .EdittingContainer .OverContainerBlock .NormalContainerBlock .LeftContainerBlock {
- background: none;
-}
-
-.EdittingContainer .NormalContainerBlock .RightContainerBlock, .EdittingContainer .OverContainerBlock .NormalContainerBlock .RightContainerBlock {
- padding: 2px;
- background: none;
-}
-
-.UIContainer .UIPortlet {
- padding: 0px;
+.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 .EditPortletPropertiesIcon {
+ float: right; /* orientation=lt */
+ float: left; /* orientation=rt */
+ width: 20px; height: 20px;
+ background: url('background/Pen.png') no-repeat top;
+ margin: 2px 0px 0px 5px; /* orientation=lt */
+ margin: 2px 5px 0px 0px; /* orientation=rt */
+}
+
+.UIContainer .DeletePortletIcon {
+ float: right; /* orientation=lt */
+ float: left; /* orientation=rt */
+ width: 20px; height:20px;
+ background: url('background/close.png') no-repeat bottom;
+ margin: 1px 0px 0px 2px; /* orientation=lt */
+ margin: 1px 2px 0px 0px; /* orientation=rt */
+}
+
+.UIContainer .NewLayer {
+ background: #93c0e2;
+ filter: alpha(opacity=40);
+ opacity: 0.4;
+ width: 100%; height: 100%;
+}
+
+/*
+.UIContainer .LAYOUT-CONTAINER {
+ background: #f5f5f5;
+ border: solid 1px #38acf3;
+ padding: 5px;
+ margin: 0px 1px;
+ min-height: 60px;
+}
+
+* html .UIContainer .LAYOUT-CONTAINER {
+ height: 60px;
+}
+
+.UIContainer .UIInfoBar .BlueRoundedStyle {
+ padding: 0px; margin: 0px;
+ height: 22px;
+}
+*/
+
+.UIContainer .CONTROL-CONTAINER .DragControlArea {
+ float: left; /* orientation=lt */
+ float: right; /* orientation=rt */
+ width: 7px; height: 13px;
+ background: url('background/DragBg2x2.gif');
+ cursor: move;
+ margin: 5px 0px 0px 2px; /* orientation=lt */
+ margin: 5px 2px 0px 0px; /* orientation=rt */
+}
+
+.UIContainer .LAYOUT-CONTAINER .UITableColumnContainer {
+ background: none;
+ border: none;
+ margin: auto;
+}
+
+.UIContainer .EditContainerIcon {
+ float: right; /* orientation=lt */
+ float: left; /* 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 */
+}
+
+.UIContainer .DeleteContainerIcon {
+ float: right; /* orientation=lt */
+ float: left; /* orientation=rt */
+ width: 22px; height: 16px;
+ background: url('background/Close.gif') no-repeat bottom;
+ margin: 4px 0px 0px 0px; /* orientation=lt */
+ margin: 4px 0px 0px 0px; /* orientation=rt */
+}
+
+.UIContainer .ContainerIcon {
+ float: left; /* orientation=lt */
+ float: right; /* orientation=rt */
+ height: 16px; line-height: 16px;
+ padding-left: 24px; /* orientation=lt */
+ padding-right: 24px; /* orientation=rt */
+ margin: 3px 0px 0px 5px; /* orientation=lt */
+ margin: 3px 5px 0px 0px; /* orientation=rt */
+ background: url('background/DefaultContainerIcon.png') no-repeat;
+}
+
+.UIPortal .LAYOUT-PORTAL {
+ /* background: url('background/PortalBackground4x4.gif');*/
+ background: white;
+ padding: 8px;
+ _padding: 8px 0px; /* orientation=rt */
+ margin: auto;
+ _margin: 0px; /* orientation=rt */
+ _width: 99%; /* orientation=rt */
+}
+
+.DragAndDropPreview {
+ width: auto; height: 80px;
+ background: url('background/DragAndDropPreview4x4.gif');
+ border: 1px solid #c4c4c4;
+ margin: 0px 12px 10px 12px;
+}
+
+.PortletBlockDecorator {
+
+}
+
+.EdittingContainer {
+ padding: 3px;
+}
+
+.EdittingContainer .NormalContainerBlock {
+ background: white;
+ border: 1px dashed #a2a2a2;
+}
+
+.EdittingContainer .NormalContainerBlock .LeftContainerBlock, .EdittingContainer .OverContainerBlock .NormalContainerBlock .LeftContainerBlock {
+ background: none;
+}
+
+.EdittingContainer .NormalContainerBlock .RightContainerBlock, .EdittingContainer .OverContainerBlock .NormalContainerBlock .RightContainerBlock {
+ padding: 2px;
+ background: none;
+}
+
+.UIContainer .UIPortlet {
+ padding: 0px;
+}
+
.UIPortletMask {
opacity: 0;
filter: alpha(opacity=0);
background: #ffffff;
-}
-
-.EdittingContainer .OverContainerBlock {
- border: 1px solid #b8babf;
+}
+
+.EdittingContainer .OverContainerBlock {
+ border: 1px solid #b8babf;
background: none;
- height: 100%;
-}
-
-.EdittingContainer .OverContainerBlock .LeftContainerBlock {
- background: white;
-}
-
-.EdittingContainer .OverContainerBlock .RightContainerBlock {
- background: none;
- padding: 2px;
+ height: 100%;
}
+.EdittingContainer .OverContainerBlock .LeftContainerBlock {
+ background: white;
+}
+
+.EdittingContainer .OverContainerBlock .RightContainerBlock {
+ background: none;
+ padding: 2px;
+}
+
.ProtectedContainer .ProtectedContent {
opacity: 0.3;
filter: alpha(opacity=80);
14 years, 9 months
gatein SVN: r2360 - in portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard: background and 1 other directory.
by do-not-reply@jboss.org
Author: thanh.do
Date: 2010-03-25 04:29:18 -0400 (Thu, 25 Mar 2010)
New Revision: 2360
Added:
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/IconClose.gif
Modified:
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css
Log:
GTNPORTAL-958:Lost images in navgation when show dashboard portlet
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css 2010-03-24 19:08:20 UTC (rev 2359)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css 2010-03-25 08:29:18 UTC (rev 2360)
@@ -41,12 +41,14 @@
}
.UITabPaneDashboard .UIHorizontalTabs .UITab span {
- margin: 3px 10px;
+ margin: 0px 10px;
+ font-weight: normal;
}
.UITabPaneDashboard .UIHorizontalTabs .UITab .CloseIcon {
background: url('background/IconClose.gif') no-repeat left top;
- width: 16px; height: 16px;
+ width: 16px;
+ height: 16px;
cursor: pointer;
}
@@ -60,21 +62,26 @@
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .LeftTab {
- background: url(background/TabDashboard.gif) no-repeat left -44px;
+ background: #E6E6E6;
+ border: 1px solid #DADADA;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .RightTab {
- background: url(background/TabDashboard.gif) no-repeat right -44px;
+ background: none;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab {
- background: url(background/TabDashboard.gif) repeat-x left -66px;
- line-height: 22px;
+ background: none;
+ line-height: 20px;
}
+.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab span {
+ color: #999999;
+}
+
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .LeftTab {
background: #fff;
- border: 1px solid #e5e5e5;
+ border: 1px solid #dadada;
padding: 0px;
}
Added: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/IconClose.gif
===================================================================
(Binary files differ)
Property changes on: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/IconClose.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 9 months
gatein SVN: r2359 - portal/trunk/docs/reference-guide/en/modules/configuration.
by do-not-reply@jboss.org
Author: mstruk
Date: 2010-03-24 15:08:20 -0400 (Wed, 24 Mar 2010)
New Revision: 2359
Modified:
portal/trunk/docs/reference-guide/en/modules/configuration/Authentication_Token_Configuration.xml
portal/trunk/docs/reference-guide/en/modules/configuration/Dashboard_Configuration.xml
portal/trunk/docs/reference-guide/en/modules/configuration/Data_Injector_Configuration.xml
portal/trunk/docs/reference-guide/en/modules/configuration/Database_Configuration.xml
portal/trunk/docs/reference-guide/en/modules/configuration/Default_Portal_Configuration.xml
portal/trunk/docs/reference-guide/en/modules/configuration/JavaScript_Configuration.xml
portal/trunk/docs/reference-guide/en/modules/configuration/Portal_Default_Permission_Configuration.xml
portal/trunk/docs/reference-guide/en/modules/configuration/Predefined_User_Configuration.xml
portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml
Log:
reference-guide edits - second chapter
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Authentication_Token_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Authentication_Token_Configuration.xml 2010-03-24 16:22:20 UTC (rev 2358)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Authentication_Token_Configuration.xml 2010-03-24 19:08:20 UTC (rev 2359)
@@ -11,18 +11,18 @@
<emphasis>Token Service</emphasis> is used in authentication.
</para>
<para>
- The token system prevents user account information being sent in clear text mode for inbound requests. This increases authentication security.
+ The token system prevents user account information being sent in clear text mode within inbound requests. This increases authentication security.
</para>
<para>
- Token service allows administrators to create, delete, retrieve and clean tokens as required. The service also defines a validity period of any given token.
- The token becomes invalid once this period expires. This period can be configured through <emphasis>life-time</emphasis> configuration property.
+ Token service allows administrators to create, delete, retrieve and clean tokens as required.
+ The service also defines a validity period of any given token. The token becomes invalid once this period expires.
</para>
</section>
<section id="sect-Reference_Guide-Authentication_Token_Configuration-Implement_token_services_API">
<title>Implementing the Token Service API</title>
<para>
- All token services used in &PRODUCT;'s authentication must be implemented by subclassing an <emphasis role="bold">AbstractTokenService</emphasis> abstract class.
+ All token services used in &PRODUCT; authentication must be implemented by subclassing an <emphasis role="bold">AbstractTokenService</emphasis> abstract class.
The following <emphasis role="bold">AbstractTokenService</emphasis> methods represent the contract between authentication runtime, and a token service implementation.
</para>
@@ -47,7 +47,7 @@
In the example below, <emphasis>CookieTokenService</emphasis> is a subclass of <emphasis role="bold">AbstractTokenService</emphasis> so it has a property which specifies the validity period of the token.
</para>
<para>
- The token service will initialize this validity property by looking for an <parameter>init-param</parameter> named "<emphasis role="bold">service.configuration</emphasis>".
+ The token service will initialize this validity property by looking for an <parameter>init-param</parameter> named <emphasis role="bold">service.configuration</emphasis>.
</para>
<para>
This property must have three values.
@@ -63,7 +63,7 @@
<type>org.exoplatform.web.security.security.CookieTokenService</type>
<init-params>
<values-param>
- <name>tokenTimeout</name>
+ <name>service.configuration</name>
<value>jcr-token</value>
<value>7</value>
<value>DAY</value>
@@ -91,10 +91,10 @@
</programlistingco>
<para>
- In this case, the service's name is "<emphasis role="bold">jcr-token</emphasis>" and the token's expiration time is one week.
+ In this case, the service name is <emphasis role="bold">jcr-token</emphasis> and the token expiration time is one week.
</para>
<para>
- &PRODUCT; supports <emphasis>four</emphasis> timing units:
+ &PRODUCT; supports <emphasis>four</emphasis> time units:
</para>
<orderedlist numeration="arabic">
<listitem>
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Dashboard_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Dashboard_Configuration.xml 2010-03-24 16:22:20 UTC (rev 2358)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Dashboard_Configuration.xml 2010-03-24 19:08:20 UTC (rev 2359)
@@ -6,7 +6,7 @@
<section id="sect-Reference_Guide-Dashboard_configuration">
<title>Dashboard configuration</title>
<para>
- The following parameters are available controll the Dashboard configuration (when in edit mode):
+ The following parameters are available to control the Dashboard configuration (when in edit mode):
</para>
<formalpara id="form-Reference_Guide-Dashboard_configuration-owner">
<title>owner</title>
@@ -14,17 +14,17 @@
<orderedlist numeration="arabic">
<listitem>
<para>
- if empty, everyone share the same dashboard and can edit it
+ if empty, everyone shares the same dashboard and can edit it
</para>
</listitem>
<listitem>
<para>
- if set to <emphasis>CURRENTUSER</emphasis> , every user has his own dashboard
+ if set to <emphasis>CURRENTUSER</emphasis>, every user has his own dashboard
</para>
</listitem>
<listitem>
<para>
- if set to a username, everyone will see the dashboard of this person
+ if set to a username, everyone shares that user's dashboard
</para>
</listitem>
</orderedlist>
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Data_Injector_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Data_Injector_Configuration.xml 2010-03-24 16:22:20 UTC (rev 2358)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Data_Injector_Configuration.xml 2010-03-24 19:08:20 UTC (rev 2359)
@@ -8,7 +8,7 @@
<section id="sect-Reference_Guide-Data_Injector_Configuration-Data_Injector">
<title>Data Injector</title>
<para>
- <emphasis>Data-injector</emphasis> is a utility to initialize enterprise data for &PRODUCT;. It is packed as a .jar. <!--
+ <emphasis>Data-injector</emphasis> is a utility used to initialize enterprise data for &PRODUCT;. It is packed as a .jar. <!--
and deployed under $TOMCATHOME/lib. It is started
automatically when Tomcat starts.
-->
@@ -18,7 +18,8 @@
<section id="sect-Reference_Guide-Data_Injector_Configuration-OrganizationInitializer">
<title>OrganizationInitializer</title>
<para>
- <emphasis>OrganizationInitializer</emphasis> is the service that allows creating a large organization with many groups and users. It also creates portal navigation and page(s) for each group and each user.
+ <emphasis>OrganizationInitializer</emphasis> is the service that allows creating a large organization with many groups and users.
+ It also creates portal navigation and page(s) for each group and each user.
</para>
<formalpara id="form-Reference_Guide-OrganizationInitializer-Service_configuration_file">
<title>Service configuration file</title>
@@ -162,6 +163,7 @@
<term>FirstName</term>
<listitem>
<para>
+ The user's given name.
</para>
</listitem>
</varlistentry>
@@ -169,7 +171,7 @@
<term>LastName</term>
<listitem>
<para>
- last name.
+ The user's family name.
</para>
</listitem>
</varlistentry>
@@ -185,7 +187,7 @@
<term>Groups</term>
<listitem>
<para>
- A list of the groups that user belongs to.
+ A list of groups that the user belongs to.
</para>
</listitem>
</varlistentry>
@@ -203,10 +205,10 @@
<section id="sect-Reference_Guide-Data_Injector_Configuration-Automatic_Navigation_Creation">
<title>Automatic Navigation Creation</title>
<para>
- The " <literal>auto.create.group.page.navigation</literal>" parameter value is <parameter>true</parameter> or <parameter>false</parameter>. If this value is set to <parameter>true</parameter> it automatically creates portal navigations and pages for each group. If <parameter>false</parameter> it does not.
+ The <literal>auto.create.group.page.navigation</literal> parameter can have a value of either <parameter>true</parameter> or <parameter>false</parameter>. If this value is set to <parameter>true</parameter> it automatically creates portal navigations and pages for each group. If the value is <parameter>false</parameter> it does not.
</para>
<para>
- The "<literal>auto.create.user.page.navigation</literal>" parameter value is the number of pages that are automatically created for each user.
+ The <literal>auto.create.user.page.navigation</literal> parameter value specifies the number of pages that are automatically created for each user.
</para>
</section>
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Database_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Database_Configuration.xml 2010-03-24 16:22:20 UTC (rev 2358)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Database_Configuration.xml 2010-03-24 19:08:20 UTC (rev 2359)
@@ -3,8 +3,6 @@
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
-<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
-%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Database_Configuration">
<title>Database Configuration</title>
@@ -13,10 +11,8 @@
<title>Overview</title>
<para>&PRODUCT; has two different database dependencies. One is the
- identity service configuration, which depends on Hibernate. The other
- database dependency is Java content repository (JCR) service, which
- depends on JDBC API, and can integrate with any existing
- datasource implementation.</para>
+ identity service configuration, which depends on Hibernate. The other is Java content repository (JCR) service, which
+ depends on JDBC API, and can integrate with any existing datasource implementation.</para>
<para>When you change the database configuration for the first time,
GateIn will automatically generate the proper schema (assuming that the
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Default_Portal_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Default_Portal_Configuration.xml 2010-03-24 16:22:20 UTC (rev 2358)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Default_Portal_Configuration.xml 2010-03-24 19:08:20 UTC (rev 2359)
@@ -8,11 +8,11 @@
<section id="sect-Reference_Guide-Default_Portal_Configuration-Overview">
<title>Overview</title>
<para>
- &PRODUCT;'s default home page URL is <literal>http://${hostname}:${port}/portal/</literal>.
+ &PRODUCT; default home page URL is <literal>http://{hostname}:{port}/portal/</literal>.
There may be multiple independent portals deployed in parallel at any given time, each of which has its root
- context (i.e.: <literal>http://${hostname}:${port}/sample-portal/</literal>).
+ context (i.e.: <literal>http://{hostname}:{port}/sample-portal/</literal>).
Each portal is internally composed of one or more, what we again call 'portals'. There needs to be at least
- one such portal - the default one is called 'classic'. When accessing &PRODUCT;'s default home page URL, you
+ one such portal - the default one is called 'classic'. When accessing &PRODUCT; default home page URL, you
are automatically redirected to 'classic' portal.
The default portal performs another important task. When starting up &PRODUCT; for the first time, its
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/JavaScript_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/JavaScript_Configuration.xml 2010-03-24 16:22:20 UTC (rev 2358)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/JavaScript_Configuration.xml 2010-03-24 19:08:20 UTC (rev 2359)
@@ -6,19 +6,23 @@
<section id="sect-Reference_Guide-Javascript_Configuration">
<title>Javascript Configuration</title>
<para>
- Managing Javascript scripts in an application like &PRODUCT; is a critical part of the configuration work. Configuring the scripts correctly will result in a faster response time from the portal.
+ Managing Javascript scripts in an application like &PRODUCT; is a critical part of the configuration work.
+ Configuring the scripts correctly will result in a faster response time from the portal.
</para>
<para>
- Every portlet can have its own javscript code but in many cases it is more convenient to reuse some existing shared libraries. For that reason, &PRODUCT; has a mechanism to easily register the libraries that will be loaded when the first page will be rendered.
+ Every portlet can have its own javscript code but in many cases it is more convenient to reuse some existing
+ shared libraries. For that reason, &PRODUCT; has a mechanism to easily register the libraries that will be loaded
+ when the first page will be rendered.
</para>
<para>
- To do so, every WAR deployed in &PRODUCT; can register the <filename>js</filename> files with the groovy script "<filename>WEB-INF/conf/script/groovy/JavascriptScript.groovy</filename>".
+ To do so, every WAR deployed in &PRODUCT; can register the <filename>.js</filename> files with the groovy script
+ <filename>WEB-INF/conf/script/groovy/JavascriptScript.groovy</filename>. (TODO: this file doesn't seem to exist)
</para>
<para>
The example file below is found in the 01eXoResources.war
</para>
-<programlisting>JavascriptService.addJavascript("eXo", "/javascript/eXo.js", ServletContext);
+<programlisting role="JAVA">JavascriptService.addJavascript("eXo", "/javascript/eXo.js", ServletContext);
/* Animation Javascripts */
JavascriptService.addJavascript("eXo.animation.ImplodeExplode", "/javascript/eXo/animation/ImplodeExplode.js", ServletContext);
/* Application descriptor */
@@ -65,7 +69,7 @@
Note that even registered dedicated javascripts will be merged into a single <literal>merged.js</literal> file when the server loads. This reduces the number of HTTP calls as seen in the home page source code:
</para>
-<programlisting><script type="text/javascript" src="/portal/javascript/merged.js"></script>
+<programlisting role="XML"><script type="text/javascript" src="/portal/javascript/merged.js"></script>
</programlisting>
<para>
Although this optimization is useful for a production environment, it may be easier to deactivate this optimization while debugging javascript problems.
@@ -80,13 +84,25 @@
The property can be passed as a JVM parameter with the <literal>-D</literal> option in your <literal>GateIn.sh</literal> or <literal>GateIn.bat</literal> startup script.
</para>
<para>
- Every javascript file is referenced with a module name of "<literal>eXo.core.DragDrop</literal>" which acts as a namespace. Inside the associated files, global javascript functions are used following the same namespace convention:
+ Every javascript file is associated with a module name which acts as a namespace.
+
+ The module name is passed as a first parameter to JavascriptService.addJavascript() function as in the following example:
+ </para>
+ <programlisting role="JAVA">
+JavascriptService.addJavascript("eXo.core.DragDrop",
+ "/javascript/eXo/core/DragDrop.js", ServletContext);
+ </programlisting>
+ <para>
+ Inside the associated javascript files, functions are exposed as global javascript function variables using the module name.
</para>
-
-<programlisting>eXo.core.DragDrop = new DragDrop() ;
-</programlisting>
+ <para> For example:</para>
+ <programlisting role="JAVA">
+eXo.core.DragDrop = new DragDrop();
+ </programlisting>
<para>
- It is also possible to use the eXo.require() javascript method to lazy load and evaluate some javascript code. This is quite useful from the portlet or widget applications that will use this javascript only once. Otherwise, if the library is reusable in several places it is better to reference it in the groovy file.
+ It is also possible to use <literal>eXo.require()</literal> javascript method to lazy load and evaluate some javascript code.
+ This is quite useful for the portlet or widget applications that will use this javascript only once. Otherwise,
+ if the library is reusable in several places it is better to reference it in the groovy file.
</para>
</section>
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Portal_Default_Permission_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Portal_Default_Permission_Configuration.xml 2010-03-24 16:22:20 UTC (rev 2358)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Portal_Default_Permission_Configuration.xml 2010-03-24 19:08:20 UTC (rev 2359)
@@ -8,7 +8,8 @@
<section id="sect-Reference_Guide-Portal_Default_Permission_Configuration-Overview">
<title>Overview</title>
<para>
- The permission configuration for the portal is defined in the file <filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml </filename> . The component UserACL is described there along with other portal component configurations.
+ The default permission configuration for the portal is defined through <literal>org.exoplatform.portal.config.UserACL</literal>
+ component configuration in the file <filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename>.
</para>
<para>
It defines 5 permissions types:
@@ -26,7 +27,8 @@
<term>portal.creator.groups</term>
<listitem>
<para>
- This list defines all groups that will be able to manage the different portals. Members of this group also have the permission to create new portals. The format is "<literal>membership:/group/subgroup</literal> ".
+ This list defines all groups that will be able to manage the different portals. Members of this group
+ also have the permission to create new portals. The format is <literal>membership:/group/subgroup</literal>.
</para>
</listitem>
</varlistentry>
@@ -34,7 +36,7 @@
<term>navigation.creator.membership.type</term>
<listitem>
<para>
- Defines the membership type of the group managers. The group managers have the permission to create and edit group pages and they can modify the group navigation.
+ Defines the membership type of group managers. The group managers have the permission to create and edit group pages and they can modify the group navigation.
</para>
</listitem>
</varlistentry>
@@ -42,7 +44,7 @@
<term>guests.group</term>
<listitem>
<para>
- Any anonymous user automatically becomes a member of this group whent they enter the public pages.
+ Any anonymous user automatically becomes a member of this group when they enter the public pages.
</para>
</listitem>
</varlistentry>
@@ -50,7 +52,10 @@
<term>access.control.workspace</term>
<listitem>
<para>
- Defines the users that have access to the control workspace. In the demo version the control workspace is accessible only to 'root' and 'john'. They can expand/collapse the workspace at the left hand side. The format is "membership:/group/subgroup", An asterisk '' gives permission to all memberships.
+ Defines the users that have access to the control workspace. In the demo version the control workspace
+ is accessible only to <emphasis>root</emphasis> and <emphasis>john</emphasis>. They can expand/collapse
+ the workspace at the left hand side. The format is <literal>membership:/group/subgroup</literal> -
+ an asterisk '*' gives permission to all memberships.
</para>
</listitem>
</varlistentry>
@@ -94,7 +99,11 @@
<section id="sect-Reference_Guide-Portal_Default_Permission_Configuration-Overwrite_Portal_Default_Permissions">
<title>Overwrite Portal Default Permissions</title>
-
+
+ <para>When creating custom portals and portal extensions it's possible to override the default configuration by
+ using <literal>org.exoplatform.portal.config.PortalACLPlugin</literal>, configuring it as an external-plugin of
+ <literal>org.exoplatform.portal.config.UserACL</literal> service:</para>
+
<programlisting role="XML"><external-component-plugins>
<target-component>org.exoplatform.portal.config.UserACL</target-component>
<component-plugin>
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Predefined_User_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Predefined_User_Configuration.xml 2010-03-24 16:22:20 UTC (rev 2358)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Predefined_User_Configuration.xml 2010-03-24 19:08:20 UTC (rev 2359)
@@ -15,21 +15,28 @@
<section id="sect-Reference_Guide-Predefined_User_Configuration-Plugin_for_adding_users_groups_and_membership_types">
<title>Plugin for adding users, groups and membership types</title>
<para>
- The plugin of type <literal>org.exoplatform.services.organization.OrganizationDatabaseInitializer</literal> specifies the list of users, groups and membership types to be created.
+ The plugin of type <literal>org.exoplatform.services.organization.OrganizationDatabaseInitializer</literal> is used to specify a list of membership types, a list of groups, and a list of users to be created.
</para>
<para>
- The initialization parameter "<parameter>checkDatabaseAlgorithm</parameter>" determines how the creation is triggered.
+ The <emphasis role="bold">checkDatabaseAlgorithm</emphasis> initialization parameter determines how the database update is performed.
</para>
<para>
- The value "<literal>entry</literal>" means that each user, group and membership listed in the configuration file is checked each time &PRODUCT; is started. If the entry doesn't exist, it is created. The value "<literal>empty</literal>" sets the configuration file to be processed only if the database is empty.
+ If its value is set to <emphasis role="bold">entry</emphasis> it means that each user, group and membership listed in the configuration is checked each time &PRODUCT; is started.
+ If the entry doesn't yet exist in the database, it is created. If <emphasis role="bold">checkDatabaseAlgorithm</emphasis> parameter value is set to <emphasis role="bold">empty</emphasis>,
+ the configuration data will be updated to the database only if the database is empty.
</para>
</section>
<section id="sect-Reference_Guide-Predefined_User_Configuration-Membership_types">
<title>Membership types</title>
<para>
- The predefined membership types are specified in the "<parameter>membershipType</parameter>" field of the "<parameter>OrganizationConfig</parameter>" plugin parameter.
+ The predefined membership types are specified in the <emphasis role="bold">membershipType</emphasis> field of the <emphasis role="bold">OrganizationConfig</emphasis> plugin parameter.
</para>
+ <note>
+ <para>
+ See <literal>02portal.war:/WEB-INF/conf/organization/organization-configuration.xml</literal> for the full content.
+ </para>
+ </note>
<programlisting role="XML"><field name="membershipType">
<collection type="java.util.ArrayList">
@@ -71,7 +78,7 @@
<section id="sect-Reference_Guide-Predefined_User_Configuration-Groups">
<title>Groups</title>
<para>
- The predefined groups are specified in the "group" field of the "<parameter>OrganizationConfig</parameter>" plugin parameter.
+ The predefined groups are specified in the <emphasis role="bold">group</emphasis> field of the <emphasis role="bold">OrganizationConfig</emphasis> plugin parameter.
</para>
<programlisting role="XML"><field name="group">
@@ -117,7 +124,7 @@
<section id="sect-Reference_Guide-Predefined_User_Configuration-Users">
<title>Users</title>
<para>
- The predefined users are specified in the "<parameter>membershipType</parameter>" field of the "<parameter>OrganizationConfig</parameter>" plugin parameter.
+ The predefined users are specified in the <emphasis role="bold">membershipType</emphasis> field of the <emphasis role="bold">OrganizationConfig</emphasis> plugin parameter.
</para>
<programlisting role="XML"><field name="user">
@@ -151,8 +158,14 @@
<section id="sect-Reference_Guide-Predefined_User_Configuration-Plugin_for_monitoring_user_creation">
<title>Plugin for monitoring user creation</title>
<para>
- The plugin of type <literal>org.exoplatform.services.organization.impl.NewUserEventListener </literal> specifies which groups should join all newly created users. It notably specifies the groups and memberships to be used. It also specifies a list of users that should be excepted.
+ The plugin of type <literal>org.exoplatform.services.organization.impl.NewUserEventListener </literal> specifies
+ which groups all the newly created users should become members of. It specifies the groups and the memberships to use
+ (while group is just a set of users, a membership type represents a user's role within a group).
+ It also specifies a list of users that should not be processed (i.e. administrative users like 'root').
</para>
+ <note>
+ <para>The terms 'membership' and 'membership type' refer to the same thing, and are used interchangeably.</para>
+ </note>
<programlisting role="XML"><component-plugin>
<name>new.user.event.listener</name>
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml 2010-03-24 16:22:20 UTC (rev 2358)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml 2010-03-24 19:08:20 UTC (rev 2359)
@@ -3,8 +3,6 @@
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
-<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
-%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Skin_Configuration">
<title>Skin Configuration</title>
@@ -50,10 +48,10 @@
</varlistentry>
<varlistentry>
- <term>Portlets skins</term>
+ <term>Portlet skins</term>
<listitem>
- <para>CSS styles for each portlet. Used when a portlet want to
+ <para>CSS styles for each portlet. Used when a portlet wants to
define it's own CSS.</para>
</listitem>
</varlistentry>
@@ -62,8 +60,8 @@
<term>Window styles</term>
<listitem>
- <para>CSS styles for the surrounding of windows (Which embed either
- gadgets or portlets).</para>
+ <para>CSS styles for portlet windows (which surround either
+ gadgets or portlets, and add control buttons and decorations).</para>
</listitem>
</varlistentry>
@@ -71,7 +69,7 @@
<term>Shared styles</term>
<listitem>
- <para>&PRODUCT; WebUI components styles are reused among most of the
+ <para>&PRODUCT; WebUI component styles are reused among most of the
shipped-in portlets.</para>
</listitem>
</varlistentry>
@@ -94,7 +92,7 @@
generates a portal page markup, it inserts stylesheet links in the page's
<literal>head</literal> tag.</para>
- <para>In the snipped code below you can see two types of links:</para>
+ <para>In the snippet code below you can see two types of links:</para>
<programlistingco>
<areaspec>
@@ -118,7 +116,7 @@
(<literal>id="CoreSkin"</literal>).</para>
</callout>
<callout arearefs="area-Reference_Guide-Skin_Configuration-Stylesheets">
- <para>Portlets skins stylesheets (all
+ <para>Portlet skins stylesheets (all
others). Each portlet within the page may contribute its
own style(s)</para>
</callout>
@@ -133,9 +131,9 @@
<section id="sect-Reference_Guide-Tips_and_Tricks-Set_the_default_skin">
<title>Set the default skin</title>
- <para>The default skin of portal is called Default. To change this value
- add a skin tag in the <literal>portal.xml</literal> that defines your
- portal:</para>
+ <para>The default skin of the portal is called Default. To change this value
+ add a <literal>skin</literal> tag in <literal>portal.xml</literal> configuration file,
+ where your portal is defined:</para>
<programlisting role="XML"><portal-config>
<portal-name>classic</portal-name>
@@ -155,19 +153,19 @@
<section id="sect-Reference_Guide-How_to_Configure_a_Portal_Skin-SkinService">
<title>SkinService</title>
- <para>The SkinService is an &PRODUCT; service that manages portal skin,
- portlet styles and portlet themes (windows borders).</para>
+ <para>The SkinService is a &PRODUCT; service that manages the portal skin,
+ portlet styles and portlet themes (window borders).</para>
</section>
<section id="sect-Reference_Guide-How_to_Configure_a_Portal_Skin-SkinConfigListener">
<title>ResourceRequestFilter</title>
- <para>&PRODUCT; automatically discovers web archives that contains a
- file descriptor for skins (WEB-INF/gatein-resources.xml).</para>
+ <para>&PRODUCT; automatically discovers web archives that contain a
+ file descriptor for skins (<filename>WEB-INF/gatein-resources.xml</filename>).</para>
<para>Because of the Right-To-Left support all CSS files need to be
- retrieved through a Servlet filter and the web application need to be
- configured to activate this filter. This is already done for the
+ retrieved through a Servlet filter and the web application needs to be
+ configured to activate this filter. This is already done for
01eXoResources.war web application.</para>
<programlisting role="XML"><filter>
@@ -184,25 +182,30 @@
<section>
<title>Skin configuration</title>
- <para>&PRODUCT; automatically discovers web archives that contains a
- file descriptor for skins (WEB-INF/gatein-resources.xml).The
+ <para>&PRODUCT; automatically discovers web archives that contain a
+ file descriptor for skins (<filename>WEB-INF/gatein-resources.xml</filename>).The
full schema can be found in
- 02portal.war:/WEB-INF/gatein_resources_1-0.xsd</para>
+ <filename>02portal.war:/WEB-INF/gatein_resources_1-0.xsd</filename></para>
- <para>Here is an example:<programlisting><gatein-resources>
+ <para>Here is an example:
+ </para>
+ <programlisting role="XML"><gatein-resources>
<portal-skin>
<skin-name>MySkin</skin-name>
<css-path>/skin/myskin.css</css-path>
<overwrite>false</overwrite>
</portal-skin>
-</gatein-resources></programlisting></para>
+</gatein-resources>
+ </programlisting>
<para>Here we defined a skin (MySkin) and the CSS location within the
same web archive.</para>
<para>Default portal skin and window styles are defined in
- 01eXoResources.war:/WEB-INF/gatein-resources.xml and the part dedicated to
- skinning is defined like:<programlisting><gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0" xmlns="http://www.ga
+ <filename>01eXoResources.war:/WEB-INF/gatein-resources.xml</filename> and the part dedicated to
+ skinning is defined like:
+ </para>
+ <programlisting role="XML"><gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0" xmlns="http://www.ga
tein.org/xml/ns/gatein_resources_1_0.xsd">
<portal-skin>
<skin-name>Default</skin-name>
@@ -227,26 +230,28 @@
<style-theme>
<theme-name>SimpleGreen</theme-name>
</style-theme>
- </window-style></programlisting></para>
+ </window-style></programlisting>
</section>
<section>
<title>Skin icon</title>
- <para>When selecting a skin, an overview of the skin is possible. It has
+ <para>When selecting a skin, a preview of the skin is possible. It has
to be defined in the current skin used to display the form to change
skins.</para>
- <para>Put the screeshot of the skin in:
- <literal>01eXoResources.war:/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/background</literal>
+ <para>Put the screenshot of the skin in:
+ <filename>01eXoResources.war:/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/background</filename>
and add the following in
- 01eXoResources.war:/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/Stylesheet.css:<programlisting>.UIChangeSkinForm .UIItemSelector .TemplateContainer .<emphasis
+ <filename>01eXoResources.war:/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/Stylesheet.css:</filename>
+ </para>
+ <programlisting>.UIChangeSkinForm .UIItemSelector .TemplateContainer .<emphasis
role="bold">MySkin</emphasis>Image {
margin: auto;
width: 329px; height:204px;
background: url('background/<emphasis role="bold">MySkin</emphasis>.jpg') no-repeat top;
cursor: pointer ;
-}</programlisting></para>
+}</programlisting>
</section>
</section>
@@ -264,13 +269,13 @@
</imageobject>
</mediaobject></para>
- <para>The code below illustrates the inclusion of all CSS resoucres for a
+ <para>The code below illustrates the inclusion of all CSS resources for a
new theme from the example file
<literal>GateInResourcesCp060508/skin/MyPortalSkin/PortletThemes/Stylesheet.css</literal>.</para>
<orderedlist>
<listitem>
- <para>In 01eXoResources:/WEB-INF/gatein-resources.xml add the
+ <para>In <filename>01eXoResources:/WEB-INF/gatein-resources.xml</filename> add the
following snippet:<programlisting><window-style>
<style-name>MyTheme</style-name>
<style-theme>
@@ -423,7 +428,7 @@
<section id="sect-Reference_Guide-Skin_Configuration-Portlet_Styles">
<title>How to create new Portlet skins</title>
- <para>Portlets often require additionnal styles that may not be defined by
+ <para>Portlets often require additional styles that may not be defined by
the portal skin. &PRODUCT; allows portlets to define additional
stylesheets for each portlet and will append the corresponding
<literal>link</literal> tags to the <literal>head</literal>.</para>
@@ -435,7 +440,7 @@
<parameter>id="content<literal>ContentPortlet"</literal></parameter></para>
<para>To define a new CSS file to include whenever a portlet is added, the
- following snippet need to be added in gatein-resources.xml<programlisting><portlet-skin>
+ following snippet needs to be added in gatein-resources.xml<programlisting><portlet-skin>
<application-name>portletAppName</application-name>
<portlet-name>PortletName</portlet-name>
<skin-name>Default</skin-name>
@@ -450,7 +455,7 @@
</portlet-skin></programlisting></para>
<para>The portal framework will include the CSS file corresponding to the
- skin in used.</para>
+ skin used.</para>
<section id="sect-Reference_Guide-Tips_and_Tricks-Change_portlet_icons">
@@ -462,13 +467,13 @@
<itemizedlist>
<listitem>
- <para><filename>skin/DefaultSkin/portletIcons<replaceable>icon_name.png</replaceable></filename>.
+ <para><filename>skin/DefaultSkin/portletIcons/<replaceable>icon_name.png</replaceable></filename>.
To be used correctly the icon must be named after the
portlet.</para>
</listitem>
</itemizedlist>
- <para>For example,the icon for an account portlet named AccountPortlet
+ <para>For example, the icon for an account portlet named AccountPortlet
would be located at:</para>
<itemizedlist>
@@ -503,12 +508,13 @@
<literal>exo.product.developing</literal> to
<literal>true</literal>.</para>
- <para>For example, the property can passed as a JVM parameter with the
- <literal>-D</literal> option when running GateIn.<programlisting>sh $JBOSS_HOME/bin/run.sh -Dexo.product.developing=true</programlisting></para>
+ <para>For example, the property can be passed as a JVM parameter with
+ <literal>-D</literal> option when running GateIn.</para>
+ <programlisting>sh $JBOSS_HOME/bin/run.sh -Dexo.product.developing=true</programlisting>
<orderedlist numeration="arabic">
<listitem>
- <para>warning("This is option may cause display bugs with certain
+ <para>warning("This option may cause display bugs with certain
browsers like Internet Explorer")</para>
</listitem>
</orderedlist>
@@ -520,7 +526,7 @@
studying &PRODUCT; CSS.</para>
<para>&PRODUCT; relies heavily on CSS to create the layout and effects
- for the UI. Some common techniques for customizing &PRODUCT;'s CSS are
+ for the UI. Some common techniques for customizing &PRODUCT; CSS are
explained below.</para>
<section id="sect-Reference_Guide-Some_CSS_techniques-Decorator_pattern">
14 years, 9 months
gatein SVN: r2358 - portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply@jboss.org
Author: mpodolin
Date: 2010-03-24 12:22:20 -0400 (Wed, 24 Mar 2010)
New Revision: 2358
Modified:
portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
Log:
JBEPP-243: the GTNPORTAL-894 ported to the EPP branch
Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
===================================================================
--- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-03-24 14:57:52 UTC (rev 2357)
+++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-03-24 16:22:20 UTC (rev 2358)
@@ -247,7 +247,8 @@
}
catch (Throwable ex)
{
- portletContent.append("This portlet encountered an error and could not be displayed.");
+ WebuiRequestContext webuiRequest = WebuiRequestContext.getCurrentInstance();
+ portletContent.append(webuiRequest.getApplicationResourceBundle().getString("UIPortlet.message.RuntimeError"));
log.error("The portlet " + uiPortlet_.getName() + " could not be loaded. Check if properly deployed.",
ExceptionUtil.getRootCause(ex));
}
Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
--- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-03-24 14:57:52 UTC (rev 2357)
+++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-03-24 16:22:20 UTC (rev 2358)
@@ -292,7 +292,7 @@
.getComponentInstanceOfType(PortletExceptionHandleService.class);
portletExceptionService.handle(pcException);
- markup = Text.create("This portlet encountered an error and could not be displayed.");
+ markup = Text.create(context.getApplicationResourceBundle().getString("UIPortlet.message.RuntimeError"));
}
}
}
@@ -312,7 +312,7 @@
log.warn("Could not find the PortletExceptionHandleService in the exo container");
}
- markup = Text.create("This portlet encountered an error and could not be displayed.");
+ markup = Text.create(context.getApplicationResourceBundle().getString("UIPortlet.message.RuntimeError"));
}
//
14 years, 9 months
gatein SVN: r2357 - in portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal: webui/application and 1 other directory.
by do-not-reply@jboss.org
Author: mpodolin
Date: 2010-03-24 10:57:52 -0400 (Wed, 24 Mar 2010)
New Revision: 2357
Modified:
portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
Log:
JBEPP-202: the GTNPORTAL-337 ported to the EPP branch
Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-03-24 13:30:20 UTC (rev 2356)
+++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-03-24 14:57:52 UTC (rev 2357)
@@ -19,8 +19,6 @@
package org.exoplatform.portal.application;
-import com.sun.syndication.feed.atom.Link;
-
import org.exoplatform.Constants;
import org.exoplatform.commons.utils.PortalPrinter;
import org.exoplatform.commons.utils.WriterPrinter;
@@ -40,6 +38,7 @@
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.core.lifecycle.HtmlValidator;
+import org.gatein.common.http.QueryStringParser;
import org.w3c.dom.Element;
import javax.xml.transform.OutputKeys;
@@ -54,6 +53,7 @@
import java.io.Writer;
import java.net.URLDecoder;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -115,6 +115,8 @@
private List<Element> extraMarkupHeaders;
private final PortalURLBuilder urlBuilder;
+
+ private Map<String, String[]> parameterMap;
public JavascriptManager getJavascriptManager()
{
@@ -131,7 +133,7 @@
//The encoding needs to be set before reading any of the parameters since the parameters's encoding
- //is set at the first acces.
+ //is set at the first access.
//TODO use the encoding from the locale-config.xml file
response_.setContentType("text/html; charset=UTF-8");
@@ -144,6 +146,17 @@
log.error("Encoding not supported", e);
}
+ // Query parameters from the request will be set in the servlet container url encoding and not
+ // necessarly in utf-8 format. So we need to directly parse the parameters from the query string.
+ parameterMap = new HashMap<String, String[]>();
+ parameterMap.putAll(request_.getParameterMap());
+ String queryString = req.getQueryString();
+ if (queryString != null)
+ {
+ Map<String, String[]> queryParams = QueryStringParser.getInstance().parseQueryString(queryString);
+ parameterMap.putAll(queryParams);
+ }
+
ajaxRequest_ = "true".equals(req.getParameter("ajaxRequest"));
String cache = req.getParameter(CACHE_LEVEL);
if (cache != null)
@@ -152,8 +165,15 @@
}
requestURI_ = URLDecoder.decode(req.getRequestURI(), "UTF-8");
- String pathInfo = req.getPathInfo();
- if (pathInfo == null)
+
+ // req.getPathInfo will already have the encoding set from the server.
+ // We need to use the UTF-8 value since this is how we store the portal name.
+ // Reconstructing the getPathInfo from the non server decoded values.
+ String servletPath = URLDecoder.decode(req.getServletPath(), "UTF-8");
+ String contextPath = URLDecoder.decode(req.getContextPath(), "UTF-8");
+ String pathInfo = requestURI_.substring((servletPath + contextPath).length());
+
+ if (pathInfo == null || pathInfo.length() == 0)
{
pathInfo = "/";
}
@@ -241,17 +261,24 @@
public String getRequestParameter(String name)
{
- return request_.getParameter(name);
+ if (parameterMap.get(name) != null && parameterMap.get(name).length > 0)
+ {
+ return parameterMap.get(name)[0];
+ }
+ else
+ {
+ return null;
+ }
}
public String[] getRequestParameterValues(String name)
{
- return request_.getParameterValues(name);
+ return parameterMap.get(name);
}
public Map<String, String[]> getPortletParameters()
{
- Map<String, String[]> unsortedParams = getRequest().getParameterMap();
+ Map<String, String[]> unsortedParams = parameterMap;
Map<String, String[]> sortedParams = new HashMap<String, String[]>();
Set<String> keys = unsortedParams.keySet();
for (String key : keys)
Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
===================================================================
--- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-03-24 13:30:20 UTC (rev 2356)
+++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-03-24 14:57:52 UTC (rev 2357)
@@ -644,7 +644,7 @@
I invocation;
HttpServletRequest servletRequest = prc.getRequest();
HashMap<String, String[]> allParams = new HashMap<String, String[]>();
- allParams.putAll(servletRequest.getParameterMap());
+ allParams.putAll(prc.getPortletParameters());
allParams.putAll(this.getPublicParameters());
allParams.remove(ExoPortletInvocationContext.NAVIGATIONAL_STATE_PARAM_NAME);
if (type.equals(ActionInvocation.class))
14 years, 9 months
gatein SVN: r2356 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization.
by do-not-reply@jboss.org
Author: bdaw
Date: 2010-03-24 09:30:20 -0400 (Wed, 24 Mar 2010)
New Revision: 2356
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
Log:
- "sybase" profile with different set of hibernate mappings
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-03-24 12:58:26 UTC (rev 2355)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-03-24 13:30:20 UTC (rev 2356)
@@ -252,6 +252,20 @@
<value>picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value>
<value>picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value>
</values-param>
+ <values-param profiles="sybase">
+ <name>hibernate.mapping</name>
+ <value>picketlink-idm/sybase-mappings/HibernateRealm.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObject.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialType.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectType.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value>
+ </values-param>
</init-params>
</component-plugin>
</external-component-plugins>
14 years, 9 months
gatein SVN: r2355 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply@jboss.org
Author: bdaw
Date: 2010-03-24 08:58:26 -0400 (Wed, 24 Mar 2010)
New Revision: 2355
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02_CreateNewAccount.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_SettingAccount.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_CreateNewAccountPublicMode.html
Log:
- some selenium tests improvements: wait 5s after user creation before login and assert that user is not displayed in management portlet after removal.
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02_CreateNewAccount.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02_CreateNewAccount.html 2010-03-24 10:54:25 UTC (rev 2354)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02_CreateNewAccount.html 2010-03-24 12:58:26 UTC (rev 2355)
@@ -82,6 +82,11 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td></td>
+</tr>
+<tr>
<td>open</td>
<td>/portal/public/classic/</td>
<td></td>
@@ -187,6 +192,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>test_user_02</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Sign out</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_SettingAccount.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_SettingAccount.html 2010-03-24 10:54:25 UTC (rev 2354)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_SettingAccount.html 2010-03-24 12:58:26 UTC (rev 2355)
@@ -77,6 +77,11 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td></td>
+</tr>
+<tr>
<td>open</td>
<td>/portal/public/classic/</td>
<td></td>
@@ -267,6 +272,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>test_user_33</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Sign out</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_CreateNewAccountPublicMode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_CreateNewAccountPublicMode.html 2010-03-24 10:54:25 UTC (rev 2354)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_CreateNewAccountPublicMode.html 2010-03-24 12:58:26 UTC (rev 2355)
@@ -112,6 +112,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>You have registered a new account.</td>
+ <td></td>
+</tr>
+<tr>
<td>echo</td>
<td>--Verify</td>
<td></td>
@@ -157,6 +162,12 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>test_user_35</td>
+ <td></td>
+</tr>
+<tr>
+<tr>
<td>clickAt</td>
<td>link=Sign out</td>
<td></td>
14 years, 9 months
gatein SVN: r2354 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply@jboss.org
Author: bdaw
Date: 2010-03-24 06:54:25 -0400 (Wed, 24 Mar 2010)
New Revision: 2354
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02_CreateNewAccount.html
Log:
- make the test wait for confirmation after user registration
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02_CreateNewAccount.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02_CreateNewAccount.html 2010-03-24 10:53:29 UTC (rev 2353)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02_CreateNewAccount.html 2010-03-24 10:54:25 UTC (rev 2354)
@@ -77,6 +77,11 @@
<td>1,1</td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>You have successfully registered a new account!</td>
+ <td></td>
+</tr>
+<tr>
<td>open</td>
<td>/portal/public/classic/</td>
<td></td>
14 years, 9 months
gatein SVN: r2353 - portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIBannerPortlet.
by do-not-reply@jboss.org
Author: thanh.do
Date: 2010-03-24 06:53:29 -0400 (Wed, 24 Mar 2010)
New Revision: 2353
Modified:
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIBannerPortlet/Stylesheet.css
Log:
GTNPORTAL-909:the simple theme of banner portlet is broken in unauthenticated mode
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIBannerPortlet/Stylesheet.css
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIBannerPortlet/Stylesheet.css 2010-03-24 10:06:28 UTC (rev 2352)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIBannerPortlet/Stylesheet.css 2010-03-24 10:53:29 UTC (rev 2353)
@@ -39,3 +39,21 @@
.UIBannerPortlet .MiddleBanner {
height: 50px;
}
+
+.UIBannerPortlet .MiddleBanner .Signin {
+ text-align: right;
+ padding: 25px 20px 0px 0px;
+}
+
+.UIBannerPortlet .MiddleBanner .Signin a {
+ background: none;
+ margin-left: 8px;
+ color: #5a5a5a;
+}
+
+.UIBannerPortlet .MiddleBanner .Signin a:hover {
+ color: #000;
+}
+
+
+
14 years, 9 months
gatein SVN: r2352 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply@jboss.org
Author: bdaw
Date: 2010-03-24 06:06:28 -0400 (Wed, 24 Mar 2010)
New Revision: 2352
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_SettingAccount.html
Log:
- make the test wait for confirmation after user registration
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_SettingAccount.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_SettingAccount.html 2010-03-24 01:47:09 UTC (rev 2351)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_SettingAccount.html 2010-03-24 10:06:28 UTC (rev 2352)
@@ -72,6 +72,11 @@
<td>1,1</td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>You have successfully registered a new account!</td>
+ <td></td>
+</tr>
+<tr>
<td>open</td>
<td>/portal/public/classic/</td>
<td></td>
14 years, 9 months