[gatein-commits] gatein SVN: r1691 - in components/wsrp/trunk/admin-gui/src/main: webapp/jsf/consumers and 1 other directories.

Author: chris.laprun(a)jboss.com Date: 2010-02-15 12:34:16 -0500 (Mon, 15 Feb 2010) New Revision: 1691 Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css Log: - Minor display change of consumer status. - Added comments to remove hardcoding of service injection in JSF beans. Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-02-15 17:21:01 UTC (rev 1690) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-02-15 17:34:16 UTC (rev 1691) @@ -478,6 +478,7 @@ public ConsumerRegistry getRegistry() { + // todo: fix this, the registry needs to be injected more cleanly if (registry == null) { registry = (ConsumerRegistry)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(ConsumerRegistry.class); Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java 2010-02-15 17:21:01 UTC (rev 1690) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java 2010-02-15 17:34:16 UTC (rev 1691) @@ -63,6 +63,7 @@ public ConsumerRegistry getRegistry() { + // todo: fix this, the registry needs to be injected more cleanly if (registry == null) { registry = (ConsumerRegistry)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(ConsumerRegistry.class); Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java 2010-02-15 17:21:01 UTC (rev 1690) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ProducerBean.java 2010-02-15 17:34:16 UTC (rev 1691) @@ -57,6 +57,7 @@ public ProducerConfigurationService getConfigurationService() { + // todo: fix this, the configuration service needs to be injected more cleanly if (configurationService == null) { configurationService = (ProducerConfigurationService)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(ProducerConfigurationService.class); Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-15 17:21:01 UTC (rev 1690) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-15 17:34:16 UTC (rev 1691) @@ -110,14 +110,16 @@ </div> </f:subview> <c:if test="#{empty showAddConsumer}"> - <span - class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} float-left"> - <h:outputFormat value="#{i18n.path_consumers_consumer}"> - <f:param value="#{consumer.id}"/> - </h:outputFormat> - (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}) - #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''} - </span> + <strong> + <h:outputFormat value="#{i18n.path_consumers_consumer}"> + <f:param value="#{consumer.id}"/> + </h:outputFormat> + </strong> + <span + class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} swatch"> + #{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive} + #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''} + </span> </c:if> </div> </webui:blueHeaderBar> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2010-02-15 17:21:01 UTC (rev 1690) +++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2010-02-15 17:34:16 UTC (rev 1691) @@ -213,6 +213,16 @@ vertical-align: top; } +.wsrp-consumers-ui .swatch { + border: 1px solid #aaa; + border-right-color: #555; + border-bottom-color: #555; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + margin: 1px; + padding: 2px 4px; +} + .wsrp-consumers-ui .active { background-color: #C7DDB7; font-weight: bold;