gatein SVN: r6237 - in components/wsrp/trunk: jcr-impl and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-15 05:20:27 -0400 (Fri, 15 Apr 2011)
New Revision: 6237
Modified:
components/wsrp/trunk/jcr-impl/pom.xml
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java
components/wsrp/trunk/pom.xml
Log:
- Upgraded to chromattic 1.1.0-beta2 and made necessary changes to mapping classes.
Modified: components/wsrp/trunk/jcr-impl/pom.xml
===================================================================
--- components/wsrp/trunk/jcr-impl/pom.xml 2011-04-15 08:11:35 UTC (rev 6236)
+++ components/wsrp/trunk/jcr-impl/pom.xml 2011-04-15 09:20:27 UTC (rev 6237)
@@ -22,7 +22,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
@@ -54,8 +55,9 @@
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.apt</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-common</artifactId>
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java 2011-04-15 08:11:35 UTC (rev 6236)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java 2011-04-15 09:20:27 UTC (rev 6237)
@@ -23,6 +23,7 @@
package org.gatein.wsrp.consumer.registry.mapping;
+import org.chromattic.api.annotations.DefaultValue;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.gatein.wsrp.consumer.EndpointConfigurationInfo;
@@ -46,11 +47,12 @@
public abstract void setWSTimeoutMilliseconds(Integer expiration);
- @Property(name = "enablewss", defaultValue = "false")
+ @Property(name = "enablewss")
+ @DefaultValue("false")
public abstract boolean getWSSEnabled();
-
+
public abstract void setWSSEnabled(boolean enable);
-
+
public void initFrom(EndpointConfigurationInfo info)
{
setWSDLURL(info.getWsdlDefinitionURL());
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java 2011-04-15 08:11:35 UTC (rev 6236)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java 2011-04-15 09:20:27 UTC (rev 6237)
@@ -23,6 +23,7 @@
package org.gatein.wsrp.consumer.registry.mapping;
+import org.chromattic.api.annotations.DefaultValue;
import org.chromattic.api.annotations.Id;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.OneToOne;
@@ -63,7 +64,8 @@
public abstract void setExpirationCacheSeconds(Integer expiration);
- @Property(name = "active", defaultValue = "false")
+ @Property(name = "active")
+ @DefaultValue("false")
public abstract boolean getActive();
public abstract void setActive(boolean active);
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-04-15 08:11:35 UTC (rev 6236)
+++ components/wsrp/trunk/pom.xml 2011-04-15 09:20:27 UTC (rev 6237)
@@ -58,7 +58,7 @@
<version.javax.xml.ws>2.1</version.javax.xml.ws>
<version.javax.xml.soap.saaj>1.3</version.javax.xml.soap.saaj>
<version.google-collections>1.0</version.google-collections>
- <version.chromattic>1.0.8</version.chromattic>
+ <version.chromattic>1.1.0-beta2</version.chromattic>
</properties>
<dependencyManagement>
@@ -174,6 +174,7 @@
<version>${version.google-collections}</version>
</dependency>
+
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.api</artifactId>
@@ -184,6 +185,7 @@
<groupId>org.chromattic</groupId>
<artifactId>chromattic.apt</artifactId>
<version>${version.chromattic}</version>
+ <scope>compile</scope>
</dependency>
<!--
14 years, 5 months
- 1
- 0
gatein SVN: r6236 - in portal/trunk: component/portal/src/main/java and 13 other directories.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-04-15 04:11:35 -0400 (Fri, 15 Apr 2011)
New Revision: 6236
Modified:
portal/trunk/
portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfig.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java
portal/trunk/component/portal/src/main/resources/binding.xml
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java
portal/trunk/component/portal/src/test/resources/portal/portal/classic/portal.xml
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
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/util/PortalDataMapper.java
Log:
GTNPORTAL-1854 Merge site describility to trunk
Property changes on: portal/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/branch-GTNPORTAL-1832:5993-6105
/portal/branches/wsrp-extraction:5828-6031
+ /portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/branch-GTNPORTAL-1832:5993-6105
/portal/branches/site-describability:6171-6235
/portal/branches/wsrp-extraction:5828-6031
Modified: portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-04-15 08:11:35 UTC (rev 6236)
@@ -88,6 +88,8 @@
<xs:complexType name="portalConfigType">
<xs:sequence>
<xs:element name="portal-name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="label" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="locale" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfig.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfig.java 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfig.java 2011-04-15 08:11:35 UTC (rev 6236)
@@ -36,6 +36,10 @@
private String templateName;
private String location;
+
+ private String label;
+
+ private String description;
/**
* @deprecated use the location instead
@@ -52,10 +56,12 @@
this.ownerType = cfg.ownerType;
this.templateLocation = cfg.templateLocation;
this.location = cfg.location;
+ this.label = cfg.label;
+ this.description = cfg.description;
this.templateName = cfg.templateName;
this.predefinedOwner = new HashSet<String>(cfg.predefinedOwner);
}
-
+
public NewPortalConfig(String path)
{
this.location = path;
@@ -126,10 +132,30 @@
this.ownerType = ownerType;
}
+ public String getLabel()
+ {
+ return label;
+ }
+
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
@Override
public String toString()
{
- return "PortalConfig[predefinedOwner=" + predefinedOwner + ",ownerType=" + ownerType + ",templateName=" + templateName +
- "location=" + location + "]";
+ return "PortalConfig[predefinedOwner=" + predefinedOwner + ",ownerType=" + ownerType + ",templateName="
+ + templateName + ",label=" + label + ",description=" + description + ",location=" + location + "]";
}
}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java 2011-04-15 08:11:35 UTC (rev 6236)
@@ -50,6 +50,10 @@
private String locale;
+ private String label;
+
+ private String description;
+
private String[] accessPermissions;
private String editPermission;
@@ -95,6 +99,8 @@
this.name = data.getName();
this.type = data.getType();
this.locale = data.getLocale();
+ this.label = data.getLabel();
+ this.description = data.getDescription();
this.accessPermissions = data.getAccessPermissions().toArray(new String[data.getAccessPermissions().size()]);
this.editPermission = data.getEditPermission();
this.properties = new Properties(data.getProperties());
@@ -238,6 +244,26 @@
setProperty(PortalProperties.SESSION_ALIVE, type);
}
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
+
+ public String getLabel()
+ {
+ return label;
+ }
+
static public class PortalConfigSet
{
private ArrayList<PortalConfig> portalConfigs;
@@ -281,6 +307,8 @@
name,
type,
locale,
+ label,
+ description,
accessPermissions,
editPermission,
properties,
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2011-04-15 08:11:35 UTC (rev 6236)
@@ -19,6 +19,8 @@
package org.exoplatform.portal.pom.data;
+import javassist.runtime.Desc;
+
import org.exoplatform.portal.config.NoSuchDataException;
import org.exoplatform.portal.config.StaleModelException;
import org.exoplatform.portal.config.UserACL;
@@ -312,6 +314,8 @@
accessPermissions = pr.getAccessPermissions();
editPermission = pr.getEditPermission();
}
+
+ Described described = src.adapt(Described.class);
//
return new PortalData(
@@ -319,6 +323,8 @@
src.getName(),
type,
attrs.getValue(MappedAttributes.LOCALE),
+ described.getName(),
+ described.getDescription(),
accessPermissions,
editPermission,
Collections.unmodifiableMap(properties),
@@ -348,6 +354,10 @@
ProtectedResource pr = dst.adapt(ProtectedResource.class);
pr.setAccessPermissions(src.getAccessPermissions());
pr.setEditPermission(src.getEditPermission());
+
+ Described described = dst.adapt(Described.class);
+ described.setName(src.getLabel());
+ described.setDescription(src.getDescription());
//
org.gatein.mop.api.workspace.Page templates = dst.getRootPage().getChild("templates");
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalData.java 2011-04-15 08:11:35 UTC (rev 6236)
@@ -48,12 +48,18 @@
/** . */
private final ContainerData portalLayout;
-
+
+ private final String label;
+
+ private final String description;
+
public PortalData(
String storageId,
String name,
String type,
String locale,
+ String label,
+ String description,
List<String> accessPermissions,
String editPermission,
Map<String, String> properties,
@@ -65,6 +71,8 @@
//
this.key = new PortalKey(type, name);
this.locale = locale;
+ this.label = label;
+ this.description = description;
this.accessPermissions = accessPermissions;
this.editPermission = editPermission;
this.properties = properties;
@@ -116,4 +124,14 @@
{
return portalLayout;
}
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public String getLabel()
+ {
+ return label;
+ }
}
Modified: portal/trunk/component/portal/src/main/resources/binding.xml
===================================================================
--- portal/trunk/component/portal/src/main/resources/binding.xml 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/component/portal/src/main/resources/binding.xml 2011-04-15 08:11:35 UTC (rev 6236)
@@ -113,7 +113,9 @@
<mapping name="portal-config" class="org.exoplatform.portal.config.model.PortalConfig" ordered="false">
<value name="portal-name" field="name"/>
- <value name="locale" field="locale"/>
+ <value name="label" field="label" default="" />
+ <value name="description" field="description" default="" />
+ <value name="locale" field="locale" />
<value name="access-permissions" field="accessPermissions" usage="optional"/>
<value name="edit-permission" field="editPermission" usage="optional"/>
<value name="skin" field="skin" usage="optional"/>
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-04-15 08:11:35 UTC (rev 6236)
@@ -55,10 +55,10 @@
assertEquals(expected, sb.toString());
}
- public void testGateInResources1_0() throws Exception
+ public void testGateInResources1_x() throws Exception
{
assertHash("d0591b0a022a0c2929e1aed8979857cd", "gatein_objects_1_0.xsd");
assertHash("99ae24c9bbfe1b59e066756a29ab6c79", "gatein_objects_1_1.xsd");
- assertHash("a3e06cf2a8c72cd8528e1112415e0b8b", "gatein_objects_1_2.xsd");
+ assertHash("616e7a91a5a841009f672af484f4861e", "gatein_objects_1_2.xsd");
}
}
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2011-04-15 08:11:35 UTC (rev 6236)
@@ -117,10 +117,14 @@
public void testCreatePortal() throws Exception
{
+ String label = "portal_foo";
+ String description = "This is new portal for testing";
PortalConfig portal = new PortalConfig();
portal.setType("portal");
portal.setName("foo");
portal.setLocale("en");
+ portal.setLabel(label);
+ portal.setDescription(description);
portal.setAccessPermissions(new String[]{UserACL.EVERYONE});
//
@@ -130,6 +134,8 @@
assertNotNull(portal);
assertEquals("portal", portal.getType());
assertEquals("foo", portal.getName());
+ assertEquals(label, portal.getLabel());
+ assertEquals(description, portal.getDescription());
}
public void testPortalConfigSave() throws Exception
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java 2011-04-15 08:11:35 UTC (rev 6236)
@@ -159,6 +159,8 @@
"foo02",
"foo03",
"foo04",
+ "foo10",
+ "foo11",
Arrays.asList("foo05"),
"foo06",
Collections.singletonMap("foo07", "foo08"),
Modified: portal/trunk/component/portal/src/test/resources/portal/portal/classic/portal.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/portal/classic/portal.xml 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/component/portal/src/test/resources/portal/portal/classic/portal.xml 2011-04-15 08:11:35 UTC (rev 6236)
@@ -25,6 +25,8 @@
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
<edit-permission>*:/platform/administrators</edit-permission>
+ <label>Classic</label>
+ <description>This is classic portal for testing</description>
<portal-layout>
<application>
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java 2011-04-15 08:11:35 UTC (rev 6236)
@@ -19,6 +19,7 @@
package org.exoplatform.toolbar.webui.component;
+import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.PageNavigation;
import org.exoplatform.portal.config.model.PageNode;
@@ -52,6 +53,19 @@
UserPortalConfigService dataStorage = getApplicationComponent(UserPortalConfigService.class);
return dataStorage.getAllPortalNames();
}
+
+ public String getPortalLabel(String portalName) throws Exception
+ {
+ DataStorage storage_ = getApplicationComponent(DataStorage.class);
+ PortalConfig portalConfig = storage_.getPortalConfig(portalName);
+ String label = portalConfig.getLabel();
+ if (label != null && label.trim().length() > 0)
+ {
+ return label;
+ }
+
+ return portalName;
+ }
public String getCurrentPortal()
{
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-04-15 08:11:35 UTC (rev 6236)
@@ -35,12 +35,13 @@
if(isCurrent && nodes.size() > 0) clazz = "class='ArrowIcon'";
else clazz = "";
href = uicomponent.getPortalURI(portal);
+ label = uicomponent.getPortalLabel(portal);
EntityEncoder entityEncoder = EntityEncoder.FULL;
portal = entityEncoder.encode(portal);
print """
<div class="MenuItem portlet-menu-cascade-item">
<div $clazz>
- <a href="$href" class="ItemIcon SiteIcon">$portal</a>
+ <a href="$href" class="ItemIcon SiteIcon">$label</a>
</div>
""";
if(isCurrent) {
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2011-04-15 08:11:35 UTC (rev 6236)
@@ -19,9 +19,20 @@
<tr>
<td class="Image"><img src="/exoadmin/skin/navigation/webui/component/background/PlImg.gif" alt=""/></td>
<td class="Content">
- <div class="Label"><%=uicomponent.getFieldValue(portalConfig, 'name') %></div>
-
- </td>
+ <div class="Label"><%=uicomponent.getFieldValue(portalConfig, 'name') %></div>
+ <%
+ def siteLabel = uicomponent.getFieldValue(portalConfig, 'label');
+ def siteDescription = uicomponent.getFieldValue(portalConfig, 'description');
+ if (siteLabel != null && siteLabel.trim().length() > 0)
+ {
+ print """<div>$siteLabel</div>""";
+ }
+ if (siteDescription != null && siteDescription.trim().length() > 0)
+ {
+ print """<div>$siteDescription</div>""";
+ }
+ %>
+ </td>
<td class="ActionBlock">
<a href="<%=uicomponent.event("EditPortalLayout", portalConfig.getName());%>" class="EditLayoutIcon"><%=_ctx.appRes("UISiteManagement.label.editLayout")%></a>
<a href="<%=uicomponent.event("EditNavigation", portalConfig.getName());%>" class="EditNavIcon"><%=_ctx.appRes("UISiteManagement.label.editNav")%></a>
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 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-04-15 08:11:35 UTC (rev 6236)
@@ -355,6 +355,8 @@
UIPortalForm.msg.sameName=This portal name already exists.
UIPortalForm.msg.notExistAnymore=This portal is not existed or may be deleted.
UIPortalForm.label.name=Portal Name :
+UIPortalForm.label.label=Label :
+UIPortalForm.label.description=Description :
UIPortalForm.label.locale=#{word.locale} :
UIPortalForm.label.date=#{word.date} :
UIPortalForm.label.factoryId=Portal Types
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-04-15 08:11:35 UTC (rev 6236)
@@ -89,6 +89,10 @@
private String ownerType;
private String locale;
+
+ private String label;
+
+ private String description;
private String editPermission;
@@ -378,6 +382,26 @@
setProperty(PortalProperties.SESSION_ALIVE, type);
}
+ public String getLabel()
+ {
+ return label;
+ }
+
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
private void localizePageNavigation(PageNavigation nav,Locale locale)
{
ResourceBundleManager mgr = getApplicationComponent(ResourceBundleManager.class);
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 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2011-04-15 08:11:35 UTC (rev 6236)
@@ -96,6 +96,10 @@
private static final String FIELD_LOCALE = "locale";
private static final String FIELD_SESSION_ALIVE = "sessionAlive";
+
+ private static final String FIELD_LABEL = "label";
+
+ private static final String FIELD_DESCRIPTION = "description";
private String portalOwner_;
@@ -181,7 +185,6 @@
setActions(new String[]{"Save", "Close"});
}
- @SuppressWarnings("unchecked")
private class LanguagesComparator implements Comparator<SelectItemOption>
{
public int compare(SelectItemOption o1, SelectItemOption o2)
@@ -237,7 +240,10 @@
StringLengthValidator.class, 3, 30).addValidator(IdentifierValidator.class).setEditable(false))
.addUIFormInput(
new UIFormSelectBox(FIELD_LOCALE, FIELD_LOCALE, languages).addValidator(MandatoryValidator.class));
-
+
+ uiSettingSet.addUIFormInput(new UIFormStringInput(FIELD_LABEL, FIELD_LABEL, null));
+ uiSettingSet.addUIFormInput(new UIFormStringInput(FIELD_DESCRIPTION, FIELD_DESCRIPTION, null));
+
List<SelectItemOption<String>> listSkin = new ArrayList<SelectItemOption<String>>();
SkinService skinService = getApplicationComponent(SkinService.class);
for (String skin : skinService.getAvailableSkinNames())
@@ -317,6 +323,11 @@
dataService.save(portalConfig);
prContext.setAttribute(UserPortalConfig.class, service.getUserPortalConfig(uiForm.getPortalOwner(), prContext.getRemoteUser()));
uiPortalApp.reloadSkinPortal(prContext);
+
+ // We should use IPC to update some portlets in the future instead of
+ UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChild(UIWorkingWorkspace.class);
+ uiWorkingWS.updatePortletsByName("PortalNavigationPortlet");
+ uiWorkingWS.updatePortletsByName("UserToolbarSitePortlet");
}
else
{
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2011-04-15 07:52:54 UTC (rev 6235)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2011-04-15 08:11:35 UTC (rev 6236)
@@ -198,6 +198,8 @@
PortalConfig model = new PortalConfig(uiPortal.getOwnerType(), uiPortal.getName(), uiPortal.getStorageId());
model.setAccessPermissions(uiPortal.getAccessPermissions());
model.setEditPermission(uiPortal.getEditPermission());
+ model.setLabel(uiPortal.getLabel());
+ model.setDescription(uiPortal.getDescription());
model.setLocale(uiPortal.getLocale());
model.setSkin(uiPortal.getSkin());
model.setModifiable(uiPortal.isModifiable());
@@ -347,6 +349,8 @@
uiPortal.setOwner(model.getName());
uiPortal.setModifiable(model.isModifiable());
+ uiPortal.setLabel(model.getLabel());
+ uiPortal.setDescription(model.getDescription());
uiPortal.setLocale(model.getLocale());
uiPortal.setSkin(model.getSkin());
uiPortal.setAccessPermissions(model.getAccessPermissions());
14 years, 5 months
- 1
- 0
gatein SVN: r6235 - portal/branches/decoupled-webos/webui/core/src/main/java/org/exoplatform/webui/form.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-04-15 03:52:54 -0400 (Fri, 15 Apr 2011)
New Revision: 6235
Modified:
portal/branches/decoupled-webos/webui/core/src/main/java/org/exoplatform/webui/form/UIFormUploadInput.java
Log:
GTNPORTAL-1863 A constructor with isAutoUpload parameter for UIFormUploadInput
Modified: portal/branches/decoupled-webos/webui/core/src/main/java/org/exoplatform/webui/form/UIFormUploadInput.java
===================================================================
--- portal/branches/decoupled-webos/webui/core/src/main/java/org/exoplatform/webui/form/UIFormUploadInput.java 2011-04-15 07:51:47 UTC (rev 6234)
+++ portal/branches/decoupled-webos/webui/core/src/main/java/org/exoplatform/webui/form/UIFormUploadInput.java 2011-04-15 07:52:54 UTC (rev 6235)
@@ -71,6 +71,26 @@
service.addUploadLimit(uploadId_, Integer.valueOf(limit)); // Use the limit set by constructor.
setComponentConfig(UIFormUploadInput.class, null);
}
+
+ public UIFormUploadInput(String name, String bindingExpression, boolean isAutoUpload)
+ {
+ super(name, bindingExpression, String.class);
+ uploadId_ = Integer.toString(Math.abs(hashCode()));
+ this.isAutoUpload = isAutoUpload;
+ UploadService service = getApplicationComponent(UploadService.class);
+ service.addUploadLimit(uploadId_, null);
+ setComponentConfig(UIFormUploadInput.class, null);
+ }
+
+ public UIFormUploadInput(String name, String bindingExpression, int limit, boolean isAutoUpload)
+ {
+ super(name, bindingExpression, String.class);
+ uploadId_ = Integer.toString(Math.abs(hashCode()));
+ this.isAutoUpload = isAutoUpload;
+ UploadService service = getApplicationComponent(UploadService.class);
+ service.addUploadLimit(uploadId_, Integer.valueOf(limit)); // Use the limit set by constructor.
+ setComponentConfig(UIFormUploadInput.class, null);
+ }
public void decode(Object input, WebuiRequestContext context) throws Exception
{
14 years, 5 months
- 1
- 0
gatein SVN: r6234 - portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-04-15 03:51:47 -0400 (Fri, 15 Apr 2011)
New Revision: 6234
Modified:
portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
Log:
GTNPORTAL-1793 Should not allow to delete pages of other users (page that have OwnerType : user)
Modified: portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-04-15 07:50:07 UTC (rev 6233)
+++ portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-04-15 07:51:47 UTC (rev 6234)
@@ -267,7 +267,8 @@
}
Page page = service.getPage(id, pcontext.getRemoteUser());
- if (page == null || !page.isModifiable())
+ if (page == null || !page.isModifiable() ||
+ (page.getOwnerType().equals(PortalConfig.USER_TYPE) && !page.getOwnerId().equals(pcontext.getRemoteUser())))
{
uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.delete.NotDelete", new String[]{id}, 1));
pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages());
14 years, 5 months
- 1
- 0
gatein SVN: r6233 - in portal/branches/decoupled-webos: portlet/web/src/main/webapp/skin/portal/webui/component/UIIFramePortlet and 4 other directories.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-04-15 03:50:07 -0400 (Fri, 15 Apr 2011)
New Revision: 6233
Removed:
portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/background/AddApplicationButton.gif
portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/background/AddToStartup.gif
Modified:
portal/branches/decoupled-webos/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css
portal/branches/decoupled-webos/portlet/web/src/main/webapp/skin/portal/webui/component/UIIFramePortlet/DefaultStylesheet.css
portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/Stylesheet.css
portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css
portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css
Log:
GTNPORTAL-1795 Remove WebOS related CSS code from eXoResources of GateIn (squash 5dbe6ae)
Modified: portal/branches/decoupled-webos/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css
===================================================================
--- portal/branches/decoupled-webos/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css 2011-04-15 07:47:48 UTC (rev 6232)
+++ portal/branches/decoupled-webos/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css 2011-04-15 07:50:07 UTC (rev 6233)
@@ -153,6 +153,7 @@
padding: 0px 10px 0px 25px; /* orientation=lt */
padding: 0px 25px 0px 10px; /* orientation=rt */
color: #fff;
+ line-height: 30px;
}
.UIToolbarContainer .Name a:hover {
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/skin/portal/webui/component/UIIFramePortlet/DefaultStylesheet.css
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/skin/portal/webui/component/UIIFramePortlet/DefaultStylesheet.css 2011-04-15 07:47:48 UTC (rev 6232)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/skin/portal/webui/component/UIIFramePortlet/DefaultStylesheet.css 2011-04-15 07:50:07 UTC (rev 6233)
@@ -23,10 +23,6 @@
margin: 7px;
height: auto;
}
-
-.UIPageDesktop .UIIFramePortlet {
- min-height: 0;
-}
*html .UIFormTabPane .UIIFramePortlet {
height: auto;
@@ -37,10 +33,6 @@
width: 97.5%;
}
-*html .UIPageDesktop .UIIFramePortlet {
- height: auto;
-}
-
.UIIFramePortlet iframe {
border: none;
width: 100%; height: 100%;
Modified: portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/Stylesheet.css
===================================================================
--- portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/Stylesheet.css 2011-04-15 07:47:48 UTC (rev 6232)
+++ portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/Stylesheet.css 2011-04-15 07:50:07 UTC (rev 6233)
@@ -128,167 +128,6 @@
overflow: hidden;
}
-/**************************** UIAddApplication ******************************************/
-
-.UIAddApplication {
- padding: 10px;
-}
-
-.UIAddApplication .TitleBarContainer {
- background: #f6f6f6;
-}
-
-.UIAddApplication .UITabContent {
- overflow: hidden;
-}
-
-.UIAddApplication .UITabContentContainer {
- padding-bottom: 5px;
- border: none;
-}
-
-.UIAddApplication .UITabContentContainer .NoneAppsMessage{
- padding: 10px;
- text-align: center;
- color: gray;
- width: 300px;
- margin: 40px auto 0px auto;
-}
-
-.UIAddApplication .ContentContainerDetail {
- border: 1px solid #d4d4d4;
- border-top: none;
-}
-
-.UIAddApplication .ContentContainerDetail .CategoryContainer {
- border: 1px solid white;
- border-top: none;
-}
-
-.UIAddApplication .ApplicationListContainer {
- height: 240px; width: 449px;
- border: 1px solid #c3c3c3;
- background: white;
- overflow-y: auto;
- overflow-x: hidden;
- padding: 0px 10px;
-}
-
-.UIAddApplication .Application {
- margin: 10px 0px 0px 0px;
- border: solid 1px #e4e4e4;
- padding: 10px;
-}
-
-.UIAddApplication .ApplicationContent {
- margin-left: 85px; /* orientation=lt */
- margin-right: 85px; /* orientation=rt */
-}
-
-.UIAddApplication .PortletIcon {
- background: none;
- float: left; /* orientation=lt */
- float: right; /* orientation=rt */
- width: 80px; height: 80px;
- cursor: pointer;
- margin-top: 2px;
-}
-
-.UIAddApplication .TitleBarApplication {
- background: none;
- width: 93%; height: 20px;
- color: #1553B9; font-weight: bold;
- border-bottom: 1px solid #dfdfdf;
- padding: 0px 1px 3px 1px;
- margin: 0px auto 5px auto;
-}
-
-.UIAddApplication .TitleBarApplication .Title {
- float: left; /* orientation=lt */
- float: right; /* orientation=rt */
- margin-top: 4px;
- font-weight: bold; font-size: 13px; color: #1553B9; font-family: arial;
-}
-
-.UIAddApplication .AddButton {
- width: 20px; height: 24px;
- background: url('background/AddApplicationButton.gif') no-repeat top;
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- cursor: pointer;
- margin: 0px 3px;
-}
-
-.UIAddApplication .AddToStartUp {
- width: 20px; height: 24px;
- background: url('background/AddToStartup.gif') no-repeat top;
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- cursor: pointer;
- margin: 0px 3px;
-}
-
-.UIAddApplication .SelectButton {
- width: 20px; height: 24px;
- background: url('background/AddApplicationButton.gif') no-repeat left -22px;
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- cursor: pointer;
- margin: 0px 3px;
-}
-
-.UIAddApplication .ApplicationContentLabel {
- line-height: 16px;
- width: 93%; margin: auto;
-}
-
-.UIAddApplication .ApplicationContentLabel .RightLabel {
- color: #058ee6;
-}
-
-.UIAddApplication .UIItemSelector .LeftColumnStyle {
- width: auto;
-}
-
-.UIAddApplication .UIItemSelector .ItemListContainer .ItemList {
- height: 240px;
- overflow: auto;
- background: #ffffff;
- border: 1px solid #c3c3c3;
- text-transform: capitalize;
-}
-
-.UIAddApplication .UIItemSelector .ItemDetailList .ItemDetail {
- background: none;
- border: none;
- height: auto;
-}
-
-.UIAddApplication .UIItemSelector {
- padding: 7px 5px 8px 7px; /* orientation=lt */
- padding: 7px 7px 8px 5px; /* orientation=rt */
- margin: 0px;
- background: #f7f7f7;
-}
-
-.UIAddApplication .ApplicationItemIcon {
- width: 16px; height: 16px;
- background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/DarkBlueNextArrow.gif') no-repeat;
- float: left; /* orientation=lt */
- float: right; /* orientation=rt */
- margin: 3px 5px 0px 5px;
-}
-
-.UIAddApplication .LeftColumnStyle .ItemListIcon {
- background: none;
- width: 0px;
-}
-
-.UIAddApplication .LeftColumnStyle .ViewListIcon {
- background: none;
- width: 0px;
-}
-
/************************************ Select Permission *******************************/
.UIGroupSelector {
Deleted: portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/background/AddApplicationButton.gif
===================================================================
(Binary files differ)
Deleted: portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/background/AddToStartup.gif
===================================================================
(Binary files differ)
Modified: portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css
===================================================================
--- portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css 2011-04-15 07:47:48 UTC (rev 6232)
+++ portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css 2011-04-15 07:50:07 UTC (rev 6233)
@@ -16,10 +16,6 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-
-.UIPageDesktop .UIWindow .WindowBarCenter .WindowPortletInfo {
- cursor: move;
-}
/*##########################################################*/
Modified: portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css
===================================================================
--- portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-04-15 07:47:48 UTC (rev 6232)
+++ portal/branches/decoupled-webos/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-04-15 07:50:07 UTC (rev 6233)
@@ -73,16 +73,6 @@
background-position: center 188px;
}
-
-.UIPageDesktop .DefaultTheme .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 18px; height: 18px;
- cursor: nw-resize;
- background: url('background/ResizeArea18x18.gif') no-repeat left top; /* orientation=lt */
- background: url('background/ResizeArea18x18-rt.gif') no-repeat right top; /* orientation=rt */
-}
-
.DefaultTheme .Information {
height: 18px; line-height: 18px;
vertical-align: middle; font-size: 10px;
@@ -254,15 +244,6 @@
margin: 4px 2px 0px 2px;
}
-.UIPageDesktop .MacTheme .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 15px;
- cursor: nw-resize;
- background: url('background/ResizeArea17x15.png') no-repeat right top; /* orientation=lt */
- background: url('background/ResizeArea17x15-rt.png') no-repeat left top; /* orientation=rt */
-}
-
.MacTheme .Information {
height: 16px; line-height: 14px; vertical-align: middle;
font-size: 10px;
@@ -420,14 +401,6 @@
margin: 4px 2px 0px 2px;
}
-.UIPageDesktop .MacGray .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 15px;
- cursor: nw-resize;
- background: url('background/ResizeArea17x15.png') no-repeat;
-}
-
.MacGray .Information {
height: 16px; line-height: 14px; vertical-align: middle;
font-size: 10px;
@@ -586,14 +559,6 @@
margin: 4px 2px 0px 2px;
}
-.UIPageDesktop .MacBlack .ResizeArea {
- float: left; /* orientation=rt */
- float: right; /* orientation=lt */
- width: 17px; height: 15px;
- cursor: nw-resize;
- background: url('background/ResizeArea17x15.png') no-repeat;
-}
-
.MacBlack .Information {
height: 16px; line-height: 14px; vertical-align: middle;
font-size: 10px;
@@ -752,14 +717,6 @@
margin: 4px 2px 0px 2px;
}
-.UIPageDesktop .MacGreenSteel .ResizeArea {
- float: left; /* orientation=rt */
- float: right; /* orientation=lt */
- width: 17px; height: 15px;
- cursor: nw-resize;
- background: url('background/ResizeArea17x15.png') no-repeat;
-}
-
.MacGreenSteel .Information {
height: 16px; line-height: 14px; vertical-align: middle;
font-size: 10px;
@@ -921,15 +878,6 @@
border: solid 1px #717171;
}
-.UIPageDesktop .VistaTheme .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 9px; height: 12px;
- cursor: nw-resize;
- background: url('/eXoSkinVista/skin/VistaSkin/skinIcons/16x16/icons/ResizeBG.gif') no-repeat bottom right; /* orientation=lt */
- background: url('/eXoSkinVista/skin/VistaSkin/skinIcons/16x16/icons/ResizeBG-rt.gif') no-repeat bottom left; /* orientation=rt */
-}
-
.VistaTheme .MiddleDecoratorLeft {
padding-left:12px;
background: url('background/MVistaTheme.png') repeat-y left;
@@ -1095,14 +1043,6 @@
height: 100%;
}
-.UIPageDesktop .VistaBlue .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 9px; height: 12px;
- cursor: nw-resize;
- background: url('/eXoSkinVista/skin/VistaSkin/skinIcons/16x16/icons/ResizeBG.gif') no-repeat bottom right;
-}
-
.VistaBlue .MiddleDecoratorLeft {
padding-left: 15px;
background: url('background/MVistaBlue.png') repeat-y left;
@@ -1201,14 +1141,6 @@
height: 16px;
}
-.UIPageDesktop .RoundConerBlue .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.RoundConerBlue .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -1356,14 +1288,6 @@
height: 16px;
}
-.UIPageDesktop .RoundConerViolet .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.RoundConerViolet .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -1516,14 +1440,6 @@
height: 16px;
}
-.UIPageDesktop .RoundConerOrange .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.RoundConerOrange .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -1676,14 +1592,6 @@
height: 16px;
}
-.UIPageDesktop .RoundConerPink .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.RoundConerPink .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -1836,14 +1744,6 @@
height: 16px;
}
-.UIPageDesktop .RoundConerGreen .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.RoundConerGreen .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -1996,14 +1896,6 @@
height: 16px;
}
-.UIPageDesktop .ShadowBlue .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.ShadowBlue .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -2154,14 +2046,6 @@
height: 16px;
}
-.UIPageDesktop .ShadowViolet .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.ShadowViolet .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -2312,14 +2196,6 @@
height: 16px;
}
-.UIPageDesktop .ShadowOrange .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.ShadowOrange .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -2471,14 +2347,6 @@
height: 16px;
}
-.UIPageDesktop .ShadowPink .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.ShadowPink .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -2630,14 +2498,6 @@
height: 16px;
}
-.UIPageDesktop .ShadowGreen .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.ShadowGreen .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -2787,14 +2647,6 @@
height: 16px;
}
-.UIPageDesktop .SimpleBlue .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.SimpleBlue .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -2934,14 +2786,6 @@
height: 16px;
}
-.UIPageDesktop .SimpleViolet .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.SimpleViolet .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -3083,14 +2927,6 @@
height: 16px;
}
-.UIPageDesktop .SimpleOrange .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.SimpleOrange .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -3232,14 +3068,6 @@
height: 16px;
}
-.UIPageDesktop .SimplePink .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.SimplePink .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
@@ -3382,14 +3210,6 @@
height: 16px;
}
-.UIPageDesktop .SimpleGreen .ResizeArea {
- float: right; /* orientation=lt */
- float: left; /* orientation=rt */
- width: 17px; height: 19px;
- cursor: nw-resize;
- background: url('background/Resize17x19.png') no-repeat;
-}
-
.SimpleGreen .WindowBarCenter .PortletName {
font-weight: bold;
color: #333333;
14 years, 5 months
- 1
- 0
gatein SVN: r6232 - in portal/branches/decoupled-webos: webui/portal/src/main and 6 other directories.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-04-15 03:47:48 -0400 (Fri, 15 Apr 2011)
New Revision: 6232
Added:
portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/BaseUIPageFactory.java
portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageFactory.java
portal/branches/decoupled-webos/webui/portal/src/main/resources/
portal/branches/decoupled-webos/webui/portal/src/main/resources/META-INF/
portal/branches/decoupled-webos/webui/portal/src/main/resources/META-INF/services/
portal/branches/decoupled-webos/webui/portal/src/main/resources/META-INF/services/org.exoplatform.portal.webui.page.UIPageFactory
Modified:
portal/branches/decoupled-webos/pom.xml
portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java
portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java
portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
Log:
GTNPORTAL-1862 Introduce UIPageFactory for loading all Page types
Modified: portal/branches/decoupled-webos/pom.xml
===================================================================
--- portal/branches/decoupled-webos/pom.xml 2011-04-15 07:43:51 UTC (rev 6231)
+++ portal/branches/decoupled-webos/pom.xml 2011-04-15 07:47:48 UTC (rev 6232)
@@ -962,6 +962,12 @@
<include>**/*.xsd</include>
</includes>
</resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </resource>
</resources>
<testResources>
<testResource>
Added: portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/BaseUIPageFactory.java
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/BaseUIPageFactory.java (rev 0)
+++ portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/BaseUIPageFactory.java 2011-04-15 07:47:48 UTC (rev 6232)
@@ -0,0 +1,50 @@
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.portal.webui.page;
+
+import org.exoplatform.webui.application.WebuiApplication;
+import org.exoplatform.webui.application.WebuiRequestContext;
+
+/**
+ * This factory is used to create the base UIPage component
+ *
+ * @author <a href="trongtt(a)gmail.com">Trong Tran</a>
+ * @version $Revision$
+ */
+public class BaseUIPageFactory extends UIPageFactory
+{
+ @Override
+ public String getType()
+ {
+ return DEFAULT_FACTORY_ID;
+ }
+
+ @Override
+ public UIPage createUIPage(WebuiRequestContext context) throws Exception
+ {
+ if (context == null)
+ {
+ context = WebuiRequestContext.getCurrentInstance();
+ }
+ WebuiApplication app = (WebuiApplication)context.getApplication();
+ UIPage uiPage = app.createUIComponent(UIPage.class, null, null, context);
+ return uiPage;
+ }
+}
\ No newline at end of file
Modified: portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java 2011-04-15 07:43:51 UTC (rev 6231)
+++ portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java 2011-04-15 07:47:48 UTC (rev 6232)
@@ -24,8 +24,8 @@
import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.webui.application.UIPortlet;
import org.exoplatform.portal.webui.container.UIContainer;
-import org.exoplatform.portal.webui.portal.UIPortalComposer;
import org.exoplatform.portal.webui.portal.UIPortalComponentActionListener.MoveChildActionListener;
+import org.exoplatform.portal.webui.portal.UIPortalComposer;
import org.exoplatform.portal.webui.util.PortalDataMapper;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIEditInlineWorkspace;
@@ -38,8 +38,6 @@
import org.exoplatform.webui.config.annotation.EventConfig;
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
-import java.util.HashMap;
-import java.util.Map;
/**
* May 19, 2006
@@ -61,28 +59,8 @@
private UIPortlet maximizedUIPortlet;
- protected static Map<String, Class<? extends UIPage>> realClass;
-
public static String DEFAULT_FACTORY_ID = "Default";
- static
- {
- if (realClass == null)
- {
- realClass = new HashMap<String, Class<? extends UIPage>>();
- realClass.put(DEFAULT_FACTORY_ID, UIPage.class);
- }
- }
-
- public static Class<? extends UIPage> getRealClass(String factoryID)
- {
- if (factoryID == null || factoryID.trim().equals("") || factoryID.trim().equals(DEFAULT_FACTORY_ID))
- {
- return UIPage.class;
- }
- return realClass.get(factoryID);
- }
-
public String getOwnerId()
{
return ownerId;
@@ -193,7 +171,7 @@
prContext.addUIComponentToUpdateByAjax(uiWorkingWS);
prContext.setFullRender(true);
}
-
+
public static class EditCurrentPageActionListener extends EventListener<UIPage>
{
@Override
Modified: portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2011-04-15 07:43:51 UTC (rev 6231)
+++ portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2011-04-15 07:47:48 UTC (rev 6232)
@@ -28,8 +28,6 @@
import org.exoplatform.portal.webui.portal.UIPortalComponent;
import org.exoplatform.portal.webui.util.PortalDataMapper;
import org.exoplatform.portal.webui.util.Util;
-import org.exoplatform.portal.webui.workspace.UIPortalApplication;
-import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.core.UIComponent;
@@ -46,7 +44,6 @@
private String storageId;
- @SuppressWarnings("unused")
public UIPageBody(PageBody model) throws Exception
{
setId("UIPageBody");
@@ -67,7 +64,6 @@
setId("UIPageBody");
}
- @SuppressWarnings("unused")
public void init(PageBody model) throws Exception
{
setId("UIPageBody");
@@ -146,8 +142,8 @@
return uiPage;
}
- Class<? extends UIPage> clazz = UIPage.getRealClass(page.getFactoryId());
- uiPage = createUIComponent(context, clazz, null, null);
+ UIPageFactory clazz = UIPageFactory.getInstance(page.getFactoryId());
+ uiPage = clazz.createUIPage(context);
PortalDataMapper.toUIPage(uiPage, page);
uiPortal.setUIPage(page.getId(), uiPage);
Modified: portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-04-15 07:43:51 UTC (rev 6231)
+++ portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-04-15 07:47:48 UTC (rev 6232)
@@ -412,8 +412,9 @@
}
//Need this code to override editpage action in extension project
- Class<? extends UIPage> clazz = UIPage.getRealClass(page.getFactoryId());
- clazz.getConstructor().newInstance().switchToEditMode(page);
+ UIPageFactory clazz = UIPageFactory.getInstance(page.getFactoryId());
+ UIPage uipage = clazz.createUIPage(null);
+ uipage.switchToEditMode(page);
}
}
Modified: portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2011-04-15 07:43:51 UTC (rev 6231)
+++ portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2011-04-15 07:47:48 UTC (rev 6232)
@@ -343,8 +343,8 @@
UIPagePreview uiPagePreview = uiWizard.getChild(UIPagePreview.class);
- Class<? extends UIPage> clazz = UIPage.getRealClass(page.getFactoryId());
- UIPage uiPage = uiWizard.createUIComponent(context, clazz, null, null);
+ UIPageFactory clazz = UIPageFactory.getInstance(page.getFactoryId());
+ UIPage uiPage = clazz.createUIPage(context);
PortalDataMapper.toUIPage(uiPage, page);
uiPagePreview.setUIComponent(uiPage);
Added: portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageFactory.java
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageFactory.java (rev 0)
+++ portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageFactory.java 2011-04-15 07:47:48 UTC (rev 6232)
@@ -0,0 +1,72 @@
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.portal.webui.page;
+
+import org.exoplatform.webui.application.WebuiRequestContext;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+/**
+ * An UIPage abstract factory
+ *
+ * @author <a href="trongtt(a)gmail.com">Trong Tran</a>
+ * @version $Revision$
+ */
+public abstract class UIPageFactory
+{
+ public static String DEFAULT_FACTORY_ID = "Default";
+
+ protected static Map<String, UIPageFactory> pageFactory = new HashMap<String, UIPageFactory>();
+
+ static
+ {
+ ServiceLoader<UIPageFactory> loader = ServiceLoader.load(UIPageFactory.class);
+ for (UIPageFactory factory : loader)
+ {
+ pageFactory.put(factory.getType(), factory);
+ }
+ }
+
+ public static UIPageFactory getInstance(String type)
+ {
+ UIPageFactory factory;
+
+ if (type == null)
+ {
+ factory = pageFactory.get(DEFAULT_FACTORY_ID);
+ }
+ else
+ {
+ factory = pageFactory.get(type);
+ }
+
+ if (factory == null)
+ {
+ throw new UnsupportedOperationException("The " + type + " page factory is not supported or not loaded");
+ }
+ return factory;
+ }
+
+ public abstract UIPage createUIPage(WebuiRequestContext context) throws Exception;
+
+ public abstract String getType();
+}
\ No newline at end of file
Modified: portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2011-04-15 07:43:51 UTC (rev 6231)
+++ portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2011-04-15 07:47:48 UTC (rev 6232)
@@ -19,8 +19,6 @@
package org.exoplatform.portal.webui.util;
-import java.util.List;
-
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.Page;
@@ -28,6 +26,7 @@
import org.exoplatform.portal.webui.application.UIPortlet;
import org.exoplatform.portal.webui.container.UIContainer;
import org.exoplatform.portal.webui.page.UIPage;
+import org.exoplatform.portal.webui.page.UIPageFactory;
import org.exoplatform.portal.webui.portal.UIPortal;
import org.exoplatform.portal.webui.portal.UIPortalComponent;
import org.exoplatform.portal.webui.workspace.UIEditInlineWorkspace;
@@ -39,6 +38,8 @@
import org.exoplatform.webui.core.UIComponentDecorator;
import org.exoplatform.webui.event.Event;
+import java.util.List;
+
/**
* Jun 5, 2006
*/
@@ -226,8 +227,8 @@
return uiPage;
WebuiRequestContext context = Util.getPortalRequestContext();
- Class<? extends UIPage> clazz = UIPage.getRealClass(page.getFactoryId());
- uiPage = uiParent.createUIComponent(context, clazz, null, null);
+ UIPageFactory clazz = UIPageFactory.getInstance(page.getFactoryId());
+ uiPage = clazz.createUIPage(context);
PortalDataMapper.toUIPage(uiPage, page);
return uiPage;
Modified: portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-04-15 07:43:51 UTC (rev 6231)
+++ portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-04-15 07:47:48 UTC (rev 6232)
@@ -31,6 +31,7 @@
import org.exoplatform.portal.webui.page.UIPage;
import org.exoplatform.portal.webui.page.UIPageBody;
import org.exoplatform.portal.webui.page.UIPageCreationWizard;
+import org.exoplatform.portal.webui.page.UIPageFactory;
import org.exoplatform.portal.webui.page.UISiteBody;
import org.exoplatform.portal.webui.page.UIWizardPageSetInfo;
import org.exoplatform.portal.webui.portal.UIPortal;
@@ -93,8 +94,8 @@
uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
// We clone the edited UIPage object, that is required for Abort action
- Class<? extends UIPage> clazz = UIPage.getRealClass(page.getFactoryId());
- UIPage newUIPage = uiWorkingWS.createUIComponent(clazz, null, null);
+ UIPageFactory clazz = UIPageFactory.getInstance(page.getFactoryId());
+ UIPage newUIPage = clazz.createUIPage(null);
PortalDataMapper.toUIPage(newUIPage, page);
uiToolPanel.setWorkingComponent(newUIPage);
Added: portal/branches/decoupled-webos/webui/portal/src/main/resources/META-INF/services/org.exoplatform.portal.webui.page.UIPageFactory
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/resources/META-INF/services/org.exoplatform.portal.webui.page.UIPageFactory (rev 0)
+++ portal/branches/decoupled-webos/webui/portal/src/main/resources/META-INF/services/org.exoplatform.portal.webui.page.UIPageFactory 2011-04-15 07:47:48 UTC (rev 6232)
@@ -0,0 +1 @@
+org.exoplatform.portal.webui.page.BaseUIPageFactory
\ No newline at end of file
14 years, 5 months
- 1
- 0
gatein SVN: r6231 - in portal/branches/decoupled-webos: portlet/exoadmin/src/main/webapp/WEB-INF and 1 other directories.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-04-15 03:43:51 -0400 (Fri, 15 Apr 2011)
New Revision: 6231
Modified:
portal/branches/decoupled-webos/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java
portal/branches/decoupled-webos/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
Log:
GTNPORTAL-1789 Should use PortletEvent to notify UIUserToolbarDashboardPortlet when delete User's page using PageManagement portlet
Modified: portal/branches/decoupled-webos/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java
===================================================================
--- portal/branches/decoupled-webos/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java 2011-04-15 07:41:26 UTC (rev 6230)
+++ portal/branches/decoupled-webos/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java 2011-04-15 07:43:51 UTC (rev 6231)
@@ -38,6 +38,7 @@
import org.exoplatform.webui.event.EventListener;
import java.util.List;
+import javax.portlet.EventRequest;
/**
* Created by The eXo Platform SAS
@@ -45,7 +46,9 @@
* thanhtungty(a)gmail.com
* May 26, 2009
*/
-@ComponentConfig(lifecycle = UIApplicationLifecycle.class, template = "app:/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl", events = {@EventConfig(name = "AddDefaultDashboard", listeners = UIUserToolBarDashboardPortlet.AddDashboardActionListener.class)})
+@ComponentConfig(lifecycle = UIApplicationLifecycle.class, template = "app:/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl",
+ events = {@EventConfig(name = "AddDefaultDashboard", listeners = UIUserToolBarDashboardPortlet.AddDashboardActionListener.class),
+ @EventConfig(listeners = UIUserToolBarDashboardPortlet.UserPageNodeDeletedActionListener.class)})
public class UIUserToolBarDashboardPortlet extends UIPortletApplication
{
@@ -78,6 +81,17 @@
return Util.getUIPortal().getSelectedNode();
}
+ static public class UserPageNodeDeletedActionListener extends EventListener<UIUserToolBarDashboardPortlet>
+ {
+ private Log log = ExoLogger.getExoLogger(UserPageNodeDeletedActionListener.class);
+
+ @Override
+ public void execute(Event<UIUserToolBarDashboardPortlet> event) throws Exception
+ {
+ log.debug("PageNode : " + ((EventRequest)event.getRequestContext().getRequest()).getEvent().getValue() + " is deleted");
+ }
+ }
+
static public class AddDashboardActionListener extends EventListener<UIUserToolBarDashboardPortlet>
{
Modified: portal/branches/decoupled-webos/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- portal/branches/decoupled-webos/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2011-04-15 07:41:26 UTC (rev 6230)
+++ portal/branches/decoupled-webos/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2011-04-15 07:43:51 UTC (rev 6231)
@@ -200,6 +200,9 @@
<short-title>Page Management Portlet</short-title>
<keywords>Administration</keywords>
</portlet-info>
+ <supported-publishing-event>
+ <name>UserPageNodeDeleted</name>
+ </supported-publishing-event>
</portlet>
<portlet>
@@ -351,6 +354,9 @@
<role-name>admin</role-name>
<role-link>admin</role-link>
</security-role-ref>
+ <supported-processing-event>
+ <name>UserPageNodeDeleted</name>
+ </supported-processing-event>
</portlet>
<portlet>
@@ -410,4 +416,7 @@
<event-definition>
<name>NewAccountAdded</name>
</event-definition>
+ <event-definition>
+ <name>UserPageNodeDeleted</name>
+ </event-definition>
</portlet-app>
Modified: portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-04-15 07:41:26 UTC (rev 6230)
+++ portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-04-15 07:43:51 UTC (rev 6231)
@@ -23,6 +23,9 @@
import java.util.List;
import java.util.ResourceBundle;
+import javax.portlet.ActionResponse;
+import javax.xml.namespace.QName;
+
import org.exoplatform.commons.serialization.api.annotations.Serialized;
import org.exoplatform.commons.utils.PageList;
import org.exoplatform.commons.utils.PageListAccess;
@@ -383,10 +386,9 @@
dataService.save(pageNavigation);
- //Update UserToolbarGroupPortlet
- UIWorkingWorkspace uiWorkingWS = portalApplication.getChild(UIWorkingWorkspace.class);
- uiWorkingWS.updatePortletsByName("UserToolbarDashboardPortlet");
-
+ //Update UserToolbarDashboardPortlet
+ ActionResponse actResponse = event.getRequestContext().getResponse();
+ actResponse.setEvent(new QName("UserPageNodeDeleted"), tobeRemoved.getName());
}
}
}
14 years, 5 months
- 1
- 0
gatein SVN: r6230 - in portal/branches/decoupled-webos: web/portal/src/main/webapp/WEB-INF/classes/locale/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-04-15 03:41:26 -0400 (Fri, 15 Apr 2011)
New Revision: 6230
Modified:
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ar.xml
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_de.properties
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_pt_BR.properties
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml
portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml
portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml
Log:
GTNPORTAL-1787 Remove WebOS related ResourceBundle keys
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ar.xml
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ar.xml 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ar.xml 2011-04-15 07:41:26 UTC (rev 6230)
@@ -24,7 +24,6 @@
<UIHomePagePortlet>
<Label>
<Title>حاول بوابة إكزو0.2 المتاحة مع حسابات المستخدمين التالية</Title>
- <intro><l1>اصدار جديد مع واجهة المستخدم ثورية</l1><l2> مخططات المكتب: Classic و WebOS </l2><l3> مخططات سحب واسقاط. معالج انشاء الصفحات. </l3><l4> وكثير من المزيد... </l4></intro>
<Username>اسم المستخدم</Username>
<Password>كلمة السر</Password>
<Demo>تجربة</Demo>
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_de.properties
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_de.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_de.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -20,7 +20,7 @@
#####################################################################################
# EXCEPTION MAPPINGS #
#####################################################################################
-UIGroovyPortlet.note.Text=Die ist ein Beispiel f�r ein Groovy-Portlet. Es kann in einer Webapplikation installiert werden.
+UIGroovyPortlet.note.Text=Die ist ein Beispiel f�r ein Groovy-Portlet. Es kann in einer Webapplikation installiert werden.
UIIFrameEditMode.title=URL \u00e4ndern
UIIFrameEditMode.label.iframeUrl=URL
UIIFrameEditMode.label.editmode=Bearbeitungsmodus
@@ -34,7 +34,6 @@
#############################################################################
UIHomePagePortlet.Label.Title=Testen Sie GateIn 3.1 mit einem dieser Benutzerkonten:
-UIHomePagePortlet.Label.Intro=Die neue Version verf\u00fcgt \u00fcber eine revolution\u00e4re Bedienoberfl\u00e4che<br/>Classic- und WebOS-Layouts<br/> Ziehen und Ablegen (Drag & Drop). Seitenerstellassistent<br/>Und viel mehr...
UIHomePagePortlet.Label.Slogan=Das Beste aus eXo und JBoss Portal<div>GateIn 3.1</div>
UIHomePagePortlet.Label.Username=Name:
UIHomePagePortlet.Label.Password=Passwort:
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -34,7 +34,6 @@
#############################################################################
UIHomePagePortlet.Label.Title=Try GateIn 3.1 with one of these user accounts:
-UIHomePagePortlet.Label.Intro=The new version comes with a revolutionary user interface<br/>Classic and WebOS Desktop Layouts<br/> Drag and Drop Features. Create Page Wizard<br/>And many more...
UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.1</div>
UIHomePagePortlet.Label.GuideText=For more information, please contact us.
UIHomePagePortlet.Label.IntroText=GateIn is the new generation of Open Source portal, jointly led by Red Hat and eXo Platform who partner to gather the best portal experts and communities around a robust and intuitive portal that brings rich administration functionalities to IT systems.
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -34,7 +34,6 @@
#############################################################################
UIHomePagePortlet.Label.Title=Prueba GateIn 3.1 con uno de los siguientes usuarios:
-UIHomePagePortlet.Label.Intro=La nueva versi\u00f3n viene con un interfaz de usuario revolucionario<br/>Layouts Cl\u00e1sico y Escritorio WebOS <br/> Funcionalidad Drag and Drop. Asistente de Creaci\u00f3n de P\u00e1gina<br/>Y mucho m\u00e1s...
UIHomePagePortlet.Label.Slogan=Lo mejor de eXo y JBoss Portal<div>GateIn 3.1</div>
UIHomePagePortlet.Label.Username=Usuario:
UIHomePagePortlet.Label.Password=Contrase\u00f1a:
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -34,7 +34,6 @@
#############################################################################
UIHomePagePortlet.Label.Title=Prova GateIn 3.1 con uno di questi account utente:
-UIHomePagePortlet.Label.Intro=La nuova versione nasce con una moderna interfaccia utente<br/>Layout Classici e WebOS Desktop<br/> Funzionalit\u00E0 di Drag and Drop. Wizard di creazione della pagina<br/>E oltre...
UIHomePagePortlet.Label.Slogan=Il meglio di eXo e JBoss Portal<div>GateIn 3.1</div>
UIHomePagePortlet.Label.GuideText=Contattaci per maggiori informazioni.
UIHomePagePortlet.Label.IntroText=GateIn \u00E8 la nuova generazione di portali Open Source, esclusivamente fornito da Red Hat ed eXo Platform ai sistemi IT che raccolgono i migliori partner esperti di tecnologie sui portali e una community che gira intorno ad un portale robusto ed intuitivo e ricco di funzionalit\u00E0 di amministrazione.
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -39,8 +39,6 @@
UIHomePagePortlet.Label.Title=\u3053\u308c\u3089\u30e6\u30fc\u30b6\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u4e00\u3064\u3067GateIn 3.1\u3092\u8a66\u3057\u3066\u304f\u3060\u3055\u3044:
-UIHomePagePortlet.Label.Intro=The new version comes with a revolutionary user interface<br/>Classic and WebOS Desktop Layouts<br/> Drag and Drop Features. Create Page Wizard<br/>And many more...
-
UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.1</div>
UIHomePagePortlet.Label.Username=\u30e6\u30fc\u30b6\u30fc\u540d:
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml 2011-04-15 07:41:26 UTC (rev 6230)
@@ -25,7 +25,6 @@
<UIHomePagePortlet>
<Label>
<Title>사용자 계정들 중 하나와 함께 GateIn 3.1을 시도하십시오.</Title>
- <Intro>새로운 버전에 혁신적인 사용자 인터페이스가 추가됩니다. <br/>표준 및 WebOS 데스크탑 레이아웃<br/> 드래그 앤 드롭 기능들. 페이지 생성 마법사<br/>기타 부가 기능.</Intro>
<Slogan>최고의 eXo 및 JBoss Portal<div>GateIn 3.1</div></Slogan>
<Username>사용자이름:</Username>
<Password>비밀번호:</Password>
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -34,7 +34,6 @@
#############################################################################
UIHomePagePortlet.Label.Title=\u092f\u0940 \u092e\u0927\u094d\u092f\u0947 \u0915\u0941\u0928\u0948 \u092a\u094d\u0930\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e \u0916\u093e\u0924\u093e\u0939\u0930\u0941\u0932\u0947 GateIn 3.1\u092e\u093e \u092a\u094d\u0930\u092f\u093e\u0938 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-UIHomePagePortlet.Label.Intro=The new version comes with a revolutionary user interface<br/>Classic and WebOS Desktop Layouts<br/> Drag and Drop Features. Create Page Wizard<br/>And many more...
UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.1</div>
UIHomePagePortlet.Label.Username=\u092a\u094d\u0930\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e \u0928\u093e\u092e:
UIHomePagePortlet.Label.Password=\u092a\u093e\u0938\u094d\u0935\u094b\u0930\u094d\u0921:
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -34,7 +34,6 @@
#############################################################################
UIHomePagePortlet.Label.Title=Probeer GateIn 3.1 met \u00E9\u00E9n van deze gebruikersaccounts:
-UIHomePagePortlet.Label.Intro=De nieuwe versie komt met een revolutionaire gebruikersinterface<br/>Klassieke en WebOS desktop lay-outs<br/> Drag and drop mogelijkheden. Pagina creatie wizard<br/>En nog veel meer ...
UIHomePagePortlet.Label.Slogan=Het beste van eXo en JBoss Portal<div>GateIn 3.1</div>
UIHomePagePortlet.Label.Username=Gebruikersnaam:
UIHomePagePortlet.Label.Password=Paswoord:
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_pt_BR.properties
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_pt_BR.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_pt_BR.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -34,7 +34,6 @@
#############################################################################
UIHomePagePortlet.Label.Title=Experimente GateIn 3.1 com uma das contas:
-UIHomePagePortlet.Label.Intro=A nova versão vem com uma revolucionárioa interface<br/>Layouts Classic e WebOS Desktop<br/>Recursos de Drag and Drop. Wizard de criação de páginas<br/>E muito mais...
UIHomePagePortlet.Label.Slogan=O melhor de eXo e JBoss Portal <div>GateIn 3.1</div>
UIHomePagePortlet.Label.Username=Usuário:
UIHomePagePortlet.Label.Password=Senha:
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -15,7 +15,6 @@
#############################################################################
UIHomePagePortlet.Label.Title=Используйте GateIn 3.1 с одной из учётных записей:
-UIHomePagePortlet.Label.Intro=Новая версия представляет революционно новый пользовательский интерфейс<br/>Класический и WebOS макеты<br/> Поддержка перетаскивания. Мастера создания страниц<br/>И многое другое...
UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.1</div>
UIHomePagePortlet.Label.Username=Имя:
UIHomePagePortlet.Label.Password=Пароль:
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -16,7 +16,6 @@
#############################################################################
UIHomePagePortlet.Label.Title=Спробуй GateIn 3.1 з користувачем серед таких облікових записів:
-UIHomePagePortlet.Label.Intro=Нова версія з прогресивним інтерфейсом користувача<br/>схема класичного та WebOS робочого столу<br/> Можливість "Перетягни-відпусти". Wizard-створювач сторінок<br/>Та багато іншого...
UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.1</div>
UIHomePagePortlet.Label.Username=Ім'я користувача:
UIHomePagePortlet.Label.Password=Пароль:
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -34,7 +34,6 @@
#############################################################################
UIHomePagePortlet.Label.Title=Dùng thử GateIn 3.1 với một trong những tài khoản sau:
-UIHomePagePortlet.Label.Intro=The new version comes with a revolutionary user interface<br/>Classic and WebOS Desktop Layouts<br/> Drag and Drop Features. Create Page Wizard<br/>And many more...
UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.1</div>
UIHomePagePortlet.Label.GuideText=Để biết thêm thông tin xin hãy liên lạc với chúng tôi.
UIHomePagePortlet.Label.IntroText=GateIn là cổng thông tin thế hệ mới kết hợp giữa Red Hat và eXo Platform, tập trung những chuyên gia về cổng thông tin và cộng đồng tốt nhất, mang lại cho các hệ thống thông tin những tính năng đầy đủ nhất.
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml 2011-04-15 07:41:26 UTC (rev 6230)
@@ -25,7 +25,6 @@
<UIHomePagePortlet>
<Label>
<Title>用一个用户帐户尝试GateIn 3.1：</Title>
- <Intro>新版本增加了新的用户界面<br/>经典和WebOS桌面布局<br/>拖放功能,创建页向导<br/>等等。。。</Intro>
<Slogan>eXo和JBoss Portal最好的门户平台<div>GateIn 3.1</div></Slogan>
<Username>用户名：</Username>
<Password>密码：</Password>
Modified: portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml
===================================================================
--- portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml 2011-04-15 07:41:26 UTC (rev 6230)
@@ -24,7 +24,6 @@
<UIHomePagePortlet>
<Label>
<Title>讓你感受全新體驗的 JBoss GateIn 3.1：</Title>
-<Intro>新版本增加了新的Web 2.0界面<br/>經典和WebOS桌面佈局<br/>拖放功能,頁面導覽<br/>等等。 。 。</Intro>
<Slogan>eXo和JBoss Portal最好的Portal平台<div>GateIn 3.1</div></Slogan>
<Username>用戶名：</Username>
<Password>密碼：</Password>
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2011-04-15 07:41:26 UTC (rev 6230)
@@ -345,9 +345,6 @@
<left>
<title>عرض وحدد الجلد</title>
</left>
- <Desktop>
- <label> تخطيط سطح المكتب</label>
- </Desktop>
<AccountTemplate>
<left>
<title>نموذج حساب قالب معاينة</title>
@@ -870,8 +867,6 @@
</Invalid-editPermission>
<Invalid-deletePermission> {0} لا يسمح لك لحذف صفحة .
</Invalid-deletePermission>
- <Invalid-Preview>هذه هي صفحة سطح المكتب. يمكنك معاينة صفحات ليست من
- هذا النوع. </Invalid-Preview>
<NotViewPage> لديك لا حقوق لعرض هذه الصفحة.</NotViewPage>
<edit>
<NotEditPage>لم تقم في ذلك الحق في تعديل هذه الصفحة. </NotEditPage>
@@ -1354,7 +1349,6 @@
<normalPage>
<EmptyLayout>تخطيط فارغ </EmptyLayout>
<CurrentLayout> تخطيط الحالي</CurrentLayout>
- <DesktopImage>تخطيط سطح المكتب </DesktopImage>
<DashboardLayout> لوحة القيادة تخطيط</DashboardLayout>
</normalPage>
<columnPage>
@@ -1678,9 +1672,6 @@
<ClassicPortal>
<label> بوابة الكلاسيكية</label>
</ClassicPortal>
- <WebOSPortal>
- <label> نظام التشغيل ويب بوابة </label>
- </WebOSPortal>
<!--
#############################################################################
-->
@@ -1906,61 +1897,6 @@
</UIPage>
<!--
############################################################################
- # org.exoplatform.portal.component.view.UIPageDesktop #
- ############################################################################
- -->
- <UIPageDesktop>
- <Default>
- <img>
- <location>/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
- </location>
- </img>
- </Default>
- <Mac>
- <img>
- <location>
- /eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
- </location>
- </img>
- </Mac>
- <Vista>
- <img>
- <location>/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
- </location>
- </img>
- </Vista>
- <label>
- <pagebody> الهيئة صفحة من البوابة</pagebody>
- <PageContent> محتويات الصفحة</PageContent>
- <View>منظر </View>
- <Edit> عدل</Edit>
- <Done> عمله</Done>
- </label>
- <title>
- <PortalPage>صفحة البوابة </PortalPage>
- <SaveToDatabase>حفظ إلى قاعدة البيانات </SaveToDatabase>
- <AddApplication>إضافة تطبيقات </AddApplication>
- <PageNavigation> الصفحة الملاحة</PageNavigation>
- <eXoBrowser> متصفح</eXoBrowser>
- <ShowPortletDesktop> إظهار / إخفاء المداخل</ShowPortletDesktop>
- <ShowWidgetDesktop>إظهار / إخفاء الأدوات </ShowWidgetDesktop>
- <SignIn> تسجيل الدخول</SignIn>
- <SignOut> تسجيل الخروج</SignOut>
- <pageNavigation>الصفحة تنقلات </pageNavigation>
- </title>
- <msg>
- <hasNotPermission> لديك إذن لا عدل في هذه الصفحة.</hasNotPermission>
- </msg>
- <action>
- <Close>إزالة التطبيق من شريط العرض </Close>
- <Quit> ترك</Quit>
- <action>
- <Open>فتح</Open>
- </action>
- </action>
- </UIPageDesktop>
- <!--
- ############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
-->
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -200,7 +200,6 @@
Template.title=Skin-Liste
Template.left.title=Skins ansehen und ausw\u00e4hlen
-Desktop.label=Arbeitsfl\u00e4chen-Layout
AccountTemplate.left.title=Vorschau anhand des Konto-Templates
AccountTemplate.title=Konto-Templates
DefaultAccount.label=Standard-Konto
@@ -412,7 +411,6 @@
UIPageBrowser.msg.Invalid-viewPermission=Ihnen fehlt die Berechtigung, um die Seite {0} zuzugreifen.
UIPageBrowser.msg.Invalid-editPermission=Ihnen fehlt die Berechtigung, um die Seite {0} zu bearbeiten.
UIPageBrowser.msg.Invalid-deletePermission=Ihnen fehlt die Berechtigung, um die Seite {0} zu l\u00f6schen.
-UIPageBrowser.msg.Invalid-Preview=Dies eine Seite der Arbeitsfl\u00e4che. F\u00fcr diesen Seitentyp kann keine Vorschau angesehen werden.
UIPageBrowser.msg.NotViewPage=Ihnen fehlt die Berechtigung, um diese Seite anzusehen.
UIPageBrowser.msg.edit.NotEditPage=Ihnen fehlt die Berechtigung, um diese Seite zu bearbeiten.
UIPageBrowser.msg.delete.NotDelete=Ihnen fehlt die Berechtigung, um diese Seite zu l\u00f6schen.
@@ -678,7 +676,6 @@
UIWizardPageSelectLayoutForm.tab.label.UIPageTemplateOptions=Seitenvorlagen-Optionen
UIWizardPageSelectLayoutForm.label.normalPage.EmptyLayout=Leeres Layout
UIWizardPageSelectLayoutForm.label.normalPage.CurrentLayout=Aktuelles Layout
-UIWizardPageSelectLayoutForm.label.normalPage.DesktopImage=Arbeitsfl\u00e4chen-Layout
UIWizardPageSelectLayoutForm.label.normalPage.DashboardLayout=Dashboard-Layout
UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=Zwei-Spalten-Layout
UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=Drei-Spalten-Layout
@@ -819,7 +816,6 @@
UIPortalBrowser.deletePortal=Sind Sie sicher, dass Sie dieses Portal l\u00f6schen m\u00f6chten?
SitePortal.label=Site Portal
ClassicPortal.label=Classic Portal
-WebOSPortal.label=WebOS Portal
############################################################################
@@ -950,33 +946,6 @@
UIPage.msg.EditPermission.null=Ihnen fehlt die Berechtigung, um diese Seite zu bearbeiten.
############################################################################
- # org.exoplatform.portal.component.view.UIPageDesktop #
- ############################################################################
-
-UIPageDesktop.Default.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Mac.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Vista.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.label.pagebody=Portalstrukturseite
-UIPageDesktop.label.PageContent=Seiteninhalt
-UIPageDesktop.label.View=Ansehen
-UIPageDesktop.label.Edit=Bearbeiten
-UIPageDesktop.label.Done=Beenden
-UIPageDesktop.title.PortalPage=Portalstrukturseite
-UIPageDesktop.title.SaveToDatabase=In der Datenbank speichern
-UIPageDesktop.title.AddApplication=Applikationen hinzuf\u00fcgen
-UIPageDesktop.title.PageNavigation=Seitennavigation
-UIPageDesktop.title.eXoBrowser=Browser.
-UIPageDesktop.title.ShowPortletDesktop=Portlets Zeigen/Ausblenden
-UIPageDesktop.title.ShowWidgetDesktop=Gadgets Zeigen/Ausblenden
-UIPageDesktop.title.SignIn=Anmelden
-UIPageDesktop.title.SignOut=Abmelden
-UIPageDesktop.title.pageNavigation=Seitennavigation
-UIPageDesktop.msg.hasNotPermission=Ihnen fehlt die Berechtigung, um diese Seite zu bearbeiten.
-UIPageDesktop.action.Close=Diese Applikation von der Leiste entfernen.
-UIPageDesktop.action.Quit=Verlassen
-UIPageDesktop.action.action.Open=Öffnen
-
- ############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -208,7 +208,6 @@
Template.title=Skins List
Template.left.title=View and select a skin
-Desktop.label=Desktop Layout
AccountTemplate.left.title=Sample Account Template Preview
AccountTemplate.title=Account Templates
DefaultAccount.label=Default Account
@@ -428,7 +427,6 @@
UIPageBrowser.msg.Invalid-viewPermission=You are not allowed to access page {0}.
UIPageBrowser.msg.Invalid-editPermission=You are not allowed to edit page {0}.
UIPageBrowser.msg.Invalid-deletePermission=You are not allowed to delete page {0}.
-UIPageBrowser.msg.Invalid-Preview=This is a desktop page. You cannot preview pages of this type.
UIPageBrowser.msg.NotViewPage=You have not the rights to view this page.
UIPageBrowser.msg.edit.NotEditPage=You have not the rights to edit this page.
UIPageBrowser.msg.delete.NotDelete=You have not the rights to delete this page.
@@ -709,7 +707,6 @@
UIWizardPageSelectLayoutForm.tab.label.UIPageTemplateOptions=Page template options
UIWizardPageSelectLayoutForm.label.normalPage.EmptyLayout=Empty Layout
UIWizardPageSelectLayoutForm.label.normalPage.CurrentLayout=Current Layout
-UIWizardPageSelectLayoutForm.label.normalPage.DesktopImage=Desktop Layout
UIWizardPageSelectLayoutForm.label.normalPage.DashboardLayout=Dashboard Layout
UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=Two Columns Layout
UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=Three Columns Layout
@@ -848,7 +845,6 @@
UIPortalBrowser.deletePortal=Are you sure you want to delete this portal?
SitePortal.label=Site Portal
ClassicPortal.label=Classic Portal
-WebOSPortal.label=WebOS Portal
BasicPortal.label=Basic Portal
############################################################################
@@ -1013,33 +1009,6 @@
UIPage.msg.EditPermission.null=You do not have the rights to edit this page.
############################################################################
- # org.exoplatform.portal.component.view.UIPageDesktop #
- ############################################################################
-
-UIPageDesktop.Default.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Mac.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Vista.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.label.pagebody=The page body of the portal
-UIPageDesktop.label.PageContent=Page Content
-UIPageDesktop.label.View=View
-UIPageDesktop.label.Edit=Edit
-UIPageDesktop.label.Done=Done
-UIPageDesktop.title.PortalPage=Portal Page
-UIPageDesktop.title.SaveToDatabase=Save to database
-UIPageDesktop.title.AddApplication=Add Applications
-UIPageDesktop.title.PageNavigation=Page Navigation
-UIPageDesktop.title.eXoBrowser=Browser.
-UIPageDesktop.title.ShowPortletDesktop=Show/Hide Portlets
-UIPageDesktop.title.ShowWidgetDesktop=Show/Hide Gadgets
-UIPageDesktop.title.SignIn=Sign In
-UIPageDesktop.title.SignOut=Sign Out
-UIPageDesktop.title.pageNavigation=Page Navigations
-UIPageDesktop.msg.hasNotPermission=You have no edit permission on this page.
-UIPageDesktop.action.Close=Remove this application from dockbar
-UIPageDesktop.action.Quit=Quit
-UIPageDesktop.action.action.Open=Open
-
- ############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -200,7 +200,6 @@
Template.title=Lista de Skins
Template.left.title=Ver y seleccionar un skin
-Desktop.label=Distribuci\u00f3n de Escritorio
AccountTemplate.left.title=Previsualizaci\u00f3n del ejemplo de Plantilla Cuenta
AccountTemplate.title=Plantilas Cuenta
DefaultAccount.label=Cuenta por Defecto
@@ -410,7 +409,6 @@
UIPageBrowser.msg.Invalid-viewPermission=No tienes permisos para acceder a la p\u00e1gina {0}.
UIPageBrowser.msg.Invalid-editPermission=No tienes permisos para editar la p\u00e1gina {0}.
UIPageBrowser.msg.Invalid-deletePermission=No tienes permisos para borrar la p\u00e1gina {0}.
-UIPageBrowser.msg.Invalid-Preview=Esta es una p\u00e1gina de escritorio. No puedes previsualizar p\u00e1ginas de este tipo.
UIPageBrowser.msg.NotViewPage=No tienes permisos para ver esta p\u00e1gina.
UIPageBrowser.msg.edit.NotEditPage=No tienes permisos para editar esta p\u00e1gina.
UIPageBrowser.msg.delete.NotDelete=No tienes permisos para borrar esta p\u00e1gina.
@@ -676,7 +674,6 @@
UIWizardPageSelectLayoutForm.tab.label.UIPageTemplateOptions=Opciones de la Plantilla de P\u00e1gina
UIWizardPageSelectLayoutForm.label.normalPage.EmptyLayout=Distribuci\u00f3n Vac\u00eda
UIWizardPageSelectLayoutForm.label.normalPage.CurrentLayout=Distribuci\u00f3n actual
-UIWizardPageSelectLayoutForm.label.normalPage.DesktopImage=Distribuci\u00f3n del Escritorio
UIWizardPageSelectLayoutForm.label.normalPage.DashboardLayout=Distribuci\u00f3n del Tabl\u00f3n
UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=Distribuci\u00f3n a dos Columnas
UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=Distribuci\u00f3n a tres Columnas
@@ -815,7 +812,6 @@
UIPortalBrowser.deletePortal=\u00bfEst\u00e1s seguro de que deseas borrar este portal?
SitePortal.label=Portal del Sitio Web
ClassicPortal.label=Portal Classic
-WebOSPortal.label=Portal WebOS
############################################################################
@@ -943,33 +939,6 @@
UIPage.msg.EditPermission.null=No tienes permisos para editar esta p\u00e1gina.
############################################################################
- # org.exoplatform.portal.component.view.UIPageDesktop #
- ############################################################################
-
-UIPageDesktop.Default.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Mac.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Vista.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.label.pagebody=El cuerpo de la p\u00e1gina del portal
-UIPageDesktop.label.PageContent=Contenido de la P\u00e1gina
-UIPageDesktop.label.View=Ver
-UIPageDesktop.label.Edit=Editar
-UIPageDesktop.label.Done=Hecho
-UIPageDesktop.title.PortalPage=P\u00e1gina del Portal
-UIPageDesktop.title.SaveToDatabase=Guardar en la Base de Datos
-UIPageDesktop.title.AddApplication=A\u00f1adir Aplicaciones
-UIPageDesktop.title.PageNavigation=Navegaci\u00f3n de P\u00e1gina
-UIPageDesktop.title.eXoBrowser=Browser eXo.
-UIPageDesktop.title.ShowPortletDesktop=Mostrar/Ocultar Portlets
-UIPageDesktop.title.ShowWidgetDesktop=Mostrar/Ocultar Gadgets
-UIPageDesktop.title.SignIn=Ingresar
-UIPageDesktop.title.SignOut=Salir
-UIPageDesktop.title.pageNavigation=Navegaciones de P\u00e1gina
-UIPageDesktop.msg.hasNotPermission=No tienes permisos de edici\u00f3n en esta P\u00e1gina.
-UIPageDesktop.action.Close=Eliminar esta aplicaci\u00f3n del dockbar
-UIPageDesktop.action.Quit=Salir
-UIPageDesktop.action.action.Open=Abrir
-
- ############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -187,7 +187,6 @@
Template.title=Liste des styles
Template.left.title=Voir et sélectionner un style
-Desktop.label=Mode Desktop
AccountTemplate.left.title=Exemple de Pré-visualisation de template de compte
AccountTemplate.title=Templates de comptes
DefaultAccount.label=Compte par défaut
@@ -401,7 +400,6 @@
UIPageBrowser.msg.Invalid-viewPermission=Accès non autorisé à la page {0}
UIPageBrowser.msg.Invalid-editPermission=Edition de la page {0} non autorisée
UIPageBrowser.msg.Invalid-deletePermission=Suppression de la page {0} non autorisée
-UIPageBrowser.msg.Invalid-Preview=Cette page est de type "bureau". Il n'est pas possible de la Pré-visualiser !
UIPageBrowser.msg.NotViewPage=Vous n'avez pas les droits pour voir cette page.
UIPageBrowser.msg.edit.NotEditPage=Vous n'avez pas les droits pour éditer cette page.
UIPageBrowser.msg.delete.NotDelete=Vous n'avez pas les droits pour supprimer cette page.
@@ -657,7 +655,6 @@
UIWizardPageSelectLayoutForm.tab.label.UIPageTemplateOptions=Options du modèle de page
UIWizardPageSelectLayoutForm.label.normalPage.EmptyLayout=Modèle de page vide
UIWizardPageSelectLayoutForm.label.normalPage.CurrentLayout=Modèle de page courant
-UIWizardPageSelectLayoutForm.label.normalPage.DesktopImage=Desktop Layout
UIWizardPageSelectLayoutForm.label.normalPage.DashboardLayout=Modèle 'Dashboard'
UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=Deux Colonnes
UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=Trois Colonnes
@@ -806,7 +803,6 @@
UIPortalBrowser.deletePortal=Confirmez-vous la suppression de ce portail ?
SitePortal.label=Portail Site
ClassicPortal.label=Portal Classique
-WebOSPortal.label=Portail WebOS
############################################################################
@@ -955,33 +951,6 @@
UIPage.msg.EditPermission.null=Vous n'avez pas le droit d'éditer cette page !
############################################################################
- # org.exoplatform.portal.component.view.UIPageDesktop #
- ############################################################################
-
-UIPageDesktop.Default.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Mac.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Vista.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.label.pagebody=la page principale du portail
-UIPageDesktop.label.PageContent=Page de contenus
-UIPageDesktop.label.View=Visualiser
-UIPageDesktop.label.Edit=Editer
-UIPageDesktop.label.Done=Terminer
-UIPageDesktop.title.PortalPage=Page principale du portail
-UIPageDesktop.title.SaveToDatabase=Sauvez en base
-UIPageDesktop.title.AddApplication=Ajouter une application
-UIPageDesktop.title.PageNavigation=Navigation
-UIPageDesktop.title.eXoBrowser=Navigateur eXo !
-UIPageDesktop.title.ShowPortletDesktop=Afficher/Cacher les portlets
-UIPageDesktop.title.ShowWidgetDesktop=Afficher/Cacher les gadgets
-UIPageDesktop.title.SignIn=Connexion
-UIPageDesktop.title.SignOut=Déconnexion
-UIPageDesktop.title.pageNavigation=Navigations
-UIPageDesktop.msg.hasNotPermission=Vous n'avez pas le droit d'éditer cette page !
-UIPageDesktop.action.Close=Supprimer l'application de la barre
-UIPageDesktop.action.Quit=Quitter
-UIPageDesktop.action.action.Open=Ouvrir
-
- ############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -208,7 +208,6 @@
Template.title=Elenco degli Skin
Template.left.title=Visualizza e seleziona uno skin
-Desktop.label=Layout del Desktop
AccountTemplate.left.title=Anteprima del Template di un'Account di esempio
AccountTemplate.title=Template per l'Account
DefaultAccount.label=Account di Default
@@ -428,7 +427,6 @@
UIPageBrowser.msg.Invalid-viewPermission=Non ti \u00E8 permesso accedere alla pagina {0}.
UIPageBrowser.msg.Invalid-editPermission=Non ti \u00E8 permesso modificare la pagina {0}.
UIPageBrowser.msg.Invalid-deletePermission=Non ti \u00E8 permesso eliminare pagina {0}.
-UIPageBrowser.msg.Invalid-Preview=Questa \u00E8 una pagina del Desktop. Non puoi vedere l'anteprima di questi tipi.
UIPageBrowser.msg.NotViewPage=Non hai i permessi per vedere la pagina.
UIPageBrowser.msg.edit.NotEditPage=Non hai i permessi per modificare la pagina.
UIPageBrowser.msg.delete.NotDelete=Non hai i permessi per eliminare la pagina.
@@ -708,7 +706,6 @@
UIWizardPageSelectLayoutForm.tab.label.UIPageTemplateOptions=Opzioni del template della pagina
UIWizardPageSelectLayoutForm.label.normalPage.EmptyLayout=Layout Vuoto
UIWizardPageSelectLayoutForm.label.normalPage.CurrentLayout=Layout Corrente
-UIWizardPageSelectLayoutForm.label.normalPage.DesktopImage=Layout del Desktop
UIWizardPageSelectLayoutForm.label.normalPage.DashboardLayout=Layout della Dashboard
UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=Layout a Due Colonne
UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=Layout a Tre Colonne
@@ -847,7 +844,6 @@
UIPortalBrowser.deletePortal=Sicuro di voler eliminare il portale?
SitePortal.label=Portale del Sito
ClassicPortal.label=Portale Classico
-WebOSPortal.label=Portale WebOS
BasicPortal.label=Portale di Base
############################################################################
@@ -1005,33 +1001,6 @@
UIPage.msg.EditPermission.null=Non hai i permessi per modificare la pagina.
############################################################################
- # org.exoplatform.portal.component.view.UIPageDesktop #
- ############################################################################
-
-UIPageDesktop.Default.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Mac.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Vista.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.label.pagebody=Il corpo della pagina del portale
-UIPageDesktop.label.PageContent=Contenuto della Pagina
-UIPageDesktop.label.View=Visualizza
-UIPageDesktop.label.Edit=Modifica
-UIPageDesktop.label.Done=Fatto
-UIPageDesktop.title.PortalPage=Pagina del Portale
-UIPageDesktop.title.SaveToDatabase=Salva nel database
-UIPageDesktop.title.AddApplication=Aggiungi Applicazioni
-UIPageDesktop.title.PageNavigation=Navigazione della Pagina
-UIPageDesktop.title.eXoBrowser=Browser.
-UIPageDesktop.title.ShowPortletDesktop=Mostra/Nascondi le Portlet
-UIPageDesktop.title.ShowWidgetDesktop=Mostra/Nascondi i Gadget
-UIPageDesktop.title.SignIn=Ingresso
-UIPageDesktop.title.SignOut=Uscita
-UIPageDesktop.title.pageNavigation=Navigazioni della Pagina
-UIPageDesktop.msg.hasNotPermission=Non devi modificare i permessi di questa pagina.
-UIPageDesktop.action.Close=Elimina l'applicazione dalla dockbar
-UIPageDesktop.action.Quit=Esci
-UIPageDesktop.action.action.Open=Apri
-
- ############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -200,7 +200,6 @@
Template.title=\u30b9\u30ad\u30f3\u30ea\u30b9\u30c8
Template.left.title=\u30b9\u30ad\u30f3\u3092\u8868\u793a\u3057\u3066\u9078\u629e
-Desktop.label=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30ec\u30a4\u30a2\u30a6\u30c8
AccountTemplate.left.title=\u30b5\u30f3\u30d7\u30eb\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30d7\u30ec\u30d3\u30e5\u30fc
AccountTemplate.title=\u30a2\u30ab\u30a6\u30f3\u30c8\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
DefaultAccount.label=\u30c7\u30d5\u30a9\u30eb\u30c8\u30a2\u30ab\u30a6\u30f3\u30c8
@@ -413,7 +412,6 @@
UIPageBrowser.msg.Invalid-viewPermission=\u30da\u30fc\u30b8 {0} \u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u3053\u3068\u306f\u8a31\u53ef\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
UIPageBrowser.msg.Invalid-editPermission=\u30da\u30fc\u30b8 {0} \u3092\u7de8\u96c6\u3059\u308b\u3053\u3068\u306f\u8a31\u53ef\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
UIPageBrowser.msg.Invalid-deletePermission=\u30da\u30fc\u30b8 {0} \u3092\u524a\u9664\u3059\u308b\u3053\u3068\u306f\u8a31\u53ef\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
-UIPageBrowser.msg.Invalid-Preview=\u3053\u308c\u306f\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30da\u30fc\u30b8\u3067\u3059\u3002\u3053\u306e\u30bf\u30a4\u30d7\u306e\u30da\u30fc\u30b8\u3092\u30d7\u30ec\u30d3\u30e5\u30fc\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
UIPageBrowser.msg.NotViewPage=\u3053\u306e\u30da\u30fc\u30b8\u3092\u8868\u793a\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u3002
UIPageBrowser.msg.edit.NotEditPage=\u3053\u306e\u30da\u30fc\u30b8\u3092\u7de8\u96c6\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u3002
UIPageBrowser.msg.delete.NotDelete=\u3053\u306e\u30da\u30fc\u30b8\u3092\u524a\u9664\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u3002
@@ -679,7 +677,6 @@
UIWizardPageSelectLayoutForm.tab.label.UIPageTemplateOptions=\u30da\u30fc\u30b8\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30aa\u30d7\u30b7\u30e7\u30f3
UIWizardPageSelectLayoutForm.label.normalPage.EmptyLayout=\u7a7a\u30ec\u30a4\u30a2\u30a6\u30c8
UIWizardPageSelectLayoutForm.label.normalPage.CurrentLayout=\u73fe\u5728\u306e\u30ec\u30a4\u30a2\u30a6\u30c8
-UIWizardPageSelectLayoutForm.label.normalPage.DesktopImage=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30ec\u30a4\u30a2\u30a6\u30c8
UIWizardPageSelectLayoutForm.label.normalPage.DashboardLayout=\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u30ec\u30a4\u30a2\u30a6\u30c8
UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=2\u30ab\u30e9\u30e0\u30ec\u30a4\u30a2\u30a6\u30c8
UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=3\u30ab\u30e9\u30e0\u30ec\u30a4\u30a2\u30a6\u30c8
@@ -820,7 +817,6 @@
UIPortalBrowser.deletePortal=\u3053\u306e\u30dd\u30fc\u30bf\u30eb\u3092\u524a\u9664\u3057\u307e\u3059\u304b?
SitePortal.label=\u30b5\u30a4\u30c8\u30dd\u30fc\u30bf\u30eb
ClassicPortal.label=\u30af\u30e9\u30b7\u30c3\u30af\u306a\u30dd\u30fc\u30bf\u30eb
-WebOSPortal.label=WebOS \u30dd\u30fc\u30bf\u30eb
############################################################################
@@ -955,33 +951,6 @@
UIPage.msg.EditPermission.null=\u3042\u306a\u305f\u306f\u3053\u306e\u30da\u30fc\u30b8\u3092\u7de8\u96c6\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u3002
############################################################################
- # org.exoplatform.portal.component.view.UIPageDesktop #
- ############################################################################
-
-UIPageDesktop.Default.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Mac.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Vista.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.label.pagebody=\u30dd\u30fc\u30bf\u30eb\u306e\u30da\u30fc\u30b8\u672c\u4f53
-UIPageDesktop.label.PageContent=\u30da\u30fc\u30b8\u30fb\u30b3\u30f3\u30c6\u30f3\u30c4
-UIPageDesktop.label.View=\u95b2\u89a7
-UIPageDesktop.label.Edit=\u7de8\u96c6
-UIPageDesktop.label.Done=\u5b8c\u4e86
-UIPageDesktop.title.PortalPage=\u30dd\u30fc\u30bf\u30eb\u30fb\u30da\u30fc\u30b8
-UIPageDesktop.title.SaveToDatabase=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u4fdd\u5b58
-UIPageDesktop.title.AddApplication=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u8ffd\u52a0
-UIPageDesktop.title.PageNavigation=\u30da\u30fc\u30b8\u30fb\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
-UIPageDesktop.title.eXoBrowser=\u30d6\u30e9\u30a6\u30b6\u30fc\u3002
-UIPageDesktop.title.ShowPortletDesktop=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u898b\u305b\u308b/\u96a0\u3059
-UIPageDesktop.title.ShowWidgetDesktop=\u30ac\u30b8\u30a7\u30c3\u30c8\u3092\u898b\u305b\u308b/\u96a0\u3059
-UIPageDesktop.title.SignIn=\u30b5\u30a4\u30f3\u30fb\u30a4\u30f3
-UIPageDesktop.title.SignOut=\u30b5\u30a4\u30f3\u30fb\u30a2\u30a6\u30c8
-UIPageDesktop.title.pageNavigation=\u30da\u30fc\u30b8\u30fb\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
-UIPageDesktop.msg.hasNotPermission=\u3042\u306a\u305f\u306f\u3053\u306e\u30da\u30fc\u30b8\u3092\u7de8\u96c6\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u3002
-UIPageDesktop.action.Close=\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30c9\u30c3\u30af\u30d0\u30fc\u304b\u3089\u53d6\u308a\u9664\u304f
-UIPageDesktop.action.Quit=\u7d42\u4e86
-UIPageDesktop.action.action.Open=\u30aa\u30fc\u30d7\u30f3
-
- ############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2011-04-15 07:41:26 UTC (rev 6230)
@@ -309,9 +309,6 @@
<title>스킨 보기 및 선택</title>
</left>
</Template>
- <Desktop>
- <label>데스크탑 레이아웃</label>
- </Desktop>
<AccountTemplate>
<left>
<title>계정 템플릿 예제 미리보기</title>
@@ -644,7 +641,6 @@
<Invalid-viewPermission>{0} 페이지 접근이 허용되지 않습니다.</Invalid-viewPermission>
<Invalid-editPermission>{0} 페이지 수정이 허용되지 않습니다.</Invalid-editPermission>
<Invalid-deletePermission>{0} 페이지 삭제가 허용되지 않습니다.</Invalid-deletePermission>
- <Invalid-Preview>데스크탑 유형의 페이지는 미리보기 하실 수 없습니다.</Invalid-Preview>
<NotViewPage>이 페이지를 볼 수 있는 권한이 없습니다.</NotViewPage>
<edit>
<NotEditPage>이 페이지를 수정할 수 있는 권한이 없습니다.</NotEditPage>
@@ -1050,7 +1046,6 @@
<normalPage>
<EmptyLayout>빈 레이아웃</EmptyLayout>
<CurrentLayout>현재 레이아웃</CurrentLayout>
- <DesktopImage>데스크탑 레이아웃</DesktopImage>
<DashboardLayout>대시보드 레이아웃</DashboardLayout>
</normalPage>
<columnPage>
@@ -1300,9 +1295,6 @@
<ClassicPortal>
<label>기본 포탈</label>
</ClassicPortal>
- <WebOSPortal>
- <label>WebOS 포탈</label>
- </WebOSPortal>
<!-- ############################################################################-->
<!-- # org.exoplatform.webui.form.UIPopupWindow #-->
<!-- ############################################################################-->
@@ -1469,52 +1461,6 @@
</EditPermission>
</msg>
</UIPage>
- <UIPageDesktop>
- <Default>
- <img>
- <location>/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80</location>
- </img>
- </Default>
- <Mac>
- <img>
- <location>/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80</location>
- </img>
- </Mac>
- <Vista>
- <img>
- <location>/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80</location>
- </img>
- </Vista>
- <label>
- <pagebody>포탈 페이지 몸체</pagebody>
- <PageContent>페이지 내용</PageContent>
- <View>보기</View>
- <Edit>편집</Edit>
- <Done>완료</Done>
- </label>
- <title>
- <PortalPage>포탈 페이지</PortalPage>
- <SaveToDatabase>데이터베이스로 저장</SaveToDatabase>
- <AddApplication>애플리케이션 추가</AddApplication>
- <PageNavigation>페이지 내비게이션</PageNavigation>
- <eXoBrowser>브라우저</eXoBrowser>
- <ShowPortletDesktop>포틀릿 보이기/감추기</ShowPortletDesktop>
- <ShowWidgetDesktop>가젯 보이기/감추기</ShowWidgetDesktop>
- <SignIn>로그인</SignIn>
- <SignOut>로그아웃</SignOut>
- <pageNavigation>페이지 내비게이션</pageNavigation>
- </title>
- <msg>
- <hasNotPermission>이 페이지를 수정할 수 있는 권한이 없습니다.</hasNotPermission>
- </msg>
- <action>
- <Close>작업 표시줄에서 이 애플리케이션 삭제</Close>
- <Quit>끝내기</Quit>
- <action>
- <Open>열기</Open>
- </action>
- </action>
- </UIPageDesktop>
<!-- ############################################################################-->
<!-- # org.exoplatform.portal.component.view.UIPageBody #-->
<!-- ############################################################################-->
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -200,7 +200,6 @@
Template.title=\u0938\u094d\u0915\u093f\u0928s \u0932\u093f\u0938\u094d\u091f
Template.left.title=\u0938\u094d\u0915\u093f\u0928 \u0939\u0947\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d \u0930 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-Desktop.label=\u0921\u0947\u0938\u094d\u0915\u091f\u092a \u0922\u093e\u091a\u093e
AccountTemplate.left.title=\u0916\u093e\u0924\u093e \u0909\u0926\u093e\u0939\u0930\u0923 \u0922\u093e\u0901\u091a\u093e\u0915\u094b \u092a\u0941\u0930\u094d\u0935\u0926\u094d\u0930\u093f\u0936\u094d\u092f
AccountTemplate.title=\u0916\u093e\u0924\u093e\u0915\u094b \u0922\u093e\u091a\u093e
DefaultAccount.label=\u0921\u093f\u092b\u094c\u0932\u094d\u091f \u0916\u093e\u0924\u093e
@@ -412,7 +411,6 @@
UIPageBrowser.msg.Invalid-viewPermission=\u0924\u092a\u093e\u0908\u0902\u0932\u093e\u0908 \u092f\u094b {0} \u092a\u0947\u091c \u0939\u0947\u0930\u094d\u0928\u0947 \u0905\u0928\u0941\u092e\u0924\u0940 \u091b\u0948\u0928\u0964
UIPageBrowser.msg.Invalid-editPermission=\u0924\u092a\u093e\u0908\u0902\u0932\u093e\u0908 \u092f\u094b {0} \u092a\u0947\u091c \u0938\u092e\u094d\u092a\u093e\u0926\u0928 \u0917\u0930\u094d\u0928\u0947 \u0938\u094d\u0935\u093f\u0915\u094d\u0930\u093f\u0924\u0940 \u091b\u0948\u0928\u0964
UIPageBrowser.msg.Invalid-deletePermission=\u0924\u092a\u093e\u0908\u0902\u0932\u093e\u0908 \u092f\u094b {0} \u092a\u0947\u091c \u092e\u0947\u091f\u093e\u0909\u0928\u0947 \u0938\u094d\u0935\u093f\u0915\u094d\u0930\u093f\u0924\u0940 \u091b\u0948\u0928\u0964
-UIPageBrowser.msg.Invalid-Preview=\u092f\u094b \u0921\u0947\u0938\u094d\u0915\u094d\u091f\u092a \u092a\u0947\u091c \u0939\u094b\u0964 \u092f\u0938 \u0915\u093f\u0938\u093f\u092e\u094d\u0915 \u092a\u0947\u091c\u0939\u0930\u0941 \u092a\u0941\u0930\u094d\u0935\u0926\u094d\u0930\u093f\u0936\u094d\u092f \u0917\u0930\u094d\u0928 \u092a\u093e\u0909\u0928\u0941\u0939\u0941\u0928\u094d\u0928\u0964
UIPageBrowser.msg.NotViewPage=\u0924\u092a\u093e\u0908\u0902\u0932\u093e\u0908 \u092f\u094b \u092a\u0947\u091c \u0939\u0947\u0930\u094d\u0928\u0947 \u0905\u0927\u093f\u0915\u093e\u0930 \u091b\u0948\u0928\u0964
UIPageBrowser.msg.edit.NotEditPage=\u0924\u092a\u093e\u0908\u0902\u0932\u093e\u0908 \u092f\u094b \u092a\u0947\u091c \u0938\u092e\u094d\u092a\u093e\u0926\u0928 \u0917\u0930\u094d\u0928\u0947 \u0905\u0927\u093f\u0915\u093e\u0930 \u091b\u0948\u0928\u0964
UIPageBrowser.msg.delete.NotDelete=\u0924\u092a\u093e\u0908\u0902\u0932\u093e\u0908 \u092f\u094b \u092a\u0947\u091c \u092e\u0947\u091f\u093e\u0909\u0928\u0947 \u0905\u0927\u093f\u0915\u093e\u0930 \u091b\u0948\u0928\u0964
@@ -677,7 +675,6 @@
UIWizardPageSelectLayoutForm.tab.label.UIPageTemplateOptions=\u092a\u0947\u091c \u091f\u0947\u092e\u094d\u092a\u094d\u0932\u0947\u091f \u0909\u092a\u093e\u092f\u0939\u0930\u0941
UIWizardPageSelectLayoutForm.label.normalPage.EmptyLayout=\u0916\u093e\u0932\u0940 \u0932\u0947\u0906\u0909\u091f
UIWizardPageSelectLayoutForm.label.normalPage.CurrentLayout=\u091a\u093e\u0932\u0941 \u0932\u0947\u0906\u0909\u091f
-UIWizardPageSelectLayoutForm.label.normalPage.DesktopImage=\u0921\u0947\u0938\u094d\u0915\u094d\u091f\u092a \u0932\u0947\u0906\u0909\u091f
UIWizardPageSelectLayoutForm.label.normalPage.DashboardLayout=\u0921\u094d\u092f\u0938\u094d\u092c\u094b\u0930\u094d\u0921 \u0932\u0947\u0906\u0909\u091f
UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=\u0968 \u0915\u094b\u0932\u0941\u092e \u0932\u0947\u0906\u0909\u091f
UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=\u0969 \u0915\u094b\u0932\u0941\u092e \u0932\u0947\u0906\u0909\u091f
@@ -819,7 +816,6 @@
UIPortalBrowser.deletePortal=\u0915\u0947 \u0924\u092a\u093e\u0908\u0902 \u092a\u0915\u094d\u0915\u093e \u092f\u094b \u092a\u094b\u0930\u094d\u091f\u0932 \u092e\u0947\u091f\u093e\u0909\u0928 \u091a\u0939\u0928\u0941\u0939\u0941\u0928\u094d\u091b?
SitePortal.label=\u0938\u093e\u0908\u091f \u092a\u094b\u0930\u094d\u091f\u0932
ClassicPortal.label=\u0915\u094d\u0932\u093e\u0938\u093f\u0915 \u092a\u094b\u0930\u094d\u091f\u0932
-WebOSPortal.label=WebOS \u092a\u094b\u0930\u094d\u091f\u0932
############################################################################
@@ -951,33 +947,6 @@
UIPage.msg.EditPermission.null=\u0924\u092a\u093e\u0908\u0902\u0932\u093e\u0908 \u092f\u094b \u092a\u0947\u091c \u0938\u092e\u094d\u092a\u093e\u0926\u0928 \u0917\u0930\u094d\u0928\u0947 \u0905\u0927\u093f\u0915\u093e\u0930 \u091b\u0948\u0928\u0964
############################################################################
- # org.exoplatform.portal.component.view.UIPageDesktop #
- ############################################################################
-
-UIPageDesktop.Default.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Mac.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Vista.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.label.pagebody=\u092a\u094b\u0930\u094d\u091f\u0932\u0915\u094b \u092a\u0947\u091c \u092c\u0921\u0940
-UIPageDesktop.label.PageContent=\u092a\u0947\u091c \u092a\u0930\u093f\u092e\u093e\u0923
-UIPageDesktop.label.View=\u0905\u0935\u0932\u094b\u0915\u0928
-UIPageDesktop.label.Edit=\u0938\u092e\u094d\u092a\u093e\u0926\u0928
-UIPageDesktop.label.Done=\u0938\u0915\u093f\u092f\u094b
-UIPageDesktop.title.PortalPage=\u092a\u094b\u0930\u094d\u091f\u0932 \u092a\u0947\u091c
-UIPageDesktop.title.SaveToDatabase=\u0921\u093e\u091f\u093e\u092c\u0947\u0938\u092e\u093e \u0938\u0941\u0930\u091b\u093f\u0924 \u0930\u0916\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-UIPageDesktop.title.AddApplication=\u090f\u092a\u094d\u0932\u0940\u0915\u0947\u0938\u0928\u0939\u0930\u0941 \u0925\u092a\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-UIPageDesktop.title.PageNavigation=\u092a\u0947\u091c \u0928\u094d\u092f\u093e\u092d\u093f\u0917\u0947\u0938\u0928
-UIPageDesktop.title.eXoBrowser=\u092c\u094d\u0930\u093e\u0909\u091c\u0930\u0964
-UIPageDesktop.title.ShowPortletDesktop=\u092a\u094b\u0930\u094d\u091f\u094d\u0932\u0947\u091f\u0939\u0930\u0941 \u0926\u0947\u0916\u093e\u0909\u0928\u0941\u0939\u094b\u0938\u094d/\u0932\u0941\u0915\u093e\u0909\u0928\u0941\u0939\u094b\u0938\u094d
-UIPageDesktop.title.ShowWidgetDesktop=\u0917\u094d\u092f\u093e\u091c\u0947\u091f\u0939\u0930\u0941 \u0926\u0947\u0916\u093e\u0909\u0928\u0941\u0939\u094b\u0938\u094d/\u0932\u0941\u0915\u093e\u0909\u0928\u0941\u0939\u094b\u0938\u094d
-UIPageDesktop.title.SignIn=\u092d\u093f\u0924\u094d\u0930\u093f\u0928\u0941\u0939\u094b\u0938\u094d
-UIPageDesktop.title.SignOut=\u092c\u0939\u093f\u0930\u093f\u0928\u0941\u0939\u094b\u0938\u094d
-UIPageDesktop.title.pageNavigation=\u092a\u0947\u091c \u0928\u094d\u092f\u093e\u092d\u093f\u0917\u0947\u0938\u0928\u0939\u0930\u0941
-UIPageDesktop.msg.hasNotPermission=\u0924\u092a\u093e\u0908\u0902\u0932\u093e\u0908 \u092f\u094b \u092a\u0947\u091c\u092e\u093e \u0938\u092e\u094d\u092a\u093e\u0926\u0928 \u0917\u0930\u094d\u0928\u0947 \u0905\u0928\u0941\u092e\u0924\u0940 \u091b\u0948\u0928\u0964
-UIPageDesktop.action.Close=\u092f\u094b \u090f\u092a\u094d\u0932\u0940\u0915\u0947\u0938\u0928 \u0921\u0915\u094d \u092c\u093e\u0930\u092c\u093e\u091f \u0939\u091f\u093e\u0909\u0928\u0941\u0939\u094b\u0938\u094d
-UIPageDesktop.action.Quit=\u091b\u093e\u0921\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-UIPageDesktop.action.action.Open=\u0916\u094b\u0932\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-
- ############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -200,7 +200,6 @@
Template.title=Lijst van stijlen
Template.left.title=Toon en selecteer een stijl
-Desktop.label=Bureaublad lay-out
AccountTemplate.left.title=Voorbeeld van de account sjabloon
AccountTemplate.title=Account sjablonen
DefaultAccount.label=Standaard account
@@ -412,7 +411,6 @@
UIPageBrowser.msg.Invalid-viewPermission=U heeft geen toestemming om pagina {0} te bekijken.
UIPageBrowser.msg.Invalid-editPermission=U heeft geen toestemming om pagina {0} te wijzigen.
UIPageBrowser.msg.Invalid-deletePermission=U heeft geen toestemming om pagina {0} te verwijderen.
-UIPageBrowser.msg.Invalid-Preview=Deze is een bureaublad pagina. Van dit type pagina kan U geen voorbeeld opvragen.
UIPageBrowser.msg.NotViewPage=U heeft geen rechten om deze pagina te bekijken.
UIPageBrowser.msg.edit.NotEditPage=U heeft geen rechten om deze pagina te wijzigen.
UIPageBrowser.msg.delete.NotDelete=U heeft geen rechten om deze pagina te verwijderen.
@@ -678,7 +676,6 @@
UIWizardPageSelectLayoutForm.tab.label.UIPageTemplateOptions=Pagina sjabloon opties
UIWizardPageSelectLayoutForm.label.normalPage.EmptyLayout=Lege lay-out
UIWizardPageSelectLayoutForm.label.normalPage.CurrentLayout=Huidige lay-out
-UIWizardPageSelectLayoutForm.label.normalPage.DesktopImage=Bureaublad lay-out
UIWizardPageSelectLayoutForm.label.normalPage.DashboardLayout=Dashboard lay-out
UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=Twee kolommen lay-out
UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=Drie kolommen lay-out
@@ -816,7 +813,6 @@
UIPortalBrowser.deletePortal=Weet U zeker dat U deze portaal wilt verwijderen?
SitePortal.label=Site portaal
ClassicPortal.label=Klassieke portaal
-WebOSPortal.label=WebOS portaal
############################################################################
@@ -944,30 +940,6 @@
UIPage.msg.EditPermission.null=U heeft geen voldoende rechten om deze pagina te wijzigen.
############################################################################
-# org.exoplatform.portal.component.view.UIPageDesktop #
-############################################################################
-
-UIPageDesktop.label.pagebody=De pagina inhoud van de portaal
-UIPageDesktop.label.PageContent=Pagina inhoud
-UIPageDesktop.label.View=Tonen
-UIPageDesktop.label.Edit=#{word.edit}
-UIPageDesktop.label.Done=#{word.done}
-UIPageDesktop.title.PortalPage=Portaal pagina
-UIPageDesktop.title.SaveToDatabase=Opslaan in database
-UIPageDesktop.title.AddApplication=Voeg applicatie toe
-UIPageDesktop.title.PageNavigation=Pagina navigatie
-UIPageDesktop.title.eXoBrowser=browser.
-UIPageDesktop.title.ShowPortletDesktop=Toon/verberg portlets
-UIPageDesktop.title.ShowWidgetDesktop=Toon/verberg gadgets
-UIPageDesktop.title.SignIn=Inloggen
-UIPageDesktop.title.SignOut=Uitloggen
-UIPageDesktop.title.pageNavigation=Pagina navigaties
-UIPageDesktop.msg.hasNotPermission=U heeft geen rechten om deze pagina te wijzigen.
-UIPageDesktop.action.Close=Verwijder deze applicatie van de werkbalk
-UIPageDesktop.action.Quit=#{word.quit}
-UIPageDesktop.action.action.Open=#{word.open}
-
-############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -196,7 +196,6 @@
Template.title=Lista de Skins
Template.left.title=Visualizar e selecionar skin
-Desktop.label=Layout da Área de Trabalho
AccountTemplate.left.title=Preview de Exemplo de Template de Conta
AccountTemplate.title=Template de Conta
DefaultAccount.label=Conta Padrão
@@ -408,7 +407,6 @@
UIPageBrowser.msg.Invalid-viewPermission=Usuário sem permissão para acessar página {0}.
UIPageBrowser.msg.Invalid-editPermission=Usuário sem permissão para editar página {0}.
UIPageBrowser.msg.Invalid-deletePermission=Usuário sem permissão para remover página {0}.
-UIPageBrowser.msg.Invalid-Preview=Esta é uma página da área de trabalho. Não é possível o preview desse tipo de página.
UIPageBrowser.msg.NotViewPage=Usuário sem permissão para acessar página.
UIPageBrowser.msg.edit.NotEditPage=Usuário sem permissão para editar página.
UIPageBrowser.msg.delete.NotDelete=Usuário sem permissão para remover página.
@@ -676,7 +674,6 @@
UIWizardPageSelectLayoutForm.tab.label.UIPageTemplateOptions=Opções de Template de Página
UIWizardPageSelectLayoutForm.label.normalPage.EmptyLayout=Layout Vazio
UIWizardPageSelectLayoutForm.label.normalPage.CurrentLayout=Layout Atual
-UIWizardPageSelectLayoutForm.label.normalPage.DesktopImage=Layout de Área de Trabalho
UIWizardPageSelectLayoutForm.label.normalPage.DashboardLayout=Layout de Dashboard
UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=Layout de Duas Colunas
UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=Layout de Três Colunas
@@ -816,7 +813,6 @@
UIPortalBrowser.deletePortal=Deseja remover este portal?
SitePortal.label=Portal de Site
ClassicPortal.label=Portal Clássico
-WebOSPortal.label=Portal WebOS
############################################################################
@@ -947,33 +943,6 @@
UIPage.msg.EditPermission.null=Usuário não possui privilégios para editar esta página.
############################################################################
- # org.exoplatform.portal.component.view.UIPageDesktop #
- ############################################################################
-
-UIPageDesktop.Default.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Mac.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Vista.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.label.pagebody=Conteúdo da página do portal
-UIPageDesktop.label.PageContent=Conteúdo da página
-UIPageDesktop.label.View=Visualizar
-UIPageDesktop.label.Edit=Editar
-UIPageDesktop.label.Done=Finalizar
-UIPageDesktop.title.PortalPage=Página do Portal
-UIPageDesktop.title.SaveToDatabase=Salvar no banco de dados
-UIPageDesktop.title.AddApplication=Adicionar Aplicação
-UIPageDesktop.title.PageNavigation=Navegação de Página
-UIPageDesktop.title.eXoBrowser=Navegador.
-UIPageDesktop.title.ShowPortletDesktop=Mostrar/Ocultar Portlets
-UIPageDesktop.title.ShowWidgetDesktop=Mostrar/Ocultar Gadgets
-UIPageDesktop.title.SignIn=Login
-UIPageDesktop.title.SignOut=Logout
-UIPageDesktop.title.pageNavigation=Navegação de Páginas
-UIPageDesktop.msg.hasNotPermission=Usuário não possui privilégios para editar esta página.
-UIPageDesktop.action.Close=Fechar
-UIPageDesktop.action.Quit=Sair
-UIPageDesktop.action.action.Open=Abrir
-
- ############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -177,7 +177,6 @@
Template.title=Список тем
Template.left.title=Просмотреть и выбрать тему оформления
-Desktop.label=Макет рабочего стола
AccountTemplate.left.title=Образцы шаблонов учётных записей
AccountTemplate.title=Шаблоны учётных записей
DefaultAccount.label=Учетная запись по умолчанию
@@ -396,7 +395,6 @@
UIPageBrowser.msg.Invalid-viewPermission=У Вас нету прав доступа к странице "{0}".
UIPageBrowser.msg.Invalid-editPermission=У Вас нету прав для изменения страницы "{0}".
UIPageBrowser.msg.Invalid-deletePermission=У Вас нету прав для удаления страницы "{0}".
-UIPageBrowser.msg.Invalid-Preview=Это страница рабочего стол. Предварительный просмотр для страниц этого типа невозможен.
UIPageBrowser.msg.NotViewPage=Вы не можете просматривать эту страницу.
UIPageBrowser.msg.edit.NotEditPage=Вы не можете изменять эту страницу.
UIPageBrowser.msg.delete.NotDelete=Вы не можете удалить эту страницу.
@@ -662,7 +660,6 @@
UIWizardPageSelectLayoutForm.tab.label.UIPageTemplateOptions=Опции шаблона страницы
UIWizardPageSelectLayoutForm.label.normalPage.EmptyLayout=Пустой макет
UIWizardPageSelectLayoutForm.label.normalPage.CurrentLayout=Текущий макет
-UIWizardPageSelectLayoutForm.label.normalPage.DesktopImage=Рабочегий стол
UIWizardPageSelectLayoutForm.label.normalPage.DashboardLayout=Доска
UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=2 колонки
UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=3 колонки
@@ -800,7 +797,6 @@
UIPortalBrowser.deletePortal=Вы действительно хотите удалить этот портал?
SitePortal.label=Сайт
ClassicPortal.label=Портал
-WebOSPortal.label=WebOS
############################################################################
@@ -928,33 +924,6 @@
UIPage.msg.EditPermission.null=У Вас нету прав для редактирования страницы.
############################################################################
- # org.exoplatform.portal.component.view.UIPageDesktop #
- ############################################################################
-
-UIPageDesktop.Default.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Mac.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Vista.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.label.pagebody=Тело страницы портала
-UIPageDesktop.label.PageContent=Содержимое страницы
-UIPageDesktop.label.View=Посмотреть
-UIPageDesktop.label.Edit=Изменить
-UIPageDesktop.label.Done=Готово
-UIPageDesktop.title.PortalPage=Страница портала
-UIPageDesktop.title.SaveToDatabase=Сохранить
-UIPageDesktop.title.AddApplication=Добавить приложение
-UIPageDesktop.title.PageNavigation=Навигация страницы
-UIPageDesktop.title.eXoBrowser=eXo браузер.
-UIPageDesktop.title.ShowPortletDesktop=Скрыть/показать портлеты
-UIPageDesktop.title.ShowWidgetDesktop=Скрыть/показать гаджеты
-UIPageDesktop.title.SignIn=Войты
-UIPageDesktop.title.SignOut=Выйти
-UIPageDesktop.title.pageNavigation=Навигации страницы
-UIPageDesktop.msg.hasNotPermission=У Вас нету прав для редактирования страницы.
-UIPageDesktop.action.Close=Удалить это приложение из док-а
-UIPageDesktop.action.Quit=Закрыть
-UIPageDesktop.action.action.Open=Открыть
-
- ############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -177,7 +177,6 @@
Template.title=Список тем
Template.left.title=Перегляд і вибір теми
-Desktop.label=Схема робочого столу
AccountTemplate.left.title=Перегляд зразку шаблону облікового запису
AccountTemplate.title=Шаблони облікових записів
DefaultAccount.label=Обліковий запис за замовчуванням
@@ -387,7 +386,6 @@
UIPageBrowser.msg.Invalid-viewPermission=Вам не дозволено відвідувати цю сторінку {0}.
UIPageBrowser.msg.Invalid-editPermission=Вам не дозволено редагувати цю сторінку {0}.
UIPageBrowser.msg.Invalid-deletePermission=Вам не дозволено видалити цю сторінку {0}.
-UIPageBrowser.msg.Invalid-Preview=Це сторінка робочого столу. Ви не можете переглядати сторінки такого типу.
UIPageBrowser.msg.NotViewPage=У Вас немає прав для перегляду цієї сторінки.
UIPageBrowser.msg.edit.NotEditPage=У Вас немає прав для редагування цієї сторінки.
UIPageBrowser.msg.delete.NotDelete=У Вас немає прав для видалення цієї сторінки.
@@ -653,7 +651,6 @@
UIWizardPageSelectLayoutForm.tab.label.UIPageTemplateOptions=Опції шаблону сторінки
UIWizardPageSelectLayoutForm.label.normalPage.EmptyLayout=Пуста схема
UIWizardPageSelectLayoutForm.label.normalPage.CurrentLayout=Поточна схема
-UIWizardPageSelectLayoutForm.label.normalPage.DesktopImage=Схема робочого столу
UIWizardPageSelectLayoutForm.label.normalPage.DashboardLayout=Схема панелі іннструментів
UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=Схема двох колонок
UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=Схема трьох колонок
@@ -791,7 +788,6 @@
UIPortalBrowser.deletePortal=Ви впевнені, що бажаєте видалити цей портал?
SitePortal.label=Сайт-портал
ClassicPortal.label=Класичний портал
-WebOSPortal.label=WebOS портал
############################################################################
@@ -919,33 +915,6 @@
UIPage.msg.EditPermission.null=У Вас немає прав, щоб редагувати цю сторінку.
############################################################################
- # org.exoplatform.portal.component.view.UIPageDesktop #
- ############################################################################
-
-UIPageDesktop.Default.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Mac.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Vista.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.label.pagebody=Тіло сторінки порталу
-UIPageDesktop.label.PageContent=Контент сторінки
-UIPageDesktop.label.View=Перегляд
-UIPageDesktop.label.Edit=Редагування
-UIPageDesktop.label.Done=Виконано
-UIPageDesktop.title.PortalPage=Сторінка порталу
-UIPageDesktop.title.SaveToDatabase=Зберегти до бази даних
-UIPageDesktop.title.AddApplication=Додати програму
-UIPageDesktop.title.PageNavigation=Навігація сторінки
-UIPageDesktop.title.eXoBrowser=eXo Браузер.
-UIPageDesktop.title.ShowPortletDesktop=Показати/приховати властивості
-UIPageDesktop.title.ShowWidgetDesktop=Показати/приховати гаджети
-UIPageDesktop.title.SignIn=Вхід
-UIPageDesktop.title.SignOut=Вихід
-UIPageDesktop.title.pageNavigation=Навігація сторінки
-UIPageDesktop.msg.hasNotPermission=У Вас немає прав редагувати цю сторінку.
-UIPageDesktop.action.Close=Вилучити це застосування з панелі документів
-UIPageDesktop.action.Quit=Вихід
-UIPageDesktop.action.action.Open=Відкрити
-
- ############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-04-15 07:41:26 UTC (rev 6230)
@@ -181,7 +181,6 @@
Template.title=Danh sách giao diện
Template.left.title=Tham khảo và chọn giao diện
-Desktop.label=Kiểu giao diện Desktop
AccountTemplate.left.title=Mẫu tài khoản tham khảo
AccountTemplate.title=Mẫu tài khoản
DefaultAccount.label=Tài khoản mặc định
@@ -397,7 +396,6 @@
UIPageBrowser.msg.Invalid-viewPermission=Bạn không có quyền truy cập trang {0}!
UIPageBrowser.msg.Invalid-editPermission=Bạn không có quyền chỉnh sửa trang {0}!
UIPageBrowser.msg.Invalid-deletePermission=Bạn không có quyền xóa trang {0}!
-UIPageBrowser.msg.Invalid-Preview=Trang này có kiểu giao diện Desktop. Bạn không thể xem mẫu !
UIPageBrowser.msg.NotViewPage=Bạn không có quyền truy cập trang này.
UIPageBrowser.msg.edit.NotEditPage=Bạn không có quyền chỉnh sửa trang này.
UIPageBrowser.msg.delete.NotDelete=Bạn không có quyền xóa trang này.
@@ -669,7 +667,6 @@
UIWizardPageSelectLayoutForm.tab.label.UIPageTemplateOptions=Tùy chọn trang mẫu
UIWizardPageSelectLayoutForm.label.normalPage.EmptyLayout=Mặc định
UIWizardPageSelectLayoutForm.label.normalPage.CurrentLayout=Giữ nguyên
-UIWizardPageSelectLayoutForm.label.normalPage.DesktopImage=Bố trí kiểu Desktop
UIWizardPageSelectLayoutForm.label.normalPage.DashboardLayout=Bố trí kiểu Dashboard
UIWizardPageSelectLayoutForm.label.columnPage.TwoColumnsLayout=2 cột
UIWizardPageSelectLayoutForm.label.columnPage.ThreeColumnsLayout=3 cột
@@ -807,7 +804,6 @@
UIPortalBrowser.deletePortal=Bạn có chắc chắn muốn xóa Portal này không?
SitePortal.label=Site Portal
ClassicPortal.label=Classic Portal
-WebOSPortal.label=WebOS Portal
############################################################################
@@ -968,33 +964,6 @@
UIPage.msg.EditPermission.null=Bạn không được quyền chỉnh sửa trang này!
############################################################################
- # org.exoplatform.portal.component.view.UIPageDesktop #
- ############################################################################
-
-UIPageDesktop.Default.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Mac.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.Vista.img.location=/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
-UIPageDesktop.label.pagebody=Phần thân của trang Portal.
-UIPageDesktop.label.PageContent=Vùng chứa nội dung của trang.
-UIPageDesktop.label.View=Xem
-UIPageDesktop.label.Edit=Chỉnh sửa
-UIPageDesktop.label.Done=Thực hiện xong
-UIPageDesktop.title.PortalPage=Trang Portal
-UIPageDesktop.title.SaveToDatabase=Lưu vào cơ sở dữ liệu
-UIPageDesktop.title.AddApplication=Thêm ứng dụng
-UIPageDesktop.title.PageNavigation=Trang danh mục chính
-UIPageDesktop.title.eXoBrowser=Trình duyệt eXo!
-UIPageDesktop.title.ShowPortletDesktop=Hiện/Ẩn các Portlet
-UIPageDesktop.title.ShowWidgetDesktop=Hiện/Ẩn các Gadget
-UIPageDesktop.title.SignIn=Đăng nhập
-UIPageDesktop.title.SignOut=Đăng xuất
-UIPageDesktop.title.pageNavigation=Trang danh mục chính
-UIPageDesktop.msg.hasNotPermission=Bạn không được quyền chỉnh sửa trang này!
-UIPageDesktop.action.Close=Loại bỏ ứng dụng khỏi Dockbar!
-UIPageDesktop.action.Quit=Thoát
-UIPageDesktop.action.action.Open=Mở
-
- ############################################################################
# org.exoplatform.portal.component.view.UIPageBody #
############################################################################
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2011-04-15 07:41:26 UTC (rev 6230)
@@ -289,9 +289,6 @@
<title>查看和选择皮肤</title>
</left>
</Template>
- <Desktop>
- <label>桌面布局</label>
- </Desktop>
<AccountTemplate>
<left>
<title>示例帐户模板预览</title>
@@ -605,7 +602,6 @@
<Invalid-viewPermission>您不能访问页面{0}</Invalid-viewPermission>
<Invalid-editPermission>您不能编辑页面{0}.</Invalid-editPermission>
<Invalid-deletePermission>您不能删除页面{0}.</Invalid-deletePermission>
- <Invalid-Preview>这是桌面网页。您无法预览这种类型的网页。</Invalid-Preview>
<NotViewPage>您无权查看此页面。</NotViewPage>
<edit>
<NotEditPage>您无权编辑此页面。</NotEditPage>
@@ -1004,7 +1000,6 @@
<normalPage>
<EmptyLayout>空布局</EmptyLayout>
<CurrentLayout>当前布局</CurrentLayout>
- <DesktopImage>桌面布局</DesktopImage>
<DashboardLayout>控制面板布局</DashboardLayout>
</normalPage>
<columnPage>
@@ -1245,9 +1240,6 @@
<ClassicPortal>
<label>经典门户</label>
</ClassicPortal>
- <WebOSPortal>
- <label>WebOS 门户</label>
- </WebOSPortal>
<PopupPageSelector>
<title>
@@ -1404,52 +1396,6 @@
</EditPermission>
</msg>
</UIPage>
- <UIPageDesktop>
- <Default>
- <img>
- <location>/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80</location>
- </img>
- </Default>
- <Mac>
- <img>
- <location>/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80</location>
- </img>
- </Mac>
- <Vista>
- <img>
- <location>/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80</location>
- </img>
- </Vista>
- <label>
- <pagebody>门户页面正文</pagebody>
- <PageContent>页面内容</PageContent>
- <View>查看</View>
- <Edit>编辑</Edit>
- <Done>完成</Done>
- </label>
- <title>
- <PortalPage>门户页面</PortalPage>
- <SaveToDatabase>保存到数据库</SaveToDatabase>
- <AddApplication>增加应用</AddApplication>
- <PageNavigation>页面导航</PageNavigation>
- <eXoBrowser>浏览器</eXoBrowser>
- <ShowPortletDesktop>显示/隐藏 Portlets</ShowPortletDesktop>
- <ShowWidgetDesktop>显示/隐藏 小工具</ShowWidgetDesktop>
- <SignIn>登录</SignIn>
- <SignOut>退出</SignOut>
- <pageNavigation>页面导航</pageNavigation>
- </title>
- <msg>
- <hasNotPermission>您无权编辑此页。</hasNotPermission>
- </msg>
- <action>
- <Close>从桌面导航删除这个应用</Close>
- <Quit>退出</Quit>
- <action>
- <Open>打开</Open>
- </action>
- </action>
- </UIPageDesktop>
<UIPageBody>
<msg>
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2011-04-15 07:37:46 UTC (rev 6229)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2011-04-15 07:41:26 UTC (rev 6230)
@@ -387,9 +387,6 @@
<title>查看和選擇外觀</title>
</left>
</Template>
- <Desktop>
- <label>桌面佈局</label>
- </Desktop>
<AccountTemplate>
<left>
<title>帳戶模板預覽</title>
@@ -750,7 +747,6 @@
<Invalid-editPermission>您不能編輯頁面{0}.</Invalid-editPermission>
<Invalid-deletePermission>您不能刪除頁面{0}.
</Invalid-deletePermission>
- <Invalid-Preview>這是桌面網頁。您無法預覽這種類型的網頁。</Invalid-Preview>
<NotViewPage>您無權查看此頁面。</NotViewPage>
<edit>
<NotEditPage>您無權編輯此頁面。</NotEditPage>
@@ -1152,7 +1148,6 @@
<normalPage>
<EmptyLayout>空佈局</EmptyLayout>
<CurrentLayout>當前佈局</CurrentLayout>
- <DesktopImage>桌面佈局</DesktopImage>
<DashboardLayout>控制面板佈局</DashboardLayout>
</normalPage>
<columnPage>
@@ -1398,9 +1393,6 @@
<ClassicPortal>
<label>經典Portal</label>
</ClassicPortal>
- <WebOSPortal>
- <label>WebOSPortal</label>
- </WebOSPortal>
<PopupPageSelector>
<title>
@@ -1573,55 +1565,6 @@
</EditPermission>
</msg>
</UIPage>
- <UIPageDesktop>
- <Default>
- <img>
- <location>/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
- </location>
- </img>
- </Default>
- <Mac>
- <img>
- <location>/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
- </location>
- </img>
- </Mac>
- <Vista>
- <img>
- <location>/eXoResources/skin/DefaultSkin/portal/webui/component/view/UIPageDesktop/icons/80x80
- </location>
- </img>
- </Vista>
- <label>
- <pagebody>Portal頁面正文</pagebody>
- <PageContent>頁面內容</PageContent>
- <View>查看</View>
- <Edit>編輯</Edit>
- <Done>完成</Done>
- </label>
- <title>
- <PortalPage>Portal頁面</PortalPage>
- <SaveToDatabase>儲存到資料庫</SaveToDatabase>
- <AddApplication>新增儲存程式</AddApplication>
- <PageNavigation>頁面導覽器</PageNavigation>
- <eXoBrowser>瀏覽器</eXoBrowser>
- <ShowPortletDesktop>顯示/隱藏Portlets</ShowPortletDesktop>
- <ShowWidgetDesktop>顯示/隱藏小工具</ShowWidgetDesktop>
- <SignIn>登錄</SignIn>
- <SignOut>退出</SignOut>
- <pageNavigation>頁面導覽器</pageNavigation>
- </title>
- <msg>
- <hasNotPermission>您無權編輯此頁。</hasNotPermission>
- </msg>
- <action>
- <Close>從桌面導覽器刪除這個儲存</Close>
- <Quit>退出</Quit>
- <action>
- <Open>打開</Open>
- </action>
- </action>
- </UIPageDesktop>
<UIPageBody>
<msg>
14 years, 5 months
- 1
- 0
gatein SVN: r6229 - portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-04-15 03:37:46 -0400 (Fri, 15 Apr 2011)
New Revision: 6229
Modified:
portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java
portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
Log:
GTNPORTAL-1785 EditInfoActionListener of UIPageBrowser should delegate the actual work to the actual UIPage
Modified: portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java 2011-04-15 07:36:05 UTC (rev 6228)
+++ portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java 2011-04-15 07:37:46 UTC (rev 6229)
@@ -19,6 +19,7 @@
package org.exoplatform.portal.webui.page;
+import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.webui.application.UIPortlet;
@@ -32,6 +33,7 @@
import org.exoplatform.portal.webui.workspace.UIPortalToolPanel;
import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
import org.exoplatform.web.application.ApplicationMessage;
+import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.EventConfig;
import org.exoplatform.webui.event.Event;
@@ -140,60 +142,64 @@
{
this.maximizedUIPortlet = maximizedUIPortlet;
}
-
- public static class EditCurrentPageActionListener extends EventListener<UIPage>
+
+ public void switchToEditMode() throws Exception
{
- @Override
- public void execute(Event<UIPage> event) throws Exception {
- UIPortalApplication uiApp = Util.getUIPortalApplication();
- UIWorkingWorkspace uiWorkingWS = uiApp
- .getChildById(UIPortalApplication.UI_WORKING_WS_ID);
+ Page page = PortalDataMapper.toPageModel(this);
+ switchToEditMode(page);
+ }
- // check edit permission for page
- UIPageBody pageBody = uiWorkingWS
- .findFirstComponentOfType(UIPageBody.class);
- UIPage uiPage = (UIPage) pageBody.getUIComponent();
- if (uiPage == null) {
- uiApp.addMessage(new ApplicationMessage(
- "UIPageBrowser.msg.PageNotExist", null));
- return;
- }
- Page page = PortalDataMapper.toPageModel(uiPage);
+ public void switchToEditMode(Page page) throws Exception
+ {
+ WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
- UserACL userACL = uiApp.getApplicationComponent(UserACL.class);
- if (!userACL.hasEditPermission(page)) {
- uiApp.addMessage(new ApplicationMessage(
- "UIPortalManagement.msg.Invalid-EditPage-Permission", null));
- return;
- }
+ // check edit permission for page
+ UserACL userACL = getApplicationComponent(UserACL.class);
+ if (!userACL.hasEditPermission(page)) {
+ context.getUIApplication().addMessage(new ApplicationMessage(
+ "UIPortalManagement.msg.Invalid-EditPage-Permission", null));
+ return;
+ }
- uiWorkingWS.setRenderedChild(UIEditInlineWorkspace.class);
+ UIPortalApplication uiApp = Util.getUIPortalApplication();
+ UIWorkingWorkspace uiWorkingWS = uiApp
+ .getChildById(UIPortalApplication.UI_WORKING_WS_ID);
+ uiWorkingWS.setRenderedChild(UIEditInlineWorkspace.class);
- UIPortalComposer portalComposer = uiWorkingWS.findFirstComponentOfType(
- UIPortalComposer.class).setRendered(true);
- portalComposer.setComponentConfig(UIPortalComposer.class, "UIPageEditor");
- portalComposer.setId("UIPageEditor");
- portalComposer.setShowControl(true);
- portalComposer.setEditted(false);
- portalComposer.setCollapse(false);
+ UIPortalComposer portalComposer = uiWorkingWS.findFirstComponentOfType(
+ UIPortalComposer.class).setRendered(true);
+ portalComposer.setComponentConfig(UIPortalComposer.class, "UIPageEditor");
+ portalComposer.setId("UIPageEditor");
+ portalComposer.setShowControl(true);
+ portalComposer.setEditted(false);
+ portalComposer.setCollapse(false);
- UIPortalToolPanel uiToolPanel = uiWorkingWS
- .findFirstComponentOfType(UIPortalToolPanel.class);
- uiToolPanel.setShowMaskLayer(false);
- uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
+ UIPortalToolPanel uiToolPanel = uiWorkingWS
+ .findFirstComponentOfType(UIPortalToolPanel.class);
+ uiToolPanel.setShowMaskLayer(false);
+ uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
- // We clone the edited UIPage object, that is required for Abort action
- Class<? extends UIPage> clazz = UIPage.getRealClass(uiPage.getFactoryId());
- UIPage newUIPage = uiWorkingWS.createUIComponent(clazz, null, null);
- PortalDataMapper.toUIPage(newUIPage, page);
- uiToolPanel.setWorkingComponent(newUIPage);
+ // We clone the edited UIPage object, that is required for Abort action
+ UIPage newUIPage = uiWorkingWS.createUIComponent(UIPage.class, null, null);
+ PortalDataMapper.toUIPage(newUIPage, page);
+ uiToolPanel.setWorkingComponent(newUIPage);
- // Remove current UIPage from UIPageBody
- pageBody.setUIComponent(null);
+ // Remove current UIPage from UIPageBody
+ UIPageBody pageBody = uiWorkingWS
+ .findFirstComponentOfType(UIPageBody.class);
+ pageBody.setUIComponent(null);
- event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS);
- Util.getPortalRequestContext().setFullRender(true);
-
- }
+ PortalRequestContext prContext = Util.getPortalRequestContext();
+ prContext.addUIComponentToUpdateByAjax(uiWorkingWS);
+ prContext.setFullRender(true);
}
+
+ public static class EditCurrentPageActionListener extends EventListener<UIPage>
+ {
+ @Override
+ public void execute(Event<UIPage> event) throws Exception
+ {
+ event.getSource().switchToEditMode();
+ }
+ }
}
\ No newline at end of file
Modified: portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
===================================================================
--- portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-04-15 07:36:05 UTC (rev 6228)
+++ portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-04-15 07:37:46 UTC (rev 6229)
@@ -29,7 +29,6 @@
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.Query;
-import org.exoplatform.portal.config.UserACL;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.ModelObject;
import org.exoplatform.portal.config.model.Page;
@@ -39,10 +38,8 @@
import org.exoplatform.portal.webui.application.UIPortlet;
import org.exoplatform.portal.webui.portal.PageNodeEvent;
import org.exoplatform.portal.webui.portal.UIPortal;
-import org.exoplatform.portal.webui.portal.UIPortalComposer;
import org.exoplatform.portal.webui.util.PortalDataMapper;
import org.exoplatform.portal.webui.util.Util;
-import org.exoplatform.portal.webui.workspace.UIEditInlineWorkspace;
import org.exoplatform.portal.webui.workspace.UIMaskWorkspace;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
@@ -400,66 +397,21 @@
public void execute(Event<UIPageBrowser> event) throws Exception
{
UIPageBrowser uiPageBrowser = event.getSource();
- PortalRequestContext pcontext = Util.getPortalRequestContext();
- UIPortalApplication uiPortalApp = (UIPortalApplication)pcontext.getUIApplication();
- String id = pcontext.getRequestParameter(OBJECTID);
- UserPortalConfigService service = uiPageBrowser.getApplicationComponent(UserPortalConfigService.class);
+ WebuiRequestContext context = event.getRequestContext();
+ String pageID = context.getRequestParameter(OBJECTID);
+ DataStorage service = uiPageBrowser.getApplicationComponent(DataStorage.class);
//Check existence of the page
- Page page = service.getPage(id);
+ Page page = service.getPage(pageID);
if (page == null)
{
- uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.PageNotExist", new String[]{id}, 1));
- pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages());
+ context.getUIApplication().addMessage(new ApplicationMessage("UIPageBrowser.msg.PageNotExist", new String[]{pageID}, 1));
return;
}
- if (page.getName().equals("webos"))
- {
- uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.edit.NotEditDesktopPage", new String[]{id}, 1));
- pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages());
- return;
- }
-
- //Check current user 's permissions on the page
- UserACL userACL = uiPageBrowser.getApplicationComponent(UserACL.class);
- if (!userACL.hasEditPermission(page))
- {
- uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.edit.NotEditPage", new String[]{id}, 1));
- pcontext.addUIComponentToUpdateByAjax(uiPortalApp.getUIPopupMessages());
- return;
- }
-
- //Switch portal application to edit mode
- uiPortalApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
- UIWorkingWorkspace uiWorkingWS = uiPortalApp.findFirstComponentOfType(UIWorkingWorkspace.class);
- UIEditInlineWorkspace editInlineWS = uiWorkingWS.getChild(UIEditInlineWorkspace.class);
-
- //Clone a UIPage object, that is required for Abort action
- UIPage uiPage = editInlineWS.createUIComponent(UIPage.class, null, null);
- PortalDataMapper.toUIPage(uiPage, page);
-
- UIPageBody uiPageBody = uiPortalApp.findFirstComponentOfType(UIPageBody.class);
- if (uiPageBody.getUIComponent() != null)
- uiPageBody.setUIComponent(null);
-
- editInlineWS.setRendered(true);
- editInlineWS.setUIComponent(uiPage);
-
- UIPortalComposer portalComposer = editInlineWS.getChild(UIPortalComposer.class).setRendered(true);
- portalComposer.setComponentConfig(UIPortalComposer.class, "UIPageEditor");
- portalComposer.setShowControl(true);
- portalComposer.setEditted(false);
- portalComposer.setCollapse(false);
- portalComposer.setId("UIPageEditor");
-
- //toolPanel.setUIComponent(uiPage);
- //toolPanel.setShowMaskLayer(false);
- //uiWorkingWS.setRenderedChild(UIPortalToolPanel.class);
- //uiWorkingWS.addChild(UIPortalComposer.class, "UIPageEditor", null);
- uiWorkingWS.setRenderedChild(UIPortalApplication.UI_EDITTING_WS_ID);
- pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.ignoreAJAXUpdateOnPortlets(true);
+ //Need this code to override editpage action in extension project
+ Class<? extends UIPage> clazz = UIPage.getRealClass(page.getFactoryId());
+ clazz.getConstructor().newInstance().switchToEditMode(page);
}
}
@@ -530,6 +482,7 @@
}
page.setOwnerType(uiPage.getOwnerType());
+
List<UIPortlet> uiPortlets = new ArrayList<UIPortlet>();
findAllPortlet(uiPortlets, uiPage);
ArrayList<ModelObject> applications = new ArrayList<ModelObject>();
@@ -552,6 +505,7 @@
uiPage.getChildren().clear();
PortalDataMapper.toUIPage(uiPage, page);
+
// if (page.getTemplate() == null) page.setTemplate(uiPage.getTemplate());
if (page.getChildren() == null)
page.setChildren(new ArrayList<ModelObject>());
14 years, 5 months
- 1
- 0
gatein SVN: r6228 - portal/branches/decoupled-webos/web/portal/src/main/webapp/groovy/portal/webui/application.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-04-15 03:36:05 -0400 (Fri, 15 Apr 2011)
New Revision: 6228
Modified:
portal/branches/decoupled-webos/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
Log:
GTNPORTAL-1784 Remove WebOS related checking from UIPortlet.gtmpl
Modified: portal/branches/decoupled-webos/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
===================================================================
--- portal/branches/decoupled-webos/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2011-04-15 07:34:42 UTC (rev 6227)
+++ portal/branches/decoupled-webos/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2011-04-15 07:36:05 UTC (rev 6228)
@@ -18,10 +18,9 @@
String onControlOver = "eXo.webui.UIPortlet.onControlOver(this, true);";
String onControlOut = "eXo.webui.UIPortlet.onControlOver(this, false);";
- WindowState windowState = uicomponent.getCurrentWindowState();
- boolean isDesktop = "Window".equals(uicomponent.getPortletStyle());
+ WindowState windowState = uicomponent.getCurrentWindowState();
String portletId = uicomponent.getId();
- if(!isDesktop && uiPortalApp.isEditing()) {
+ if(uiPortalApp.isEditing()) {
%>
<div class="UIPortlet <%=hasPermission?"":"ProtectedPortlet"%>" id="UIPortlet-$portletId" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"
style="top: 0px; left:0px;">
@@ -66,20 +65,6 @@
if(windowWidth!= null && !windowWidth.contains("%") && !windowWidth.contains("px")) windowWidth += "px";
String windowHeight = uicomponent.getHeight();
if(windowHeight != null && !windowHeight.contains("%") && !windowHeight.contains("px")) windowHeight += "px";
- if(isDesktop) {
- appDisplay = "";
- visibility = "hidden";
-
- /*###################################################################*/
- String appStatus = uicomponent.getProperties().get("appStatus");
- if("SHOW".equals(appStatus)) {
- appDisplay = "block";
- appZIndex = uicomponent.getProperties().get("zIndex");
- windowWidth = (String)uicomponent.getProperties().getIntValue("windowWidth") + "px";
- windowHeight = (String)uicomponent.getProperties().getIntValue("windowHeight") + "px";
- }
- /*###################################################################*/
- }
String cssStyle = "style=\"";
cssStyle += "visibility: "+ visibility +";";
cssStyle += "display: "+ appDisplay +";";
@@ -107,15 +92,7 @@
} else if(windowState == WindowState.MINIMIZED) {
renderMini = restore;
}
- if(isDesktop) {%>
- <div class="ControlIcon MaximizedIcon" title="$renderMaxi" onmouseover="$onControlOver" onmouseout="$onControlOut"><span></span>
- <div style="display:none">{"normalTitle":"$maxiTooltip","modeTitle":"$restoreDown"}</div>
- </div>
- <div class="ControlIcon MinimizedIcon" title="$renderMini" onmouseover="$onControlOver" onmouseout="$onControlOut"><span></span>
- <div style="display:none">{"normalTitle":"$miniTooltip","modeTitle":"$restore"}</div>
- </div>
- <%
- } else if(uicomponent.getShowWindowState()) {
+ if(uicomponent.getShowWindowState()) {
String maximizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'maximized');";
String minimizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'minimized');";
String maximizedMode = "Maximized";
@@ -255,7 +232,7 @@
}
}
}
- if(!isDesktop && uiPortalApp.isEditing()) {
+ if(uiPortalApp.isEditing()) {
if(portalMode != uiPortalApp.CONTAINER_BLOCK_EDIT_MODE && portalMode != uiPortalApp.APP_BLOCK_EDIT_MODE) {
%>
<div class="UIPortletMaskParent" style="height: 0px;position:relative;">
14 years, 5 months
- 1
- 0