Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-27 01:39:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

breaking: move category filter/selector dropdowns to core

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-01-19 12:04:44 -05:00
parent bd13561cf4
commit bd679499dc
22 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en-GB/users.json
View File

@@ -1,4 +1,5 @@
{
"all-users": "All Users",
"latest_users": "Latest Users",
"top_posters": "Top Posters",
"most_reputation": "Most Reputation",

2
public/scss/generics.scss
View File

@@ -20,7 +20,7 @@
}
}
.category-dropdown-container.right .category-dropdown-menu {
.dropdown-right .dropdown-menu {
--bs-position: end;
}

4
public/src/modules/categoryFilter.js
View File

@@ -9,7 +9,7 @@ define('categoryFilter', ['categorySearch', 'api', 'hooks'], function (categoryS
}
options = options || {};
options.states = options.states || ['watching', 'notwatching', 'ignoring'];
options.template = 'partials/category-filter';
options.template = 'partials/category/filter-dropdown-left';
hooks.fire('action:category.filter.options', { el: el, options: options });
@@ -91,7 +91,7 @@ define('categoryFilter', ['categorySearch', 'api', 'hooks'], function (categoryS
renderButton();
}
function renderButton(category) {
app.parseAndTranslate('partials/category-filter-content', {
app.parseAndTranslate('partials/category/filter-dropdown-content', {
selectedCategory: category,
}, function (html) {
el.find('button').replaceWith($('<div/>').html(html).find('button'));

2
public/src/modules/categorySelector.js
View File

@@ -13,7 +13,7 @@ define('categorySelector', [
const onSelect = options.onSelect || function () {};
options.states = options.states || ['watching', 'notwatching', 'ignoring'];
options.template = 'partials/category-selector';
options.template = 'partials/category/selector-dropdown-left';
hooks.fire('action:category.selector.options', { el: el, options: options });
categorySearch.init(el, options);

2
src/views/admin/manage/admins-mods.tpl
View File

@@ -35,7 +35,7 @@
<!-- IMPORT partials/breadcrumbs.tpl -->
<div class="mb-3">
<!-- IMPORT admin/partials/category-selector.tpl -->
<!-- IMPORT admin/partials/category/selector-dropdown-left.tpl -->
</div>
{{{ if !categoryMods.length }}}
<div><p class="alert alert-info">[[admin/manage/admins-mods:no-sub-categories]]</p></div>

2
src/views/admin/manage/categories.tpl
View File

@@ -2,7 +2,7 @@
<div class="row">
<div class="col-lg-12">
<div class="category btn-group">
<!-- IMPORT admin/partials/category-selector.tpl -->
<!-- IMPORT admin/partials/category/selector-dropdown-left.tpl -->
</div>
<div class="btn-group">
<button id="collapse-all" class="btn btn-outline-secondary">[[admin/manage/categories:collapse-all]]</button>

2
src/views/admin/manage/category.tpl
View File

@@ -1,7 +1,7 @@
<div class="category" data-cid="{category.cid}">
<div class="row mb-3">
<div class="d-flex col-12 justify-content-end">
<!-- IMPORT admin/partials/category-selector-right.tpl -->
<!-- IMPORT admin/partials/category/selector-dropdown-right.tpl -->
</div>
</div>

6
src/views/admin/manage/group.tpl
View File

@@ -105,7 +105,7 @@
<input id="memberPostCids" type="text" class="form-control" value="{group.memberPostCids}">
</div>
<div class="col-md-3 member-post-cids-selector">
<!-- IMPORT admin/partials/category-selector.tpl -->
<!-- IMPORT admin/partials/category/selector-dropdown-right.tpl -->
</div>
</div>
</div>
@@ -146,7 +146,9 @@
<hr />
<div class="edit-privileges-selector">
<label class="form-label" class="float-start">[[admin/manage/privileges:edit-privileges]]</label>
<!-- IMPORT admin/partials/category-selector.tpl -->
<div>
<!-- IMPORT admin/partials/category/selector-dropdown-right.tpl -->
</div>
</div>
</div>
</form>

2
src/views/admin/manage/privileges.tpl
View File

@@ -8,7 +8,7 @@
<div class="lead mb-3">
[[admin/manage/categories:privileges.category-selector]]
<!-- IMPORT admin/partials/category-selector.tpl -->
<!-- IMPORT admin/partials/category/selector-dropdown-left.tpl -->
</div>
<div class="privilege-table-container">

4
src/views/admin/partials/categories/create.tpl
View File

@@ -5,12 +5,12 @@
</div>
<div class="mb-3" id="parentCidGroup">
<label class="form-label" for="parentCid">[[admin/manage/categories:optional-parent-category]]</label>
<!-- IMPORT admin/partials/category-selector.tpl -->
<!-- IMPORT admin/partials/category/selector-dropdown-left.tpl -->
</div>
<div class="mb-3" id="cloneFromCidGroup">
<label class="form-label" for="cloneFromCid">[[admin/manage/categories:optional-clone-settings]]</label>
<!-- IMPORT admin/partials/category-selector.tpl -->
<!-- IMPORT admin/partials/category/selector-dropdown-left.tpl -->
<label>
<input id="cloneChildren" name="cloneChildren" type="checkbox">
<strong>[[admin/manage/categories:clone-children]]</strong>

3
src/views/admin/partials/category-selector-right.tpl
View File

@@ -1,3 +0,0 @@
<div component="category-selector" class="btn-group right category-dropdown-container bottom-sheet">
<!-- IMPORT admin/partials/category-selector-content.tpl -->
</div>

0
src/views/admin/partials/category-selector-content.tpl → src/views/admin/partials/category/selector-dropdown-content.tpl
View File

2
src/views/admin/partials/category-selector.tpl → src/views/admin/partials/category/selector-dropdown-left.tpl
View File

@@ -1,3 +1,3 @@
<div component="category-selector" class="btn-group bottom-sheet">
<!-- IMPORT admin/partials/category-selector-content.tpl -->
<!-- IMPORT admin/partials/category/selector-dropdown-content.tpl -->
</div>

3
src/views/admin/partials/category/selector-dropdown-right.tpl Normal file
View File

@@ -0,0 +1,3 @@
<div component="category-selector" class="btn-group dropdown-right category-dropdown-container bottom-sheet">
<!-- IMPORT admin/partials/category/selector-dropdown-content.tpl -->
</div>

2
src/views/modals/move-topic.tpl
View File

@@ -6,7 +6,7 @@
<p>
[[topic:move_topic_instruction]]
</p>
<!-- IMPORT partials/category-selector-right.tpl -->
<!-- IMPORT partials/category/selector-dropdown-right.tpl -->
</div>
<div class="card-footer text-end">
<button type="button" class="btn btn-sm btn-outline-secondary" id="move_topic_cancel">[[global:buttons.close]]</button>

3
src/views/partials/category/filter-dropdown-left.tpl Normal file
View File

@@ -0,0 +1,3 @@
<div component="category/dropdown" class="btn-group category-dropdown-container bottom-sheet">
<!-- IMPORT partials/category/filter-dropdown-content.tpl -->
</div>

3
src/views/partials/category/filter-dropdown-right.tpl Normal file
View File

@@ -0,0 +1,3 @@
<div component="category/dropdown" class="btn-group dropdown-right category-dropdown-container bottom-sheet">
<!-- IMPORT partials/category/filter-dropdown-content.tpl -->
</div>

3
src/views/partials/category/selector-dropdown-left.tpl Normal file
View File

@@ -0,0 +1,3 @@
<div component="category-selector" class="btn-group category-dropdown-container bottom-sheet">
<!-- IMPORT partials/category/selector-dropdown-content.tpl -->
</div>

3
src/views/partials/category/selector-dropdown-right.tpl Normal file
View File

@@ -0,0 +1,3 @@
<div component="category-selector" class="btn-group dropdown-right category-dropdown-container bottom-sheet">
<!-- IMPORT partials/category/selector-dropdown-content.tpl -->
</div>

3
src/views/partials/users/filter-dropdown-left.tpl Normal file
View File

@@ -0,0 +1,3 @@
<div class="dropdown bottom-sheet {{{ if !users.length }}}hidden{{{ end }}}">
<!-- IMPORT partials/users/filter-dropdown-content.tpl -->
</div>

3
src/views/partials/users/filter-dropdown-right.tpl Normal file
View File

@@ -0,0 +1,3 @@
<div class="dropdown dropdown-right bottom-sheet {{{ if !users.length }}}hidden{{{ end }}}">
<!-- IMPORT partials/users/filter-dropdown-content.tpl -->
</div>

2
src/views/post-queue.tpl
View File

@@ -2,7 +2,7 @@
<div class="btn-toolbar justify-content-end">
{{{ if (!singlePost && posts.length) }}}
<div class="me-2">
<!-- IMPORT partials/category-filter-right.tpl -->
<!-- IMPORT partials/category/filter-dropdown-right.tpl -->
</div>
<div class="btn-group bottom-sheet" component="post-queue/bulk-actions">
<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" autocomplete="off" aria-haspopup="true" aria-expanded="false">