Merge branch 'master' of dev.insomnia.fi:/data/bortal

code/LanBortalWeb/WebContent/voting/compolist.xhtml

@@ -12,13 +12,13 @@
 			<!--  <f:event type="preRenderView" listener="#{votingCompoListView.initView}" />  -->
 		</f:metadata>
 		<ui:define name="content">
-			<!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> -->
+			<h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> 
 			<h1>#{i18n['voting.allcompos.header']}</h1>
 			<p>#{i18n['voting.allcompos.description']}</p>
 			
 			<div class="clearfix"></div>
 			
-			<div id="compolist">
+			<div id="actionlog">
 			
 			<h:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="compolisttable" value="#{votingCompoListView.compos}" var="compo">
 				<h:column>
@@ -34,6 +34,12 @@
 					<h:outputText value="#{compo.description}" />
 				</h:column>
 				<h:column>
+					<f:facet name="header">
+						<h:outputText value="current entries" />
+					</f:facet>
+					<h:outputText value="#{compo.compoEntries.size()}"  />
+				</h:column>
+				<h:column>
 					<f:facet name="header" >
 						<h:outputText value="Max parts" />
 					</f:facet>