Skip to content

Commit

Permalink
Merge branch '6.0' into 6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@BurntimeX
BurntimeX committed May 13, 2024
2 parents 81172da + 1fae129 commit 9e30c41
Show file tree
Hide file tree
Showing 14 changed files with 148 additions and 74 deletions.
3 changes: 3 additions & 0 deletions docs/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ Create a new file called `package.xml` and insert the code below:
<author>Your Name</author>
<authorurl>http://www.example.com</authorurl>
</authorinformation>
<requiredpackages>
<requiredpackage minversion="6.0.0">com.woltlab.wcf</requiredpackage>
</requiredpackages>
<excludedpackages>
<excludedpackage version="7.0.0 Alpha 1">com.woltlab.wcf</excludedpackage>
</excludedpackages>
Expand Down
3 changes: 2 additions & 1 deletion docs/javascript/components_confirmation.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ Some dialogs require additional input elements, for example, the prompt to remov
const { result, dialog } = await confirmationFactory()
.custom(theQuestionToAsk)
.withFormElements((dialog) => {
const p = document.createElement("<p>Hello World</p>");
const p = document.createElement("p");
p.textContent = "Hello World";
dialog.content.append(p);
});
if (result) {
Expand Down
2 changes: 1 addition & 1 deletion docs/javascript/components_pagination.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ The event can be canceled to prevent navigation.

### `jumpToPage`

The `switchPage` event will be fired when the user clicks on one of the ellipsis buttons within the pagination.
The `jumpToPage` event will be fired when the user clicks on one of the ellipsis buttons within the pagination.
4 changes: 2 additions & 2 deletions snippets/package/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
</authorinformation>

<requiredpackages>
<requiredpackage minversion="5.4.10">com.woltlab.wcf</requiredpackage>
<requiredpackage minversion="6.0.0">com.woltlab.wcf</requiredpackage>
</requiredpackages>

<excludedpackages>
<excludedpackage version="6.0.0 Alpha 1">com.woltlab.wcf</excludedpackage>
<excludedpackage version="7.0.0 Alpha 1">com.woltlab.wcf</excludedpackage>
</excludedpackages>

<instructions type="install">
Expand Down
20 changes: 14 additions & 6 deletions snippets/tutorial/tutorial-series/part-1/acptemplates/personList.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@
</nav>
</header>

{hascontent}
{if $pages > 1}
<div class="paginationTop">
{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{if $objects|count}
<div class="section tabularBox">
Expand Down Expand Up @@ -54,11 +58,15 @@
</div>

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{unsafe:$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

<nav class="contentFooterNavigation">
<ul>
Expand Down
22 changes: 14 additions & 8 deletions snippets/tutorial/tutorial-series/part-1/templates/personList.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@

{include file='header'}

{hascontent}
{if $pages > 1}
<div class="paginationTop">
{content}
{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{if $items}
<div class="section sectionContainerList">
Expand Down Expand Up @@ -84,11 +86,15 @@
{/if}

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{unsafe:$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{hascontent}
<nav class="contentFooterNavigation">
Expand Down
20 changes: 14 additions & 6 deletions snippets/tutorial/tutorial-series/part-3/acptemplates/personList.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@
</nav>
</header>

{hascontent}
{if $pages > 1}
<div class="paginationTop">
{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{if $objects|count}
<div class="section tabularBox">
Expand Down Expand Up @@ -54,11 +58,15 @@
</div>

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{unsafe:$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

<nav class="contentFooterNavigation">
<ul>
Expand Down
22 changes: 14 additions & 8 deletions snippets/tutorial/tutorial-series/part-3/templates/personList.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@

{include file='header'}

{hascontent}
{if $pages > 1}
<div class="paginationTop">
{content}
{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{if $items}
<div class="section sectionContainerList">
Expand Down Expand Up @@ -91,11 +93,15 @@
{/if}

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{unsafe:$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{hascontent}
<nav class="contentFooterNavigation">
Expand Down
20 changes: 14 additions & 6 deletions snippets/tutorial/tutorial-series/part-4/acptemplates/personList.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@
</nav>
</header>

{hascontent}
{if $pages > 1}
<div class="paginationTop">
{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{if $objects|count}
<div class="section tabularBox">
Expand Down Expand Up @@ -54,11 +58,15 @@
</div>

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{unsafe:$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

<nav class="contentFooterNavigation">
<ul>
Expand Down
22 changes: 14 additions & 8 deletions snippets/tutorial/tutorial-series/part-4/templates/personList.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@

{include file='header'}

{hascontent}
{if $pages > 1}
<div class="paginationTop">
{content}
{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{if $items}
<div class="section sectionContainerList">
Expand Down Expand Up @@ -91,11 +93,15 @@
{/if}

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{unsafe:$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{hascontent}
<nav class="contentFooterNavigation">
Expand Down
20 changes: 14 additions & 6 deletions snippets/tutorial/tutorial-series/part-5/acptemplates/personList.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@
</nav>
</header>

{hascontent}
{if $pages > 1}
<div class="paginationTop">
{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{if $objects|count}
<div class="section tabularBox">
Expand Down Expand Up @@ -54,11 +58,15 @@
</div>

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{unsafe:$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

<nav class="contentFooterNavigation">
<ul>
Expand Down
22 changes: 14 additions & 8 deletions snippets/tutorial/tutorial-series/part-5/templates/personList.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@

{include file='header'}

{hascontent}
{if $pages > 1}
<div class="paginationTop">
{content}
{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{if $items}
<div class="section sectionContainerList">
Expand Down Expand Up @@ -95,11 +97,15 @@
{/if}

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{unsafe:$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{hascontent}
<nav class="contentFooterNavigation">
Expand Down
20 changes: 14 additions & 6 deletions snippets/tutorial/tutorial-series/part-6/acptemplates/personList.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@
</nav>
</header>

{hascontent}
{if $pages > 1}
<div class="paginationTop">
{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

{if $objects|count}
<div class="section tabularBox">
Expand Down Expand Up @@ -54,11 +58,15 @@
</div>

<footer class="contentFooter">
{hascontent}
{if $pages > 1}
<div class="paginationBottom">
{content}{unsafe:$pagesLinks}{/content}
<woltlab-core-pagination
page="{$pageNo}"
count="{$pages}"
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
></woltlab-core-pagination>
</div>
{/hascontent}
{/if}

<nav class="contentFooterNavigation">
<ul>
Expand Down
Loading

0 comments on commit 9e30c41

Please sign in to comment.