Skip to content

Codecrew / Moya

Go to a project
Commit 4ea1b2b1 by Tuukka Kivilahti
Options

Merge branch 'cachemap' into 'master' 

Minor fixes



See merge request !332
2 parents df222c46 ca1a3dc5
Inline Side-by-side
Showing with 52 additions and 46 deletions
code/moya-web/WebContent/map/edit.xhtml
......@@ -27,7 +27,7 @@
<h:form>
<h:commandButton styleClass="imgcenter" id="commandbutton" image="/PlaceMap?mapid=#{mapView.activeMap.id}" actionListener="#{mapManageView.mapClick}" />
<h:commandButton styleClass="imgcenter" id="commandbutton" image="/MoyaWeb/rest/placemap/v1/#{mapManageView.mapId}/" actionListener="#{mapManageView.mapClick}" />
</h:form>
<map:genplaces />
......
code/moya-web/WebContent/neomap/reserve.xhtml
......@@ -125,11 +125,13 @@
}
if (data.value == 0) {
updateWholePage();
alert("#{i18n['reservequeue.nowReservingAlert']}");
//updateWholePage();
location.reload();
} else {
$("#queuepos").text(data.value);
var d = new Date();
$("#queueupdated").text(d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds())
$("#queueupdated").text(new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"));
}
}
......@@ -150,7 +152,7 @@
element: document.getElementById("seatmap"),
moyaurl: "#{request.contextPath}",
map_id: #{ajaxMapView.map.id},
placeurl : "/rest/placemap/v1/#{ajaxMapView.map.id}/places",
placeurl : "/rest/placemap/v1/#{ajaxMapView.map.id}/#{ajaxMapView.reserving?'places':'allplaces'}",
});
px.toggleaction = function(d){
......
code/moya-web/WebContent/useradmin/list.xhtml
......@@ -30,19 +30,11 @@
<div id="advancedSearch" style="display: none;">
<!--
<strong><p:outputLabel for="rolefilter" value="#{i18n['userlist.rolefilter']}" /></strong>
<br />
<br />
<h:outputLabel for="rolefilter" value="#{i18n['userlist.rolefilter']}" />
<h:selectManyCheckbox layout="pageDirection" styleClass="nowrap" id="rolefilter"
value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}">
</h:inputText>
-->
<p:selectManyCheckbox layout="pageDirection" styleClass="nowrap" id="rolefilter" value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}">
<f:selectItems value="#{roleDataView.roles}" var="r" itemLabel="#{r.name}" />
<f:selectItems value="#{roleDataView.roleList}" var="r" itemLabel="#{r.name}" />
</p:selectManyCheckbox>
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserCartView.java
......@@ -96,7 +96,8 @@ public class UserCartView extends GenericCDIView {
sb.append("Zip").append(CSV_SEPARATOR);
sb.append("City").append(CSV_SEPARATOR);
sb.append("Places").append(CSV_SEPARATOR);
sb.append("Created").append(CSV_SEPARATOR);
sb.append("User created").append(CSV_SEPARATOR);
sb.append("Added to event").append(CSV_SEPARATOR);
LanEvent event = null;
if (usercart != null && !usercart.isEmpty()) {
......@@ -129,8 +130,13 @@ public class UserCartView extends GenericCDIView {
if (uc.getCreated() != null) {
sb.append(createtimeFormat.format(uc.getCreated().getTime()));
}
sb.append(CSV_SEPARATOR);
if (uc.getEventuserCreated() != null) {
sb.append(createtimeFormat.format(uc.getEventuserCreated()));
}
sb.append(CSV_SEPARATOR);
sb.append("\n");
}
DefaultStreamedContent ret = new DefaultStreamedContent(new ByteArrayInputStream(sb.toString().getBytes(UTF8)));
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
......@@ -105,6 +105,8 @@ bortalApplication.tournament.SINGLE_ELIMINATION = Single Elimination
bortalApplication.user = User permissions
bortalApplication.user.ANYUSER = All users have this anyways
bortalApplication.user.CREATE_NEW = Create new user
bortalApplication.user.EDIT_HELP = Can edit help texts
bortalApplication.user.HELPPAGE = Can see help page
bortalApplication.user.INVITE_USERS = Invite users
bortalApplication.user.LOGGED_IN_USER = Logged in user
bortalApplication.user.LOGIN = Can login
......@@ -335,13 +337,14 @@ global.notAuthorizedExecute = You are not authorized to do that!
global.notauthorized = You don't have enough rights to enter this site.
global.save = Save
help.edit=Edit help
help.placeholder.content=help.add=Create help for page
help.content=Help content
help.dialog.header=Edit page help
You can add help by pressing button under this text.
help.placeholder.title=No help for page
help.title=Help for page
help.content = Help content
help.dialog.header = Edit page help
help.edit = Edit help
help.globalWarning = Helptexts are globals, and shared between every events!
help.placeholder.content = help.add=Create help for page
help.placeholder.title = No help for page
help.title = Help for page
httpsession.creationTime = Created
httpsession.hostname = Hostname
httpsession.id = ID
......@@ -1555,6 +1558,3 @@ voting.create.voteEnd = Voting close
voting.create.voteStart = Voting start
yes = Yes
help.globalWarning=Helptexts are globals, and shared between every events\!
bortalApplication.user.HELPPAGE=Can see help page
bortalApplication.user.EDIT_HELP=Can edit help texts
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
......@@ -206,6 +206,8 @@ bortalApplication.tournamentstatus.SETUP = Setup
bortalApplication.user = User permissions
bortalApplication.user.ANYUSER = All users have this anyways
bortalApplication.user.CREATE_NEW = Create new user
bortalApplication.user.EDIT_HELP = Can edit help texts
bortalApplication.user.HELPPAGE = Can see help page
bortalApplication.user.INVITE_USERS = Invite users
bortalApplication.user.LOGGED_IN_USER = Logged in user
bortalApplication.user.LOGIN = Can login
......@@ -548,13 +550,15 @@ global.notAuthorizedExecute = You are not authorized to do that!
global.notauthorized = You don't have enough rights to enter this site.
global.save = Save
help.add=Create help for page
help.content=Help content
help.dialog.header=Edit page help
help.edit=Edit help
help.placeholder.content=You can add help by pressing button under this text.
help.placeholder.title=No help for page
help.title=Help for page
help.add = Create help for page
help.content = Help content
help.dialog.header = Edit page help
help.edit = Edit help
help.globalWarning = Helptexts are globals, and shared between every events!
help.placeholder.content = You can add help by pressing button under this text.
help.placeholder.title = No help for page
help.title = Help for page
httpsession.creationTime = Created
httpsession.hostname = Hostname
httpsession.id = ID
......@@ -1185,6 +1189,8 @@ rejectcard.toName = Name
required = Required
reservequeue.nowReservingAlert = You can now select places from the map.
resetMail.body = You can change a forgotten password by inserting your username or email address to the field below. A link where you can change the password will be sent to the email address associated to that.
resetMail.email = Email address
resetMail.header = Reset lost password
......@@ -1828,6 +1834,3 @@ voting.create.voteEnd = Voting close
voting.create.voteStart = Voting start
yes = Yes
help.globalWarning=Helptexts are globals, and shared between every events\!
bortalApplication.user.HELPPAGE=Can see help page
bortalApplication.user.EDIT_HELP=Can edit help texts
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
......@@ -207,6 +207,8 @@ bortalApplication.tournamentstatus.SETUP = Valmistel
bortalApplication.user = K\u00E4ytt\u00E4j\u00E4oikeudet
bortalApplication.user.ANYUSER = AINA kaikilla k\u00E4ytt\u00E4jill\u00E4
bortalApplication.user.CREATE_NEW = Voi luoda uuden k\u00E4ytt\u00E4j\u00E4n
bortalApplication.user.EDIT_HELP = Voi muokata ohjeita
bortalApplication.user.HELPPAGE = N\u00E4kee ohjesivun
bortalApplication.user.INVITE_USERS = Voi kutsua yst\u00E4vi\u00E4
bortalApplication.user.LOGGED_IN_USER = Kirjautunut k\u00E4ytt\u00E4j\u00E4
bortalApplication.user.LOGIN = Voi kirjautua
......@@ -549,13 +551,15 @@ global.notAuthorizedExecute = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia suo
global.notauthorized = Sinulla ei ole riitt\u00E4vi\u00E4 oikeuksia t\u00E4lle sivulle.
global.save = Tallenna
help.add=Luo ohje sivulle
help.content=Ohjeen sis\u00E4lt\u00F6
help.dialog.header=Muokkaa sivun ohjetta
help.edit=Muokkaa ohjetta
help.placeholder.content=Voit lis\u00E4t\u00E4 ohjeen allaolevalla napilla.
help.placeholder.title=Ei ohjetta sivulle
help.title=Ohje sivulle
help.add = Luo ohje sivulle
help.content = Ohjeen sis\u00E4lt\u00F6
help.dialog.header = Muokkaa sivun ohjetta
help.edit = Muokkaa ohjetta
help.globalWarning = Ohjeet ovat universaaleja ja ne n\u00E4kyv\u00E4t kaikissa moya-lippukaupoissa!
help.placeholder.content = Voit lis\u00E4t\u00E4 ohjeen allaolevalla napilla.
help.placeholder.title = Ei ohjetta sivulle
help.title = Ohje sivulle
httpsession.creationTime = Luotu
httpsession.hostname = Hostname
httpsession.id = ID
......@@ -1172,6 +1176,8 @@ rejectcard.toName = Nimi
required = Vaaditaan
reservequeue.nowReservingAlert = Voit nyt varata paikkasi kartasta.
resetMail.body = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi tai tunnukseen liitetyn s\u00E4hk\u00F6postiosoitteen allaolevaan kentt\u00E4\u00E4n. Tunnukseen liitettyyn s\u00E4hk\u00F6postiosoitteeseen l\u00E4hetet\u00E4\u00E4n kertak\u00E4ytt\u00F6inen osoite, jossa voit vaihtaa sy\u00F6tt\u00E4m\u00E4si k\u00E4ytt\u00E4j\u00E4tunnuksen salasanan.
resetMail.email = S\u00E4hk\u00F6postiosoite
resetMail.header = Salasana unohtunut?
......@@ -1815,6 +1821,3 @@ voting.create.voteEnd = \u00C4\u00E4nestys kiinni
voting.create.voteStart = \u00C4\u00E4nestys auki
yes = Kyll\u00E4
help.globalWarning=Ohjeet ovat universaaleja ja ne n\u00E4kyv\u00E4t kaikissa moya-lippukaupoissa\!
bortalApplication.user.HELPPAGE=N\u00E4kee ohjesivun
bortalApplication.user.EDIT_HELP=Voi muokata ohjeita
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!