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

From version 18.14
edited by Alex Cotiuga
on 2026/07/09 20:12
Change comment: There is no comment for this version
To version 16.56
edited by Alex Cotiuga
on 2026/06/16 17:09
Change comment: There is no comment for this version

Summary

Details

Page properties
Default language
... ... @@ -1,0 +1,1 @@
1 +en
Hidden
... ... @@ -1,1 +1,1 @@
1 -true
1 +false
Content
... ... @@ -3,115 +3,56 @@
3 3   #set ($statusCode = 400)
4 4   #set ($message = 'The request could not be sent. Please try again or contact Agnease by email at alex@agnease.com.')
5 5  
6 - #set ($className = 'Agnease.Code.ContactRequest.ContactRequestClass')
7 - #set ($allowedProperties = [
8 - 'scope',
9 - 'alreadyUseXWiki',
10 - 'name',
11 - 'email',
12 - 'hosting',
13 - 'customDevelopment',
14 - 'timeline',
15 - 'users',
16 - 'sourcePage'
17 - ])
18 -
19 19   #set ($name = '')
20 20   #set ($email = '')
21 21   #set ($scope = '')
9 + ## Fields to help preventing bots filled forms.
22 22   #set ($contactWebsite = '')
23 23   #set ($startedAtRaw = '')
24 - #set ($sourcePage = '')
25 25  
26 - ## Extract only the values we need for validation.
27 27   #foreach ($parameterName in $request.parameterNames)
28 28   #set ($propertyParts = $parameterName.split('_0_'))
29 29   #if ($propertyParts.size() > 1)
30 - #set ($propertyName = $propertyParts[1])
31 - #set ($propertyValue = $stringtool.trim($request.get($parameterName)))
32 -
16 + #set ($propertyName = $parameterName.split('_0_')[1])
33 33   #if ($propertyName == 'name')
34 - #set ($name = $propertyValue)
18 + #set ($name = $stringtool.trim($request.get($parameterName)))
35 35   #elseif ($propertyName == 'email')
36 - #set ($email = $propertyValue)
20 + #set ($email = $stringtool.trim($request.get($parameterName)))
37 37   #elseif ($propertyName == 'scope')
38 - #set ($scope = $propertyValue)
22 + #set ($scope = $stringtool.trim($request.get($parameterName)))
39 39   #elseif ($propertyName == 'contactWebsite')
40 - #set ($contactWebsite = $propertyValue)
24 + #set ($contactWebsite = $stringtool.trim($request.get($parameterName)))
41 41   #elseif ($propertyName == 'contactStartedAt')
42 - #set ($startedAtRaw = $propertyValue)
26 + #set ($startedAtRaw = $stringtool.trim($request.get($parameterName)))
43 43   #end
44 44   #end
45 45   #end
46 46  
47 - #set ($spamScore = 0)
48 -
49 - ## Honeypot: real users should never fill this field.
50 - #if ("$!contactWebsite" != '')
51 - #set ($spamScore = $spamScore + 5)
52 - #end
53 -
54 - ## Submission timing check.
55 - #if ("$!startedAtRaw" == '')
56 - ## The field is expected from the real form, so missing it is suspicious.
57 - #set ($spamScore = $spamScore + 2)
58 - #else
31 + #if ("$!startedAtRaw" != '')
59 59   #set ($startedAt = $numbertool.toNumber($startedAtRaw))
60 - #if ("$!startedAt" == '')
61 - #set ($spamScore = $spamScore + 2)
62 - #else
63 - #set ($now = $datetool.systemDate.time)
64 - #set ($elapsed = $now - $startedAt)
33 + #set ($now = $datetool.systemDate.time)
34 + #set ($elapsed = $now - $startedAt)
65 65  
66 - ## Reject very fast submissions.
67 - #if ($elapsed > 0 && $elapsed < 10000)
68 - #set ($spamScore = $spamScore + 3)
69 - #end
36 + ## Reject submissions faster than 10 seconds.
37 + #if ($elapsed > 0 && $elapsed < 10000)
38 + #set ($statusCode = 400)
39 + #set ($message = 'Please take a moment to describe your XWiki request before submitting.')
70 70   #end
71 - #end
72 -
73 - ## Random-looking name: long single token.
74 - #if ($name.length() >= 16 && !$name.contains(' '))
75 - #set ($spamScore = $spamScore + 2)
76 - #end
77 -
78 - ## Random-looking project description: long single token.
79 - #if ($scope.length() >= 12 && !$scope.contains(' '))
80 - #set ($spamScore = $spamScore + 2)
81 - #end
82 -
83 - ## Suspicious email local part with many dots and tiny fragments.
84 - #set ($emailParts = $email.split('@'))
85 - #if ($emailParts.size() == 2)
86 - #set ($localPart = $emailParts[0])
87 - #set ($localFragments = $localPart.split('\.'))
88 - #set ($dotCount = $localFragments.size() - 1)
89 - #set ($oneCharFragments = 0)
90 -
91 - #foreach ($fragment in $localFragments)
92 - #if ($fragment.length() == 1)
93 - #set ($oneCharFragments = $oneCharFragments + 1)
94 - #end
95 - #end
96 -
97 - #if ($dotCount >= 4 && $oneCharFragments >= 3)
98 - #set ($spamScore = $spamScore + 2)
99 - #end
100 - #else
101 - #set ($spamScore = $spamScore + 2)
102 - #end
103 -
104 - ## Human-facing validation.
105 - #if ("$!name" == '' && "$!email" == '')
41 + #elseif ("$!contactWebsite.trim()" != '')
42 + #set ($statusCode = 400)
43 + #set ($message = 'The request could not be sent. Please try again or contact Agnease by email.')
44 + #elseif ("$!name" == '' && "$!email" == '')
45 + #set ($statusCode = 400)
106 106   #set ($message = 'Please enter your name and email.')
107 107   #elseif ("$!name" == '')
48 + #set ($statusCode = 400)
108 108   #set ($message = 'Please enter your name.')
109 109   #elseif ("$!email" == '')
51 + #set ($statusCode = 400)
110 110   #set ($message = 'Please enter your email address.')
111 111   #elseif ("$!scope" == '' || $scope.length() < 30)
54 + #set ($statusCode = 400)
112 112   #set ($message = 'Please add a short description of your XWiki project, question or issue.')
113 - #elseif ($spamScore >= 3)
114 - #set ($message = 'The request could not be sent. Please add a clearer description of your XWiki request or contact Agnease by email.')
115 115   #else
116 116   #try('contactException')
117 117   #set ($now = $datetool.get('yyyyMMddHHmm'))
... ... @@ -118,22 +118,13 @@
118 118   #set ($random = $mathtool.random(100000, 999999))
119 119   #set ($uniqueName = "ContactRequest-${now}-${random}")
120 120   #set ($contactRequestDoc = $xwiki.getDocumentAsAuthor('ContactRequests.' + $uniqueName))
121 - #set ($contactRequestObj = $contactRequestDoc.getObject($className, true))
62 + #set ($contactRequestObj = $contactRequestDoc.getObject('Agnease.Code.ContactRequest.ContactRequestClass', true))
122 122  
123 - ## Save only known ContactRequest fields.
124 124   #foreach ($parameterName in $request.parameterNames)
125 - #if ($parameterName == 'sourcePage')
126 - #set ($sourcePage = $stringtool.trim($request.get($parameterName)))
127 - #set ($discard = $contactRequestObj.set('Agnease.Code.ContactRequest.ContactRequestClass_0_sourcePage', $stringtool.trim($request.get($parameterName))))
65 + #set ($propertyName = $parameterName.split('_0_')[1])
66 + #if ($propertyName != 'contactWebsite' && $propertyName != 'contactStartedAt')
67 + #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
128 128   #end
129 - #set ($propertyParts = $parameterName.split('_0_'))
130 - #if ($propertyParts.size() > 1)
131 - #set ($propertyName = $propertyParts[1])
132 -
133 - #if ($allowedProperties.contains($propertyName))
134 - #set ($discard = $contactRequestObj.set($propertyName, $stringtool.trim($request.get($parameterName))))
135 - #end
136 - #end
137 137   #end
138 138  
139 139   #set ($discard = $contactRequestDoc.saveAsAuthor())
... ... @@ -168,20 +168,15 @@
168 168   ## As a measure to avoid high load on website.
169 169   Tell us more about your project at <a href="mailto:alex@agnease.com">alex@agnease.com</a>
170 170   #else
171 - #set ($hiddenProperties = ['sourcePage'])
172 172   <form id="contactForm">
173 173   <dl>
174 174   #foreach ($property in $xclass.properties)
175 - #set ($hiddenPropertiesCSS = '')
176 - #if ($hiddenProperties.contains($property.name))
177 - #set ($hiddenPropertiesCSS = 'class="hidden"')
178 - #end
179 179   #if ($property.name == 'hosting')
180 180   <hr>
181 181   <h3>Optional project details</h3>
182 182   <p>These details help us understand the scope and suggest practical next steps.</p>
183 183   #end
184 - <dt $hiddenPropertiesCSS #if (!$editing && $hasEdit)
111 + <dt #if (!$editing && $hasEdit)
185 185   class="editableProperty"
186 186   #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
187 187   data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
... ... @@ -194,7 +194,7 @@
194 194   ## Support for specifying a translation key as hint in the property definition.
195 195   <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
196 196   </dt>
197 - <dd $hiddenPropertiesCSS>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
124 + <dd>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
198 198   #end
199 199   #if (!$xclass.properties || $xclass.properties.size() == 0)
200 200   ## Keep the empty definition term in order to have valid HTML.
... ... @@ -207,7 +207,7 @@
207 207   <div class="contact-hp-wrapper" aria-hidden="true">
208 208   <label for="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite">Website</label>
209 209   <input
210 - id="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite"
137 + id="contactWebsite"
211 211   type="text"
212 212   name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite"
213 213   autocomplete="off"
... ... @@ -215,7 +215,6 @@
215 215   />
216 216   </div>
217 217   <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
218 - <input type="hidden" name="sourcePage" value="$!{request.sourcePage}" />
219 219   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
220 220   </form>
221 221   #end
... ... @@ -236,13 +236,9 @@
236 236   {{/html}}
237 237   {{html clean="false"}}
238 238   </div>
239 - <div class="col-md-5 contact-side-panel">
240 - <div class="split-copy contact-help-panel">
241 - <h2>
242 - <i class="fa fa-check-circle" aria-hidden="true"></i>
243 - How Agnease can help
244 - </h2>
245 -
165 + <div class="col-md-5">
166 + <div class="widget">
167 + <h4>$services.icon.renderHTML('check') How Agnease can help</h4>
246 246   <ul>
247 247   <li>XWiki upgrades and long-term maintenance</li>
248 248   <li>Knowledge bases, intranets, SOP and documentation workflows</li>
... ... @@ -252,21 +252,14 @@
252 252   <li>Security-aware reviews and platform stabilization</li>
253 253   </ul>
254 254   </div>
255 -
256 - <ol class="process-list contact-process-list">
257 - <li>
258 - <strong>Your request is reviewed</strong>
259 - The project description is checked to understand the context and initial scope.
260 - </li>
261 - <li>
262 - <strong>You receive a reply</strong>
263 - Agnease replies with clarifying questions or suggested next steps.
264 - </li>
265 - <li>
266 - <strong>A short call can be scheduled</strong>
267 - If useful, we discuss scope, timeline and estimated effort together.
268 - </li>
269 - </ol>
177 + <div class="widget">
178 + <h4>$services.icon.renderHTML('right') What happens next?</h4>
179 + <ol>
180 + <li>Your request is reviewed.</li>
181 + <li>You receive a reply with clarifying questions or suggested next steps.</li>
182 + <li>If useful, we schedule a short call to discuss scope, timeline, and estimated effort.</li>
183 + </ol>
184 + </div>
270 270   </div>
271 271   </div>
272 272  {{/html}}
XWiki.StyleSheetExtension[0]
code
... ... @@ -1,17 +1,71 @@
1 -/* ===== Contact page side panel ===== */
1 +@brand: #00937D;
2 +@brand-strong: #007B6A;
3 +@text: #2D3A34;
4 +@muted: #5B6B64;
5 +@line: #E4ECE9;
6 +@radius: 16px;
7 +@shadow-sm: 0 6px 20px rgba(0,0,0,.06);
8 +@shadow: 0 12px 36px rgba(0,0,0,.08);
9 +@maxw: 1140px;
2 2  
3 -.contact-side-panel {
4 - padding-top: 10px;
11 +/* ===== Contact page widgets ===== */
12 +#mainContentArea {
13 + padding: 0;
5 5  }
6 6  
7 -.contact-help-panel {
8 - margin-bottom: 18px;
16 +.col-xs-5 {
17 + padding-top: 45px;
9 9  }
10 10  
11 -.contact-process-list li {
12 - min-height: auto;
20 +.col-xs-5 .widget {
21 + margin-bottom: 16px;
22 + padding: 16px;
13 13  }
14 14  
25 +.col-xs-5 .widget h4 {
26 + display: flex;
27 + align-items: center;
28 + gap: 8px;
29 + margin: 0 0 10px;
30 + padding-bottom: 8px;
31 + border-bottom: 1px solid fade(@line, 60%);
32 + color: @text;
33 + font-size: 18px;
34 + line-height: 1.25;
35 +}
36 +
37 +.col-xs-5 .widget h4 .fa,
38 +.col-xs-5 .widget h4 .glyphicon {
39 + color: @brand;
40 + font-size: 15px;
41 +}
42 +
43 +.col-xs-5 .widget ul,
44 +.col-xs-5 .widget ol {
45 + margin: 0;
46 + padding-left: 1.2rem;
47 + color: @muted;
48 +}
49 +
50 +.col-xs-5 .widget li {
51 + margin: 5px 0;
52 + line-height: 1.4;
53 +}
54 +
55 +.col-xs-5 .widget p {
56 + margin: 0 0 8px;
57 + color: @muted;
58 + line-height: 1.45;
59 +}
60 +
61 +.col-xs-5 .widget p:last-child {
62 + margin-bottom: 0;
63 +}
64 +
65 +.col-xs-5 .widget a {
66 + color: @brand;
67 + font-weight: 700;
68 +}
15 15  /* CSS for hidden field to identify requests filled by bots. */
16 16  .contact-hp-wrapper {
17 17   position: absolute;
... ... @@ -20,9 +20,3 @@
20 20   height: 1px;
21 21   overflow: hidden;
22 22  }
23 -
24 -@media (max-width: 991px) {
25 - .contact-side-panel {
26 - padding-top: 24px;
27 - }
28 -}