Skip to content

Riina Antikainen / Moya

Go to a project
Commit d6be3845 by Tuomas Riihimäki
Options

Merge branch 'mitakakkaa' into 'master' 

Mitakakkaa

See merge request !248
2 parents b79c2f77 b2ef196c
Inline Side-by-side
Showing with 13 additions and 2 deletions
code/moya-web/WebContent/place/myGroups.xhtml
<!DOCTYPE html <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jsp/jstl/core" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jsp/jstl/core"
...@@ -74,11 +74,19 @@ ...@@ -74,11 +74,19 @@
</h:form> </h:form>
<!-- TODO: button --> <!-- TODO: button -->
<p:outputPanel rendered="#{!placeGroupView.useEticket}" > <p:outputPanel rendered="#{!placeGroupView.useEticket and !empty placeGroupView.groupMemberships}" >
<p> <p>
<input type="button" onclick="location.replace('#{request.contextPath}/PlaceGroupPdf');" value="#{i18n['placegroup.printPdf']}" /> <input type="button" onclick="location.replace('#{request.contextPath}/PlaceGroupPdf');" value="#{i18n['placegroup.printPdf']}" />
</p> </p>
</p:outputPanel> </p:outputPanel>
<p:outputPanel rendered="#{!placeGroupView.useEticket and empty placeGroupView.groupMemberships}" >
<p>
#{i18n['placegroup.noPlacegroups']}
</p>
</p:outputPanel>
<p:outputPanel rendered="#{placeGroupView.useEticket}" > <p:outputPanel rendered="#{placeGroupView.useEticket}" >
<p> <p>
<p:button outcome="/place/myEtickets" value="#{i18n['placegroup.showEticket']}" /> <p:button outcome="/place/myEtickets" value="#{i18n['placegroup.showEticket']}" />
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
...@@ -516,3 +516,4 @@ cardObjectData.deleteQ=Delete object data from card template? ...@@ -516,3 +516,4 @@ cardObjectData.deleteQ=Delete object data from card template?
cardTextData.deleteQ=Delete text data from card template? cardTextData.deleteQ=Delete text data from card template?
cardObjectData.delete=Delete cardObjectData.delete=Delete
cardTextData.delete=Delete cardTextData.delete=Delete
placegroup.noPlacegroups=Sinulla t\u00E4ytyy olla paikkoja ett\u00E4 voit n\u00E4hd\u00E4 lippusi
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
...@@ -1733,3 +1733,4 @@ cardObjectData.deleteQ=Delete object data from card template? ...@@ -1733,3 +1733,4 @@ cardObjectData.deleteQ=Delete object data from card template?
cardTextData.deleteQ=Delete text data from card template? cardTextData.deleteQ=Delete text data from card template?
cardObjectData.delete=Delete cardObjectData.delete=Delete
cardTextData.delete=Delete cardTextData.delete=Delete
placegroup.noPlacegroups=You must have placegroups that you can have places
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -1716,3 +1716,4 @@ cardObjectData.deleteQ=Poistetaanko objektidata korttipohjalta? ...@@ -1716,3 +1716,4 @@ cardObjectData.deleteQ=Poistetaanko objektidata korttipohjalta?
cardTextData.deleteQ=Poistetaanko tekstidata korttipohjalta? cardTextData.deleteQ=Poistetaanko tekstidata korttipohjalta?
cardObjectData.delete=Poista cardObjectData.delete=Poista
cardTextData.delete=Poista cardTextData.delete=Poista
placegroup.noPlacegroups=Sinulla t\u00E4ytyy olla paikkoja ett\u00E4 voit n\u00E4hd\u00E4 lippusi
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!