Skip to content

Codecrew / Moya

Go to a project
Commit eca9d1d0 by Antti Tönkyrä
Options

Merge branch 'template' into 'master' 

Tournament templates

Some changes to tournament page templates.
2 parents 1f78477b cea957fd
Inline Side-by-side
Showing with 50 additions and 34 deletions
code/MoyaWeb/WebContent/resources/templates/custom_components.css
...@@ -117,10 +117,7 @@ ...@@ -117,10 +117,7 @@
color: #006600; color: #006600;
} }
.lectureCalendar,
.lectureCalendar,
.lectureCalendarParticipating, .lectureCalendarParticipating,
.lectureCalendarDisabled { .lectureCalendarDisabled {
border: 1px solid black; border: 1px solid black;
...@@ -136,3 +133,13 @@ ...@@ -136,3 +133,13 @@
background-color: gray; 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 @@ ...@@ -13,7 +13,7 @@
<p>#{i18n['tournaments.admin.view_tournament_description_teamview_addition']}</p> <p>#{i18n['tournaments.admin.view_tournament_description_teamview_addition']}</p>
<h:form> <h:form>
<p:dataTable value="#{tournamentParticipantsView.tournament.participants}" var="participant"> <p:dataTable value="#{tournamentParticipantsView.tournament.participants}" var="participant">
<p:column style="width:2%"> <p:column style="width:20px">
<p:rowToggler /> <p:rowToggler />
</p:column> </p:column>
<p:column> <p:column>
...@@ -28,32 +28,40 @@ ...@@ -28,32 +28,40 @@
</f:facet> </f:facet>
<h:outputText value="#{participant.participator.nick}" /> <h:outputText value="#{participant.participator.nick}" />
</p:column> </p:column>
<p:rowExpansion> <p:rowExpansion styleClass="inlineRow">
<h:panelGrid id="display" columns="2" cellpadding="4" styleClass=" ui-widget-content grid"> <p:dataTable value="#{participant.teamMembers}" var="member">
<h:outputText value="#{i18n['tournament.team_members']}" /> <p:column>
<h:panelGroup> <f:facet name="header">
<ul> <h:outputText value="#{i18n['user.nick']}" />
<ui:repeat var="member" value="#{participant.teamMembers}"> </f:facet>
<li> <h:outputText value="#{member.eventUser.nick}" />
<h:outputText value="#{member.eventUser.nick}" /> </p:column>
<ul>
<li> <p:column>
<h:outputText value="#{tournamentParticipantsView.eventUserGameID[member.eventUser.id]}" /> <f:facet name="header">
</li> <h:outputText value="#{i18n['tournament.participant_gameid']}" />
<li> </f:facet>
<h:outputText value="#{member.eventUser.email}" /> <h:outputText value="#{tournamentParticipantsView.eventUserGameID[member.eventUser.id]}" />
</li> </p:column>
<li>
<ui:repeat rendered="#{not empty member.eventUser.groupMemberships}" var="groupMembership" value="#{member.eventUser.groupMemberships}"> <p:column>
<h:outputText value="#{groupMembership.placeReservation.name}" />&nbsp; <f:facet name="header">
</ui:repeat> <h:outputText value="#{i18n['user.email']}" />
</li> </f:facet>
</ul> <h:outputText value="#{member.eventUser.email}" />
</li> </p:column>
</ui:repeat>
</ul> <p:column>
</h:panelGroup> <f:facet name="header">
</h:panelGrid> <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>
</p:column>
</p:dataTable>
</p:rowExpansion> </p:rowExpansion>
</p:dataTable> </p:dataTable>
</h:form> </h:form>
......
code/MoyaWeb/WebContent/tournaments/index.xhtml
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
<p>#{i18n['tournaments.description']}</p> <p>#{i18n['tournaments.description']}</p>
<h2>#{i18n['tournaments.open_tournaments']}</h2> <h2>#{i18n['tournaments.open_tournaments']}</h2>
<p:dataTable value="#{tournamentListView.setupPhaseTournaments}" var="tournament"> <p:dataTable value="#{tournamentListView.setupPhaseTournaments}" var="tournament">
<p:column style="width:2%">
<p:column style="width:20px">
<p:rowToggler /> <p:rowToggler />
</p:column> </p:column>
<p:column> <p:column>
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
</p:dataTable> </p:dataTable>
<h2>#{i18n['tournaments.setup_closed_tournaments']}</h2> <h2>#{i18n['tournaments.setup_closed_tournaments']}</h2>
<p:dataTable value="#{tournamentListView.setupClosedPhaseTournaments}" var="tournament"> <p:dataTable value="#{tournamentListView.setupClosedPhaseTournaments}" var="tournament">
<p:column style="width:2%"> <p:column style="width:20px">
<p:rowToggler /> <p:rowToggler />
</p:column> </p:column>
<p:column> <p:column>
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/tournaments/TournamentParticipantsView.java
...@@ -36,7 +36,7 @@ public class TournamentParticipantsView extends GenericCDIView { ...@@ -36,7 +36,7 @@ public class TournamentParticipantsView extends GenericCDIView {
if(gid != null) if(gid != null)
eventUserGameID.put(ttm.getEventUser().getId(), gid.getIdentifier()); eventUserGameID.put(ttm.getEventUser().getId(), gid.getIdentifier());
else else
eventUserGameID.put(ttm.getEventUser().getId(), "n/a"); eventUserGameID.put(ttm.getEventUser().getId(), ttm.getEventUser().getUser().getNick());
} }
} }
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!