Author: jkoster
Date: 2009-09-11 14:02:06 +0200 (Fri, 11 Sep 2009)
New Revision: 38565
Modified:
natmm/trunk/templates/nmintra/includes/peoplefinder/commit.jsp
natmm/trunk/templates/nmintra/includes/peoplefinder/form.jsp
natmm/trunk/templates/nmintra/includes/peoplefinder/table.jsp
natmm/trunk/templates/nmintra/includes/peoplefinder/table_vraagbaak.jsp
natmm/trunk/templates/nmintra/includes/peoplefinder/texts.jsp
natmm/trunk/templates/nmintra/includes/peoplefinder/update.jsp
natmm/trunk/templates/nmintra/thumbs.jsp
Log:
NMCMS-623 - Lokatie should be locatie, with an c.
Modified: natmm/trunk/templates/nmintra/includes/peoplefinder/commit.jsp
===================================================================
--- natmm/trunk/templates/nmintra/includes/peoplefinder/commit.jsp
2009-09-11 07:29:43 UTC (rev 38564)
+++ natmm/trunk/templates/nmintra/includes/peoplefinder/commit.jsp
2009-09-11 12:02:06 UTC (rev 38565)
@@ -98,7 +98,7 @@
faxId = e.getStringValue("fax");
emailId = e.getStringValue("email");
jobId = e.getStringValue("job");
- omschrijving_engId = e.getStringValue("omschrijving_eng"); //
lokatie, regio/afdeling en functie
+ omschrijving_engId = e.getStringValue("omschrijving_eng"); //
locatie, regio/afdeling en functie
omschrijving_deId = e.getStringValue("omschrijving_de"); //
werkzaamheden
omschrijving_fraId = e.getStringValue("omschrijving_fra"); //
vaste vrije/werk dag(en)
omschrijvingId = e.getStringValue("omschrijving"); // en
verder
Modified: natmm/trunk/templates/nmintra/includes/peoplefinder/form.jsp
===================================================================
--- natmm/trunk/templates/nmintra/includes/peoplefinder/form.jsp
2009-09-11 07:29:43 UTC (rev 38564)
+++ natmm/trunk/templates/nmintra/includes/peoplefinder/form.jsp
2009-09-11 12:02:06 UTC (rev 38565)
@@ -59,7 +59,7 @@
<td colspan="2" class="bold">
<select tabindex="6" name="location" style="width:195px;">
<option value="default" <% if(programId.equals("default")) {
%>SELECTED<% }
- %>>alle lokaties
+ %>>alle locaties
<mm:list path="locations" orderby="locations.naam"
directions="UP"
><mm:field name="locations.number" jspvar="locations_number"
vartype="String" write="false"
><mm:field name="locations.naam" jspvar="locations_name"
vartype="String" write="false"
Modified: natmm/trunk/templates/nmintra/includes/peoplefinder/table.jsp
===================================================================
--- natmm/trunk/templates/nmintra/includes/peoplefinder/table.jsp
2009-09-11 07:29:43 UTC (rev 38564)
+++ natmm/trunk/templates/nmintra/includes/peoplefinder/table.jsp
2009-09-11 12:02:06 UTC (rev 38565)
@@ -80,7 +80,7 @@
</mm:isnotempty
></mm:field
><mm:related path="readmore,locations" fields="locations.naam"
distinct="true">
- <tr><td style="padding-bottom:3px;">Lokatie: </td><td
style="padding-bottom:3px;vertical-align:bottom;"><mm:field
name="locations.naam" /></td></tr>
+ <tr><td style="padding-bottom:3px;">Locatie: </td><td
style="padding-bottom:3px;vertical-align:bottom;"><mm:field
name="locations.naam" /></td></tr>
</mm:related
>
<%--
Modified:
natmm/trunk/templates/nmintra/includes/peoplefinder/table_vraagbaak.jsp
===================================================================
--- natmm/trunk/templates/nmintra/includes/peoplefinder/table_vraagbaak.jsp
2009-09-11 07:29:43 UTC (rev 38564)
+++ natmm/trunk/templates/nmintra/includes/peoplefinder/table_vraagbaak.jsp
2009-09-11 12:02:06 UTC (rev 38565)
@@ -80,7 +80,7 @@
</mm:isnotempty
></mm:field
><mm:related path="readmore,locations" fields="locations.naam"
distinct="true">
- <tr><td style="padding-bottom:3px;">Lokatie: </td><td
style="padding-bottom:3px;vertical-align:bottom;"><mm:field
name="locations.naam" /></td></tr>
+ <tr><td style="padding-bottom:3px;">Locatie: </td><td
style="padding-bottom:3px;vertical-align:bottom;"><mm:field
name="locations.naam" /></td></tr>
</mm:related
>
<%--
Modified: natmm/trunk/templates/nmintra/includes/peoplefinder/texts.jsp
===================================================================
--- natmm/trunk/templates/nmintra/includes/peoplefinder/texts.jsp
2009-09-11 07:29:43 UTC (rev 38564)
+++ natmm/trunk/templates/nmintra/includes/peoplefinder/texts.jsp
2009-09-11 12:02:06 UTC (rev 38565)
@@ -18,7 +18,7 @@
pzText += "<br><br>Achternaam '" + e.getStringValue("lastname") + "'
moet worden gewijzigd in: " + lastnameId;
}
if(!omschrijving_engId.equals(e.getStringValue("omschrijving_eng"))) {
- pzText += "<br><br>Beschrijving lokatie, regio/afdeling en functie moet
worden gewijzigd in:<br>" + omschrijving_engId;
+ pzText += "<br><br>Beschrijving locatie, regio/afdeling en functie moet
worden gewijzigd in:<br>" + omschrijving_engId;
}
if(!omschrijving_deId.equals(e.getStringValue("omschrijving_de"))) {
pzText += "<br><br>Beschrijving werkzaamheden moet worden gewijzigd
in:<br>" + omschrijving_deId;
Modified: natmm/trunk/templates/nmintra/includes/peoplefinder/update.jsp
===================================================================
--- natmm/trunk/templates/nmintra/includes/peoplefinder/update.jsp
2009-09-11 07:29:43 UTC (rev 38564)
+++ natmm/trunk/templates/nmintra/includes/peoplefinder/update.jsp
2009-09-11 12:02:06 UTC (rev 38565)
@@ -11,7 +11,7 @@
<tr><td>Mobiel: </td> <td><input type="text"
name="cellularphone" value="<mm:field name="cellularphone" />"
style="width:400px;"></td></tr>
<tr><td>Fax: </td> <td><input type="text"
name="fax" value="<mm:field name="fax" />" style="width:400px;"></td></tr>
<tr><td>Email (**): </td> <td><input type="text"
name="email" value="<mm:field name="email" />" style="width:400px;"></td></tr>
- <tr><td>Lokatie, regio/afdeling en functie: </td><td><textarea
name="omschrijving_eng" style="width:400px;height:50px;"><%= omschrijving_engId
%></textarea></td></tr>
+ <tr><td>Locatie, regio/afdeling en functie: </td><td><textarea
name="omschrijving_eng" style="width:400px;height:50px;"><%= omschrijving_engId
%></textarea></td></tr>
<tr><td>Functie (visitekaartje): </td> <td><input type="text"
name="job" value="<mm:field name="job" />" style="width:400px;"></td></tr>
<tr><td><%= specialDays %>: </td> <td><textarea
name="omschrijving_fra" rows="2" style="width:400px;"><mm:field
name="omschrijving_fra" /></textarea></td></tr>
<tr><td>Werkzaamheden: </td> <td><textarea
name="omschrijving_de" rows="4" style="width:400px;"><mm:field
name="omschrijving_de" jspvar="omschrijving_de" vartype="String"
write="false"><%= HtmlCleaner.cleanHtml(omschrijving_de)
%></mm:field></textarea></td></tr>
Modified: natmm/trunk/templates/nmintra/thumbs.jsp
===================================================================
--- natmm/trunk/templates/nmintra/thumbs.jsp 2009-09-11 07:29:43 UTC (rev
38564)
+++ natmm/trunk/templates/nmintra/thumbs.jsp 2009-09-11 12:02:06 UTC (rev
38565)
@@ -134,7 +134,7 @@
isFirst = false;
}
if(!programId.equals("default")) {
- %><mm:node number="<%= programId %>"><li><%if(!isFirst) { %> en<%
}%> de lokatie <mm:field name="naam" /></li></mm:node><%
+ %><mm:node number="<%= programId %>"><li><%if(!isFirst) { %> en<%
}%> de locatie <mm:field name="naam" /></li></mm:node><%
}
if(!otherGroupsId.equals("default")) {
%><mm:node number="<%= otherGroupsId %>"><li><%if(!isFirst) { %>
en<% }%> de groep <mm:field name="title" /></li></mm:node><%
@@ -167,7 +167,7 @@
></select> <br><div align="right"><span
class="light">en</span></div></td></tr>
<tr><td><select name="program" style="width:195px;">
<option value="default" <% if(programId.equals("default")) {
%>SELECTED<% }
- %>>alle lokaties
+ %>>alle locaties
<mm:list path="locations" orderby="locations.naam" directions="UP"
><mm:field name="locations.number" jspvar="locations_number"
vartype="String" write="false"
><mm:field name="locations.naam" jspvar="locations_name"
vartype="String" write="false"
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
