Merge branch 'template' into 'master'

Tournament templates

Some changes to tournament page templates.

code/MoyaWeb/WebContent/resources/templates/custom_components.css

@@ -117,9 +117,6 @@
 	color: #006600;
 }
 
-
-
-
 .lectureCalendar,
 .lectureCalendarParticipating,
 .lectureCalendarDisabled {
@@ -136,3 +133,13 @@
 	background-color: gray;
 }
 
+.noBorders tr, .noBorders td {
+    background: none !important;
+    border: none !important;
+}
+
+.inlineRow > td {
+    padding: 0 !important;
+    margin: 0;
+    padding-left: 40px !important;
+}

code/MoyaWeb/WebContent/tournaments/admin/view_tournament_team.xhtml

@@ -13,7 +13,7 @@
 			<p>#{i18n['tournaments.admin.view_tournament_description_teamview_addition']}</p>
 			<h:form>
 	 			<p:dataTable value="#{tournamentParticipantsView.tournament.participants}" var="participant">
-	 				<p:column style="width:2%">  
+	 				<p:column style="width:20px">  
             			<p:rowToggler />  
         			</p:column>
 	 				<p:column>
@@ -28,32 +28,40 @@
 						</f:facet>
 						<h:outputText value="#{participant.participator.nick}" />
 					</p:column>
-	 				<p:rowExpansion>
-						<h:panelGrid id="display" columns="2" cellpadding="4" styleClass=" ui-widget-content grid">						
-						        <h:outputText value="#{i18n['tournament.team_members']}" />
-						        <h:panelGroup>
-						        	<ul>
-						        		<ui:repeat var="member" value="#{participant.teamMembers}">
-						        			<li>
+	 				<p:rowExpansion styleClass="inlineRow">
+	 					<p:dataTable value="#{participant.teamMembers}" var="member">
+	 						<p:column>
+	 							<f:facet name="header">
+	 								<h:outputText value="#{i18n['user.nick']}" />
+	 							</f:facet>
 	 							<h:outputText value="#{member.eventUser.nick}" />
-						        				<ul>
-							        				<li>
+	 						</p:column>
+	 						
+	 						<p:column>
+	 							<f:facet name="header">
+	 								<h:outputText value="#{i18n['tournament.participant_gameid']}" />
+	 							</f:facet>
 	 							<h:outputText value="#{tournamentParticipantsView.eventUserGameID[member.eventUser.id]}" />
-							        				</li>
-							        				<li>
+	 						</p:column>
+	 						
+	 						<p:column>
+	 							<f:facet name="header">
+	 								<h:outputText value="#{i18n['user.email']}" />
+	 							</f:facet>
 	 							<h:outputText value="#{member.eventUser.email}" />
-							        				</li>
-							        				<li>
+	 						</p:column>
+	 						
+	 						<p:column>
+	 							<f:facet name="header">
+	 								<h:outputText value="#{i18n['place.code']}" />
+	 							</f:facet>
 	 							<ui:repeat rendered="#{not empty member.eventUser.groupMemberships}" var="groupMembership" value="#{member.eventUser.groupMemberships}">
 							        	<h:outputText value="#{groupMembership.placeReservation.name}" />&nbsp;
 							    </ui:repeat>
-							        				</li>
-						        				</ul>
-						        			</li>
-						        		</ui:repeat>
-						        	</ul>
-						        </h:panelGroup>
-						    </h:panelGrid>
+							</p:column>
+	 						
+	 					</p:dataTable>
+
 					</p:rowExpansion>
 	 			</p:dataTable>
  			</h:form>

code/MoyaWeb/WebContent/tournaments/index.xhtml

@@ -17,7 +17,8 @@
 				<p>#{i18n['tournaments.description']}</p>
 				<h2>#{i18n['tournaments.open_tournaments']}</h2>
 				<p:dataTable value="#{tournamentListView.setupPhaseTournaments}" var="tournament">
-					<p:column style="width:2%">
+
+					<p:column style="width:20px">
 						<p:rowToggler />
 					</p:column>
 					<p:column>
@@ -96,7 +97,7 @@
 				</p:dataTable>
 				<h2>#{i18n['tournaments.setup_closed_tournaments']}</h2>
 				<p:dataTable value="#{tournamentListView.setupClosedPhaseTournaments}" var="tournament">
-					<p:column style="width:2%">
+					<p:column style="width:20px">
 						<p:rowToggler />
 					</p:column>
 					<p:column>

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/tournaments/TournamentParticipantsView.java

@@ -36,7 +36,7 @@ public class TournamentParticipantsView extends GenericCDIView {
 					if(gid != null)
 						eventUserGameID.put(ttm.getEventUser().getId(), gid.getIdentifier());
 					else
-						eventUserGameID.put(ttm.getEventUser().getId(), "n/a");
+						eventUserGameID.put(ttm.getEventUser().getId(), ttm.getEventUser().getUser().getNick());
 				}
 			}
 		}