Author: julien(a)jboss.com Date: 2007-02-19 10:20:35 -0500 (Mon, 19 Feb 2007) New Revision: 6337 Modified: trunk/core-admin/src/bin/portal-admin-war/images/management/management.css trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml Log: - moved some html attributes in management.css - corrected the portlet manager to show portlet state description Modified: trunk/core-admin/src/bin/portal-admin-war/images/management/management.css =================================================================== --- trunk/core-admin/src/bin/portal-admin-war/images/management/management.css 2007-02-19 14:31:50 UTC (rev 6336) +++ trunk/core-admin/src/bin/portal-admin-war/images/management/management.css 2007-02-19 15:20:35 UTC (rev 6337) @@ -28,4 +28,8 @@ border-width: 1px; padding: 4px; margin: 2px; +} + +img.scroller { + border:thin solid black; } \ No newline at end of file Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java 2007-02-19 14:31:50 UTC (rev 6336) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java 2007-02-19 15:20:35 UTC (rev 6337) @@ -312,7 +312,7 @@ // PreferenceInfo prefs = prefsInfo.getPreference(key); - Value value = new StringValue(); + Value value = new StringValue("not available"); Boolean readOnly = prefs.isReadOnly(); // Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml 2007-02-19 14:31:50 UTC (rev 6336) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml 2007-02-19 15:20:35 UTC (rev 6337) @@ -4,7 +4,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:t="http://myfaces.apache.org/tomahawk"> -<br/> <h:panelGroup id="panel2" rendered="#{preferences != null}"> @@ -41,7 +40,6 @@ action="#{action.selectRow}"> <h:graphicImage value="/images/management/edit.png" - border="0" alt="Edit" style="vertical-align:middle;"/> </h:commandLink> @@ -50,7 +48,6 @@ action="#{action.deleteCell}"> <h:graphicImage value="/images/management/delete.png" - border="0" alt="Delete" style="vertical-align:middle;"/> </h:commandLink> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-19 14:31:50 UTC (rev 6336) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-19 15:20:35 UTC (rev 6337) @@ -8,7 +8,7 @@ <br/><br/> <h:panelGrid id="federateddropdown"> - <h:form name="menu"> + <h:form> <h:selectOneMenu id="menu" value="#{portletmgr.selectedFederatedId}"> @@ -24,7 +24,7 @@ columnClasses="menu,,content"> <h:panelGroup id="panel1"> -<h:form name="portlets"> +<h:form> <t:dataTable id="portletsTable" var="portlet" @@ -37,12 +37,14 @@ <f:facet name="header"> <t:commandSortHeader columnName="id"> <f:facet name="ascending"> - <t:graphicImage value="/images/management/up.png" - rendered="true" border="0"/> + <t:graphicImage + value="/images/management/up.png" + rendered="true"/> </f:facet> <f:facet name="descending"> - <t:graphicImage value="/images/management/down.png" - rendered="true" border="0"/> + <t:graphicImage + value="/images/management/down.png" + rendered="true"/> </f:facet> <h:outputText value="Id"/> </t:commandSortHeader> @@ -59,12 +61,14 @@ <f:facet name="header"> <t:commandSortHeader columnName="name"> <f:facet name="ascending"> - <t:graphicImage value="/images/management/up.png" - rendered="true" border="0"/> + <t:graphicImage + value="/images/management/up.png" + rendered="true"/> </f:facet> <f:facet name="descending"> - <t:graphicImage value="/images/management/down.png" - rendered="true" border="0"/> + <t:graphicImage + value="/images/management/down.png" + rendered="true"/> </f:facet> <h:outputText value="Name"/> </t:commandSortHeader> @@ -87,12 +91,14 @@ <f:facet name="header"> <t:commandSortHeader columnName="description"> <f:facet name="ascending"> - <t:graphicImage value="/images/management/up.png" - rendered="true" border="0"/> + <t:graphicImage + value="/images/management/up.png" + rendered="true"/> </f:facet> <f:facet name="descending"> - <t:graphicImage value="/images/management/down.png" - rendered="true" border="0"/> + <t:graphicImage + value="/images/management/down.png" + rendered="true"/> </f:facet> <h:outputText value="Description"/> </t:commandSortHeader> @@ -106,22 +112,22 @@ paginator="true" paginatorMaxPages="9" paginatorActiveColumnStyle="font-weight:bold;"> <f:facet name="first"> - <t:graphicImage url="/images/management/first.png" border="1"/> + <t:graphicImage styleClass="scroller" url="/images/management/first.png"/> </f:facet> <f:facet name="last"> - <t:graphicImage url="/images/management/last.png" border="1"/> + <t:graphicImage styleClass="scroller" url="/images/management/last.png"/> </f:facet> <f:facet name="previous"> - <t:graphicImage url="/images/management/left.png" border="1"/> + <t:graphicImage styleClass="scroller" url="/images/management/left.png"/> </f:facet> <f:facet name="next"> - <t:graphicImage url="/images/management/right.png" border="1"/> + <t:graphicImage styleClass="scroller" url="/images/management/right.png"/> </f:facet> <f:facet name="fastforward"> - <t:graphicImage url="/images/management/fast-forward.png" border="1"/> + <t:graphicImage styleClass="scroller" url="/images/management/fast-forward.png"/> </f:facet> <f:facet name="fastrewind"> - <t:graphicImage url="/images/management/fast-rewind.png" border="1"/> + <t:graphicImage styleClass="scroller" url="/images/management/fast-rewind.png"/> </f:facet> </t:dataScroller> </h:form> @@ -132,11 +138,11 @@ <h:panelGroup id="pg2"> <div align="center"> <h:form id="plugin_nav"> - <h:panelGrid id="pg3" columns="5" border="0" cellspacing="0" cellpadding="0" rowClasses="vertTop"> + <h:panelGrid id="pg3" columns="3" border="0" cellspacing="0" cellpadding="0" rowClasses="vertTop"> <h:commandLink action="#{portletmgr.selectPlugin}" style="#{portletmgr.selectedPlugin == 'manager' ? 'font-weight:bold' : ''}"> - <h:graphicImage value="/images/management/manage.png" style="vertical-align:middle;border-width:0"/> + <h:graphicImage value="/images/management/manage.png" style="vertical-align:middle;border-width:1"/> <h:outputText>&#160;</h:outputText> <h:outputText value="Manager"/> <f:param name="plugin" value="manager"/> @@ -144,17 +150,8 @@ <h:outputText>&#160;&#160;&#160;</h:outputText> <h:commandLink action="#{portletmgr.selectPlugin}" - style="#{portletmgr.selectedPlugin == 'security' ? 'font-weight:bold' : ''}"> - <h:graphicImage value="/images/management/security.png" style="vertical-align:middle;border-width:0"/> - <h:outputText>&#160;</h:outputText> - <h:outputText value="Security"/> - <f:param name="plugin" value="security"/> - </h:commandLink> - <h:outputText>&#160;&#160;&#160;</h:outputText> - <h:commandLink - action="#{portletmgr.selectPlugin}" style="#{portletmgr.selectedPlugin == 'preferences' ? 'font-weight:bold' : ''}"> - <h:graphicImage value="/images/management/preferences.png" style="vertical-align:middle;border-width:0"/> + <h:graphicImage value="/images/management/preferences.png" style="vertical-align:middle"/> <h:outputText>&#160;</h:outputText> <h:outputText value="Preferences"/> <f:param name="plugin" value="preferences"/> @@ -165,20 +162,12 @@ <h:panelGroup id="pg4" rendered="#{portletmgr.selectedPortlet != null}"> - <!-- - <h:panelGroup - rendered="#{portletmgr.selectedPlugin == 'security'}"> - <ui:include src="/WEB-INF/jsp/management/plugins/security.xhtml"> - <ui:param name="auth" value="#{portletmgr.auth}"/> - </ui:include> - </h:panelGroup> - --> <h:panelGroup rendered="#{portletmgr.selectedPlugin == 'manager'}"> <ui:include src="/WEB-INF/jsp/management/plugins/portlet/manager.xhtml"/> </h:panelGroup> <h:panelGroup - rendered="#{instancemgr.selectedPlugin == 'preferences'}"> + rendered="#{portletmgr.selectedPlugin == 'preferences'}"> <ui:include src="/WEB-INF/jsp/management/plugins/preferences.xhtml"> <ui:param name="preferences" value="#{portletmgr.selectedPreferences}"/> </ui:include>