Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Orbit
Manage
Activity
Members
Labels
Plan
Issues
97
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Applications
Orbit
Commits
ad85779f
Commit
ad85779f
authored
1 year ago
by
Benoit Alessandroni
Browse files
Options
Downloads
Plain Diff
Merge branch 'issue-1091' into switch/new_permissions
parents
e0d41736
2ee9a4dc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!359
fix: usage of community instead of community.community (wtf)
,
!355
Issue 1091
Pipeline
#16763
passed with stages
in 7 minutes and 23 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/views/partials/admin/page-admin-chat.pug
+20
-4
20 additions, 4 deletions
src/views/partials/admin/page-admin-chat.pug
with
20 additions
and
4 deletions
src/views/partials/admin/page-admin-chat.pug
+
20
−
4
View file @
ad85779f
...
@@ -8,10 +8,17 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
...
@@ -8,10 +8,17 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
div.segment.full.margin-bottom-xlarge
div.segment.full.margin-bottom-xlarge
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='communities.subTitle')
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='communities.subTitle')
if component.parameters.adminExtraSearch != null
- var extra_attr = component.parameters.adminExtraSearch
- var extra_fields = 'cell1, '+ component.parameters.adminExtraSearchFields
else
- var extra_attr = {}
- var extra_fields = 'cell1'
solid-form-search.form.search-form(
solid-form-search.form.search-form(
id="admin-community-filter"
id="admin-community-filter"
fields=
'cell1'
fields=
`${extra_fields}`
label-cell1=''
label-cell1=''
widget-cell1='solid-form-label-text'
widget-cell1='solid-form-label-text'
class-cell1="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
class-cell1="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
...
@@ -19,7 +26,8 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
...
@@ -19,7 +26,8 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
submit-widget="button"
submit-widget="button"
class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
data-trans='label-cell1=communities.searchBy;submit-button=goButton'
data-trans='label-cell1=communities.searchBy;submit-button=goButton'
)
)&attributes(extra_attr)
.segment.table-wrapper
.segment.table-wrapper
.table
.table
...
@@ -27,16 +35,24 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
...
@@ -27,16 +35,24 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
div.segment.table-cell.table-cell.half(data-trans='communities.tableHeader1')
div.segment.table-cell.table-cell.half(data-trans='communities.tableHeader1')
div.segment.table-cell.table-cell.half(data-trans='communities.tableHeader2')
div.segment.table-cell.table-cell.half(data-trans='communities.tableHeader2')
if component.parameters.adminExtraList != null
- var extra_list_attr = component.parameters.adminExtraList
- var extra_list_fields = 'cell1(name, counter), cell2(@id), '+ component.parameters.adminExtraListFields
else
- var extra_list_attr = {}
- var extra_list_fields = 'cell1(name, counter), cell2(@id)'
solid-display(
solid-display(
class='table-body'
class='table-body'
filtered-by='admin-community-filter'
filtered-by='admin-community-filter'
bind-user
bind-user
nested-field='communities'
nested-field='communities'
fields=
'cell1(name, counter), cell2(@id)'
fields=
`${extra_list_fields}`
loader-id='loader-admin-community'
loader-id='loader-admin-community'
class-cell1='segment table-cell half'
class-cell1='segment table-cell half'
class-cell2='segment table-cell half text-center'
class-cell2='segment table-cell half text-center'
class-cell3='hidden'
class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large ellipsis'
class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large ellipsis'
widget-id='orbit-action-community'
widget-id='orbit-action-community'
...
@@ -44,7 +60,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
...
@@ -44,7 +60,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
widget-counter="orbit-admin-community-counter"
widget-counter="orbit-admin-community-counter"
order-asc='name'
order-asc='name'
)
)
&attributes(extra_list_attr)
div#loader-admin-community.loader.loader-top
div#loader-admin-community.loader.loader-top
div
div
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment