diff options
| author | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2018-07-22 15:36:58 +0200 |
|---|---|---|
| committer | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2018-07-22 15:36:58 +0200 |
| commit | 1de577a5ae785b67a7990f14057e70c4f28f02f3 (patch) | |
| tree | 049bd2566e8fb8786cce4336d846cb5c09a028f2 | |
| parent | a86c0db98c3b5f12b0f47532c5136234a5161f5d (diff) | |
| download | chd_gestion-1de577a5ae785b67a7990f14057e70c4f28f02f3.zip chd_gestion-1de577a5ae785b67a7990f14057e70c4f28f02f3.tar.gz chd_gestion-1de577a5ae785b67a7990f14057e70c4f28f02f3.tar.bz2 | |
action-nav : add separator, equipements/index fix filter config
6 files changed, 11 insertions, 1 deletions
diff --git a/app-from-scratch.sh b/app-from-scratch.sh index 8dd51ba..4ad2077 100644 --- a/app-from-scratch.sh +++ b/app-from-scratch.sh @@ -383,3 +383,5 @@ editor $p/Template/view.twig $p/Template/index.twig $p/Element/form.twig config/ git add $p/Template/view.twig $p/Template/index.twig $p/Element/form.twig config/bake_extra.php git add ../app-from-scratch.sh git commit -m "bake : limit action links to defined controller methods" +# a86c0db98c3b5f12b0f47532c5136234a5161f5d + diff --git a/fai_gestion/config/bake_extra.php b/fai_gestion/config/bake_extra.php index ec2fb0b..e8fd5e6 100644 --- a/fai_gestion/config/bake_extra.php +++ b/fai_gestion/config/bake_extra.php @@ -129,7 +129,7 @@ EOT ], 'relais_id' => [ 'mode' => 'value', - 'colspan' => 2, + 'colspan' => 1, 'hint' => 'Relais', ], ], diff --git a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Element/form.twig b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Element/form.twig index e48d107..d26b912 100644 --- a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Element/form.twig +++ b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Element/form.twig @@ -51,6 +51,7 @@ <li><?= $this->Html->link(__('List {{ pluralHumanName }}'), ['action' => 'index']) ?></li> {{- "\n" }} {%- set done = [] %} + <li class="sep"></li> {% for type, data in associations %} {%- for alias, details in data %} {%- if details.controller is not same as(_view.name) and details.controller not in done %} diff --git a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/index.twig b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/index.twig index 10a8754..9c7437e 100644 --- a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/index.twig +++ b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/index.twig @@ -51,6 +51,7 @@ $this->Form->setTemplates(['label' => '']); <li><?= $this->Html->link(__('New {{ singularHumanName }}'), ['action' => 'add']) ?></li> {% endif %} {% set done = [] %} + <li class="sep"></li> {% for type, data in associations %} {% for alias, details in data %} {% if details.navLink and details.controller is not same as(_view.name) and details.controller not in done %} diff --git a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/view.twig b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/view.twig index 354ec12..d56588e 100644 --- a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/view.twig +++ b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/view.twig @@ -58,6 +58,7 @@ <li><?= $this->Html->link(__('List {{ pluralHumanName }}'), ['action' => 'index']) ?> </li> {% endif %} {% set done = [] %} + <li class="sep"></li> {% for type, data in associations %} {% for alias, details in data %} {% if false %} diff --git a/fai_gestion/webroot/css/local.css b/fai_gestion/webroot/css/local.css index d8a99fa..b304094 100644 --- a/fai_gestion/webroot/css/local.css +++ b/fai_gestion/webroot/css/local.css @@ -36,3 +36,8 @@ text-align: left; } +.side-nav li.sep { + border-bottom: 1px solid #e7e7e7; + border-top: 0; + margin: 0 0.875rem 0.4375rem 0.875rem; +} |