Skip to content

Commit fc90f96

Browse files
CyperghostCyperghost
committed
Merge branch '6.2' into file-upload-image-crop
# Conflicts: # .github/workflows/javascript.yml # wcfsetup/install/files/js/require.config.js
2 parents 1c6b805 + 9ec543e commit fc90f96

File tree

117 files changed

+3040
-1324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+3040
-1324
lines changed

‎.github/workflows/javascript.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ jobs:
7171
- name: "Check '@fancyapps/ui'"
7272
run: |
7373
diff -wu wcfsetup/install/files/js/3rdParty/fancybox/fancybox.umd.js node_modules/@fancyapps/ui/dist/fancybox/fancybox.umd.js
74+
- name: "Check 'sortablejs'"
75+
run: |
76+
diff -wu wcfsetup/install/files/js/3rdParty/Sortable.min.js node_modules/sortablejs/Sortable.min.js
7477
- name: "Check 'cropperjs'"
7578
run: |
7679
diff -wu wcfsetup/install/files/js/3rdParty/cropper.min.js node_modules/cropperjs/dist/cropper.min.js

‎com.woltlab.wcf/fileDelete.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
<file>acp/images/wcfLogoWhite.svg</file>
2727
<file>acp/install.php</file>
2828
<file>acp/js/WCF.ACP.User.js</file>
29+
<file>acp/js/WCF.ACP.Language.js</file>
30+
<file>acp/js/WCF.ACP.Language.min.js</file>
2931
<file>acp/js/wcombined.min.js</file>
3032
<file>acp/post_install.php</file>
3133
<file>acp/pre_update_com.woltlab.wcf_2.1.php</file>

‎com.woltlab.wcf/templates/boxCategories.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<ol class="boxMenu">
22
{foreach from=$categoryList item=categoryItem}
3-
{if $categoryItem->isVisibleInNestedList($activeCategory, $showChildCategories)}
4-
<li class="boxMenuItem boxMenuItemDepth{@$categoryItem->getDepth()}{if $activeCategory && $activeCategory->categoryID == $categoryItem->categoryID} active{/if}" data-category-id="{@$categoryItem->categoryID}">
5-
<a href="{@$categoryItem->getLink()}" class="boxMenuLink">
3+
{if $categoryItem->isVisibleInNestedList($activeCategory, $showChildCategories) && $categoryItem->getItems()}
4+
<li class="boxMenuItem boxMenuItemDepth{$categoryItem->getDepth()}{if $activeCategory && $activeCategory->categoryID == $categoryItem->categoryID} active{/if}" data-category-id="{$categoryItem->categoryID}">
5+
<a href="{$categoryItem->getLink()}" class="boxMenuLink">
66
<span class="boxMenuLinkTitle">{$categoryItem->getTitle()}</span>
77
<span class="badge">{#$categoryItem->getItems()}</span>
88
</a>

‎com.woltlab.wcf/templates/flexibleCategoryList.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
{/foreach}
3333
</ol>
3434
<script data-relocate="true">
35-
$(function() {
36-
new WCF.Category.FlexibleCategoryList('{$flexibleCategoryListID}');
35+
require(['WoltLabSuite/Core/Component/Category/Flexible'], ({ FlexibleCategoryList }) => {
36+
new FlexibleCategoryList('{$flexibleCategoryListID}');
3737
});
3838
</script>

‎com.woltlab.wcf/templates/header.tpl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@
7474
{/hascontent}
7575

7676
<section id="main" class="main" role="main"{if !$__mainItemScope|empty} {@$__mainItemScope}{/if}>
77+
{if !$beforeMaincontent|empty}
78+
{unsafe:$beforeMaincontent}
79+
{/if}
80+
7781
<div class="layoutBoundary">
7882
{hascontent}
7983
{if !$__sidebarLeftShow|isset}{assign var='__sidebarLeftShow' value='wcf.global.button.showSidebarLeft'|phrase}{/if}

‎com.woltlab.wcf/templates/radioButtonOptionType.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{foreach name=radioButtons from=$selectOptions key=key item=selectOption}
2-
<label><input {if $tpl.foreach.radioButtons.first}id="{$option->optionName}" {/if}type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
2+
<label><input {if $tpl.foreach.radioButtons.first}id="{$option->optionName}" {/if}type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {$disableOptions[$key]}]" data-enable-options="[ {$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
33
{/foreach}

‎com.woltlab.wcf/templates/recentActivityListItem.tpl‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<div class="
33
recentActivityListItem
44
{if $event->isIgnoredContent()}ignoredUserContent{/if}
5-
{if !$event->getDescription()}recentActivityListItem--compact{/if}
5+
{if $event->getDescription()}recentActivityListItem--withDescription{/if}
6+
{if $event->getImage()}recentActivityListItem--withImage{/if}
67
">
78
<div class="recentActivityListItem__avatar">
89
{user object=$event->getUserProfile() type='avatar48' ariaHidden='true' tabindex='-1'}
@@ -22,6 +23,12 @@
2223
</div>
2324
{/if}
2425

26+
{if $event->getImage()}
27+
<div class="recentActivityListItem__image">
28+
{unsafe:$event->getImage()->toHtml()}
29+
</div>
30+
{/if}
31+
2532
<div class="recentActivityListItem__time">
2633
{time time=$event->time}
2734
</div>

‎com.woltlab.wcf/templates/selectOptionType.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<select id="{$option->optionName}" name="values[{$option->optionName}]"{if $option->required} required{/if}{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
1+
<select id="{$option->optionName}" name="values[{$option->optionName}]"{if $option->required} required{/if}{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {$disableOptions}]" data-enable-options="[ {$enableOptions}]"{/if}>
22
{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
33
{foreach from=$selectOptions key=key item=selectOption}
44
<option value="{$key}"{if $value == $key} selected{/if}>{lang}{@$selectOption}{/lang}</option>

‎com.woltlab.wcf/templates/settings.tpl‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,4 @@
145145
</div>
146146
</form>
147147

148-
<script data-relocate="true">
149-
$(function() {
150-
new WCF.Option.Handler();
151-
});
152-
</script>
153-
154148
{include file='footer' __disableAds=true}

‎com.woltlab.wcf/templates/shared_booleanOptionType.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<ol class="flexibleButtonGroup optionTypeBoolean">
22
<li>
3-
<input type="radio" id="{$option->optionName}"{if $value == 1} checked{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
3+
<input type="radio" id="{$option->optionName}"{if $value == 1} checked{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {$disableOptions}]" data-enable-options="[ {$enableOptions}]"{/if}>
44
<label for="{$option->optionName}" class="green">{icon name='check'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
55
</li>
66
<li>
7-
<input type="radio" id="{$option->optionName}_no"{if $value == 0} checked{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
7+
<input type="radio" id="{$option->optionName}_no"{if $value == 0} checked{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {$disableOptions}]" data-enable-options="[ {$enableOptions}]"{/if}>
88
<label for="{$option->optionName}_no" class="red">{icon name='xmark'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
99
</li>
1010
</ol>

0 commit comments

Comments
 (0)