user cart ui improvements

code/moya-web/WebContent/useradmin/userCartShow.xhtml

@@ -13,14 +13,23 @@
 		<ui:define name="title">
 			<h1>#{i18n['user.edit.title']}</h1>
 		</ui:define>
-		<ui:define name="content">
 
+		<ui:define name="content">
 			<h:form>
-				<h:outputText value="#{userCartView.current+1}" /> / <h:outputText value="#{userCartView.userCartSize}" />
-				<h:commandButton action="#{userCartView.prev()}" value="#{i18n['usercart.prev']}" rendered="#{userCartView.current > 0}" />
-				<h:commandButton action="#{userCartView.removeCurrent()}" value="#{i18n['usercart.removeCurrent']}" />
-				<h:commandButton action="#{userCartView.next()}" value="#{i18n['usercart.next']}" rendered="#{userCartView.userCartSize > (userCartView.current+1)}" />
-
+				<p:toolbar>
+					<f:facet name="left">
+						<h:outputText value="#{userCartView.current+1}" /> / <h:outputText value="#{userCartView.userCartSize}" />
+						<span class="ui-separator"><span class="ui-icon ui-icon-grip-dotted-vertical" /></span>
+						<p:commandButton action="#{userCartView.prev()}" value="#{i18n['usercart.prev']}"
+										 icon="ui-icon-circle-arrow-w" ajax="false"
+										 rendered="#{userCartView.current > 0}" />
+						<p:commandButton action="#{userCartView.removeCurrent()}" value="#{i18n['usercart.removeCurrent']}"
+										 icon="ui-icon-close" ajax="false"/>
+						<p:commandButton action="#{userCartView.next()}" value="#{i18n['usercart.next']}"
+										 icon="ui-icon-circle-arrow-e" ajax="false"
+										 rendered="#{userCartView.userCartSize > (userCartView.current+1)}" />
+					</f:facet>
+				</p:toolbar>
 			</h:form>
 
 			<ui:fragment rendered="#{userView.hasPrintedCard}">
@@ -40,16 +49,18 @@
 				</h:form>
 			</ui:fragment>
 
-			<h:link outcome="/card/massprint" value="Mass Print">
-				<f:param name="cid" value="#{javax.enterprise.context.conversation.id}" />
-			</h:link>
-
+			<p>
+				<h:link outcome="/card/massprint" value="Mass Print">
+					<f:param name="cid" value="#{javax.enterprise.context.conversation.id}" />
+				</h:link>
+			</p>
 
 			<p>
 				<h:link outcome="/useradmin/changePassword" value="#{i18n['submenu.user.changePassword']}">
 					<f:param name="userid" value="#{userView.user.user.id}" />
 				</h:link>
 			</p>
+
 			<users:edit id="useredit" commitaction="#{userCartView.saveUser()}" commitvalue="#{i18n['user.save']}" />
 
 			<h:form id="roleform" rendered="#{roleView.canReadRoles}">

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserView.java

@@ -661,6 +661,6 @@ public class UserView extends GenericCDIView {
 
 	public void cardStateChangeListener(ValueChangeEvent valueChange) {
 		logger.debug("PrintedCard state changed from {} to {}", valueChange.getOldValue(), valueChange.getNewValue());
-		cardBean.saveCard(printedCard);
+		setCardState();
 	}
 }