diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 61ecf32..2b35e2f 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -14,6 +14,16 @@ $pagination-active-bg: #343a40; @import "~bootstrap/scss/bootstrap.scss"; @import "~@fortawesome/fontawesome-free/css/all.css"; +@for $i from 1 through 100 { + .miw-#{$i*5} { + min-width: $i * 5px; + } +} + +body { + overflow-x: hidden; +} + #logo { width: 30px; } @@ -116,6 +126,9 @@ tr.table-primary-light { .sidebar { + width: 260px; + display: inline-block; + .nav-link { font-weight: 500; color: #333; @@ -142,32 +155,6 @@ tr.table-primary-light { text-transform: uppercase; display: flex; } - - @media screen and (max-width: 1130px) { - .nav-link { - font-size: 14px; - } - } - - @media screen and (max-width: 770px) { - .nav { - padding-left: 0; - } - - .nav-link { - padding-left: 10px; - } - - .nav-item-label { - display: none; - } - - .sidebar-heading { - display: none; - } - - width: 50px; - } } *[data-selectable-selector] { @@ -194,15 +181,19 @@ tr.table-primary-light { .body { padding-top: 60px; + width: calc(100vw - 260px); + margin-left: 260px; + display: inline-block; .nav { padding-left: 10px; } } -@media screen and (max-width: 580px) { +@media screen and (max-width: 770px) { .body { - margin-left: 45px; + margin-left: 50px; + width: calc(100vw - 50px); } .sidebar { @@ -213,49 +204,39 @@ tr.table-primary-light { width: 50px; max-width: 100% !important; } + + .nav { + padding-left: 0; + } + + .nav-link { + padding-left: 10px; + } + + .nav-item-label { + display: none; + } + + .sidebar-heading { + display: none; + } } } -table.table-fixed, .table-fixed > table { - width: 100%; - - tbody { - overflow: auto; - width: 100%; - height: 500px; - } - - thead, tbody, tr, td, th { - display: block; - } - - tbody { - td, th { - float: left; - min-height: 60px; - } - - tr { - clear: left; +th { + &.sorted { + &::before { + content: '\f0dc'; + font-family: 'FontAwesome'; + color: #aaa; + margin-right: 3px; } } +} - thead { - tr { - th { - float: left; - - &.sorted { - &::before { - content: '\f0dc'; - font-family: 'FontAwesome'; - color: #aaa; - margin-right: 3px; - } - } - } - } - } +.table-responsive { + max-width: 100%; + overflow-y: hidden; } .toast-container { diff --git a/assets/images/core/logo.svg b/assets/images/core/logo.svg new file mode 100644 index 0000000..0fcfb57 --- /dev/null +++ b/assets/images/core/logo.svg @@ -0,0 +1,92 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/assets/js/admin.js b/assets/js/admin.js index 99a51a7..858e8f7 100644 --- a/assets/js/admin.js +++ b/assets/js/admin.js @@ -1,3 +1,10 @@ +/*const imagesContext = require.context( + '../images', + true, /\.(png|jpg|jpeg|gif|ico|svg|webp)$/ +); + +imagesContext.keys().forEach(imagesContext);*/ + import '../css/admin.scss'; require('../../node_modules/bootstrap/dist/js/bootstrap.min.js'); diff --git a/core/Resources/translations/messages.fr.yaml b/core/Resources/translations/messages.fr.yaml index 61b0f18..22b6a31 100644 --- a/core/Resources/translations/messages.fr.yaml +++ b/core/Resources/translations/messages.fr.yaml @@ -85,6 +85,7 @@ "Add a menu": "Ajouter un menu" "Actions": "Actions" "Remove": "Supprimer" +"Move": "Déplacer" "Hidden": "Caché" "Show": "Voir" "No result": "Aucun résultat" diff --git a/core/Resources/views/admin/layout.html.twig b/core/Resources/views/admin/layout.html.twig index b168ae9..d8dd78f 100644 --- a/core/Resources/views/admin/layout.html.twig +++ b/core/Resources/views/admin/layout.html.twig @@ -27,16 +27,14 @@ {% block body_container %}
-
- -
- {% block body %} - {% endblock %} + +
+ {% block body %} + {% endblock %}
{% endblock %} diff --git a/core/Resources/views/site/navigation_admin/index.html.twig b/core/Resources/views/site/navigation_admin/index.html.twig index 78f3fd9..282abfa 100644 --- a/core/Resources/views/site/navigation_admin/index.html.twig +++ b/core/Resources/views/site/navigation_admin/index.html.twig @@ -24,64 +24,64 @@ {{ knp_pagination_render(pager) }}
- - - - - - - - - - {% for item in pager %} - {% set edit = path('admin_site_navigation_edit', {entity: item.id}) %} - {% set show = path('admin_site_navigation_show', {entity: item.id}) %} - - - - - - - {% else %} +
+
- {{ 'Label'|trans }} - - {{ 'Domain'|trans }} - - {{ 'Actions'|trans }} -
- - {{ item.label }} - - - {{ item.code }} - - - {{ item.domain }} - - - - - - - -
- - -
-
+ - + + + - {% endfor %} - -
-
- -
-
- {{ 'No result'|trans }} -
- 		+ {{ 'Label'|trans }} + + {{ 'Domain'|trans }} + + {{ 'Actions'|trans }} +
+ + + {% for item in pager %} + {% set edit = path('admin_site_navigation_edit', {entity: item.id}) %} + {% set show = path('admin_site_navigation_show', {entity: item.id}) %} + + + + + {{ item.label }} + + + + + {{ item.domain }} + + + + + + + + +
+ + +
+ + + {% else %} + + +
+ +
+
+ {{ 'No result'|trans }} +
+ + + {% endfor %} + + +
{% endblock %} diff --git a/core/Resources/views/site/page_admin/_form.html.twig b/core/Resources/views/site/page_admin/_form.html.twig index c6c2f73..71c0fc9 100644 --- a/core/Resources/views/site/page_admin/_form.html.twig +++ b/core/Resources/views/site/page_admin/_form.html.twig @@ -20,10 +20,10 @@ {% endset %}
-
+
{{ form_widget(form) }}
-
+
  • {{ 'Meta datas'|trans }} diff --git a/core/Resources/views/site/page_admin/index.html.twig b/core/Resources/views/site/page_admin/index.html.twig index e60a961..07ea264 100644 --- a/core/Resources/views/site/page_admin/index.html.twig +++ b/core/Resources/views/site/page_admin/index.html.twig @@ -13,59 +13,62 @@ {{ knp_pagination_render(pager) }}
