Changes for page Get in Touch About Your XWiki Project

Summary

• Page properties (3 modified, 0 added, 0 removed)
• Objects (1 modified, 0 added, 0 removed)
  • XWiki.StyleSheetExtension[0]

Details

Page properties

Default language

...	...	@@ -1,1 +1,0 @@
1		-en

Hidden

...	...	@@ -1,1 +1,1 @@
1		-false
	1	+true

Content

...	...	@@ -3,56 +3,115 @@
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	+
6	6	#set ($name = '')
7	7	#set ($email = '')
8	8	#set ($scope = '')
9		- ## Fields to help preventing bots filled forms.
10	10	#set ($contactWebsite = '')
11	11	#set ($startedAtRaw = '')
	24	+ #set ($sourcePage = '')
12	12
	26	+ ## Extract only the values we need for validation.
13	13	#foreach ($parameterName in $request.parameterNames)
14	14	#set ($propertyParts = $parameterName.split('_0_'))
15	15	#if ($propertyParts.size() > 1)
16		- #set ($propertyName = $parameterName.split('_0_')[1])
	30	+ #set ($propertyName = $propertyParts[1])
	31	+ #set ($propertyValue = $stringtool.trim($request.get($parameterName)))
	32	+
17	17	#if ($propertyName == 'name')
18		- #set ($name = $stringtool.trim($request.get($parameterName)))
	34	+ #set ($name = $propertyValue)
19	19	#elseif ($propertyName == 'email')
20		- #set ($email = $stringtool.trim($request.get($parameterName)))
	36	+ #set ($email = $propertyValue)
21	21	#elseif ($propertyName == 'scope')
22		- #set ($scope = $stringtool.trim($request.get($parameterName)))
	38	+ #set ($scope = $propertyValue)
23	23	#elseif ($propertyName == 'contactWebsite')
24		- #set ($contactWebsite = $stringtool.trim($request.get($parameterName)))
	40	+ #set ($contactWebsite = $propertyValue)
25	25	#elseif ($propertyName == 'contactStartedAt')
26		- #set ($startedAtRaw = $stringtool.trim($request.get($parameterName)))
	42	+ #set ($startedAtRaw = $propertyValue)
27	27	#end
28	28	#end
29	29	#end
30	30
31		- #if ("$!startedAtRaw" != '')
	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
32	32	#set ($startedAt = $numbertool.toNumber($startedAtRaw))
33		- #set ($now = $datetool.systemDate.time)
34		- #set ($elapsed = $now - $startedAt)
	60	+ #if ("$!startedAt" == '')
	61	+ #set ($spamScore = $spamScore + 2)
	62	+ #else
	63	+ #set ($now = $datetool.systemDate.time)
	64	+ #set ($elapsed = $now - $startedAt)
35	35
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.')
	66	+ ## Reject very fast submissions.
	67	+ #if ($elapsed > 0 && $elapsed < 10000)
	68	+ #set ($spamScore = $spamScore + 3)
	69	+ #end
40	40	#end
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)
	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" == '')
46	46	#set ($message = 'Please enter your name and email.')
47	47	#elseif ("$!name" == '')
48		- #set ($statusCode = 400)
49	49	#set ($message = 'Please enter your name.')
50	50	#elseif ("$!email" == '')
51		- #set ($statusCode = 400)
52	52	#set ($message = 'Please enter your email address.')
53	53	#elseif ("$!scope" == '' || $scope.length() < 30)
54		- #set ($statusCode = 400)
55	55	#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.')
56	56	#else
57	57	#try('contactException')
58	58	#set ($now = $datetool.get('yyyyMMddHHmm'))
...	...	@@ -59,13 +59,22 @@
59	59	#set ($random = $mathtool.random(100000, 999999))
60	60	#set ($uniqueName = "ContactRequest-${now}-${random}")
61	61	#set ($contactRequestDoc = $xwiki.getDocumentAsAuthor('ContactRequests.' + $uniqueName))
62		- #set ($contactRequestObj = $contactRequestDoc.getObject('Agnease.Code.ContactRequest.ContactRequestClass', true))
	121	+ #set ($contactRequestObj = $contactRequestDoc.getObject($className, true))
