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

From version 16.58
edited by Alex Cotiuga
on 2026/06/16 17:18
Change comment: There is no comment for this version
To version 18.27
edited by Alex Cotiuga
on 2026/07/09 21:01
Change comment: There is no comment for this version

Summary

Details

Page properties
Default language
... ... @@ -1,1 +1,0 @@
1 -en
Hidden
... ... @@ -1,1 +1,1 @@
1 -false
1 +true
Content
... ... @@ -12,7 +12,8 @@
12 12   'hosting',
13 13   'customDevelopment',
14 14   'timeline',
15 - 'users'
15 + 'users',
16 + 'sourcePage'
16 16   ])
17 17  
18 18   #set ($name = '')
... ... @@ -120,17 +120,70 @@
120 120  
121 121   ## Save only known ContactRequest fields.
122 122   #foreach ($parameterName in $request.parameterNames)
124 + #if ($parameterName == 'sourcePage')
125 + #set ($discard = $contactRequestObj.set($parameterName, $stringtool.trim($request.get($parameterName))))
126 + #end
123 123   #set ($propertyParts = $parameterName.split('_0_'))
124 124   #if ($propertyParts.size() > 1)
125 125   #set ($propertyName = $propertyParts[1])
126 126  
127 127   #if ($allowedProperties.contains($propertyName))
128 - #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
132 + #set ($discard = $contactRequestObj.set($propertyName, $stringtool.trim($request.get($parameterName))))
129 129   #end
130 130   #end
131 131   #end
132 132  
133 133   #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 ($sourcePage = "$!contactRequestObj.getValue('sourcePage')")
143 +
144 + #set ($notificationSubject = 'New Agnease contact request')
145 + #if ($sourcePage != '')
146 + #set ($notificationSubject = "New Agnease contact request from $sourcePage")
147 + #end
148 +
149 + #set ($notificationBody = "
150 + New Agnease contact request
151 +
152 + Name:
153 + $!contactRequestObj.get('name')
154 +
155 + Email:
156 + $!contactRequestObj.get('email')
157 +
158 + Source page:
159 + $!contactRequestObj.get('sourcePage')
160 +
161 + Already uses XWiki:
162 + $!contactRequestObj.get('alreadyUseXWiki')
163 +
164 + Hosting:
165 + $!contactRequestObj.get('hosting')
166 +
167 + Custom development:
168 + $!contactRequestObj.get('customDevelopment')
169 +
170 + Timeline:
171 + $!contactRequestObj.get('timeline')
172 +
173 + Users:
174 + $!contactRequestObj.get('users')
175 +
176 + Message:
177 + $!contactRequestObj.get('scope')
178 +
179 + Internal request page:
180 + $xwiki.getURL($contactRequestDoc.fullName)
181 + ")
182 +
183 + #set ($message = $services.mail.sender.createMessage($notificationRecipient, $notificationSubject))
184 + #set ($discard = $message.setType('Agnease Contact Request'))
185 + #set ($discard = $message.addPart('text/plain', $notificationBody))
186 + #set ($mailResult = $services.mail.sender.sendAsynchronously([$message], 'database'))
187 + #end
134 134   #set ($statusCode = 200)
135 135   #set ($message = 'Your request was successfully sent.')
136 136   #end
... ... @@ -162,28 +162,31 @@
162 162   ## As a measure to avoid high load on website.
163 163   Tell us more about your project at <a href="mailto:alex@agnease.com">alex@agnease.com</a>
164 164   #else
219 + #set ($hiddenProperties = ['sourcePage'])
165 165   <form id="contactForm">
166 166   <dl>
167 167   #foreach ($property in $xclass.properties)
168 - #if ($property.name == 'hosting')
169 - <hr>
170 - <h3>Optional project details</h3>
171 - <p>These details help us understand the scope and suggest practical next steps.</p>
223 + #if (!$hiddenProperties.contains($property.name))
224 + #if ($property.name == 'hosting')
225 + <hr>
226 + <h3>Optional project details</h3>
227 + <p>These details help us understand the scope and suggest practical next steps.</p>
228 + #end
229 + <dt #if (!$editing && $hasEdit)
230 + class="editableProperty"
231 + #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
232 + data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
233 + data-property-type="object"#end>
234 + ## This must match the id generated by the $doc.display() method below.
235 + #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
236 + <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
237 + $escapetool.xml($property.translatedPrettyName)
238 + </label>
239 + ## Support for specifying a translation key as hint in the property definition.
240 + <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
241 + </dt>
242 + <dd>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
172 172   #end
173 - <dt #if (!$editing && $hasEdit)
174 - class="editableProperty"
175 - #set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
176 - data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
177 - data-property-type="object"#end>
178 - ## This must match the id generated by the $doc.display() method below.
179 - #set ($propertyId = "${xclass.name}_${xobject.number}_$property.name")
180 - <label#if ($editing) for="$escapetool.xml($propertyId)"#end>
181 - $escapetool.xml($property.translatedPrettyName)
182 - </label>
183 - ## Support for specifying a translation key as hint in the property definition.
184 - <span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
185 - </dt>
186 - <dd>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
187 187   #end
188 188   #if (!$xclass.properties || $xclass.properties.size() == 0)
189 189   ## Keep the empty definition term in order to have valid HTML.
... ... @@ -204,6 +204,7 @@
204 204   />
205 205   </div>
206 206   <input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
264 + <input type="hidden" name="sourcePage" />
207 207   <input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
208 208   </form>
209 209   #end
... ... @@ -224,9 +224,13 @@
224 224   {{/html}}
225 225   {{html clean="false"}}
226 226   </div>
227 - <div class="col-md-5">
228 - <div class="widget">
229 - <h4>$services.icon.renderHTML('check') How Agnease can help</h4>
285 + <div class="col-md-5 contact-side-panel">
286 + <div class="split-copy contact-help-panel">
287 + <h2>
288 + <i class="fa fa-check-circle" aria-hidden="true"></i>
289 + How Agnease can help
290 + </h2>
291 +
230 230   <ul>
231 231   <li>XWiki upgrades and long-term maintenance</li>
232 232   <li>Knowledge bases, intranets, SOP and documentation workflows</li>
... ... @@ -236,14 +236,21 @@
236 236   <li>Security-aware reviews and platform stabilization</li>
237 237   </ul>
238 238   </div>
239 - <div class="widget">
240 - <h4>$services.icon.renderHTML('right') What happens next?</h4>
241 - <ol>
242 - <li>Your request is reviewed.</li>
243 - <li>You receive a reply with clarifying questions or suggested next steps.</li>
244 - <li>If useful, we schedule a short call to discuss scope, timeline, and estimated effort.</li>
245 - </ol>
246 - </div>
301 +
302 + <ol class="process-list contact-process-list">
303 + <li>
304 + <strong>Your request is reviewed</strong>
305 + The project description is checked to understand the context and initial scope.
306 + </li>
307 + <li>
308 + <strong>You receive a reply</strong>
309 + Agnease replies with clarifying questions or suggested next steps.
310 + </li>
311 + <li>
312 + <strong>A short call can be scheduled</strong>
313 + If useful, we discuss scope, timeline and estimated effort together.
314 + </li>
315 + </ol>
247 247   </div>
248 248   </div>
249 249  {{/html}}
XWiki.StyleSheetExtension[0]
code
... ... @@ -1,71 +1,17 @@
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;
1 +/* ===== Contact page side panel ===== */
10 10  
11 -/* ===== Contact page widgets ===== */
12 -#mainContentArea {
13 - padding: 0;
3 +.contact-side-panel {
4 + padding-top: 10px;
14 14  }
15 15  
16 -.col-xs-5 {
17 - padding-top: 45px;
7 +.contact-help-panel {
8 + margin-bottom: 18px;
18 18  }
19 19  
20 -.col-xs-5 .widget {
21 - margin-bottom: 16px;
22 - padding: 16px;
11 +.contact-process-list li {
12 + min-height: auto;
23 23  }
24 24  
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 -}
69 69  /* CSS for hidden field to identify requests filled by bots. */
70 70  .contact-hp-wrapper {
71 71   position: absolute;
... ... @@ -74,3 +74,9 @@
74 74   height: 1px;
75 75   overflow: hidden;
76 76  }
23 +
24 +@media (max-width: 991px) {
25 + .contact-side-panel {
26 + padding-top: 24px;
27 + }
28 +}
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