XWIKI-22433: Provide consistency in info / warning / error class usages in templates

xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminUsersSheet.xml

@@ -244,7 +244,10 @@
 #macro (maybeShowDeleteUserWarning $userReference $right)
   #countPagesLastModifiedBy($userReference)
   #if ($pageCount > 0)
-    <div class="box errormessage xform">
+    {{/html}}
+
+    {{error cssClass="xform"}}
+      {{html clean="false"}}
       #set ($pageIndexReference = $services.model.createDocumentReference(
         $userReference.wikiReference.name, 'Main', 'AllDocs'))
       #set ($pageIndexURL = $xwiki.getURL($pageIndexReference) + '#|t=alldocs&doc.author=' +
@@ -273,7 +276,10 @@
             [$rightTranslation]))</span>
         </dd>
       </dl>
-    </div>
+      {{/html}}
+    {{/error}}
+
+    {{html clean="false"}}
   #end
 #end
 

xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ColorThemePropertyDisplayer.xml

@@ -129,7 +129,7 @@
   <div class="XWikiColorThemeDisplayer">
     #set ($colorThemeExists = $xwiki.exists($services.model.resolveDocument($value)))
     #if ("$!value" != '' && !$colorThemeExists)
-      <p class="errormessage">$services.localization.render('admin.colorthemes.invalidtheme', $escapetool.xml($value))</p>
+      #error(<p>$services.localization.render('admin.colorthemes.invalidtheme', $escapetool.xml($value))</p>)
     #end
 
     #if ($isSubWiki && (!$flamingoThemesFromMainWiki.isEmpty() || !$colibriThemesFromMainWiki.isEmpty()))

xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ConfigurableClass.xml

@@ -429,7 +429,7 @@ $xwiki.jsfx.use('js/xwiki/actionbuttons/actionButtons.js', true)
       $escapetool.xml($sectionDisplayName)
       </span>
       #if(!$hasAccess)
-        <br/><span class="errormessage">$services.localization.render('xe.admin.configurable.sectionIconNoAccess')</span>
+        <br/>#inlineError($services.localization.render('xe.admin.configurable.sectionIconNoAccess'))
       #end
       </a>
     </li>

xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/main/resources/AnnotationCode/Macros.xml

@@ -119,7 +119,7 @@
         #displayAnnotationBoxButtons('edit')
       </form>
     #else
-      <div class="box infomessage">$services.localization.render('annotations.action.edit.error.notfound')</div>
+      #info($services.localization.render('annotations.action.edit.error.notfound'))
     #end
   </div>
 #end
@@ -152,7 +152,7 @@
       ##<div class="clearfloats"></div>
       #displayAnnotationFromReference($ann $mode $docRef)
     #else
-      <div class="box infomessage">$services.localization.render('annotations.action.view.error.notfound')</div>
+      #info($services.localization.render('annotations.action.view.error.notfound'))
     #end
   </div>
 #end

xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/main/resources/AnnotationCode/Settings.xml

@@ -148,10 +148,10 @@
       </div>
       <div class="clearfloats" />
     #else
-      <div class="box infomessage">$services.localization.render('annotations.settings.error.wrongsyntax')</div>
+      #info($services.localization.render('annotations.settings.error.wrongsyntax'))
     #end
   #else
-    <div class="box infomessage">$services.localization.render('annotations.settings.error.notarget')</div>
+    #info($services.localization.render('annotations.settings.error.notarget'))
   #end
 </div>
 {{/html}}

xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/ClassEditSheet.xml

@@ -228,9 +228,7 @@ xcontext.put('propertyCustomDisplayer', new PropertyCustomDisplayer(xcontext))
           ["#pageLink($sheetReference)"])
       </span>
     #else
-      <span class="warningmessage">
-        $services.localization.render('platform.appwithinminutes.classEditorMultipleSheetsWarning')
-      </span>
+        #inlineWarning($services.localization.render('platform.appwithinminutes.classEditorMultipleSheetsWarning'))
     #end
     </dd>
     <dt>
@@ -705,7 +703,7 @@ xcontext.put('propertyCustomDisplayer', new PropertyCustomDisplayer(xcontext))
   #updateAndSaveTranslations
   #if ($action == 'save')
     #if ($errorMessage)
-      <div class="box errormessage">$errorMessage</div>
+      #error($errorMessage)
     #elseif ("$!request.wizard" == 'true')
       ## Redirect to next wizard step.
       #set ($className = $stringtool.removeEnd($doc.fullName, 'Class'))

xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/CreateApplication.xml

@@ -140,14 +140,10 @@
     </dl>
     #set ($appHomeRef = $services.model.resolveDocument('', 'default', $appReference))
     #if ($appDescriptor || $xwiki.exists($appHomeRef) || $xwiki.exists($appClassRef))
