Etienne Pallier / labinvent

Commit d7a08925dfb4665b2708388d6d9c0b32fa26a5f4

Authored by Etienne Pallier
1 parent d198d4b7
Exists in master and in 1 other branch dev

Labels projet en français

Showing 2 changed files with 14 additions and 11 deletions   Show diff stats
Inline Side-by-side
src/Template/Projets/index.ctp
  Diff comments   View file @d7a0892
... ... @@ -37,10 +37,10 @@ $projets = $projets;
37 37 -->
38 38 <th scope="col"><?= $this->Paginator->sort('nom') ?></th>
39 39 <th scope="col"><?= $this->Paginator->sort('groupes_thematique_id', 'Groupe thématique') ?></th>
40   - <th scope="col"><?= $this->Paginator->sort('chef_science_id') ?></th>
41   - <th scope="col"><?= $this->Paginator->sort('chef_projet_id') ?></th>
42   - <th scope="col"><?= $this->Paginator->sort('date_start') ?></th>
43   - <th scope="col"><?= $this->Paginator->sort('date_stop') ?></th>
  40 + <th scope="col"><?= $this->Paginator->sort('chef_science_id', 'Responsable scientifique') ?></th>
  41 + <th scope="col"><?= $this->Paginator->sort('chef_projet_id', 'Chef de projet') ?></th>
  42 + <th scope="col"><?= $this->Paginator->sort('date_start', 'Date début') ?></th>
  43 + <th scope="col"><?= $this->Paginator->sort('date_stop', 'Date fin') ?></th>
44 44 <th scope="col" class="actions"><?= __('Actions') ?></th>
45 45 </tr>
46 46 </thead>
... ...
src/Template/Projets/view.ctp
  Diff comments   View file @d7a0892
... ... @@ -26,11 +26,14 @@ $projet = $projet;
26 26 -->
27 27 <div class="projets view large-9 medium-8 columns content">
28 28 <h3><?= h($projet->nom) ?></h3>
  29 +
29 30 <table class="vertical-table">
  31 + <!--
30 32 <tr>
31   - <th scope="row"><?= __('Nom') ?></th>
32   - <td><?= h($projet->nom) ?></td>
  33 + <th scope="row"><S= __('Nom') ?></th>
  34 + <td><S= h($projet->nom) ?></td>
33 35 </tr>
  36 + -->
34 37 <tr>
35 38 <th scope="row"><?= __('Groupe Thématique principal') ?></th>
36 39 <td><?= $projet->has('groupes_thematique_id') ? $this->Html->link($projet->groupe_thematique->nom, ['controller' => 'GroupesThematiques', 'action' => 'view', $projet->groupes_thematique_id]) : '' ?></td>
... ... @@ -42,20 +45,20 @@ $projet = $projet;
42 45 </tr>
43 46 -->
44 47 <tr>
45   - <th scope="row"><?= __('Chef Science') ?></th>
  48 + <th scope="row"><?= __('Responsable scientifique') ?></th>
46 49 <td><?= $projet->has('chef_science_id') ? $this->Html->link($projet->Pi->nom, ['controller' => 'Users', 'action' => 'view', $projet->Pi->id]) : '' ?></td>
47 50 </tr>
48 51 <tr>
49   - <th scope="row"><?= __('Chef Projet') ?></th>
  52 + <th scope="row"><?= __('Chef de projet') ?></th>
50 53 <td><?= $projet->has('chef_projet_id') ? $this->Html->link($projet->Pm->nom, ['controller' => 'Users', 'action' => 'view', $projet->Pm->id]) : '' ?></td>
51 54 </tr>
52 55  
53 56 <tr>
54   - <th scope="row"><?= __('Date Start') ?></th>
  57 + <th scope="row"><?= __('Date début') ?></th>
55 58 <td><?= h($projet->date_start) ?></td>
56 59 </tr>
57 60 <tr>
58   - <th scope="row"><?= __('Date Stop') ?></th>
  61 + <th scope="row"><?= __('Date fin') ?></th>
59 62 <td><?= h($projet->date_stop) ?></td>
60 63 </tr>
61 64 <!--
... ... @@ -74,7 +77,7 @@ $projet = $projet;
74 77 <b><u>Description :</b></u>
75 78 <?=$this->Text->autoParagraph(h($projet->description));?>
76 79 <div class="related">
77   - <h4><?= __('Related Materiels') ?></h4>
  80 + <h4><?= __('Matériels associés') ?></h4>
78 81 <?php if (!empty($projet->materiels)): ?>
79 82 <table cellpadding="0" cellspacing="0">
80 83 <tr>
... ...