gatein SVN: r835 - in portal/trunk/web/portal/src/main/webapp/groovy: webui/core and 1 other directory.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2009-11-27 05:46:54 -0500 (Fri, 27 Nov 2009)
New Revision: 835
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl
Log:
GTNPORTAL-290: NPE when delete tab of new page in Dashboard page
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl 2009-11-27 10:36:14 UTC (rev 834)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl 2009-11-27 10:46:54 UTC (rev 835)
@@ -11,7 +11,7 @@
%>
<div class="UIWizardPageSetInfo">
<%uiform.begin()%>
- <div class="OverflowContainer <%=isNoSelecter ? "NoPageSelecter" : ""%>">
+ <div class="<%=isNoSelecter ? "NoPageSelecter" : ""%>">
<%if(!isNoSelecter) {%>
<div class="PageNodeContainer">
<% uicomponent.renderChild(UIPageNodeSelector.class); %>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl 2009-11-27 10:36:14 UTC (rev 834)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl 2009-11-27 10:46:54 UTC (rev 835)
@@ -4,15 +4,20 @@
<div class="UIWizardContent">
<%/*WizardStepTitle*/%>
+
<div class="WizardStepTitleBar">
- <div class="OverflowContainer">
- <div class="WizardIcon"><span></span></div>
- <div class="WizardTitle">
- <%=_ctx.appRes(uicomponent.getId() + ".label.pageCreateWizard")%>:
+ <div class="WizardStepTitleBarR">
+ <div class="WizardStepTitleBarM">
+ <div class="OverflowContainer">
+ <div class="WizardIcon"><span></span></div>
+ <div class="WizardTitle">
+ <%=_ctx.appRes(uicomponent.getId() + ".label.pageCreateWizard")%>:
+ </div>
+ <div class="StepTitle">
+ <%=_ctx.appRes(uicomponent.getId() + ".label.step"+String.valueOf(step)+".title")%>
+ </div>
+ </div>
</div>
- <div class="StepTitle">
- <%=_ctx.appRes(uicomponent.getId() + ".label.step"+String.valueOf(step)+".title")%>
- </div>
</div>
</div>
@@ -20,100 +25,104 @@
<div class="WizardStepContent"><% uicomponent.renderChildren(); %></div>
<div class="WizardControlBar">
- <div class="OverflowContainer">
- <div class="StepNavigationBar">
- <div class="StepNavigationTitle">
- <%=_ctx.appRes(uicomponent.getId() + ".label.wizardSteps")%>:
- </div>
- <%
- List children = uicomponent.getChildren();
- int numberSteps = uicomponent.getNumberSteps();
- String actionLink = "#";
- int i = 1;
- while(i <= numberSteps) {
- int j = i;
- if(uicomponent.isShowWelcomeComponent()) j--;
- if(j < 1){
- i++;
- continue;
- }
- strStep = _ctx.appRes(uicomponent.getId() + ".label.step") + String.valueOf(j);
- if(i != step) {
- actionLink = uicomponent.url("ViewStep" + String.valueOf(i));
- print "<a href=\"$actionLink\" title=\"$strStep\">";
- } else print "<a href=\"#\" class=\"SelectedStep\" title=\"$strStep\">";
-
- print String.valueOf(j);
- println "</a>";
- i++;
- }
- %>
- </div>
-
- <%/*Begin UIWizardActionBar*/%>
- <div class="ActionBar">
-
- <div class="UIAction">
- <table class="ActionContainer">
- <tr>
- <td>
- <% if (uicomponent.isShowActions()) { %>
- <div onclick="<%=uicomponent.event("Abort", "");%>" class="ActionButton LightBlueStyle">
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".label.abort")%></a>
+ <div class="WizardControlBarR">
+ <div class="WizardControlBarM">
+ <div class="OverflowContainer">
+ <div class="StepNavigationBar">
+ <div class="StepNavigationTitle">
+ <%=_ctx.appRes(uicomponent.getId() + ".label.wizardSteps")%>:
+ </div>
+ <%
+ List children = uicomponent.getChildren();
+ int numberSteps = uicomponent.getNumberSteps();
+ String actionLink = "#";
+ int i = 1;
+ while(i <= numberSteps) {
+ int j = i;
+ if(uicomponent.isShowWelcomeComponent()) j--;
+ if(j < 1){
+ i++;
+ continue;
+ }
+ strStep = _ctx.appRes(uicomponent.getId() + ".label.step") + String.valueOf(j);
+ if(i != step) {
+ actionLink = uicomponent.url("ViewStep" + String.valueOf(i));0
+ print "<a href=\"$actionLink\" title=\"$strStep\">";
+ } else print "<a href=\"#\" class=\"SelectedStep\" title=\"$strStep\">";
+
+ print String.valueOf(j);
+ println "</a>";
+ i++;
+ }
+ %>
+ </div>
+
+ <%/*Begin UIWizardActionBar*/%>
+ <div class="ActionBar">
+
+ <div class="UIAction">
+ <table class="ActionContainer">
+ <tr>
+ <td>
+ <% if (uicomponent.isShowActions()) { %>
+ <div onclick="<%=uicomponent.event("Abort", "");%>" class="ActionButton LightBlueStyle">
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".label.abort")%></a>
+ </div>
+ </div>
</div>
</div>
- </div>
- </div>
- <%
- String action = "next";
- if(step == children.size()){
- action = "done";
- actionLink = uicomponent.event("ViewStep" + String.valueOf(step+1), "");
- } else {
- actionLink = uicomponent.url("ViewStep" + String.valueOf(step+1));
- }
- %>
-
- <div onclick="$actionLink" class="ActionButton LightBlueStyle">
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <%=_ctx.appRes(uicomponent.getId() + ".label."+action)%>
+ <%
+ String action = "next";
+ if(step == children.size()){
+ action = "done";
+ actionLink = uicomponent.event("ViewStep" + String.valueOf(step+1), "");
+ } else {
+ actionLink = uicomponent.url("ViewStep" + String.valueOf(step+1));
+ }
+ %>
+
+ <div onclick="$actionLink" class="ActionButton LightBlueStyle">
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <%=_ctx.appRes(uicomponent.getId() + ".label."+action)%>
+ </div>
+ </div>
</div>
</div>
- </div>
- </div>
-
- <%
- int showBack = step;
- if (uicomponent.getClass().getName().contains("Edit")) showBack++;
- if(showBack > 2) {
- actionLink = uicomponent.url("ViewStep" + String.valueOf(step-1));
- String display = "LightBlueStyle";
- %>
- <div onclick="$actionLink" class="ActionButton $display">
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <%=_ctx.appRes(uicomponent.getId() + ".label.back")%>
+
+ <%
+ int showBack = step;
+ if (uicomponent.getClass().getName().contains("Edit")) showBack++;
+ if(showBack > 2) {
+ actionLink = uicomponent.url("ViewStep" + String.valueOf(step-1));
+ String display = "LightBlueStyle";
+ %>
+ <div onclick="$actionLink" class="ActionButton $display">
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <%=_ctx.appRes(uicomponent.getId() + ".label.back")%>
+ </div>
+ </div>
</div>
</div>
- </div>
- </div>
- <% } %>
-
-
- <%} // End if (step != 3)%>
- </td>
- </tr>
- </table>
+ <% } %>
+
+
+ <%} // End if (step != 3)%>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ </div>
+ <%/*End UIWizardActionBar*/%>
</div>
-
- </div>
- <%/*End UIWizardActionBar*/%>
+ </div>
</div>
</div>
15 years, 1 month
gatein SVN: r834 - portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow.
by do-not-reply＠jboss.org
Author: thanh.do
Date: 2009-11-27 05:36:14 -0500 (Fri, 27 Nov 2009)
New Revision: 834
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css
Log:
change icon for Edit Layout
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css 2009-11-27 10:27:22 UTC (rev 833)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css 2009-11-27 10:36:14 UTC (rev 834)
@@ -193,8 +193,8 @@
}
.UIPortalComposer .SaveButton {
- background: url(background/SaveIcon.gif) no-repeat right bottom; /* orientation=lt */
- background: url(background/SaveIcon-rt.gif) no-repeat left bottom; /* orientation=rt */
+ background: url(background/EdittedSaveIcon.gif) no-repeat right bottom; /* orientation=lt */
+ background: url(background/EdittedSaveIcon-rt.gif) no-repeat left bottom; /* orientation=rt */
cursor: pointer;
float: right; /* orientation=lt */
float: left; /* orientation=rt */
@@ -215,8 +215,8 @@
}
.UIPortalComposer .EdittedSaveButton {
- background: url(background/EdittedSaveIcon.gif) no-repeat right bottom; /* orientation=lt */
- background: url(background/EdittedSaveIcon-rt.gif) no-repeat left bottom; /* orientation=rt */
+ background: url(background/SaveIcon.gif) no-repeat right bottom; /* orientation=lt */
+ background: url(background/SaveIcon-rt.gif) no-repeat left bottom; /* orientation=rt */
cursor: pointer;
float: right; /* orientation=lt */
float: left; /* orientation=rt */
15 years, 1 month
gatein SVN: r833 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.
by do-not-reply＠jboss.org
Author: tam_nguyen
Date: 2009-11-27 05:27:22 -0500 (Fri, 27 Nov 2009)
New Revision: 833
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
Log:
GTNPORTAL-297 Always show public permission in access permission form of portal when limit number of access users
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2009-11-27 10:10:30 UTC (rev 832)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2009-11-27 10:27:22 UTC (rev 833)
@@ -521,6 +521,7 @@
UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
UIPortalForm portalForm = uiMaskWS.createUIComponent(UIPortalForm.class, null, "UIPortalForm");
portalForm.setPortalOwner(portalName);
+ portalForm.setBindingBean();
uiMaskWS.setWindowSize(700, -1);
event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2009-11-27 10:10:30 UTC (rev 832)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2009-11-27 10:27:22 UTC (rev 833)
@@ -132,9 +132,22 @@
super("UIPortalForm");
createDefaultItem();
setSelectedTab("PortalSetting");
- invokeGetBindingBean(Util.getUIPortal());
+
+ }
+
+ public void setBindingBean() throws Exception
+ {
+
+ UserPortalConfigService service = this.getApplicationComponent(UserPortalConfigService.class);
+ PortalRequestContext prContext = Util.getPortalRequestContext();
+
+ UserPortalConfig userConfig = service.getUserPortalConfig(getPortalOwner(), prContext.getRemoteUser());
+ UIPortal editPortal = this.createUIComponent(UIPortal.class, null, null);
+ PortalDataMapper.toUIPortal(editPortal, userConfig);
+
+ invokeGetBindingBean(editPortal);
((UIFormStringInput)getChild(UIFormInputSet.class).getChildById(FIELD_NAME))
- .setValue(((PortalRequestContext)WebuiRequestContext.getCurrentInstance()).getPortalOwner());
+ .setValue(getPortalOwner());
setActions(new String[]{"Save", "Close"});
}
@@ -238,9 +251,15 @@
public void execute(Event<UIPortalForm> event) throws Exception
{
UIPortalForm uiForm = event.getSource();
+
+ UserPortalConfigService service = uiForm.getApplicationComponent(UserPortalConfigService.class);
PortalRequestContext prContext = Util.getPortalRequestContext();
+
+ UserPortalConfig userConfig = service.getUserPortalConfig(uiForm.getPortalOwner(), prContext.getRemoteUser());
+ UIPortal uiPortal = uiForm.createUIComponent(UIPortal.class, null, null);
+ PortalDataMapper.toUIPortal(uiPortal, userConfig);
+
UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication();
- UIPortal uiPortal = Util.getUIPortal();
uiForm.invokeSetBindingBean(uiPortal);
//uiPortal.refreshNavigation(localeConfigService.getLocaleConfig(uiPortal.getLocale()).getLocale()) ;
if (uiPortalApp.getModeState() == UIPortalApplication.NORMAL_MODE)
15 years, 1 month
gatein SVN: r832 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-11-27 05:10:30 -0500 (Fri, 27 Nov 2009)
New Revision: 832
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
Log:
GTNPORTAL-282: In PageCreationWizard still create page at level 2
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-11-27 09:34:05 UTC (rev 831)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-11-27 10:10:30 UTC (rev 832)
@@ -78,7 +78,9 @@
setShowWelcomeComponent(false);
boolean isUserNav = Util.getUIPortal().getSelectedNavigation().getOwnerType().equals(PortalConfig.USER_TYPE);
if (isUserNav)
+ {
uiPageInfo.getChild(UIPageNodeSelector.class).setRendered(false);
+ }
}
private void saveData() throws Exception
@@ -105,6 +107,8 @@
UIPageNodeSelector uiNodeSelector = uiPageInfo.getChild(UIPageNodeSelector.class);
PageNode selectedNode = uiNodeSelector.getSelectedPageNode();
PageNavigation pageNav = uiNodeSelector.getSelectedNavigation();
+ if (PortalConfig.USER_TYPE.equals(pageNav.getOwnerType()))
+ selectedNode = null;
Page page = (Page)PortalDataMapper.buildModelObject(uiPage);
PageNode pageNode = uiPageInfo.getPageNode();
15 years, 1 month
gatein SVN: r831 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-11-27 04:34:05 -0500 (Fri, 27 Nov 2009)
New Revision: 831
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
Log:
GTNPORTAL-296: Change default value of session Alive to 'On Demand'
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2009-11-27 09:13:01 UTC (rev 830)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2009-11-27 09:34:05 UTC (rev 831)
@@ -28,7 +28,6 @@
import org.exoplatform.portal.config.model.PortalProperties;
import org.exoplatform.portal.resource.SkinService;
import org.exoplatform.portal.webui.util.PortalDataMapper;
-import org.exoplatform.portal.webui.util.PortalDataMapper;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIMaskWorkspace;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
@@ -50,8 +49,8 @@
import org.exoplatform.webui.core.model.SelectItemCategory;
import org.exoplatform.webui.core.model.SelectItemOption;
import org.exoplatform.webui.event.Event;
+import org.exoplatform.webui.event.EventListener;
import org.exoplatform.webui.event.Event.Phase;
-import org.exoplatform.webui.event.EventListener;
import org.exoplatform.webui.form.UIFormInputItemSelector;
import org.exoplatform.webui.form.UIFormInputSet;
import org.exoplatform.webui.form.UIFormSelectBox;
@@ -61,8 +60,8 @@
import org.exoplatform.webui.form.validator.MandatoryValidator;
import org.exoplatform.webui.form.validator.StringLengthValidator;
import org.exoplatform.webui.organization.UIListPermissionSelector;
+import org.exoplatform.webui.organization.UIPermissionSelector;
import org.exoplatform.webui.organization.UIListPermissionSelector.EmptyIteratorValidator;
-import org.exoplatform.webui.organization.UIPermissionSelector;
import java.util.ArrayList;
import java.util.Collection;
@@ -105,7 +104,7 @@
setSelectedTab(uiTemplateInput.getId());
createDefaultItem();
- UIFormInputSet uiPortalSetting = this.<UIFormInputSet>getChildById("PortalSetting");
+ UIFormInputSet uiPortalSetting = this.<UIFormInputSet> getChildById("PortalSetting");
UIFormStringInput uiNameInput = uiPortalSetting.getUIStringInput(FIELD_NAME);
uiNameInput.setEditable(true);
@@ -204,6 +203,7 @@
.add(new SelectItemOption<String>(PortalProperties.SESSION_NEVER, PortalProperties.SESSION_NEVER));
UIFormSelectBox uiSessionAliveBox =
new UIFormSelectBox(FIELD_SESSION_ALIVE, FIELD_SESSION_ALIVE, listSessionAlive);
+ uiSessionAliveBox.setValue(PortalProperties.SESSION_ON_DEMAND);
uiPropertiesSet.addUIFormInput(uiSessionAliveBox);
addUIFormInput(uiPropertiesSet);
15 years, 1 month
gatein SVN: r830 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/navigation and 1 other directory.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-11-27 04:13:01 -0500 (Fri, 27 Nov 2009)
New Revision: 830
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
Log:
GTNPORTAL-287 It should be able to paste a node to root node in navigation
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2009-11-27 08:53:50 UTC (rev 829)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2009-11-27 09:13:01 UTC (rev 830)
@@ -341,7 +341,7 @@
ArrayList<PageNavigation> list = new ArrayList<PageNavigation>();
list.add(navi);
selector.initNavigations(list);
- selector.removeChild(UIRightClickPopupMenu.class);
+ //selector.removeChild(UIRightClickPopupMenu.class);
popUp.setUIComponent(naviManager);
popUp.setShowMask(true);
popUp.setShow(true);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2009-11-27 08:53:50 UTC (rev 829)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2009-11-27 09:13:01 UTC (rev 830)
@@ -69,7 +69,9 @@
@EventConfig(listeners = UINavigationNodeSelector.MoveUpActionListener.class),
@EventConfig(listeners = UINavigationNodeSelector.MoveDownActionListener.class),
@EventConfig(listeners = UINavigationNodeSelector.DeleteNodeActionListener.class, confirm = "UIPageNodeSelector.deleteNavigation")}),
- @ComponentConfig(id = "UINavigationNodeSelectorPopupMenu", type = UIRightClickPopupMenu.class, template = "system:/groovy/webui/core/UIRightClickPopupMenu.gtmpl", events = {})})
+ @ComponentConfig(id = "UINavigationNodeSelectorPopupMenu", type = UIRightClickPopupMenu.class, template = "system:/groovy/webui/core/UIRightClickPopupMenu.gtmpl", events = {
+ @EventConfig(listeners = UINavigationNodeSelector.AddNodeActionListener.class),
+ @EventConfig(listeners = UINavigationNodeSelector.PasteNodeActionListener.class)})})
public class UINavigationNodeSelector extends UIContainer
{
@@ -83,7 +85,9 @@
public UINavigationNodeSelector() throws Exception
{
- addChild(UIRightClickPopupMenu.class, "UINavigationNodeSelectorPopupMenu", null).setRendered(false);
+ UIRightClickPopupMenu rightClickPopup =
+ addChild(UIRightClickPopupMenu.class, "UINavigationNodeSelectorPopupMenu", null).setRendered(true);
+ rightClickPopup.setActions(new String[]{"AddNode", "PasteNode"});
UITree uiTree = addChild(UITree.class, null, "TreeNodeSelector");
uiTree.setIcon("DefaultPageIcon");
@@ -451,7 +455,7 @@
UIWorkingWorkspace uiWorkingWS = uiApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
UIPortalToolPanel uiToolPanel =
- uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class).setRendered(true);
+ uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class).setRendered(true);
UserPortalConfigService userService = uiToolPanel.getApplicationComponent(UserPortalConfigService.class);
// get selected page
@@ -465,13 +469,13 @@
uiApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.UserNotPermission", new String[]{pageId}, 1));
return;
}
-
+
uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
//uiWorkingWS.setRenderedChild(UIPortalToolPanel.class);
//uiWorkingWS.addChild(UIPortalComposer.class, "UIPageEditor", null);
-
+
uiWorkingWS.setRenderedChild(UIEditInlineWorkspace.class);
-
+
UIPortalComposer portalComposer =
uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(true);
portalComposer.setShowControl(true);
@@ -479,15 +483,15 @@
portalComposer.setCollapse(false);
portalComposer.setId("UIPageEditor");
portalComposer.setComponentConfig(UIPortalComposer.class, "UIPageEditor");
-
+
uiToolPanel.setShowMaskLayer(false);
uiToolPanel.setWorkingComponent(UIPage.class, null);
UIPage uiPage = (UIPage)uiToolPanel.getUIComponent();
-
+
WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
selectPage.setModifier(context.getRemoteUser());
selectPage.setTitle(selectedPageNode.getLabel());
-
+
// convert Page to UIPage
PortalDataMapper.toUIPage(uiPage, selectPage);
Util.getPortalRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS);
@@ -522,8 +526,7 @@
UserACL userACL = uiApp.getApplicationComponent(UserACL.class);
if (!userACL.hasPermission(node))
{
- uiApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.UserNotPermission", new String[]{pageId}, 1));
- ;
+ uiApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.UserNotPermission", new String[]{pageId}, 1));;
return;
}
}
15 years, 1 month
gatein SVN: r829 - in portal/trunk: portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component and 1 other directory.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-11-27 03:53:50 -0500 (Fri, 27 Nov 2009)
New Revision: 829
Modified:
portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/Calculator.xml
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl
Log:
GTNPORTAL-257: Correct name of gadgets in UIGadgetInfo
Modified: portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/Calculator.xml
===================================================================
--- portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/Calculator.xml 2009-11-27 06:58:47 UTC (rev 828)
+++ portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/Calculator/Calculator.xml 2009-11-27 08:53:50 UTC (rev 829)
@@ -31,7 +31,7 @@
<Module>
<ModulePrefs author="eXoPlatform"
title="Calculator"
- directory_title="Caculator"
+ directory_title="Calculator"
title_url="http://www.exoplatform.org"
description="This simple and useful calculator lets you perform most of the basic arithmetic operations."
thumbnail="http://localhost:8080/eXoGadgets/skin/DefaultSkin/portletIcons/Calculator..."
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl 2009-11-27 06:58:47 UTC (rev 828)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl 2009-11-27 08:53:50 UTC (rev 829)
@@ -25,7 +25,7 @@
<table class="TitleBarApplication">
<tr>
<td class="LeftLabel"><%=_ctx.appRes("UIGadgetInfo.label.name")%></td>
- <td class="RightLabel" title=" <%= gadget.getTitle() %> "><%= gadget.getTitle() %></td>
+ <td class="RightLabel" title=" <%= gadget.getName() %> "><%= gadget.getName() %></td>
</tr>
</table>
<table>
15 years, 1 month
gatein SVN: r828 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-11-27 01:58:47 -0500 (Fri, 27 Nov 2009)
New Revision: 828
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java
Log:
GTNPORTAL-303: In Register portlet, show exception when find username by null
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java 2009-11-27 06:27:37 UTC (rev 827)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java 2009-11-27 06:58:47 UTC (rev 828)
@@ -33,9 +33,12 @@
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
import org.exoplatform.webui.event.Event.Phase;
+import org.exoplatform.webui.exception.MessageException;
import org.exoplatform.webui.form.UIForm;
import org.exoplatform.webui.form.UIFormInputWithActions;
+import org.exoplatform.webui.form.UIFormStringInput;
import org.exoplatform.webui.form.UIFormInputWithActions.ActionData;
+import org.exoplatform.webui.form.validator.MandatoryValidator;
/**
*
@@ -44,23 +47,18 @@
*
*/
-@ComponentConfig(
- lifecycle = UIFormLifecycle.class,
- template = "system:/groovy/webui/form/UIFormWithTitle.gtmpl",
- events = {
- @EventConfig( listeners = UIRegisterForm.SubscribeActionListener.class),
- @EventConfig( listeners = UIRegisterForm.ResetActionListener.class, phase = Phase.DECODE),
- @EventConfig( name = UIRegisterForm.CheckUsernameAvailability.LISTENER_NAME,
- listeners = UIRegisterForm.CheckUsernameAvailability.class,
- phase = Phase.DECODE)
- }
-)
-public class UIRegisterForm extends UIForm {
+@ComponentConfig(lifecycle = UIFormLifecycle.class, template = "system:/groovy/webui/form/UIFormWithTitle.gtmpl", events = {
+ @EventConfig(listeners = UIRegisterForm.SubscribeActionListener.class),
+ @EventConfig(listeners = UIRegisterForm.ResetActionListener.class, phase = Phase.DECODE),
+ @EventConfig(name = UIRegisterForm.CheckUsernameAvailability.LISTENER_NAME, listeners = UIRegisterForm.CheckUsernameAvailability.class, phase = Phase.DECODE)})
+public class UIRegisterForm extends UIForm
+{
- private final static String[] ACTIONS = {"Subscribe", "Reset"};
-
- public UIRegisterForm() throws Exception{
- UIFormInputWithActions registerInput = new UIRegisterInputSet("RegisterInputSet");
+ private final static String[] ACTIONS = {"Subscribe", "Reset"};
+
+ public UIRegisterForm() throws Exception
+ {
+ UIFormInputWithActions registerInput = new UIRegisterInputSet("RegisterInputSet");
//Set actions on registerInput 's User Name field
List<ActionData> fieldActions = new ArrayList<ActionData>();
ActionData checkAvailable = new ActionData();
@@ -70,66 +68,89 @@
checkAvailable.setCssIconClass("SearchIcon");
fieldActions.add(checkAvailable);
registerInput.setActionField(UIRegisterInputSet.USER_NAME, fieldActions);
-
+
addUIFormInput(registerInput);
setActions(ACTIONS);
- }
-
- private void resetInput(){
+ }
+
+ private void resetInput()
+ {
getChild(UIRegisterInputSet.class).reset();
}
-
- static public class SubscribeActionListener extends EventListener<UIRegisterForm>{
- @Override
- public void execute(Event<UIRegisterForm> event) throws Exception {
- UIRegisterForm registerForm = event.getSource();
+
+ static public class SubscribeActionListener extends EventListener<UIRegisterForm>
+ {
+ @Override
+ public void execute(Event<UIRegisterForm> event) throws Exception
+ {
+ UIRegisterForm registerForm = event.getSource();
OrganizationService orgService = registerForm.getApplicationComponent(OrganizationService.class);
UserHandler userHandler = orgService.getUserHandler();
WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
UIRegisterInputSet registerInput = registerForm.getChild(UIRegisterInputSet.class);
-
- if(registerInput.save(userHandler, context)){
+
+ if (registerInput.save(userHandler, context))
+ {
//TODO: Send email and add Account Activating feature
UIApplication uiApp = context.getUIApplication();
uiApp.addMessage(new ApplicationMessage("UIRegisterForm.registerWithSuccess.message", null));
}
- }
- }
-
- static public class CheckUsernameAvailability extends EventListener<UIRegisterForm>{
-
- final static String LISTENER_NAME = "CheckUsernameAvailability";
-
+ }
+ }
+
+ static public class CheckUsernameAvailability extends EventListener<UIRegisterForm>
+ {
+
+ final static String LISTENER_NAME = "CheckUsernameAvailability";
+
@Override
public void execute(Event<UIRegisterForm> event) throws Exception
{
UIRegisterForm registerForm = event.getSource();
OrganizationService orgService = registerForm.getApplicationComponent(OrganizationService.class);
UIRegisterInputSet registerInput = registerForm.getChild(UIRegisterInputSet.class);
- String typedUsername = registerInput.getUIStringInput(UIRegisterInputSet.USER_NAME).getValue();
-
- if(usernameIsUsed(typedUsername, orgService)){
+ UIFormStringInput userNameInput = registerInput.getUIStringInput(UIRegisterInputSet.USER_NAME);
+ MandatoryValidator validator = new MandatoryValidator();
+ try
+ {
+ validator.validate(userNameInput);
+ }
+ catch (MessageException e)
+ {
+ event.getRequestContext().getUIApplication().addMessage(e.getDetailMessage());
+ return;
+ }
+
+ String typedUsername = userNameInput.getValue();
+ if (usernameIsUsed(typedUsername, orgService))
+ {
WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
UIApplication uiApp = context.getUIApplication();
-
- uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.user-exist", new String[]{ typedUsername}));
+
+ uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.user-exist", new String[]{typedUsername}));
}
}
-
- private boolean usernameIsUsed(String username, OrganizationService orgService){
+
+ private boolean usernameIsUsed(String username, OrganizationService orgService)
+ {
UserHandler userHandler = orgService.getUserHandler();
- try{
- if( userHandler.findUserByName(username) != null){
+ try
+ {
+ if (userHandler.findUserByName(username) != null)
+ {
return true;
}
- }catch(Exception ex){
+ }
+ catch (Exception ex)
+ {
ex.printStackTrace();
}
return false;
}
}
-
- static public class ResetActionListener extends EventListener<UIRegisterForm>{
+
+ static public class ResetActionListener extends EventListener<UIRegisterForm>
+ {
@Override
public void execute(Event<UIRegisterForm> event) throws Exception
{
15 years, 1 month
gatein SVN: r827 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2009-11-27 01:27:37 -0500 (Fri, 27 Nov 2009)
New Revision: 827
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
Log:
GTNPORTAL-313 Fix IPC error which causes an infinite loop
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2009-11-27 04:07:01 UTC (rev 826)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2009-11-27 06:27:37 UTC (rev 827)
@@ -410,13 +410,13 @@
* page (usual layout or webos) which instance can be targeted by the
* event and then process the event on the associated UIPortlet component
*/
- for (Iterator<javax.portlet.Event> iter = events.iterator(); iter.hasNext();)
+ while(events.size() > 0)
{
- javax.portlet.Event nativeEvent = iter.next();
+ javax.portlet.Event nativeEvent = events.remove(0);
QName eventName = nativeEvent.getQName();
- for (Iterator iterator = portletInstancesInPage.iterator(); iterator.hasNext();)
+ for (Iterator<UIPortlet> iterator = portletInstancesInPage.iterator(); iterator.hasNext();)
{
- UIPortlet uiPortletInPage = (UIPortlet)iterator.next();
+ UIPortlet uiPortletInPage = iterator.next();
if (uiPortletInPage.supportsProcessingEvent(eventName)
&& !eventsWrapper.isInvokedTooManyTimes(uiPortletInPage))
{
@@ -439,7 +439,6 @@
log.info("The portlet: " + uiPortletInPage.getPortletContext().getId()
+ " processEvent() method has generated new events itself");
events.addAll(newEvents);
- uiPortlet.createEvent("ProcessEvents", Phase.PROCESS, context).broadcast();
}
}
}
15 years, 1 month
gatein SVN: r826 - in portal/trunk: web/portal/src/main/webapp/groovy/portal/webui/page and 1 other directories.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-11-26 23:07:01 -0500 (Thu, 26 Nov 2009)
New Revision: 826
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/Stylesheet.css
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
Log:
GTNPORTAL-290: Remove PageNodeSelecter in UIPageCreationWizard with User Navigation
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/Stylesheet.css 2009-11-27 04:00:25 UTC (rev 825)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIWizard/Stylesheet.css 2009-11-27 04:07:01 UTC (rev 826)
@@ -194,6 +194,11 @@
float: left; /* orientation=lt */
float: right; /* orientation=rt */
width: 240px;
+}
+
+.UIWizard .UIWizardPageSetInfo .NoPageSelecter .SelectedPageInfo {
+ margin-left: auto; /* orientation=lt */
+ margin-right: auto; /* orientation=rt */
}
.UIWizard .UIWizardPageSetInfo .SelectedPageInfo {
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl 2009-11-27 04:00:25 UTC (rev 825)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIWizardPageSetInfo.gtmpl 2009-11-27 04:07:01 UTC (rev 826)
@@ -7,13 +7,16 @@
PageNode pageNode = uicomponent.getSelectedPageNode();
String nodeName = "";
if(pageNode!=null ) nodeName = "/"+pageNode.getResolvedLabel();
+ boolean isNoSelecter = !uicomponent.getChild(UIPageNodeSelector.class).isRendered();
%>
<div class="UIWizardPageSetInfo">
<%uiform.begin()%>
- <div class="OverflowContainer">
+ <div class="OverflowContainer <%=isNoSelecter ? "NoPageSelecter" : ""%>">
+ <%if(!isNoSelecter) {%>
<div class="PageNodeContainer">
<% uicomponent.renderChild(UIPageNodeSelector.class); %>
</div>
+ <%}%>
<div class="SelectedPageInfo">
<div class="PageInfoContainer">
<div class="PageNodeInfo">
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-11-27 04:00:25 UTC (rev 825)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-11-27 04:07:01 UTC (rev 826)
@@ -70,12 +70,15 @@
public UIPageCreationWizard() throws Exception
{
- addChild(UIWizardPageSetInfo.class, null, null).setRendered(false);
+ UIWizardPageSetInfo uiPageInfo = addChild(UIWizardPageSetInfo.class, null, null).setRendered(false);
addChild(UIWizardPageSelectLayoutForm.class, null, null).setRendered(false);
addChild(UIPagePreview.class, null, null).setRendered(false);
setNumberSteps(NUMBER_OF_STEPs);
viewStep(FIRST_STEP);
setShowWelcomeComponent(false);
+ boolean isUserNav = Util.getUIPortal().getSelectedNavigation().getOwnerType().equals(PortalConfig.USER_TYPE);
+ if (isUserNav)
+ uiPageInfo.getChild(UIPageNodeSelector.class).setRendered(false);
}
private void saveData() throws Exception
@@ -120,7 +123,7 @@
{
pageNav.addNode(pageNode);
}
- pageNav.setModifier(RequestContext.<WebuiRequestContext>getCurrentInstance().getRemoteUser());
+ pageNav.setModifier(RequestContext.<WebuiRequestContext> getCurrentInstance().getRemoteUser());
uiNodeSelector.selectPageNodeByUri(pageNode.getUri());
service.create(page);
@@ -181,7 +184,7 @@
uiWizard.updateWizardComponent();
uiWizard.viewStep(FIRST_STEP);
-
+
uiWizard.setShowActions(true);
UIWorkingWorkspace uiWorkingWS = uiWizard.getAncestorOfType(UIWorkingWorkspace.class);
@@ -225,8 +228,7 @@
if (navigation == null)
{
uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.notSelectedPageNavigation",
- new String[]{}));
- ;
+ new String[]{}));;
uiWizard.viewStep(FIRST_STEP);
return;
}
15 years, 1 month
