Last modified by Alex Cotiuga on 2026/07/27 06:09

From version 18.13
edited by Alex Cotiuga
on 2026/07/09 20:07
Change comment: There is no comment for this version
To version 19.1
edited by Alex Cotiuga
on 2026/07/27 06:09
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -121,17 +121,62 @@
121 121  
122 122   ## Save only known ContactRequest fields.
123 123   #foreach ($parameterName in $request.parameterNames)
124 + #if ($parameterName == 'sourcePage')
125 + #set ($discard = $contactRequestObj.set($parameterName, $stringtool.trim($request.get($parameterName))))
126 + #end
124 124   #set ($propertyParts = $parameterName.split('_0_'))
125 125   #if ($propertyParts.size() > 1)
126 126   #set ($propertyName = $propertyParts[1])
127 127  
128 128   #if ($allowedProperties.contains($propertyName))
129 - #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
132 + #set ($discard = $contactRequestObj.set($propertyName, $stringtool.trim($request.get($parameterName))))
130 130   #end
131 131   #end
132 132   #end
133 133  
134 134   #set ($discard = $contactRequestDoc.saveAsAuthor())
138 + ## Send internal notification email.
139 + ## This is intentionally best-effort: if email fails, the contact request is still saved.
140 + #try('mailException')
141 + #set ($notificationRecipient = 'alex@agnease.com')
142 + #set ($notificationSubject = 'New Agnease contact request')
143 + #set ($notificationBody = "
144 + Name:
145 + $!contactRequestObj.getValue('name')
146 +
147 + Email:
148 + $!contactRequestObj.getValue('email')
149 +
150 + Source page:
151 + $!contactRequestObj.getValue('sourcePage')
152 +
153 + Already uses XWiki:
154 + $!contactRequestObj.get('alreadyUseXWiki')
155 +
156 + Hosting:
157 + $!contactRequestObj.get('hosting')
158 +
159 + Custom development:
160 + $!contactRequestObj.get('customDevelopment')
161 +
162 + Timeline:
163 + $!contactRequestObj.get('timeline')
164 +
165 + Users:
166 + $!contactRequestObj.get('users')
167 +
168 + Message:
169 + $!contactRequestObj.getValue('scope')
170 +
171 + Internal request page:
172 + $contactRequestDoc.getExternalURL()
173 + ")
174 +
175 + #set ($message = $services.mail.sender.createMessage($notificationRecipient, $notificationSubject))
176 + #set ($discard = $message.setType('Agnease Contact Request'))
177 + #set ($discard = $message.addPart('text/plain', $notificationBody))
178 + #set ($mailResult = $services.mail.sender.sendAsynchronously([$message], 'database'))
179 + #end
135 135   #set ($statusCode = 200)
136 136   #set ($message = 'Your request was successfully sent.')
137 137   #end
... ... @@ -156,7 +156,8 @@
156 156  = Tell Us More About Your Project =
157 157  You do not need to have a full specification. A short description is enough to start the conversation.
158 158  {{html clean="false"}}
159 -You can also <a href="https://calendly.com/alex-agnease/30min?back=1&month=2026-06" target="_blank">book a free XWiki review call</a> to discuss your current setup.
204 + <p>You can also <a href="https://calendly.com/alex-agnease/30min?back=1&month=2026-06" target="_blank">book a free XWiki review call</a> to discuss your current setup.</p>
205 + <p>Looking for a starting point first? <a href="$xwiki.getURL('pricing.WebHome')">View XWiki service packages and starting prices</a>.</p>
160 160   <div class="row">
161 161   <div class="xform col-md-7">
162 162   #if ($totalRequests.size() > 50)
... ... @@ -167,29 +167,27 @@
167 167   <form id="contactForm">
168 168   <dl>
169 169   #foreach ($property in $xclass.properties)
170 - #set ($hiddenPropertiesCSS = '')
171 - #if ($hiddenProperties.contains($property.name))
172 - #set ($hiddenPropertiesCSS = 'class="hidden"')
216 + #if (!$hiddenProperties.contains($property.name))
217 + #if ($property.name == 'hosting')
218 + <hr>
219 + <h3>Optional project details</h3>
220 + <p>These details help us understand the scope and suggest practical next steps.</p>
221 + #end
222 + <dt #if (!$editing && $hasEdit)
223 + class="editableProperty"
224 + #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
225 + data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
226 + data-property-type="object"#end>
227 + ## This must match the id generated by the $doc.display() method below.
228 + #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
229 + <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
230 + $escapetool.xml($property.translatedPrettyName)
231 + </label>
232 + ## Support for specifying a translation key as hint in the property definition.
233 + <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
234 + </dt>
235 + <dd>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
173 173   #end
174 - #if ($property.name == 'hosting')
175 - <hr>
176 - <h3>Optional project details</h3>
177 - <p>These details help us understand the scope and suggest practical next steps.</p>
178 - #end
179 - <dt $hiddenPropertiesCSS #if (!$editing && $hasEdit)
180 - class="editableProperty"
181 - #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
182 - data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
183 - data-property-type="object"#end>
184 - ## This must match the id generated by the $doc.display() method below.
185 - #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
186 - <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
187 - $escapetool.xml($property.translatedPrettyName)
188 - </label>
189 - ## Support for specifying a translation key as hint in the property definition.
190 - <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
191 - </dt>
192 - <dd $hiddenPropertiesCSS>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
193 193   #end
194 194   #if (!$xclass.properties || $xclass.properties.size() == 0)
195 195   ## Keep the empty definition term in order to have valid HTML.
... ... @@ -210,7 +210,7 @@
210 210   />
211 211   </div>
212 212   <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
213 - <input type="hidden" name="sourcePage" value="$!{request.sourcePage}" />
257 + <input type="hidden" name="sourcePage" />
214 214   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
215 215   </form>
216 216   #end
XWiki.JavaScriptExtension[1]
cache
... ... @@ -1,0 +1,1 @@
1 +long
code
... ... @@ -1,0 +1,32 @@
1 +require(['jquery'], function ($) {
2 + $(function () {
3 + var sourcePageField = $('input[name="sourcePage"]');
4 +
5 + if (!sourcePageField.length || sourcePageField.val()) {
6 + return;
7 + }
8 +
9 + if (!document.referrer) {
10 + return;
11 + }
12 +
13 + try {
14 + var referrerUrl = new URL(document.referrer);
15 +
16 + if (referrerUrl.origin !== window.location.origin) {
17 + return;
18 + }
19 +
20 + var sourcePage = referrerUrl.pathname
21 + .replace(/^\/bin\//, '')
22 + .replace(/\/$/, '')
23 + .replace(/\//g, '.');
24 +
25 + if (sourcePage) {
26 + sourcePageField.val(sourcePage);
27 + }
28 + } catch (e) {
29 + // Ignore invalid referrer values.
30 + }
31 + });
32 +});
name
... ... @@ -1,0 +1,1 @@
1 +document referrer catcher
use
... ... @@ -1,0 +1,1 @@
1 +currentPage