Skip to content

Commit 3cf5ac9

Browse files
author
roadiz-ci
committed
Merge tag v2.6.5 into develop
1 parent 355254f commit 3cf5ac9

6 files changed

Lines changed: 72 additions & 77 deletions

File tree

public/main-CI8skzn8.js renamed to public/main-CqeATFdf.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"src": "Resources/app/img/spritemap@2x.png"
3333
},
3434
"Resources/app/main.js": {
35-
"file": "main-CI8skzn8.js",
35+
"file": "main-CqeATFdf.js",
3636
"name": "main",
3737
"src": "Resources/app/main.js",
3838
"isEntry": true,
@@ -45,15 +45,15 @@
4545
]
4646
},
4747
"Resources/app/shared.js": {
48-
"file": "shared-DURwnNVI.js",
48+
"file": "shared-CoLbaQ8A.js",
4949
"name": "shared",
5050
"src": "Resources/app/shared.js",
5151
"isEntry": true,
5252
"imports": [
5353
"_jquery-5sAwpjfl.js"
5454
],
5555
"css": [
56-
"shared-Bb2GMCsX.css"
56+
"shared-DcelSTFS.css"
5757
],
5858
"assets": [
5959
"fontawesome-webfont-B-jkhYfk.woff2",

‎public/shared-Bb2GMCsX.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/shared-DURwnNVI.js renamed to public/shared-CoLbaQ8A.js

File renamed without changes.

‎public/shared-DcelSTFS.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/widgets/nodeTree/contextualMenu.html.twig‎

Lines changed: 67 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,31 @@
44
{% if not node.Visible %} <i class="uk-icon-eye-slash"></i>{% endif %}
55
</div>
66
<div class="uk-nav uk-nav-dropdown">
7-
<p class="add-child">
8-
<a title="{{ "add.node.%name%.child"|trans({'%name%': node.nodeName}) }}"
7+
<div class="wrapper">
8+
<header class="uk-nav-header">Actions</header>
9+
<a
10+
title="{{ "add.node.%name%.child"|trans({'%name%': node.nodeName}) }}"
911
href="{{ path('nodesAddChildPage', { nodeId:node.id }) }}">
1012
<i class="uk-icon-rz-plus"></i> {% trans %}add.a.child.node{% endtrans %}
1113
</a>
12-
</p>
13-
<div class="wrapper">
14-
<header class="uk-nav-header">Actions</header>
15-
<p>
16-
<a title="{{ "edit.node.%name%"|trans({'%name%': node.nodeName}) }}"
17-
href="{{ path('nodesEditPage', { nodeId:node.id }) }}">
18-
<i class="uk-icon-rz-pencil"></i> {% trans %}edit.node{% endtrans %}
19-
</a>
20-
</p>
21-
{% if not node.Locked %}
22-
<p>
23-
<a class="move-node-first-position smaller-text"
24-
title="{% trans %}move.node.to.first.position{% endtrans %}"
25-
href="#">
26-
<i class="uk-icon-arrow-up"></i> {% trans %}move.node.to.first.position{% endtrans %}
27-
</a>
28-
</p>
29-
<p>
30-
<a class="move-node-last-position smaller-text"
31-
title="{% trans %}move.node.to.last.position{% endtrans %}"
32-
href="#">
33-
<i class="uk-icon-arrow-down"></i> {% trans %}move.node.to.last.position{% endtrans %}
34-
</a>
35-
</p>
36-
{% endif %}
14+
<a title="{{ "edit.node.%name%"|trans({'%name%': node.nodeName}) }}"
15+
href="{{ path('nodesEditPage', { nodeId:node.id }) }}">
16+
<i class="uk-icon-rz-pencil"></i> {% trans %}edit.node{% endtrans %}
17+
</a>
18+
{%- if not node.Locked -%}
19+
<button
20+
type="button"
21+
class="move-node-first-position smaller-text"
22+
title="{% trans %}move.node.to.first.position{% endtrans %}">
23+
<i class="uk-icon-arrow-up"></i> {% trans %}move.node.to.first.position{% endtrans %}
24+
</button>
25+
<button
26+
type="button"
27+
class="move-node-last-position smaller-text"
28+
title="{% trans %}move.node.to.last.position{% endtrans %}">
29+
<i class="uk-icon-arrow-down"></i> {% trans %}move.node.to.last.position{% endtrans %}
30+
</button>
31+
{%- endif -%}
3732

3833
{% if workflow_can(node, 'delete') %}
3934
{% set refererUrl = null %}
@@ -43,59 +38,59 @@
4338
translationId: translation.id
4439
}) %}
4540
{% endif %}
46-
<p>
47-
<a title="{{ "delete.node.%name%"|trans({'%name%': node.nodeName}) }}"
48-
href="{{ path('nodesDeletePage', { nodeId: node.id, referer: refererUrl }) }}">
49-
<i class="uk-icon-rz-trash-o"></i> {% trans %}delete.node{% endtrans %}
50-
</a>
51-
</p>
41+
<a title="{{ "delete.node.%name%"|trans({'%name%': node.nodeName}) }}"
42+
href="{{ path('nodesDeletePage', { nodeId: node.id, referer: refererUrl }) }}">
43+
<i class="uk-icon-rz-trash-o"></i> {% trans %}delete.node{% endtrans %}
44+
</a>
5245
{% endif %}
5346
</div>
5447
{% if not node.locked %}
5548
<div class="wrapper node-actions">
5649
<header class="uk-nav-header">{% trans %}statuses{% endtrans %}</header>
57-
<p>
58-
{% if node.visible %}
59-
<a data-action="hide"
60-
data-status="visible"
61-
data-value="0"
62-
class="hide-node"
63-
title="{% trans %}node.hide{% endtrans %}"
64-
href="#"><i class="uk-icon-eye-slash"></i> {% trans %}node.hide{% endtrans %}</a>
65-
{% else %}
66-
<a data-action="show"
67-
data-status="visible"
68-
data-value="1"
69-
class="show-node"
70-
title="{% trans %}node.show{% endtrans %}"
71-
href="#"><i class="uk-icon-rz-visibility-mini"></i> {% trans %}node.show{% endtrans %}</a>
72-
{% endif %}
73-
</p>
50+
{% if node.visible %}
51+
<button
52+
data-action="hide"
53+
data-status="visible"
54+
data-value="0"
55+
type="button"
56+
class="hide-node"
57+
title="{% trans %}node.hide{% endtrans %}"
58+
><i class="uk-icon-eye-slash"></i> {% trans %}node.hide{% endtrans %}</button>
59+
{% else %}
60+
<button
61+
data-action="show"
62+
data-status="visible"
63+
data-value="1"
64+
type="button"
65+
class="show-node"
66+
title="{% trans %}node.show{% endtrans %}"
67+
><i class="uk-icon-rz-visibility-mini"></i> {% trans %}node.show{% endtrans %}</button>
68+
{% endif %}
7469
{% if not node.published and workflow_can(node, 'publish') %}
75-
<p>
76-
<a data-action="publish"
77-
data-status="status"
78-
data-value="publish"
79-
class="publish-node"
80-
title="{% trans %}node.publish{% endtrans %}"
81-
href="#"><i class="uk-icon-rz-published-mini"></i> {% trans %}node.publish{% endtrans %}</a>
82-
</p>
70+
<button
71+
data-action="publish"
72+
data-status="status"
73+
data-value="publish"
74+
type="button"
75+
class="publish-node"
76+
title="{% trans %}node.publish{% endtrans %}"
77+
><i class="uk-icon-rz-published-mini"></i> {% trans %}node.publish{% endtrans %}</button>
8378
{% elseif node.published and workflow_can(node, 'reject') %}
84-
<p>
85-
<a data-action="reject"
86-
data-status="status"
87-
data-value="reject"
88-
class="unpublish-node"
89-
title="{% trans %}node.unpublish{% endtrans %}"
90-
href="#"><i class="uk-icon-rz-draft-nodes"></i> {% trans %}node.unpublish{% endtrans %}</a>
91-
</p>
79+
<button
80+
data-action="reject"
81+
data-status="status"
82+
data-value="reject"
83+
type="button"
84+
class="unpublish-node"
85+
title="{% trans %}node.unpublish{% endtrans %}"
86+
><i class="uk-icon-rz-draft-nodes"></i> {% trans %}node.unpublish{% endtrans %}</button>
9287
{% endif %}
93-
<p>
94-
<a data-action="duplicate"
95-
class="duplicate-node"
96-
title="{% trans %}node.duplicate{% endtrans %}"
97-
href="#"><i class="uk-icon-rz-duplicate"></i> {% trans %}node.duplicate{% endtrans %}</a>
98-
</p>
88+
<button
89+
data-action="duplicate"
90+
class="duplicate-node"
91+
type="button"
92+
title="{% trans %}node.duplicate{% endtrans %}"
93+
><i class="uk-icon-rz-duplicate"></i> {% trans %}node.duplicate{% endtrans %}</button>
9994
</div>
10095
{% endif %}
10196
</div>

0 commit comments

Comments
 (0)