November 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r9178 - branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-11-28 21:50:09 -0500 (Wed, 28 Nov 2007) New Revision: 9178 Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java Log: - Make sure that the test consumer we use is known by the RegistrationManager, otherwise tests will fail. Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java 2007-11-29 02:18:00 UTC (rev 9177) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java 2007-11-29 02:50:09 UTC (rev 9178) @@ -24,6 +24,7 @@ package org.jboss.portal.test.wsrp.v1.producer; import org.jboss.portal.common.junit.ExtendedAssert; +import org.jboss.portal.registration.RegistrationException; import org.jboss.portal.registration.RegistrationManager; import org.jboss.portal.registration.policies.DefaultRegistrationPolicy; import org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator; @@ -61,6 +62,7 @@ protected WSRP_v1_ServiceDescription_PortType serviceDescriptionService; protected WSRP_v1_Markup_PortType markupService; protected WSRP_v1_PortletManagement_PortType portletManagementService; + private static final String CONSUMER = "test-consumer"; public V1ProducerBaseTest() throws Exception @@ -163,6 +165,7 @@ protected RegistrationData createBaseRegData() { RegistrationData regData = WSRPTypeFactory.createDefaultRegistrationData(); + regData.setConsumerName(CONSUMER); regData.setRegistrationProperties(new Property[]{new Property("regProp", null, "regValue", null)}); return regData; } @@ -186,10 +189,21 @@ DefaultRegistrationPolicy defaultRegistrationPolicy = new DefaultRegistrationPolicy(); defaultRegistrationPolicy.setValidator(new DefaultRegistrationPropertyValidator()); producer.getProducerRegistrationRequirements().setPolicy(defaultRegistrationPolicy); + RegistrationManager registrationManager = producer.getRegistrationManager(); registrationManager.setPolicy(defaultRegistrationPolicy); producer.getProducerRegistrationRequirements().addRegistrationPropertyChangeListener(registrationManager); + // create consumer for policy to be able to make decisions properly + try + { + registrationManager.createConsumer(CONSUMER); + } + catch (RegistrationException e) + { + ExtendedAssert.fail("Couldn't create consumer. Cause: " + e.getLocalizedMessage()); + } + return regProp; } else

16 years, 6 months

1
0
0 / 0