-      <div class="box warningmessage">
-        $services.localization.render('platform.appwithinminutes.appNameIsUsedWarning')
-      </div>
+      #warning($services.localization.render('platform.appwithinminutes.appNameIsUsedWarning'))
     #end
     #if (!$services.security.authorization.hasAccess('script', $xcontext.userReference, $appHomeRef))
-      <div class="box errormessage">
-        $escapetool.xml($services.localization.render('platform.appwithinminutes.appHomePageNoScriptRight'))
-      </div>
+      #error($escapetool.xml($services.localization.render('platform.appwithinminutes.appHomePageNoScriptRight')))
     #end
   #end
 #end

xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/LiveTableEditSheet.xml

@@ -337,9 +337,9 @@
   #updateAndSaveIcon()
   #if ($action == 'save')
     #if ($errorMessage)
-      {{html clean="false"}}
-      <div class="box errormessage">$errorMessage</div>
-      {{/html}}
+
+      {{error}}{{html clean="false"}}$errorMessage{{/html}}{/error}}
+
     #else
       ## Redirect to view mode.
       $response.sendRedirect($doc.getURL())

xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/LiveTableViewSheet.xml

@@ -183,14 +183,8 @@
 #end
 
 #macro (renameAppModalBody)
-  <div class="box infomessage">
-    $services.icon.renderHTML('info')
-    $services.localization.render('appWithinMinutes.renameApp.changeAppTitleInfo')
-  </div>
-  <div class="box warningmessage">
-    $services.icon.renderHTML('warning')
-    $services.localization.render('appWithinMinutes.renameApp.regenerateAppCodeWarning')
-  </div>
+  #info($services.localization.render('appWithinMinutes.renameApp.changeAppTitleInfo'))
+  #warning($services.localization.render('appWithinMinutes.renameApp.regenerateAppCodeWarning'))
   <div class="hidden">
     <input type="hidden" name="form_token" value="$!escapetool.xml($services.csrf.token)" />
     <input type="hidden" name="oldAppReference" value="$escapetool.xml(
@@ -242,7 +236,7 @@
   #set ($classFullName = $doc.getValue('class'))
   #if ("$!classFullName" == '' || !$xwiki.exists($classFullName))
     {{warning}}
-    $services.icon.render('warning') {{translation key="platform.appwithinminutes.appHomePageMovedWarning"/}}
+      {{translation key="platform.appwithinminutes.appHomePageMovedWarning"/}}
     {{/warning}}
 
   #end

xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/src/main/resources/templates/attachment/moveStatus.vm

@@ -67,7 +67,5 @@
   #end
 #else
   $response.setStatus(404)
-<div class="box errormessage">
-  $escapetool.xml($services.localization.render('attachment.move.status.notFound'))
-</div>
+  #error($escapetool.xml($services.localization.render('attachment.move.status.notFound')))
 #end

xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-ui/src/main/resources/XWiki/Extension/Security/Code/Admin.xml

@@ -89,7 +89,9 @@
 
 #set ($indexJobStatus = $services.job.getJobStatus(['extension_security']))
 #if ($indexJobStatus)
-  <div class="box infomessage">
+  ## We use the velocity macro here instead of the XWiki macro, in order to keep HTML in the content
+  ## With the XWiki macro, the progress bar is not properly rendered.
+  #define ($infoMessageContent)
     #if ($indexJobStatus.state != 'FINISHED')
       $escapetool.xml($services.localization.render('extension.security.indexed.started', [$xwiki.formatDate($indexJobStatus.startDate)]))
       #set ($discard = $xwiki.jsfx.use('uicomponents/job/job.js'))
@@ -101,13 +103,14 @@
       <div class="xcontent job-status" data-url="$escapetool.xml($jobStatusURL)">
         #displayJobProgressBar($indexJobStatus, true)
       </div>
-      #else
-        $escapetool.xml($services.localization.render('extension.security.indexed.on', [$xwiki.formatDate($indexJobStatus.startDate)]))
-      #end
-</div>
     #else
-      <div class="box warningmessage">$escapetool.xml($services.localization.render('extension.security.indexed.nojob'))</div>
+      $escapetool.xml($services.localization.render('extension.security.indexed.on', [$xwiki.formatDate($indexJobStatus.startDate)]))
     #end
+  #end
+  #info($infoMessageContent)
+  #else
+    {{warning}}$escapetool.xml($services.localization.render('extension.security.indexed.nojob')){{/warning}}
+  #end
   {{/html}}
 #end
 {{/velocity}}

xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-ui/src/main/resources/XWiki/Extension/Security/Code/NotificationAlert.xml

@@ -307,9 +307,7 @@
     #set ($parameters = [$count, $htmlLink])
     {{html wiki='false' clean='false'}}
       <li>
