Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
Admin
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
osuny
Admin
Commits
8dd59856
Unverified
Commit
8dd59856
authored
1 year ago
by
Pierre-André Boissinot
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1133 from noesya/fix_block_reorder
Déplacer les blocs que si on a les droits
parents
63d4ebd0
a6287aa5
No related branches found
Branches containing commit
Tags
v2.2.2
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/views/admin/communication/blocks/_block.html.erb
+8
-6
8 additions, 6 deletions
app/views/admin/communication/blocks/_block.html.erb
app/views/admin/communication/blocks/headings/_heading.html.erb
+8
-6
8 additions, 6 deletions
...ews/admin/communication/blocks/headings/_heading.html.erb
with
16 additions
and
12 deletions
app/views/admin/communication/blocks/_block.html.erb
+
8
−
6
View file @
8dd59856
...
...
@@ -15,13 +15,15 @@
<%=
edit_link
block
,
html_classes:
'action ms-2'
%>
</div>
<span
class=
"small text-muted kind mb-2"
>
<%=
block
.
template_kind_i18n
%>
</span>
<span
class=
" content-editor__elements__handle
content-editor__elements__element--hover"
>
<span
class=
"handle"
>
<span
class=
"small"
>
<%=
t
'organize'
%>
</span>
<i
class=
"
<%=
Icon
::
SORT
%>
"
></i>
<%
if
can?
(
:update
,
block
)
%>
<span
class=
" content-editor__elements__handle
content-editor__elements__element--hover"
>
<span
class=
"handle"
>
<span
class=
"small"
>
<%=
t
'organize'
%>
</span>
<i
class=
"
<%=
Icon
::
SORT
%>
"
></i>
</span>
</span>
<
/span
>
<
%
end
%
>
</div>
<div
class=
"content-editor__elements__preview
content-editor__elements__preview--
<%=
block
.
template_kind
%>
"
>
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/communication/blocks/headings/_heading.html.erb
+
8
−
6
View file @
8dd59856
...
...
@@ -10,13 +10,15 @@
<%=
link_to
t
(
'edit'
),
edit_admin_communication_heading_path
(
heading
),
class:
'action ms-2'
%>
<span
class=
" content-editor__elements__handle
content-editor__elements__element--hover"
>
<span
class=
"handle"
>
<span
class=
"small"
>
<%=
t
'organize'
%>
</span>
<i
class=
"
<%=
Icon
::
SORT
%>
"
></i>
<%
if
can?
(
:update
,
heading
)
%>
<span
class=
" content-editor__elements__handle
content-editor__elements__element--hover"
>
<span
class=
"handle"
>
<span
class=
"small"
>
<%=
t
'organize'
%>
</span>
<i
class=
"
<%=
Icon
::
SORT
%>
"
></i>
</span>
</span>
<
/span
>
<
%
end
%
>
</div>
<div
class=
"content-editor__elements
js-content-editor-sortable-container"
>
...
...
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