gatein SVN: r7314 - in epp/portal/branches/EPP_5_2_Branch: wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators and 1 other directory.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-09-06 07:41:54 -0400 (Tue, 06 Sep 2011)
New Revision: 7314
Modified:
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/AbstractApplicationHandler.java
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml
Log:
JBEPP-1116: Add possibility to specify WSRP portlets in pages.xml
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/AbstractApplicationHandler.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/AbstractApplicationHandler.java 2011-09-06 11:36:51 UTC (rev 7313)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/AbstractApplicationHandler.java 2011-09-06 11:41:54 UTC (rev 7314)
@@ -102,6 +102,7 @@
//
Application<?> app;
+ TransientApplicationState state;
if ("application".equals(m_name))
{
String instanceId = ctx.parseElementText(m_uri, "instance-id");
@@ -112,7 +113,6 @@
String ownerId = instanceId.substring(i0 + 1, i1);
String persistenceid = instanceId.substring(i1 + 2);
String[] persistenceChunks = split("/", persistenceid);
- TransientApplicationState<Portlet> state;
if (persistenceChunks.length == 2)
{
state = new TransientApplicationState<Portlet>(
@@ -131,9 +131,8 @@
ownerId,
persistenceChunks[2]);
}
- Application<Portlet> application = Application.createPortletApplication();
- application.setState(state);
- app = application;
+ app = Application.createPortletApplication();
+ app.setState(state);
}
// Since we don't support dashboard's here, this only works for gadgets using the gadget wrapper portlet.
else if ("gadget-application".equals(m_name))
@@ -144,18 +143,31 @@
// Once the gadget portlet wrapper is able to use gadget userPref's, include parsing logic here.
// Gadget gadget = new Gadget();
// gadget.setUserPref();
- TransientApplicationState<Gadget> state = new TransientApplicationState<Gadget>(gadgetName, gadget);
- Application<Gadget> application = Application.createGadgetApplication();
- application.setState(state);
- app = application;
+ state = new TransientApplicationState<Gadget>(gadgetName, gadget);
+ app = Application.createGadgetApplication();
+ app.setState(state);
ctx.parsePastEndTag(m_uri, "gadget");
}
else
{
- ctx.parsePastStartTag(m_uri, "portlet");
- String applicationName = ctx.parseElementText(m_uri, "application-ref");
- String portletName = ctx.parseElementText(m_uri, "portlet-ref");
- TransientApplicationState<Portlet> state;
+ String contentId;
+ boolean isWSRP = false;
+ if(ctx.isAt(m_uri, "wsrp"))
+ {
+ contentId = ctx.parseElementText(m_uri, "wsrp");
+ app = Application.createWSRPApplication();
+ isWSRP = true;
+ }
+ else
+ {
+
+ ctx.parsePastStartTag(m_uri, "portlet");
+ String applicationName = ctx.parseElementText(m_uri, "application-ref");
+ String portletName = ctx.parseElementText(m_uri, "portlet-ref");
+ contentId = applicationName + "/" + portletName;
+ app = Application.createPortletApplication();
+ }
+
if (ctx.isAt(m_uri, "preferences"))
{
PortletBuilder builder = new PortletBuilder();
@@ -166,16 +178,19 @@
builder.add(value.getName(), value.getValues(), value.isReadOnly());
}
ctx.parsePastEndTag(m_uri, "preferences");
- state = new TransientApplicationState<Portlet>(applicationName + "/" + portletName, builder.build());
+ state = new TransientApplicationState(contentId, builder.build());
}
else
{
- state = new TransientApplicationState<Portlet>(applicationName + "/" + portletName, null);
+ state = new TransientApplicationState(contentId, null);
}
- Application<Portlet> application = Application.createPortletApplication();
- application.setState(state);
- app = application;
- ctx.parsePastEndTag(m_uri, "portlet");
+
+ if(!isWSRP)
+ {
+ ctx.parsePastEndTag(m_uri, "portlet");
+ }
+
+ app.setState(state);
}
//
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-09-06 11:36:51 UTC (rev 7313)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-09-06 11:41:54 UTC (rev 7314)
@@ -24,8 +24,8 @@
<page-set
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2">
<page>
<name>wsrpConfiguration</name>
@@ -41,6 +41,12 @@
<access-permissions>manager:/platform/administrators</access-permissions>
<show-info-bar>false</show-info-bar>
</portlet-application>
+ <!--<portlet-application>
+ <wsrp>selfv2./richFacesPortlet.richFacesPortlet</wsrp>
+ <title>RichFaces</title>
+ <access-permissions>manager:/platform/administrators</access-permissions>
+ <show-info-bar>true</show-info-bar>
+ </portlet-application>-->
</page>
</page-set>
13 years, 3 months
- 1
- 0
gatein SVN: r7313 - in epp/portal/branches/EPP_5_2_Branch/component/portal/src: main/resources and 2 other directories.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-09-06 07:36:51 -0400 (Tue, 06 Sep 2011)
New Revision: 7313
Added:
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/GadgetApplication.java
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/GadgetApplicationHandler.java
epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/jibx/gadget-application.xml
Modified:
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/AbstractApplicationHandler.java
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/resources/binding.xml
epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java
Log:
JBEPP-1149: Support for gadget applications in xml descriptor
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/AbstractApplicationHandler.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/AbstractApplicationHandler.java 2011-09-06 11:35:46 UTC (rev 7312)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/AbstractApplicationHandler.java 2011-09-06 11:36:51 UTC (rev 7313)
@@ -26,6 +26,7 @@
import org.exoplatform.portal.config.model.Application;
import org.exoplatform.portal.config.model.Properties;
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.portlet.PortletBuilder;
import org.jibx.runtime.IAliasable;
@@ -100,7 +101,7 @@
ctx.parsePastStartTag(m_uri, m_name);
//
- Application<Portlet> app;
+ Application<?> app;
if ("application".equals(m_name))
{
String instanceId = ctx.parseElementText(m_uri, "instance-id");
@@ -130,9 +131,25 @@
ownerId,
persistenceChunks[2]);
}
- app = Application.createPortletApplication();
- app.setState(state);
+ Application<Portlet> application = Application.createPortletApplication();
+ application.setState(state);
+ app = application;
}
+ // Since we don't support dashboard's here, this only works for gadgets using the gadget wrapper portlet.
+ else if ("gadget-application".equals(m_name))
+ {
+ ctx.parsePastStartTag(m_uri, "gadget");
+ String gadgetName = ctx.parseElementText(m_uri, "gadget-ref");
+ Gadget gadget = null;
+ // Once the gadget portlet wrapper is able to use gadget userPref's, include parsing logic here.
+ // Gadget gadget = new Gadget();
+ // gadget.setUserPref();
+ TransientApplicationState<Gadget> state = new TransientApplicationState<Gadget>(gadgetName, gadget);
+ Application<Gadget> application = Application.createGadgetApplication();
+ application.setState(state);
+ app = application;
+ ctx.parsePastEndTag(m_uri, "gadget");
+ }
else
{
ctx.parsePastStartTag(m_uri, "portlet");
@@ -155,8 +172,9 @@
{
state = new TransientApplicationState<Portlet>(applicationName + "/" + portletName, null);
}
- app = Application.createPortletApplication();
- app.setState(state);
+ Application<Portlet> application = Application.createPortletApplication();
+ application.setState(state);
+ app = application;
ctx.parsePastEndTag(m_uri, "portlet");
}
Copied: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/GadgetApplication.java (from rev 6223, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/serialize/GadgetApplication.java)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/GadgetApplication.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/GadgetApplication.java 2011-09-06 11:36:51 UTC (rev 7313)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.config.serialize;
+
+import org.exoplatform.portal.config.model.Application;
+import org.exoplatform.portal.config.model.ApplicationType;
+import org.exoplatform.portal.pom.data.ApplicationData;
+import org.exoplatform.portal.pom.spi.gadget.Gadget;
+
+/**
+ * @author <a href="mailto:nscavell@redhat.com">Nick Scavelli</a>
+ * @version $Revision$
+ */
+public class GadgetApplication extends Application<Gadget>
+{
+ public GadgetApplication(ApplicationData<Gadget> gadgetApplicationData)
+ {
+ super(gadgetApplicationData);
+ }
+
+ public GadgetApplication(ApplicationType<Gadget> gadgetApplicationType, String storageId)
+ {
+ super(gadgetApplicationType, storageId);
+ }
+
+ public GadgetApplication(ApplicationType<Gadget> gadgetApplicationType)
+ {
+ super(gadgetApplicationType);
+ }
+}
Copied: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/GadgetApplicationHandler.java (from rev 6223, portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/serialize/GadgetApplicationHandler.java)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/GadgetApplicationHandler.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/GadgetApplicationHandler.java 2011-09-06 11:36:51 UTC (rev 7313)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.config.serialize;
+
+/**
+ * @author <a href="mailto:nscavell@redhat.com">Nick Scavelli</a>
+ * @version $Revision$
+ */
+public class GadgetApplicationHandler extends AbstractApplicationHandler
+{
+ public GadgetApplicationHandler()
+ {
+ }
+
+ public GadgetApplicationHandler(String m_uri, int m_index, String m_name)
+ {
+ super(m_uri, m_index, m_name);
+ }
+}
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/resources/binding.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/resources/binding.xml 2011-09-06 11:35:46 UTC (rev 7312)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/resources/binding.xml 2011-09-06 11:36:51 UTC (rev 7313)
@@ -50,9 +50,16 @@
unmarshaller="org.exoplatform.portal.config.serialize.PortletApplicationHandler">
</mapping>
+ <mapping name="gadget-application"
+ label="gadget-application"
+ class="org.exoplatform.portal.config.serialize.GadgetApplication"
+ marshaller="org.exoplatform.portal.config.serialize.GadgetApplicationHandler"
+ unmarshaller="org.exoplatform.portal.config.serialize.GadgetApplicationHandler">
+ </mapping>
+
<mapping name="page-body" label="pageBody" class="org.exoplatform.portal.config.model.PageBody">
</mapping>
-
+
<mapping name="site-body" label="siteBody" class="org.exoplatform.portal.config.model.SiteBody">
</mapping>
@@ -72,8 +79,9 @@
<structure map-as="org.exoplatform.portal.config.model.Container" usage="optional"/>
<structure map-as="org.exoplatform.portal.config.model.Application" usage="optional"/>
<structure map-as="org.exoplatform.portal.config.model.PageBody" usage="optional"/>
- <structure map-as="org.exoplatform.portal.config.model.SiteBody" usage="optional"/>
+ <structure map-as="org.exoplatform.portal.config.model.SiteBody" usage="optional"/>
<structure map-as="org.exoplatform.portal.config.serialize.PortletApplication" usage="optional"/>
+ <structure map-as="org.exoplatform.portal.config.serialize.GadgetApplication" usage="optional"/>
</collection>
</mapping>
@@ -92,6 +100,7 @@
<structure map-as="org.exoplatform.portal.config.model.Application" usage="optional"/>
<structure map-as="org.exoplatform.portal.config.model.PageBody" usage="optional"/>
<structure map-as="org.exoplatform.portal.config.serialize.PortletApplication" usage="optional"/>
+ <structure map-as="org.exoplatform.portal.config.serialize.GadgetApplication" usage="optional"/>
</collection>
</mapping>
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java 2011-09-06 11:35:46 UTC (rev 7312)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java 2011-09-06 11:36:51 UTC (rev 7313)
@@ -25,6 +25,7 @@
import org.exoplatform.portal.config.model.LocalizedString;
import org.exoplatform.portal.config.model.ModelUnmarshaller;
import org.exoplatform.portal.config.model.NavigationFragment;
+import org.exoplatform.portal.config.model.ApplicationType;
import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.config.model.Page.PageSet;
import org.exoplatform.portal.config.model.PageNavigation;
@@ -33,6 +34,7 @@
import org.exoplatform.portal.config.model.TransientApplicationState;
import org.exoplatform.portal.config.model.UnmarshalledObject;
import org.exoplatform.portal.config.model.Version;
+import org.exoplatform.portal.pom.spi.gadget.Gadget;
import org.exoplatform.portal.pom.spi.portlet.Portlet;
import org.exoplatform.portal.pom.spi.portlet.PortletBuilder;
import org.gatein.common.util.Tools;
@@ -212,4 +214,21 @@
PageNode bar = fragment.getNode("bar");
assertNotNull(bar);
}
+
+ public void testGadgetApplicationMapping() throws Exception
+ {
+ IBindingFactory bfact = BindingDirectory.getFactory(PortalConfig.class);
+ IUnmarshallingContext uctx = bfact.createUnmarshallingContext();
+ @SuppressWarnings("unchecked")
+ Application<Gadget> app =
+ (Application<Gadget>)uctx.unmarshalDocument(new FileInputStream(
+ "src/test/resources/jibx/gadget-application.xml"), null);
+
+ assertEquals(ApplicationType.GADGET, app.getType());
+ TransientApplicationState gadgetState = (TransientApplicationState) app.getState();
+ assertNotNull(gadgetState);
+ assertEquals("Calendar", gadgetState.getContentId());
+ assertNull(gadgetState.getContentState());
+ // Add test for user-prefs when supported...
+ }
}
Copied: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/jibx/gadget-application.xml (from rev 6223, portal/trunk/component/portal/src/test/resources/jibx/gadget-application.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/jibx/gadget-application.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/resources/jibx/gadget-application.xml 2011-09-06 11:36:51 UTC (rev 7313)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ 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.
+ -->
+
+<gadget-application>
+ <gadget>
+ <gadget-ref>Calendar</gadget-ref>
+ </gadget>
+</gadget-application>
13 years, 3 months
- 1
- 0
gatein SVN: r7312 - in portal/branches/dom/web: portal/src/main/webapp/groovy/portal/webui/container and 1 other directory.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-09-06 07:35:46 -0400 (Tue, 06 Sep 2011)
New Revision: 7312
Modified:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl
Log:
[DOM] UIColumnContainer optimization
Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css
===================================================================
--- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-06 10:59:21 UTC (rev 7311)
+++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-06 11:35:46 UTC (rev 7312)
@@ -58,6 +58,7 @@
cursor: move;
margin: 3px 0px 0px 2px; /* orientation=lt */
margin: 3px 2px 0px 0px; /* orientation=rt */
+ display: block;
}
.EDITION-BLOCK .EditIcon {
Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl
===================================================================
--- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-09-06 10:59:21 UTC (rev 7311)
+++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-09-06 11:35:46 UTC (rev 7312)
@@ -29,9 +29,7 @@
id="${uicomponent.id}" ${cssStyle}
onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);"
onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
- <div class="NormalContainerBlock">
- <div class="LeftContainerBlock">
- <div class="RightContainerBlock UIComponentBlock">
+ <div class="NormalContainerBlock UIComponentBlock">
<%
int portalMode = uiPortalApp.getModeState();
@@ -42,90 +40,64 @@
<div class="VIEW-CONTAINER VIEW-BLOCK">
<%} %>
<%if(hasPermission) {%>
- <div>
<div class="UIRowContainer <%=(portalMode != UIPortalApplication.NORMAL_MODE && uicomponent.getChildren().size() == 0) ? "EmptyContainer" : ""%>">
+ <div>
<%uicomponent.renderChildren();%>
+ </div>
</div>
- </div>
<%} else out.print("<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>");%>
</div>
<%if(portalMode != UIPortalApplication.NORMAL_MODE){%>
- <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;">
- <div style="position: relative;">
+ <div class="EDITION-BLOCK EDITION-CONTAINER" style="position: relative; display: none;">
+
<div style="position: absolute; top: -86px;">
<div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div>
- <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;">
+ <div class="CONTROL-CONTAINER CONTROL-BLOCK UIInfoBar" style="position: absolute; top: -6px;">
<%/*Begin InfoBar*/%>
- <div class="UIInfoBar">
- <div class="BlueRoundedStyle">
- <div class="LeftBar">
- <div class="RightBar">
- <div class="MiddleBar">
- <div class="FixHeight ClearFix">
- <div class="DragControlArea" title="<%=_ctx.appRes("UIColumnContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div>
- <%
- String showCategory = "eXo.webui.UIPopupSelectCategory.show(this, event)";
- String strTitle = uicomponent.getTitle() != null ?
- ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) :
- _ctx.appRes("UIColumnContainer.title.Container");
- %>
- <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
- <%if(hasPermission) {%>
- <div class="ControlIcon ArrowDownIcon" onclick="$showCategory" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertColumn") %>">
- <% /*Begin Popup Menu*/ %>
- <div style="position: relative; width: 100%">
- <div class="UIPopupCategory" style="display: none;">
- <div class="PopupCategoryDecorator">
- <div class="PopupCategoryTL">
- <div class="PopupCategoryTR">
- <div class="PopupCategoryTC"><span></span></div>
- </div>
- </div>
- <div class="PopupCategoryML">
- <div class="PopupCategoryMR">
- <div class="PopupCategoryMC">
- <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_BEFORE) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertLeft") %>">
- <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertLeft") %></div>
- </a>
- <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_AFTER) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertRight") %>">
- <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertRight") %></div>
- </a>
- </div>
- </div>
- </div>
- <div class="PopupCategoryBL">
- <div class="PopupCategoryBR">
- <div class="PopupCategoryBC"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <% /*End Popup Menu*/ %>
- </div>
- <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a>
- <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a>
-
- <%}%>
-
+ <div class="BlueRoundedStyle FixHeight ClearFix">
+
+ <span class="DragControlArea" title="<%=_ctx.appRes("UIColumnContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"></span>
+ <%
+ String showCategory = "eXo.webui.UIPopupSelectCategory.show(this, event)";
+ String strTitle = uicomponent.getTitle() != null ?
+ ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) :
+ _ctx.appRes("UIColumnContainer.title.Container");
+ %>
+ <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
+ <%if(hasPermission) {%>
+ <div class="ControlIcon ArrowDownIcon" onclick="$showCategory" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertColumn") %>">
+ <% /*Begin Popup Menu*/ %>
+ <div style="position: relative; width: 100%">
+ <div class="UIPopupCategory" style="display: none;">
+ <div class="PopupCategoryDecorator">
+
+ <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_BEFORE) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertLeft") %>">
+ <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertLeft") %></div>
+ </a>
+ <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_AFTER) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertRight") %>">
+ <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertRight") %></div>
+ </a>
+
+ </div>
</div>
</div>
+ <% /*End Popup Menu*/ %>
</div>
- </div>
+ <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a>
+
+ <%}%>
+
</div>
- </div>
<%/*End InfoBar*/ %>
</div>
</div>
- </div>
+
</div>
<%} %>
-
- </div>
- </div>
- </div>
-</div>
+ </div>
+</div>
\ No newline at end of file
13 years, 3 months
- 1
- 0
gatein SVN: r7311 - in epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf: common and 1 other directory.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-09-06 06:59:21 -0400 (Tue, 06 Sep 2011)
New Revision: 7311
Removed:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml
Modified:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
Log:
JBEPP-1148: Remove embbeded logger configuration
Deleted: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml 2011-09-06 09:53:16 UTC (rev 7310)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml 2011-09-06 10:59:21 UTC (rev 7311)
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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.
-
--->
-
-<configuration
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
- <component profiles="jboss">
- <key>org.exoplatform.services.log.LogConfigurationInitializer</key>
- <type>org.exoplatform.services.log.LogConfigurationInitializer</type>
- <init-params>
- <!-- Commons Simple: -->
- <!--
- <value-param>
- <name>logger</name>
- <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value>
- </value-param>
- <value-param>
- <name>configurator</name>
- <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value>
- </value-param>
- <properties-param>
- <name>properties</name>
- <description>SimpleLog properties</description>
- <property name="org.apache.commons.logging.simplelog.defaultlog" value="info"/>
- <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/>
- </properties-param>
- -->
- <!-- end Commons Simple -->
-
- <!-- JDK -->
- <value-param>
- <name>logger</name>
- <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value>
- </value-param>
- <value-param>
- <name>configurator</name>
- <value>org.exoplatform.services.log.impl.Jdk14Configurator</value>
- </value-param>
- <properties-param>
- <name>properties</name>
- <description>jdk1.4 Logger properties</description>
- <property name="handlers" value="java.util.logging.ConsoleHandler"/>
- <property name=".level" value="FINE"/>
- <property name="java.util.logging.ConsoleHandler.level" value="FINE"/>
- </properties-param>
- <!-- end JDK -->
- <!-- Log4J -->
- <!--
- <value-param>
- <name>logger</name>
- <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value>
- </value-param>
- <value-param>
- <name>configurator</name>
- <value>org.exoplatform.services.log.impl.Log4JConfigurator</value>
- </value-param>
- <properties-param>
- <name>properties</name>
- <description>Log4J properties</description>
- <property name="log4j.rootLogger" value="DEBUG, stdout, file"/>
- <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/>
- <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/>
- <property name="log4j.appender.stdout.layout.ConversionPattern" value="%d {dd.MM.yyyy HH:mm:ss} %c {1}: %m (%F, line %L) %n"/>
- <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/>
- <property name="log4j.appender.file.File" value="jcr.log"/>
- <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/>
- <property name="log4j.appender.file.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %m (%F, line %L) %n"/>
- </properties-param>
- -->
- <!-- end Log4J-->
- </init-params>
- </component>
-</configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-09-06 09:53:16 UTC (rev 7310)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-09-06 10:59:21 UTC (rev 7311)
@@ -27,7 +27,6 @@
<import>war:/conf/common/common-configuration.xml</import>
<import>war:/conf/common/resource-compressor-configuration.xml</import>
<import>war:/conf/common/portlet-container-configuration.xml</import>
- <import>war:/conf/common/logs-configuration.xml</import>
<import>war:/conf/common/autologin-configuration.xml</import>
<import>war:/conf/common/remindpwd-configuration.xml</import>
<import>war:/conf/jcr/jcr-configuration.xml</import>
13 years, 3 months
- 1
- 0
gatein SVN: r7310 - portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-09-06 05:53:16 -0400 (Tue, 06 Sep 2011)
New Revision: 7310
Modified:
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
Log:
[DOM] Fix DnD problem with UITableColumnContainer
Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
===================================================================
--- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2011-09-06 09:51:17 UTC (rev 7309)
+++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2011-09-06 09:53:16 UTC (rev 7310)
@@ -36,7 +36,7 @@
<%} %>
<div>
<%if(hasPermission) {%>
- <table class="UITableColumnContainer" style="margin: 0px auto; $style">
+ <table class="UITableColumn" style="margin: 0px auto; $style">
<tr class="TRContainer">
<% for(uiChild in uicomponent.getChildren()) {%>
<td class="${uiChild.id}TDContainer TDContainer" <% if(uiChild.getWidth()) { %> width="<%= uiChild.getWidth(); %>" <% } %>><% uicomponent.renderUIComponent(uiChild) %></td>
Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
===================================================================
--- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2011-09-06 09:51:17 UTC (rev 7309)
+++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2011-09-06 09:53:16 UTC (rev 7310)
@@ -36,7 +36,7 @@
<%} %>
<div>
<%if(hasPermission) {%>
- <table class="UITableColumnContainer" style="table-layout: fixed; margin: 0px auto; $style">
+ <table class="UITableColumn" style="table-layout: fixed; margin: 0px auto; $style">
<tr class="TRContainer">
<% for(uiChild in uicomponent.getChildren()) {%>
<td class="${uiChild.id}TDContainer TDContainer" <% if(uiChild.getWidth()) { %> width="<%= uiChild.getWidth(); %>" <% } %>><% uicomponent.renderUIComponent(uiChild) %></td>
13 years, 3 months
- 1
- 0
gatein SVN: r7309 - in epp/portal/branches/EPP_5_2_Branch/component/portal/src: test/java/org/exoplatform/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-09-06 05:51:17 -0400 (Tue, 06 Sep 2011)
New Revision: 7309
Modified:
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/gatein_objects_1_2.xsd
epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java
Log:
JBEPP-1147
factor out the common XML elements as applicationGroup in gatein object 1.2 XSD
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/gatein_objects_1_2.xsd
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-09-06 08:34:43 UTC (rev 7308)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-09-06 09:51:17 UTC (rev 7309)
@@ -176,25 +176,23 @@
<xs:complexType name="portletApplicationType">
<xs:sequence>
- <xs:choice>
- <xs:element name="portlet" type="portletType"/>
- <xs:element name="wsrp" type="xs:string"/>
- </xs:choice>
- <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="access-permissions" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="show-info-bar" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
- <xs:element name="show-application-state" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
- <xs:element name="show-application-mode" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
- <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:choice>
+ <xs:element name="portlet" type="portletType"/>
+ <xs:element name="wsrp" type="xs:string"/>
+ </xs:choice>
+ <xs:group ref="applicationGroup"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="gadgetApplicationType">
<xs:sequence>
<xs:element name="gadget" type="gadgetType" minOccurs="1" maxOccurs="1"/>
+ <xs:group ref="applicationGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:group name="applicationGroup">
+ <xs:sequence>
<xs:element name="theme" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="access-permissions" type="xs:string" minOccurs="1" maxOccurs="1"/>
@@ -206,7 +204,7 @@
<xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
- </xs:complexType>
+ </xs:group>
<xs:complexType name="portletType">
<xs:sequence>
@@ -235,4 +233,4 @@
<xs:element name="read-only" type="xs:string" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-09-06 08:34:43 UTC (rev 7308)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-09-06 09:51:17 UTC (rev 7309)
@@ -60,6 +60,6 @@
{
assertHash("d0591b0a022a0c2929e1aed8979857cd", "gatein_objects_1_0.xsd");
assertHash("99ae24c9bbfe1b59e066756a29ab6c79", "gatein_objects_1_1.xsd");
- assertHash("4aab6cc6bf86236de80deaed72170c5f", "gatein_objects_1_2.xsd");
+ assertHash("b0e79a35641cccf49c8796a99a5a91a3", "gatein_objects_1_2.xsd");
}
}
13 years, 3 months
- 1
- 0
gatein SVN: r7308 - in portal/trunk/web/portal/src/main/webapp/WEB-INF/conf: common and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-09-06 04:34:43 -0400 (Tue, 06 Sep 2011)
New Revision: 7308
Removed:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
Log:
GTNPORTAL-2080 : Remove embbeded logger configuration
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml 2011-09-06 04:52:36 UTC (rev 7307)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml 2011-09-06 08:34:43 UTC (rev 7308)
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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.
-
--->
-
-<configuration
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
- <component profiles="jboss">
- <key>org.exoplatform.services.log.LogConfigurationInitializer</key>
- <type>org.exoplatform.services.log.LogConfigurationInitializer</type>
- <init-params>
- <!-- Commons Simple: -->
- <!--
- <value-param>
- <name>logger</name>
- <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value>
- </value-param>
- <value-param>
- <name>configurator</name>
- <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value>
- </value-param>
- <properties-param>
- <name>properties</name>
- <description>SimpleLog properties</description>
- <property name="org.apache.commons.logging.simplelog.defaultlog" value="info"/>
- <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/>
- </properties-param>
- -->
- <!-- end Commons Simple -->
-
- <!-- JDK -->
- <value-param>
- <name>logger</name>
- <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value>
- </value-param>
- <value-param>
- <name>configurator</name>
- <value>org.exoplatform.services.log.impl.Jdk14Configurator</value>
- </value-param>
- <properties-param>
- <name>properties</name>
- <description>jdk1.4 Logger properties</description>
- <property name="handlers" value="java.util.logging.ConsoleHandler"/>
- <property name=".level" value="FINE"/>
- <property name="java.util.logging.ConsoleHandler.level" value="FINE"/>
- </properties-param>
- <!-- end JDK -->
- <!-- Log4J -->
- <!--
- <value-param>
- <name>logger</name>
- <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value>
- </value-param>
- <value-param>
- <name>configurator</name>
- <value>org.exoplatform.services.log.impl.Log4JConfigurator</value>
- </value-param>
- <properties-param>
- <name>properties</name>
- <description>Log4J properties</description>
- <property name="log4j.rootLogger" value="DEBUG, stdout, file"/>
- <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/>
- <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/>
- <property name="log4j.appender.stdout.layout.ConversionPattern" value="%d {dd.MM.yyyy HH:mm:ss} %c {1}: %m (%F, line %L) %n"/>
- <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/>
- <property name="log4j.appender.file.File" value="jcr.log"/>
- <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/>
- <property name="log4j.appender.file.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %m (%F, line %L) %n"/>
- </properties-param>
- -->
- <!-- end Log4J-->
- </init-params>
- </component>
-</configuration>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-09-06 04:52:36 UTC (rev 7307)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-09-06 08:34:43 UTC (rev 7308)
@@ -27,7 +27,6 @@
<import>war:/conf/common/common-configuration.xml</import>
<import>war:/conf/common/resource-compressor-configuration.xml</import>
<import>war:/conf/common/portlet-container-configuration.xml</import>
- <import>war:/conf/common/logs-configuration.xml</import>
<import>war:/conf/common/autologin-configuration.xml</import>
<import>war:/conf/common/remindpwd-configuration.xml</import>
<import>war:/conf/jcr/jcr-configuration.xml</import>
13 years, 3 months
- 1
- 0
gatein SVN: r7307 - in portal/branches/dom: web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent and 5 other directories.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-09-06 00:52:36 -0400 (Tue, 06 Sep 2011)
New Revision: 7307
Removed:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/MidlePopupCategory.gif
Modified:
portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/Stylesheet.css
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/PopupCategory.gif
portal/branches/dom/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormInputThemeSelector.gtmpl
portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIItemThemeSelector.gtmpl
Log:
[DOM] UIPortlet.gtmpl optimization
Modified: portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css
===================================================================
--- portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-09-06 04:49:25 UTC (rev 7306)
+++ portal/branches/dom/examples/skins/simpleskin/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-09-06 04:52:36 UTC (rev 7307)
@@ -106,7 +106,6 @@
color: #333333;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.DefaultTheme .WindowBarLeft {
@@ -127,9 +126,6 @@
background-image: url('background/DefaultTheme.png');
background-repeat: repeat-x;
background-position: left -90px;
-}
-
-.DefaultTheme .WindowBarCenter .FixHeight {
height: 20px;
padding-top: 7px;
}
@@ -166,9 +162,6 @@
background-image: url('background/DefaultTheme.png');
background-repeat: repeat-x;
background-position: left top;
-}
-
-.DefaultTheme .BottomDecoratorCenter .FixHeight {
height: 26px;
}
@@ -190,7 +183,6 @@
line-height: 17px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.MacTheme .WindowBarCenter .PortletIcon {
@@ -307,9 +299,6 @@
background-image: url('background/MacTheme.png');
background-repeat: repeat-x;
background-position: center top;
-}
-
-.MacTheme .BottomDecoratorCenter .FixHeight {
height: 23px; line-height: 23px;
}
@@ -331,9 +320,6 @@
background-image: url('background/MacTheme.png');
background-repeat: repeat-x;
background-position: center -69px;
-}
-
-.MacTheme .WindowBarCenter .FixHeight {
height: 19px;
padding-top: 4px;
}
@@ -356,7 +342,6 @@
line-height: 17px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.MacGray .WindowBarCenter .PortletIcon {
@@ -473,9 +458,6 @@
background-image: url('background/MacGray.png');
background-repeat: repeat-x;
background-position: left top;
-}
-
-.MacGray .BottomDecoratorCenter .FixHeight {
height: 24px; line-height: 24px;
}
@@ -497,9 +479,6 @@
background-image: url('background/MacGray.png');
background-repeat: repeat-x;
background-position: center -72px;
-}
-
-.MacGray .WindowBarCenter .FixHeight {
height: 19px;
padding-top: 4px;
}
@@ -522,7 +501,6 @@
line-height: 17px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.MacBlack .WindowBarCenter .PortletIcon {
@@ -639,9 +617,6 @@
background-image: url('background/MacBlack.png');
background-repeat: repeat-x;
background-position: left top;
-}
-
-.MacBlack .BottomDecoratorCenter .FixHeight {
height: 24px; line-height: 24px;
}
@@ -663,9 +638,6 @@
background-image: url('background/MacBlack.png');
background-repeat: repeat-x;
background-position: center -72px;
-}
-
-.MacBlack .WindowBarCenter .FixHeight {
height: 19px;
padding-top: 4px;
}
@@ -688,7 +660,6 @@
line-height: 17px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.MacGreenSteel .WindowBarCenter .PortletIcon {
@@ -805,9 +776,6 @@
background-image: url('background/MacGreen.png');
background-repeat: repeat-x;
background-position: left top;
-}
-
-.MacGreenSteel .BottomDecoratorCenter .FixHeight {
height: 24px; line-height: 24px;
}
@@ -829,9 +797,6 @@
background-image: url('background/MacGreen.png');
background-repeat: repeat-x;
background-position: center -72px;
-}
-
-.MacGreenSteel .WindowBarCenter .FixHeight {
height: 19px;
padding-top: 4px;
}
@@ -962,9 +927,6 @@
background-image: url('background/VistaTheme.png');
background-repeat: repeat-x;
background-position: left top;
-}
-
-.VistaTheme .BottomDecoratorCenter .FixHeight {
height: 24px;
}
@@ -973,7 +935,6 @@
line-height: 22px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.VistaTheme .WindowBarLeft {
@@ -994,9 +955,6 @@
background-image: url('background/VistaTheme.png');
background-repeat: repeat-x;
background-position: left -72px;
-}
-
-.VistaTheme .WindowBarCenter .FixHeight {
height: 24px;
padding-top: 5px;
}
@@ -1022,7 +980,6 @@
line-height: 22px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.VistaBlue .WindowBarCenter .PortletIcon {
@@ -1135,9 +1092,6 @@
background-image: url('background/VistaBlue.png');
background-repeat: repeat-x;
background-position: left top;
-}
-
-.VistaBlue .BottomDecoratorCenter .FixHeight {
height: 27px;
}
@@ -1159,9 +1113,6 @@
background-image: url('background/VistaBlue.png');
background-repeat: repeat-x;
background-position: left -81px;
-}
-
-.VistaBlue .WindowBarCenter .FixHeight {
height: 27px;
padding-top: 8px;
}
@@ -1215,7 +1166,6 @@
line-height: 19px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.RoundConerBlue .ArrowDownIcon {
@@ -1275,9 +1225,6 @@
.RoundConerBlue .WindowBarCenter {
background: url('background/RoundCornerBlue.png') repeat-x;
background-position: left -90px;
-}
-
-.RoundConerBlue .WindowBarCenter .FixHeight {
height: 22px;
padding-top: 10px;
}
@@ -1317,9 +1264,6 @@
.RoundConerBlue .BottomDecoratorCenter {
background: url('background/RoundCornerBlue.png') repeat-x;
background-position: top;
-}
-
-.RoundConerBlue .BottomDecoratorCenter .FixHeight {
height: 30px;
}
@@ -1370,7 +1314,6 @@
line-height: 19px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.RoundConerViolet .ArrowDownIcon {
@@ -1430,9 +1373,6 @@
.RoundConerViolet .WindowBarCenter {
background: url('background/RoundConerViolet.png') repeat-x;
background-position: left -90px;
-}
-
-.RoundConerViolet .WindowBarCenter .FixHeight {
height: 22px;
padding-top: 10px;
}
@@ -1476,9 +1416,6 @@
.RoundConerViolet .BottomDecoratorCenter {
background: url('background/RoundConerViolet.png') repeat-x;
background-position: top;
-}
-
-.RoundConerViolet .BottomDecoratorCenter .FixHeight {
height: 30px;
}
@@ -1530,7 +1467,6 @@
line-height: 19px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.RoundConerOrange .ArrowDownIcon {
@@ -1590,9 +1526,6 @@
.RoundConerOrange .WindowBarCenter {
background: url('background/RoundConerOrange.png') repeat-x;
background-position: left -90px;
-}
-
-.RoundConerOrange .WindowBarCenter .FixHeight {
height: 22px;
padding-top: 10px;
}
@@ -1636,9 +1569,6 @@
.RoundConerOrange .BottomDecoratorCenter {
background: url('background/RoundConerOrange.png') repeat-x;
background-position: top;
-}
-
-.RoundConerOrange .BottomDecoratorCenter .FixHeight {
height: 30px;
}
@@ -1690,7 +1620,6 @@
line-height: 19px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.RoundConerPink .ArrowDownIcon {
@@ -1750,9 +1679,6 @@
.RoundConerPink .WindowBarCenter {
background: url('background/RoundConerPink.png') repeat-x;
background-position: left -90px;
-}
-
-.RoundConerPink .WindowBarCenter .FixHeight {
height: 22px;
padding-top: 10px;
}
@@ -1796,9 +1722,6 @@
.RoundConerPink .BottomDecoratorCenter {
background: url('background/RoundConerPink.png') repeat-x;
background-position: top;
-}
-
-.RoundConerPink .BottomDecoratorCenter .FixHeight {
height: 30px;
}
@@ -1850,7 +1773,6 @@
line-height: 19px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.RoundConerGreen .ArrowDownIcon {
@@ -1910,9 +1832,6 @@
.RoundConerGreen .WindowBarCenter {
background: url('background/RoundConerGreen.png') repeat-x;
background-position: left -90px;
-}
-
-.RoundConerGreen .WindowBarCenter .FixHeight {
height: 22px;
padding-top: 10px;
}
@@ -1956,9 +1875,6 @@
.RoundConerGreen .BottomDecoratorCenter {
background: url('background/RoundConerGreen.png') repeat-x;
background-position: top;
-}
-
-.RoundConerGreen .BottomDecoratorCenter .FixHeight {
height: 30px;
}
@@ -2010,7 +1926,6 @@
line-height: 16px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.ShadowBlue .ArrowDownIcon {
@@ -2071,9 +1986,6 @@
background-image: url('background/ShadowBlue.png');
background-repeat: repeat-x;
background-position: center -84px;
-}
-
-.ShadowBlue .WindowBarCenter .FixHeight {
height: 20px;
padding-top: 9px;
}
@@ -2114,9 +2026,6 @@
background-image: url('background/ShadowBlue.png');
background-repeat: repeat-x;
background-position: center top;
-}
-
-.ShadowBlue .BottomDecoratorCenter .FixHeight {
height: 28px;
}
@@ -2168,7 +2077,6 @@
line-height: 16px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.ShadowViolet .ArrowDownIcon {
@@ -2229,9 +2137,6 @@
background-image: url('background/ShadowViolet.png');
background-repeat: repeat-x;
background-position: center -84px;
-}
-
-.ShadowViolet .WindowBarCenter .FixHeight {
height: 20px;
padding-top: 9px;
}
@@ -2272,9 +2177,6 @@
background-image: url('background/ShadowViolet.png');
background-repeat: repeat-x;
background-position: center top;
-}
-
-.ShadowViolet .BottomDecoratorCenter .FixHeight {
height: 28px;
}
@@ -2326,7 +2228,6 @@
line-height: 16px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.ShadowOrange .ArrowDownIcon {
@@ -2387,9 +2288,6 @@
background-image: url('background/ShadowOrange.png');
background-repeat: repeat-x;
background-position: center -84px;
-}
-
-.ShadowOrange .WindowBarCenter .FixHeight {
height: 19px;
padding-top: 10px;
}
@@ -2430,9 +2328,6 @@
background-image: url('background/ShadowOrange.png');
background-repeat: repeat-x;
background-position: center top;
-}
-
-.ShadowOrange .BottomDecoratorCenter .FixHeight {
height: 28px;
}
@@ -2485,7 +2380,6 @@
line-height: 16px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.ShadowPink .ArrowDownIcon {
@@ -2546,9 +2440,6 @@
background-image: url('background/ShadowPink.png');
background-repeat: repeat-x;
background-position: center -84px;
-}
-
-.ShadowPink .WindowBarCenter .FixHeight {
height: 19px;
padding-top: 10px;
}
@@ -2589,9 +2480,6 @@
background-image: url('background/ShadowPink.png');
background-repeat: repeat-x;
background-position: center top;
-}
-
-.ShadowPink .BottomDecoratorCenter .FixHeight {
height: 28px;
}
@@ -2644,7 +2532,6 @@
line-height: 16px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.ShadowGreen .ArrowDownIcon {
@@ -2705,9 +2592,6 @@
background-image: url('background/ShadowGreen.png');
background-repeat: repeat-x;
background-position: center -84px;
-}
-
-.ShadowGreen .WindowBarCenter .FixHeight {
height: 20px;
padding-top: 9px;
}
@@ -2748,9 +2632,6 @@
background-image: url('background/ShadowGreen.png');
background-repeat: repeat-x;
background-position: center top;
-}
-
-.ShadowGreen .BottomDecoratorCenter .FixHeight {
height: 28px;
}
@@ -2800,7 +2681,6 @@
color: #333333;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.SimpleBlue .ArrowDownIcon {
@@ -2854,9 +2734,6 @@
.SimpleBlue .WindowBarCenter {
background: #b0c0f5;
-}
-
-.SimpleBlue .WindowBarCenter .FixHeight {
height: 18px;
line-height: 18px;
}
@@ -2895,9 +2772,6 @@
border: 1px solid #4a67b1;
border-top: none;
background: white url('background/BGDecoratorCenter1x18.gif') repeat-x;
-}
-
-.SimpleBlue .BottomDecoratorCenter .FixHeight {
height: 19px;
}
@@ -2947,7 +2821,6 @@
color: #333333;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.SimpleViolet .ArrowDownIcon {
@@ -3001,9 +2874,6 @@
.SimpleViolet .WindowBarCenter {
background: #c4a6ff;
-}
-
-.SimpleViolet .WindowBarCenter .FixHeight {
height: 18px;
line-height: 18px;
}
@@ -3040,9 +2910,6 @@
border: 1px solid #5700a9;
border-top: none;
background: url('background/BGDecoratorCenter1x18.gif') repeat-x;
-}
-
-.SimpleViolet .BottomDecoratorCenter .FixHeight {
height: 19px;
}
@@ -3096,7 +2963,6 @@
color: #333333;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.SimpleOrange .ArrowDownIcon {
@@ -3150,9 +3016,6 @@
.SimpleOrange .WindowBarCenter {
background: #ffd1a8;
-}
-
-.SimpleOrange .WindowBarCenter .FixHeight {
height: 18px;
line-height: 18px;
}
@@ -3189,9 +3052,6 @@
border: 1px solid #b27a49;
border-top: none;
background: url('background/BGDecoratorCenter1x18.gif') repeat-x;
-}
-
-.SimpleOrange .BottomDecoratorCenter .FixHeight {
height: 19px;
}
@@ -3245,7 +3105,6 @@
color: #333333;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.SimplePink .ArrowDownIcon {
@@ -3299,9 +3158,6 @@
.SimplePink .WindowBarCenter {
background: #fdd8f9;
-}
-
-.SimplePink .WindowBarCenter .FixHeight {
height: 18px;
line-height: 18px;
}
@@ -3338,9 +3194,6 @@
border: 1px solid #9a5591;
border-top: none;
background: url('background/BGDecoratorCenter1x18.gif') repeat-x;
-}
-
-.SimplePink .BottomDecoratorCenter .FixHeight {
height: 19px;
}
@@ -3395,7 +3248,6 @@
color: #333333;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.SimpleGreen .ArrowDownIcon {
@@ -3449,9 +3301,6 @@
.SimpleGreen .WindowBarCenter {
background: #a3d0ff;
-}
-
-.SimpleGreen .WindowBarCenter .FixHeight {
height: 18px;
line-height: 18px;
}
@@ -3489,9 +3338,6 @@
border: 1px solid #4c717e;
border-top: none;
background: url('background/BGDecoratorCenter1x18.gif') repeat-x;
-}
-
-.SimpleGreen .BottomDecoratorCenter .FixHeight {
height: 19px;
}
Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css
===================================================================
--- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-06 04:49:25 UTC (rev 7306)
+++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-06 04:52:36 UTC (rev 7307)
@@ -182,9 +182,6 @@
.PortletLayoutDecorator .CPortletLayoutDecorator {
background: url('background/PortletLayoutDecorator.gif') repeat-x center -89px;
-}
-
-.PortletLayoutDecorator .FixHeight {
height: 69px;
padding: 10px 0;
}
@@ -218,4 +215,4 @@
filter: alpha(opacity=0);
background: #ffffff;
cursor:move;
-}
\ No newline at end of file
+}
Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/Stylesheet.css
===================================================================
--- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/Stylesheet.css 2011-09-06 04:49:25 UTC (rev 7306)
+++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/Stylesheet.css 2011-09-06 04:52:36 UTC (rev 7307)
@@ -28,68 +28,25 @@
width: 120px;
top: 15px;
left: -85px; /* orientation=lt */
- right: -85px; /* orientation=rt */
+ right: -85px; /* orientation=rt */
+ border: 1px solid #787878;
+ box-shadow: 1px 1px 2px #787878; /* orientation=lt */
+ -moz-box-shadow: 1px 1px 2px #787878; /* orientation=lt */
+ -webkit-box-shadow: 1px 1px 2px #787878; /* orientation=lt */
+ box-shadow: -1px 1px 2px #787878; /* orientation=rt */
+ -moz-box-shadow: -1px 1px 2px #787878; /* orientation=rt */
+ -webkit-box-shadow: -1px 1px 2px #787878; /* orientation=rt */
+ margin-top: 8px;
+ background: #ffffff;
}
-.UIPopupCategory .PopupCategoryDecorator {
+.UIPopupCategory .PopupCategoryDecorator {
+ background: url('background/PopupCategory.gif') no-repeat 88% top; /* orientation=lt */
+ background: url('background/PopupCategory-rt.gif') no-repeat 8px top; /* orientation=rt */
+ margin-top: -11px;
+ padding: 15px 4px 4px;
}
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryTL {
- background: url('background/PopupCategory.gif') no-repeat left top; /* orientation=lt */
- background: url('background/PopupCategory-rt.gif') no-repeat right top; /* orientation=rt */
- padding-left: 6px; /* orientation=lt */
- padding-right: 6px; /* orientation=rt */
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryTC {
- height: 16px;
- background: url('background/PopupCategory.gif') repeat-x left -39px;
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryTR {
- background: url('background/PopupCategory.gif') no-repeat right -16px; /* orientation=lt */
- background: url('background/PopupCategory-rt.gif') no-repeat left -16px; /* orientation=rt */
- padding-right: 35px; /* orientation=lt */
- padding-left: 35px; /* orientation=rt */
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryML {
- background: url('background/MidlePopupCategory.gif') repeat-y left; /* orientation=lt */
- background: url('background/MidlePopupCategory-rt.gif') repeat-y right; /* orientation=rt */
- padding-left: 6px; /* orientation=lt */
- padding-right: 6px; /* orientation=rt */
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryMC {
- background: #efefef;
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryMR {
- background: url('background/MidlePopupCategory.gif') repeat-y right; /* orientation=lt */
- background: url('background/MidlePopupCategory-rt.gif') repeat-y left; /* orientation=rt */
- padding-right: 8px; /* orientation=lt */
- padding-left: 8px; /* orientation=rt */
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryBL {
- background: url('background/PopupCategory.gif') no-repeat left -32px; /* orientation=lt */
- background: url('background/PopupCategory-rt.gif') no-repeat right -32px; /* orientation=rt */
- padding-left: 6px; /* orientation=lt */
- padding-right: 6px; /* orientation=rt */
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryBC {
- height: 7px;
- background: url('background/PopupCategory.gif') repeat-x left -55px;
-}
-
-.UIPopupCategory .PopupCategoryDecorator .PopupCategoryBR {
- background: url('background/PopupCategory.gif') no-repeat right -32px; /* orientation=lt */
- background: url('background/PopupCategory-rt.gif') no-repeat left -32px; /* orientation=rt */
- padding-right: 8px; /* orientation=lt */
- padding-left: 8px; /* orientation=rt */
-}
-
.UIPopupCategory .CategoryItem .Icon {
width: 16px;
height: 16px;
@@ -110,21 +67,23 @@
border-bottom: 1px #cdcdcd solid;
cursor: pointer;
display: block;
- text-align: left;
- width: auto;
+ padding-left: 18px; /* orientation=lt */
+ padding-right: 18px; /* orientation=rt */
+ height: 22px;
+ line-height: 22px;
+ background: #efefef url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow.gif') no-repeat left center; /* orientation=lt */
+ background: #efefef url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow-rt.gif') no-repeat right center; /* orientation=rt */
}
.UIPopupCategory .CategoryItem:hover {
- background: #cbcff2;
- color: #2569dc;
-}
-
-.UIPopupCategory .CategoryItem .CategoryItemLabel {
- padding-left: 18px; /* orientation=lt */
- padding-right: 18px; /* orientation=rt */
- height: 22px;
+ color: #2569dc;
+ border-bottom: 1px #cdcdcd solid;
+ cursor: pointer;
+ display: block;
+ padding-left: 18px; /* orientation=lt */
+ padding-right: 18px; /* orientation=rt */
+ height: 22px;
line-height: 22px;
- overflow: hidden;
- background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow.gif') no-repeat left center; /* orientation=lt */
- background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow-rt.gif') no-repeat right center; /* orientation=rt */
+ background: #cbcff2 url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow.gif') no-repeat left center; /* orientation=lt */
+ background: #cbcff2 url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/GrayNextArrow-rt.gif') no-repeat right center; /* orientation=rt */
}
\ No newline at end of file
Deleted: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/MidlePopupCategory.gif
===================================================================
(Binary files differ)
Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupCategory/background/PopupCategory.gif
===================================================================
(Binary files differ)
Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css
===================================================================
--- portal/branches/dom/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-09-06 04:49:25 UTC (rev 7306)
+++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/PortletThemes/Stylesheet.css 2011-09-06 04:52:36 UTC (rev 7307)
@@ -96,7 +96,6 @@
color: #333333;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.DefaultTheme .WindowBarLeft {
@@ -117,9 +116,6 @@
background-image: url('background/DefaultTheme.png');
background-repeat: repeat-x;
background-position: left -90px;
-}
-
-.DefaultTheme .WindowBarCenter .FixHeight {
height: 21px;
padding-top: 8px;
}
@@ -156,9 +152,6 @@
background-image: url('background/DefaultTheme.png');
background-repeat: repeat-x;
background-position: left top;
-}
-
-.DefaultTheme .BottomDecoratorCenter .FixHeight {
height: 30px;
}
@@ -180,7 +173,6 @@
line-height: 17px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.MacTheme .WindowBarCenter .PortletIcon {
@@ -288,9 +280,6 @@
background-image: url('background/MacTheme.png');
background-repeat: repeat-x;
background-position: center top;
-}
-
-.MacTheme .BottomDecoratorCenter .FixHeight {
height: 23px; line-height: 23px;
}
@@ -312,9 +301,6 @@
background-image: url('background/MacTheme.png');
background-repeat: repeat-x;
background-position: center -69px;
-}
-
-.MacTheme .WindowBarCenter .FixHeight {
height: 19px;
padding-top: 4px;
}
@@ -337,7 +323,6 @@
line-height: 17px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.MacGray .WindowBarCenter .PortletIcon {
@@ -446,9 +431,6 @@
background-image: url('background/MacGray.png');
background-repeat: repeat-x;
background-position: left top;
-}
-
-.MacGray .BottomDecoratorCenter .FixHeight {
height: 24px; line-height: 24px;
}
@@ -470,9 +452,6 @@
background-image: url('background/MacGray.png');
background-repeat: repeat-x;
background-position: center -72px;
-}
-
-.MacGray .WindowBarCenter .FixHeight {
height: 19px;
padding-top: 4px;
}
@@ -495,7 +474,6 @@
line-height: 17px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.MacBlack .WindowBarCenter .PortletIcon {
@@ -604,9 +582,6 @@
background-image: url('background/MacBlack.png');
background-repeat: repeat-x;
background-position: left top;
-}
-
-.MacBlack .BottomDecoratorCenter .FixHeight {
height: 24px; line-height: 24px;
}
@@ -628,9 +603,6 @@
background-image: url('background/MacBlack.png');
background-repeat: repeat-x;
background-position: center -72px;
-}
-
-.MacBlack .WindowBarCenter .FixHeight {
height: 19px;
padding-top: 4px;
}
@@ -653,7 +625,6 @@
line-height: 17px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.MacGreenSteel .WindowBarCenter .PortletIcon {
@@ -762,9 +733,6 @@
background-image: url('background/MacGreen.png');
background-repeat: repeat-x;
background-position: left top;
-}
-
-.MacGreenSteel .BottomDecoratorCenter .FixHeight {
height: 24px; line-height: 24px;
}
@@ -786,9 +754,6 @@
background-image: url('background/MacGreen.png');
background-repeat: repeat-x;
background-position: center -72px;
-}
-
-.MacGreenSteel .WindowBarCenter .FixHeight {
height: 19px;
padding-top: 4px;
}
@@ -910,9 +875,6 @@
background-image: url('background/VistaTheme.png');
background-repeat: repeat-x;
background-position: left top;
-}
-
-.VistaTheme .BottomDecoratorCenter .FixHeight {
height: 24px;
}
@@ -921,7 +883,6 @@
line-height: 22px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.VistaTheme .WindowBarLeft {
@@ -942,9 +903,6 @@
background-image: url('background/VistaTheme.png');
background-repeat: repeat-x;
background-position: left -72px;
-}
-
-.VistaTheme .WindowBarCenter .FixHeight {
height: 24px;
padding-top: 5px;
}
@@ -970,7 +928,6 @@
line-height: 22px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.VistaBlue .WindowBarCenter .PortletIcon {
@@ -1075,9 +1032,6 @@
background-image: url('background/VistaBlue.png');
background-repeat: repeat-x;
background-position: left top;
-}
-
-.VistaBlue .BottomDecoratorCenter .FixHeight {
height: 27px;
}
@@ -1099,9 +1053,6 @@
background-image: url('background/VistaBlue.png');
background-repeat: repeat-x;
background-position: left -81px;
-}
-
-.VistaBlue .WindowBarCenter .FixHeight {
height: 27px;
padding-top: 8px;
}
@@ -1147,7 +1098,6 @@
line-height: 19px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.RoundConerBlue .ArrowDownIcon {
@@ -1207,9 +1157,6 @@
.RoundConerBlue .WindowBarCenter {
background: url('background/RoundCornerBlue.png') repeat-x;
background-position: left -90px;
-}
-
-.RoundConerBlue .WindowBarCenter .FixHeight {
height: 22px;
padding-top: 10px;
}
@@ -1249,9 +1196,6 @@
.RoundConerBlue .BottomDecoratorCenter {
background: url('background/RoundCornerBlue.png') repeat-x;
background-position: top;
-}
-
-.RoundConerBlue .BottomDecoratorCenter .FixHeight {
height: 30px;
}
@@ -1294,7 +1238,6 @@
line-height: 19px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.RoundConerViolet .ArrowDownIcon {
@@ -1354,9 +1297,6 @@
.RoundConerViolet .WindowBarCenter {
background: url('background/RoundConerViolet.png') repeat-x;
background-position: left -90px;
-}
-
-.RoundConerViolet .WindowBarCenter .FixHeight {
height: 22px;
padding-top: 10px;
}
@@ -1400,9 +1340,6 @@
.RoundConerViolet .BottomDecoratorCenter {
background: url('background/RoundConerViolet.png') repeat-x;
background-position: top;
-}
-
-.RoundConerViolet .BottomDecoratorCenter .FixHeight {
height: 30px;
}
@@ -1446,7 +1383,6 @@
line-height: 19px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.RoundConerOrange .ArrowDownIcon {
@@ -1506,9 +1442,6 @@
.RoundConerOrange .WindowBarCenter {
background: url('background/RoundConerOrange.png') repeat-x;
background-position: left -90px;
-}
-
-.RoundConerOrange .WindowBarCenter .FixHeight {
height: 22px;
padding-top: 10px;
}
@@ -1552,9 +1485,6 @@
.RoundConerOrange .BottomDecoratorCenter {
background: url('background/RoundConerOrange.png') repeat-x;
background-position: top;
-}
-
-.RoundConerOrange .BottomDecoratorCenter .FixHeight {
height: 30px;
}
@@ -1598,7 +1528,6 @@
line-height: 19px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.RoundConerPink .ArrowDownIcon {
@@ -1658,9 +1587,6 @@
.RoundConerPink .WindowBarCenter {
background: url('background/RoundConerPink.png') repeat-x;
background-position: left -90px;
-}
-
-.RoundConerPink .WindowBarCenter .FixHeight {
height: 22px;
padding-top: 10px;
}
@@ -1704,9 +1630,6 @@
.RoundConerPink .BottomDecoratorCenter {
background: url('background/RoundConerPink.png') repeat-x;
background-position: top;
-}
-
-.RoundConerPink .BottomDecoratorCenter .FixHeight {
height: 30px;
}
@@ -1750,7 +1673,6 @@
line-height: 19px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.RoundConerGreen .ArrowDownIcon {
@@ -1810,9 +1732,6 @@
.RoundConerGreen .WindowBarCenter {
background: url('background/RoundConerGreen.png') repeat-x;
background-position: left -90px;
-}
-
-.RoundConerGreen .WindowBarCenter .FixHeight {
height: 22px;
padding-top: 10px;
}
@@ -1856,9 +1775,6 @@
.RoundConerGreen .BottomDecoratorCenter {
background: url('background/RoundConerGreen.png') repeat-x;
background-position: top;
-}
-
-.RoundConerGreen .BottomDecoratorCenter .FixHeight {
height: 30px;
}
@@ -1902,7 +1818,6 @@
line-height: 16px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.ShadowBlue .ArrowDownIcon {
@@ -1963,9 +1878,6 @@
background-image: url('background/ShadowBlue.png');
background-repeat: repeat-x;
background-position: center -84px;
-}
-
-.ShadowBlue .WindowBarCenter .FixHeight {
height: 20px;
padding-top: 9px;
}
@@ -2006,9 +1918,6 @@
background-image: url('background/ShadowBlue.png');
background-repeat: repeat-x;
background-position: center top;
-}
-
-.ShadowBlue .BottomDecoratorCenter .FixHeight {
height: 28px;
}
@@ -2052,7 +1961,6 @@
line-height: 16px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.ShadowViolet .ArrowDownIcon {
@@ -2113,9 +2021,6 @@
background-image: url('background/ShadowViolet.png');
background-repeat: repeat-x;
background-position: center -84px;
-}
-
-.ShadowViolet .WindowBarCenter .FixHeight {
height: 20px;
padding-top: 9px;
}
@@ -2156,9 +2061,6 @@
background-image: url('background/ShadowViolet.png');
background-repeat: repeat-x;
background-position: center top;
-}
-
-.ShadowViolet .BottomDecoratorCenter .FixHeight {
height: 28px;
}
@@ -2202,7 +2104,6 @@
line-height: 16px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.ShadowOrange .ArrowDownIcon {
@@ -2263,9 +2164,6 @@
background-image: url('background/ShadowOrange.png');
background-repeat: repeat-x;
background-position: center -84px;
-}
-
-.ShadowOrange .WindowBarCenter .FixHeight {
height: 19px;
padding-top: 10px;
}
@@ -2306,9 +2204,6 @@
background-image: url('background/ShadowOrange.png');
background-repeat: repeat-x;
background-position: center top;
-}
-
-.ShadowOrange .BottomDecoratorCenter .FixHeight {
height: 28px;
}
@@ -2353,7 +2248,6 @@
line-height: 16px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.ShadowPink .ArrowDownIcon {
@@ -2414,9 +2308,6 @@
background-image: url('background/ShadowPink.png');
background-repeat: repeat-x;
background-position: center -84px;
-}
-
-.ShadowPink .WindowBarCenter .FixHeight {
height: 19px;
padding-top: 10px;
}
@@ -2457,9 +2348,6 @@
background-image: url('background/ShadowPink.png');
background-repeat: repeat-x;
background-position: center top;
-}
-
-.ShadowPink .BottomDecoratorCenter .FixHeight {
height: 28px;
}
@@ -2504,7 +2392,6 @@
line-height: 16px;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.ShadowGreen .ArrowDownIcon {
@@ -2565,9 +2452,6 @@
background-image: url('background/ShadowGreen.png');
background-repeat: repeat-x;
background-position: center -84px;
-}
-
-.ShadowGreen .WindowBarCenter .FixHeight {
height: 20px;
padding-top: 9px;
}
@@ -2608,9 +2492,6 @@
background-image: url('background/ShadowGreen.png');
background-repeat: repeat-x;
background-position: center top;
-}
-
-.ShadowGreen .BottomDecoratorCenter .FixHeight {
height: 28px;
}
@@ -2652,7 +2533,6 @@
color: #333333;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.SimpleBlue .ArrowDownIcon {
@@ -2706,9 +2586,6 @@
.SimpleBlue .WindowBarCenter {
background: #b0c0f5;
-}
-
-.SimpleBlue .WindowBarCenter .FixHeight {
height: 18px;
line-height: 18px;
}
@@ -2747,9 +2624,6 @@
border: 1px solid #4a67b1;
border-top: none;
background: white url('background/BGDecoratorCenter1x18.gif') repeat-x;
-}
-
-.SimpleBlue .BottomDecoratorCenter .FixHeight {
height: 19px;
}
@@ -2791,7 +2665,6 @@
color: #333333;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.SimpleViolet .ArrowDownIcon {
@@ -2845,9 +2718,6 @@
.SimpleViolet .WindowBarCenter {
background: #c4a6ff;
-}
-
-.SimpleViolet .WindowBarCenter .FixHeight {
height: 18px;
line-height: 18px;
}
@@ -2884,15 +2754,9 @@
border: 1px solid #5700a9;
border-top: none;
background: url('background/BGDecoratorCenter1x18.gif') repeat-x;
-}
-
-.SimpleViolet .BottomDecoratorCenter .FixHeight {
height: 19px;
}
-.UIPortlet .SimpleViolet .BottomDecoratorCenter {
- height: 18px;
-}
/*------------------------------ SimpleOrange -----------------------------------*/
@@ -2932,7 +2796,6 @@
color: #333333;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.SimpleOrange .ArrowDownIcon {
@@ -2986,9 +2849,6 @@
.SimpleOrange .WindowBarCenter {
background: #ffd1a8;
-}
-
-.SimpleOrange .WindowBarCenter .FixHeight {
height: 18px;
line-height: 18px;
}
@@ -3025,16 +2885,9 @@
border: 1px solid #b27a49;
border-top: none;
background: url('background/BGDecoratorCenter1x18.gif') repeat-x;
-}
-
-.SimpleOrange .BottomDecoratorCenter .FixHeight {
height: 19px;
}
-.UIPortlet .SimpleOrange .BottomDecoratorCenter {
- height: 18px;
-}
-
/*------------------------------ SimplePink -----------------------------------*/
.SimplePink .WindowBarCenter .WindowPortletInfo {
@@ -3073,7 +2926,6 @@
color: #333333;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.SimplePink .ArrowDownIcon {
@@ -3127,9 +2979,6 @@
.SimplePink .WindowBarCenter {
background: #fdd8f9;
-}
-
-.SimplePink .WindowBarCenter .FixHeight {
height: 18px;
line-height: 18px;
}
@@ -3166,16 +3015,9 @@
border: 1px solid #9a5591;
border-top: none;
background: url('background/BGDecoratorCenter1x18.gif') repeat-x;
-}
-
-.SimplePink .BottomDecoratorCenter .FixHeight {
height: 19px;
}
-.UIPortlet .SimplePink .BottomDecoratorCenter {
- height: 18px;
-}
-
/*------------------------------ SimpleGreen -----------------------------------*/
.SimpleGreen .WindowBarCenter .WindowPortletInfo {
@@ -3215,7 +3057,6 @@
color: #333333;
overflow: hidden;
white-space: nowrap;
- width: 100%;
}
.SimpleGreen .ArrowDownIcon {
@@ -3269,9 +3110,6 @@
.SimpleGreen .WindowBarCenter {
background: #a3d0ff;
-}
-
-.SimpleGreen .WindowBarCenter .FixHeight {
height: 18px;
line-height: 18px;
}
@@ -3309,12 +3147,5 @@
border: 1px solid #4c717e;
border-top: none;
background: url('background/BGDecoratorCenter1x18.gif') repeat-x;
-}
-
-.SimpleGreen .BottomDecoratorCenter .FixHeight {
height: 19px;
}
-
-.UIPortlet .SimpleGreen .BottomDecoratorCenter {
- height: 18px;
-}
Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
===================================================================
--- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2011-09-06 04:49:25 UTC (rev 7306)
+++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2011-09-06 04:52:36 UTC (rev 7307)
@@ -33,13 +33,11 @@
<div class="LPortletLayoutDecorator">
<div class="RPortletLayoutDecorator">
<div class="CPortletLayoutDecorator">
- <div class="FixHeight">
<%
if(hasPermission) {
print uicomponent.getDisplayTitle();
} else print "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>";
%>
- </div>
</div>
</div>
</div>
@@ -77,102 +75,82 @@
<div class="UIWindow $theme UIDragObject UIResizeObject" id="UIWindow-${portletId}" ${cssStyle} >
<div class="WindowBarLeft">
<div class="WindowBarRight">
- <div class="WindowBarCenter">
- <div class="FixHeight ClearFix">
- <%
-
- String restoreDown = _ctx.appRes("UIPortlet.tooltip.MaximizeRestore");
- String restore = _ctx.appRes("UIPortlet.tooltip.MinimizeRestore");
- String miniTooltip = _ctx.appRes("UIPortlet.tooltip.Minimize");
- String maxiTooltip = _ctx.appRes("UIPortlet.tooltip.Maximize");
- String renderMaxi = maxiTooltip;
- String renderMini = miniTooltip;
- if(windowState == WindowState.MAXIMIZED) {
- renderMaxi = restoreDown;
- } else if(windowState == WindowState.MINIMIZED) {
- renderMini = restore;
- }
- if(uicomponent.getShowWindowState()) {
- String maximizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'maximized');";
- String minimizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'minimized');";
- String maximizedMode = "Maximized";
- String minimizedMode = "Minimized";
- if(windowState == WindowState.MAXIMIZED) {
- maximizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'normal');";
- maximizedMode = "Normal";
- } else if(windowState == WindowState.MINIMIZED) {
- minimizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'normal');";
- minimizedMode = "Normal";
- }
- %>
- <div class="ControlIcon ${maximizedMode}Icon" title="$renderMaxi" onclick="$maximizedAction" onmouseover="$onControlOver" onmouseout="$onControlOut"><span></span>
- <div style="display:none">{"normalTitle":"$maxiTooltip","modeTitle":"$restoreDown"}</div>
- </div>
- <div class="ControlIcon ${minimizedMode}Icon" title="$renderMini" onclick="$minimizedAction" onmouseover="$onControlOver" onmouseout="$onControlOut"><span></span>
- <div style="display:none">{"normalTitle":"$miniTooltip","modeTitle":"$restore"}</div>
- </div>
- <%}
-
- List supportModes = uicomponent.getSupportModes();
- if(uicomponent.getShowPortletMode() && supportModes.size() > 0) {
- String showCategory = "eXo.webui.UIPopupSelectCategory.show(this, event);"
- %>
- <div class="ControlIcon ArrowDownIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.PortletMode");%>" onclick="$showCategory" onmouseover="$onControlOver" onmouseout="$onControlOut">
- <% /*Begin Popup Menu*/ %>
- <div style="position: relative; width: 100%">
- <div class="UIPopupCategory" style="display: none;">
- <div class="PopupCategoryDecorator">
- <div class="PopupCategoryTL">
- <div class="PopupCategoryTR">
- <div class="PopupCategoryTC"><span></span></div>
- </div>
- </div>
- <div class="PopupCategoryML">
- <div class="PopupCategoryMR">
- <div class="PopupCategoryMC">
- <%
- for(String mode in supportModes) {
- if(mode.equals("edit") && rcontext.getRemoteUser()==null) continue;
- String actionLink = uicomponent.event("ChangePortletMode", mode);
- String modeLabel = _ctx.appRes("PortletMode.label." + mode);
- String upper = mode.charAt(0).toString();
- mode = mode.replaceFirst(upper, upper.toUpperCase());
- %>
- <a class="CategoryItem" href="$actionLink" title="$modeLabel">
- <div class="CategoryItemLabel" >$modeLabel</div>
- </a>
- <%
- }
- if(supportModes != null && supportModes.size() > 0 && !supportModes.contains("view")) {
- String modeLabel = _ctx.appRes("PortletMode.label.view");
- %>
- <a class="CategoryItem" href="<%=uicomponent.event("ChangePortletMode", "view")%>" title="$modeLabel">
- <div class="CategoryItemLabel">$modeLabel</div>
- </a>
- <%}%>
- </div>
- </div>
- </div>
- <div class="PopupCategoryBL">
- <div class="PopupCategoryBR">
- <div class="PopupCategoryBC"><span></span></div>
- </div>
- </div>
- </div>
- </div>
+ <div class="WindowBarCenter ClearFix">
+ <%
+
+ String restoreDown = _ctx.appRes("UIPortlet.tooltip.MaximizeRestore");
+ String restore = _ctx.appRes("UIPortlet.tooltip.MinimizeRestore");
+ String miniTooltip = _ctx.appRes("UIPortlet.tooltip.Minimize");
+ String maxiTooltip = _ctx.appRes("UIPortlet.tooltip.Maximize");
+ String renderMaxi = maxiTooltip;
+ String renderMini = miniTooltip;
+ if(windowState == WindowState.MAXIMIZED) {
+ renderMaxi = restoreDown;
+ } else if(windowState == WindowState.MINIMIZED) {
+ renderMini = restore;
+ }
+ if(uicomponent.getShowWindowState()) {
+ String maximizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'maximized');";
+ String minimizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'minimized');";
+ String maximizedMode = "Maximized";
+ String minimizedMode = "Minimized";
+ if(windowState == WindowState.MAXIMIZED) {
+ maximizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'normal');";
+ maximizedMode = "Normal";
+ } else if(windowState == WindowState.MINIMIZED) {
+ minimizedAction = "eXo.portal.UIPortalControl.changeWindowState('"+portletId+"', 'normal');";
+ minimizedMode = "Normal";
+ }
+ %>
+ <div class="ControlIcon ${maximizedMode}Icon" title="$renderMaxi" onclick="$maximizedAction" onmouseover="$onControlOver" onmouseout="$onControlOut"><span></span>
+ <div style="display:none">{"normalTitle":"$maxiTooltip","modeTitle":"$restoreDown"}</div>
+ </div>
+ <div class="ControlIcon ${minimizedMode}Icon" title="$renderMini" onclick="$minimizedAction" onmouseover="$onControlOver" onmouseout="$onControlOut"><span></span>
+ <div style="display:none">{"normalTitle":"$miniTooltip","modeTitle":"$restore"}</div>
+ </div>
+ <%}
+
+ List supportModes = uicomponent.getSupportModes();
+ if(uicomponent.getShowPortletMode() && supportModes.size() > 0) {
+ String showCategory = "eXo.webui.UIPopupSelectCategory.show(this, event);"
+ %>
+ <div class="ControlIcon ArrowDownIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.PortletMode");%>" onclick="$showCategory" onmouseover="$onControlOver" onmouseout="$onControlOut" style="position: relative;">
+ <% /*Begin Popup Menu*/ %>
+ <div class="UIPopupCategory" style="display: none;">
+ <div class="PopupCategoryDecorator">
+ <%
+ for(String mode in supportModes) {
+ if(mode.equals("edit") && rcontext.getRemoteUser()==null) continue;
+ String actionLink = uicomponent.event("ChangePortletMode", mode);
+ String modeLabel = _ctx.appRes("PortletMode.label." + mode);
+ String upper = mode.charAt(0).toString();
+ mode = mode.replaceFirst(upper, upper.toUpperCase());
+ %>
+ <a class="CategoryItem" href="$actionLink" title="$modeLabel">
+ $modeLabel
+ </a>
+ <%
+ }
+ if(supportModes != null && supportModes.size() > 0 && !supportModes.contains("view")) {
+ String modeLabel = _ctx.appRes("PortletMode.label.view");
+ %>
+ <a class="CategoryItem" href="<%=uicomponent.event("ChangePortletMode", "view")%>" title="$modeLabel">
+ $modeLabel
+ </a>
+ <%}%>
</div>
- <% /*End Popup Menu*/ %>
</div>
- <%}%>
-
- <%
- /*TODO: modify: dang.tung - fixed icon themes*/
- String portletIcon = uicomponent.getIcon();
- if(portletIcon == null) portletIcon = "PortletIcon";
- %>
- <div class="$portletIcon WindowPortletIcon NovaPortletIcon WindowPortletInfo"><div class="PortletName"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div></div>
-
- </div>
+ <% /*End Popup Menu*/ %>
+ </div>
+ <%}%>
+
+ <%
+ /*TODO: modify: dang.tung - fixed icon themes*/
+ String portletIcon = uicomponent.getIcon();
+ if(portletIcon == null) portletIcon = "PortletIcon";
+ %>
+ <div class="$portletIcon WindowPortletIcon NovaPortletIcon WindowPortletInfo PortletName"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
+
</div>
</div>
</div>
@@ -198,11 +176,9 @@
<%//Begin Bottom Decorator %>
<div class="BottomDecoratorLeft">
<div class="BottomDecoratorRight">
- <div class="BottomDecoratorCenter">
- <div class="FixHeight ClearFix">
- <div class="ResizeArea" title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div>
+ <div class="BottomDecoratorCenter ClearFix">
+ <div class="ResizeArea" title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div>
<div class="Information"><%=_ctx.appRes("UIPortlet.lable.information");%></div>
- </div>
</div>
</div>
</div>
Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormInputThemeSelector.gtmpl
===================================================================
--- portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormInputThemeSelector.gtmpl 2011-09-06 04:49:25 UTC (rev 7306)
+++ portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIFormInputThemeSelector.gtmpl 2011-09-06 04:52:36 UTC (rev 7307)
@@ -11,7 +11,7 @@
def uiParentComponent = uicomponent.getParent() ;
%>
<div class="UIItemSelector UIFormInputThemeSelector" id="$uicomponent.id">
- <div class="LeftColumnStyle">
+ <div class="LeftColumnStyle ClearFix">
<div class="ItemListContainer"><%uicomponent.renderChild(UIItemThemeSelector.class);%></div>
<div class="ItemDetailList">
<div class="ItemDetailTitle">
@@ -20,7 +20,6 @@
<div class="SetDefault" onclick="eXo.webui.UIFormInputThemeSelector.setDefaultTheme(this,'DefaultTheme')">
<a href="#"><%= _ctx.appRes(uiParentComponent.getId() + "." + uicomponent.getId() + ".title.SetDefault") %></a>
</div>
- <div class="ClearBoth"><span></span></div>
</div>
<div class="DetailView">
<%
@@ -31,16 +30,13 @@
<div class="UIThemeSelector $selectedThemeName">
<div class="WindowBarLeft">
<div class="WindowBarRight">
- <div class="WindowBarCenter">
- <div class="FixHeight">
+ <div class="WindowBarCenter ClearFix">
<div class="ControlIcon MaximizedIcon"><span></span></div>
<div class="ControlIcon RestoreIcon"><span></span></div>
<div class="ControlIcon MinimizedIcon"><span></span></div>
- <div class="PortletIcon WindowPortletIcon WindowPortletInfo">
- <div class="PortletName">Title</div>
+ <div class="PortletIcon WindowPortletIcon WindowPortletInfo PortletName">
+ Title
</div>
- <div class="ClearBoth"><span></span></div>
- </div>
</div>
</div>
</div>
@@ -55,13 +51,10 @@
<div class="BottomDecoratorLeft">
<div class="BottomDecoratorRight">
- <div class="BottomDecoratorCenter">
- <div class="FixHeight">
- <div class="ResizeArea" title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div>
+ <div class="BottomDecoratorCenter ClearFix">
+ <div class="ResizeArea" title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div>
<div class="Information">Done</div>
- <div class="ClearRight"><span></span></div>
- </div>
- </div>
+ </div>
</div>
</div>
@@ -70,6 +63,5 @@
</div>
</div>
- <div class="ClearLeft"></div>
</div>
</div>
\ No newline at end of file
Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIItemThemeSelector.gtmpl
===================================================================
--- portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIItemThemeSelector.gtmpl 2011-09-06 04:49:25 UTC (rev 7306)
+++ portal/branches/dom/web/portal/src/main/webapp/groovy/webui/form/UIItemThemeSelector.gtmpl 2011-09-06 04:52:36 UTC (rev 7307)
@@ -22,15 +22,12 @@
<div class="WindowBarLeft">
<div class="WindowBarRight">
- <div class="WindowBarCenter">
- <div class="FixHeight">
- <div class="ControlIcon MaximizedIcon"><span></span></div>
- <div class="ControlIcon RestoreIcon"><span></span></div>
- <div class="ControlIcon MinimizedIcon"><span></span></div>
- <div class="PortletIcon WindowPortletIcon WindowPortletInfo">
- <div class="PortletName">Title</div>
- </div>
- <div class="ClearBoth"><span></span></div>
+ <div class="WindowBarCenter ClearFix">
+ <div class="ControlIcon MaximizedIcon"><span></span></div>
+ <div class="ControlIcon RestoreIcon"><span></span></div>
+ <div class="ControlIcon MinimizedIcon"><span></span></div>
+ <div class="PortletIcon WindowPortletIcon WindowPortletInfo PortletName">
+ Title
</div>
</div>
</div>
@@ -46,12 +43,9 @@
<div class="BottomDecoratorLeft">
<div class="BottomDecoratorRight">
- <div class="BottomDecoratorCenter">
- <div class="FixHeight">
- <div class="ResizeArea" title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div>
- <div class="Information">Done</div>
- <div class="ClearRight"><span></span></div>
- </div>
+ <div class="BottomDecoratorCenter ClearFix">
+ <div class="ResizeArea" title="<%=_ctx.appRes("UIPortlet.tooltip.ResizeWindow");%>"><span></span></div>
+ <div class="Information">Done</div>
</div>
</div>
</div>
13 years, 3 months
- 1
- 0
gatein SVN: r7306 - in portal/branches/dom/web: portal/src/main/webapp/groovy/portal/webui/container and 1 other directory.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-09-06 00:49:25 -0400 (Tue, 06 Sep 2011)
New Revision: 7306
Modified:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl
Log:
[DOM] UIContainer, UIColumnContainer Optimization
Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css
===================================================================
--- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-05 12:50:49 UTC (rev 7305)
+++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2011-09-06 04:49:25 UTC (rev 7306)
@@ -98,18 +98,13 @@
background: url('/eXoResources/skin/PortletThemes/background/DefaultTheme.png') no-repeat center;
}
-.UIColumnContainer .EditContainerIcon {
- margin-left: 0px; /* orientation=lt */
- margin-right: 0px; /* orientation=rt */
-}
-
.UIColumnContainer .ArrowDownIcon {
float: left; /* orientation=lt */
float: right; /* orientation=rt */
width: 22px; height: 16px;
background: url('background/ArrowDown.gif') no-repeat center top;
- margin: 4px 0px 0px 2px; /* orientation=lt */
- margin: 4px 2px 0px 0px; /* orientation=rt */
+ margin: 3px 0px 0px 2px; /* orientation=lt */
+ margin: 3px 2px 0px 0px; /* orientation=rt */
}
.EDITION-BLOCK .PortletIcon {
@@ -223,4 +218,4 @@
filter: alpha(opacity=0);
background: #ffffff;
cursor:move;
-}
+}
\ No newline at end of file
Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl
===================================================================
--- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-09-05 12:50:49 UTC (rev 7305)
+++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2011-09-06 04:49:25 UTC (rev 7306)
@@ -105,8 +105,8 @@
</div>
<% /*End Popup Menu*/ %>
</div>
- <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a>
- <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
===================================================================
--- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2011-09-05 12:50:49 UTC (rev 7305)
+++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2011-09-06 04:49:25 UTC (rev 7306)
@@ -64,8 +64,8 @@
%>
<div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
- <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
+ <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
</div>
<%/*End InfoBar*/ %>
Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
===================================================================
--- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2011-09-05 12:50:49 UTC (rev 7305)
+++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2011-09-06 04:49:25 UTC (rev 7306)
@@ -63,8 +63,8 @@
%>
<div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
- <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
</div>
<%/*End InfoBar*/ %>
Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
===================================================================
--- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2011-09-05 12:50:49 UTC (rev 7305)
+++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2011-09-06 04:49:25 UTC (rev 7306)
@@ -63,8 +63,8 @@
%>
<div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
- <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"></a>
+ <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
+ <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"></a>
<%}%>
</div>
<%/*End InfoBar*/ %>
Modified: portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl
===================================================================
--- portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2011-09-05 12:50:49 UTC (rev 7305)
+++ portal/branches/dom/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2011-09-06 04:49:25 UTC (rev 7306)
@@ -63,8 +63,8 @@
%>
<div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
- <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
</div>
<%/*End InfoBar*/ %>
13 years, 3 months
- 1
- 0
gatein SVN: r7305 - in portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer: background and 1 other directory.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-09-05 08:50:49 -0400 (Mon, 05 Sep 2011)
New Revision: 7305
Modified:
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css
portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/background/ToolbarContainer.gif
Log:
[DOM] Admin Toolbar optimization
Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css
===================================================================
--- portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-09-05 12:49:25 UTC (rev 7304)
+++ portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2011-09-05 12:50:49 UTC (rev 7305)
@@ -20,6 +20,8 @@
.UIToolbarContainer {
padding: 0px;
height: auto;
+ position:relative;
+ z-index:4;
}
.UIToolbarContainer ul {
padding:0;
@@ -44,7 +46,7 @@
}
.UIToolbarContainer .ToolbarContainer .TRContainer {
- height: 30px;
+ height: 32px;
}
.UIToolbarContainer .UIContainer {
@@ -140,8 +142,8 @@
}
.UIToolbarContainer .ArrowIcon {
- background: url('background/ToolbarContainer.gif') no-repeat right bottom; /* orientation=lt */
- background: url('background/ToolbarContainer-rt.gif') no-repeat -5px bottom; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat right -452px; /* orientation=lt */
+ background: url('background/ToolbarContainer-rt.gif') no-repeat -5px -452px; /* orientation=rt */
}
.UIToolbarContainer .MenuItem {
Modified: portal/branches/dom/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/background/ToolbarContainer.gif
===================================================================
(Binary files differ)
13 years, 3 months
- 1
- 0