-        <div class='box errormessage'>
-          $services.localization.render('extension.security.notification.message', $parameters)
-        </div>
+        #error($services.localization.render('extension.security.notification.message', $parameters))
       </li>
     {{/html}}
   #end

xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-ui/src/main/resources/XWiki/Extensions.xml

@@ -116,13 +116,13 @@
 
     #if ($recommended)
       #if (!$extensions.iterator().hasNext())
-        <div class="box warningmessage">$services.localization.render('extensions.search.recommended.fallback', ["<em>$!escapetool.xml($request.search)</em>"])</div>
+        #warning($services.localization.render('extensions.search.recommended.fallback', ["<em>$!escapetool.xml($request.search)</em>"]))
         ## Search again with the recommended filter
         #set ($extensions = $repository.search("$!request.search", $paginationParams.firstItem, $paginationParams.itemsPerPage))
         #set ($totalHits = $extensions.totalHits)
         #set ($recommended = false)
       #elseif (!$customExtensionFilter)
-        <div class="box infomessage">
+        #define ($infoHeaderContent)
           #if ($compatible)
             $services.localization.render('extensions.search.compatiblerecommended.disclaimer')
           #else
@@ -142,12 +142,13 @@
               <input type="submit" value="${escapetool.xml($services.localization.render('extensions.search.all.label'))}" class="btn btn-default"/>
             #end
           </form>
-        </div>
+        #end
+        #info("$infoHeaderContent")
       #end
     #end
 
     #if (!$extensions.iterator().hasNext())
-      <div class="box infomessage">$services.localization.render($noResultsMessageKey, ["<em>$!escapetool.xml($request.search)</em>"])</div>
+      #info($services.localization.render($noResultsMessageKey, ["<em>$!escapetool.xml($request.search)</em>"]))
     #else
       #if ($totalHits && $totalHits > $paginationParams.itemsPerPage)
         #set ($hasPagination = true)
@@ -165,39 +166,46 @@
     #end
 
     #if ($indexed)
+      #define ($formContent)
+        <form action="${xwiki.relativeRequestURL}">
+          #if ($request.section)
+            <input type="hidden" name="section" value="${escapetool.xml($request.section)}" />
+          #end
+          <input type="hidden" name="search" value="$!{escapetool.xml($request.search)}" />
+          <input type="hidden" name="recommended" value="$recommended" />
+          <input type="hidden" name="indexed" value="$indexed" />
+          <input type="hidden" name="compatible" value="$compatible" />
+          #if ($indexJobStatus.state != 'RUNNING')
+            <input type="submit" value="${escapetool.xml($services.localization.render('extensions.search.indexed.reindex'))}" name="index_start" class="btn btn-default"/>
+          #end
+        </form>
+      #end
       #set ($indexJobStatus = $repository.getStatus("wiki:${xcontext.database}"))
       #if ($indexJobStatus)
-        <div class="box infomessage">
         #if ($indexJobStatus.state != 'FINISHED')
-          $escapetool.xml($services.localization.render('extensions.search.indexed.started', [$xwiki.formatDate($indexJobStatus.startDate)]))
           #set ($discard = $xwiki.jsfx.use('uicomponents/job/job.js'))
           #set ($jobStatusURL = $doc.getURL('get', $escapetool.url({
               'xpage': 'job_status_json',
               'outputSyntax': 'plain',
               'jobId': $indexJobStatus.request.id
             })))
-          <div class="xcontent job-status" data-url="$escapetool.xml($jobStatusURL)">
-            #displayJobProgressBar($indexJobStatus, true)
-          </div>
+          #define ($infoFooterContent)
+            $escapetool.xml($services.localization.render('extensions.search.indexed.started', [$xwiki.formatDate($indexJobStatus.startDate)]))
+            <div class="xcontent job-status" data-url="$escapetool.xml($jobStatusURL)">
+              #displayJobProgressBar($indexJobStatus, true)
+            </div>
+          #end
         #else
-          $escapetool.xml($services.localization.render('extensions.search.indexed.on', [$xwiki.formatDate($indexJobStatus.startDate)]))
+          #define ($infoFooterContent)
+            $escapetool.xml($services.localization.render('extensions.search.indexed.on', [$xwiki.formatDate($indexJobStatus.startDate)]))
+          #end
         #end
+        #info("$infoFooterContent
+          $formContent")
       #else
-        <div class="box warningmessage">$escapetool.xml($services.localization.render('extensions.search.indexed.nojob'))
+        #warning("$escapetool.xml($services.localization.render('extensions.search.indexed.nojob'))
+          $formContent")
       #end
