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

From version 18.5
edited by Alex Cotiuga
on 2026/07/09 19:54
Change comment: There is no comment for this version
To version 16.50
edited by Alex Cotiuga
on 2026/06/16 17:02
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,113 +3,50 @@
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 - ])
17 -
18 18   #set ($name = '')
19 19   #set ($email = '')
20 - #set ($scope = '')
8 + ## Fields to help preventing bots filled forms.
21 21   #set ($contactWebsite = '')
22 22   #set ($startedAtRaw = '')
23 23  
24 - ## Extract only the values we need for validation.
25 25   #foreach ($parameterName in $request.parameterNames)
26 26   #set ($propertyParts = $parameterName.split('_0_'))
27 27   #if ($propertyParts.size() > 1)
28 - #set ($propertyName = $propertyParts[1])
29 - #set ($propertyValue = $stringtool.trim($request.get($parameterName)))
30 -
15 + #set ($propertyName = $parameterName.split('_0_')[1])
31 31   #if ($propertyName == 'name')
32 - #set ($name = $propertyValue)
17 + #set ($name = $stringtool.trim($request.get($parameterName)))
33 33   #elseif ($propertyName == 'email')
34 - #set ($email = $propertyValue)
35 - #elseif ($propertyName == 'scope')
36 - #set ($scope = $propertyValue)
19 + #set ($email = $stringtool.trim($request.get($parameterName)))
37 37   #elseif ($propertyName == 'contactWebsite')
38 - #set ($contactWebsite = $propertyValue)
21 + #set ($contactWebsite = $stringtool.trim($request.get($parameterName)))
39 39   #elseif ($propertyName == 'contactStartedAt')
40 - #set ($startedAtRaw = $propertyValue)
23 + #set ($startedAtRaw = $stringtool.trim($request.get($parameterName)))
41 41   #end
42 42   #end
43 43   #end
44 44  
45 - #set ($spamScore = 0)
46 -
47 - ## Honeypot: real users should never fill this field.
48 - #if ("$!contactWebsite" != '')
49 - #set ($spamScore = $spamScore + 5)
50 - #end
51 -
52 - ## Submission timing check.
53 - #if ("$!startedAtRaw" == '')
54 - ## The field is expected from the real form, so missing it is suspicious.
55 - #set ($spamScore = $spamScore + 2)
56 - #else
28 + #if ("$!startedAtRaw" != '')
57 57   #set ($startedAt = $numbertool.toNumber($startedAtRaw))
58 - #if ("$!startedAt" == '')
59 - #set ($spamScore = $spamScore + 2)
60 - #else
61 - #set ($now = $datetool.systemDate.time)
62 - #set ($elapsed = $now - $startedAt)
30 + #set ($now = $datetool.systemDate.time)
31 + #set ($elapsed = $now - $startedAt)
63 63  
64 - ## Reject very fast submissions.
65 - #if ($elapsed > 0 && $elapsed < 10000)
66 - #set ($spamScore = $spamScore + 3)
67 - #end
33 + ## Reject submissions faster than 10 seconds.
34 + #if ($elapsed > 0 && $elapsed < 10000)
35 + #set ($statusCode = 400)
36 + #set ($message = 'Please take a moment to describe your XWiki request before submitting.')
68 68   #end
69 - #end
70 -
71 - ## Random-looking name: long single token.
72 - #if ($name.length() >= 16 && !$name.contains(' '))
73 - #set ($spamScore = $spamScore + 2)
74 - #end
75 -
76 - ## Random-looking project description: long single token.
77 - #if ($scope.length() >= 12 && !$scope.contains(' '))
78 - #set ($spamScore = $spamScore + 2)
79 - #end
80 -
81 - ## Suspicious email local part with many dots and tiny fragments.
82 - #set ($emailParts = $email.split('@'))
83 - #if ($emailParts.size() == 2)
84 - #set ($localPart = $emailParts[0])
85 - #set ($localFragments = $localPart.split('\.'))
86 - #set ($dotCount = $localFragments.size() - 1)
87 - #set ($oneCharFragments = 0)
88 -
89 - #foreach ($fragment in $localFragments)
90 - #if ($fragment.length() == 1)
91 - #set ($oneCharFragments = $oneCharFragments + 1)
92 - #end
93 - #end
94 -
95 - #if ($dotCount >= 4 && $oneCharFragments >= 3)
96 - #set ($spamScore = $spamScore + 2)
97 - #end
98 - #else
99 - #set ($spamScore = $spamScore + 2)
100 - #end
101 -
102 - ## Human-facing validation.
103 - #if ("$!name" == '' && "$!email" == '')
38 + #elseif ("$!contactWebsite.trim()" != '')
39 + #set ($statusCode = 400)
40 + #set ($message = 'The request could not be sent. Please try again or contact Agnease by email.')
41 + #elseif ("$!name" == '' && "$!email" == '')
42 + #set ($statusCode = 400)
104 104   #set ($message = 'Please enter your name and email.')
105 105   #elseif ("$!name" == '')
45 + #set ($statusCode = 400)
106 106   #set ($message = 'Please enter your name.')
107 107   #elseif ("$!email" == '')
48 + #set ($statusCode = 400)
108 108   #set ($message = 'Please enter your email address.')
109 - #elseif ("$!scope" == '' || $scope.length() < 30)
110 - #set ($message = 'Please add a short description of your XWiki project, question or issue.')
111 - #elseif ($spamScore >= 3)
112 - #set ($message = 'The request could not be sent. Please add a clearer description of your XWiki request or contact Agnease by email.')
113 113   #else
114 114   #try('contactException')
115 115   #set ($now = $datetool.get('yyyyMMddHHmm'))
... ... @@ -116,18 +116,11 @@
116 116   #set ($random = $mathtool.random(100000, 999999))
117 117   #set ($uniqueName = "ContactRequest-${now}-${random}")
118 118   #set ($contactRequestDoc = $xwiki.getDocumentAsAuthor('ContactRequests.' + $uniqueName))
119 - #set ($contactRequestObj = $contactRequestDoc.getObject($className, true))
56 + #set ($contactRequestObj = $contactRequestDoc.getObject('Agnease.Code.ContactRequest.ContactRequestClass', true))
120 120  
121 - ## Save only known ContactRequest fields.
122 122   #foreach ($parameterName in $request.parameterNames)
123 - #set ($propertyParts = $parameterName.split('_0_'))
124 - #if ($propertyParts.size() > 1)
125 - #set ($propertyName = $propertyParts[1])
126 -
127 - #if ($allowedProperties.contains($propertyName))
128 - #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
129 - #end
130 - #end
59 + #set ($propertyName = $parameterName.split('_0_')[1])
60 + #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
131 131   #end
132 132  
133 133   #set ($discard = $contactRequestDoc.saveAsAuthor())
... ... @@ -170,22 +170,20 @@
170 170   <h3>Optional project details</h3>
171 171   <p>These details help us understand the scope and suggest practical next steps.</p>
172 172   #end
173 - <div>
174 - <dt #if (!$editing && $hasEdit)
175 - class="editableProperty"
176 - #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
177 - data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
178 - data-property-type="object"#end>
179 - ## This must match the id generated by the $doc.display() method below.
180 - #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
181 - <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
182 - $escapetool.xml($property.translatedPrettyName)
183 - </label>
184 - ## Support for specifying a translation key as hint in the property definition.
185 - <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
186 - </dt>
187 - <dd>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
188 - </div>
103 + <dt #if (!$editing && $hasEdit)
104 + class="editableProperty"
105 + #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
106 + data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
107 + data-property-type="object"#end>
108 + ## This must match the id generated by the $doc.display() method below.
109 + #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
110 + <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
111 + $escapetool.xml($property.translatedPrettyName)
112 + </label>
113 + ## Support for specifying a translation key as hint in the property definition.
114 + <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
115 + </dt>
116 + <dd>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
189 189   #end
190 190   #if (!$xclass.properties || $xclass.properties.size() == 0)
191 191   ## Keep the empty definition term in order to have valid HTML.
... ... @@ -198,7 +198,7 @@
198 198   <div class="contact-hp-wrapper" aria-hidden="true">
199 199   <label for="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite">Website</label>
200 200   <input
201 - id="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite"
129 + id="contactWebsite"
202 202   type="text"
203 203   name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite"
204 204   autocomplete="off"
... ... @@ -226,13 +226,9 @@
226 226   {{/html}}
227 227   {{html clean="false"}}
228 228   </div>
229 - <div class="col-md-5 contact-side-panel">
230 - <div class="split-copy contact-help-panel">
231 - <h2>
232 - <i class="fa fa-check-circle" aria-hidden="true"></i>
233 - How Agnease can help
234 - </h2>
235 -
157 + <div class="col-md-5">
158 + <div class="widget">
159 + <h4>$services.icon.renderHTML('check') How Agnease can help</h4>
236 236   <ul>
237 237   <li>XWiki upgrades and long-term maintenance</li>
238 238   <li>Knowledge bases, intranets, SOP and documentation workflows</li>
... ... @@ -242,21 +242,14 @@
242 242   <li>Security-aware reviews and platform stabilization</li>
243 243   </ul>
244 244   </div>
245 -
246 - <ol class="process-list contact-process-list">
247 - <li>
248 - <strong>Your request is reviewed</strong>
249 - The project description is checked to understand the context and initial scope.
250 - </li>
251 - <li>
252 - <strong>You receive a reply</strong>
253 - Agnease replies with clarifying questions or suggested next steps.
254 - </li>
255 - <li>
256 - <strong>A short call can be scheduled</strong>
257 - If useful, we discuss scope, timeline and estimated effort together.
258 - </li>
259 - </ol>
169 + <div class="widget">
170 + <h4>$services.icon.renderHTML('right') What happens next?</h4>
171 + <ol>
172 + <li>Your request is reviewed.</li>
173 + <li>You receive a reply with clarifying questions or suggested next steps.</li>
174 + <li>If useful, we schedule a short call to discuss scope, timeline, and estimated effort.</li>
175 + </ol>
176 + </div>
260 260   </div>
261 261   </div>
262 262  {{/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 -}