gatein SVN: r673 - components/common/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-11-19 08:27:58 -0500 (Thu, 19 Nov 2009)
New Revision: 673
Modified:
components/common/trunk/pom.xml
Log:
Standardize Name and Description in POM
Modified: components/common/trunk/pom.xml
===================================================================
--- components/common/trunk/pom.xml 2009-11-19 13:20:34 UTC (rev 672)
+++ components/common/trunk/pom.xml 2009-11-19 13:27:58 UTC (rev 673)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
- <name>GateIn - Common component</name>
+ <name>GateIn - Common</name>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
15 years, 1 month
gatein SVN: r672 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/application and 1 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-11-19 08:20:34 -0500 (Thu, 19 Nov 2009)
New Revision: 672
Modified:
portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/portlet.xml
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
Log:
- GTNPORTAL-263 : Adding gadgets to a page always defaults to the horoscope one
- disable edit mode of gadget wrapper as it does not make sense to edit the url of an existing gadget via preferences
Modified: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/portlet.xml 2009-11-19 13:04:01 UTC (rev 671)
+++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/portlet.xml 2009-11-19 13:20:34 UTC (rev 672)
@@ -75,7 +75,6 @@
<expiration-cache>0</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
- <portlet-mode>edit</portlet-mode>
</supports>
<supported-locale>en</supported-locale>
<resource-bundle>locale.portlet.gadget.GadgetPortlet</resource-bundle>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2009-11-19 13:04:01 UTC (rev 671)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2009-11-19 13:20:34 UTC (rev 672)
@@ -183,7 +183,7 @@
public ApplicationState<Gadget> update(ExoContainer container, ExoPortletState updateState,
ApplicationState<Gadget> gadgetApplicationState) throws Exception
{
- throw new UnsupportedOperationException("todo / julien");
+ throw new UnsupportedOperationException("Cannot edit gadget preferences");
}
@Override
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-19 13:04:01 UTC (rev 671)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2009-11-19 13:20:34 UTC (rev 672)
@@ -345,15 +345,6 @@
app = appList.getApplication(sourceId);
ApplicationType applicationType = app.getType();
- // TanPD: Hardcoded to fix bug GTNPORTAL-91
- Application temp = null;
- if (applicationType.equals(ApplicationType.GADGET))
- {
- applicationType = ApplicationType.PORTLET;
- temp = app;
- app = appList.getApplication("dashboard/Gadget_Wrapper_Portlet");
- }
-
//
UIPortlet uiPortlet = uiTarget.createUIComponent(UIPortlet.class, null, null);
if (app.getDisplayName() != null)
@@ -382,41 +373,9 @@
//
uiPortlet.setState(new PortletState(state, applicationType));
-
- // TanPD: Fix bug GTNPORTAL-91
- if (temp != null && applicationType.equals(ApplicationType.PORTLET))
- {
- Portlet pref = uiPortlet.getPreferences();
- try
- {
- UIGadget uiGadget = uiPortlet.createUIComponent(UIGadget.class, null, null);
- uiGadget.setState(new TransientApplicationState<Gadget>(temp.getApplicationName()));
- pref.setValue("url", uiGadget.getUrl());
- }
- catch (Exception e)
- {
- // Fix in case: RSS Reader Gadget
- Preference aggIdPref = pref.getPreference("aggregatorId");
- String aggregatorId = null;
- if (aggIdPref == null || aggIdPref.getValue() == null || aggIdPref.getValue().length() == 0)
- aggregatorId = "rssAggregator";
- else
- aggregatorId = aggIdPref.getValue();
- GadgetRegistryService gadgetSrv = uiApp.getApplicationComponent(GadgetRegistryService.class);
- org.exoplatform.application.gadget.Gadget gadget = gadgetSrv.getGadget(aggregatorId);
- // TODO make sure it's an rss feed
- // TODO make sure that we did not add it already
- UIGadget uiGadget = uiPortlet.createUIComponent(UIGadget.class, null, null);
- uiGadget.setState(new TransientApplicationState<org.exoplatform.portal.pom.spi.gadget.Gadget>(
- gadget.getName()));
- pref.setValue("url", uiGadget.getUrl());
- }
- }
-
uiPortlet.setPortletInPortal(uiTarget instanceof UIPortal);
uiPortlet.setShowEditControl(true);
uiSource = uiPortlet;
-
}
List<UIComponent> children = uiTarget.getChildren();
uiSource.setParent(uiTarget);
15 years, 1 month
gatein SVN: r669 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-11-19 04:05:41 -0500 (Thu, 19 Nov 2009)
New Revision: 669
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
Log:
GTNPORTAL-236: Upgrade java code to show Next and Abort button at step 3
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-19 08:51:27 UTC (rev 668)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-11-19 09:05:41 UTC (rev 669)
@@ -287,6 +287,7 @@
if (uiWizard.getSelectedStep() < THIRD_STEP)
{
+ uiWizard.setShowActions(true);
uiWizard.setDescriptionWizard(uiWizard.getSelectedStep());
uiWizard.updateWizardComponent();
uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.StepByStep", null));
15 years, 1 month
gatein SVN: r668 - portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background.
by do-not-reply＠jboss.org
Author: thanh.do
Date: 2009-11-19 03:51:27 -0500 (Thu, 19 Nov 2009)
New Revision: 668
Added:
portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/BgEvenRow.gif
portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/BgOddRow.gif
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/GroupImage.png
Log:
add missing image
Added: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/BgEvenRow.gif
===================================================================
(Binary files differ)
Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/BgEvenRow.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/BgOddRow.gif
===================================================================
(Binary files differ)
Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/BgOddRow.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/GroupImage.png
===================================================================
(Binary files differ)
15 years, 1 month
gatein SVN: r667 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-11-19 03:13:17 -0500 (Thu, 19 Nov 2009)
New Revision: 667
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
Log:
GTNPORTAL-202: Update java code to fix errors when delete container inside a UIPage
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-19 08:08:58 UTC (rev 666)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2009-11-19 08:13:17 UTC (rev 667)
@@ -97,9 +97,9 @@
static public class DeleteComponentActionListener extends EventListener<UIComponent>
{
- private final static String UI_CONTAINER = "UIContainer";
+ private final static String UI_CONTAINER_PREFIX = "UIContainer-";
- private final static String UI_PORTLET = "UIPortlet";
+ private final static String UI_PORTLET_PREFIX = "UIPortlet-";
public void execute(Event<UIComponent> event) throws Exception
{
@@ -152,42 +152,80 @@
Util.showComponentLayoutMode(uiRemoveComponent.getClass());
PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
- String componentType = null;
+
+ // Case1: current component is a portlet
if (uiComponent instanceof UIPortlet)
{
- componentType = UI_PORTLET;
+ removeComponent(id, UI_PORTLET_PREFIX, pcontext);
+ return;
}
- else if (uiComponent instanceof org.exoplatform.portal.webui.container.UIContainer)
+
+ // Case 2: current component is a container
+ if (uiComponent instanceof org.exoplatform.portal.webui.container.UIContainer)
{
- componentType = UI_CONTAINER;
- org.exoplatform.portal.webui.container.UIContainer topAncestor = getTopBlockContainer((org.exoplatform.portal.webui.container.UIContainer)uiParent);
-
- //Case of nested container like tab container, mixed container
- if(topAncestor != null){
+ org.exoplatform.portal.webui.container.UIContainer topAncestor =
+ getTopBlockContainer((org.exoplatform.portal.webui.container.UIContainer)uiParent);
+
+ /**
+ * topAncestor is null if the uiParent is either UIPortal or UIPage,
+ * that happens when our container is a simple container
+ */
+ if (topAncestor == null)
+ {
+ removeComponent(id, UI_CONTAINER_PREFIX, pcontext);
+ return;
+ }
+ /** Case of nested container like tab container, mixed container */
+ else
+ {
String topAncestorId = topAncestor.getId();
- //Add UIContainer- prefix to the id as it is required to be updated by Ajax
- if(!topAncestorId.startsWith("UIContainer-")){
- topAncestor.setId("UIContainer-" + topAncestorId);
+
+ /** If the topAncestor has no child, then it is removed */
+ if (topAncestor.getChildren().size() == 0)
+ {
+ /** Update server-side */
+ UIContainer parentOfTopAncestor = topAncestor.getParent();
+ parentOfTopAncestor.removeChildById(topAncestorId);
+
+ /** Update client side */
+ if (topAncestorId.startsWith(UI_CONTAINER_PREFIX))
+ {
+ topAncestorId = topAncestorId.substring(UI_CONTAINER_PREFIX.length());
+ topAncestor.setId(topAncestorId);
+ }
+ removeComponent(topAncestorId, UI_CONTAINER_PREFIX, pcontext);
+ return;
}
+
+ /**
+ * If the topAncestor contains at least one child, then it is
+ * updated via Ajax
+ */
+ if (!topAncestorId.startsWith(UI_CONTAINER_PREFIX))
+ {
+ topAncestor.setId(UI_CONTAINER_PREFIX + topAncestorId);
+ }
pcontext.addUIComponentToUpdateByAjax(topAncestor);
return;
}
}
- if (componentType != null)
- {
- JavascriptManager jsManager = pcontext.getJavascriptManager();
- jsManager.addJavascript(scriptRemovingComponent(id, componentType));
- jsManager.addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();");
- }
}
- private String scriptRemovingComponent(String componentId, String componentType)
+ /** Add Javascript script to remove component */
+ private void removeComponent(String componentId, String componentType, PortalRequestContext pcontext)
{
+ String scriptRemovingComponent = scriptRemovingComponent(componentId, componentType);
+ JavascriptManager jsManager = pcontext.getJavascriptManager();
+ jsManager.addJavascript(scriptRemovingComponent);
+ jsManager.addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();");
+ }
+
+ private String scriptRemovingComponent(String componentId, String prefix)
+ {
StringBuffer buffer = new StringBuffer();
buffer.append("eXo.portal.UIPortal.removeComponent('");
- buffer.append(componentType);
- buffer.append("-");
+ buffer.append(prefix);
buffer.append(componentId);
buffer.append("');");
return buffer.toString();
@@ -196,12 +234,13 @@
/**
* Returns the top ancestor( of type
* org.exoplatform.portal.webui.container.UIContainer but not of type
- * UIPortal) of a given container
+ * UIPortal or UIPage) of a given container
*/
private static org.exoplatform.portal.webui.container.UIContainer getTopBlockContainer(
org.exoplatform.portal.webui.container.UIContainer container)
{
- if(container instanceof UIPortal){
+ if (container instanceof UIPortal || container instanceof UIPage)
+ {
return null;
}
org.exoplatform.portal.webui.container.UIContainer topAncestor = container;
@@ -209,7 +248,8 @@
try
{
intermediateCont = topAncestor.getParent();
- while (intermediateCont != null && !(intermediateCont instanceof UIPortal))
+ while (intermediateCont != null && !(intermediateCont instanceof UIPortal)
+ && !(intermediateCont instanceof UIPage))
{
topAncestor = intermediateCont;
intermediateCont = topAncestor.getParent();
15 years, 1 month
gatein SVN: r666 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-11-19 03:08:58 -0500 (Thu, 19 Nov 2009)
New Revision: 666
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml
Log:
GTNPORTAL-219 show duplicate "gadget" category when click " Import Applications"
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java 2009-11-19 07:19:28 UTC (rev 665)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java 2009-11-19 08:08:58 UTC (rev 666)
@@ -239,6 +239,15 @@
{
UIApplicationOrganizer uiOrganizer = event.getSource();
ApplicationRegistryService service = uiOrganizer.getApplicationComponent(ApplicationRegistryService.class);
+
+ // Remove preconfig application to prevent duplicating
+ List<Application> preConfigApplications = service.getAllApplications();
+ if (preConfigApplications!=null) {
+ for (Application application : preConfigApplications) {
+ service.remove(application);
+ }
+ }
+
service.importAllPortlets();
service.importExoGadgets();
uiOrganizer.reload();
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2009-11-19 07:19:28 UTC (rev 665)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2009-11-19 08:08:58 UTC (rev 666)
@@ -378,11 +378,11 @@
</object-param>
<object-param>
- <name>eXoGadgets</name>
+ <name>Gadgets</name>
<description>Gadgets</description>
<object type="org.exoplatform.application.registry.ApplicationCategory">
<field name="name">
- <string>eXoGadgets</string>
+ <string>Gadgets</string>
</field>
<field name="displayName">
<string>Gadgets</string>
@@ -402,7 +402,7 @@
<value>
<object type="org.exoplatform.application.registry.Application">
<field name="categoryName">
- <string>eXoGadgets</string>
+ <string>Gadgets</string>
</field>
<field name="applicationName">
<string>Todo</string>
@@ -431,7 +431,7 @@
<value>
<object type="org.exoplatform.application.registry.Application">
<field name="categoryName">
- <string>eXoGadgets</string>
+ <string>Gadgets</string>
</field>
<field name="applicationName">
<string>Calendar</string>
@@ -462,7 +462,7 @@
<value>
<object type="org.exoplatform.application.registry.Application">
<field name="categoryName">
- <string>eXoGadgets</string>
+ <string>Gadgets</string>
</field>
<field name="applicationName">
<string>Calculator</string>
@@ -493,7 +493,7 @@
<value>
<object type="org.exoplatform.application.registry.Application">
<field name="categoryName">
- <string>eXoGadgets</string>
+ <string>Gadgets</string>
</field>
<field name="applicationName">
<string>rssAggregator</string>
15 years, 1 month
gatein SVN: r665 - portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background.
by do-not-reply＠jboss.org
Author: thanh.do
Date: 2009-11-19 02:19:28 -0500 (Thu, 19 Nov 2009)
New Revision: 665
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/LineBg.gif
Log:
add missing image
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/LineBg.gif
===================================================================
(Binary files differ)
15 years, 1 month
gatein SVN: r664 - in portal/trunk/web/portal/src/main/webapp: groovy/webui/core and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-11-19 01:51:27 -0500 (Thu, 19 Nov 2009)
New Revision: 664
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_es.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_ru.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.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/core/UIWizard.gtmpl
Log:
GTNPORTAL-236: Fix errors in resources bundled messages
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 2009-11-19 05:06:12 UTC (rev 663)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-19 06:51:27 UTC (rev 664)
@@ -638,10 +638,9 @@
UIPageCreationWizard.label.pageCreateWizard=Page Creation Wizard
UIPageCreationWizard.label.step=Step
UIPageCreationWizard.label.wizardSteps=Wizard Steps
-UIPageCreationWizard.label.step1.title=Welcome to the Page Creation Wizard
-UIPageCreationWizard.label.step2.title=Select a Navigation Node and create the Page
-UIPageCreationWizard.label.step3.title=Select a Page Layout Template
-UIPageCreationWizard.label.step4.title=Re-arrange the Page Layout and add Portlets to the Page
+UIPageCreationWizard.label.step1.title=Select a Navigation Node and create the Page
+UIPageCreationWizard.label.step2.title=Select a Page Layout Template
+UIPageCreationWizard.label.step3.title=Re-arrange the Page Layout and add Portlets to the Page
UIPageCreationWizard.label.abort=#{word.abort}
UIPageCreationWizard.label.back=#{word.back}
UIPageCreationWizard.label.next=#{word.next}
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2009-11-19 05:06:12 UTC (rev 663)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2009-11-19 06:51:27 UTC (rev 664)
@@ -638,10 +638,9 @@
UIPageCreationWizard.label.pageCreateWizard=Asistente Creaci\u00f3n de P\u00e1gina
UIPageCreationWizard.label.step=Paso
UIPageCreationWizard.label.wizardSteps=Pasos del Asistente
-UIPageCreationWizard.label.step1.title=Bienvenido al Asistente Creaci\u00f3n de P\u00e1gina
-UIPageCreationWizard.label.step2.title=Selecciona un Nodo de Navegaci\u00f3n y crea la P\u00e1gina
-UIPageCreationWizard.label.step3.title=Selecciona una Plantilla de Distribuci\u00f3n de P\u00e1gina
-UIPageCreationWizard.label.step4.title=Reorganiza la Distribuci\u00f3n de la P\u00e1gina y a\u00f1ade Portlets a la P\u00e1gina
+UIPageCreationWizard.label.step1.title=Selecciona un Nodo de Navegaci\u00f3n y crea la P\u00e1gina
+UIPageCreationWizard.label.step2.title=Selecciona una Plantilla de Distribuci\u00f3n de P\u00e1gina
+UIPageCreationWizard.label.step3.title=Reorganiza la Distribuci\u00f3n de la P\u00e1gina y a\u00f1ade Portlets a la P\u00e1gina
UIPageCreationWizard.label.abort=#{word.abort}
UIPageCreationWizard.label.back=#{word.back}
UIPageCreationWizard.label.next=#{word.next}
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 2009-11-19 05:06:12 UTC (rev 663)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-19 06:51:27 UTC (rev 664)
@@ -614,10 +614,9 @@
UIPageCreationWizard.label.pageCreateWizard=Assistant de création de page
UIPageCreationWizard.label.step=Etape
UIPageCreationWizard.label.wizardSteps=Etapes de l'assistant
-UIPageCreationWizard.label.step1.title=Bienvenue dans l'assistant de création de page
-UIPageCreationWizard.label.step2.title=Sélectionner un noeud pour la page et indiquer le nom de la page
-UIPageCreationWizard.label.step3.title=Sélectionner un modèle d'organisation de page
-UIPageCreationWizard.label.step4.title=Ré-organiser la page et ajouter des portlets
+UIPageCreationWizard.label.step1.title=Sélectionner un noeud pour la page et indiquer le nom de la page
+UIPageCreationWizard.label.step2.title=Sélectionner un modèle d'organisation de page
+UIPageCreationWizard.label.step3.title=Ré-organiser la page et ajouter des portlets
UIPageCreationWizard.label.abort=#{word.abort}
UIPageCreationWizard.label.back=#{word.back}
UIPageCreationWizard.label.next=#{word.next}
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-19 05:06:12 UTC (rev 663)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-19 06:51:27 UTC (rev 664)
@@ -628,10 +628,9 @@
UIPageCreationWizard.label.pageCreateWizard=Мастер создания страниц
UIPageCreationWizard.label.step=Шаг
UIPageCreationWizard.label.wizardSteps=Шаги
-UIPageCreationWizard.label.step1.title=Добро пожаловать в мастер создания страниц
-UIPageCreationWizard.label.step2.title=Выберите узел навигации и создайте страницу
-UIPageCreationWizard.label.step3.title=Выберите макет страницы
-UIPageCreationWizard.label.step4.title=Измените макет и добавьте портлеты
+UIPageCreationWizard.label.step1.title=Выберите узел навигации и создайте страницу
+UIPageCreationWizard.label.step2.title=Выберите макет страницы
+UIPageCreationWizard.label.step3.title=Измените макет и добавьте портлеты
UIPageCreationWizard.label.abort=#{word.abort}
UIPageCreationWizard.label.back=#{word.back}
UIPageCreationWizard.label.next=#{word.next}
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-19 05:06:12 UTC (rev 663)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-19 06:51:27 UTC (rev 664)
@@ -619,10 +619,9 @@
UIPageCreationWizard.label.pageCreateWizard=Wizard-створювач сторінок
UIPageCreationWizard.label.step=Крок
UIPageCreationWizard.label.wizardSteps=Wizard кроки
-UIPageCreationWizard.label.step1.title=Вітаємо на сторінці Wizard-створювача
-UIPageCreationWizard.label.step2.title=Вибрати навігаційний вузол і створити сторінку
-UIPageCreationWizard.label.step3.title=Вибрати шаблон сторінкової схеми
-UIPageCreationWizard.label.step4.title=Перекомпонувати схему сторінки і додати портлети
+UIPageCreationWizard.label.step1.title=Вибрати навігаційний вузол і створити сторінку
+UIPageCreationWizard.label.step2.title=Вибрати шаблон сторінкової схеми
+UIPageCreationWizard.label.step3.title=Перекомпонувати схему сторінки і додати портлети
UIPageCreationWizard.label.abort=#{word.abort}
UIPageCreationWizard.label.back=#{word.back}
UIPageCreationWizard.label.next=#{word.next}
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 2009-11-19 05:06:12 UTC (rev 663)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2009-11-19 06:51:27 UTC (rev 664)
@@ -619,10 +619,9 @@
UIPageCreationWizard.label.pageCreateWizard=Khởi tạo trang bằng Wizard
UIPageCreationWizard.label.step=Bước
UIPageCreationWizard.label.wizardSteps=Các bước tạo trang
-UIPageCreationWizard.label.step1.title=Chào mừng bạn đến với khởi tạo trang bằng Wizard.
-UIPageCreationWizard.label.step2.title=Chọn một node của trang và tạo tên trang.
-UIPageCreationWizard.label.step3.title=Lựa chọn cách trình bày trang theo mẫu.
-UIPageCreationWizard.label.step4.title=Sắp xếp lại cách trình bày trang và thêm Portlet vào trang.
+UIPageCreationWizard.label.step1.title=Chọn một node của trang và tạo tên trang.
+UIPageCreationWizard.label.step2.title=Lựa chọn cách trình bày trang theo mẫu.
+UIPageCreationWizard.label.step3.title=Sắp xếp lại cách trình bày trang và thêm Portlet vào trang.
UIPageCreationWizard.label.abort=#{word.abort}
UIPageCreationWizard.label.back=#{word.back}
UIPageCreationWizard.label.next=#{word.next}
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-19 05:06:12 UTC (rev 663)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIWizard.gtmpl 2009-11-19 06:51:27 UTC (rev 664)
@@ -39,7 +39,7 @@
}
strStep = _ctx.appRes(uicomponent.getId() + ".label.step") + String.valueOf(j);
if(i != step) {
- actionLink = uicomponent.url("ViewStep" + String.valueOf(i));0
+ actionLink = uicomponent.url("ViewStep" + String.valueOf(i));
print "<a href=\"$actionLink\" title=\"$strStep\">";
} else print "<a href=\"#\" class=\"SelectedStep\" title=\"$strStep\">";
15 years, 1 month
gatein SVN: r663 - in portal/trunk/docs: testing and 1 other directory.
by do-not-reply＠jboss.org
Author: dbaeli
Date: 2009-11-19 00:06:12 -0500 (Thu, 19 Nov 2009)
New Revision: 663
Added:
portal/trunk/docs/testing/
portal/trunk/docs/testing/GateIn_v3.0_BasicPortlets_TestDefinition.ods
portal/trunk/docs/testing/GateIn_v3.0_MainFucntions_TestDefinition.ods
portal/trunk/docs/testing/GateIn_v3.0_SniffTests.ods
portal/trunk/docs/testing/selenium-suite.zip
Log:
GTNPORTAL testing documentation (UI Testing scenarios)
Added: portal/trunk/docs/testing/GateIn_v3.0_BasicPortlets_TestDefinition.ods
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/testing/GateIn_v3.0_BasicPortlets_TestDefinition.ods
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: portal/trunk/docs/testing/GateIn_v3.0_MainFucntions_TestDefinition.ods
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/testing/GateIn_v3.0_MainFucntions_TestDefinition.ods
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: portal/trunk/docs/testing/GateIn_v3.0_SniffTests.ods
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/testing/GateIn_v3.0_SniffTests.ods
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: portal/trunk/docs/testing/selenium-suite.zip
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/testing/selenium-suite.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 1 month
gatein SVN: r662 - portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background.
by do-not-reply＠jboss.org
Author: thanh.do
Date: 2009-11-18 23:10:04 -0500 (Wed, 18 Nov 2009)
New Revision: 662
Added:
portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/Button.gif
Log:
add missing image
Added: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/Button.gif
===================================================================
(Binary files differ)
Property changes on: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/Button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 1 month