-        <form action="${xwiki.relativeRequestURL}">
-          #if ($request.section)
-            <input type="hidden" name="section" value="${escapetool.xml($request.section)}" />
-          #end
-          <input type="hidden" name="search" value="$!{escapetool.xml($request.search)}" />
-          <input type="hidden" name="recommended" value="$recommended" />
-          <input type="hidden" name="indexed" value="$indexed" />
-          <input type="hidden" name="compatible" value="$compatible" />
-          #if ($indexJobStatus.state != 'RUNNING')
-            <input type="submit" value="${escapetool.xml($services.localization.render('extensions.search.indexed.reindex'))}" name="index_start" class="btn btn-default"/>
-          #end
-        </form>
-      </div>
     #end
   #end
   </div>

xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-ui/src/main/resources/Filter/FilterStreamJobJSON.xml

@@ -43,13 +43,9 @@
   #set($finished = $jobStatus.state.name() == 'FINISHED')
   #if ($finished)
     #if (!$jobStatus.logTail.hasLogLevel('ERROR'))
-      <div class="box successmessage">
-        Done.
-      </div>
+      #success('Done.')
     #else
-      <div class="box errormessage">
-        Error has been found during the conversion !
-      </div>
+      #error('Error has been found during the conversion !')
     #end
   #end
 #end

xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/copy.vm

@@ -292,9 +292,7 @@
     #end
   #else
     $response.setStatus(404)
-    <div class="box errormessage">
-      $services.localization.render('core.copy.status.notFound')
-    </div>
+    #error($services.localization.render('core.copy.status.notFound'))
   #end
 #end
 

xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/editobject.vm

@@ -30,6 +30,21 @@
  * Displays a class name without its space prefix. XML-escapes the output.
  *#
 #macro(cleanClassname $classname)$!{escapetool.xml($classname.substring($classname.indexOf('.')).substring(1))}#end
+
+#*
+ * Displays a warning box, with an extra class. Note that the implementation of this macro should be very close to the 
+ * one of the #warning macro defined in the web templates macros.
+ * This is the only place where we use this extraClass feature, so the implementation is contained here.
+ * Note that the exact context this content is rendered in is not fixed, using the XWiki macro 
+ * would have ended up in unstable behaviour.
+ *#
+#macro (warningWithExtraClass $text $extraClass)
+<div class="box warningmessage ${extraClass}">
+  <span class="icon-block">$services.icon.renderHTML('warning')</span>
+  <span class="sr-only">$services.localization.render('warning')</span>
+  $text
+</div>
+#end
 ##
 #*
  * Display an object
@@ -79,7 +94,7 @@
   </dl>
   #set ($deprecatedProperties = $class.getDeprecatedObjectProperties($obj))
   #if ($deprecatedProperties.size() > 0)
-    <div class="box warningmessage deprecatedProperties">
+    #define ($warningMessageContent)
       <strong>$services.localization.render('core.editors.object.removeDeprecatedProperties.info', [${escapetool.xml($class.name)}])</strong>
       <dl>
         #foreach ($prop in $deprecatedProperties)
@@ -94,7 +109,8 @@
           $services.localization.render('core.editors.object.removeDeprecatedProperties.link')
         </a>
       </div>
-    </div>
+    #end
+    #warningWithExtraClass($warningMessageContent 'deprecatedProperties')
   #end
 </div>
 #end
@@ -245,10 +261,11 @@
     #if ($mustSync) #break #end
   #end
   #if ($mustSync)
-    <div class="box warningmessage deprecatedProperties">
+    #define ($warningMessageContent)
       $services.localization.render('core.editors.object.removeDeprecatedProperties.all.info')
       <div><a class="syncProperties syncAllProperties" href="$doc.getURL('objectsync')" title="$services.localization.render('core.editors.object.removeDeprecatedProperties.all.link.tooltip')">$services.localization.render('core.editors.object.removeDeprecatedProperties.all.link')</a></div>
-    </div>
+    #end
+    #warningWithExtraClass($warningMessageContent 'deprecatedProperties')
   #end
 #end ## checkPropertyDeprecation
 ##

xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/macros.vm

@@ -248,7 +248,7 @@
             #livetable_filters($collist $colprops $classname)
             <tr class="xwiki-livetable-initial-message">
               <td colspan="${columnCount}">
-                <div class="warningmessage">$services.localization.render('platform.livetable.environmentCannotLoadTableMessage')</div>
+                #warning($services.localization.render('platform.livetable.environmentCannotLoadTableMessage'))
               </td>
             </tr>
           </thead>

xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/renameStatus.vm

@@ -94,7 +94,5 @@
   #end
 #else
   $response.setStatus(404)
-  <div class="box errormessage">
-    $services.localization.render('core.rename.status.notFound')
-  </div>
+  #error($services.localization.render('core.rename.status.notFound'))
 #end