gatein SVN: r3097 - portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-05-14 07:59:27 -0400 (Fri, 14 May 2010)
New Revision: 3097
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
Log:
GTNPORTAL-890:GateIn should provide default styling for standard portlet CSS classes
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2010-05-14 11:42:00 UTC (rev 3096)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2010-05-14 11:59:27 UTC (rev 3097)
@@ -245,23 +245,27 @@
text-decoration: none;
font-size: 12px;
line-height: 18px;
+ background: #F5F9FA;
}
/* Selected menu item. */
.portlet-menu-item-selected {
line-height: 18px;
+ background: #F5F9FA;
}
.portlet-menu-item-hover {
- color: #5699B7;
+ color: #058ee6;
text-decoration: none;
font-size: 12px;
line-height: 18px;
+ background: #F5F9FA;
}
/* Selected menu item when the mouse hovers over it. */
.portlet-menu-item-hover-selected {
line-height: 18px;
+ background: #F5F9FA;
}
/* Normal, unselected menu item that has sub-menus. */
@@ -280,6 +284,7 @@
.portlet-menu-cascade-item-hover {
line-height: 18px;
+ color: #058ee6;
}
.portlet-menu-cascade-item-hover-selected {
@@ -304,6 +309,7 @@
.portlet-menu-content-hover {
line-height: 18px;
+ color: #058ee6;
}
.portlet-menu-content-hover-selected {
@@ -320,6 +326,7 @@
.portlet-menu-indicator-hover {
line-height: 18px;
+ color: #058ee6;
}
.portlet-menu-indicator-hover-selected {
14 years, 7 months
gatein SVN: r3096 - portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-05-14 07:42:00 -0400 (Fri, 14 May 2010)
New Revision: 3096
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
Log:
GTNPORTAL-890:GateIn should provide default styling for standard portlet CSS classes
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2010-05-14 11:33:05 UTC (rev 3095)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2010-05-14 11:42:00 UTC (rev 3096)
@@ -26,58 +26,58 @@
/* 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;
- font-size: 11px;
+ color: #000000;
+ font-size: 11px;
+ line-height: 18px;
}
/* Font attributes similar to the portlet.font but the color is lighter */
.portlet-font-dim {
color: #777777;
- font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
+ line-height: 18px;
}
/** MESSAGES **/
/* Status of the current operation. */
.portlet-msg-status {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 12px;
font-style: normal;
color: #336699;
+ line-height: 18px;
}
/* Help messages, general additional information, etc. */
.portlet-msg-info {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 12px;
font-style: italic;
color: #000;
+ line-height: 18px;
}
/* Error messages. */
.portlet-msg-error {
color: red;
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 12px;
font-weight: bold;
+ line-height: 18px;
}
/* Warning messages. */
.portlet-msg-alert {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 12px;
font-weight: bold;
color: #821717;
+ line-height: 18px;
}
/* Verification of the successful completion of a task. */
.portlet-msg-success {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 12px;
font-weight: bold;
color: #359630;
+ line-height: 18px;
}
/** SECTIONS **/
@@ -85,27 +85,33 @@
/* Table or section header */
.portlet-section-header {
font-weight: bold;
+ line-height: 18px;
}
.portlet-section-body {
color: #333333;
+ line-height: 18px;
}
.portlet-section-alternate {
background-color: #F2F2F2;
+ line-height: 18px;
}
.portlet-section-selected {
background-color: #CBD4E6;
+ line-height: 18px;
}
.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
@@ -113,6 +119,7 @@
.portlet-section-text {
font-size: 12px;
font-style: italic;
+ line-height: 18px;
}
/** TABLE **/
@@ -141,6 +148,7 @@
/* Text in every other row in the table */
.portlet-table-alternate {
background: #f5f5f5;
+ line-height: 18px;
}
/* Text in a selected cell range */
@@ -148,6 +156,7 @@
color: #000;
font-size: 12px;
background-color: #CBD4E6;
+ line-height: 18px;
}
/* Text of a subheading */
@@ -155,31 +164,35 @@
font-weight: bold;
color: #000;
font-size: 12px;
+ 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 table). */
.portlet-table-text {
padding: 3px 5px;
border-bottom: 1px solid #d5d5d5;
+ line-height: 18px;
}
/** FORMS **/
.portlet-form-label {
font-size: 10px;
color: #333333;
+ line-height: 18px;
}
/* Text of the user-input in an input field. not sure if we need this guy? */
.portlet-form-input-field {
color: #000000;
font-size: 10px;
+ line-height: 18px;
}
/* Form Button Style */
.portlet-form-button {
- line-height: 22px;
+ line-height: 18px;
text-align: center;
- background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/LightBlueStyle.gif') repeat-x bottom;
+ background: url('/eXoResources/skin/DefaultSkin/webui/component/UIBarDecorator/UIAction/background/LightBlueStyle.gif') repeat-x center -24px;
white-space: nowrap;
display: table-cell;
padding: 0 12px;
@@ -193,109 +206,131 @@
/* Text that appears beside a context dependent action icon */
.portlet-icon-label {
+ line-height: 18px;
}
/* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
not sure if we need this one?.. */
.portlet-dlg-icon-label {
+ line-height: 18px;
}
/* Text for form field labels */
.portlet-form-field-label {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- color: #000;
- white-space: nowrap;
- text-align: left;
- vertical-align: top;
- font-weight: bold;
+ color: #000;
+ white-space: nowrap;
+ text-align: left;
+ vertical-align: top;
+ font-weight: bold;
+ line-height: 18px;
}
/* Text for a form field */
.portlet-form-field {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 10px;
- color: #000; /*margin-top: 10px;*/
+ font-size: 10px;
+ color: #000; /*margin-top: 10px;*/
+ line-height: 18px;
}
/** MENUS **/
/*General menu settings such as background color, margins, etc. */
.portlet-menu {
+ line-height: 18px;
}
/* Normal, unselected menu item. */
.portlet-menu-item {
- color: #242424;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ color: #242424;
+ text-decoration: none;
+ font-size: 12px;
+ line-height: 18px;
}
/* Selected menu item. */
.portlet-menu-item-selected {
+ line-height: 18px;
}
.portlet-menu-item-hover {
- color: #5699B7;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ color: #5699B7;
+ text-decoration: none;
+ font-size: 12px;
+ line-height: 18px;
}
/* Selected menu item when the mouse hovers over it. */
.portlet-menu-item-hover-selected {
+ line-height: 18px;
}
/* Normal, unselected menu item that has sub-menus. */
.portlet-menu-cascade-item {
+ line-height: 18px;
}
/* Selected sub-menu item that has sub-menus */
.portlet-menu-cascade-item-selected {
+ line-height: 18px;
}
.porlet-menu-cascade {
+ line-height: 18px;
}
.portlet-menu-cascade-item-hover {
+ line-height: 18px;
}
.portlet-menu-cascade-item-hover-selected {
+ line-height: 18px;
}
.portlet-menu-separator {
+ line-height: 18px;
}
.portlet-menu-cascade-separator {
+ line-height: 18px;
}
.portlet-menu-content {
+ line-height: 18px;
}
.portlet-menu-content-selected {
+ line-height: 18px;
}
.portlet-menu-content-hover {
+ line-height: 18px;
}
.portlet-menu-content-hover-selected {
+ line-height: 18px;
}
.portlet-menu-indicator {
+ line-height: 18px;
}
.portlet-menu-indicator-selected {
+ line-height: 18px;
}
.portlet-menu-indicator-hover {
+ line-height: 18px;
}
.portlet-menu-indicator-hover-selected {
+ line-height: 18px;
}
.portlet-menu-description {
+ line-height: 18px;
}
.portlet-menu-caption {
+ line-height: 18px;
}
14 years, 7 months
gatein SVN: r3095 - 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-05-14 07:33:05 -0400 (Fri, 14 May 2010)
New Revision: 3095
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css
Log:
GTNPORTAL-1045:Can't drag & drop application into container when click switch view mode
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-05-14 11:23:14 UTC (rev 3094)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2010-05-14 11:33:05 UTC (rev 3095)
@@ -139,8 +139,7 @@
}
.UIContainer .VIEW-BLOCK .UIRowContainer {
- min-height: 86px;
- _height: 86px;
+ min-height: 20px;
}
.UIContainer .NewLayer {
14 years, 7 months
gatein SVN: r3094 - in portal/trunk/web/eXoResources/src/main/webapp: skin/DefaultSkin/portal/webui/component/view/UIDashboard and 2 other directories.
by do-not-reply＠jboss.org
Author: thanh.do
Date: 2010-05-14 07:23:14 -0400 (Fri, 14 May 2010)
New Revision: 3094
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/background/AddDashboard.gif
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/background/TabDashboard.gif
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css
Log:
GTNPORTAL-1045:Cant drag & drop application into container when click switch view mode
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2010-05-14 10:38:42 UTC (rev 3093)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2010-05-14 11:23:14 UTC (rev 3094)
@@ -91,6 +91,11 @@
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";
},
createDashboardPage : function(e){
@@ -163,6 +168,10 @@
spanElement.parentNode.replaceChild(inputElement, spanElement);
DOMUtil.findNextElementByTagName(inputElement, "a").href = "#";
- inputElement.focus();
+ inputElement.focus();
+
+ //find Middle tab of MiddleTab
+ var middleTab = DOMUtil.findAncestorByClass(inputElement, "MiddleTab");
+ middleTab.className = "MiddleTab EditTab";
}
}
\ No newline at end of file
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-05-14 10:38:42 UTC (rev 3093)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-05-14 11:23:14 UTC (rev 3094)
@@ -85,7 +85,7 @@
}
.UITabPaneDashboard .UIHorizontalTabs {
- padding: 1px 0 5px;
+ padding-top: 1px;
}
.UITabPaneDashboard .UIHorizontalTabs .TabsContainer {
@@ -93,16 +93,17 @@
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle {
- margin: 4px 2px 0 0;
+ margin: 3px 2px 0 0;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab,
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .MiddleTab,
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .MiddleTab {
- padding: 0px 10px;
- _padding: 3px 10px;
+ padding: 0px 5px;
+ _padding: 4px 5px;
white-space:nowrap;
font-weight: normal;
+ line-height: 24px;
}
@@ -115,39 +116,37 @@
.UITabPaneDashboard .UIHorizontalTabs .AddDashboard {
background: url('background/AddDashboard.gif') no-repeat bottom;
- width: 34px; height: 22px;
+ width: 34px; height: 24px;
float: left; /* orientation=lt */
float: right; /* orientation=rt */
cursor: pointer;
- margin-top: 4px;
+ margin-top: 3px;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .LeftTab {
- background: url(background/TabDashboard.gif) no-repeat left -44px;
+ background: url(background/TabDashboard.gif) no-repeat left -48px;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .RightTab {
- background: url(background/TabDashboard.gif) no-repeat right -44px;
+ background: url(background/TabDashboard.gif) no-repeat right -48px;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab {
- background: url(background/TabDashboard.gif) repeat-x left -66px;
- line-height: 22px;
+ background: url(background/TabDashboard.gif) repeat-x left -72px;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .HighlightNavigationTab .LeftTab {
- background: url(background/TabDashboard.gif) no-repeat left -44px;
+ 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 -44px;
+ 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 -66px;
- line-height: 22px;
+ background: url(background/TabDashboard.gif) repeat-x left -72px;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .LeftTab {
@@ -160,8 +159,7 @@
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .SelectedTab .MiddleTab {
- background: url(background/TabDashboard.gif) repeat-x left -22px;
- line-height: 22px;
+ background: url(background/TabDashboard.gif) repeat-x left -24px;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .EditnewTab .LeftTab {
@@ -174,12 +172,16 @@
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .EditnewTab .MiddleTab {
- background: url(background/TabDashboard.gif) repeat-x left -22px;
+ 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;
}
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/background/AddDashboard.gif
===================================================================
(Binary files differ)
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/background/TabDashboard.gif
===================================================================
(Binary files differ)
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-05-14 10:38:42 UTC (rev 3093)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2010-05-14 11:23:14 UTC (rev 3094)
@@ -133,12 +133,16 @@
padding: 0px 2px;
}
-
.UIContainer .LAYOUT-BLOCK .UIRowContainer {
min-height: 86px;
_height: 86px;
}
+.UIContainer .VIEW-BLOCK .UIRowContainer {
+ min-height: 86px;
+ _height: 86px;
+}
+
.UIContainer .NewLayer {
background: #93c0e2;
filter: alpha(opacity=40);
@@ -240,11 +244,13 @@
border: 1px dashed #a2a2a2;
}
-.EdittingContainer .NormalContainerBlock .LeftContainerBlock, .EdittingContainer .OverContainerBlock .NormalContainerBlock .LeftContainerBlock {
+.EdittingContainer .NormalContainerBlock .LeftContainerBlock,
+.EdittingContainer .OverContainerBlock .NormalContainerBlock .LeftContainerBlock {
background: none;
}
-.EdittingContainer .NormalContainerBlock .RightContainerBlock, .EdittingContainer .OverContainerBlock .NormalContainerBlock .RightContainerBlock {
+.EdittingContainer .NormalContainerBlock .RightContainerBlock,
+.EdittingContainer .OverContainerBlock .NormalContainerBlock .RightContainerBlock {
padding: 2px;
background: none;
}
14 years, 7 months
gatein SVN: r3093 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-05-14 06:38:42 -0400 (Fri, 14 May 2010)
New Revision: 3093
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterEditMode.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java
Log:
GTNPORTAL-1156: Captcha input visibility does not follow Register portlet 's Portlet Preferences
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterEditMode.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterEditMode.java 2010-05-14 10:17:46 UTC (rev 3092)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterEditMode.java 2010-05-14 10:38:42 UTC (rev 3093)
@@ -18,6 +18,8 @@
*/
package org.exoplatform.account.webui.component;
+import org.exoplatform.portal.webui.CaptchaValidator;
+import org.exoplatform.portal.webui.UICaptcha;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
import org.exoplatform.webui.application.WebuiRequestContext;
@@ -30,6 +32,7 @@
import org.exoplatform.webui.event.EventListener;
import org.exoplatform.webui.form.UIForm;
import org.exoplatform.webui.form.UIFormCheckBoxInput;
+import org.exoplatform.webui.form.validator.MandatoryValidator;
import javax.portlet.PortletMode;
import javax.portlet.PortletPreferences;
@@ -70,6 +73,28 @@
PortletPreferences pref = pcontext.getRequest().getPreferences();
pref.setValue(USE_CAPTCHA, Boolean.toString(useCaptcha));
pref.store();
+
+ //Show/hide the captcha input in UIRegisterInputSet
+ UIRegisterPortlet registerPortlet = uiForm.getParent();
+ UIRegisterInputSet registerInputSet = registerPortlet.findFirstComponentOfType(UIRegisterInputSet.class);
+
+ if(useCaptcha)
+ {
+ if(!registerInputSet.getCaptchaInputAvailability())
+ {
+ registerInputSet.addUIFormInput(new UICaptcha(UIRegisterInputSet.CAPTCHA, UIRegisterInputSet.CAPTCHA, null).addValidator(MandatoryValidator.class).addValidator(CaptchaValidator.class));
+ registerInputSet.setCaptchaInputAvailability(true);
+ }
+ }
+ else
+ {
+ if(registerInputSet.getCaptchaInputAvailability())
+ {
+ registerInputSet.removeChildById(UIRegisterInputSet.CAPTCHA);
+ registerInputSet.setCaptchaInputAvailability(false);
+ }
+ }
+
UIPortalApplication portalApp = Util.getUIPortalApplication();
if (portalApp.getModeState() == UIPortalApplication.NORMAL_MODE)
pcontext.setApplicationMode(PortletMode.VIEW);
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java 2010-05-14 10:17:46 UTC (rev 3092)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java 2010-05-14 10:38:42 UTC (rev 3093)
@@ -60,6 +60,8 @@
protected static String CAPTCHA = "captcha";
+ private boolean captchaInputAvailability;
+
public UIRegisterInputSet(String name) throws Exception{
super(name);
@@ -91,9 +93,20 @@
if (useCaptcha)
{
addUIFormInput(new UICaptcha(CAPTCHA, CAPTCHA, null).addValidator(MandatoryValidator.class).addValidator(CaptchaValidator.class));
+ this.captchaInputAvailability = true;
}
}
+ public void setCaptchaInputAvailability(boolean availability)
+ {
+ this.captchaInputAvailability = availability;
+ }
+
+ public boolean getCaptchaInputAvailability()
+ {
+ return this.captchaInputAvailability;
+ }
+
private String getUserName(){
return getUIStringInput(USER_NAME).getValue();
}
14 years, 7 months
gatein SVN: r3092 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-05-14 06:17:46 -0400 (Fri, 14 May 2010)
New Revision: 3092
Added:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_003_CopyPasteNodeIntoTheSamePlace.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_004_CopyPasteNodeIntoTheSameSource.html
Log:
TESTVN-399: Create new GateIn Selenium Scrips
Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation.html 2010-05-14 10:17:46 UTC (rev 3092)
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Login portal--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Open Navigation Menu--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Copy a node--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@title='Home']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Copy Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Copy Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Paste node into another node in the same navigation--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@title='SiteMap']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//a[@title='SiteMap']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='SiteMap']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='SiteMap']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div/div/div[2]/div/div/div[7]//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div/div/div[2]/div/div/div[7]//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete node--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/div//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Delete Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertConfirmation</td>
+ <td>Are you sure you want to delete this node?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Sign out --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_003_CopyPasteNodeIntoTheSamePlace.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_003_CopyPasteNodeIntoTheSamePlace.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_003_CopyPasteNodeIntoTheSamePlace.html 2010-05-14 10:17:46 UTC (rev 3092)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Test_POR_14_03_003_CopyPasteNodeIntoTheSamePlace</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_14_03_003_CopyPasteNodeIntoTheSamePlace</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Login portal--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Open Navigation Management pop-up --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Copy node--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@title='Home']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Copy Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Copy Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Paste node to same place--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='UIContextMenuContainer']/div[2]/div/div/div[7]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@class='UIContextMenuContainer']/div[2]/div/div/div[7]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify text Message--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>This node name already exists.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Sign out--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_004_CopyPasteNodeIntoTheSameSource.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_004_CopyPasteNodeIntoTheSameSource.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_004_CopyPasteNodeIntoTheSameSource.html 2010-05-14 10:17:46 UTC (rev 3092)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Test_POR_14_03_004_CopyPasteNodeIntoTheSameSource</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_14_03_004_CopyPasteNodeIntoTheSameSource</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Login portal--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Open Navigation Management pop-up --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Copy node--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@title='Home']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Copy Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Copy Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Paste node to same place--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>//a[@title='Home']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='UIContextMenuContainer']/div[2]/div/div/div[7]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@class='UIContextMenuContainer']/div[2]/div/div/div[7]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify text Message--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>The source and the destination must be different. </td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Sign out--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
14 years, 7 months
gatein SVN: r3091 - in portal/trunk/web/portal/src/main/webapp: groovy/webui/organization/account and 1 other directory.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-05-14 01:09:56 -0400 (Fri, 14 May 2010)
New Revision: 3091
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
portal/trunk/web/portal/src/main/webapp/groovy/webui/organization/account/UIGroupSelector.gtmpl
Log:
GTNPORTAL-1178 UIGroupSelector.gtmpl isn't internationalized
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-05-14 05:04:01 UTC (rev 3090)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-05-14 05:09:56 UTC (rev 3091)
@@ -400,6 +400,9 @@
UIGroupSelector.lable.groupId=Group Id:
UIGroupSelector.lable.description=Description:
UIGroupSelector.action.done=Done
+UIGroupSelector.title.selectGroupMember=Select Group
+UIGroupSelector.title.selectChildGroup=Select Child Group
+UIGroupSelector.title.addGroupButton=Select this Group
#############################################################################
# org.exoplatform.portal.component.customization.UIPageSelector#
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-05-14 05:04:01 UTC (rev 3090)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-05-14 05:09:56 UTC (rev 3091)
@@ -374,6 +374,9 @@
UIGroupSelector.lable.groupId=Id du groupe :
UIGroupSelector.lable.description=Description :
UIGroupSelector.action.done=Terminé
+UIGroupSelector.title.selectGroupMember=Choisir un groupe
+UIGroupSelector.title.selectChildGroup=Choisir un sous-groupe
+UIGroupSelector.title.addGroupButton=Choisir ce groupe
#############################################################################
# org.exoplatform.portal.component.customization.UIPageSelector#
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-05-14 05:04:01 UTC (rev 3090)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-05-14 05:09:56 UTC (rev 3091)
@@ -369,6 +369,9 @@
UIGroupSelector.lable.groupId=Mã nhóm:
UIGroupSelector.lable.description=Mô tả:
UIGroupSelector.action.done=Hoàn thành
+UIGroupSelector.title.selectGroupMember=Chọn nhóm
+UIGroupSelector.title.selectChildGroup=Chọn con của nhóm
+UIGroupSelector.title.addGroupButton=Chọn nhóm này
#############################################################################
# org.exoplatform.portal.component.customization.UIPageSelector#
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/organization/account/UIGroupSelector.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/organization/account/UIGroupSelector.gtmpl 2010-05-14 05:04:01 UTC (rev 3090)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/organization/account/UIGroupSelector.gtmpl 2010-05-14 05:09:56 UTC (rev 3091)
@@ -8,13 +8,13 @@
<div class="SelectedGroupPath"><% uicomponent.renderChild(UIBreadcumbs.class); %></div>
<div class="GroupSelector">
<div class="ContentContainer">
- <div class="MembershipTitle">Select Group</div>
+ <div class="MembershipTitle"><%=_ctx.appRes("UIGroupSelector.title.selectGroupMember")%></div>
<%uicomponent.renderChild(UITree.class);%>
</div>
</div>
<div class="MembershipSelector">
<div class="ContentContainer">
- <div class="MembershipTitle">Select Child Group</div>
+ <div class="MembershipTitle"><%=_ctx.appRes("UIGroupSelector.title.selectChildGroup")%></div>
<div class="OverflowContainer">
<%
boolean even = true;
@@ -30,7 +30,7 @@
<%}%>
<% } else if( groups != null && groups.size() == 0 ) { %>
<div class="AddButton">
- <a class="ItemIcon" href="<%= uicomponent.event("SelectGroup",uicomponent.getCurrentGroup().getId()) %>">select this group</a>
+ <a class="ItemIcon" href="<%= uicomponent.event("SelectGroup",uicomponent.getCurrentGroup().getId()) %>"><%=_ctx.appRes("UIGroupSelector.title.addGroupButton")%></a>
</div>
<% } %>
</div>
14 years, 7 months
gatein SVN: r3090 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-05-14 01:04:01 -0400 (Fri, 14 May 2010)
New Revision: 3090
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
Log:
GTNPORTAL-1072 Show protected content when edit page in special case (refactor code to look clearer)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-05-14 04:34:06 UTC (rev 3089)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-05-14 05:04:01 UTC (rev 3090)
@@ -199,7 +199,9 @@
int portalMode = Util.getUIPortalApplication().getModeState();
//Check mode of portal, portlet and permission for viewable
- if ((portalMode % 2 == 0 || uicomponent.getCurrentPortletMode().equals(PortletMode.EDIT)) && uicomponent.hasPermission())
+ if ((portalMode == UIPortalApplication.NORMAL_MODE || portalMode == UIPortalApplication.APP_VIEW_EDIT_MODE
+ || portalMode == UIPortalApplication.CONTAINER_VIEW_EDIT_MODE || uicomponent.getCurrentPortletMode().equals(PortletMode.EDIT))
+ && uicomponent.hasPermission())
{
PortletInvocationResponse response = uicomponent.invoke(renderInvocation);
if (response instanceof FragmentResponse)
14 years, 7 months
gatein SVN: r3089 - in portal/trunk/web/eXoResources/src/main/webapp: skin/DefaultSkin/portal/webui/component/view/UIDashboard and 1 other directory.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-05-14 00:34:06 -0400 (Fri, 14 May 2010)
New Revision: 3089
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css
Log:
GTNPORTAL-1095: IE6 User Interface problems
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2010-05-14 04:31:14 UTC (rev 3088)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UITabbedDashboard.js 2010-05-14 04:34:06 UTC (rev 3089)
@@ -82,7 +82,7 @@
inputElement.name = currentContent; // To store old value
inputElement.value = currentContent;
inputElement.style.border = "1px solid #b7b7b7";
- inputElement.style.width = "95px";
+ inputElement.style.width = (selectedElement.offsetWidth - 2 ) + "px";
inputElement.onkeypress = eXo.webui.UITabbedDashboard.renameTabLabel;
inputElement.setAttribute('maxLength', 50);
inputElement.onblur = function() {
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-05-14 04:31:14 UTC (rev 3088)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-05-14 04:34:06 UTC (rev 3089)
@@ -176,8 +176,26 @@
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .EditnewTab .MiddleTab {
background: url(background/TabDashboard.gif) repeat-x left -22px;
line-height: 22px;
+ vertical-align: middle;
+ padding-top: 0;
}
+.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 {
14 years, 7 months
gatein SVN: r3088 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-05-14 00:31:14 -0400 (Fri, 14 May 2010)
New Revision: 3088
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java
Log:
GTNPORTAL-1110: Update java code
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2010-05-14 04:07:53 UTC (rev 3087)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2010-05-14 04:31:14 UTC (rev 3088)
@@ -138,6 +138,7 @@
return null;
}
+ //TODO: Split the uri and use optimzed method <code>searchParentChildPairByPath</code>
public static ParentChildPair searchParentChildPairUnderNode(PageNode rootNode, String uri)
{
if(uri.equals(rootNode.getUri()))
@@ -167,6 +168,51 @@
return null;
}
+ /**
+ * Search a pair of page node (specified by the path) and its parent
+ *
+ * @param rootNode
+ * @param path
+ * @return
+ */
+ public static ParentChildPair searchParentChildPairByPath(PageNode rootNode, String[] path)
+ {
+ if(path.length == 0)
+ {
+ throw new IllegalArgumentException("The input path must have unzero length");
+ }
+
+ if(!rootNode.getName().equals(path[0]))
+ {
+ return null;
+ }
+ else
+ {
+ if(path.length == 1)
+ {
+ return new ParentChildPair(null, rootNode);
+ }
+
+ PageNode tempNode = rootNode;
+
+ PageNode parentNode = null;
+ PageNode childNode = null;
+ for(int i = 1; i< path.length; i++)
+ {
+ childNode = tempNode.getChild(path[i]);
+ if(childNode == null)
+ {
+ return null;
+ }
+ else
+ {
+ parentNode = tempNode;
+ }
+ }
+
+ return new ParentChildPair(parentNode, childNode);
+ }
+ }
public static PageNode searchPageNodeByUri(PageNode node, String uri)
{
14 years, 7 months