63	63
	123	+ ## Save only known ContactRequest fields.
64	64	#foreach ($parameterName in $request.parameterNames)
65		- #set ($propertyName = $parameterName.split('_0_')[1])
66		- #if ($propertyName != 'contactWebsite' && $propertyName != 'contactStartedAt')
67		- #set ($discard = $contactRequestObj.set($propertyName, $request.get($parameterName)))
	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))))
68	68	#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
69	69	#end
70	70
71	71	#set ($discard = $contactRequestDoc.saveAsAuthor())
...	...	@@ -100,15 +100,20 @@
100	100	## As a measure to avoid high load on website.
101	101	Tell us more about your project at <a href="mailto:alex@agnease.com">alex@agnease.com</a>
102	102	#else
	171	+ #set ($hiddenProperties = ['sourcePage'])
103	103	<form id="contactForm">
104	104	<dl>
105	105	#foreach ($property in $xclass.properties)
	175	+ #set ($hiddenPropertiesCSS = '')
	176	+ #if ($hiddenProperties.contains($property.name))
	177	+ #set ($hiddenPropertiesCSS = 'class="hidden"')
	178	+ #end
106	106	#if ($property.name == 'hosting')
107	107	<hr>
108	108	<h3>Optional project details</h3>
109	109	<p>These details help us understand the scope and suggest practical next steps.</p>
110	110	#end
111		- <dt #if (!$editing && $hasEdit)
	184	+ <dt $hiddenPropertiesCSS #if (!$editing && $hasEdit)
112	112	class="editableProperty"
113	113	#set ($xobjectPropertyReference = $xobject.getPropertyReference($property.name))
114	114	data-property="$escapetool.xml($services.model.serialize($xobjectPropertyReference))"
...	...	@@ -121,7 +121,7 @@
121	121	## Support for specifying a translation key as hint in the property definition.
122	122	<span class="xHint">$!escapetool.xml($services.localization.render($property.hint))</span>
123	123	</dt>
124		- <dd>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
	197	+ <dd $hiddenPropertiesCSS>$doc.display($property.name, 'edit').replace('{{html clean="false" wiki="false"}}', '').replace("{{/html}}", '')</dd>
125	125	#end
126	126	#if (!$xclass.properties || $xclass.properties.size() == 0)
127	127	## Keep the empty definition term in order to have valid HTML.
...	...	@@ -134,7 +134,7 @@
134	134	<div class="contact-hp-wrapper" aria-hidden="true">
135	135	<label for="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite">Website</label>
136	136	<input
137		- id="contactWebsite"
	210	+ id="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite"
138	138	type="text"
139	139	name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactWebsite"
140	140	autocomplete="off"
...	...	@@ -142,6 +142,7 @@
142	142	/>
143	143	</div>
144	144	<input type="hidden" name="Agnease.Code.ContactRequest.ContactRequestClass_0_contactStartedAt" value="$datetool.systemDate.time" />
	218	+ <input type="hidden" name="sourcePage" value="$!{request.sourcePage}" />
145	145	<input id="contactSubmit" type="submit" class="btn btn-primary" value="Send my request">
146	146	</form>
147	147	#end
...	...	@@ -162,9 +162,13 @@
162	162	{{/html}}
163	163	{{html clean="false"}}
164	164	</div>
165		- <div class="col-md-5">
166		- <div class="widget">
167		- <h4>$services.icon.renderHTML('check') How Agnease can help</h4>
	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	+
168	168	<ul>
169	169	<li>XWiki upgrades and long-term maintenance</li>
170	170	<li>Knowledge bases, intranets, SOP and documentation workflows</li>
...	...	@@ -174,14 +174,21 @@
174	174	<li>Security-aware reviews and platform stabilization</li>
175	175	</ul>
176	176	</div>
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>
	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>
185	185	</div>
186	186	</div>
187	187	{{/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	+}