- - - - - - - - - {% for item in pager %} - {% set edit = path('admin_site_page_edit', {entity: item.id}) %} - - - - - - - {% else %} +
+
{{ 'Name'|trans }}{{ 'Actions'|trans }}
- - {{ item.name }} - - - {% for node in item.nodes %} - - {{ node.label }} - - {% endfor %} - - - - - - -
- - -
-
+ - + + + - {% endfor %} - -
-
- -
-
- {{ 'No result'|trans }} -
- 		{{ 'Name'|trans }}{{ 'Actions'|trans }}
+ + + {% for item in pager %} + {% set edit = path('admin_site_page_edit', {entity: item.id}) %} + + + + + {{ item.name }} + + + + {% for node in item.nodes %} + + {{ node.label }} + + {% endfor %} + + + + + + + +
+ + +
+ + + {% else %} + + +
+ +
+
+ {{ 'No result'|trans }} +
+ + + {% endfor %} + + +
{% endblock %} diff --git a/core/Resources/views/site/tree_admin/navigation.html.twig b/core/Resources/views/site/tree_admin/navigation.html.twig index aadeb8a..914cc15 100644 --- a/core/Resources/views/site/tree_admin/navigation.html.twig +++ b/core/Resources/views/site/tree_admin/navigation.html.twig @@ -33,7 +33,7 @@
{% for menu in navigation.menus %} -
+
@@ -63,7 +63,7 @@
-
+
{% set rootNode = menu.rootNode %} @@ -74,95 +74,135 @@ {% set new = path('admin_site_node_new', {node: node.id}) %}
-
- {% if node.page %} - - - {{ 'Page'|trans }} - - {% endif %} +
+
+ {{ node.label }} - - - - - - - - - -
- -
- {{ node.label }} - - - {% if node.hasExternalUrl %} - - - - {% else %} - {% if node.parameters|length %} - - {{ node.url }} - + + {% if node.hasExternalUrl %} + + + {% else %} - {% set url = safe_node_url(node) %} - - {% if url %} - + {% if node.parameters|length %} + {{ node.url }} - + + {% else %} + {% set url = safe_node_url(node) %} + + {% if url %} + + {{ node.url }} + + {% endif %} + + {% if url is same as(null) %} + + + + {% endif %} {% endif %} - {% if url is same as(null) %} - - + {% if node.controller %} + + {% endif %} {% endif %} + +
+
+
+
+ {% if node.page %} + + + {{ 'Page'|trans }} + + {% endif %} - {% if node.controller %} - - - - {% endif %} - {% endif %} - + + + + + + + + + +
+
+ +
+ {% if node.page %} + + {{ 'Page'|trans }} + + {% endif %} + + + + + + + + + +
+
+
+
+ +
+ +
+ +
+ + +
- -
- -
- -
- - -
{% endfor %} {% endif %}
{% else %} -
+
diff --git a/core/Resources/views/user/user_admin/index.html.twig b/core/Resources/views/user/user_admin/index.html.twig index 3e02929..6c5b75d 100644 --- a/core/Resources/views/user/user_admin/index.html.twig +++ b/core/Resources/views/user/user_admin/index.html.twig @@ -22,52 +22,54 @@ {{ knp_pagination_render(pager) }}
- - - - - - - - - {% for item in pager %} - {% set edit = path('admin_user_edit', {entity: item.id}) %} - {% set show = path('admin_user_show', {entity: item.id}) %} - - - - - - {% else %} +
+
{{ 'Username'|trans }}{{ 'Actions'|trans }}
- - {{ item.displayName }} - - - {{ item.email }} - - - - - - -
- - -
-
+ - + + - {% endfor %} - -
-
- -
-
- {{ 'No result'|trans }} -
- 		{{ 'Username'|trans }}{{ 'Actions'|trans }}
+ + + {% for item in pager %} + {% set edit = path('admin_user_edit', {entity: item.id}) %} + {% set show = path('admin_user_show', {entity: item.id}) %} + + + + + {{ item.displayName }} + + + {{ item.email }} + + + + + + + +
+ + +
+ + + {% else %} + + +
+ +
+
+ {{ 'No result'|trans }} +
+ + + {% endfor %} + + +
{% endblock %}