Author: trong.tran Date: 2011-05-06 05:37:15 -0400 (Fri, 06 May 2011) New Revision: 6449 Added: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/BaseUIPageFactory.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageFactory.java portal/trunk/webui/portal/src/main/resources/ portal/trunk/webui/portal/src/main/resources/META-INF/ portal/trunk/webui/portal/src/main/resources/META-INF/services/ portal/trunk/webui/portal/src/main/resources/META-INF/services/org.exoplatform.portal.webui.page.UIPageFactory Removed: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/background/AddApplicationButton.gif portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/background/AddToStartup.gif portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIAddNewApplication.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIDesktopPage.gtmpl portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java portal/trunk/webui/portal/src/main/resources/META-INF/ portal/trunk/webui/portal/src/main/resources/META-INF/services/ portal/trunk/webui/portal/src/main/resources/META-INF/services/org.exoplatform.portal.webui.page.UIPageFactory Modified: portal/trunk/ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSearch.java portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css portal/trunk/pom.xml portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIAdminToolbarPortlet.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ar.xml portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_de.properties portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_pt_BR.properties portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIIFramePortlet/DefaultStylesheet.css portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/Stylesheet.css portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css portal/trunk/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormUploadInput.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalToolPanel.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java Log: Merge the decouple webos branch into GateIn 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/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /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/decoupled-webos:6214-6243 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/branches/wsrp-extraction:5828-6031 Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -21,8 +21,8 @@ import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.FormattedBy; import org.chromattic.api.annotations.NamingPrefix; +import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.PrimaryType; -import org.chromattic.api.annotations.OneToMany; import org.chromattic.ext.format.BaseEncodingObjectFormatter; import java.util.List; @@ -49,8 +49,8 @@ public CategoryDefinition getCategory(String categoryName) { - Map<String, CategoryDefinition> categoryMap = getCategoryMap(); - return categoryMap.get(categoryName); + Map<String, CategoryDefinition> categories = getCategoryMap(); + return categories.get(categoryName); } public CategoryDefinition createCategory(String categoryName) Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -31,9 +31,6 @@ **/ public class Page extends Container { - - final static public String DESKTOP_PAGE = "Desktop"; - final static public String DEFAULT_PAGE = "Default"; private String ownerType; @@ -203,5 +200,5 @@ public String toString() { return "Page[ownerType=" + ownerType + ",ownerId=" + ownerId + ",name=" + name + "]"; - } + } } \ No newline at end of file Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -242,6 +242,11 @@ return prefs; } + public POMSessionManager getManager() + { + return mgr; + } + private static final BaseEncodingObjectFormatter formatter = new BaseEncodingObjectFormatter(); public <O extends WorkspaceObject> Iterator<O> findObjects(ObjectType<O> type, ObjectType<? extends Site> siteType, @@ -255,7 +260,7 @@ ownerId = ownerId.trim(); if (!ownerId.isEmpty()) { - ownerIdChunk = formatter.encodeNodeName(null, ownerId); + ownerIdChunk = "mop:" + formatter.encodeNodeName(null, ownerId); } } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -23,6 +23,7 @@ import org.exoplatform.commons.utils.ListAccess; import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.config.Query; +import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.portal.pom.config.POMTask; import org.exoplatform.portal.pom.data.Mapper; import org.exoplatform.portal.pom.data.NavigationData; @@ -30,11 +31,7 @@ import org.exoplatform.portal.pom.data.PortalData; import org.exoplatform.portal.pom.data.PortalKey; import org.exoplatform.portal.pom.config.POMSession; -import org.gatein.mop.api.workspace.Navigation; -import org.gatein.mop.api.workspace.ObjectType; -import org.gatein.mop.api.workspace.Site; -import org.gatein.mop.api.workspace.Workspace; -import org.gatein.mop.api.workspace.WorkspaceObject; +import org.gatein.mop.api.workspace.*; import java.util.ArrayList; import java.util.Collection; @@ -64,7 +61,7 @@ super(query); } - public LazyPageList<T> run(final POMSession session) throws Exception + public final LazyPageList<T> run(final POMSession session) throws Exception { Iterator<W> ite; try @@ -80,22 +77,24 @@ } catch (IllegalArgumentException e) { - ite = Collections.<W> emptyList().iterator(); + ite = Collections.<W>emptyList().iterator(); } // - final ArrayList<W> array = new ArrayList<W>(); + final ArrayList<String> array = new ArrayList<String>(); while (ite.hasNext()) { - array.add(ite.next()); + array.add(ite.next().getObjectId()); } // - final Iterator<W> it = array.iterator(); + final POMSessionManager manager = session.getManager(); + final Iterator<String> it = array.iterator(); ListAccess<T> la = new ListAccess<T>() { public T[] load(int index, int length) throws Exception, IllegalArgumentException { + POMSession session = manager.getSession(); T[] result = createT(length); for (int i = 0; i < length; i++) { @@ -120,7 +119,7 @@ protected abstract T[] createT(int length); - protected abstract T loadT(POMSession session, W w); + protected abstract T loadT(POMSession session, String id); } @@ -143,9 +142,10 @@ return new PageData[length]; } - protected PageData loadT(POMSession session, org.gatein.mop.api.workspace.Page w) + protected PageData loadT(POMSession session, String id) { - return new Mapper(session).load(w); + Page page = session.getManager().getPOMService().getModel().findObjectById(ObjectType.PAGE, id); + return new Mapper(session).load(page); } } @@ -168,9 +168,10 @@ return new NavigationData[length]; } - protected NavigationData loadT(POMSession session, Navigation w) + protected NavigationData loadT(POMSession session, String id) { - return new Mapper(session).load(w); + Navigation nav = session.getManager().getPOMService().getModel().findObjectById(ObjectType.NAVIGATION, id); + return new Mapper(session).load(nav); } } Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSearch.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSearch.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSearch.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -97,4 +97,26 @@ assertNotFound("foo"); assertNotFound("foo bar"); } + + public void testSearchPageByOwnerID() throws Exception + { + Query<Page> q = new Query<Page>(null, "foo", Page.class); + List<Page> res = storage.find(q).getAll(); + assertEquals(0, res.size()); + + q.setOwnerId("test"); + res = storage.find(q).getAll(); + int pageNum = res.size(); + assertTrue(pageNum > 0); + + //Test trim ownerID + q.setOwnerId(" test "); + res = storage.find(q).getAll(); + assertEquals(pageNum, res.size()); + + //This should returns all pages + q.setOwnerId(null); + res = storage.find(q).getAll(); + assertTrue(res.size() > 0); + } } Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css =================================================================== --- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/pom.xml 2011-05-06 09:37:15 UTC (rev 6449) @@ -757,6 +757,12 @@ <include>**/*.xsd</include> </includes> </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*.*</include> + </includes> + </resource> </resources> <testResources> <testResource> Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIAdminToolbarPortlet.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIAdminToolbarPortlet.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIAdminToolbarPortlet.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -40,9 +40,6 @@ @ComponentConfig(lifecycle = UIApplicationLifecycle.class, template = "app:/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl") public class UIAdminToolbarPortlet extends UIPortletApplication { - // Minh Hoang TO - // TODO: Add a ThreadLocal cache to avoid double invocation of editPermission - // check ( one in processRender method, and one in Groovy template ) public UIAdminToolbarPortlet() throws Exception { Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2011-05-06 09:37:15 UTC (rev 6449) @@ -22,6 +22,12 @@ <portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> + + <public-render-parameter> + <identifier>navigation_uri</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:navigatio... + </public-render-parameter> + <portlet> <description xml:lang="EN">Organization Portlet</description> <portlet-name>OrganizationPortlet</portlet-name> @@ -194,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> @@ -253,6 +262,8 @@ <short-title>Administration Toolbar</short-title> <keywords>gatein_internal</keywords> </portlet-info> + + <supported-public-render-parameter>navigation_uri</supported-public-render-parameter> </portlet> <portlet> @@ -343,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> @@ -402,4 +416,7 @@ <event-definition> <name>NewAccountAdded</name> </event-definition> + <event-definition> + <name>UserPageNodeDeleted</name> + </event-definition> </portlet-app> Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ar.xml =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ar.xml 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ar.xml 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_de.properties =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_de.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_de.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_pt_BR.properties =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_pt_BR.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_pt_BR.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml =================================================================== --- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIIFramePortlet/DefaultStylesheet.css =================================================================== --- portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIIFramePortlet/DefaultStylesheet.css 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIIFramePortlet/DefaultStylesheet.css 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/Stylesheet.css =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/Stylesheet.css 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/Stylesheet.css 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/background/AddApplicationButton.gif =================================================================== (Binary files differ) Deleted: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIMaskWorkspace/background/AddToStartup.gif =================================================================== (Binary files differ) Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIWindow/Stylesheet.css 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-05-06 09:37:15 UTC (rev 6449) @@ -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; Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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=&Ouml;ffnen - - ############################################################################ # org.exoplatform.portal.component.view.UIPageBody # ############################################################################ 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-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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 @@ -430,10 +429,10 @@ 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. +UIPageBrowser.msg.delete.DeleteCurrentUserPage=You have to switch to other page to delete this page UIPageBrowser.selectItem.ownerType=Owner Type UIPageBrowser.selectItem.ownerId=Owner Id UIPageBrowser.selectItem.name=Name @@ -710,7 +709,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 @@ -849,7 +847,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 ############################################################################ @@ -1014,33 +1011,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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_pt_BR.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2011-05-06 09:37:15 UTC (rev 6449) @@ -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/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2011-05-06 09:37:15 UTC (rev 6449) @@ -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> Deleted: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIAddNewApplication.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIAddNewApplication.gtmpl 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIAddNewApplication.gtmpl 2011-05-06 09:37:15 UTC (rev 6449) @@ -1,152 +0,0 @@ -<% - import org.exoplatform.web.application.Parameter; - List appCategories = uicomponent.getApplicationCategories(); -%> -<div class="UIAddApplication" id="UIAddNewApplication"> - <div class="UIBarStyle"> - <div class="TitleBar"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"><%=_ctx.appRes("UIAddNewApplication.label.AddApplication")%></div> - </div> - </div> - </div> - </div> - - <div class="ContentContainerDetail"> - <div class="CategoryContainer"> - - <div class="UITabContentContainer"> - <div class="UITabContent" style="display: block"> - <div class="UIAddPortlet"> - <div class="UIItemSelector"> - <div class="LeftColumnStyle"> - <div class="ItemListContainer"> - - <div class="ItemListTitle"> - <div class="TitleIcon ItemListIcon"><span></span></div> - <div class="Title"><%=_ctx.appRes("UIAddNewApplication.label.Categories")%></div> - <div class="ClearLeft"><span></span></div> - </div> - <div class="ItemList"> - <% - boolean selected = true; - for(category in appCategories){ - %> - <div onmouseout="eXo.webui.UIItemSelector.onOver(this, false);" onmouseover="eXo.webui.UIItemSelector.onOver(this, true);" onclick="eXo.webui.UIItemSelector.onClick(this);" class="<%= selected ? "SelectedItem" : "" %> Item" title="<%=category.getDisplayName()%>"> - <div class="LeftItem"> - <div class="RightItem"><div id="<%=category.getName()%>" class="ItemTitle"><div class="CenterItemTitle"><%=category.getDisplayName()%></div></div></div> - </div> - </div> - <% - selected = false; - } - %> - </div> - - </div> - - <div class="ItemDetailList"> - <div class="ItemDetailTitle"> - <div class="TitleIcon ViewListIcon"><span></span></div> - <div class="Title"><%=_ctx.appRes("UIAddNewApplication.label.Select")%></div> - <div class="ClearLeft"><span></span></div> - </div> - <div class="ApplicationListContainer"> - <% if(appCategories==null || appCategories.isEmpty()){ %> - <div class="ItemDetail" style="display:block"> - <div class="NoneAppsMessage" style="display:block"> - <%=_ctx.appRes("UIAddNewApplication.label.NoneApp")%> - </div> - </div> - <% } %> - <% - selected = true; - for(category in appCategories) { - List listApplication = category.getApplications(); - %> - <div class="ItemDetail" style="display: <%= selected ? "block" : "none" %>"> - - <% - for(application in listApplication) { - String srcBG = application.getApplicationGroup() + "/skin/DefaultSkin/portletIcons/" + application.getApplicationName()+ ".png"; - String srcNormalBG = "/eXoResources/skin/sharedImages/Icon80x80/DefaultPortlet.png"; - - //Create add Application Ajax request URL - String callingAction = "AddApplication"; - String addApplicationURL = uicomponent.event(callingAction, application.getId()); - String addToStartup = uicomponent.event("AddToStartup", application.getId()); - %> - <div class="Application"> - <div class="ApplicationDescription"> - <div onclick="$addApplicationURL" title="<%= application.getDisplayName() %>" class="PortletIcon"> - <span><img src="/$srcBG" alt="" onError="src='$srcNormalBG'" /></span> - </div> - <div class="ApplicationContent"> - <div class="TitleBarApplication"> - <div class="Title"><%= application.getDisplayName() %></div> - <div class="ApplicationButton"> - <% if (org.exoplatform.web.application.Application.EXO_PORTLET_TYPE.equals(application.getApplicationType())) { %> - <div title="<%=_ctx.appRes("UIAddNewApplication.label.AddToStartup")%>" class="AddToStartUp" onclick="$addToStartup" ><span></span></div> - <%}%> - <div title="<%=_ctx.appRes("UIAddNewApplication.label.Add")%>" class="AddButton" onclick="$addApplicationURL" ><span></span></div> - </div> - </div> - <div class="ApplicationContentLabel"> - <div class="ContentLabel"> - <span class="LeftLabel"><%=_ctx.appRes("UIAddNewApplication.label.Type")%></span> - <span class="RightLabel"><%=application.getApplicationType()%></span> - </div> - <div class="ContentLabel"> - <span class="LeftLabel"><%=_ctx.appRes("UIAddNewApplication.label.Created")%></span> - <span class="RightLabel">eXo Platform SAS.</span> - </div> - <div class="ContentLabel"> - <span class="LeftLabel"><%=_ctx.appRes("UIAddNewApplication.label.Description")%></span> - <span class="RightLabel"><%= application.getDescription() %></span> - </div> - </div> - </div> - </div> - <div class="ClearRight"><span ></span></div> - </div> - <% - } - %> - - </div> - <% - selected = false; - } - %> - </div> - </div> - <div class="ClearLeft"><span></span></div> - </div> - </div> - </div> - </div> - </div> - - </div> - </div> - - <div class="UIAction"> - <table class="ActionContainer"> - <tr> - <td> - <div class="ActionButton LightBlueStyle" onclick="<%= uicomponent.event("Close") %>" > - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);"><%=_ctx.appRes("UIAddNewApplication.label.Close")%></a> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> - </div> - -</div> \ No newline at end of file Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2011-05-06 09:37:15 UTC (rev 6449) @@ -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;"> Deleted: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIDesktopPage.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIDesktopPage.gtmpl 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIDesktopPage.gtmpl 2011-05-06 09:37:15 UTC (rev 6449) @@ -1,307 +0,0 @@ -<% - import org.exoplatform.portal.webui.application.UIPortlet; - import org.exoplatform.web.application.JavascriptManager; - import org.exoplatform.portal.config.model.PageNavigation; - import org.exoplatform.portal.config.model.PageNode; - def rcontext = _ctx.getRequestContext(); - JavascriptManager jsmanager = rcontext.getJavascriptManager(); - - jsmanager.importJavascript('eXo.desktop.UIDesktop'); - jsmanager.importJavascript('eXo.webui.UIPopupSelectCategory'); - jsmanager.importJavascript('eXo.desktop.UIWindow'); - jsmanager.importJavascript('eXo.webui.UIRightClickPopupMenu'); - jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.SaveTitle='" + _ctx.appRes("UIDashboardContainer.label.SaveTitle") + "';"); - jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.CancelTitle='" + _ctx.appRes("UIDashboardContainer.label.CancelTitle") + "';"); - jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.Cache='" + _ctx.appRes("UIDashboardContainer.label.Cache") + "';"); - jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.Debug='" + _ctx.appRes("UIDashboardContainer.label.Debug") + "';"); - jsmanager.addCustomizedOnLoadScript('eXo.desktop.UIDockbar.initNav();'); - - String docBase = rcontext.getRequestContextPath(); - String comId = uicomponent.getId(); - boolean modifiable = uicomponent.isModifiable(); - - void renderSinglePageNode(PageNavigation nav, PageNode node) { - String href = uicomponent.event("ChangePage", nav.getId() + "::" + node.getUri()); - String icon = node.getIcon(); - if(icon == null) icon = "DefaultPageIcon"; - print """ - <div class="MenuItem"> - <div class="LabelItem"> - <div class="Icon $icon" style="padding-left: 18px"> - <div class="LabelText"><a href="#" onclick="$href">$node.resolvedLabel</a></div> - </div> - </div> - </div> - """; - } - - void renderPageNode(PageNavigation nav, PageNode node) { - String href = uicomponent.event("ChangePage", nav.getId() + "::" + node.getUri()); - String icon = node.getIcon(); - String scrollUpTitle = _ctx.appRes("UIExoStart.tooltip.scrollUp"); - String scrollDownTitle = _ctx.appRes("UIExoStart.tooltip.scrollDown"); - if(icon == null) icon = "DefaultPageIcon"; - print """ - <div class="MenuItem"> - <div class="LabelItem"> - <div class="Icon $icon" style="padding-left: 18px"> - <div class="BlackArrowIcon"> - <div class="LabelText "><a href="#" onclick="$href">$node.resolvedLabel</a></div> - </div> - </div> - </div> - <div class="MenuItemContainer"> - <div class="StartMenuDecorator"> - <div class="StartMenuTL"> - <div class="StartMenuTR"> - <div class="StartMenuTC"><span></span></div> - </div> - </div> - <div class="StartMenuML"> - <div class="StartMenuMR"> - <div class="StartMenuBG" style="padding-bottom: 6px"> - <div class="TopNavigator" style="display: none;" title="$scrollUpTitle"> - <div class="UpNavigatorIcon"><span></span></div> - </div> - <div class="BlockMenu"> - <div class="MenuContainer"> - """; - for(child in node.getChildren()) { - if(child.getChildren() != null && child.getChildren().size() > 0) renderPageNode(nav, child); - else renderSinglePageNode(nav, child); - } - print """ - </div> - </div> - <div class="BottomNavigator" style="display: none;" title="$scrollDownTitle"> - <div class="DownNavigatorIcon"><span></span></div> - </div> - </div> - </div> - </div> - <div class="StartMenuBL"> - <div class="StartMenuBR"> - <div class="StartMenuBC"><span></span></div> - </div> - </div> - </div> - </div> - </div> - """; - } - - void renderPageNavigation(PageNavigation navigation) { - nodes = navigation.getNodes(); - if(nodes.size() < 1) return; - String navTitle = _ctx.appRes("UIPageNavigation.label.titleBar"); - navTitle = navTitle.replace("{0}", navigation.ownerId); - print """ - <div class="PageNavigationBlock"> - <div class="DecoratorBlock"> - <div class="PageOwnerContainer"> - <div class="TitleBar">$navTitle </div> - """; - for(node in nodes) { - if(node.getChildren() != null && node.getChildren().size() > 0) { - renderPageNode(navigation, node); - } - else renderSinglePageNode(navigation, node); - } - print """ - </div> - </div> - </div> - """; - } - - void renderNavigations() { - String label = _ctx.appRes(uicomponent.getId() + ".item.PageNavigation"); - String scrollUpTitle = _ctx.appRes("UIExoStart.tooltip.scrollUp"); - String scrollDownTitle = _ctx.appRes("UIExoStart.tooltip.scrollDown"); - navigations = uicomponent.getNavigations(); - //if (navigations != null && navigations.size() > 0 && navigations.get(0).getNodes().size() > 0) { - if (navigations != null && navigations.size() > 0) { - print """ - <div class="MenuItemContainer NavigationContainer" style="position: absolute; top: -450px;"> - <div class="StartMenuDecorator"> - <div class="StartMenuTL"> - <div class="StartMenuTR"> - <div class="StartMenuTC"><span></span></div> - </div> - </div> - <div class="StartMenuML"> - <div class="StartMenuMR"> - <div class="StartMenuBG" style="padding: 5px 0px;"> - <div class="TopNavigator" style="display: none;" title="$scrollUpTitle"> - <div class="UpNavigatorIcon"><span></span></div> - </div> - <div class="BlockMenu"> - <div class="MenuContainer"> - """; - for(navigation in navigations) { - renderPageNavigation(navigation); - } - print """ - </div> - </div> - <div class="BottomNavigator" style="display: none;" title="$scrollDownTitle"> - <div class="DownNavigatorIcon"><span></span></div> - </div> - </div> - </div> - </div> - <div class="StartMenuBL"> - <div class="StartMenuBR"> - <div class="StartMenuBC"><span></span></div> - </div> - </div> - </div> - </div> - """; - } - } - -%> - - -<div class="UIPage" id="UIPage-${uicomponent.id}"> - <div class="META-DATA-BLOCK" style="display: none"> - <div class="id">$uicomponent.id</div> - <div class="title"><%=_ctx.appRes("UIPage.label.title")%></div> - <div class="description"><%=_ctx.appRes("UIPage.label.description")%></div> - </div> - <div class="VIEW-PAGE"> - <div id="UIPage"> - <div class="UIPageDesktop" id="UIPageDesktop"> - <%int x = 15; y = 15 %> - <%for(uiChild in uicomponent.getChildren()) { - if(!(uiChild instanceof UIPortlet)) { - uicomponent.renderUIComponent(uiChild); - continue; - } - - String popupId = uiChild.getId(); - String title = uiChild.getTitle(); - if(title == null || title.trim().length() < 1) { - title = popupId; - uiChild.setTitle(title); - } - uiChild.setShowInfoBar(true); - uiChild.setPortletStyle("Window"); - uicomponent.renderUIComponent(uiChild); - - String posX = uiChild.getProperties().get("locationX"); - String posY = uiChild.getProperties().get("locationY"); - - if(posX == null) posX = (String)x; - if(posY == null) posY = (String)y; - - jsmanager.addJavascript("eXo.desktop.UIWindow.init('UIWindow-${popupId}', true, ${posX}, ${posY});"); - %> - <% x += 10; y += 20;%> - <%}%> - - <%//String containerMouseOver = "eXo.desktop.UIDockbar.containerMouseOver();";%> - <div class="UIDockBar" id="UIDockBar" onmouseover="eXo.desktop.UIDockbar.startDockBarEvt(event);"> - <div id="DockNavigation" class="UIExoStart" style="position: absolute; display: none; width: 0px;"> - <div class="StartMenuContainer"> - <% renderNavigations(); %> - </div> - </div> - <div class="UIRightClickPopupMenu" id="DockbarContextMenu" onmousedown="event.cancelBubble = true;"> - <div class="UIContextMenuContainer" > - <div class="TopLeftRightClickPopupMenu"> - <div class="TopRightRightClickPopupMenu"> - <div class="TopCenterRightClickPopupMenu"><span></span></div> - </div> - </div> - <div class="MiddleLeftRightClickPopupMenu"> - <div class="MiddleRightRightClickPopupMenu"> - <div class="UIRightPopupMenuContainer"> - <div class="MenuItem"> - <a href="javascript:eXo.desktop.UIDesktop.removeApp('<%=uicomponent.url("RemoveChild", "_objectid_")%>')" onclick="return eXo.webui.UIRightClickPopupMenu.prepareObjectId(event, this);" - class="ItemIcon CloseDockBarIcon"><%=_ctx.appRes("UIPageDesktop.action.Close")%></a> - </div> - <div class="MenuItem"> - <a class="ItemIcon QuitDockBarIcon" href="javascript:eXo.desktop.UIDesktop.removeWindowContent('_objectid_')" onclick="return eXo.webui.UIRightClickPopupMenu.prepareObjectId(event, this);" ><%=_ctx.appRes("UIPageDesktop.action.Quit")%></a> - </div> - <div class="RightClickCustomItem"><%=_ctx.appRes("UIPageDesktop.action.action.Open")%></div> - </div> - </div> - </div> - <div class="BottomLeftRightClickPopupMenu"> - <div class="BottomRightRightClickPopupMenu"> - <div class="BottomCenterRightClickPopupMenu"> - <div class="ClickCenterBottom"><span></span></div> - </div> - </div> - </div> - </div> - </div> - <div class="DockbarLeft"> - <div class="DockbarRight"> - <div class="DockbarCenter" id="DockbarCenter"> - - <div class="IconContainer" id="IconContainer" style="text-align: center;"> - <img id="FixBug" alt="" src="/eXoResources/skin/sharedImages/Debug1x32.gif" /> - - <%if(rcontext.getRemoteUser() == null) {%> - <img id="SignInIcon" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/Signin.png" alt="" title="" - onclick="<%=uicomponent.event("ShowLoginForm", null);%>" /><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIPageDesktop.title.SignIn")%></span> - <%} else {%> - <img id="SignOutIcon" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/Signout.png" alt="" title="" - onclick="eXo.portal.logout()" /><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIPageDesktop.title.SignOut")%></span> - <%} %> - <img class="Separator" alt="" src="/webosResources/skin/Defaultskin/portal/webui/component/view/UIPageDesktop/background/Separator2x1.png"/> - - <% String changeLanguageAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ChangeLanguage', true));"; %> - <img id="ChangeLanguageIcon" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/ChangeLanguage.png" alt="" title="" - onclick="$changeLanguageAction" /><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIExoStart.item.ChangeLanguage")%></span> - - <img class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/NavigationIcon.png" alt="" title="" - id="NavigationIcon" - onclick="eXo.desktop.UIDockbar.showNavigation(event)"/><span class="Tooltip" style="display: none"><%=_ctx.appRes("UIPageDesktop.title.pageNavigation")%></span> - - <%if(modifiable) {%> - <img class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/AddPortlet.png" alt="" title="" - id="UIAddApplicationIcon" - onclick="<%=uicomponent.event("ShowAddNewApplication")%>"/><span class="Tooltip" style="display: none"><%=_ctx.appRes("UIPageDesktop.title.AddApplication")%></span> - <%}%> - <img class="Separator" alt="" src="/webosResources/skin/Defaultskin/portal/webui/component/view/UIPageDesktop/background/Separator2x1.png"/> - <% - def res = rcontext.getApplicationResourceBundle(); - String skin = rcontext.getUIApplication().getSkin(); - - for(uiChild in uicomponent.getChildren()) { - if(!(uiChild instanceof UIPortlet)) continue; - String imgLocation = uiChild.getExoWindowID().getPortletApplicationName() + "/skin/DefaultSkin/portletIcons/" + uiChild.getExoWindowID().getPortletName(); - String appStatus = uiChild.getProperties().get("appStatus"); - boolean isVisible = "SHOW".equals(appStatus) || "HIDE".equals(appStatus); - - if(rcontext.getRemoteUser() != null) { - %> - <img id="DockItem${uiChild.id}" class="Icon <%=isVisible ? "ShowIcon": ""%>" onmousedown="eXo.webui.UIRightClickPopupMenu.clickRightMouse(event, this, 'DockbarContextMenu', '${uiChild.id}', null, 1)" src="/${imgLocation}.png" alt="" - onerror="this.src='/eXoResources/skin/sharedImages/Icon80x80/DefaultPortlet.png'" onclick="eXo.desktop.UIDesktop.showHideWindow('UIWindow-${uiChild.id}', this);" /><span class="Tooltip" style="display: none"><%=uiChild.getTitle();%></span> - <%}else{%> - <img id="DockItem${uiChild.id}" class="Icon <%=isVisible ? "ShowIcon": ""%>" src="/${imgLocation}.png" alt="" - onerror="this.src='/eXoResources/skin/sharedImages/Icon80x80/DefaultPortlet.png'" onclick="eXo.desktop.UIDesktop.showHideWindow('UIWindow-${uiChild.id}', this);" /><span class="Tooltip" style="display: none"><%=uiChild.getTitle();%></span> - <%}}%> - - <img class="Separator" alt="" src="/webosResources/skin/Defaultskin/portal/webui/component/view/UIPageDesktop/background/Separator2x1.png" /> - <img id="PortletsViewer" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/ShowPortletsViewer.png" alt="" title=""/><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIPageDesktop.title.ShowPortletDesktop")%></span> - <img id="GadgetsViewer" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/HideWidgetsViewer.png" alt="" title=""/><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIPageDesktop.title.ShowWidgetDesktop")%></span> - </div> - </div> - </div> - </div> - - </div> - </div> - </div> - </div> -</div> - -<% - jsmanager.addOnLoadJavascript('eXo.desktop.UIDesktop.init'); - jsmanager.addOnResizeJavascript('eXo.desktop.UIDesktop.fixDesktop'); -%> \ No newline at end of file Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormUploadInput.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormUploadInput.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormUploadInput.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -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 { Deleted: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -1,289 +0,0 @@ -/** - * 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.application; - -import org.exoplatform.application.registry.Application; -import org.exoplatform.application.registry.ApplicationCategory; -import org.exoplatform.application.registry.ApplicationRegistryService; -import org.exoplatform.container.ExoContainer; -import org.exoplatform.container.ExoContainerContext; -import org.exoplatform.portal.application.PortalRequestContext; -import org.exoplatform.portal.config.DataStorage; -import org.exoplatform.portal.config.UserPortalConfigService; -import org.exoplatform.portal.config.model.ApplicationType; -import org.exoplatform.portal.config.model.CloneApplicationState; -import org.exoplatform.portal.config.model.ModelObject; -import org.exoplatform.portal.config.model.Page; -import org.exoplatform.portal.config.model.TransientApplicationState; -import org.exoplatform.portal.pom.spi.gadget.Gadget; -import org.exoplatform.portal.pom.spi.portlet.Portlet; -import org.exoplatform.portal.pom.spi.wsrp.WSRPState; -import org.exoplatform.portal.webui.page.UIPage; -import org.exoplatform.portal.webui.portal.UIPortal; -import org.exoplatform.portal.webui.util.PortalDataMapper; -import org.exoplatform.portal.webui.util.Util; -import org.exoplatform.portal.webui.workspace.UIMaskWorkspace; -import org.exoplatform.portal.webui.workspace.UIPortalApplication; -import org.exoplatform.portal.webui.workspace.UIPortalToolPanel; -import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace; -import org.exoplatform.webui.config.annotation.ComponentConfig; -import org.exoplatform.webui.config.annotation.EventConfig; -import org.exoplatform.webui.core.UIComponent; -import org.exoplatform.webui.core.UIContainer; -import org.exoplatform.webui.event.Event; -import org.exoplatform.webui.event.EventListener; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** Created by The eXo Platform SARL Author : Anh Nguyen ntuananh.vn(a)gmail.com Oct 18, 2007 */ -@ComponentConfig(template = "system:/groovy/portal/webui/application/UIAddNewApplication.gtmpl", events = { - @EventConfig(listeners = UIMaskWorkspace.CloseActionListener.class), - @EventConfig(listeners = UIAddNewApplication.AddApplicationActionListener.class), - @EventConfig(listeners = UIAddNewApplication.AddToStartupActionListener.class)}) -public class UIAddNewApplication extends UIContainer -{ - - private List<ApplicationCategory> listAppCategories; - - private UIComponent uiComponentParent; - - private boolean isInPage; - - public List<ApplicationCategory> getApplicationCategories() throws Exception - { - return listAppCategories; - } - - public List<ApplicationCategory> getApplicationCategories(String remoteUser, - ApplicationType[] applicationType) throws Exception - { - ExoContainer container = ExoContainerContext.getCurrentContainer(); - ApplicationRegistryService prService = (ApplicationRegistryService)container.getComponentInstanceOfType(ApplicationRegistryService.class); - - if (applicationType == null) - { - applicationType = new ApplicationType[0]; - } - - List<ApplicationCategory> appCategories = prService.getApplicationCategories(remoteUser, - applicationType); - - if (appCategories == null) - { - appCategories = new ArrayList(); - } - else - { - Iterator<ApplicationCategory> cateItr = appCategories.iterator(); - while (cateItr.hasNext()) - { - ApplicationCategory cate = cateItr.next(); - List<Application> applications = cate.getApplications(); - if (applications.size() < 1) - { - cateItr.remove(); - } - } - } - listAppCategories = appCategories; - - return listAppCategories; - - } - - public UIComponent getUiComponentParent() - { - return uiComponentParent; - } - - public void setUiComponentParent(UIComponent uiComponentParent) - { - this.uiComponentParent = uiComponentParent; - } - - public boolean isInPage() - { - return isInPage; - } - - public void setInPage(boolean isInPage) - { - this.isInPage = isInPage; - } - - private Application getApplication(String id) throws Exception - { - - List<ApplicationCategory> pCategories = getApplicationCategories(); - - for (ApplicationCategory pCategory : pCategories) - { - List<Application> applications = pCategory.getApplications(); - for (Application application : applications) - { - if (application.getId().equals(id)) - { - return application; - } - } - } - - return null; - } - - /** - * Add Application to UiPage - * - * @param event - * @throws Exception - */ - private static void addApplicationToPage(Event<UIAddNewApplication> event, boolean atStartup) throws Exception - { - UIPortal uiPortal = Util.getUIPortal(); - - UIPortalApplication uiPortalApp = uiPortal.getAncestorOfType(UIPortalApplication.class); - UIPage uiPage; - if (uiPortal.isRendered()) - { - uiPage = uiPortal.findFirstComponentOfType(UIPage.class); - } - else - { - UIPortalToolPanel uiPortalToolPanel = uiPortalApp.findFirstComponentOfType(UIPortalToolPanel.class); - uiPage = uiPortalToolPanel.findFirstComponentOfType(UIPage.class); - } - - String applicationId = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID); - - Application application = event.getSource().getApplication(applicationId); - ApplicationType appType = application.getType(); - String portletName = application.getApplicationName(); -// String appGroup = application.getApplicationGroup(); - - // TODO review windowId for eXoWidget and eXoApplication - UIComponent component = null; - if (ApplicationType.GADGET.equals(appType)) - { - UIGadget uiGadget = uiPage.createUIComponent(event.getRequestContext(), UIGadget.class, null, null); - - uiGadget.setState(new TransientApplicationState<Gadget>(portletName)); - - // Set Properties For gadget - int posX = (int)(Math.random() * 400); - int posY = (int)(Math.random() * 200); - - uiGadget.getProperties().put(UIApplication.locationX, String.valueOf(posX)); - uiGadget.getProperties().put(UIApplication.locationY, String.valueOf(posY)); - - component = uiGadget; - } - else - { - boolean remote = ApplicationType.WSRP_PORTLET.equals(appType); - - UIPortlet uiPortlet = uiPage.createUIComponent(UIPortlet.class, null, null); - - CloneApplicationState appState; - Object appId; - if (!remote) - { - appState = new CloneApplicationState<Portlet>(application.getId()); - } - else - { - appState = new CloneApplicationState<WSRPState>(application.getId()); - } - - ApplicationType applicationType = remote ? ApplicationType.WSRP_PORTLET : ApplicationType.PORTLET; - PortletState portletState = new PortletState(appState, applicationType); - - uiPortlet.setState(portletState); - uiPortlet.setPortletInPortal(false); - - if (atStartup) - { - uiPortlet.getProperties().setProperty("appStatus", "HIDE"); - } - - if (application != null) - { - String displayName = application.getDisplayName(); - if (displayName != null) - { - uiPortlet.setTitle(displayName); - } - else if (portletName != null) - { - uiPortlet.setTitle(portletName); - } - uiPortlet.setDescription(application.getDescription()); - List<String> accessPers = application.getAccessPermissions(); - String[] accessPermissions = accessPers.toArray(new String[accessPers.size()]); - uiPortlet.setAccessPermissions(accessPermissions); - - component = uiPortlet; - } - } - - // Add component to page - uiPage.addChild(component); - - // Save all changes - if (uiPage.isModifiable()) - { - Page page = (Page)PortalDataMapper.buildModelObject(uiPage); - if (page.getChildren() == null) - { - page.setChildren(new ArrayList<ModelObject>()); - } - DataStorage dataService = uiPortalApp.getApplicationComponent(DataStorage.class); - dataService.save(page); - } - - PortalRequestContext pcontext = Util.getPortalRequestContext(); - UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); - pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.ignoreAJAXUpdateOnPortlets(true); - } - - static public class AddApplicationActionListener extends EventListener<UIAddNewApplication> - { - public void execute(Event<UIAddNewApplication> event) throws Exception - { - if (event.getSource().isInPage()) - { - addApplicationToPage(event, false); - } - } - } - - static public class AddToStartupActionListener extends EventListener<UIAddNewApplication> - { - public void execute(Event<UIAddNewApplication> event) throws Exception - { - if (event.getSource().isInPage()) - { - addApplicationToPage(event, true); - } - } - } -} Copied: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/BaseUIPageFactory.java (from rev 6243, portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/BaseUIPageFactory.java) =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/BaseUIPageFactory.java (rev 0) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/BaseUIPageFactory.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -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=&quot;trongtt(a)gmail.com&quot;&gt;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 Deleted: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -1,237 +0,0 @@ -/** - * 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.commons.serialization.api.annotations.Serialized; -import org.exoplatform.portal.config.DataStorage; -import org.exoplatform.portal.config.model.ModelObject; -import org.exoplatform.portal.config.model.Page; -import org.exoplatform.portal.config.model.PageNavigation; -import org.exoplatform.portal.webui.application.UIAddNewApplication; -import org.exoplatform.portal.webui.application.UIApplication; -import org.exoplatform.portal.webui.application.UIGadget; -import org.exoplatform.portal.webui.application.UIPortlet; -import org.exoplatform.portal.webui.navigation.PageNavigationUtils; -import org.exoplatform.portal.webui.page.UIPageActionListener.DeleteGadgetActionListener; -import org.exoplatform.portal.webui.page.UIPageActionListener.RemoveChildActionListener; -import org.exoplatform.portal.webui.portal.PageNodeEvent; -import org.exoplatform.portal.webui.portal.UIPortal; -import org.exoplatform.portal.webui.portal.UIPortalComponentActionListener.ShowLoginFormActionListener; -import org.exoplatform.portal.webui.util.PortalDataMapper; -import org.exoplatform.portal.webui.util.Util; -import org.exoplatform.portal.webui.workspace.UIMaskWorkspace; -import org.exoplatform.portal.webui.workspace.UIPortalApplication; -import org.exoplatform.webui.config.annotation.ComponentConfig; -import org.exoplatform.webui.config.annotation.EventConfig; -import org.exoplatform.webui.core.UIComponent; -import org.exoplatform.webui.event.Event; -import org.exoplatform.webui.event.EventListener; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; - -import javax.portlet.WindowState; - -/** - * May 19, 2006 - */ - -@ComponentConfig(lifecycle = UIPageLifecycle.class, template = "system:/groovy/portal/webui/page/UIDesktopPage.gtmpl", events = { - @EventConfig(listeners = ShowLoginFormActionListener.class), - @EventConfig(listeners = DeleteGadgetActionListener.class), - @EventConfig(listeners = RemoveChildActionListener.class), - @EventConfig(listeners = UIDesktopPage.SaveGadgetPropertiesActionListener.class), - @EventConfig(listeners = UIDesktopPage.SaveWindowPropertiesActionListener.class), - @EventConfig(listeners = UIDesktopPage.ShowAddNewApplicationActionListener.class), - @EventConfig(listeners = UIDesktopPage.ChangePageActionListener.class), - @EventConfig(listeners = UIDesktopPage.ShowPortletActionListener.class)}) -@Serialized -public class UIDesktopPage extends UIPage -{ - - public UIDesktopPage() - { - setChildren((List<UIComponent>)new CopyOnWriteArrayList<UIComponent>()); - } - - public boolean isShowMaxWindow() - { - return true; - } - - public List<PageNavigation> getNavigations() throws Exception - { - List<PageNavigation> allNav = Util.getUIPortal().getNavigations(); - String removeUser = Util.getPortalRequestContext().getRemoteUser(); - List<PageNavigation> result = new ArrayList<PageNavigation>(); - for (PageNavigation nav : allNav) - { - result.add(PageNavigationUtils.filter(nav, removeUser)); - } - return result; - } - - static public class SaveGadgetPropertiesActionListener extends EventListener<UIPage> - { - public void execute(Event<UIPage> event) throws Exception - { - UIPage uiPage = event.getSource(); - String objectId = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID); - List<UIGadget> uiGadgets = new ArrayList<UIGadget>(); - uiPage.findComponentOfType(uiGadgets, UIGadget.class); - UIGadget uiGadget = null; - for (UIGadget ele : uiGadgets) - { - if (ele.getId().equals(objectId)) - { - uiGadget = ele; - break; - } - } - if (uiGadget == null) - return; - String posX = event.getRequestContext().getRequestParameter("posX"); - String posY = event.getRequestContext().getRequestParameter("posY"); - String zIndex = event.getRequestContext().getRequestParameter(UIApplication.zIndex); - - uiGadget.getProperties().put(UIApplication.locationX, posX); - uiGadget.getProperties().put(UIApplication.locationY, posY); - uiGadget.getProperties().put(UIApplication.zIndex, zIndex); - - if (!uiPage.isModifiable()) - return; - Page page = (Page)PortalDataMapper.buildModelObject(uiPage); - if (page.getChildren() == null) - page.setChildren(new ArrayList<ModelObject>()); - DataStorage dataService = uiPage.getApplicationComponent(DataStorage.class); - dataService.save(page); - } - } - - static public class SaveWindowPropertiesActionListener extends EventListener<UIPage> - { - public void execute(Event<UIPage> event) throws Exception - { - UIPage uiPage = event.getSource(); - String objectId = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID); - - UIApplication uiApp = uiPage.getChildById(objectId); - if (uiApp == null) - return; - - /*########################## Save Position ##########################*/ - String posX = event.getRequestContext().getRequestParameter("posX"); - String posY = event.getRequestContext().getRequestParameter("posY"); - - if (posX != null) - uiApp.getProperties().put(UIApplication.locationX, posX); - if (posY != null) - uiApp.getProperties().put(UIApplication.locationY, posY); - - //System.out.println("\n\n\n\n\n\n\n\n\n\n\n SAVE POSX: "+posX+"\n SAVE POSY: "+posY+"\n\n\n\n\n\n\n\n\n"); - /*########################## Save ZIndex ##########################*/ - String zIndex = event.getRequestContext().getRequestParameter(UIApplication.zIndex); - - if (zIndex != null) - uiApp.getProperties().put(UIApplication.zIndex, zIndex); - - /*########################## Save Dimension ##########################*/ - String windowWidth = event.getRequestContext().getRequestParameter("windowWidth"); - String windowHeight = event.getRequestContext().getRequestParameter("windowHeight"); - - if (windowWidth != null) - uiApp.getProperties().put("windowWidth", windowWidth); - if (windowHeight != null) - uiApp.getProperties().put("windowHeight", windowHeight); - - // if(appWidth != null) uiComponent.getProperties().put(UIApplication.appWidth, appWidth); - // if(appHeight != null) uiComponent.getProperties().put(UIApplication.appHeight, appHeight); - - // String applicationHeight = event.getRequestContext().getRequestParameter("applicationHeight"); - // if(applicationHeight != null) uiComponent.getProperties().put("applicationHeight", applicationHeight); - - /*########################## Save Window status (SHOW / HIDE) ##########################*/ - String appStatus = event.getRequestContext().getRequestParameter(UIApplication.appStatus); - if (appStatus != null) - uiApp.getProperties().put(UIApplication.appStatus, appStatus); - - // if(!uiPage.isModifiable()) return; - // Page page = PortalDataMapper.toPageModel(uiPage); - // UserPortalConfigService configService = uiPage.getApplicationComponent(UserPortalConfigService.class); - // if(page.getChildren() == null) page.setChildren(new ArrayList<Object>()); - // configService.update(page); - } - } - - static public class ShowAddNewApplicationActionListener extends EventListener<UIPage> - { - public void execute(Event<UIPage> event) throws Exception - { - UIPage uiPage = event.getSource(); - UIPortalApplication uiPortalApp = uiPage.getAncestorOfType(UIPortalApplication.class); - UIMaskWorkspace uiMaskWorkspace = uiPortalApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); - - UIAddNewApplication uiAddApplication = uiPage.createUIComponent(UIAddNewApplication.class, null, null); - uiAddApplication.setInPage(true); - uiAddApplication.setUiComponentParent(uiPage); - uiAddApplication.getApplicationCategories(event.getRequestContext().getRemoteUser(), null); - - uiMaskWorkspace.setWindowSize(700, 375); - uiMaskWorkspace.setUIComponent(uiAddApplication); - uiMaskWorkspace.setShow(true); - event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWorkspace); - } - } - - static public class ChangePageActionListener extends EventListener<UIPage> - { - public void execute(Event<UIPage> event) throws Exception - { - String uri = event.getRequestContext().getRequestParameter(OBJECTID); - UIPortal uiPortal = Util.getUIPortal(); - UIPageBody uiPageBody = uiPortal.findFirstComponentOfType(UIPageBody.class); - if (uiPageBody != null) - { - if (uiPageBody.getMaximizedUIComponent() != null) - { - UIPortlet currentPortlet = (UIPortlet)uiPageBody.getMaximizedUIComponent(); - currentPortlet.setCurrentWindowState(WindowState.NORMAL); - uiPageBody.setMaximizedUIComponent(null); - } - } - PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uri); - uiPortal.broadcast(pnevent, Event.Phase.PROCESS); - } - } - - static public class ShowPortletActionListener extends EventListener<UIPage> - { - public void execute(Event<UIPage> event) throws Exception - { - UIPage uiPage = event.getSource(); - String portletId = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID); - UIPortlet uiPortlet = uiPage.getChildById(portletId); - uiPortlet.getProperties().setProperty("appStatus", "SHOW"); - event.getRequestContext().addUIComponentToUpdateByAjax(uiPortlet); - } - } - -} \ No newline at end of file Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPage.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -19,19 +19,33 @@ 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; import org.exoplatform.portal.webui.container.UIContainer; 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; +import org.exoplatform.portal.webui.workspace.UIPortalApplication; +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; +import org.exoplatform.webui.event.EventListener; /** * May 19, 2006 */ -@ComponentConfig(lifecycle = UIPageLifecycle.class, template = "system:/groovy/portal/webui/page/UIPage.gtmpl", events = {@EventConfig(listeners = MoveChildActionListener.class)}) +@ComponentConfig(lifecycle = UIPageLifecycle.class, template = "system:/groovy/portal/webui/page/UIPage.gtmpl", events = {@EventConfig(listeners = MoveChildActionListener.class), + @EventConfig(name = "EditCurrentPage", listeners = UIPage.EditCurrentPageActionListener.class)}) public class UIPage extends UIContainer { - /** . */ private String pageId; @@ -45,6 +59,8 @@ private UIPortlet maximizedUIPortlet; + public static String DEFAULT_FACTORY_ID = "Default"; + public String getOwnerId() { return ownerId; @@ -104,4 +120,64 @@ { this.maximizedUIPortlet = maximizedUIPortlet; } + + public void switchToEditMode() throws Exception + { + Page page = PortalDataMapper.toPageModel(this); + switchToEditMode(page); + } + + public void switchToEditMode(Page page) throws Exception + { + WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); + + // 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; + } + + 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); + + 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 + UIPage newUIPage = uiWorkingWS.createUIComponent(UIPage.class, null, null); + PortalDataMapper.toUIPage(newUIPage, page); + uiToolPanel.setWorkingComponent(newUIPage); + + // Remove current UIPage from UIPageBody + UIPageBody pageBody = uiWorkingWS + .findFirstComponentOfType(UIPageBody.class); + pageBody.setUIComponent(null); + + 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/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -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"); @@ -145,15 +141,10 @@ { return uiPage; } + + UIPageFactory clazz = UIPageFactory.getInstance(page.getFactoryId()); + uiPage = clazz.createUIPage(context); - if (Page.DESKTOP_PAGE.equals(page.getFactoryId())) - { - uiPage = createUIComponent(context, UIDesktopPage.class, null, null); - } - else - { - uiPage = createUIComponent(context, UIPage.class, null, null); - } PortalDataMapper.toUIPage(uiPage, page); uiPortal.setUIPage(page.getId(), uiPage); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -19,13 +19,19 @@ package org.exoplatform.portal.webui.page; +import java.util.ArrayList; +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; 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; @@ -35,10 +41,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; @@ -57,8 +61,8 @@ import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; import org.exoplatform.webui.core.model.SelectItemOption; import org.exoplatform.webui.event.Event; -import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.event.Event.Phase; +import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.form.UIForm; import org.exoplatform.webui.form.UIFormInputItemSelector; import org.exoplatform.webui.form.UIFormInputSet; @@ -66,10 +70,6 @@ import org.exoplatform.webui.form.UIFormStringInput; import org.exoplatform.webui.form.UISearchForm; -import java.util.ArrayList; -import java.util.List; -import java.util.ResourceBundle; - @ComponentConfigs({ @ComponentConfig(template = "system:/groovy/portal/webui/page/UIPageBrowser.gtmpl", events = { @EventConfig(listeners = UIPageBrowser.DeleteActionListener.class, confirm = "UIPageBrowse.deletePage"), @@ -266,13 +266,24 @@ return; } 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()); return; } - + + UIPortal uiPortal = Util.getUIPortal(); + boolean isDeleteCurrentPage = uiPortal.getSelectedNode().getPageReference().equals(page.getPageId()); + if (isDeleteCurrentPage && page.getOwnerType().equals(PortalConfig.USER_TYPE)) + { + ApplicationMessage msg = new ApplicationMessage("UIPageBrowser.msg.delete.DeleteCurrentUserPage", null, ApplicationMessage.WARNING); + event.getRequestContext().getUIApplication().addMessage(msg); + return; + } + UIVirtualList virtualList = uiPageBrowser.getChild(UIVirtualList.class); UIRepeater repeater = (UIRepeater)virtualList.getDataFeed(); PageListAccess datasource = (PageListAccess)repeater.getDataSource(); @@ -283,9 +294,8 @@ //As we have multiple UIPortal, which means multiple caches of UIPage. It 's unwise to garbage // all UIPage caches at once. Better solution is to clear UIPage on browsing to PageNode having Page //removed - - UIPortal uiPortal = Util.getUIPortal(); - if (uiPortal.getSelectedNode().getPageReference().equals(page.getPageId())) + + if (isDeleteCurrentPage) { PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uiPortal.getSelectedNode() @@ -377,10 +387,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()); } } } @@ -391,70 +400,22 @@ 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; } - - //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); - - if (Page.DESKTOP_PAGE.equals(page.getFactoryId())) - { - UIMaskWorkspace uiMaskWS = uiPortalApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); - UIPageForm uiPageForm = uiMaskWS.createUIComponent(UIPageForm.class, "UIBrowserPageForm", "UIPageForm"); - uiPageForm.setValues(uiPage); - uiMaskWS.setUIComponent(uiPageForm); - uiMaskWS.setShow(true); - pcontext.addUIComponentToUpdateByAjax(uiMaskWS); - return; - } - - 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 + UIPageFactory clazz = UIPageFactory.getInstance(page.getFactoryId()); + UIPage uipage = clazz.createUIPage(null); + uipage.switchToEditMode(page); } } @@ -525,6 +486,7 @@ } page.setOwnerType(uiPage.getOwnerType()); + List<UIPortlet> uiPortlets = new ArrayList<UIPortlet>(); findAllPortlet(uiPortlets, uiPage); ArrayList<ModelObject> applications = new ArrayList<ModelObject>(); @@ -533,21 +495,6 @@ applications.add(PortalDataMapper.buildModelObject(uiPortlet)); } - if (Page.DESKTOP_PAGE.equals(uiPage.getFactoryId()) && !Page.DESKTOP_PAGE.equals(page.getFactoryId())) - { - page.setShowMaxWindow(false); - uiPage.getChildren().clear(); - page.setChildren(applications); - PortalDataMapper.toUIPage(uiPage, page); - // if (page.getTemplate() == null) - // page.setTemplate(uiPage.getTemplate()); - if (page.getChildren() == null) - page.setChildren(new ArrayList<ModelObject>()); - dataService.save(page); - postSave(uiPortalApp, pcontext); - return; - } - List<UIComponent> uiChildren = uiPage.getChildren(); if (uiChildren == null) return; @@ -562,14 +509,10 @@ uiPage.getChildren().clear(); PortalDataMapper.toUIPage(uiPage, page); + // if (page.getTemplate() == null) page.setTemplate(uiPage.getTemplate()); if (page.getChildren() == null) page.setChildren(new ArrayList<ModelObject>()); - if (Page.DESKTOP_PAGE.equals(uiPage.getFactoryId())) - { - dataService.save(page); - postSave(uiPortalApp, pcontext); - } } private void postSave(UIPortalApplication uiPortalApp, WebuiRequestContext context) throws Exception Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -19,6 +19,11 @@ package org.exoplatform.portal.webui.page; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + import org.exoplatform.portal.application.PortalRequestContext; import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.UserACL; @@ -27,7 +32,6 @@ import org.exoplatform.portal.config.model.PageNode; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.webui.navigation.UIPageNodeSelector; -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; @@ -43,11 +47,6 @@ import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.EventListener; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - /** Created by The eXo Platform SARL Author : Dang Van Minh minhdv81(a)yahoo.com Jun 23, 2006 */ @ComponentConfigs(@ComponentConfig(template = "system:/groovy/webui/core/UIWizard.gtmpl", events = { @EventConfig(listeners = UIPageCreationWizard.ViewStep1ActionListener.class), @@ -355,37 +354,14 @@ page.setTitle(pageNode.getName()); } - boolean isDesktopPage = Page.DESKTOP_PAGE.equals(page.getFactoryId()); - if (isDesktopPage) - { - page.setShowMaxWindow(true); - } - UIPagePreview uiPagePreview = uiWizard.getChild(UIPagePreview.class); - UIPage uiPage; - if (Page.DESKTOP_PAGE.equals(page.getFactoryId())) - { - uiPage = uiWizard.createUIComponent(context, UIDesktopPage.class, null, null); - } - else - { - uiPage = uiWizard.createUIComponent(context, UIPage.class, null, null); - } - + + UIPageFactory clazz = UIPageFactory.getInstance(page.getFactoryId()); + UIPage uiPage = clazz.createUIPage(context); + PortalDataMapper.toUIPage(uiPage, page); uiPagePreview.setUIComponent(uiPage); - if (isDesktopPage) - { - uiWizard.saveData(); - PageNode selectedNode = uiNodeSelector.getSelectedPageNode(); - UIPortal uiPortal = Util.getUIPortal(); - PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, selectedNode.getUri()); - uiPortal.broadcast(pnevent, Event.Phase.PROCESS); - uiWizard.updateUIPortal(event); - return; - } - uiWizard.updateWizardComponent(); uiPageTemplateOptions.setSelectedOption(null); } Copied: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageFactory.java (from rev 6243, portal/branches/decoupled-webos/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageFactory.java) =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageFactory.java (rev 0) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageFactory.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -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=&quot;trongtt(a)gmail.com&quot;&gt;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/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -19,10 +19,13 @@ package org.exoplatform.portal.webui.page; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.portal.application.PortalRequestContext; -import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.NoSuchDataException; import org.exoplatform.portal.config.UserACL; import org.exoplatform.portal.config.UserPortalConfig; @@ -33,29 +36,23 @@ import org.exoplatform.portal.webui.application.UIPortlet; import org.exoplatform.portal.webui.container.UIContainer; import org.exoplatform.portal.webui.portal.UIPortal; -import org.exoplatform.portal.webui.portal.UIPortalComponent; 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.UIMaskWorkspace; import org.exoplatform.portal.webui.workspace.UIPortalApplication; -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.InitParams; -import org.exoplatform.webui.config.Param; import org.exoplatform.webui.config.annotation.ComponentConfig; import org.exoplatform.webui.config.annotation.ComponentConfigs; import org.exoplatform.webui.config.annotation.EventConfig; import org.exoplatform.webui.config.annotation.ParamConfig; import org.exoplatform.webui.core.UIComponent; import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; -import org.exoplatform.webui.core.model.SelectItemCategory; import org.exoplatform.webui.core.model.SelectItemOption; import org.exoplatform.webui.event.Event; -import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.event.Event.Phase; +import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.form.UIFormCheckBoxInput; import org.exoplatform.webui.form.UIFormInputItemSelector; import org.exoplatform.webui.form.UIFormInputSet; @@ -68,13 +65,9 @@ import org.exoplatform.webui.form.validator.StringLengthValidator; import org.exoplatform.webui.organization.UIGroupMembershipSelector; import org.exoplatform.webui.organization.UIListPermissionSelector; -import org.exoplatform.webui.organization.UIPermissionSelector; import org.exoplatform.webui.organization.UIListPermissionSelector.EmptyIteratorValidator; +import org.exoplatform.webui.organization.UIPermissionSelector; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - @ComponentConfigs({ @ComponentConfig(lifecycle = UIFormLifecycle.class, template = "system:/groovy/webui/form/UIFormTabPane.gtmpl", events = { @EventConfig(listeners = UIPageForm.SaveActionListener.class), @@ -266,8 +259,6 @@ { page.setFactoryId(itemOption.getIcon()); // page.setTemplate((String)itemOption.getValue()); - if (page.getFactoryId().equals(Page.DESKTOP_PAGE)) - page.setShowMaxWindow(true); } } UIPageTemplateOptions uiConfigOptions = getChild(UIPageTemplateOptions.class); @@ -278,9 +269,6 @@ return; page.setChildren(selectedPage.getChildren()); page.setFactoryId(selectedPage.getFactoryId()); - if (Page.DESKTOP_PAGE.equals(page.getFactoryId())) - page.setShowMaxWindow(true); - } static public class SaveActionListener extends EventListener<UIPageForm> @@ -311,43 +299,6 @@ applications.add(PortalDataMapper.buildModelObject(uiPortlet)); } - if (Page.DESKTOP_PAGE.equals(uiPage.getFactoryId()) && !Page.DESKTOP_PAGE.equals(page.getFactoryId())) - { - page.setShowMaxWindow(false); - uiPage.getChildren().clear(); - page.setChildren(applications); - - PortalDataMapper.toUIPage(uiPage, page); - if (page.getChildren() == null) - page.setChildren(new ArrayList<ModelObject>()); - - pcontext.ignoreAJAXUpdateOnPortlets(true); - UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); - pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();"); - return; - } - - if (Page.DESKTOP_PAGE.equals(page.getFactoryId())) - { - uiPage.getChildren().clear(); - page.setChildren(applications); - - PortalDataMapper.toUIPage(uiPage, page); - if (page.getChildren() == null) - page.setChildren(new ArrayList<ModelObject>()); - - UIPortalToolPanel toolPanel = Util.getUIPortalToolPanel(); - toolPanel.setShowMaskLayer(true); - pcontext.ignoreAJAXUpdateOnPortlets(true); - UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); - pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();"); - DataStorage dataService = uiPageForm.getApplicationComponent(DataStorage.class); - dataService.save(page); - return; - } - List<UIComponent> uiChildren = uiPage.getChildren(); if (uiChildren == null) { Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -25,8 +25,8 @@ import org.exoplatform.portal.config.model.PageNode; import org.exoplatform.portal.webui.application.UIPortlet; import org.exoplatform.portal.webui.container.UIContainer; -import org.exoplatform.portal.webui.page.UIDesktopPage; 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; @@ -226,14 +226,10 @@ if (uiPage != null && uiPage.getId().equals(page.getId())) return uiPage; WebuiRequestContext context = Util.getPortalRequestContext(); - if (Page.DESKTOP_PAGE.equals(page.getFactoryId())) - { - uiPage = uiParent.createUIComponent(context, UIDesktopPage.class, null, null); - } - else - { - uiPage = uiParent.createUIComponent(context, UIPage.class, null, null); - } + + UIPageFactory clazz = UIPageFactory.getInstance(page.getFactoryId()); + uiPage = clazz.createUIPage(context); + PortalDataMapper.toUIPage(uiPage, page); return uiPage; } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -19,6 +19,8 @@ package org.exoplatform.portal.webui.workspace; +import java.lang.reflect.Method; + import org.exoplatform.portal.application.PortalRequestContext; import org.exoplatform.portal.config.UserACL; import org.exoplatform.portal.config.UserPortalConfig; @@ -29,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; @@ -36,7 +39,10 @@ import org.exoplatform.portal.webui.portal.UIPortalForm; import org.exoplatform.portal.webui.util.PortalDataMapper; import org.exoplatform.portal.webui.util.Util; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import org.exoplatform.web.application.ApplicationMessage; +import org.exoplatform.webui.application.WebuiRequestContext; import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.EventListener; @@ -88,8 +94,8 @@ uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE); // We clone the edited UIPage object, that is required for Abort action - //UIPage newUIPage = new UIPage(); - UIPage newUIPage = uiWorkingWS.createUIComponent(UIPage.class, null, null); + UIPageFactory clazz = UIPageFactory.getInstance(page.getFactoryId()); + UIPage newUIPage = clazz.createUIPage(null); PortalDataMapper.toUIPage(newUIPage, page); uiToolPanel.setWorkingComponent(newUIPage); @@ -224,5 +230,36 @@ prContext.addUIComponentToUpdateByAjax(uiMaskWS); } } + + public static class EditBackgroundActionListener extends EventListener<UIWorkingWorkspace> + { + private Log log = ExoLogger.getExoLogger(this.getClass()); + + @Override + public void execute(Event<UIWorkingWorkspace> event) throws Exception + { + + UIWorkingWorkspace workingWorkspace = event.getSource(); + UIPage uiPage = workingWorkspace.findFirstComponentOfType(UIPage.class); + + Method showEditBackgroundPopupMethod = null; + try + { + if (uiPage == null) + { + return; + } + showEditBackgroundPopupMethod = uiPage.getClass().getDeclaredMethod("showEditBackgroundPopup", WebuiRequestContext.class); + } + catch (NoSuchMethodException ex) + { + log.warn(ex.getMessage(), ex); + } + if(showEditBackgroundPopupMethod != null) + { + showEditBackgroundPopupMethod.invoke(uiPage, event.getRequestContext()); + } + } + } } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalToolPanel.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalToolPanel.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalToolPanel.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -19,8 +19,6 @@ package org.exoplatform.portal.webui.workspace; -import org.exoplatform.portal.config.model.Page; -import org.exoplatform.portal.webui.page.UIPage; import org.exoplatform.web.application.JavascriptManager; import org.exoplatform.webui.application.WebuiRequestContext; import org.exoplatform.webui.config.annotation.ComponentConfig; @@ -56,22 +54,6 @@ public void processRender(WebuiRequestContext context) throws Exception { JavascriptManager jsmanager = context.getJavascriptManager(); - UIComponent uiComponent = getUIComponent(); - if (uiComponent instanceof UIPage) - { - UIPage uiPage = (UIPage)uiComponent; - //if(uiPage.isShowMaxWindow()){ - if (Page.DESKTOP_PAGE.equals(uiPage.getFactoryId())) - { - uiComponent.processRender(context); - if (showMaskLayer) - { - jsmanager.importJavascript("eXo.core.UIMaskLayer"); - jsmanager.addCustomizedOnLoadScript("eXo.core.UIMaskLayer.createMask('UIPage', null, 10) ;"); - } - return; - } - } super.processRender(context); if (showMaskLayer) Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java 2011-05-05 08:57:12 UTC (rev 6448) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java 2011-05-06 09:37:15 UTC (rev 6449) @@ -42,6 +42,7 @@ @EventConfig(listeners = UIMainActionListener.CreatePortalActionListener.class), @EventConfig(listeners = UIMainActionListener.EditCurrentPageActionListener.class), @EventConfig(listeners = UIMainActionListener.PageCreationWizardActionListener.class), + @EventConfig(listeners = UIMainActionListener.EditBackgroundActionListener.class), @EventConfig(listeners = UIMainActionListener.EditInlineActionListener.class)}) public class UIWorkingWorkspace extends UIContainer { Deleted: portal/trunk/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 2011-04-15 16:39:08 UTC (rev 6243) +++ portal/trunk/webui/portal/src/main/resources/META-INF/services/org.exoplatform.portal.webui.page.UIPageFactory 2011-05-06 09:37:15 UTC (rev 6449) @@ -1 +0,0 @@ -org.exoplatform.portal.webui.page.BaseUIPageFactory \ No newline at end of file Copied: portal/trunk/webui/portal/src/main/resources/META-INF/services/org.exoplatform.portal.webui.page.UIPageFactory (from rev 6243, portal/branches/decoupled-webos/webui/portal/src/main/resources/META-INF/services/org.exoplatform.portal.webui.page.UIPageFactory) =================================================================== --- portal/trunk/webui/portal/src/main/resources/META-INF/services/org.exoplatform.portal.webui.page.UIPageFactory (rev 0) +++ portal/trunk/webui/portal/src/main/resources/META-INF/services/org.exoplatform.portal.webui.page.UIPageFactory 2011-05-06 09:37:15 UTC (rev 6449) @@ -0,0 +1 @@ +org.exoplatform.portal.webui.page.BaseUIPageFactory \ No newline at end of file