diff options
| author | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2016-05-22 12:13:19 +0200 |
|---|---|---|
| committer | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2016-05-22 12:13:19 +0200 |
| commit | 489c0831aaf8e59aaa8554d774b6aa82b01591e0 (patch) | |
| tree | 2ea62896ce549cd23d1b0dc53be78c9d190ba123 | |
| parent | 20f922a84d9e5b831654283d9f331fd0fe28c45d (diff) | |
| download | chd_gestion-489c0831aaf8e59aaa8554d774b6aa82b01591e0.zip chd_gestion-489c0831aaf8e59aaa8554d774b6aa82b01591e0.tar.gz chd_gestion-489c0831aaf8e59aaa8554d774b6aa82b01591e0.tar.bz2 | |
Equipements : make index&view more usable, direct links to mgmt_ip
| -rw-r--r-- | generator/after-bake/src/Template/Equipements/index.ctp | 19 | ||||
| -rw-r--r-- | generator/after-bake/src/Template/Equipements/view.ctp | 33 |
2 files changed, 34 insertions, 18 deletions
diff --git a/generator/after-bake/src/Template/Equipements/index.ctp b/generator/after-bake/src/Template/Equipements/index.ctp index d1a294a..912ba78 100644 --- a/generator/after-bake/src/Template/Equipements/index.ctp +++ b/generator/after-bake/src/Template/Equipements/index.ctp @@ -38,8 +38,8 @@ <tr class="filter"> <th colspan="3"> <?= $this->Form->input('q', [ - 'placeholder' => __('Adresse MAC ou IPv4...'), - 'empty' => __('Adresse MAC ou IPv4...') + 'placeholder' => __('MAC, IPv4, Nom...'), + 'empty' => __('MAC, IPv4, Nom...') ]) ?> </th> <th colspan="2"> @@ -61,10 +61,9 @@ </tr> <tr> <th><?= $this->Paginator->sort('mac') ?></th> - <th><?= $this->Paginator->sort('hostname') ?></th> <th><?= $this->Paginator->sort('ipmgmt_id') ?></th> + <th colspan="2"><?= $this->Paginator->sort('hostname') ?></th> <th><?= $this->Paginator->sort('equipement_modele_id') ?></th> - <th><?= $this->Paginator->sort('service_id') ?></th> <th><?= $this->Paginator->sort('relais_id') ?></th> <th><?= $this->Paginator->sort('uplink_id') ?></th> <th class="actions"><?= __('Actions') ?></th> @@ -75,10 +74,16 @@ <?php foreach ($equipements as $equipement): ?> <tr> <td><?= h($equipement->mac) ?></td> - <td><?= h($equipement->hostname) ?></td> - <td><?= $equipement->has('ipmgmt') ? $this->Html->link($equipement->ipmgmt->title, ['controller' => 'Ipmgmt', 'action' => 'view', $equipement->ipmgmt->id]) : '' ?></td> + <td><?= $equipement->has('ipmgmt') + ? $this->Html->link( + $equipement->ipmgmt->ip4, + 'http://' . $equipement->ipmgmt->ip4, + [ 'target' => '_blank', '_full' => true ] + ) + : '' ?> + </td> + <td colspan="2"><?= h($equipement->hostname) ?></td> <td><?= $equipement->has('equipement_modele') ? $this->Html->link($equipement->equipement_modele->title, ['controller' => 'EquipementModeles', 'action' => 'view', $equipement->equipement_modele->id]) : '' ?></td> - <td><?= $equipement->has('service') ? $this->Html->link($equipement->service->title, ['controller' => 'Services', 'action' => 'view', $equipement->service->id]) : '' ?></td> <td><?= $equipement->has('relais') ? $this->Html->link($equipement->relais->title, ['controller' => 'Relais', 'action' => 'view', $equipement->relais->id]) : '' ?></td> <td><?= $equipement->has('uplink_id') ? $this->Html->link($equipement->uplink_id, ['controller' => 'Equipements', 'action' => 'view', $equipement->uplink_id]) : '' ?></td> <td class="actions"> diff --git a/generator/after-bake/src/Template/Equipements/view.ctp b/generator/after-bake/src/Template/Equipements/view.ctp index 9a0f167..08b5e25 100644 --- a/generator/after-bake/src/Template/Equipements/view.ctp +++ b/generator/after-bake/src/Template/Equipements/view.ctp @@ -39,36 +39,47 @@ <h3><?= h($equipement->title) ?></h3> <table class="vertical-table"> <tr> + <th><?= __('Uplink') ?></th> + <td><?= $equipement->has('equipement') ? $this->Html->link($equipement->equipement->title, ['controller' => 'Equipements', 'action' => 'view', $equipement->equipement->id]) : '' ?></td> + </tr> + <tr> <th><?= __('Mac') ?></th> <td><?= h($equipement->mac) ?></td> </tr> <tr> - <th><?= __('Hostname') ?></th> - <td><?= h($equipement->hostname) ?></td> + <th><?= __('Ipmgmt') ?></th> +<!-- TODO custom --> + <td><?= $equipement->has('ipmgmt') + ? ( + $this->Html->link($equipement->ipmgmt->ip4, ['controller' => 'Ipmgmt', 'action' => 'view', $equipement->ipmgmt->ip4]) + . ' ' + . $this->Html->link( + __('Access'), + 'http://' . $equipement->ipmgmt->ip4, + [ 'target' => '_blank', '_full' => true ] + ) + ) + : '' ?></td> </tr> <tr> - <th><?= __('Ipmgmt') ?></th> - <td><?= $equipement->has('ipmgmt') ? $this->Html->link($equipement->ipmgmt->title, ['controller' => 'Ipmgmt', 'action' => 'view', $equipement->ipmgmt->id]) : '' ?></td> + <th><?= __('Hostname') ?></th> + <td><?= h($equipement->hostname) ?></td> </tr> <tr> <th><?= __('Equipement Modele') ?></th> <td><?= $equipement->has('equipement_modele') ? $this->Html->link($equipement->equipement_modele->title, ['controller' => 'EquipementModeles', 'action' => 'view', $equipement->equipement_modele->id]) : '' ?></td> </tr> <tr> - <th><?= __('Relais') ?></th> - <td><?= $equipement->has('relais') ? $this->Html->link($equipement->relais->title, ['controller' => 'Relais', 'action' => 'view', $equipement->relais->id]) : '' ?></td> - </tr> - <tr> <th><?= __('Service') ?></th> <td><?= $equipement->has('service') ? $this->Html->link($equipement->service->title, ['controller' => 'Services', 'action' => 'view', $equipement->service->id]) : '' ?></td> </tr> <tr> - <th><?= __('Uplink') ?></th> - <td><?= $equipement->has('uplink_id') ? $this->Html->link($equipement->uplink_id, ['controller' => 'Equipements', 'action' => 'view', $equipement->uplink_id]) : '' ?></td> + <th><?= __('Relais') ?></th> + <td><?= $equipement->has('relais') ? $this->Html->link($equipement->relais->title, ['controller' => 'Relais', 'action' => 'view', $equipement->relais->id]) : '' ?></td> </tr> <tr> <th><?= __('Equipement Mode') ?></th> - <td><?= $equipement->has('equipement_mode') ? $this->Html->link($equipement->equipement_mode->id, ['controller' => 'EquipementModes', 'action' => 'view', $equipement->equipement_mode->id]) : '' ?></td> + <td><?= $equipement->equipement_mode->id ?></td> </tr> <tr> <th><?= __('Description') ?></th> |