JBoss Portal SVN: r9177 - in branches/JBoss_Portal_Branch_2_6: registration/src/main/org/jboss/portal/registration and 6 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-11-28 21:18:00 -0500 (Wed, 28 Nov 2007) New Revision: 9177 Added: branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/PropertyDescription.java branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/test/registration/DefaultRegistrationPolicyTestCase.java Modified: branches/JBoss_Portal_Branch_2_6/registration/build.xml branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/RegistrationPolicy.java branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/RegistrationPropertyChangeListener.java branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/impl/RegistrationManagerImpl.java branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/policies/DefaultRegistrationPolicy.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestRegistrationPolicy.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/registration/RegistrationPropertyDescription.java Log: - JBPORTAL-1821: + Allow RegistrationPolicy to be aware of producer expectations to decide on registration data. + Properly implement validateRegistrationDataFor to correctly analyze input registration. + Updated RegistrationPropertyChangeListener to pass new registration property descriptions. + Introduced PropertyDescription interface to access registration property information in registration module. + Added DefaultRegistrationPolicyTestCase. Modified: branches/JBoss_Portal_Branch_2_6/registration/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/registration/build.xml 2007-11-29 00:52:01 UTC (rev 9176) +++ branches/JBoss_Portal_Branch_2_6/registration/build.xml 2007-11-29 02:18:00 UTC (rev 9177) @@ -150,7 +150,7 @@ </jar> <jar jarfile="${build.lib}/portal-registration-test-lib.jar"> - <fileset dir="${build.classes}" includes="org/jboss/portal/test/registration/**"/> + <fileset dir="${build.classes}" includes="org/jboss/portal/test/registration/**"/> </jar> </target> @@ -193,6 +193,7 @@ <test todir="${test.reports}" name="org.jboss.portal.test.registration.ConsumerGroupTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.registration.RegistrationManagerTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.registration.RegistrationTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.registration.DefaultRegistrationPolicyTestCase"/> </x-test> <x-sysproperty> <!--<jvmarg value="-Xdebug"/> @@ -225,7 +226,7 @@ <delete file="tests.log"/> <delete file="output.log"/> </target> - + <target name="tests" depends="clean-test"> <antcall target="registration-test"/> </target> Added: branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/PropertyDescription.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/PropertyDescription.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/PropertyDescription.java 2007-11-29 02:18:00 UTC (rev 9177) @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2007, Your Corporation. All Rights Reserved. + */ + +package org.jboss.portal.registration; + +import javax.xml.namespace.QName; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + * @since 2.6.3 + */ +public interface PropertyDescription +{ + QName getName(); + + QName getType(); +} Property changes on: branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/PropertyDescription.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/RegistrationPolicy.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/RegistrationPolicy.java 2007-11-29 00:52:01 UTC (rev 9176) +++ branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/RegistrationPolicy.java 2007-11-29 02:18:00 UTC (rev 9177) @@ -23,6 +23,7 @@ package org.jboss.portal.registration; +import javax.xml.namespace.QName; import java.util.Map; /** @@ -127,4 +128,13 @@ * @param manager the RegistrationManager with which this RegistrationPolicy should be associated. */ void setManager(RegistrationManager manager); + + /** + * Define what the expectations are as far as acceptable registration properties go. + * + * @param registrationPropertyDescriptions + * a map of containing the description of expected registrations + * @since 2.6.3 + */ + void setExpectations(Map<QName, ? extends PropertyDescription> registrationPropertyDescriptions); } Modified: branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/RegistrationPropertyChangeListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/RegistrationPropertyChangeListener.java 2007-11-29 00:52:01 UTC (rev 9176) +++ branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/RegistrationPropertyChangeListener.java 2007-11-29 02:18:00 UTC (rev 9177) @@ -23,6 +23,9 @@ package org.jboss.portal.registration; +import javax.xml.namespace.QName; +import java.util.Map; + /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ @@ -30,5 +33,5 @@ */ public interface RegistrationPropertyChangeListener { - void propertiesHaveChanged(); + void propertiesHaveChanged(Map<QName, ? extends PropertyDescription> newRegistrationProperties); } Modified: branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/impl/RegistrationManagerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/impl/RegistrationManagerImpl.java 2007-11-29 00:52:01 UTC (rev 9176) +++ branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/impl/RegistrationManagerImpl.java 2007-11-29 02:18:00 UTC (rev 9177) @@ -30,6 +30,7 @@ import org.jboss.portal.registration.ConsumerGroup; import org.jboss.portal.registration.InvalidConsumerDataException; import org.jboss.portal.registration.NoSuchRegistrationException; +import org.jboss.portal.registration.PropertyDescription; import org.jboss.portal.registration.Registration; import org.jboss.portal.registration.RegistrationException; import org.jboss.portal.registration.RegistrationManager; @@ -37,6 +38,7 @@ import org.jboss.portal.registration.RegistrationPolicy; import org.jboss.portal.registration.RegistrationStatus; +import javax.xml.namespace.QName; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -323,18 +325,24 @@ * We listen to registration property changes on the producer configuration so that we can invalidate the current * registrations. Consumers will need to call modifyRegistration since properties have changed... which requires * throwing an OperationFailedFault... not an InvalidRegistrationFault! + * + * @param registrationProperties */ - public void propertiesHaveChanged() + public void propertiesHaveChanged(Map<QName, ? extends PropertyDescription> registrationProperties) { log.debug("Registration properties have changed, existing registrations will be invalidated..."); - for (Iterator regs = persistenceManager.getRegistrations().iterator(); regs.hasNext();) + Collection registrations = persistenceManager.getRegistrations(); + for (Object registration : registrations) { - Registration reg = (Registration)regs.next(); + Registration reg = (Registration)registration; // pending instead of invalid as technically, the registration is not yet invalid reg.setStatus(RegistrationStatus.PENDING); // reg.clearAssociatedState(); //todo: do we need to clear the associated state? If we do, should we wait until current operations are done? } + + // make policy aware of new registration properties + policy.setExpectations(registrationProperties); } /** Modified: branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/policies/DefaultRegistrationPolicy.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/policies/DefaultRegistrationPolicy.java 2007-11-29 00:52:01 UTC (rev 9176) +++ branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/policies/DefaultRegistrationPolicy.java 2007-11-29 02:18:00 UTC (rev 9177) @@ -28,6 +28,7 @@ import org.jboss.portal.registration.Consumer; import org.jboss.portal.registration.DuplicateRegistrationException; import org.jboss.portal.registration.InvalidConsumerDataException; +import org.jboss.portal.registration.PropertyDescription; import org.jboss.portal.registration.Registration; import org.jboss.portal.registration.RegistrationException; import org.jboss.portal.registration.RegistrationManager; @@ -35,8 +36,9 @@ import javax.xml.namespace.QName; import java.util.Collections; -import java.util.Iterator; +import java.util.HashSet; import java.util.Map; +import java.util.Set; /** * Provides a default implementation of RegistrationPolicy which should be enough for most user needs provided the @@ -50,6 +52,7 @@ { private RegistrationManager manager; private RegistrationPropertyValidator validator; + private Map<QName, ? extends PropertyDescription> expectations; public RegistrationManager getManager() @@ -62,6 +65,11 @@ this.manager = manager; } + public void setExpectations(Map<QName, ? extends PropertyDescription> registrationPropertyDescriptions) + { + this.expectations = registrationPropertyDescriptions; + } + /** * Only accepts the registration if no registration with identical values exists for the Consumer identified by the * specified identify and delegates the validation of properties to the configured RegistrationPropertyValidator. @@ -75,14 +83,59 @@ ParameterValidation.throwIllegalArgExceptionIfNull(registrationProperties, "Registration properties"); ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(consumerIdentity, "Consumer identity", null); + StringBuilder message = new StringBuilder(); + + // check that values are consistent with expectations + if (expectations != null) + { + Set<QName> expectedNames = expectations.keySet(); + boolean consistentWithExpectations = true; + + // check for extra properties + Set<QName> unexpected = new HashSet<QName>(registrationProperties.keySet()); + unexpected.removeAll(expectedNames); + if (!unexpected.isEmpty()) + { + consistentWithExpectations = false; + message.append("Consumer '").append(consumerIdentity) + .append("' provided values for unexpected registration properties:\n"); + for (QName name : unexpected) + { + message.append("\t- ").append(name).append("\n"); + } + } + + for (Map.Entry<QName, ? extends PropertyDescription> entry : expectations.entrySet()) + { + QName name = entry.getKey(); + Object value = registrationProperties.get(name); + try + { + validator.validateValueFor(name, value); + } + catch (IllegalArgumentException e) + { + message.append("Missing value for expected '").append(name.getLocalPart()).append("' property.\n"); + consistentWithExpectations = false; + } + } + + if (!consistentWithExpectations) + { + log.debug(message); + throw new InvalidConsumerDataException(message.toString()); + } + } + + // check that this is not a duplicate registration Consumer consumer = manager.getConsumerByIdentity(consumerIdentity); if (consumer != null) { // allow the new registration only if the registration properties are different that existing registrations // for this consumer... - for (Iterator iterator = consumer.getRegistrations().iterator(); iterator.hasNext();) + for (Object o : consumer.getRegistrations()) { - Registration registration = (Registration)iterator.next(); + Registration registration = (Registration)o; if (registration.hasEqualProperties(registrationProperties)) { throw new DuplicateRegistrationException("Consumer named '" + consumer.getName() @@ -90,12 +143,9 @@ } } } - - // check that values are consistent with ProducerRegistrationRequirement - for (Iterator properties = registrationProperties.entrySet().iterator(); properties.hasNext();) + else { - Map.Entry property = (Map.Entry)properties.next(); - validator.validateValueFor((QName)property.getKey(), property.getValue()); + throw new RegistrationException("'" + consumerIdentity + "' is not a valid Consumer"); } } Added: branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/test/registration/DefaultRegistrationPolicyTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/test/registration/DefaultRegistrationPolicyTestCase.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/test/registration/DefaultRegistrationPolicyTestCase.java 2007-11-29 02:18:00 UTC (rev 9177) @@ -0,0 +1,164 @@ +/* + * Copyright (c) 2007, Your Corporation. All Rights Reserved. + */ + +package org.jboss.portal.test.registration; + +import junit.framework.TestCase; +import org.jboss.portal.registration.PropertyDescription; +import org.jboss.portal.registration.RegistrationException; +import org.jboss.portal.registration.RegistrationManager; +import org.jboss.portal.registration.impl.RegistrationManagerImpl; +import org.jboss.portal.registration.impl.RegistrationPersistenceManagerImpl; +import org.jboss.portal.registration.policies.DefaultRegistrationPolicy; +import org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator; + +import javax.xml.namespace.QName; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + * @since 2.6.3 + */ +public class DefaultRegistrationPolicyTestCase extends TestCase +{ + DefaultRegistrationPolicy policy; + Map registrationProperties; + HashMap<QName, PropertyDescription> expectations; + private static final String CONSUMER = "consumer"; + private static final QName PROP1 = new QName("prop1"); + private static final QName PROP2 = new QName("prop2"); + private static final QName PROP3 = new QName("prop3"); + + @Override + protected void setUp() throws Exception + { + policy = new DefaultRegistrationPolicy(); + + policy.setValidator(new DefaultRegistrationPropertyValidator()); + + RegistrationManager manager = new RegistrationManagerImpl(); + manager.setPolicy(policy); + manager.setPersistenceManager(new RegistrationPersistenceManagerImpl()); + manager.createConsumer(CONSUMER); + + policy.setManager(manager); + + registrationProperties = new HashMap(); + registrationProperties.put(PROP1, "value1"); + registrationProperties.put(PROP2, "value2"); + + expectations = new HashMap<QName, PropertyDescription>(); + policy.setExpectations(expectations); + } + + public void testValidateRegistrationDataForNull() throws RegistrationException + { + try + { + policy.validateRegistrationDataFor(null, "foo"); + fail("null data cannot be validated"); + } + catch (IllegalArgumentException e) + { + // expected + } + + try + { + policy.validateRegistrationDataFor(Collections.EMPTY_MAP, null); + fail("null data cannot be validated"); + } + catch (IllegalArgumentException e) + { + // expected + } + } + + public void testValidateRegistrationDataForInexistentConsumer() + { + try + { + policy.validateRegistrationDataFor(Collections.EMPTY_MAP, "foo"); + fail("shouldn't validate data for inexistent consumer"); + } + catch (RegistrationException e) + { + // expected + } + } + + public void testValidateRegistrationDataMissingProps() + { + expectations.put(PROP1, new TestPropertyDescription(PROP1)); + expectations.put(PROP2, new TestPropertyDescription(PROP2)); + expectations.put(PROP3, new TestPropertyDescription(PROP3)); + + try + { + policy.validateRegistrationDataFor(registrationProperties, CONSUMER); + fail("Missing prop3 should have been detected"); + } + catch (RegistrationException e) + { + assertTrue(e.getLocalizedMessage().contains("prop3")); + } + } + + public void testValidateRegistrationDataExtraProps() + { + expectations.put(PROP1, new TestPropertyDescription(PROP1)); + + try + { + policy.validateRegistrationDataFor(registrationProperties, CONSUMER); + fail("Extra prop2 should have been detected"); + } + catch (RegistrationException e) + { + assertTrue(e.getLocalizedMessage().contains("prop2")); + } + } + + public void testValidateRegistrationDataInvalidValue() + { + expectations.put(PROP1, new TestPropertyDescription(PROP1)); + + registrationProperties.remove(PROP2); + registrationProperties.put(PROP1, null); + + try + { + policy.validateRegistrationDataFor(registrationProperties, CONSUMER); + fail("Should have detected null value for prop1"); + } + catch (RegistrationException e) + { + assertTrue(e.getLocalizedMessage().contains("prop1")); + } + } + + static class TestPropertyDescription implements PropertyDescription + { + private QName name; + private static final QName TYPE = new QName("type"); + + TestPropertyDescription(QName name) + { + this.name = name; + } + + public QName getName() + { + return name; + } + + public QName getType() + { + return TYPE; + } + } +} Property changes on: branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/test/registration/DefaultRegistrationPolicyTestCase.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestRegistrationPolicy.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestRegistrationPolicy.java 2007-11-29 00:52:01 UTC (rev 9176) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestRegistrationPolicy.java 2007-11-29 02:18:00 UTC (rev 9177) @@ -24,10 +24,12 @@ package org.jboss.portal.test.wsrp.config; import org.jboss.portal.registration.InvalidConsumerDataException; +import org.jboss.portal.registration.PropertyDescription; import org.jboss.portal.registration.RegistrationException; import org.jboss.portal.registration.RegistrationManager; import org.jboss.portal.registration.RegistrationPolicy; +import javax.xml.namespace.QName; import java.util.Map; /** @@ -72,4 +74,8 @@ public void setManager(RegistrationManager manager) { } + + public void setExpectations(Map<QName, ? extends PropertyDescription> registrationPropertyDescriptions) + { + } } Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2007-11-29 00:52:01 UTC (rev 9176) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2007-11-29 02:18:00 UTC (rev 9177) @@ -177,7 +177,7 @@ { for (RegistrationPropertyChangeListener listener : propertyChangeListeners) { - listener.propertiesHaveChanged(); + listener.propertiesHaveChanged(registrationProperties); } } @@ -241,6 +241,8 @@ DefaultRegistrationPolicy registrationPolicy = (DefaultRegistrationPolicy)policy; validatorClassName = registrationPolicy.getValidator().getClass().getName(); } + + this.policy.setExpectations(registrationProperties); } notifyRegistrationPolicyChangeListeners(); Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/registration/RegistrationPropertyDescription.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/registration/RegistrationPropertyDescription.java 2007-11-29 00:52:01 UTC (rev 9176) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/registration/RegistrationPropertyDescription.java 2007-11-29 02:18:00 UTC (rev 9177) @@ -24,6 +24,7 @@ package org.jboss.portal.wsrp.registration; import org.jboss.portal.common.util.ParameterValidation; +import org.jboss.portal.registration.PropertyDescription; import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements; import javax.xml.namespace.QName; @@ -37,7 +38,7 @@ * @version $Revision:5865 $ * @since 2.6 */ -public class RegistrationPropertyDescription implements Cloneable +public class RegistrationPropertyDescription implements Cloneable, PropertyDescription { private Long key; private QName name;

16 years, 6 months

1
0
0 / 0

JBoss Portal SVN: r9176 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/bin/portal-admin-war/css and 3 other directories.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2007-11-28 19:52:01 -0500 (Wed, 28 Nov 2007) New Revision: 9176 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css Log: JBPORTAL-1798 Cleanup nested tables and other UI elements in core adminlocation Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-11-29 00:52:01 UTC (rev 9176) @@ -913,12 +913,14 @@ /* Text for form field labels */ .portlet-form-field-label{ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; - font-size: 10px; color: #000; - vertical-align: bottom; white-space: nowrap } +.provider-menu-container{ + padding:10px; +} + /* Text for a form field */ .portlet-form-field { font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css 2007-11-29 00:52:01 UTC (rev 9176) @@ -27,6 +27,10 @@ text-align: right; } +.align-top { + vertical-align:top; +} + .half-width { width: 49%; } @@ -77,3 +81,13 @@ padding: 10px } +.grey-border { + border: 1px solid #B3C0C7; +} + +.dotted-blue-border { + background-image:url(../img/border-dotted-blue.gif); + background-position:left bottom; + background-repeat:repeat-x; +} + Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-29 00:52:01 UTC (rev 9176) @@ -21,20 +21,36 @@ .admin-ui table { border: 0; + border-collapse:collapse; } +.admin-ui table tbody{ + +} + .admin-ui th { text-align: left; - border: 0; - border-bottom: 1px solid; padding-bottom: 2px; padding-top: 2px; font-size: 11px; + /*border-bottom: 1px solid #B3C0C7;*/ + background-color:#fafafa; + /*border-top: 1px solid #B3C0C7;*/ + background-image:url(../img/border-dotted-blue.gif); + background-position:left bottom; + background-repeat:repeat-x; } -.admin-ui td { +/*.admin-ui thead tr th { + text-align: left; padding-bottom: 2px; padding-top: 2px; + font-size: 11px; + background-color: +}*/ + +.admin-ui td { + padding: 4px; } /* Pagination. */ @@ -184,14 +200,14 @@ /* Area header. */ .admin-ui .portlet-area-header { - border: 1px solid #54708c; font-weight: bold; - color: #fff; - font-size: 11px; - background-color: #5986b3; - padding: 2px; - padding-left: 4px; + color: #5986b3; + font-size: 13px; + /*background-color: #5986b3;*/ + background-color: #ebf2f5; + padding: 2px 2px 2px 4px; margin: 0; + border:1px solid #B3C0C7; } .admin-ui .portlet-area-body { @@ -205,21 +221,30 @@ .admin-ui th.portlet-section-title { font-weight: bold; - color: #656565; + color: #31587f; font-size: 11px; - border: 1px solid #999; - background-color: #ebf2f5; - padding-left: 6px; + padding-bottom: 5px; } .admin-ui h3.sectionTitle { font-weight: bold; - color: #656565; + color: #31587f; font-size: 11px; - border-top: 1px solid #999; + padding-bottom: 5px; + background-image:url(../img/border-dotted-blue.gif); + background-position:left bottom; + background-repeat:repeat-x; + background-color:#fafafa; +} + +.sectionTitle-blue { + font-weight: bold; + color: #5986b3; + font-size: 13px; background-color: #ebf2f5; - padding: 2px; - padding-left: 4px; + padding: 2px 2px 2px 4px; + margin: 0; + border:1px solid #B3C0C7; } .admin-ui .portlet-section-header { @@ -248,7 +273,7 @@ .admin-ui .portlet-section-body { color: #656565; - border: 1px solid #d5d5d5; + /*border: 1px solid #d5d5d5;*/ border-top: 0px; } @@ -506,3 +531,9 @@ .admin-ui .objectList img.windowStateIcon { margin: 0 5px 0 0; } + +.property-container, +.portlet-def-table { + width:98%; + margin: 0 auto 0 auto; +} Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-11-29 00:52:01 UTC (rev 9176) @@ -1,10 +1,12 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" +<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + +<div class="property-container"> + <p class="portlet-area-header">Page Error Handling</p> <div class="portlet-area-body"> @@ -146,3 +148,4 @@ </div> </div> +</ui:composition> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-11-29 00:52:01 UTC (rev 9176) @@ -1,16 +1,18 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" +<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + +<div class="property-container"> + <p class="portlet-area-header">Portal Error Handling</p> <div class="portlet-area-body">  -<table cellpadding="0" cellspacing="0" width="100%"> +<table class="full-width"> <tr> <th class="portlet-section-title">Configure how the system handles errors on portal level.</th> </tr> @@ -147,3 +149,4 @@ </div> </div> +</ui:composition> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-11-29 00:52:01 UTC (rev 9176) @@ -1,32 +1,32 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" +<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> -<br/> +<div class="property-container"> + <div class="portlet-area-header">Properties</div> <div class="portlet-area-body">  <table cellpadding="0" cellspacing="0" width="100%"> <tr> -<td> +<td class="align-top">  - <table cellpadding="0" cellspacing="0" width="100%"> + <table class="grey-border full-width"> <tr> <th class="portlet-section-title">Add a property.</th> </tr> <tr> - <td valign="top" class="portlet-section-body"> + <td class="portlet-section-body grey-border"> <h:form>  <table> - <tbody> + <tbody> <f:subview id="predefined-properties" rendered="#{not empty properties.propertyItems}"> <tr> <td class="portlet-form-field-label"> @@ -74,7 +74,7 @@  <c:if test="#{properties.size != 0}"> - <table cellpadding="0" cellspacing="0" width="100%"> + <table class="full-width"> <tr> <th class="portlet-section-title">Manage currently defined properties.</th> </tr> @@ -83,7 +83,7 @@ <h:form>  - <h:dataTable value="#{properties.entries}" width="100%" + <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header" rowClasses="portlet-section-body, portlet-section-alternate" var="prop"> <h:column> <f:facet name="header">Name</f:facet> @@ -151,3 +151,4 @@ </div> </div> +</ui:composition> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-11-29 00:52:01 UTC (rev 9176) @@ -1,53 +1,56 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core" + template="dashboardsTemplate.xhtml"> - <ui:composition template="dashboardsTemplate.xhtml"> - <ui:define name="content"> + <ui:define name="content"> -  - <ui:include src="common/editProperties.xhtml"> - <ui:param name="properties" value="#{dashboardmgr.selectedProperties}"/> - </ui:include> +  + <ui:include src="common/editProperties.xhtml"> + <ui:param name="properties" value="#{dashboardmgr.selectedProperties}"/> + </ui:include> -  - <br/> - <ui:include src="common/editPortalErrorHandling.xhtml"> - <ui:param name="properties" value="#{dashboardmgr.controlProperties}"/> - </ui:include> +  + <br/> + <ui:include src="common/editPortalErrorHandling.xhtml"> + <ui:param name="properties" value="#{dashboardmgr.controlProperties}"/> + </ui:include> -  - <br/> - <ui:include src="common/editPageErrorHandling.xhtml"> - <ui:param name="properties" value="#{dashboardmgr.controlProperties}"/> - </ui:include> +  + <br/> + <ui:include src="common/editPageErrorHandling.xhtml"> + <ui:param name="properties" value="#{dashboardmgr.controlProperties}"/> + </ui:include> -  - <br/> +  + <br/> + <div class="property-container"> <p class="portlet-area-header">Dashboard theme properties</p> - <table cellpadding="0" cellspacing="0" width="100%" class="portlet-area-body"> - <tr> - <th class="portlet-section-title">Configure dashboards settings.</th> - </tr> - <tr> - <td valign="top" class="portlet-section-body"> - <ui:decorate template="common/editTheme.xhtml"> - <ui:param name="theme" value="#{dashboardmgr.theme}"/> - <ui:define name="form_submit"> - <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" - styleClass="portlet-form-button portlet-section-buttonrow"/> - </ui:define> - </ui:decorate> - </td> - </tr> - </table> - </ui:define> + <div class="portlet-area-body"> + <table cellpadding="0" cellspacing="0" width="100%"> + <tr> + <th class="portlet-section-title">Configure dashboards settings.</th> + </tr> + <tr> + <td valign="top" class="portlet-section-body"> + <ui:decorate template="common/editTheme.xhtml"> + <ui:param name="theme" value="#{dashboardmgr.theme}"/> + <ui:define name="form_submit"> + <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + </ui:define> + </ui:decorate> + </td> + </tr> + </table> + </div> + </div> + </ui:define> - </ui:composition> -</div> +</ui:composition> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-29 00:52:01 UTC (rev 9176) @@ -8,11 +8,10 @@ <ui:param name="portalObjectScreen" value="Display Names"/> <ui:define name="content"> - <h3 class="zero pad10 clear">Add Display Name</h3> - + <br/><br/> <div class="float-left third-width-pad5"> <h:form id="displayNameForm"> - <p class="portlet-area-header">Add Display Names</p> + <h3 class="sectionTitle zero">Add Display Names</h3> <div class="portlet-area-body"> <h:inputText id="newName" value="#{addDisplayNameAction.newText}" required="true"/> @@ -27,7 +26,7 @@ <div class="float-left two-third-width-pad5"> <h:form> - <p class="portlet-area-header">Current Display Names</p> + <h3 class="sectionTitle zero">Current Display Names</h3> <div class="portlet-area-body"> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-11-29 00:52:01 UTC (rev 9176) @@ -8,8 +8,8 @@ <ui:composition template="objectTemplate.xhtml"> <ui:define name="content"> - - <h3 class="sectionTitle"> + <div class="property-container "> + <h3 class="sectionTitle tenpx-top-bottom"> Manage   <c:choose> <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">portals</c:when> @@ -33,20 +33,20 @@ </c:choose> </h3>  - <h:form styleClass="createObjectForm"> + <div class="tenpx-top-bottom"> + <h:form> <span class="portlet-font">Create a portal named: </span> <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/> <h:commandButton action="#{portalAction.addPortal}" value="Create portal" styleClass="portlet-form-button"/> <h:message for="name" errorClass="portlet-msg-error"/> </h:form> + </div> + -  - <hr/> -  <ui:include src="objectNavigation.xhtml"/> - + </div> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-11-29 00:52:01 UTC (rev 9176) @@ -8,8 +8,8 @@ <ui:composition template="objectTemplate.xhtml"> <ui:define name="content"> - - <h3 class="sectionTitle">Manage <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + <div class="property-container"> + <h3 class="sectionTitle tenpx-top-bottom">Manage <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> @@ -52,20 +52,19 @@ <h3 class="sectionTitle">Manage sub-pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3>  - <h:form styleClass="createObjectForm"> + <div class="tenpx-top-bottom"> + <h:form> <span class="portlet-font">Create a page named: </span> <h:inputText id="pageName" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/> <h:commandButton action="#{addPageAction.execute}" value="Create page" styleClass="portlet-form-button"/> <h:message for="pageName" errorClass="portlet-msg-error"/> </h:form> + </div> -  - <hr/> -  <ui:include src="objectNavigation.xhtml"/> - + </div> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-11-29 00:52:01 UTC (rev 9176) @@ -10,10 +10,11 @@ <ui:param name="portalObjectScreen" value="Properties"/> <ui:define name="content"> - + <br/> + <div class="property-container tenpx-top-bottom"> <p class="portlet-area-header">Event Listener Binding</p> - <div class="portlet-area-body"> + <div class="portlet-area-body tenpx-top-bottom"> <h:form> <h:outputLabel for="listener" styleClass="portlet-form-field-label"> Choose the id of the PortalEventListener to bind to this #{portalobjectmgr.selectedObjectType}: @@ -24,7 +25,7 @@ <h:commandButton value="Update" styleClass="portlet-form-button"/> </h:form> </div> - + </div> <ui:include src="common/editProperties.xhtml"> <ui:param name="properties" value="#{portalobjectmgr.selectedProperties}"/> </ui:include> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-11-29 00:52:01 UTC (rev 9176) @@ -12,7 +12,7 @@ <c:if test="#{empty instancemgr.selectedPlugin}"> <h:form> - <table id="instancesTable2" width="100%"> + <table id="instancesTable2" width="100%" class="portlet-def-table"> <thead class="portlet-section-header"> <tr> <th>Id</th> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-29 00:52:01 UTC (rev 9176) @@ -1,11 +1,11 @@ <div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:fn="http://java.sun.com/jsp/jstl/functions" - xmlns:pfc="http://www.jboss.com/portal/facelet/common" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:fn="http://java.sun.com/jsp/jstl/functions" + xmlns:pfc="http://www.jboss.com/portal/facelet/common" + xmlns:c="http://java.sun.com/jstl/core"> <h:form> @@ -40,21 +40,23 @@ Theme </h:commandLink> <h:panelGroup - rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}"> - | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> + rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}"> + | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}" + styleClass="actionRename"> <h:outputText value="Rename"/> <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:panelGroup> <h:panelGroup - rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}"> - | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> + rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}"> + | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" + actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> <h:outputText value="Display Names"/> <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:panelGroup> | <h:commandLink action="confirm" styleClass="actionDelete" - actionListener="#{portalobjectmgr.selectObject}"> + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> Delete </h:commandLink> @@ -112,7 +114,7 @@ <f:param name="id" value="#{object.id}"/> Display Names </h:commandLink> |<h:commandLink action="confirm" styleClass="actionDelete" - actionListener="#{portalobjectmgr.selectObject}"> + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> Delete </h:commandLink> @@ -144,31 +146,31 @@ </f:facet> <h:graphicImage - title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? 'This window is set to a minimized state.' : 'This window defaults to a normal state.'}" - rendered="#{!maximizedStateExists}" - value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }" - styleClass="windowStateIcon" - alt=""/> + title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? 'This window is set to a minimized state.' : 'This window defaults to a normal state.'}" + rendered="#{!maximizedStateExists}" + value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }" + styleClass="windowStateIcon" + alt=""/> <h:graphicImage - title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? 'This window is set to a maximized state.' : 'This window defaults to a minimized state because one window within this page is set to maximized.'}" - rendered="#{maximizedStateExists}" - value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}" - styleClass="windowStateIcon" - alt=""/> + title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? 'This window is set to a maximized state.' : 'This window defaults to a minimized state because one window within this page is set to maximized.'}" + rendered="#{maximizedStateExists}" + value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}" + styleClass="windowStateIcon" + alt=""/> - -  - <h:outputText value="#{object.name}" - rendered="#{fn:startsWith(object.declaredProperties['portal.windowContentType'], 'widget/')}" /> - <h:commandLink action="#{portalobjectmgr.selectObject}" - rendered="#{! fn:startsWith(object.declaredProperties['portal.windowContentType'], 'widget/')}"> - <h:outputText value="#{object.name}" /> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> +  + <h:outputText value="#{object.name}" + rendered="#{fn:startsWith(object.declaredProperties['portal.windowContentType'], 'widget/')}"/> + <h:commandLink action="#{portalobjectmgr.selectObject}" + rendered="#{! fn:startsWith(object.declaredProperties['portal.windowContentType'], 'widget/')}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </h:column> <h:column> <f:facet name="header"> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-11-29 00:52:01 UTC (rev 9176) @@ -13,6 +13,7 @@ <ui:define name="content"> <c:if test="#{empty portletmgr.selectedPlugin}"> + <div class="provider-menu-container"> <h:form> <h:outputLabel for="menu"> <h:outputText value="View portlets provided by the portlet provider named: " @@ -24,10 +25,10 @@ </h:selectOneMenu> <h:commandButton value="View portlets" styleClass="portlet-form-button"/> </h:form> - + </div> <h:form> - <table width="100%"> + <table class="portlet-def-table"> <thead class="portlet-section-header"> <tr> <th>Name</th> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -14,7 +14,7 @@ <div class="admin-ui"> <div class=" cms-tab-container"> <table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_COPYCONFIRM")}</h3></th> + <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("TITLE_COPYCONFIRM")}</h3></th> <tr> <td class="portlet-section-body" align="left"> <form name="pickform" action="<portlet:actionURL> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -12,7 +12,7 @@ <div class="admin-ui"> <div class=" cms-tab-container"> <table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_CREATECOLLCONFIRM")}</h3></th> + <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("TITLE_CREATECOLLCONFIRM")}</h3></th> <tr> <td valign="top" width="250" class="portlet-section-alternate"> <%@ include file="folderlist.jsp" %> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -19,7 +19,7 @@ <portlet:param name="path" value="<%= sCurrPath %>"/> </portlet:actionURL>" method="post"> <table width="100%"> - <th><h3 class="sectionTitle">${n:i18n("TITLE_DELETECONFIRM")}</h3></th> + <th><h3 class="sectionTitle-blue">${n:i18n("TITLE_DELETECONFIRM")}</h3></th> <tr> <td align="center"> <font class="portlet-font">${n:i18n("CMS_DELETEPATH")} <%= sCurrPath %> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -14,7 +14,7 @@ <div class="admin-ui"> <div class=" cms-tab-container"> <table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_MOVECONFIRM")}</h3></th> + <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("TITLE_MOVECONFIRM")}</h3></th> <tr> <td valign="top" width="250" class="portlet-section-alternate"> <%@ include file="folderlist.jsp" %> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -99,7 +99,7 @@ <input type="hidden" name="savetopath" value="<%= sCurrPath %>"> <table width="100%"> -<th><h3 class="sectionTitle">${n:i18n("TITLE_CREATE")}</h3></th> +<th><h3 class="sectionTitle-blue">${n:i18n("TITLE_CREATE")}</h3></th> <tr> <td height="10"></td> </tr> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -66,7 +66,7 @@ </portlet:actionURL>"> <table width="100%"> -<th><h3 class="sectionTitle">${n:i18n("TITLE_EDIT")}</h3></th> +<th><h3 class="sectionTitle-blue">${n:i18n("TITLE_EDIT")}</h3></th> <tr> <td height="10"></td> </tr> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -19,7 +19,7 @@ <input type="hidden" name="destination" value="<%= sCurrPath %>"> <input type="hidden" name="language" value="<%= sLanguage %>"> <table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_UPLOAD")}</h3></th> + <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("TITLE_UPLOAD")}</h3></th> <tr> <td align="left"> <table> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -18,7 +18,7 @@ </portlet:actionURL>"> <input type="hidden" name="destination" value="<%= sCurrPath %>"> <table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th> + <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th> <tr> <td valign="top" width="250" class="portlet-section-alternate"> <%@ include file="folderlist.jsp" %> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -13,7 +13,7 @@ %> <table width="100%"> - <th><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th> + <th><h3 class="sectionTitle-blue">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th> <tr> <td align="left"> <table width="100%"> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -13,7 +13,7 @@ %> <table width="100%"> - <th><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th> + <th><h3 class="sectionTitle-blue">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th> <tr> <td align="left"> <table width="100%"> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -24,7 +24,7 @@ <div class="admin-ui"> <div class=" cms-tab-container"> -<h3 class="sectionTitle"> +<h3 class="sectionTitle-blue"> ${n:i18n("CMS_MANAGE")} </h3> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -21,7 +21,7 @@ %> -<h3 class="sectionTitle"> +<h3 class="sectionTitle-blue"> ${n:i18n("CMS_MAIN_USE")} </h3> @@ -73,7 +73,7 @@ { %> <table width="100%"> - <th colspan="2"><h3 class="sectionTitle">Error:</h3></th> + <th colspan="2"><h3 class="sectionTitle-blue">Error:</h3></th> <tr colspan="2" align="center"> <td colspan="2"> <font color="red"> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -14,7 +14,7 @@ <div class="admin-ui"> <div class=" cms-tab-container"> -<h3 class="sectionTitle"> +<h3 class="sectionTitle-blue"> ${n:i18n("CMS_MANAGE")} </h3>  Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -33,7 +33,7 @@ <portlet:param name="returnOp" value="<%= returnOp %>"/> </portlet:actionURL>" method="post"> <table width="100%"> -<th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_SECURECONFIRM")}</h3></th> +<th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("TITLE_SECURECONFIRM")}</h3></th> <% if (sConfirm != null && !"".equals(sConfirm)) { Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -18,7 +18,7 @@ </portlet:actionURL>"> <input type="hidden" name="destination" value="<%= sCurrPath %>"> <table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_UPLOAD")}</h3></th> + <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("TITLE_UPLOAD")}</h3></th> <tr> <td valign="top" width="250" class="portlet-section-alternate"> <%@ include file="folderlist.jsp" %> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -19,7 +19,7 @@ </portlet:actionURL>"> <input type="hidden" name="destination" value="<%= sCurrPath %>"> <table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("CMS_UPLOADARCHIVE")}</h3></th> + <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_UPLOADARCHIVE")}</h3></th> <tr> <td valign="top" width="250" class="portlet-section-alternate"> <%@ include file="folderlist.jsp" %> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-11-28 17:38:43 UTC (rev 9175) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-11-29 00:52:01 UTC (rev 9176) @@ -45,7 +45,7 @@ Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible"); %> -<h3 class="sectionTitle"> +<h3 class="sectionTitle-blue"> ${n:i18n("CMS_MANAGE")} </h3> @@ -335,7 +335,7 @@ { %> <table width="100%"> - <th colspan="2"><h3 class="sectionTitle">Error:</h3></th> + <th colspan="2"><h3 class="sectionTitle-blue">Error:</h3></th> <tr colspan="2" align="center"> <td colspan="2"> <font color="red">

16 years, 6 months

1
0
0 / 0

JBoss Portal SVN: r9175 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: resources/portal-admin-war/WEB-INF/jsf/common and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-28 12:38:43 -0500 (Wed, 28 Nov 2007) New Revision: 9175 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml Log: Unify day is everyday Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-28 17:22:08 UTC (rev 9174) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-28 17:38:43 UTC (rev 9175) @@ -195,7 +195,6 @@ } .admin-ui .portlet-area-body { - border: 1px solid #d5d5d5; border-top: 0px; background-color: #fff; padding: 4px; Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-11-28 17:22:08 UTC (rev 9174) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-11-28 17:38:43 UTC (rev 9175) @@ -3,8 +3,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core" - style="padding:5px"> + xmlns:c="http://java.sun.com/jstl/core"> <br/>

16 years, 6 months

1
0
0 / 0

JBoss Portal SVN: r9174 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.

by portal-commits＠lists.jboss.org

Author: emuckenhuber Date: 2007-11-28 12:22:08 -0500 (Wed, 28 Nov 2007) New Revision: 9174 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml Log: missing icons (styleClass) for Rename and Display Names Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-11-28 17:00:56 UTC (rev 9173) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-11-28 17:22:08 UTC (rev 9174) @@ -39,8 +39,8 @@ </h:commandLink> | </h:panelGroup> <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink - action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionDisplayName"> - <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}" /> Display Names </h:commandLink> | </h:panelGroup><h:commandLink action="confirm" styleClass="actionDelete" actionListener="#{portalobjectmgr.selectObject}"> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-28 17:00:56 UTC (rev 9173) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-28 17:22:08 UTC (rev 9174) @@ -41,14 +41,14 @@ </h:commandLink> <h:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}"> - | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> + | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> <h:outputText value="Rename"/> <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:panelGroup> <h:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}"> - | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}"> + | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> <h:outputText value="Display Names"/> <f:param name="id" value="#{object.id}"/> </h:commandLink>

16 years, 6 months

1
0
0 / 0

JBoss Portal SVN: r9173 - branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-11-28 12:00:56 -0500 (Wed, 28 Nov 2007) New Revision: 9173 Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIContextImpl.java Log: make the map of loaded objects on the ui context private and final Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIContextImpl.java =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIContextImpl.java 2007-11-28 16:57:14 UTC (rev 9172) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIContextImpl.java 2007-11-28 17:00:56 UTC (rev 9173) @@ -44,7 +44,7 @@ { /** . */ - Map<String, UIObject> objects = new HashMap<String, UIObject>(); + private final Map<String, UIObject> objects = new HashMap<String, UIObject>(); /** . */ protected final StructuralStateContext structuralStateContext; @@ -82,7 +82,7 @@ } /** - * + * */ public UIObject getObject(String id) {

16 years, 6 months

1
0
0 / 0

JBoss Portal SVN: r9172 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2007-11-28 11:57:14 -0500 (Wed, 28 Nov 2007) New Revision: 9172 Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp Log: refactor admin css location Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -10,7 +10,7 @@ String sBackPath = NodeUtil.getParentPath(sCurrPath); %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> <table width="100%"> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -8,7 +8,7 @@ String OP = CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION; %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> <table width="100%"> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -6,7 +6,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> <% Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -10,7 +10,7 @@ String sBackPath = NodeUtil.getParentPath(sCurrPath); %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> <table width="100%"> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -7,7 +7,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <% String sCurrPath = (String)request.getAttribute("currpath"); String[] langs = Locale.getISOLanguages(); Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -6,7 +6,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> <% Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -5,7 +5,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> <% Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -5,7 +5,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <% String sCurrPath = (String)request.getAttribute("currpath"); String OP = CMSAdminConstants.OP_EXPORTARCHIVE; Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -5,7 +5,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> <% Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -5,7 +5,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> <% Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -12,7 +12,7 @@ <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <% String sCurrPath = (String)request.getAttribute("currpath"); List folders = (List)request.getAttribute("folders"); Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -9,7 +9,7 @@ <%@ page import="java.util.StringTokenizer" %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> <% Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -10,7 +10,7 @@ <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -10,7 +10,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <% String sCurrPath = (String)request.getAttribute("currpath"); Set roleSet = (Set)request.getAttribute("roles"); Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -5,7 +5,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <% String sCurrPath = (String)request.getAttribute("currpath"); String OP = CMSAdminConstants.OP_UPLOADCONFIRM; Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -5,7 +5,7 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> <% Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-11-28 16:45:37 UTC (rev 9171) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-11-28 16:57:14 UTC (rev 9172) @@ -15,7 +15,7 @@ <%@ page import="java.util.Vector" %> <portlet:defineObjects/> -<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container">

16 years, 6 months

1
0
0 / 0

JBoss Portal SVN: r9171 - in branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf: common and 1 other directory.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2007-11-28 11:45:37 -0500 (Wed, 28 Nov 2007) New Revision: 9171 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml Log: JBPORTAL-1805 Let a user define multiple display-name for a portal object in the admin portlet Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-11-28 16:35:27 UTC (rev 9170) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-11-28 16:45:37 UTC (rev 9171) @@ -5,6 +5,7 @@ <div class="tab-container"> <ui:insert name="tab-container-content"/> + <br class="clear"/> </div> </ui:composition> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-28 16:35:27 UTC (rev 9170) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-28 16:45:37 UTC (rev 9171) @@ -1,62 +1,79 @@ <div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Rename"/> - + <ui:param name="portalObjectScreen" value="Display Names"/> + <ui:define name="content"> <h3 class="zero pad10 clear">Add Display Name</h3> + <div class="float-left third-width-pad5"> <h:form id="displayNameForm"> - <p class="portlet-area-header">Add Display Names</p> - <div class="portlet-area-body"> - <h:inputText id="newName" value="#{addDisplayNameAction.newText}" required="true"/> - <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}"> - <f:selectItems value="#{addDisplayNameAction.locales}"/> - </h:selectOneMenu> - <h:commandButton value="Add Name" action="#{addDisplayNameAction.addDisplayName}" styleClass="portlet-form-button"/> - </div> + <p class="portlet-area-header">Add Display Names</p> + + <div class="portlet-area-body"> + <h:inputText id="newName" value="#{addDisplayNameAction.newText}" required="true"/> + <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{addDisplayNameAction.locales}"/> + </h:selectOneMenu> + <h:commandButton value="#{addDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" action="#{addDisplayNameAction.addDisplayName}" + styleClass="portlet-form-button"/> + </div> </h:form> </div> <div class="float-left two-third-width-pad5"> <h:form> - <p class="portlet-area-header">Current Display Names</p> - <div class="portlet-area-body"> + <p class="portlet-area-header">Current Display Names</p> - <table class="full-width"> - <tr> - <th>Locale</th> - <th>Display Name</th> - <th>Delete</th> - <th>Rename</th> - </tr> + <div class="portlet-area-body"> - <c:forEach items="#{addDisplayNameAction.currentLocales}" var="value"> - <tr> + <h:dataTable var="value" value="#{addDisplayNameAction.currentLocales}" styleClass="objectList" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + <h:outputText value="Locale"/> + </f:facet> + #{value.localeDisplayName} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Display Name"/> + </f:facet> + #{value.text} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Delete"/> + </f:facet> - <td>#{value.localeDisplayName}</td> - <td>#{value.text}</td> - <td> - <h:commandLink action="#{addDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionDelete" value="Delete"/> - <f:param name="locale" value="#{value.locale}"/> - <f:param name="editAction" value="delete"/> - </h:commandLink> - </td> - <td><h:commandLink action="#{addDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionRename" value="Rename"/> - <f:param name="locale" value="#{value.locale}"/> - <f:param name="editAction" value="rename"/> - </h:commandLink></td> - </tr> - </c:forEach> - </table> - </div> + <div style="width:150px"><h:commandLink action="#{addDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionDelete" value="Delete"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="delete"/> + </h:commandLink></div> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Rename"/> + </f:facet> + + <div style="width:150px"><h:commandLink action="#{addDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionRename" value="Rename"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="rename"/> + </h:commandLink></div> + </h:column> + </h:dataTable> + + </div> </h:form> + </div>

16 years, 6 months

1
0
0 / 0

JBoss Portal SVN: r9170 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2007-11-28 11:35:27 -0500 (Wed, 28 Nov 2007) New Revision: 9170 Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp Log: [JBPORTAL-1721] - Improve error handling when the CMS content cannot be found by the content selector Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2007-11-28 16:05:30 UTC (rev 9169) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2007-11-28 16:35:27 UTC (rev 9170) @@ -122,19 +122,25 @@ { Content content = (Content)renderRequest.getAttribute("content"); %> -<p class="portlet-font"> - Selected file: <%= uri %><br/> - <% - if (content.getTitle() != null) - { - out.println("File title: " + content.getTitle() + "<br />"); - } - if (content.getDescription() != null) - { - out.println("File description: " + content.getDescription() + "<br />"); - } - %> -</p> + <%if(content != null){%> + <p class="portlet-font"> + Selected file: <%= uri %><br/> + <% + if (content.getTitle() != null) + { + out.println("File title: " + content.getTitle() + "<br />"); + } + if (content.getDescription() != null) + { + out.println("File description: " + content.getDescription() + "<br />"); + } + %> + </p> + <%}else{%> + <p class="portlet-font"> + Content could not be found for the selected file + </p> + <%}%> <% } }

16 years, 6 months

1
0
0 / 0

JBoss Portal SVN: r9169 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: main/org/jboss/portal/core/admin/ui/actions and 1 other directories.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2007-11-28 11:05:30 -0500 (Wed, 28 Nov 2007) New Revision: 9169 Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml Log: JBPORTAL-1805 Let a user define multiple display-name for a portal object in the admin portlet Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css 2007-11-28 16:05:30 UTC (rev 9169) @@ -0,0 +1,79 @@ +.zero { + margin:0; + padding:0; +} + +.align-center { + text-align: center; +} + +.align-center-margin { + margin: 0 auto 0 auto; +} + +.float-left { + float: left; +} + +.float-right { + float: right; +} + +.align-left { + text-align: left; +} + +.align-right { + text-align: right; +} + +.half-width { + width: 49%; +} + +.quarter-width { + width: 24.9%; +} + +.three-quarter-width { + width: 74.9%; +} + +.full-width { + width: 100%; +} + +.third-width { + width: 32.9%; +} + +.two-third-width { + width: 65.9%; +} + +.third-width-pad5 { + width: 32.5%; + padding: 5px; +} + +.two-third-width-pad5 { + width: 65.5%; + padding: 5px; +} + +.tenpx-top-bottom { + margin: 10px 0 10px 0; +} + +.clear { + clear: both; +} + +.pad5 { + padding: 5px; +} + +.pad10 { + padding: 10px +} + Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-28 15:41:20 UTC (rev 9168) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-28 16:05:30 UTC (rev 9169) @@ -1,5 +1,7 @@ /* Redefine spacing for tables. */ +@import url(basestyles.css); + a { color: #446688; text-decoration: none; Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2007-11-28 15:41:20 UTC (rev 9168) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2007-11-28 16:05:30 UTC (rev 9169) @@ -157,9 +157,10 @@ return null; } - public void removeDisplayName() + public void editDisplayName() { - String locale = (String)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("locale"); + String locale = getFacesParam("locale"); + String editAction = getFacesParam("editAction"); PortalObject portalObject = getSelectedObject(); LocalizedString displayName = portalObject.getDisplayName(); @@ -168,17 +169,37 @@ { Map<Locale, LocalizedString.Value> oldMap = displayName.getValues(); Collection<LocalizedString.Value> values = oldMap.values(); - for (LocalizedString.Value value : values) + if (editAction.equals("delete")) { - if (!value.getLocale().toString().equals(locale.toString())) + for (LocalizedString.Value value : values) { + if (!value.getLocale().toString().equals(locale.toString())) + { + map.put(value.getLocale(), value.getString()); + } + } + } + if (editAction.equals("rename")) + { + for (LocalizedString.Value value : values) + { map.put(value.getLocale(), value.getString()); + if (value.getLocale().toString().equals(locale.toString())) + { + newText = value.getString(); + newLocale = value.getLocale().getLanguage(); + } } } } LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH); selectedObject.setDisplayName(newLocalizedString); } + + + public String getFacesParam(String param){ + return (String)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(param); + } /* public void setCurrentLocales(Map currentLocales) @@ -200,6 +221,8 @@ return "editDisplayNames"; } + + private String convertLocaleDisplayName(String str) { if (str.length() > 0) Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-28 15:41:20 UTC (rev 9168) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-28 16:05:30 UTC (rev 9169) @@ -6,26 +6,11 @@ xmlns:c="http://java.sun.com/jstl/core"> <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Rename"/> + <ui:define name="content"> - <h3>Add Display Name</h3> - - <h:form> - - <p class="portlet-area-header">Current Display Names</p> - <div class="portlet-area-body"> - <ul> - <c:forEach items="#{addDisplayNameAction.currentLocales}" var="value"> -  - <li>#{value.localeDisplayName} - #{value.text} <h:commandLink action="#{addDisplayNameAction.removeDisplayName}"> - <h:outputText styleClass="actionDelete" value="Delete"/> - <f:param name="locale" value="#{value.locale}"/> - </h:commandLink></li> - </c:forEach> - </ul> - </div> - </h:form> - <h:form id="displayNameForm"> + <h3 class="zero pad10 clear">Add Display Name</h3> + <div class="float-left third-width-pad5"> + <h:form id="displayNameForm"> <p class="portlet-area-header">Add Display Names</p> <div class="portlet-area-body"> <h:inputText id="newName" value="#{addDisplayNameAction.newText}" required="true"/> @@ -34,7 +19,49 @@ </h:selectOneMenu> <h:commandButton value="Add Name" action="#{addDisplayNameAction.addDisplayName}" styleClass="portlet-form-button"/> </div> - </h:form> + </h:form> + </div> + + <div class="float-left two-third-width-pad5"> + <h:form> + <p class="portlet-area-header">Current Display Names</p> + <div class="portlet-area-body"> + + <table class="full-width"> + <tr> + <th>Locale</th> + <th>Display Name</th> + <th>Delete</th> + <th>Rename</th> + </tr> + + <c:forEach items="#{addDisplayNameAction.currentLocales}" var="value"> + <tr> + + <td>#{value.localeDisplayName}</td> + <td>#{value.text}</td> + <td> + <h:commandLink action="#{addDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionDelete" value="Delete"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="delete"/> + </h:commandLink> + </td> + <td><h:commandLink action="#{addDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionRename" value="Rename"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="rename"/> + </h:commandLink></td> + </tr> + </c:forEach> + </table> + </div> + </h:form> + </div> + + + <br class="clear"/> + </ui:define> </ui:composition> </div>

16 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits November 2007