Changeset 631
- Timestamp:
- 04/03/11 22:44:22 (2 years ago)
- Location:
- raptor-web/trunk/src/main
- Files:
-
- 1 deleted
- 4 edited
-
java/uk/ac/cardiff/raptorweb/model/StartModel.java (modified) (1 diff)
-
webapp/WEB-INF/flows/reports/graphicalReports.xhtml (modified) (1 diff)
-
webapp/WEB-INF/flows/reports/setupRaptorWeb.xhtml (modified) (3 diffs)
-
webapp/WEB-INF/flows/reports/startReport.xhtml (modified) (1 diff)
-
webapp/WEB-INF/flows/test (deleted)
Legend:
- Unmodified
- Added
- Removed
-
raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/model/StartModel.java
r531 r631 22 22 public class StartModel implements Serializable{ 23 23 24 static Logger log = LoggerFactory.getLogger(StartModel.class); 24 /** Generated Serial UID */ 25 private static final long serialVersionUID = 6795818266913419538L; 26 27 /** The Class logger */ 28 private final Logger log = LoggerFactory.getLogger(StartModel.class); 25 29 26 30 private Capabilities attachedMUACapabilities; 27 31 32 /** Holds the statistics used by the dashboard on the front page*/ 28 33 private StartStatistics startStatistics; 29 34 -
raptor-web/trunk/src/main/webapp/WEB-INF/flows/reports/graphicalReports.xhtml
r572 r631 37 37 <f:facet name="header"> 38 38 <h:outputText 39 value="#{graphService.attachedCapabilities.m uaMetadata.muaName}" />39 value="#{graphService.attachedCapabilities.metadata.serverName}" /> 40 40 </f:facet> 41 41 -
raptor-web/trunk/src/main/webapp/WEB-INF/flows/reports/setupRaptorWeb.xhtml
r534 r631 12 12 13 13 <ui:define name="content"> 14 < a4j:form id="setupForm">14 <h:form id="setupForm"> 15 15 <rich:tabPanel id="setupTabPanel" height="450" selectedTab="graph" 16 switchType="client"> 16 switchType="client"> 17 17 18 18 <rich:tab name="aggregatorSetup" label="Aggregator Setup"> 19 19 20 <h:panelGrid> 21 <rich:spacer height="15px" /> 22 <rich:spacer width="30%" /> 23 <rich:dataTable value="#{setupService.attached}" 24 bandingInterval="2" banding="row" var="attached" width="90%"> 25 <rich:column> 26 <f:facet name="header"> 27 <h:outputText value="Aggregator Location" /> 28 </f:facet> 29 <h:outputText value="#{attached.serviceEndpoint}" /> 30 </rich:column> 31 <rich:column align="center"> 32 <f:facet name="header"> 33 <h:outputText value="Attached" /> 34 </f:facet> 35 <h:outputText value="#{attached.isAttached}" /> 36 </rich:column> 37 <rich:column align="center"> 38 <f:facet name="header"> 39 <h:outputText value="Actions" /> 40 </f:facet> 41 <h:commandLink value="Attach" action="attachMUA"> 42 <f:setPropertyActionListener value="#{attached}" 43 target="#{flowScope.websession.setupmodel.selectedEndpoint}" /> 44 </h:commandLink> 45 </rich:column> 46 <rich:column> 47 <f:facet name="header"> 48 <h:outputText value="Statistical Capabilities" /> 49 </f:facet> 50 <h:commandLink action="getAggregatorCapabilities" 51 value="Check Now" 52 rendered="#{empty flowScope.websession.setupmodel.selectEndpointCapabilities.statisticalServices}" 53 reRender="setupForm"> 54 <f:setPropertyActionListener value="#{attached}" 55 target="#{flowScope.websession.setupmodel.selectedEndpoint}" /> 56 </h:commandLink> 57 <h:panelGrid columns="1" 58 rendered="#{flowScope.websession.setupmodel.selectEndpointCapabilities.error}"> 59 <h:outputText 60 value="ERROR: #{flowScope.websession.setupmodel.selectEndpointCapabilities.errorMessage}" /> 61 </h:panelGrid> 62 <h:panelGrid columns="2" 63 rendered="#{not empty flowScope.websession.setupmodel.selectEndpointCapabilities.statisticalServices}"> 64 <c:forEach var="item" 65 items="#{flowScope.websession.setupmodel.selectEndpointCapabilities.statisticalServices}"> 66 <h:outputText value="#{item.statisticParameters.unitName}" /> 67 </c:forEach> 20 <rich:layout> 21 22 <rich:layoutPanel position="left" width="10%"> 68 23 69 24 70 </h:panelGrid>71 </rich:column>72 <rich:column align="center">73 <f:facet name="header">74 <h:outputText value="Online" />75 </f:facet>76 25 77 <center><h:graphicImage value="/image/red-circle.gif" 78 rendered="#{flowScope.websession.setupmodel.selectEndpointCapabilities.error}" /> 79 <h:graphicImage value="/image/green-circle.png" shortDesc="help" 80 rendered="#{!flowScope.websession.setupmodel.selectEndpointCapabilities.error}" /> 81 </center> 82 </rich:column> 83 </rich:dataTable> 84 <rich:spacer height="15px" /> 85 </h:panelGrid> 26 </rich:layoutPanel> 27 28 <rich:layoutPanel position="top"> 29 <center><h2>Aggregators</h2></center> 30 </rich:layoutPanel> 31 32 33 <rich:layoutPanel position="right"> 34 35 <rich:spacer height="15px" /> 36 37 <rich:dataTable value="#{setupService.attached}" 38 bandingInterval="2" banding="row" var="attached" width="90%"> 39 <rich:column> 40 <f:facet name="header"> 41 <h:outputText value="Aggregator Location" /> 42 </f:facet> 43 <h:outputText value="#{attached.serviceEndpoint}" /> 44 </rich:column> 45 <rich:column align="center"> 46 <f:facet name="header"> 47 <h:outputText value="Attached" /> 48 </f:facet> 49 <h:outputText value="#{attached.isAttached}" /> 50 </rich:column> 51 <rich:column align="center"> 52 <f:facet name="header"> 53 <h:outputText value="Actions" /> 54 </f:facet> 55 <h:commandLink value="Attach" action="attachMUA"> 56 <f:setPropertyActionListener value="#{attached}" 57 target="#{flowScope.websession.setupmodel.selectedEndpoint}" /> 58 </h:commandLink> 59 </rich:column> 60 <rich:column> 61 <f:facet name="header"> 62 <h:outputText value="Statistical Capabilities" /> 63 </f:facet> 64 <h:commandLink action="getAggregatorCapabilities" 65 value="Check Now" 66 rendered="#{empty flowScope.websession.setupmodel.selectEndpointCapabilities.statisticalServices}" 67 reRender="setupForm"> 68 <f:setPropertyActionListener value="#{attached}" 69 target="#{flowScope.websession.setupmodel.selectedEndpoint}" /> 70 </h:commandLink> 71 <h:panelGrid columns="1" 72 rendered="#{flowScope.websession.setupmodel.selectEndpointCapabilities.error}"> 73 <h:outputText 74 value="ERROR: #{flowScope.websession.setupmodel.selectEndpointCapabilities.errorMessage}" /> 75 </h:panelGrid> 76 <h:panelGrid columns="2" 77 rendered="#{not empty flowScope.websession.setupmodel.selectEndpointCapabilities.statisticalServices}"> 78 <c:forEach var="item" 79 items="#{flowScope.websession.setupmodel.selectEndpointCapabilities.statisticalServices}"> 80 <h:outputText value="#{item.statisticParameters.unitName}" /> 81 </c:forEach> 82 83 84 </h:panelGrid> 85 </rich:column> 86 <rich:column align="center"> 87 <f:facet name="header"> 88 <h:outputText value="Online" /> 89 </f:facet> 90 91 <center><h:graphicImage value="/image/red-circle.gif" 92 rendered="#{flowScope.websession.setupmodel.selectEndpointCapabilities.error}" /> 93 <h:graphicImage value="/image/green-circle.png" 94 shortDesc="help" 95 rendered="#{!flowScope.websession.setupmodel.selectEndpointCapabilities.error}" /> 96 </center> 97 </rich:column> 98 </rich:dataTable> 99 <rich:spacer height="15px" /> 100 101 </rich:layoutPanel> 102 </rich:layout> 86 103 87 104 <rich:separator /> 88 <rich:spacer height="10px" /> 89 105 <rich:spacer height="10px" /> 106 <center><h2>Attached Aggregator Information</h2></center> 90 107 <rich:spacer height="5px" /> 91 108 <h:panelGrid columns="1"> 92 109 <h:outputText 93 value="Organisation Name: #{setupService.attachedCapabilities.m uaMetadata.organisationName}" />110 value="Organisation Name: #{setupService.attachedCapabilities.metadata.organisationName}" /> 94 111 <h:outputText 95 value="Contact: #{setupService.attachedCapabilities.m uaMetadata.contactEmail}" />112 value="Contact: #{setupService.attachedCapabilities.metadata.contactEmail}" /> 96 113 <h:outputText 97 114 value="Endpoint: #{setupService.currentlyAttached.serviceEndpoint}" /> … … 100 117 <rich:separator /> 101 118 <rich:spacer height="15px" /> 119 <center><h2>Administrative Functions</h2></center> 102 120 121 <rich:spacer height="10px" /> 122 <rich:spacer width="15px" /> 123 <h:panelGrid columns="2" rendered="#{setupService.hasAttached}"> 124 <h:graphicImage style="cursor: pointer" value="/image/arrow.png"/> 125 103 126 104 <rich:spacer height="7px" /> 105 <rich:spacer width="15px" /> 106 <h:panelGrid columns="2" rendered="#{setupService.hasAttached}"> 107 <h:graphicImage style="cursor: pointer" value="/image/arrow.png"> 108 </h:graphicImage> 127 <h:commandLink style="cursor: pointer" value="Delete All Entries"/> 128 <!-- action="deleteAllEntriesFromAttachedMUA" /> 109 129 110 <h:commandLink style="cursor: pointer" value="Delete All Entries" 111 action="deleteAllEntriesFromAttachedMUA" /> 112 113 <h:graphicImage style="cursor: pointer" 114 value="/image/arrow.png"> 115 </h:graphicImage> 116 <h:commandLink style="cursor: pointer" 117 value="Delete All Entries In Range" /> 130 <h:graphicImage style="cursor: pointer" value="/image/arrow.png"/> 131 132 <h:commandLink style="cursor: pointer" value="Delete All Entries In Range" />--> 118 133 </h:panelGrid> 119 134 … … 125 140 126 141 </rich:tabPanel> 127 </ a4j:form>142 </h:form> 128 143 129 144 -
raptor-web/trunk/src/main/webapp/WEB-INF/flows/reports/startReport.xhtml
r566 r631 23 23 24 24 <h:outputText style="font-size:150%" 25 value="Currently Attached to #{flowScope.websession.startmodel.attachedMUACapabilities.m uaMetadata.muaName}, and showing statistics for: " />25 value="Currently Attached to #{flowScope.websession.startmodel.attachedMUACapabilities.metadata.serverName}, and showing statistics for: " /> 26 26 27 27 <rich:inplaceSelect id="quickStatsRangeSelector"
Note: See TracChangeset
for help on using the changeset viewer.
