summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Pouzenc <ludovic@pouzenc.fr>2018-07-20 08:26:54 +0200
committerLudovic Pouzenc <ludovic@pouzenc.fr>2018-07-20 09:06:46 +0200
commit5cb131935f0e4a8fb4082ed989a17c214d1e4beb (patch)
tree217e223a7f674b9be6b7dee3ac407cc665c8ac99
parent5e90ca7ab1cddf94e500397549b85c54aed570da (diff)
downloadchd_gestion-5cb131935f0e4a8fb4082ed989a17c214d1e4beb.zip
chd_gestion-5cb131935f0e4a8fb4082ed989a17c214d1e4beb.tar.gz
chd_gestion-5cb131935f0e4a8fb4082ed989a17c214d1e4beb.tar.bz2
make side bar skinny, add shortcuts to main controllers
-rw-r--r--app-from-scratch.sh7
-rw-r--r--fai_gestion/plugins/CustomTheme/src/Template/Bake/Element/form.twig4
-rw-r--r--fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/index.twig4
-rw-r--r--fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/view.twig4
-rw-r--r--fai_gestion/src/Template/Layout/default.ctp8
5 files changed, 18 insertions, 9 deletions
diff --git a/app-from-scratch.sh b/app-from-scratch.sh
index 0268887..08a0947 100644
--- a/app-from-scratch.sh
+++ b/app-from-scratch.sh
@@ -323,3 +323,10 @@ editor plugins/CustomTheme/src/View/Helper/BakeExtraHelper.php plugins/CustomThe
git add plugins/CustomTheme/src/View/Helper/BakeExtraHelper.php plugins/CustomTheme/src/Template/Bake/Template/index.twig
git add ../app-from-scratch.sh
git commit -m "index: no 'id' column by default"
+# 5e90ca7ab1cddf94e500397549b85c54aed570da
+
+# make side bar skinny, add shortcuts to main controllers
+editor $p/Template/index.twig $p/Template/view.twig $p/Element/form.twig src/Template/Layout/default.ctp
+git add $p/Template/index.twig $p/Template/view.twig $p/Element/form.twig src/Template/Layout/default.ctp
+git add ../app-from-scratch.sh
+git commit -m "make side bar skinny, add shortcuts to main controllers"
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 b2d9e50..2ed5249 100644
--- a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Element/form.twig
+++ b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Element/form.twig
@@ -14,7 +14,7 @@
*/
#}
{% set fields = Bake.filterFields(fields, schema, modelObject) %}
-<nav class="large-3 medium-4 columns" id="actions-sidebar">
+<nav class="large-2 medium-3 columns" id="actions-sidebar">
<ul class="side-nav">
<li class="heading"><?= __('Actions') ?></li>
{% if strpos(action, 'add') is same as(false) %}
@@ -40,7 +40,7 @@
{% endfor %}
</ul>
</nav>
-<div class="{{ pluralVar }} form large-9 medium-8 columns content">
+<div class="{{ pluralVar }} form large-10 medium-9 columns content">
<?= $this->Form->create(${{ singularVar }}) ?>
<fieldset>
<legend><?= __('{{ action|humanize }} {{ singularHumanName }}') ?></legend>
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 7950242..bf8d08a 100644
--- a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/index.twig
+++ b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/index.twig
@@ -44,7 +44,7 @@
$this->Form->setTemplates(['label' => '']);
?>
{% set fields = BakeExtra.filterFields(fields, schema, modelObject, indexColumns, ['binary', 'text']) %}
-<nav class="large-3 medium-4 columns" id="actions-sidebar">
+<nav class="large-2 medium-3 columns" id="actions-sidebar">
<ul class="side-nav">
<li class="heading"><?= __('Actions') ?></li>
<li><?= $this->Html->link(__('New {{ singularHumanName }}'), ['action' => 'add']) ?></li>
@@ -60,7 +60,7 @@ $this->Form->setTemplates(['label' => '']);
{% endfor %}
</ul>
</nav>
-<div class="{{ pluralVar }} index large-9 medium-8 columns content">
+<div class="{{ pluralVar }} index large-10 medium-9 columns content">
<h3><?= __('{{ pluralHumanName }}') ?></h3>
<table cellpadding="0" cellspacing="0">
<thead>
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 bef4074..69abdd2 100644
--- a/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/view.twig
+++ b/fai_gestion/plugins/CustomTheme/src/Template/Bake/Template/view.twig
@@ -45,7 +45,7 @@
{% set associationFields = fieldsData.associationFields %}
{% set groupedFields = fieldsData.groupedFields %}
{% set pK = '$' ~ singularVar ~ '->' ~ primaryKey[0] %}
-<nav class="large-3 medium-4 columns" id="actions-sidebar">
+<nav class="large-2 medium-3 columns" id="actions-sidebar">
<ul class="side-nav">
<li class="heading"><?= __('Actions') ?></li>
<li><?= $this->Html->link(__('Edit {{ singularHumanName }}'), ['action' => 'edit', {{ pK|raw }}]) ?> </li>
@@ -64,7 +64,7 @@
{% endfor %}
</ul>
</nav>
-<div class="{{ pluralVar }} view large-9 medium-8 columns content">
+<div class="{{ pluralVar }} view large-10 medium-9 columns content">
<h3><?= h(${{ singularVar }}->{{ displayField }}) ?></h3>
<table class="vertical-table">
{% if groupedFields['string'] %}
diff --git a/fai_gestion/src/Template/Layout/default.ctp b/fai_gestion/src/Template/Layout/default.ctp
index b412f64..0dd4773 100644
--- a/fai_gestion/src/Template/Layout/default.ctp
+++ b/fai_gestion/src/Template/Layout/default.ctp
@@ -36,15 +36,17 @@ $cakeDescription = 'CakePHP: the rapid development php framework';
</head>
<body>
<nav class="top-bar expanded" data-topbar role="navigation">
- <ul class="title-area large-3 medium-4 columns">
+ <ul class="title-area large-2 medium-3 columns">
<li class="name">
<h1><a href=""><?= $this->fetch('title') ?></a></h1>
</li>
</ul>
<div class="top-bar-section">
<ul class="right">
- <li><a target="_blank" href="https://book.cakephp.org/3.0/">Documentation</a></li>
- <li><a target="_blank" href="https://api.cakephp.org/3.0/">API</a></li>
+ <li><?= $this->Html->link(__('Adherents'),['controller' => 'Adherents', 'action' => 'index']) ?></li>
+ <li><?= $this->Html->link(__('Interesses'), ['controller' => 'Interesses', 'action' => 'index']) ?></li>
+ <li><?= $this->Html->link(__('Equipements'), ['controller' => 'Equipements', 'action' => 'index']) ?></li>
+ <li><?= $this->Html->link(__('Ippubliques'), ['controller' => 'Ippubliques', 'action' => 'index']) ?></li>
</ul>
</div>
</nav>