... |
... |
@@ -524,7 +524,7 @@ |
524 |
524 |
#set ($discard = $xwiki.ssfx.use('uicomponents/logging/logging.css', true)) |
525 |
525 |
#set ($discard = $xwiki.jsfx.use('uicomponents/logging/logging.js', true)) |
526 |
526 |
#set ($status = $services.wiki.creationjob.getJobStatus($request.wikiname)) |
527 |
|
- {{html clean="false"}} |
|
527 |
+ {{html}} |
528 |
528 |
<form class="xform" method="post" action="$doc.getURL()"> |
529 |
529 |
<input type="hidden" name="wikiId" id="wikiId" value="$!escapetool.xml($request.wikiname)" /> |
530 |
530 |
<input type="hidden" name="csrf" id="csrf" value="$!escapetool.xml($services.csrf.getToken())" /> |
... |
... |
@@ -545,21 +545,15 @@ |
545 |
545 |
</div> |
546 |
546 |
#end |
547 |
547 |
#set($hasErrors = $status.logTail.hasLogLevel('ERROR')) |
548 |
|
- {{/html}} |
549 |
|
- |
550 |
|
- {{success cssClass="successMessage #if($status.error || $state != 'FINISHED')hidden#end"}} |
551 |
|
- {{html}}$services.localization.render('platform.wiki.create.wizard.step.creation.complete', ["<strong>$escapetool.xml($request.wikiname)</strong>"]){{/html}} |
552 |
|
- {{/success}} |
553 |
|
- |
554 |
|
- {{warning cssClass="errorlogMessage #if(!$hasErrors || $state != 'FINISHED')hidden#end"}} |
555 |
|
- {{html}}$services.localization.render('platform.wiki.create.wizard.step.creation.errorlog', ["<strong>$escapetool.xml($request.wikiname)</strong>"]){{/html}} |
556 |
|
- {{/warning}} |
557 |
|
- |
558 |
|
- {{error cssClass="errorMessage #if(!$status.error || $state != 'FINISHED')hidden#end"}} |
559 |
|
- {{html}}$services.localization.render('platform.wiki.create.wizard.step.creation.error', ["<strong>$escapetool.xml($request.wikiname)</strong>"]){{/html}} |
560 |
|
- {{/error}} |
561 |
|
- |
562 |
|
- {{html clean="false"}} |
|
548 |
+ <p class="successmessage box #if($status.error || $state != 'FINISHED')hidden#end" id="successMessage"> |
|
549 |
+ $services.localization.render('platform.wiki.create.wizard.step.creation.complete', ["<strong>$escapetool.xml($request.wikiname)</strong>"]) |
|
550 |
+ </p> |
|
551 |
+ <p class="warningmessage box #if(!$hasErrors || $state != 'FINISHED')hidden#end" id="errorlogMessage"> |
|
552 |
+ $services.localization.render('platform.wiki.create.wizard.step.creation.errorlog', ["<strong>$escapetool.xml($request.wikiname)</strong>"]) |
|
553 |
+ </p> |
|
554 |
+ <p class="errormessage box #if(!$status.error || $state != 'FINISHED')hidden#end" id="errorMessage"> |
|
555 |
+ $services.localization.render('platform.wiki.create.wizard.step.creation.error', ["<strong>$escapetool.xml($request.wikiname)</strong>"]) |
|
556 |
+ </p> |
563 |
563 |
</div> |
564 |
564 |
## Log |
565 |
565 |
#template('logging_macros.vm') |
... |
... |
@@ -628,24 +628,18 @@ |
628 |
628 |
#end |
629 |
629 |
#else |
630 |
630 |
#set($wikiId = $request.wikiId) |
631 |
|
- {{html clean="false"}} |
|
625 |
+ {{html}} |
632 |
632 |
#wizardHeader($services.localization.render('platform.wiki.create.wizard.step.cleaningUp')) |
633 |
633 |
<div class="wizard-body"> |
634 |
|
- {{/html}} |
635 |
635 |
#if($request.deleteOk) |
636 |
|
- |
637 |
|
- {{success}} |
638 |
|
- {{html}}$services.localization.render('platform.wiki.create.wizard.step.cleaningup.success', ["<strong>$wikiId</strong>"]){{/html}} |
639 |
|
- {{/success}} |
640 |
|
- |
|
629 |
+ <p class="successmessage box"> |
|
630 |
+ $services.localization.render('platform.wiki.create.wizard.step.cleaningup.success', ["<strong>$wikiId</strong>"]) |
|
631 |
+ </p> |
641 |
641 |
#else |
642 |
|
- |
643 |
|
- {{error}} |
644 |
|
- {{html}}$services.localization.render('platform.wiki.create.wizard.step.cleaningup.error', ["<strong>$wikiId</strong>"]){{/html}} |
645 |
|
- {{/error}} |
646 |
|
- |
|
633 |
+ <p class="errormessage box"> |
|
634 |
+ $services.localization.render('platform.wiki.create.wizard.step.cleaningup.error', ["<strong>$wikiId</strong>"]) |
|
635 |
+ </p> |
647 |
647 |
#end |
648 |
|
- {{html clean="false"}} |
649 |
649 |
</div> |
650 |
650 |
</form> |
651 |
651 |
{{/html}} |