Перейти к содержимому

Изменения документа Создать новую Вики

Редактировал(а) IT IT 2025/05/22 16:51
От версии 1.1
отредактировано IT IT
на 2022/04/14 13:33
Изменить комментарий: Install extension [org.xwiki.platform:xwiki-platform-wiki-ui-mainwiki/14.2.1]
К версии 3.1
отредактировано IT IT
на 2025/05/22 16:51
Изменить комментарий: Install extension [org.xwiki.platform:xwiki-platform-wiki-ui-mainwiki/17.3.0]

Сводка

Подробности

Свойства страницы
Содержимое
... ... @@ -47,7 +47,7 @@
47 47  #macro(wizardHeader $title $currentStepNumber)
48 48   ## Display a step name in the header
49 49   #macro(wizardHeaderStep $name $number $currentStepNumber)
50 - <li><span class="number #if($currentStepNumber==$number)active#end">$number</span> <span class="name #if($currentStepNumber==$number)active#end">$name</span></li>
50 + <li><span class="btn btn-xs number #if($currentStepNumber==$number)step-active#end">$number</span> <span class="name #if($currentStepNumber==$number)step-active#end">$name</span></li>
51 51   #end
52 52  
53 53   <div class="wizard-header">
... ... @@ -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}}
527 + {{html clean="false"}}
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,15 +545,21 @@
545 545   </div>
546 546   #end
547 547   #set($hasErrors = $status.logTail.hasLogLevel('ERROR'))
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>
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"}}
557 557   </div>
558 558   ## Log
559 559   #template('logging_macros.vm')
... ... @@ -622,18 +622,24 @@
622 622   #end
623 623   #else
624 624   #set($wikiId = $request.wikiId)
625 - {{html}}
631 + {{html clean="false"}}
626 626   #wizardHeader($services.localization.render('platform.wiki.create.wizard.step.cleaningUp'))
627 627   <div class="wizard-body">
634 + {{/html}}
628 628   #if($request.deleteOk)
629 - <p class="successmessage box">
630 - $services.localization.render('platform.wiki.create.wizard.step.cleaningup.success', ["<strong>$wikiId</strong>"])
631 - </p>
636 +
637 + {{success}}
638 + {{html}}$services.localization.render('platform.wiki.create.wizard.step.cleaningup.success', ["<strong>$wikiId</strong>"]){{/html}}
639 + {{/success}}
640 +
632 632   #else
633 - <p class="errormessage box">
634 - $services.localization.render('platform.wiki.create.wizard.step.cleaningup.error', ["<strong>$wikiId</strong>"])
635 - </p>
642 +
643 + {{error}}
644 + {{html}}$services.localization.render('platform.wiki.create.wizard.step.cleaningup.error', ["<strong>$wikiId</strong>"]){{/html}}
645 + {{/error}}
646 +
636 636   #end
648 + {{html clean="false"}}
637 637   </div>
638 638   </form>
639 639   {{/html}}
XWiki.JavaScriptExtension[1]
Код
... ... @@ -28,13 +28,13 @@
28 28   $('ui-progress').addClassName('hidden');
29 29   // We need to know if we have error
30 30   if (response.error.length > 0) {
31 - $('errorMessage').removeClassName('hidden');
31 + $$('.errorMessage')[0].removeClassName('hidden');
32 32   $('cleanUp').removeClassName('hidden');
33 33   } else {
34 34   // Success
35 - $('successMessage').removeClassName('hidden');
35 + $$('.successMessage')[0].removeClassName('hidden');
36 36   if (response.hasErrorLog) {
37 - $('errorlogMessage').removeClassName('hidden');
37 + $$('.errorlogMessage')[0].removeClassName('hidden');
38 38   $('cleanUp').removeClassName('hidden');
39 39   }
40 40   $('finalize').removeClassName('hidden');
XWiki.StyleSheetExtension[1]
Код
... ... @@ -22,7 +22,7 @@
22 22  
23 23  .ui-progress-background {
24 24   background-color: transparent;
25 - border-radius: 8px 8px 8px 8px;
25 + border-radius: 10px 10px 10px 10px;
26 26   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.3) inset, 0 1px 0 0 $theme.pageContentBackgroundColor;
27 27   height: 8px;
28 28  }
... ... @@ -29,7 +29,7 @@
29 29  
30 30  .ui-progress-bar {
31 31   background-color: $theme.backgroundSecondaryColor;
32 - border-radius: 8px 8px 8px 8px;
32 + border-radius: 10px 10px 10px 10px;
33 33   height: 8px;
34 34  }
35 35