Etienne Pallier / labinvent

Compare View

switch
from
...
to
 
Commits (2)
Showing 95 changed files   Show diff stats
Inline Side-by-side
src/Template/Categories/add.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="categories form">
  2 +<div class="categories form col-lg-5 col-md-7 col-sm-9">
3 3 <?= $this->Form->create($category) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -13,15 +13,17 @@
13 13 ]);
14 14 ?>
15 15 </fieldset>
16   - <?= $this->Form->submit(__('Valider')) ?>
  16 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
17 17 <?= $this->Form->end() ?>
18 18 </div>
19 19  
  20 +<!--
20 21 <div class="actions">
21   - <?php
  22 + <php
22 23 echo $this->element('menu');
23 24 echo $this->element('menu_form', [
24 25 'pluralHumanName' => 'Catégories'
25 26 ]);
26 27 ?>
27   -</div>
28 28 \ No newline at end of file
  29 +</div>
  30 +-->
29 31 \ No newline at end of file
... ...
src/Template/Categories/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="categories form">
  2 +<div class="categories form col-lg-5 col-md-7 col-sm-9">
3 3 <?= $this->Form->create($category) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -13,15 +13,17 @@
13 13 ]);
14 14 ?>
15 15 </fieldset>
16   - <?= $this->Form->submit(__('Valider')) ?>
  16 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
17 17 <?= $this->Form->end() ?>
18 18 </div>
19 19  
  20 +<!--
20 21 <div class="actions">
21   - <?php
  22 + <php
22 23 echo $this->element('menu');
23 24 echo $this->element('menu_form', [
24 25 'pluralHumanName' => 'Catégories'
25 26 ]);
26 27 ?>
27   -</div>
28 28 \ No newline at end of file
  29 +</div>
  30 +-->
29 31 \ No newline at end of file
... ...
src/Template/Categories/index.ctp
  Diff comments   View file @3a0887a
1 1  
2 2 <div class="categories index">
3 3 <?php echo '<h2><i class="icon-list"></i> Liste des catégories</h2>'; ?>
4   - <table style="border-collapse: separate; border-spacing: 0;">
  4 + <table style="border-collapse: separate; border-spacing: 0;width: 270px;">
5 5 <thead>
6 6 <tr>
7 7 <th class="actions"><?= __('') ?></th>
... ... @@ -38,13 +38,15 @@
38 38  
39 39 </div>
40 40  
  41 +<!--
41 42 <div class="actions">
42   - <?php echo $this->element('menu') ?>
43   - <?php
  43 + <php echo $this->element('menu') ?>
  44 + <php
44 45  
45 46 echo $this->element('menu_index', [
46 47 'pluralHumanName' => 'Catégories',
47 48 'singularHumanName' => 'Catégorie'
48 49 ])?>
49 50 </div>
  51 +-->
50 52  
... ...
src/Template/Categories/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -17,6 +17,7 @@
17 17 'action' => 'edit',
18 18 $category->id
19 19 ], [
  20 + 'style' => 'margin-right: 40px; display: inline-block',
20 21 'escape' => false,
21 22 'onclick' => 'return true;'
22 23 ]);
... ... @@ -29,7 +30,7 @@
29 30 'action' => 'delete',
30 31 $category->id
31 32 ], [
32   - 'style' => 'margin-left: 110px',
  33 + 'style' => 'display: inline-block',
33 34 'escape' => false,
34 35 'confirm' => __('Êtes-vous sur de vouloir supprimer # {0}?', $category->id)
35 36 ]);
... ... @@ -103,13 +104,15 @@
103 104  
104 105 </div>
105 106  
  107 +<!--
106 108 <div class="actions">
107   - <?php echo $this->element('menu') ?>
108   - <?php
  109 + <php echo $this->element('menu') ?>
  110 + <php
109 111  
110 112 echo $this->element('menu_view', [
111 113 'pluralHumanName' => 'Catégories',
112 114 'singularHumanName' => 'Catégorie',
113 115 'lien' => $category->id
114 116 ])?>
115   - </div>
116 117 \ No newline at end of file
  118 + </div>
  119 +-->
117 120 \ No newline at end of file
... ...
src/Template/Configurations/edit.ctp
  Diff comments   View file @3a0887a
... ... @@ -288,19 +288,20 @@ function echoSection($title, $section) {
288 288  
289 289 ?>
290 290 </fieldset>
291   - <?=$this->Form->submit(__('Valider'))?>
  291 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
292 292 <?=$this->Form->end()?>
293 293 </div>
294 294  
295   -
  295 +<!--
296 296 <div class="actions">
297   - <?php
  297 + <php
298 298 echo $this->element('menu');
299 299 echo $this->element('menu_form', [
300 300 'pluralHumanName' => 'Configuration générale'
301 301 ]);
302 302 ?>
303 303 </div>
  304 +-->
304 305  
305 306 <script type="text/javascript">
306 307 $(document).ready(function(){
... ...
src/Template/Configurations/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -192,8 +192,10 @@ function echoSection($title, $section) {
192 192  
193 193 </div>
194 194  
  195 +<!--
195 196 <div class="actions">
196   - <?php
  197 + <php
197 198  
198 199 echo $this->element('menu')?>
199 200 </div>
  201 +-->
200 202 \ No newline at end of file
... ...
src/Template/Documents/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -62,11 +62,13 @@
62 62 <?= $this->Form->end() ?>
63 63 </div>
64 64  
  65 +<!--
65 66 <div class="actions">
66   - <?php
  67 + <php
67 68 echo $this->element('menu');
68 69 echo $this->element('menu_form', [
69 70 'pluralHumanName' => 'Documents'
70 71 ]);
71 72 ?>
72 73 </div>
  74 +-->
73 75 \ No newline at end of file
... ...
src/Template/Documents/edit.ctp
  Diff comments   View file @3a0887a
... ... @@ -68,11 +68,13 @@
68 68 <?= $this->Form->end() ?>
69 69 </div>
70 70  
  71 +<!--
71 72 <div class="actions">
72   - <?php
  73 + <php
73 74 echo $this->element('menu');
74 75 echo $this->element('menu_form', [
75 76 'pluralHumanName' => 'Documents'
76 77 ]);
77 78 ?>
78 79 </div>
  80 +-->
... ...
src/Template/Documents/index.ctp
  Diff comments   View file @3a0887a
1 1  
2 2 <div class="documents index">
3 3 <?php echo '<h2><i class="icon-list"></i> Liste des documents</h2>'; ?>
4   - <table style="border-collapse: separate; border-spacing: 0;">
  4 + <table style="border-collapse: separate; border-spacing: 0; width: 270px;">
5 5 <thead>
6 6 <tr>
7 7 <th class="actions"><?= __('') ?></th>
... ... @@ -70,6 +70,8 @@ foreach ($documents as $document) :
70 70  
71 71 </div>
72 72  
  73 +<!--
73 74 <div class="actions">
74   - <?php echo $this->element('menu') ?>
75   - </div>
76 75 \ No newline at end of file
  76 + <php echo $this->element('menu') ?>
  77 + </div>
  78 +-->
77 79 \ No newline at end of file
... ...
src/Template/Documents/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -59,13 +59,15 @@
59 59 </table>
60 60 </div>
61 61  
  62 +<!--
62 63 <div class="actions">
63   - <?php echo $this->element('menu') ?>
64   - <?php
  64 + <php echo $this->element('menu') ?>
  65 + <php
65 66  
66 67 echo $this->element('menu_view', [
67 68 'pluralHumanName' => 'Documents',
68 69 'singularHumanName' => 'Document',
69 70 'lien' => $document->id
70 71 ])?>
71   - </div>
72 72 \ No newline at end of file
  73 + </div>
  74 +-->
73 75 \ No newline at end of file
... ...
src/Template/Element/menu_responsive.ctp 0 → 100644
  Diff comments   View file @3a0887a
... ... @@ -0,0 +1,91 @@
  1 +<!-- début menu -->
  2 +
  3 +
  4 +<nav class="navbar navbar-expand-xl navbar-light bg-light">
  5 + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
  6 + <span class="navbar-toggler-icon"></span>
  7 + </button>
  8 +
  9 + <div class="collapse navbar-collapse" id="navbarSupportedContent">
  10 + <ul class="navbar-nav mr-auto">
  11 +
  12 +
  13 + <li class="nav-item">
  14 + <?=$this->Html->link('<i class="nav-link" id="police">Retour</i>', 'javascript:window.history.go(-1)', ['escape' => false])?>
  15 + </li>
  16 +
  17 + <li class="nav-item">
  18 + <?=$this->Html->link('<i class="nav-link" id="police">Accueil</i>', ['controller' => 'pages','action' => 'home'], ['escape' => false]);?>
  19 + </li>
  20 +
  21 + <?php if(isset($username) && $username != " "): ?>
  22 +
  23 + <li class="nav-item dropdown">
  24 +
  25 + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="text-decoration-color: #17457F;">
  26 + Matériel
  27 + </a>
  28 + <div class="dropdown-menu" aria-labelledby="navbarDropdown">
  29 + <?=$this->Html->link('<i class="dropdown-item">Nouveau</i>', ['controller' => 'Materiels','action' => 'add'], ['escape' => false]);?>
  30 + <?=$this->Html->link('<i class="dropdown-item">Ma liste</i>', ['controller' => 'Materiels', 'action' => 'index', 'MY' => $username ], ['escape' => false]);?>
  31 + <?=$this->Html->link('<i class="dropdown-item">Tous</i>', ['controller' => 'Materiels','action' => 'index'], ['escape' => false])?>
  32 + <?=$this->Html->link('<i class="dropdown-item">Rechercher</i>', ['controller' => 'materiels','action' => 'find'], ['escape' => false]);?>
  33 + </div>
  34 + </li>
  35 +
  36 + <li class="nav-item dropdown">
  37 + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="text-decoration-color: #17457F;">
  38 + Suivi
  39 + </a>
  40 + <div class="dropdown-menu" aria-labelledby="navbarDropdown">
  41 + <?=$this->Html->link('<i class="dropdown-item">Liste</i>', ['controller' => 'Suivis','action' => 'index'], ['escape' => false])?>
  42 + <?=$this->Html->link('<i class="dropdown-item">Rechercher</i>', ['controller' => 'suivis','action' => 'find'], ['escape' => false]);?>
  43 + </div>
  44 + </li>
  45 +
  46 + <li class="nav-item dropdown">
  47 + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="text-decoration-color: #17457F;">
  48 + Emprunt
  49 + </a>
  50 + <div class="dropdown-menu" aria-labelledby="navbarDropdown">
  51 + <?=$this->Html->link('<i class="dropdown-item">Liste</i>', ['controller' => 'Emprunts','action' => 'index'], ['escape' => false]);?>
  52 + <?=$this->Html->link('<i class="dropdown-item">Rechercher</i>', ['controller' => 'emprunts','action' => 'find'], ['escape' => false])?>
  53 + </div>
  54 + </li>
  55 +
  56 + <li class="nav-item">
  57 + <?=$this->Html->link('<i class="nav-link aligner" id="police">Autres listes</i>', ['controller' => 'pages','action' => 'tools_sm'], ['escape' => false])?>
  58 + </li>
  59 +
  60 + <?php if(isset($role) && !(in_array($role, ['Utilisateur']))): ?>
  61 + <li class="nav-item">
  62 + <?=$this->Html->link('<i class="nav-link" id="police">Outils</i>', ['controller' => 'pages','action' => 'tools'], ['escape' => false])?>
  63 + </li>
  64 + <?php endif; ?>
  65 + <?php endif; ?>
  66 +
  67 + <li class="nav-item">
  68 + <?=$this->Html->link('<i class="nav-link aligner" id="police">A propos</i>', ['controller' => 'pages','action' => 'about'], ['escape' => false])?>
  69 + </li>
  70 +
  71 + </ul>
  72 +
  73 + <div id="barre">
  74 + <?php if (isset($username) && $username != " ") {
  75 +
  76 + // Search function
  77 + echo $this->Form->create('Materiel', ['url' => '/materiels/find']);
  78 +
  79 + echo '<input name="s_all_2" class="form-control mr-2 mr-sm-2 col-8 col-sm-6 col-md-6 col-lg-9" type="search" placeholder="Recherche (matériels)" aria-label="Search" id="MaterielSAll barre">';
  80 + echo $this->Form->button('Chercher', [ 'class'=>'btn btn-outline-success', 'type'=>'submit', 'name' => 'MaterielSAll', 'id' => 'MaterielSAll', 'style' => 'margin: 0px;' ]);
  81 +
  82 + echo $this->Form->end();
  83 + }?>
  84 + </div>
  85 +
  86 + </div>
  87 +</nav>
  88 +
  89 +
  90 +<!-- fin menu -->
  91 +
... ...
src/Template/Emprunts/add.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="emprunts form">
  2 +<div class="emprunts form col-lg-12 col-md-12 col-sm-12">
3 3 <?= $this->Form->create($emprunt) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -125,14 +125,16 @@
125 125 <?= $this->Form->end() ?>
126 126 </div>
127 127  
  128 +<!--
128 129 <div class="actions">
129   - <?php
  130 + <php
130 131 echo $this->element('menu');
131 132 echo $this->element('menu_form', [
132 133 'pluralHumanName' => 'Emprunts'
133 134 ]);
134 135 ?>
135 136 </div>
  137 +-->
136 138  
137 139 <script type="text/javascript">
138 140  
... ...
src/Template/Emprunts/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="emprunts form">
  2 +<div class="emprunts form col-lg-12 col-md-12 col-sm-12">
3 3 <?= $this->Form->create($emprunt) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -120,14 +120,16 @@
120 120 <?= $this->Form->end() ?>
121 121 </div>
122 122  
  123 +<!--
123 124 <div class="actions">
124   - <?php
  125 + <php
125 126 echo $this->element('menu');
126 127 echo $this->element('menu_form', [
127 128 'pluralHumanName' => 'Emprunts'
128 129 ]);
129 130 ?>
130 131 </div>
  132 +-->
131 133  
132 134 <script type="text/javascript">
133 135  
... ...
src/Template/Emprunts/find.ctp
  Diff comments   View file @3a0887a
1 1 <?php
2 2 use Cake\ORM\TableRegistry;
3 3 ?>
4   -<div class="index">
  4 +<div class="index col-lg-5 col-md-7 col-sm-9">
5 5 <h2>
6 6 <i class="icon-search"></i> Recherche d'emprunt
7 7 </h2>
... ... @@ -86,9 +86,9 @@ echo $this-&gt;Form-&gt;control(&#39;laboratoire&#39;, [
86 86 echo '</div>';
87 87  
88 88 // -------Bouton recherche Bas---------
89   -echo $this->Form->submit('Rechercher', [
90   - 'style' => 'width: 20%'
91   -]);
  89 +//echo $this->Form->submit('Rechercher', [ 'style' => 'width: 20%']);
  90 +echo $this->Form->button('Rechercher', ['class'=>'btn btn-outline-success', 'type'=>'submit', 'style' => 'margin: 0px;']);
  91 +
92 92 echo '<br/><br/><br/>';
93 93 ?>
94 94 </div>
... ... @@ -217,10 +217,11 @@ echo $this-&gt;Form-&gt;end();
217 217  
218 218 </div>
219 219  
220   -
  220 +<!--
221 221 <div class="actions">
222   - <?php echo $this->element('menu') ?>
  222 + <php echo $this->element('menu') ?>
223 223 </div>
  224 +-->
224 225 <script type="text/javascript">
225 226 $(document).ready(function () {
226 227 $('#interne').show();
... ...
src/Template/Emprunts/index.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="emprunts index">
  2 +<div class="emprunts index col-lg-12 col-md-12 col-sm-12">
3 3 <?php echo '<h2><i class="icon-list"></i> Liste des emprunts ('.$nbEmprunts.')</h2>'; ?>
4 4 <table style="border-collapse: separate; border-spacing: 0;">
5 5 <thead>
... ... @@ -47,6 +47,8 @@
47 47  
48 48 </div>
49 49  
  50 +<!--
50 51 <div class="actions">
51   - <?php echo $this->element('menu') ?>
52   - </div>
53 52 \ No newline at end of file
  53 + <php echo $this->element('menu') ?>
  54 + </div>
  55 +-->
54 56 \ No newline at end of file
... ...
src/Template/Emprunts/view.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="emprunts view">
  2 +<div class="emprunts view col-lg-12 col-md-12 col-sm-12">
3 3 <h2>Détail emprunt</h2>
4 4 <table style="margin-bottom: 30px;">
5 5  
... ... @@ -74,13 +74,15 @@
74 74 </table>
75 75 </div>
76 76  
  77 +<!--
77 78 <div class="actions">
78   - <?php echo $this->element('menu') ?>
79   - <?php
  79 + <php echo $this->element('menu') ?>
  80 + <php
80 81  
81 82 echo $this->element('menu_view', [
82 83 'pluralHumanName' => 'Emprunts',
83 84 'singularHumanName' => 'Emprunt',
84 85 'lien' => $emprunt->id
85 86 ])?>
86   - </div>
87 87 \ No newline at end of file
  88 + </div>
  89 +-->
88 90 \ No newline at end of file
... ...
src/Template/Fichemetrologiques/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -126,14 +126,16 @@ echo &#39;&lt;/div&gt;&#39;;
126 126 <?= $this->Form->end() ?>
127 127 </div>
128 128  
  129 +<!--
129 130 <div class="actions">
130   - <?php
  131 + <php
131 132 echo $this->element('menu');
132 133 echo $this->element('menu_form', [
133 134 'pluralHumanName' => 'Suivis'
134 135 ]);
135 136 ?>
136 137 </div>
  138 +-->
137 139  
138 140 <script type="text/javascript">
139 141  
... ...
src/Template/Fichemetrologiques/edit.ctp
  Diff comments   View file @3a0887a
... ... @@ -46,14 +46,16 @@
46 46 <?= $this->Form->end() ?>
47 47 </div>
48 48  
  49 +<!--
49 50 <div class="actions">
50   - <?php
  51 + <php
51 52 echo $this->element('menu');
52 53 echo $this->element('menu_form', [
53 54 'pluralHumanName' => 'Suivis'
54 55 ]);
55 56 ?>
56 57 </div>
  58 +-->
57 59  
58 60 <script type="text/javascript">
59 61  
... ...
src/Template/Fichemetrologiques/index.ctp
  Diff comments   View file @3a0887a
... ... @@ -28,6 +28,8 @@
28 28  
29 29 </div>
30 30  
  31 +<!--
31 32 <div class="actions">
32   - <?php echo $this->element('menu') ?>
33   - </div>
34 33 \ No newline at end of file
  34 + <php echo $this->element('menu') ?>
  35 + </div>
  36 +-->
35 37 \ No newline at end of file
... ...
src/Template/Fichemetrologiques/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -7,13 +7,14 @@
7 7  
8 8 </div>
9 9  
10   -
  10 +<!--
11 11 <div class="actions">
12   - <?php echo $this->element('menu') ?>
13   - <?php
  12 + <php echo $this->element('menu') ?>
  13 + <php
14 14  
15 15 echo $this->element('menu_index', [
16 16 'pluralHumanName' => 'Matériels',
17 17 'singularHumanName' => 'Matériel'
18 18 ])?>
19   - </div>
20 19 \ No newline at end of file
  20 + </div>
  21 +-->
21 22 \ No newline at end of file
... ...
src/Template/Formules/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -37,14 +37,16 @@ echo $this-&gt;Form-&gt;control(&#39;nbVariable&#39;, [
37 37 <?= $this->Form->end() ?>
38 38 </div>
39 39  
  40 +<!--
40 41 <div class="actions">
41   - <?php
  42 + <php
42 43 echo $this->element('menu');
43 44 echo $this->element('menu_form', [
44 45 'pluralHumanName' => 'Formules'
45 46 ]);
46 47 ?>
47 48 </div>
  49 +-->
48 50  
49 51 <script type="text/javascript">
50 52  
... ...
src/Template/Formules/edit.ctp
  Diff comments   View file @3a0887a
... ... @@ -37,14 +37,16 @@ echo $this-&gt;Form-&gt;control(&#39;nbVariable&#39;, [
37 37 <?= $this->Form->end() ?>
38 38 </div>
39 39  
  40 +<!--
40 41 <div class="actions">
41   - <?php
  42 + <php
42 43 echo $this->element('menu');
43 44 echo $this->element('menu_form', [
44 45 'pluralHumanName' => 'Formules'
45 46 ]);
46 47 ?>
47 48 </div>
  49 +-->
48 50  
49 51 <script type="text/javascript">
50 52  
... ...
src/Template/Formules/index.ctp
  Diff comments   View file @3a0887a
... ... @@ -38,12 +38,14 @@
38 38  
39 39 </div>
40 40  
  41 +<!--
41 42 <div class="actions">
42   - <?php echo $this->element('menu') ?>
43   - <?php
  43 + <php echo $this->element('menu') ?>
  44 + <php
44 45  
45 46 echo $this->element('menu_index', [
46 47 'pluralHumanName' => 'Formules',
47 48 'singularHumanName' => 'Formule'
48 49 ])?>
49   - </div>
50 50 \ No newline at end of file
  51 + </div>
  52 +-->
51 53 \ No newline at end of file
... ...
src/Template/Formules/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -59,9 +59,10 @@ foreach ($formule-&gt;variables as $variable) :
59 59  
60 60 </div>
61 61  
  62 +<!--
62 63 <div class="actions">
63   - <?php echo $this->element('menu') ?>
64   - <?php
  64 + <php echo $this->element('menu') ?>
  65 + <php
65 66  
66 67 echo $this->element('menu_view', [
67 68 'pluralHumanName' => 'Formules',
... ... @@ -69,3 +70,4 @@ echo $this-&gt;element(&#39;menu_view&#39;, [
69 70 'lien' => $formule->id
70 71 ])?>
71 72 </div>
  73 +-->
... ...
src/Template/Fournisseurs/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -13,11 +13,13 @@
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => 'Fournisseurs'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/Fournisseurs/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="fournisseurs form">
  2 +<div class="fournisseurs form col-lg-5 col-md-7 col-sm-9">
3 3 <?= $this->Form->create($fournisseur) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -9,15 +9,17 @@
9 9 echo $this->Form->control('nom');
10 10 ?>
11 11 </fieldset>
12   - <?= $this->Form->submit(__('Valider')) ?>
  12 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => 'Fournisseurs'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/Fournisseurs/index.ctp
  Diff comments   View file @3a0887a
1 1  
2 2 <div class="fournisseurs index">
3 3 <?php echo '<h2><i class="icon-list"></i> Liste des Fournisseurs</h2>'; ?>
4   - <table cellpadding="0" cellspacing="0">
  4 + <table cellpadding="0" cellspacing="0" style="width: 270px;">
5 5 <thead>
6 6 <tr>
7 7 <th class="actions"><?= __('') ?></th>
... ... @@ -44,12 +44,14 @@ foreach ($fournisseurs as $fournisseur) :
44 44  
45 45 </div>
46 46  
  47 +<!--
47 48 <div class="actions">
48   - <?php echo $this->element('menu') ?>
49   - <?php
  49 + <php echo $this->element('menu') ?>
  50 + <php
50 51  
51 52 echo $this->element('menu_index', [
52 53 'pluralHumanName' => 'Fournisseurs',
53 54 'singularHumanName' => 'Fournisseur'
54 55 ])?>
55   - </div>
56 56 \ No newline at end of file
  57 + </div>
  58 +-->
57 59 \ No newline at end of file
... ...
src/Template/Fournisseurs/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -18,6 +18,7 @@
18 18 'action' => 'edit',
19 19 $fournisseur->id
20 20 ], [
  21 + 'style' => 'margin-right: 40px; display: inline-block',
21 22 'escape' => false,
22 23 'onclick' => 'return true;'
23 24 ]);
... ... @@ -31,7 +32,7 @@
31 32 'action' => 'delete',
32 33 $fournisseur->id
33 34 ], [
34   - 'style' => 'margin-left: 110px',
  35 + 'style' => 'display: inline-block',
35 36 'escape' => false,
36 37 'confirm' => __('Êtes-vous sur de vouloir supprimer # {0}?', $fournisseur->id)
37 38 ]);
... ... @@ -72,14 +73,15 @@
72 73  
73 74 </div>
74 75  
75   -
  76 +<!--
76 77 <div class="actions">
77   - <?php echo $this->element('menu') ?>
78   - <?php
  78 + <php echo $this->element('menu') ?>
  79 + <php
79 80  
80 81 echo $this->element('menu_view', [
81 82 'pluralHumanName' => 'Fournisseurs',
82 83 'singularHumanName' => 'Fournisseur',
83 84 'lien' => $fournisseur->id
84 85 ])?>
85   - </div>
86 86 \ No newline at end of file
  87 + </div>
  88 +-->
87 89 \ No newline at end of file
... ...
src/Template/GroupesMetiers/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -13,11 +13,13 @@
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => $configuration->nom_groupe_metier . 's'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/GroupesMetiers/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="groupesMetiers form">
  2 +<div class="groupesMetiers form col-lg-5 col-md-7 col-sm-9">
3 3 <?= $this->Form->create($groupesMetier) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -9,15 +9,17 @@
9 9 echo $this->Form->control('description');
10 10 ?>
11 11 </fieldset>
12   - <?= $this->Form->submit(__('Valider')) ?>
  12 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => $configuration->nom_groupe_metier . 's'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/GroupesMetiers/index.ctp
  Diff comments   View file @3a0887a
1 1  
2 2 <div class="groupesMetiers index">
3 3 <?php echo '<h2><i class="icon-list"></i> Liste des '.$configuration->nom_groupe_metier.'</h2>'; ?>
4   - <table style="border-collapse: separate; border-spacing: 0;">
  4 + <table style="border-collapse: separate; border-spacing: 0; width: 270px;">
5 5 <thead>
6 6 <tr>
7 7 <th class="actions"><?= __('') ?></th>
... ... @@ -45,12 +45,14 @@ foreach ($groupesMetiers as $groupesMetier) :
45 45  
46 46 </div>
47 47  
  48 +<!--
48 49 <div class="actions">
49   - <?php echo $this->element('menu') ?>
50   - <?php
  50 + <php echo $this->element('menu') ?>
  51 + <php
51 52  
52 53 echo $this->element('menu_index', [
53 54 'pluralHumanName' => $configuration->nom_groupe_metier . 's',
54 55 'singularHumanName' => $configuration->nom_groupe_metier
55 56 ])?>
56 57 </div>
  58 +-->
57 59 \ No newline at end of file
... ...
src/Template/GroupesMetiers/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -19,6 +19,7 @@
19 19 'action' => 'edit',
20 20 $groupesMetier->id
21 21 ], [
  22 + 'style' => 'margin-right: 40px; display: inline-block',
22 23 'escape' => false,
23 24 'onclick' => 'return true;'
24 25 ]);
... ... @@ -31,7 +32,7 @@
31 32 'action' => 'delete',
32 33 $groupesMetier->id
33 34 ], [
34   - 'style' => 'margin-left: 110px',
  35 + 'style' => 'display: inline-block',
35 36 'escape' => false,
36 37 'confirm' => __('Êtes-vous sur de vouloir supprimer # {0}?', $groupesMetier->id)
37 38 ]);
... ... @@ -130,13 +131,15 @@
130 131  
131 132 </div>
132 133  
  134 +<!--
133 135 <div class="actions">
134   - <?php echo $this->element('menu') ?>
135   - <?php
  136 + <php echo $this->element('menu') ?>
  137 + <php
136 138  
137 139 echo $this->element('menu_view', [
138 140 'pluralHumanName' => $configuration->nom_groupe_metier . 's',
139 141 'singularHumanName' => $configuration->nom_groupe_metier,
140 142 'lien' => $groupesMetier->id
141 143 ])?>
142   - </div>
143 144 \ No newline at end of file
  145 + </div>
  146 +-->
144 147 \ No newline at end of file
... ...
src/Template/GroupesThematiques/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -13,11 +13,13 @@
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => $configuration->nom_groupe_thematique . 's'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/GroupesThematiques/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="groupesThematiques form">
  2 +<div class="groupesThematiques form col-lg-5 col-md-7 col-sm-9">
3 3 <?= $this->Form->create($groupesThematique) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -9,15 +9,17 @@
9 9 echo $this->Form->control('description');
10 10 ?>
11 11 </fieldset>
12   - <?= $this->Form->submit(__('Valider')) ?>
  12 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => $configuration->nom_groupe_thematique . 's'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/GroupesThematiques/index.ctp
  Diff comments   View file @3a0887a
1 1  
2 2 <div class="groupesThematiques index">
3 3 <?php echo '<h2><i class="icon-list"></i> Liste des '.$configuration->nom_groupe_thematique.'s</h2>'; ?>
4   - <table style="border-collapse: separate; border-spacing: 0;">
  4 + <table style="border-collapse: separate; border-spacing: 0; width: 270px;">
5 5 <thead>
6 6 <tr>
7 7 <th class="actions"><?= __('') ?></th>
... ... @@ -42,13 +42,14 @@ foreach ($groupesThematiques as $groupesThematique) :
42 42  
43 43 </div>
44 44  
45   -
  45 +<!--
46 46 <div class="actions">
47   - <?php echo $this->element('menu') ?>
48   - <?php
  47 + <php echo $this->element('menu') ?>
  48 + <php
49 49  
50 50 echo $this->element('menu_index', [
51 51 'pluralHumanName' => $configuration->nom_groupe_thematique . 's',
52 52 'singularHumanName' => $configuration->nom_groupe_thematique
53 53 ])?>
54   - </div>
55 54 \ No newline at end of file
  55 + </div>
  56 +-->
56 57 \ No newline at end of file
... ...
src/Template/GroupesThematiques/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -19,6 +19,7 @@
19 19 'action' => 'edit',
20 20 $groupesThematique->id
21 21 ], [
  22 + 'style' => 'margin-right: 40px; display: inline-block',
22 23 'escape' => false,
23 24 'onclick' => 'return true;'
24 25 ]);
... ... @@ -31,7 +32,7 @@
31 32 'action' => 'delete',
32 33 $groupesThematique->id
33 34 ], [
34   - 'style' => 'margin-left: 110px',
  35 + 'style' => 'display: inline-block',
35 36 'escape' => false,
36 37 'confirm' => __('Êtes-vous sur de vouloir supprimer # {0}?', $groupesThematique->id)
37 38 ]);
... ... @@ -128,13 +129,15 @@
128 129  
129 130 </div>
130 131  
  132 +<!--
131 133 <div class="actions">
132   - <?php echo $this->element('menu') ?>
133   - <?php
  134 + <php echo $this->element('menu') ?>
  135 + <php
134 136  
135 137 echo $this->element('menu_view', [
136 138 'pluralHumanName' => $configuration->nom_groupe_thematique . 's',
137 139 'singularHumanName' => $configuration->nom_groupe_thematique,
138 140 'lien' => $groupesThematique->id
139 141 ])?>
140   - </div>
141 142 \ No newline at end of file
  143 + </div>
  144 +-->
142 145 \ No newline at end of file
... ...
src/Template/Layout/default.ctp
  Diff comments   View file @3a0887a
... ... @@ -43,7 +43,7 @@ $this-&gt;append(&#39;css&#39;, $html5Shim);
43 43 // <!-- Added for LabInvent : START -->
44 44  
45 45 //echo $this->Html->css('smoothness');
46   -$this->append('css', $this->Html->css(['smoothness', 'inventirap', 'font-awesome']));
  46 +$this->append('css', $this->Html->css(['smoothness', 'inventirap', 'font-awesome', 'responsive']));
47 47 //<= $this->Html->css('inventirap') >
48 48 //<= $this->Html->css('font-awesome') >
49 49  
... ... @@ -100,31 +100,41 @@ $this-&gt;append(&#39;script&#39;, $this-&gt;Html-&gt;script([&#39;script&#39;, &#39;DatepickerConfig&#39;, &#39;onTa
100 100  
101 101 <div id="container">
102 102  
103   - <div id="header">
104   - <?=$this->Html->image('logo_software.jpg', ['alt' => 'Logo de l\'application','border' => '0','height' => '80px','url' => '/'])?>
105   - <div class="user">
106   - <?php
107   - if (isset($username) && $username != " ") {
108   - echo 'Bienvenue ' . $username . '<br/>';
109   - echo $role . '<br/>';
110   - echo $this->Html->link('Se déconnecter', [
111   - 'controller' => 'Users',
112   - 'action' => 'logout'
113   - ]);
114   - } else {
115   - echo 'Bienvenue invité<br/>';
116   - echo $this->Html->link('Se connecter', [
117   - 'controller' => 'Users',
118   - 'action' => 'login'
119   - ]);
120   - }
  103 + <div class="row" id="header">
  104 + <div class="col-lg-2">
  105 + <?=$this->Html->image('logo_software.jpg', ['alt' => 'Logo de l\'application','border' => '0','height' => '70px','url' => '/'])?>
  106 + </div>
  107 + <div class="offset-lg-6 col-lg-4 user">
  108 + <?php
  109 + if (isset($username) && $username != " ") {
  110 + echo 'Bienvenue ' . $username . '<br/>';
  111 + echo $role . '<br/>';
  112 + echo $this->Html->link('Se déconnecter', [
  113 + 'controller' => 'Users',
  114 + 'action' => 'logout'
  115 + ]);
  116 + } else {
  117 + echo 'Bienvenue invité<br/>';
  118 + echo $this->Html->link('Se connecter', [
  119 + 'controller' => 'Users',
  120 + 'action' => 'login'
  121 + ]);
  122 + }
121 123 ?>
122 124 </div> <!-- user -->
123 125 </div> <!-- header -->
124 126  
125 127  
  128 + <!-- menu -->
  129 + <div>
  130 + <?php
  131 + echo $this->element('menu_responsive');
  132 + ?>
  133 + </div>
  134 +
  135 +
126 136 <!-- Contenu principal de chaque page web -->
127   - <div id="content">
  137 + <div class="col-lg-12" id="content">
128 138  
129 139 <!-- Message Flash éventuel -->
130 140 <?= $this->Flash->render() ?>
... ... @@ -138,75 +148,70 @@ $this-&gt;append(&#39;script&#39;, $this-&gt;Html-&gt;script([&#39;script&#39;, &#39;DatepickerConfig&#39;, &#39;onTa
138 148  
139 149 </div> <!-- content -->
140 150  
  151 + <div class="row" id="footer">
  152 +
  153 + <section class="row col-lg-12">
  154 +
  155 + <div class="col-lg-2">
  156 + <?=$this->Html->image('logo_entity.jpg', ['alt' => 'Logo du labo','border' => '0','height' => '50px'])?>
  157 + </div>
  158 +
  159 + <a class="col-lg-2" href="http://cakephp.org">Baked with CAKEPHP</a>
  160 +
  161 + <div class="col-lg-5" id="bugreport"><a href="https://tinyurl.com/labinvent#heading=h.2r55bflctpt5"><h3>WHAT's NEW ?</h3></a>
  162 + <i>
  163 + <!--
  164 + (<a href="https://projects.irap.omp.eu/projects/inventirap/roadmap?tracker_ids[]=1&tracker_ids[]=2&tracker_ids[]=4&tracker_ids[]=5&tracker_ids[]=6&tracker_ids[]=7&tracker_ids[]=8&tracker_ids[]=9#version_2.04_-_Impl%C3%A9mentation_des_ACL_%28droits%29">ROADMAP : Activité restant à réaliser</a>)
  165 + -->
  166 + (<a href="https://projects.irap.omp.eu/projects/inventirap/issues?query_id=263">ROADMAP => Activité restant à réaliser - TODO LIST</a>)
  167 + <br/><h6>Merci de communiquer remarques et bugs à <a href="mailto:inventirap@irap.omp.eu">LABINVENT-MAILING-LIST</a></h6>
  168 + </i>
  169 + </div>
  170 +
  171 + <div class="col-lg-3" id="version">
  172 + <?php
  173 + // pour "what's new" : &nbsp;&nbsp;&nbsp
  174 + // Set $version and $version_date
  175 + // (cf https://book.cakephp.org/3.0/fr/core-libraries/file-folder.html#Cake\Filesystem)
  176 + //$version = '2.9.1.4';
  177 + //$version_date = '21/12/2018';
  178 + $wwwroot_dir = new Cake\Filesystem\Folder(WWW_ROOT);
  179 + $readme_file = new Cake\Filesystem\File($wwwroot_dir->pwd() . DS . '..' . DS . 'README.md');
  180 + //dump($file);
  181 + $contents = $readme_file->read();
  182 + $lines = explode("\n", $contents);
  183 + for ($i = 0; $i < sizeof($lines); $i++) {
  184 + $line = $lines[$i];
  185 + if (substr($line, 0, strlen("Date:")) === "Date:") {
  186 + $version_date = ltrim( explode(":", $line)[1] );
  187 + $version = explode(":", $lines[$i+1])[1];
  188 + break;
  189 + }
  190 + }
  191 + // $readme_file->write('J'écris dans ce fichier');
  192 + // $readme_file->append('J'ajoute à la fin de ce fichier.');
  193 + // $readme_file->delete(); // Je supprime ce fichier
  194 + $readme_file->close(); // Assurez-vous de fermer le fichier quand c'est fini
  195 + ?>
  196 + <!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) -->
  197 + <font color="black">
  198 + <!--
  199 + VERSION 2.9.1.4 (21/12/2018)
  200 + -->
  201 + <?="VERSION $version ($version_date)"?>
  202 + <br/>
  203 + <a href="<?=$this->request->getAttribute("webroot")?>webroot/doc/userguide/labinvent2_userguide.pdf" onclick="window.open(this.href); return false;">Documentation utilisateurs</a>
  204 + <br/>
  205 + <a href="https://tinyurl.com/labinvent" onclick="window.open(this.href); return false;">Documentation technique générale</a>
  206 + <!--
  207 + <a href="https://projects.irap.omp.eu/projects/inventirap/wiki/Installation" onclick="window.open(this.href); return false;">Wiki installation</a>
  208 + -->
  209 + </font>
  210 + </div>
  211 +
  212 + </section>
  213 + </div> <!-- footer -->
141 214  
142   - <div id="footer">
143   - <table>
144   - <tr>
145   -
146   - <td>
147   - <?=$this->Html->image('logo_entity.jpg', ['alt' => 'Logo du labo','border' => '0','height' => '50px'])?>
148   - </td>
149   -
150   - <td>
151   - <br/> <a href="http://cakephp.org">Baked with CAKEPHP</a>
152   - </td>
153   -
154   - <td id="bugreport">
155   - <a href="https://tinyurl.com/labinvent#heading=h.2r55bflctpt5"><h3>WHAT's NEW ?</h3></a>
156   - <i>
157   - <!--
158   - (<a href="https://projects.irap.omp.eu/projects/inventirap/roadmap?tracker_ids[]=1&tracker_ids[]=2&tracker_ids[]=4&tracker_ids[]=5&tracker_ids[]=6&tracker_ids[]=7&tracker_ids[]=8&tracker_ids[]=9#version_2.04_-_Impl%C3%A9mentation_des_ACL_%28droits%29">ROADMAP : Activité restant à réaliser</a>)
159   - -->
160   - (<a href="https://projects.irap.omp.eu/projects/inventirap/issues?query_id=263">ROADMAP => Activité restant à réaliser - TODO LIST</a>)
161   - <br/>
162   - <h6>Merci de communiquer remarques et bugs à <a href="mailto:inventirap@irap.omp.eu">LABINVENT-MAILING-LIST</a></h6>
163   - </i>
164   - </td>
165   -
166   - <td id="version">
167   - <?php
168   - // pour "what's new" : &nbsp;&nbsp;&nbsp
169   -
170   - // Set $version and $version_date
171   - // (cf https://book.cakephp.org/3.0/fr/core-libraries/file-folder.html#Cake\Filesystem)
172   - //$version = '2.9.1.4';
173   - //$version_date = '21/12/2018';
174   - $wwwroot_dir = new Cake\Filesystem\Folder(WWW_ROOT);
175   - $readme_file = new Cake\Filesystem\File($wwwroot_dir->pwd() . DS . '..' . DS . 'README.md');
176   - //dump($file);
177   - $contents = $readme_file->read();
178   - $lines = explode("\n", $contents);
179   - for ($i = 0; $i < sizeof($lines); $i++) {
180   - $line = $lines[$i];
181   - if (substr($line, 0, strlen("Date:")) === "Date:") {
182   - $version_date = ltrim( explode(":", $line)[1] );
183   - $version = explode(":", $lines[$i+1])[1];
184   - break;
185   - }
186   - }
187   - // $readme_file->write('J'écris dans ce fichier');
188   - // $readme_file->append('J'ajoute à la fin de ce fichier.');
189   - // $readme_file->delete(); // Je supprime ce fichier
190   - $readme_file->close(); // Assurez-vous de fermer le fichier quand c'est fini
191   - ?>
192   - <!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) -->
193   - <font color="black">
194   - <!--
195   - VERSION 2.9.1.4 (21/12/2018)
196   - -->
197   - <?="VERSION $version ($version_date)"?>
198   - <br/>
199   - <a href="<?=$this->request->getAttribute("webroot")?>webroot/doc/userguide/labinvent2_userguide.pdf" onclick="window.open(this.href); return false;">Documentation utilisateurs</a>
200   - <br/>
201   - <a href="https://tinyurl.com/labinvent" onclick="window.open(this.href); return false;">Documentation technique générale</a>
202   - <!--
203   - <a href="https://projects.irap.omp.eu/projects/inventirap/wiki/Installation" onclick="window.open(this.href); return false;">Wiki installation</a>
204   - -->
205   - </font>
206   - </td>
207   - </tr>
208   - </table>
209   - </div> <!-- footer -->
210 215  
211 216 </div> <!-- container -->
212 217  
... ...
src/Template/Materiels/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -123,19 +123,21 @@ if (isset($cpMateriel)) {
123 123 //debug($Sur_categ_id)
124 124 ?>
125 125  
126   -<div class="materiels form">
  126 +<div class="materiels form col-lg-4 col-md-7 col-sm-9">
127 127 <?=$this->Form->create($materiel)?>
128 128 <fieldset>
129 129 <h2>
130 130 <i class="icon-plus"></i> Ajouter un Matériel
131 131 </h2>
132   - <div id="boutons" class="actions"
  132 + <!--<div id="boutons" class="actions"
133 133 style="margin-bottom: 20px; width: 100%; float: none; padding: 10px 0;">
134 134  
135   - <?=$this->Form->submit(__('Enregistrer'))?>
  135 + <=$this->Form->submit(__('Enregistrer'))?>
  136 + <=$this->Form->button('Enregistrer', [ 'class'=>'btn btn-outline-success', 'type'=>'submit', ]) ?>-->
136 137  
137   - <?=$this->Html->link(__('<i class="icon-minus-sign"></i> Annuler'), ['action' => 'index'], ['escape' => false,'onclick' => 'return true;','style' => 'margin-right: 10px'])?>
138   - </div>
  138 + <!--<=$this->Html->link(__('<i class="icon-minus-sign"></i> Annuler'), ['action' => 'index'], ['escape' => false,'onclick' => 'return true;','style' => 'margin-right: 10px'])?>
  139 + <=$this->Form->button(('<i class="btn btn-outline-dark btn-sm">Annuler</i>'), ['action' => 'index'], ['escape' => false,'onclick' => 'return true;','style' => 'margin-right: 10px'])?>
  140 + </div>-->
139 141  
140 142 <?php
141 143 echo $this->Form->control('designation', [
... ... @@ -148,7 +150,7 @@ if (isset($cpMateriel)) {
148 150 //debug($surCategories);
149 151 echo $this->Form->control('sur_categorie_id', [
150 152 'label' => 'Domaine',
151   - 'style' => 'width: 260px',
  153 + //'style' => 'width: 260px',
152 154 'options' => $surCategories,
153 155 'empty' => 'Choisir un domaine',
154 156 //'default' => $Sur_categ_id
... ... @@ -169,7 +171,7 @@ if (isset($cpMateriel)) {
169 171 */
170 172 echo $this->Form->control('categorie_id', [
171 173 'label' => 'Catégorie',
172   - 'style' => 'width: 380px',
  174 + //'style' => 'width: 380px',
173 175 'options' => $categs,
174 176 'empty' => 'Choisir une catégorie',
175 177 //'default' => $Categ_id
... ... @@ -190,7 +192,7 @@ if (isset($cpMateriel)) {
190 192 */
191 193 echo $this->Form->control('sous_categorie_id', [
192 194 'label' => 'Sous-catégorie',
193   - 'style' => 'width: 380px',
  195 + //'style' => 'width: 380px',
194 196 'options' => $souscategs,
195 197 'empty' => 'Choisir une sous-catégorie',
196 198 //'default' => $Sous_categ_id
... ... @@ -234,7 +236,7 @@ if (isset($cpMateriel)) {
234 236 }
235 237 echo $this->Form->control('site_id', [
236 238 'options' => $sites,
237   - 'style' => 'width: 380px',
  239 + //'style' => 'width: 380px',
238 240 //'default' => $Site_id
239 241 'default' => $materiel->site_id
240 242 ]);
... ... @@ -274,7 +276,7 @@ if (isset($cpMateriel)) {
274 276 echo $this->Form->control('unite_duree_garantie', [
275 277 'label' => false,
276 278 'templates' => [
277   - 'inputContainer' => '<div class="typeFrequence">{{content}}</div>'
  279 + 'inputContainer' => '<div class="typeFrequence" style="margin-left: -300px;margin-right: 200px;margin-bottom: -23px;">{{content}}</div>'
278 280 ],
279 281 'options' => [
280 282 'Mois' => 'Mois',
... ... @@ -353,12 +355,12 @@ if (isset($cpMateriel)) {
353 355 echo $this->Form->control('fournisseur_id', [
354 356 'label' => 'Fournisseur',
355 357 'options' => $fournisseurs,
356   - 'style' => 'width: 380px',
  358 + //'style' => 'width: 380px',
357 359 'empty' => 'Choisir un fournisseur'
358 360 ]);
359 361 echo $this->Form->control('organisme_id', [
360 362 'options' => $organismes,
361   - 'style' => 'width: 380px',
  363 + //'style' => 'width: 380px',
362 364 'empty' => 'Choisir un organisme',
363 365 //'default' => $Organisme_id
364 366 'default' => $materiel->organisme_id,
... ... @@ -399,18 +401,23 @@ if (isset($cpMateriel)) {
399 401 ]);
400 402 ?>
401 403 </fieldset>
402   - <?=$this->Form->submit(__('Enregistrer'))?>
  404 + <!--<=$this->Form->submit(__('Enregistrer'))?>-->
  405 + <?=$this->Form->button('Enregistrer', [ 'class'=>'btn btn-outline-success', 'type'=>'submit', ]) ?>
  406 +
  407 + <!--<=$this->Html->link(__('<i class="icon-minus-sign"></i> Annuler'), ['action' => 'index'], ['escape' => false,'onclick' => 'return true;','style' => 'margin-right: 10px'])?>-->
  408 + <?=$this->Form->button(('<i class="btn btn-outline-dark btn-sm">Annuler</i>'), ['action' => 'index'], ['escape' => false,'onclick' => 'return true;','style' => 'margin-right: 10px'])?>
  409 +
403 410 <?=$this->Form->end()?>
404 411 </div>
405 412  
406   -<div class="actions">
407   -<?php
  413 +<!--<div class="actions">
  414 +<php
408 415 echo $this->element('menu');
409 416 echo $this->element('menu_form', [
410 417 'pluralHumanName' => 'Matériels'
411 418 ]);
412 419 ?>
413   -</div>
  420 +</div>-->
414 421  
415 422  
416 423  
... ...
src/Template/Materiels/administrer.ctp
  Diff comments   View file @3a0887a
... ... @@ -261,15 +261,16 @@
261 261 <?= $this->Form->end() ?>
262 262 </div>
263 263  
  264 +<!--
264 265 <div class="actions">
265   - <?php
  266 + <php
266 267 echo $this->element('menu');
267 268 echo $this->element('menu_form', [
268 269 'pluralHumanName' => 'Matériels'
269 270 ]);
270 271 ?>
271 272 </div>
272   -
  273 +-->
273 274  
274 275 <?php
275 276 /**
... ...
src/Template/Materiels/edit.ctp
  Diff comments   View file @3a0887a
... ... @@ -154,7 +154,7 @@ if ($IS_VALIDATED &amp;&amp; $materiel-&gt;numero_serie)
154 154 ?>
155 155  
156 156  
157   -<div class="materiels form">
  157 +<div class="materiels form col-lg-5 col-md-7 col-sm-9">
158 158 <?=$this->Form->create($materiel)?>
159 159 <fieldset>
160 160  
... ... @@ -177,9 +177,11 @@ if ($IS_VALIDATED &amp;&amp; $materiel-&gt;numero_serie)
177 177  
178 178 <div id="boutons" class="actions"
179 179 style="margin-bottom: 20px; width: 100%; float: none; padding: 10px 0;">
180   - <?=$this->Form->submit(__('Enregistrer'))?>
  180 + <!--<=$this->Form->submit(__('Enregistrer'))?>-->
  181 + <?=$this->Form->button('Enregistrer', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
181 182  
182   - <?=$this->Html->link(__('<i class="icon-minus-sign"></i> Annuler'), ['action' => 'view', $materiel->id], ['escape' => false,'onclick' => 'return true;','style' => 'margin-right: 10px'])?>
  183 + <!--?=$this->Html->link(__('<i class="icon-minus-sign"></i> Annuler'), ['action' => 'view', $materiel->id], ['escape' => false,'onclick' => 'return true;','style' => 'margin-right: 10px'])?> -->
  184 + <?=$this->Form->button(('<i class="btn btn-outline-dark btn-sm">Annuler</i>'), ['action' => 'view', $materiel->id], ['escape' => false,'onclick' => 'return true;','style' => 'margin-right: 10px'])?>
183 185 </div>
184 186  
185 187 <?php
... ... @@ -226,7 +228,7 @@ if ($IS_VALIDATED &amp;&amp; $materiel-&gt;numero_serie)
226 228 */
227 229 echo $this->Form->control('categorie_id', [
228 230 'label' => 'Catégorie',
229   - 'style' => 'width: 380px',
  231 + //'style' => 'width: 380px',
230 232 'options' => $categs,
231 233 'empty' => 'Choisir une catégorie',
232 234 'disabled' => $isReadonlyField('categorie_id', $myReadonlyFields)
... ... @@ -249,7 +251,7 @@ if ($IS_VALIDATED &amp;&amp; $materiel-&gt;numero_serie)
249 251 */
250 252 echo $this->Form->control('sous_categorie_id', [
251 253 'label' => 'Sous-catégorie',
252   - 'style' => 'width: 380px',
  254 + //'style' => 'width: 380px',
253 255 'options' => $souscategs,
254 256 'empty' => 'Choisir une sous-catégorie',
255 257 'disabled' => $isReadonlyField('sous_categorie_id', $myReadonlyFields)
... ... @@ -290,7 +292,7 @@ if ($IS_VALIDATED &amp;&amp; $materiel-&gt;numero_serie)
290 292 }
291 293 echo $this->Form->control('site_id', [
292 294 'options' => $sites,
293   - 'style' => 'width: 380px',
  295 + //'style' => 'width: 380px',
294 296 'default' => 9,
295 297 'disabled' => $isReadonlyField('site_id', $myReadonlyFields)
296 298 ]);
... ... @@ -328,7 +330,7 @@ if ($IS_VALIDATED &amp;&amp; $materiel-&gt;numero_serie)
328 330 echo $this->Form->control('unite_duree_garantie', [
329 331 'label' => false,
330 332 'templates' => [
331   - 'inputContainer' => '<div class="typeFrequence">{{content}}</div>'
  333 + 'inputContainer' => '<div class="typeFrequence" style="margin-left: -300px;margin-right: 200px;margin-bottom: -23px;">{{content}}</div>'
332 334 ],
333 335 'options' => [
334 336 'Mois' => 'Mois',
... ... @@ -426,7 +428,7 @@ if ($IS_VALIDATED &amp;&amp; $materiel-&gt;numero_serie)
426 428 echo $this->Form->control('fournisseur_id', [
427 429 'label' => 'Fournisseur',
428 430 'options' => $fournisseurs,
429   - 'style' => 'width: 380px',
  431 + //'style' => 'width: 380px',
430 432 'empty' => 'choisir un fournisseur',
431 433 'disabled' => $USER_IS_UTILISATEUR
432 434 /*
... ... @@ -437,7 +439,7 @@ if ($IS_VALIDATED &amp;&amp; $materiel-&gt;numero_serie)
437 439 ]);
438 440 echo $this->Form->control('organisme_id', [
439 441 'options' => $organismes,
440   - 'style' => 'width: 380px',
  442 + //'style' => 'width: 380px',
441 443 'disabled' => $isReadonlyField('organisme_id', $myReadonlyFields),
442 444 'empty' => 'Choisir un organisme'
443 445 ]);
... ... @@ -527,18 +529,24 @@ echo $this-&gt;Form-&gt;hidden(&#39;nom_modificateur&#39;, [
527 529  
528 530 ?>
529 531 </fieldset>
530   - <?=$this->Form->submit(__('Enregistrer'))?>
  532 + <!--<=$this->Form->submit(__('Enregistrer'))?>-->
  533 + <?=$this->Form->button('Enregistrer', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
  534 +
  535 + <!--?=$this->Html->link(__('<i class="icon-minus-sign"></i> Annuler'), ['action' => 'view', $materiel->id], ['escape' => false,'onclick' => 'return true;','style' => 'margin-right: 10px'])?> -->
  536 + <?=$this->Form->button(('<i class="btn btn-outline-dark btn-sm">Annuler</i>'), ['action' => 'view', $materiel->id], ['escape' => false,'onclick' => 'return true;','style' => 'margin-right: 10px'])?>
531 537 <?=$this->Form->end()?>
532 538 </div>
533 539  
  540 +<!--
534 541 <div class="actions">
535   -<?php
  542 +<php
536 543 echo $this->element('menu');
537 544 echo $this->element('menu_form', [
538 545 'pluralHumanName' => 'Matériels'
539 546 ]);
540 547 ?>
541 548 </div>
  549 +-->
542 550  
543 551 <?php
544 552 /**
... ...
src/Template/Materiels/exec_actions.ctp
  Diff comments   View file @3a0887a
  1 +<!--
1 2 <div class="actions">
2   - <?php echo $this->element('menu') ?>
3   - <?php echo $this->element('menu_form', [ 'pluralHumanName' => '' ]); ?>
4   -</div>
5 3 \ No newline at end of file
  4 + <php echo $this->element('menu') ?>
  5 + <php echo $this->element('menu_form', [ 'pluralHumanName' => '' ]); ?>
  6 +</div>
  7 +-->
6 8 \ No newline at end of file
... ...
src/Template/Materiels/export.ctp
  Diff comments   View file @3a0887a
1   -
2   -
3   -
  1 +<!--
4 2 <div class="actions">
5   - <?php echo $this->element('menu') ?>
6   - <?php echo $this->element('menu_form', [ 'pluralHumanName' => '' ]); ?>
7   -</div>
8 3 \ No newline at end of file
  4 + <php echo $this->element('menu') ?>
  5 + <php echo $this->element('menu_form', [ 'pluralHumanName' => '' ]); ?>
  6 +</div>
  7 +-->
9 8 \ No newline at end of file
... ...
src/Template/Materiels/find.ctp
  Diff comments   View file @3a0887a
... ... @@ -2,7 +2,7 @@
2 2  
3 3  
4 4  
5   -<div class="index">
  5 +<div class="index col-lg-5 col-md-7 col-sm-9">
6 6 <h2>
7 7 <i class="icon-search"></i> Recherche de matériel
8 8 </h2>
... ... @@ -55,9 +55,7 @@ else
55 55 echo $this->Form->create();
56 56  
57 57 // -------Bouton recherche Haut---------
58   -echo $this->Form->submit('Rechercher', [
59   - 'style' => 'width: 20%'
60   -]);
  58 +//echo $this->Form->submit('Rechercher', [ 'style' => 'width: 20%' ]);
61 59  
62 60 // CHAMP DE RECHERCHE GENERIQUE
63 61 echo $this->Form->control('s_all', [
... ... @@ -83,7 +81,7 @@ echo $this-&gt;Form-&gt;control(&#39;s_matostype&#39;, [
83 81 'AO' => 'Administratif seulement',
84 82 'TO' => 'Technique seulement'
85 83 ],
86   - 'style' => 'width: 280px'
  84 +
87 85 ]);
88 86  
89 87 // DOMAINE
... ... @@ -261,9 +259,10 @@ echo $this-&gt;Form-&gt;control(&#39;s_all&#39;, [
261 259 */
262 260  
263 261 // -------Bouton recherche Bas---------
264   -echo $this->Form->submit('Rechercher', [
265   - 'style' => 'width: 20%'
266   -]);
  262 +//echo $this->Form->submit('Rechercher', [ 'style' => 'width: 20%']);
  263 +echo $this->Form->button('Rechercher', ['class'=>'btn btn-outline-success', 'type'=>'submit', 'style' => 'margin: 0px;']);
  264 +
  265 +
267 266 echo '<br/><br/><br/>';
268 267 ?>
269 268 </div>
... ... @@ -512,11 +511,11 @@ echo $this-&gt;Form-&gt;end();
512 511  
513 512  
514 513  
515   -
  514 +<!--
516 515 <div class="actions">
517   - <?php echo $this->element('menu') ?>
  516 + <php echo $this->element('menu') ?>
518 517 </div>
519   -
  518 +-->
520 519  
521 520 <?php
522 521  
... ...
src/Template/Materiels/index.ctp
  Diff comments   View file @3a0887a
... ... @@ -57,7 +57,7 @@ $echoActionButton = $echoActionButton;
57 57 ?>
58 58  
59 59  
60   -<div class="materiels index">
  60 +<div class="materiels index col-lg-12 col-md-12 col-sm-12">
61 61 <?php echo '<h2><i class="icon-list"></i> Liste des matériels ('.$nbMateriels.')</h2>'; ?>
62 62  
63 63 <div class="actions" style="width: 100%; float: none; padding: 0 0;">
... ... @@ -65,14 +65,14 @@ $echoActionButton = $echoActionButton;
65 65 // @TODO : get from Configurations
66 66 $METRO=false;
67 67  
68   -echo '<p>';
  68 +/*echo '<p>';
69 69 echo $this->Html->link('<i class="icon-plus"></i> Nouveau Matériel', [
70 70 'action' => 'add'
71 71 ], [
72 72 'title' => 'Ajouter un matériel',
73 73 'escape' => false
74 74 ]);
75   -echo '</p>';
  75 +echo '</p>';*/
76 76  
77 77 if ($USER_IS_ADMIN_OR_MORE) {
78 78 echo '<p>';
... ... @@ -101,6 +101,7 @@ if ($USER_IS_ADMIN_OR_MORE) {
101 101 'style' => 'margin-right: 5px',
102 102 'escape' => false
103 103 ]);
  104 +
104 105 echo $this->Html->link($b_cre . ' A valider', [
105 106 'action' => 'index',
106 107 'CREATED'
... ... @@ -109,6 +110,7 @@ if ($USER_IS_ADMIN_OR_MORE) {
109 110 'style' => 'margin-right: 5px',
110 111 'escape' => false
111 112 ]);
  113 +
112 114 echo $this->Html->link($b_val . ' Validés', [
113 115 'action' => 'index',
114 116 'VALIDATED'
... ... @@ -117,6 +119,7 @@ if ($USER_IS_ADMIN_OR_MORE) {
117 119 'style' => 'margin-right: 5px',
118 120 'escape' => false
119 121 ]);
  122 +
120 123 echo $this->Html->link($b_toarc . ' A sortir', [
121 124 'action' => 'index',
122 125 'TOBEARCHIVED'
... ... @@ -125,12 +128,13 @@ if ($USER_IS_ADMIN_OR_MORE) {
125 128 'style' => 'margin-right: 5px',
126 129 'escape' => false
127 130 ]);
  131 +
128 132 echo $this->Html->link($b_arc . ' Archivés', [
129 133 'action' => 'index',
130 134 'ARCHIVED'
131 135 ], [
132 136 'title' => 'A sortir de l\'inventaire',
133   - 'style' => 'margin-right: 5px',
  137 + 'style' => 'margin-right: 0px',
134 138 'escape' => false
135 139 ]);
136 140  
... ... @@ -156,6 +160,7 @@ if ($USER_IS_ADMIN_OR_MORE) {
156 160 ?>
157 161 </div>
158 162  
  163 +<div class="col-lg-2 col-md-3 col-sm-4">
159 164 <?php
160 165 echo $this->Form->create('materiels', [
161 166 'url' => '/materiels/execActions?page=' . $this->request->getQuery('page')
... ... @@ -173,6 +178,10 @@ echo $this-&gt;Form-&gt;control(&#39;aff_par_defaut&#39;, [
173 178 '200' => 200
174 179 ]
175 180 ]);
  181 +?>
  182 +</div>
  183 +
  184 +<?php
176 185 if ($nbMateriels > 0) {
177 186 // $form2 = $this->Form;
178 187 // /echo $this->Form->create('materiels', ['url' => '/materiels/execActions']);
... ... @@ -416,28 +425,31 @@ if ($nbMateriels &gt; 0) {
416 425 if ($SELECTED_STATUS != 'ARCHIVED') {
417 426 //if (! ($role == 'Super Administrateur' && $SELECTED_STATUS == 'TOBEARCHIVED')) {
418 427 if (! ($USER_IS_SUPERADMIN && $SELECTED_STATUS=='TOBEARCHIVED') ) {
419   - echo $this->Form->submit($action . ' matériels cochés', [
420   - 'name' => 'updateSelectedStatus',
421   - 'id' => 'updateSelectedStatus',
422   - 'style' => 'margin: 0px'
423   - ]);
  428 + //echo $this->Form->submit($action . ' matériels cochés', [
  429 + // 'name' => 'updateSelectedStatus',
  430 + // 'id' => 'updateSelectedStatus',
  431 + // 'style' => 'margin: 0px'
  432 + //]);
  433 + echo $this->Form->button($action . ' matériels cochés', [ 'class'=>'btn btn-outline-success', 'type'=>'submit', 'name' => 'updateSelectedStatus', 'id' => 'updateSelectedStatus', 'style' => 'margin: 0px']);
424 434 echo "<br /><br />";
425 435 }
426 436 }
427   - echo $this->Form->submit('Exporter la liste des matériels cochés', [
428   - 'name' => 'export',
429   - 'id' => 'export',
430   - 'style' => 'margin: 0px;'
431   - ]);
  437 + //echo $this->Form->submit('Exporter la liste des matériels cochés', [
  438 + // 'name' => 'export',
  439 + // 'id' => 'export',
  440 + // 'style' => 'margin: 0px;'
  441 + //]);
  442 + echo $this->Form->button('Exporter la liste des matériels cochés', ['class'=>'btn btn-outline-success', 'type'=>'submit', 'name' => 'export', 'id' => 'export', 'style' => 'margin: 0px;' ]);
432 443 echo "<br /><br />";
433 444 }
434 445  
435 446 if ($USER_IS_ADMIN_OR_MORE || $USER_IS_RESPONSABLE)
436   - echo $this->Form->submit('Exporter la liste complete (toutes les pages)', [
437   - 'name' => 'exportAll',
438   - 'id' => 'exportAll',
439   - 'style' => 'margin: 0px;'
440   - ]);
  447 + //echo $this->Form->submit('Exporter la liste complete', [
  448 + // 'name' => 'exportAll',
  449 + // 'id' => 'exportAll',
  450 + // 'style' => 'margin: 0px;'
  451 + //]);
  452 + echo $this->Form->button('Exporter la liste complete', ['class'=>'btn btn-outline-success', 'type'=>'submit', 'name' => 'exportAll', 'id' => 'exportAll', 'style' => 'margin: 0px;']);
441 453  
442 454 echo $this->element('pagination_with_first_and_last');
443 455  
... ... @@ -451,18 +463,17 @@ else {
451 463 </div>
452 464  
453 465  
  466 +<!--
454 467 <div class="actions">
455   - <?php
456   - echo $this->element('menu');
457   - echo $this->element('menu_index', [
458   - 'pluralHumanName' => 'Matériels',
459   - 'singularHumanName' => 'Matériel'
460   - ]);
461   - ?>
462   -</div>
463   -
464   -
  468 + <php echo $this->element('menu') ?>
  469 + <php
465 470  
  471 +echo $this->element('menu_index', [
  472 + 'pluralHumanName' => 'Matériels',
  473 + 'singularHumanName' => 'Matériel'
  474 +])?>
  475 +</div>
  476 +-->
466 477  
467 478 <script type="text/javascript">
468 479  
... ...
src/Template/Materiels/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -179,7 +179,7 @@ $CAN_PRINT_LABEL = $IS_VALIDATED &amp;&amp; $configuration-&gt;hasPrinter &amp;&amp; $USER_IS_ADMIN
179 179  
180 180  
181 181  
182   -<div class="materiels view">
  182 +<div class="materiels view col-lg-9 col-md-11 col-sm-11">
183 183  
184 184 <h2>
185 185 <?php
... ... @@ -826,14 +826,15 @@ $bStyle = &#39;margin:0&#39;;
826 826 <!-- "materiels view" -->
827 827  
828 828  
829   -<!-- MENU -->
  829 +<!-- MENU
830 830 <div class="actions">
831   - <?php echo $this->element('menu')?>
832   - <?php
  831 + <php echo $this->element('menu')?>
  832 + <php
833 833  
834 834 echo $this->element('menu_view', [
835 835 'pluralHumanName' => 'Matériels',
836 836 'singularHumanName' => 'Matériel',
837 837 'lien' => $materiel->id
838 838 ])?>
839   - </div>
840 839 \ No newline at end of file
  840 + </div>
  841 +-->
841 842 \ No newline at end of file
... ...
src/Template/Organismes/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -13,11 +13,13 @@
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => 'Organismes'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/Organismes/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="organismes form">
  2 +<div class="organismes form col-lg-5 col-md-7 col-sm-9">
3 3 <?= $this->Form->create($organisme) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -9,15 +9,17 @@
9 9 echo $this->Form->control('nom');
10 10 ?>
11 11 </fieldset>
12   - <?= $this->Form->submit(__('Valider')) ?>
  12 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => 'Organismes'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/Organismes/index.ctp
  Diff comments   View file @3a0887a
1 1  
2 2 <div class="organismes index">
3 3 <?php echo '<h2><i class="icon-list"></i> Liste des organismes</h2>'; ?>
4   - <table style="border-collapse: separate; border-spacing: 0;">
  4 + <table style="border-collapse: separate; border-spacing: 0; width: 270px;">
5 5 <thead>
6 6 <tr>
7 7 <th class="actions"><?= __('') ?></th>
... ... @@ -35,12 +35,14 @@
35 35  
36 36 </div>
37 37  
  38 +<!--
38 39 <div class="actions">
39   - <?php echo $this->element('menu') ?>
40   - <?php
  40 + <php echo $this->element('menu') ?>
  41 + <php
41 42  
42 43 echo $this->element('menu_index', [
43 44 'pluralHumanName' => 'Organismes',
44 45 'singularHumanName' => 'Organisme'
45 46 ])?>
46   - </div>
47 47 \ No newline at end of file
  48 + </div>
  49 +-->
48 50 \ No newline at end of file
... ...
src/Template/Organismes/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -18,6 +18,7 @@
18 18 'action' => 'edit',
19 19 $organisme->id
20 20 ], [
  21 + 'style' => 'margin-right: 40px; display: inline-block',
21 22 'escape' => false,
22 23 'onclick' => 'return true;'
23 24 ]);
... ... @@ -30,7 +31,7 @@
30 31 'action' => 'delete',
31 32 $organisme->id
32 33 ], [
33   - 'style' => 'margin-left: 110px',
  34 + 'style' => 'display: inline-block',
34 35 'escape' => false,
35 36 'confirm' => __('Êtes-vous sur de vouloir supprimer # {0}?', $organisme->id)
36 37 ]);
... ... @@ -74,14 +75,15 @@
74 75  
75 76 </div>
76 77  
77   -
  78 +<!--
78 79 <div class="actions">
79   - <?php echo $this->element('menu') ?>
80   - <?php
  80 + <php echo $this->element('menu') ?>
  81 + <php
81 82  
82 83 echo $this->element('menu_view', [
83 84 'pluralHumanName' => 'Organismes',
84 85 'singularHumanName' => 'Organisme',
85 86 'lien' => $organisme->id
86 87 ])?>
87   - </div>
88 88 \ No newline at end of file
  89 + </div>
  90 +-->
89 91 \ No newline at end of file
... ...
src/Template/Pages/about.ctp
  Diff comments   View file @3a0887a
1   -<div class="index">
  1 +<div class="index col-lg-12">
2 2 <?php
3 3 $softwareName = "LABINVENT";
4 4  
5 5 echo '<h2><i class="icon-idea"></i> A PROPOS DU LOGICIEL ' . $softwareName . '</h2>';
6 6  
7 7 echo <<<"EOD"
8   -<pre>
9   -Ce logiciel sert a inventorier le matériel d'un laboratoire (à l'origine, celui de l'IRAP).
  8 +<section id="cadre" class="col-lg-12">
  9 +Ce logiciel sert a inventorier le matériel d'un laboratoire (à l'origine, celui de l'IRAP).<br><br>
10 10  
11   -COPYRIGHT (C) 2012-2019 IRAP (Institut de Recherche en Astrophysique et Planetologie) Toulouse - France
  11 +COPYRIGHT (C) 2012-2019 IRAP (Institut de Recherche en Astrophysique et Planetologie) Toulouse - France <br><br>
12 12  
13   -Auteurs :
14   -- Upsilon (micro-entreprise Université Toulouse 3 Paul Sabatier), réalisation version initiale 2012
15   -- Marielle Lacombe (mlacombe@obs-mip.fr), chef de projet
16   -- Elodie Bourrec (ebourrec@irap.omp.eu), administration base de données
17   -- Etienne Pallier (epallier@irap.omp.eu), développement
  13 +Auteurs : <br>
  14 +- Upsilon (micro-entreprise Université Toulouse 3 Paul Sabatier), réalisation version initiale 2012<br>
  15 +- Marielle Lacombe (mlacombe@obs-mip.fr), chef de projet<br>
  16 +- Elodie Bourrec (ebourrec@irap.omp.eu), administration base de données<br>
  17 +- Etienne Pallier (epallier@irap.omp.eu), développement<br><br>
18 18  
19   -Licence GPL (http://www.gnu.org/copyleft/gpl.html)
  19 +Licence GPL (http://www.gnu.org/copyleft/gpl.html)<br><br>
20 20  
21 21 This program is free software: you can redistribute it and/or modify
22 22 it under the terms of the GNU General Public License as published by
23 23 the Free Software Foundation, either version 3 of the License, or
24   - (at your option) any later version.
  24 + (at your option) any later version.<br><br>
25 25  
26 26 This program is distributed in the hope that it will be useful,
27 27 but WITHOUT ANY WARRANTY; without even the implied warranty of
28 28 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
29   - GNU General Public License for more details.
  29 + GNU General Public License for more details.<br><br>
30 30  
31 31 See http://www.gnu.org/licenses
32   -</pre>
  32 +</section>
33 33 EOD;
34 34 echo '<br/>';
35 35 echo '<a href="' . 'https://tinyurl.com/labinvent">Documentation générale</a>';
... ... @@ -38,6 +38,8 @@ echo &#39;&lt;a href=&quot;&#39; . $this-&gt;request-&gt;webroot . &#39;webroot/doc/userguide/labinvent2_u
38 38 ?>
39 39 </div>
40 40  
  41 +<!--
41 42 <div class="actions">
42   - <?php echo $this->element('menu') ?>
43   -</div>
44 43 \ No newline at end of file
  44 + <php echo $this->element('menu') ?>
  45 +</div>
  46 +-->
45 47 \ No newline at end of file
... ...
src/Template/Pages/acls.ctp
  Diff comments   View file @3a0887a
... ... @@ -1591,8 +1591,10 @@ ODF styles with no properties representable as CSS --&gt;.Tableau2.13 .T10 .T11 .T1
1591 1591 class="T9">et </span><span class="T7">index</span><span class="T9">)</span>
1592 1592 </p>
1593 1593 </div>
  1594 + <!--
1594 1595 <div class="actions">
1595   - <?php echo $this->element('menu') ?>
  1596 + <php echo $this->element('menu') ?>
1596 1597 </div>
  1598 + -->
1597 1599 </body>
1598 1600 </html>
1599 1601 \ No newline at end of file
... ...
src/Template/Pages/home_app.ctp
  Diff comments   View file @3a0887a
... ... @@ -13,7 +13,7 @@ echo &#39;&lt;p&gt;Vous êtes connecté en tant que &lt;b&gt;&#39; . $username . &#39;&lt;/b&gt; &#39;;
13 13 echo 'et avec le niveau d\'authentification <b>' . $role . '</b>.';
14 14 echo '<p>';
15 15  
16   -echo '<table cellpadding="0" cellspacing="0" style="width: 800px;">';
  16 +echo '<table cellpadding="0" cellspacing="0" style="width: 270px;">';
17 17 echo '<tr><th></th></tr>';
18 18 echo '<tr><td> ' . $this->Html->link('Voir mes matériels', [
19 19 'controller' => 'materiels',
... ... @@ -32,7 +32,7 @@ if (in_array($role, [
32 32 'Administration',
33 33 'Administration Plus'
34 34 ])) {
35   - echo '<table cellpadding="0" cellspacing="0" style="width: 800px;">';
  35 + echo '<table cellpadding="0" cellspacing="0" style="width: 270px;">';
36 36 echo '<tr><th></th></tr>';
37 37 echo '<tr><td> ' . $this->Html->link('Voir les matériels à valider', [
38 38 'controller' => 'materiels',
... ... @@ -49,7 +49,7 @@ if (in_array($role, [
49 49  
50 50 // Utilisateur responsable
51 51 if ($role == 'Responsable') {
52   - echo '<table cellpadding="0" cellspacing="0" style="width: 800px;">';
  52 + echo '<table cellpadding="0" cellspacing="0" style="width: 270px;">';
53 53 echo '<tr><th></th></tr>';
54 54 echo '<tr><td> ' . $this->Html->link('Voir les matériels dont je suis responsable', [
55 55 'controller' => 'materiels',
... ... @@ -116,10 +116,11 @@ if (($role == &#39;Responsable&#39; || $role == &#39;Utilisateur&#39;) &amp;&amp; $configuration-&gt;proced
116 116  
117 117 </div>
118 118  
  119 +<!--
119 120 <div class="actions">
120   - <?php
  121 + <php
121 122  
122 123 echo $this->element('menu')?>
123 124 </div>
124   -
  125 +-->
125 126  
... ...
src/Template/Pages/infos.ctp
  Diff comments   View file @3a0887a
... ... @@ -8,6 +8,8 @@ phpinfo();
8 8 ?>
9 9 </div>
10 10  
  11 +<!--
11 12 <div class="actions">
12   - <?php echo $this->element('menu') ?>
  13 + <php echo $this->element('menu') ?>
13 14 </div>
  15 +-->
... ...
src/Template/Pages/printers.ctp
  Diff comments   View file @3a0887a
... ... @@ -16,6 +16,8 @@
16 16 </p>
17 17 </div>
18 18  
  19 +<!--
19 20 <div class="actions">
20   - <?php echo $this->element('menu') ?>
  21 + <php echo $this->element('menu') ?>
21 22 </div>
  23 +-->
... ...
src/Template/Pages/tools.ctp
  Diff comments   View file @3a0887a
... ... @@ -3,7 +3,7 @@
3 3 <h2>
4 4 <i class="icon-wrench"></i> Outils
5 5 </h2>
6   - <table style="border-collapse: separate; border-spacing: 0;">
  6 + <table style="border-collapse: separate; border-spacing: 0; width: 400px;">
7 7 <tr>
8 8 <th></th>
9 9 </tr>
... ... @@ -126,6 +126,8 @@ endif;
126 126 </table>
127 127 </div>
128 128  
  129 +<!--
129 130 <div class="actions">
130   - <?php echo $this->element('menu') ?>
  131 + <php echo $this->element('menu') ?>
131 132 </div>
  133 +-->
132 134 \ No newline at end of file
... ...
src/Template/Pages/tools_cat.ctp
  Diff comments   View file @3a0887a
... ... @@ -3,7 +3,7 @@
3 3 <h2>
4 4 <i class="icon-wrench"></i> Gérer les Catégories
5 5 </h2>
6   - <table style="border-collapse: separate; border-spacing: 0;">
  6 + <table style="border-collapse: separate; border-spacing: 0; width: 270px;">
7 7 <tr>
8 8 <th></th>
9 9 </tr>
... ... @@ -33,6 +33,8 @@ echo &#39;&lt;/td&gt;&lt;/tr&gt;&#39;;
33 33 </table>
34 34 </div>
35 35  
  36 +<!--
36 37 <div class="actions">
37   - <?php echo $this->element('menu') ?>
  38 + <php echo $this->element('menu') ?>
38 39 </div>
  40 +-->
39 41 \ No newline at end of file
... ...
src/Template/Pages/tools_menu_cat.ctp
  Diff comments   View file @3a0887a
... ... @@ -33,6 +33,8 @@ echo &#39;&lt;/td&gt;&lt;/tr&gt;&#39;;
33 33 </table>
34 34 </div>
35 35  
  36 +<!--
36 37 <div class="actions">
37   - <?php echo $this->element('menu') ?>
  38 + <php echo $this->element('menu') ?>
38 39 </div>
  40 +-->
39 41 \ No newline at end of file
... ...
src/Template/Pages/tools_menu_sm.ctp
  Diff comments   View file @3a0887a
... ... @@ -113,6 +113,8 @@ if ($configuration-&gt;metrologie) {
113 113 </table>
114 114 </div>
115 115  
  116 +<!--
116 117 <div class="actions">
117   - <?php echo $this->element('menu') ?>
  118 + <php echo $this->element('menu') ?>
118 119 </div>
  120 +-->
119 121 \ No newline at end of file
... ...
src/Template/Pages/tools_sm.ctp
  Diff comments   View file @3a0887a
... ... @@ -33,7 +33,7 @@ $admin_can_manage = array(
33 33 -->
34 34 <?= $title; ?>
35 35 </h2>
36   - <table style="border-collapse: separate; border-spacing: 0;">
  36 + <table style="border-collapse: separate; border-spacing: 0; width: 270px;">
37 37 <tr>
38 38 <th></th>
39 39 </tr>
... ... @@ -184,6 +184,8 @@ if ($configuration-&gt;metrologie) {
184 184 </table>
185 185 </div>
186 186  
  187 +<!--
187 188 <div class="actions">
188   - <?php echo $this->element('menu') ?>
  189 + <php echo $this->element('menu') ?>
189 190 </div>
  191 +-->
190 192 \ No newline at end of file
... ...
src/Template/Sites/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -13,11 +13,13 @@
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => 'Sites'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/Sites/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="sites form">
  2 +<div class="sites form col-lg-5 col-md-7 col-sm-9">
3 3 <?= $this->Form->create($site) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -9,15 +9,17 @@
9 9 echo $this->Form->control('nom');
10 10 ?>
11 11 </fieldset>
12   - <?= $this->Form->submit(__('Valider')) ?>
  12 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => 'Sites'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/Sites/index.ctp
  Diff comments   View file @3a0887a
1 1  
2 2 <div class="sites index">
3 3 <?php echo '<h2><i class="icon-list"></i> Liste des sites</h2>'; ?>
4   - <table style="border-collapse: separate; border-spacing: 0;">
  4 + <table style="border-collapse: separate; border-spacing: 0; width: 270px;">
5 5 <thead>
6 6 <tr>
7 7 <th class="actions"><?= __('') ?></th>
... ... @@ -47,12 +47,14 @@ foreach ($sites as $site) :
47 47  
48 48 </div>
49 49  
  50 +<!--
50 51 <div class="actions">
51   - <?php echo $this->element('menu') ?>
52   - <?php
  52 + <php echo $this->element('menu') ?>
  53 + <php
53 54  
54 55 echo $this->element('menu_index', [
55 56 'pluralHumanName' => 'Sites',
56 57 'singularHumanName' => 'Site'
57 58 ])?>
58   - </div>
59 59 \ No newline at end of file
  60 + </div>
  61 +-->
60 62 \ No newline at end of file
... ...
src/Template/Sites/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -17,6 +17,7 @@
17 17 'action' => 'edit',
18 18 $site->id
19 19 ], [
  20 + 'style' => 'margin-right: 40px; display: inline-block',
20 21 'escape' => false,
21 22 'onclick' => 'return true;'
22 23 ]);
... ... @@ -29,7 +30,7 @@
29 30 'action' => 'delete',
30 31 $site->id
31 32 ], [
32   - 'style' => 'margin-left: 110px',
  33 + 'style' => 'display: inline-block',
33 34 'escape' => false,
34 35 'confirm' => __('Êtes-vous sur de vouloir supprimer # {0}?', $site->id)
35 36 ]);
... ... @@ -96,13 +97,15 @@
96 97 </div>
97 98  
98 99  
  100 +<!--
99 101 <div class="actions">
100   - <?php echo $this->element('menu') ?>
101   - <?php
  102 + <php echo $this->element('menu') ?>
  103 + <php
102 104  
103 105 echo $this->element('menu_view', [
104 106 'pluralHumanName' => 'Sites',
105 107 'singularHumanName' => 'Site',
106 108 'lien' => $site->id
107 109 ])?>
108   - </div>
109 110 \ No newline at end of file
  111 + </div>
  112 +-->
110 113 \ No newline at end of file
... ...
src/Template/SousCategories/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -17,11 +17,13 @@
17 17 <?= $this->Form->end() ?>
18 18 </div>
19 19  
  20 +<!--
20 21 <div class="actions">
21   - <?php
  22 + <php
22 23 echo $this->element('menu');
23 24 echo $this->element('menu_form', [
24 25 'pluralHumanName' => 'Sous-catégories'
25 26 ]);
26 27 ?>
27   -</div>
28 28 \ No newline at end of file
  29 +</div>
  30 +-->
29 31 \ No newline at end of file
... ...
src/Template/SousCategories/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="sousCategories form">
  2 +<div class="sousCategories form col-lg-5 col-md-7 col-sm-9">
3 3 <?= $this->Form->create($sousCategory) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -13,15 +13,17 @@
13 13 ]);
14 14 ?>
15 15 </fieldset>
16   - <?= $this->Form->submit(__('Valider')) ?>
  16 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
17 17 <?= $this->Form->end() ?>
18 18 </div>
19 19  
  20 +<!--
20 21 <div class="actions">
21   - <?php
  22 + <php
22 23 echo $this->element('menu');
23 24 echo $this->element('menu_form', [
24 25 'pluralHumanName' => 'Sous-catégories'
25 26 ]);
26 27 ?>
27   -</div>
28 28 \ No newline at end of file
  29 +</div>
  30 +-->
29 31 \ No newline at end of file
... ...
src/Template/SousCategories/index.ctp
  Diff comments   View file @3a0887a
1 1  
2 2 <div class="sousCategories index">
3 3 <?php echo '<h2><i class="icon-list"></i> Liste des sous-catégories</h2>'; ?>
4   - <table style="border-collapse: separate; border-spacing: 0;">
  4 + <table style="border-collapse: separate; border-spacing: 0;width: 270px;">
5 5 <thead>
6 6 <tr>
7 7 <th class="actions"><?= __('') ?></th>
... ... @@ -36,12 +36,14 @@
36 36  
37 37 </div>
38 38  
  39 +<!--
39 40 <div class="actions">
40   - <?php echo $this->element('menu') ?>
41   - <?php
  41 + <php echo $this->element('menu') ?>
  42 + <php
42 43  
43 44 echo $this->element('menu_index', [
44 45 'pluralHumanName' => 'Sous-Catégories',
45 46 'singularHumanName' => 'Sous-Catégorie'
46 47 ])?>
47   - </div>
48 48 \ No newline at end of file
  49 + </div>
  50 +-->
49 51 \ No newline at end of file
... ...
src/Template/SousCategories/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -18,6 +18,7 @@
18 18 'action' => 'edit',
19 19 $sousCategory->id
20 20 ], [
  21 + 'style' => 'margin-right: 40px; display: inline-block',
21 22 'escape' => false,
22 23 'onclick' => 'return true;'
23 24 ]);
... ... @@ -30,7 +31,7 @@
30 31 'action' => 'delete',
31 32 $sousCategory->id
32 33 ], [
33   - 'style' => 'margin-left: 110px',
  34 + 'style' => 'display: inline-block',
34 35 'escape' => false,
35 36 'confirm' => __('Êtes-vous sur de vouloir supprimer # {0}?', $sousCategory->id)
36 37 ]);
... ... @@ -76,13 +77,15 @@
76 77  
77 78 </div>
78 79  
  80 +<!--
79 81 <div class="actions">
80   - <?php echo $this->element('menu') ?>
81   - <?php
  82 + <php echo $this->element('menu') ?>
  83 + <php
82 84  
83 85 echo $this->element('menu_view', [
84 86 'pluralHumanName' => 'Sous-Catégories',
85 87 'singularHumanName' => 'Sous-Catégorie',
86 88 'lien' => $sousCategory->id
87 89 ])?>
88   - </div>
89 90 \ No newline at end of file
  91 + </div>
  92 +-->
90 93 \ No newline at end of file
... ...
src/Template/Suivis/add.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="suivis form">
  2 +<div class="suivis form col-lg-12 col-md-12 col-sm-12">
3 3 <?=$this->Form->create($suivi)?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -90,14 +90,16 @@
90 90 <?=$this->Form->end()?>
91 91 </div>
92 92  
  93 +<!--
93 94 <div class="actions">
94   - <?php
  95 + <php
95 96 echo $this->element('menu');
96 97 echo $this->element('menu_form', [
97 98 'pluralHumanName' => 'Suivis'
98 99 ]);
99 100 ?>
100 101 </div>
  102 +-->
101 103  
102 104 <script type="text/javascript">
103 105  
... ...
src/Template/Suivis/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="suivis form">
  2 +<div class="suivis form col-lg-12 col-md-12 col-sm-12">
3 3 <?=$this->Form->create($suivi)?>
4 4 <fieldset>
5 5  
... ... @@ -167,14 +167,16 @@
167 167 <?=$this->Form->end()?>
168 168 </div>
169 169  
  170 +<!--
170 171 <div class="actions">
171   - <?php
  172 + <php
172 173 echo $this->element('menu');
173 174 echo $this->element('menu_form', [
174 175 'pluralHumanName' => 'Suivis'
175 176 ]);
176 177 ?>
177 178 </div>
  179 +-->
178 180  
179 181 <script type="text/javascript">
180 182  
... ...
src/Template/Suivis/find.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="index">
  2 +<div class="index col-lg-5 col-md-7 col-sm-9">
3 3 <h2>
4 4 <i class="icon-search"></i> Recherche de suivi
5 5 </h2>
... ... @@ -86,9 +86,9 @@ echo $this-&gt;Form-&gt;control(&#39;s_periode_controle2&#39;, [
86 86 ]);
87 87  
88 88 // -------Bouton recherche Bas---------
89   -echo $this->Form->submit('Rechercher', [
90   - 'style' => 'width: 20%'
91   -]);
  89 +//echo $this->Form->submit('Rechercher', [ 'style' => 'width: 20%']);
  90 +echo $this->Form->button('Rechercher', ['class'=>'btn btn-outline-success', 'type'=>'submit', 'style' => 'margin: 0px;']);
  91 +
92 92 echo '<br/><br/><br/>';
93 93 ?>
94 94 </div>
... ... @@ -195,7 +195,8 @@ echo $this-&gt;Form-&gt;end();
195 195 ?>
196 196 </div>
197 197  
198   -
  198 +<!--
199 199 <div class="actions">
200   - <?php echo $this->element('menu') ?>
201   -</div>
202 200 \ No newline at end of file
  201 + <php echo $this->element('menu') ?>
  202 +</div>
  203 +-->
203 204 \ No newline at end of file
... ...
src/Template/Suivis/index.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="suivis index">
  2 +<div class="suivis index col-lg-12 col-md-12 col-sm-12">
3 3 <?php echo '<h2><i class="icon-list"></i> Liste des suivis ('.$nbSuivis.')</h2>'; ?>
4 4 <table style="border-collapse: separate; border-spacing: 0;">
5 5 <thead>
... ... @@ -65,6 +65,8 @@ if (($role == &#39;Utilisateur&#39; &amp;&amp; in_array($username, [
65 65  
66 66 </div>
67 67  
  68 +<!--
68 69 <div class="actions">
69   - <?php echo $this->element('menu') ?>
70   - </div>
71 70 \ No newline at end of file
  71 + <php echo $this->element('menu') ?>
  72 + </div>
  73 +-->
72 74 \ No newline at end of file
... ...
src/Template/Suivis/view.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="suivis view">
  2 +<div class="suivis view col-lg-12 col-md-12 col-sm-12">
3 3  
4 4 <h2>Détail suivi</h2>
5 5  
... ... @@ -232,7 +232,9 @@ if ($suivi-&gt;type_suivi-&gt;nom == &quot;Vérification métrologique&quot;) {
232 232  
233 233 </div>
234 234  
  235 +<!--
235 236 <div class="actions">
236   - <?php echo $this->element('menu') ?>
237   - <?php echo $this->element('menu_view', [ 'pluralHumanName' => 'Suivis', 'singularHumanName' => 'Suivi', 'lien' => $suivi->id ]) ?>
  237 + <php echo $this->element('menu') ?>
  238 + <php echo $this->element('menu_view', [ 'pluralHumanName' => 'Suivis', 'singularHumanName' => 'Suivi', 'lien' => $suivi->id ]) ?>
238 239 </div>
  240 +-->
239 241 \ No newline at end of file
... ...
src/Template/SurCategories/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -9,15 +9,18 @@
9 9 echo $this->Form->control('nom');
10 10 ?>
11 11 </fieldset>
12   - <?= $this->Form->submit(__('Valider')) ?>
  12 + <!--<= $this->Form->submit(__('Valider')) ?>-->
  13 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
13 14 <?= $this->Form->end() ?>
14 15 </div>
15 16  
  17 +<!--
16 18 <div class="actions">
17   - <?php
  19 + <php
18 20 echo $this->element('menu');
19 21 echo $this->element('menu_form', [
20 22 'pluralHumanName' => 'Domaines'
21 23 ]);
22 24 ?>
23   -</div>
24 25 \ No newline at end of file
  26 +</div>
  27 +-->
25 28 \ No newline at end of file
... ...
src/Template/SurCategories/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="surCategories form">
  2 +<div class="surCategories form col-lg-5 col-md-7 col-sm-9">
3 3 <?= $this->Form->create($surCategory) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -9,16 +9,18 @@
9 9 echo $this->Form->control('nom');
10 10 ?>
11 11 </fieldset>
12   - <?= $this->Form->submit(__('Valider')) ?>
  12 + <!--<= $this->Form->submit(__('Valider')) ?>-->
  13 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
13 14 <?= $this->Form->end() ?>
14 15 </div>
15 16  
16   -
  17 +<!--
17 18 <div class="actions">
18   - <?php
  19 + <php
19 20 echo $this->element('menu');
20 21 echo $this->element('menu_form', [
21 22 'pluralHumanName' => 'Domaines'
22 23 ]);
23 24 ?>
24   -</div>
25 25 \ No newline at end of file
  26 +</div>
  27 +-->
26 28 \ No newline at end of file
... ...
src/Template/SurCategories/index.ctp
  Diff comments   View file @3a0887a
1 1  
2 2 <div class="surCategories index">
3 3 <?php echo '<h2><i class="icon-list"></i> Liste des domaines</h2>'; ?>
4   - <table style="border-collapse: separate; border-spacing: 0;">
  4 + <table style="border-collapse: separate; border-spacing: 0; width: 270px;">
5 5 <thead>
6 6 <tr>
7 7 <th class="actions"><?= __('') ?></th>
... ... @@ -32,13 +32,14 @@
32 32  
33 33 </div>
34 34  
35   -
  35 +<!--
36 36 <div class="actions">
37   - <?php echo $this->element('menu') ?>
38   - <?php
  37 + <php echo $this->element('menu') ?>
  38 + <php
39 39  
40 40 echo $this->element('menu_index', [
41 41 'pluralHumanName' => 'Domaines',
42 42 'singularHumanName' => 'Domaine'
43 43 ])?>
44   - </div>
45 44 \ No newline at end of file
  45 + </div>
  46 +-->
46 47 \ No newline at end of file
... ...
src/Template/SurCategories/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -17,6 +17,7 @@
17 17 'action' => 'edit',
18 18 $surCategory->id
19 19 ], [
  20 + 'style' => 'margin-right: 40px; display: inline-block',
20 21 'escape' => false,
21 22 'onclick' => 'return true;'
22 23 ]);
... ... @@ -29,7 +30,7 @@
29 30 'action' => 'delete',
30 31 $surCategory->id
31 32 ], [
32   - 'style' => 'margin-left: 110px',
  33 + 'style' => 'display: inline-block',
33 34 'escape' => false,
34 35 'confirm' => __('Êtes-vous sur de vouloir supprimer # {0}?', $surCategory->id)
35 36 ]);
... ... @@ -96,13 +97,15 @@
96 97  
97 98 </div>
98 99  
  100 +<!--
99 101 <div class="actions">
100   - <?php echo $this->element('menu') ?>
101   - <?php
  102 + <php echo $this->element('menu') ?>
  103 + <php
102 104  
103 105 echo $this->element('menu_view', [
104 106 'pluralHumanName' => 'Domaines',
105 107 'singularHumanName' => 'Domaine',
106 108 'lien' => $surCategory->id
107 109 ])?>
108   - </div>
109 110 \ No newline at end of file
  111 + </div>
  112 +-->
110 113 \ No newline at end of file
... ...
src/Template/TypeDocuments/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -13,11 +13,13 @@
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => 'Types Documents'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/TypeDocuments/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="typeDocuments form">
  2 +<div class="typeDocuments form col-lg-5 col-md-7 col-sm-9">
3 3 <?= $this->Form->create($typeDocument) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -9,15 +9,17 @@
9 9 echo $this->Form->control('nom');
10 10 ?>
11 11 </fieldset>
12   - <?= $this->Form->submit(__('Valider')) ?>
  12 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => 'Types Documents'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/TypeDocuments/index.ctp
  Diff comments   View file @3a0887a
1 1  
2 2 <div class="typeDocuments index">
3 3 <?php echo '<h2><i class="icon-list"></i> Liste des types de documents</h2>'; ?>
4   - <table style="border-collapse: separate; border-spacing: 0;">
  4 + <table style="border-collapse: separate; border-spacing: 0; width: 270px;">
5 5 <thead>
6 6 <tr>
7 7 <th class="actions"><?= __('') ?></th>
... ... @@ -43,13 +43,14 @@
43 43  
44 44 </div>
45 45  
46   -
  46 +<!--
47 47 <div class="actions">
48   - <?php echo $this->element('menu') ?>
49   - <?php
  48 + <php echo $this->element('menu') ?>
  49 + <php
50 50  
51 51 echo $this->element('menu_index', [
52 52 'pluralHumanName' => 'Types Documents',
53 53 'singularHumanName' => 'Type Document'
54 54 ])?>
55   - </div>
56 55 \ No newline at end of file
  56 + </div>
  57 +-->
57 58 \ No newline at end of file
... ...
src/Template/TypeDocuments/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -17,6 +17,7 @@
17 17 'action' => 'edit',
18 18 $typeDocument->id
19 19 ], [
  20 + 'style' => 'margin-right: 40px; display: inline-block',
20 21 'escape' => false,
21 22 'onclick' => 'return true;'
22 23 ]);
... ... @@ -29,7 +30,7 @@
29 30 'action' => 'delete',
30 31 $typeDocument->id
31 32 ], [
32   - 'style' => 'margin-left: 110px',
  33 + 'style' => 'display: inline-block',
33 34 'escape' => false,
34 35 'confirm' => __('Êtes-vous sur de vouloir supprimer # {0}?', $typeDocument->id)
35 36 ]);
... ... @@ -44,13 +45,15 @@
44 45  
45 46 </div>
46 47  
  48 +<!--
47 49 <div class="actions">
48   - <?php echo $this->element('menu') ?>
49   - <?php
  50 + <php echo $this->element('menu') ?>
  51 + <php
50 52  
51 53 echo $this->element('menu_view', [
52 54 'pluralHumanName' => 'Types Documents',
53 55 'singularHumanName' => 'Type Document',
54 56 'lien' => $typeDocument->id
55 57 ])?>
56   - </div>
57 58 \ No newline at end of file
  59 + </div>
  60 +-->
58 61 \ No newline at end of file
... ...
src/Template/TypeSuivis/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -13,11 +13,13 @@
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => 'Types Suivis'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/TypeSuivis/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="typeSuivis form">
  2 +<div class="typeSuivis form col-lg-5 col-md-7 col-sm-9">
3 3 <?= $this->Form->create($typeSuivi) ?>
4 4 <fieldset>
5 5 <h2>
... ... @@ -9,15 +9,17 @@
9 9 echo $this->Form->control('nom');
10 10 ?>
11 11 </fieldset>
12   - <?= $this->Form->submit(__('Valider')) ?>
  12 + <?= $this->Form->button('Valider', ['class'=>'btn btn-outline-success', 'type'=>'submit'])?>
13 13 <?= $this->Form->end() ?>
14 14 </div>
15 15  
  16 +<!--
16 17 <div class="actions">
17   - <?php
  18 + <php
18 19 echo $this->element('menu');
19 20 echo $this->element('menu_form', [
20 21 'pluralHumanName' => 'Types Suivis'
21 22 ]);
22 23 ?>
23   -</div>
24 24 \ No newline at end of file
  25 +</div>
  26 +-->
25 27 \ No newline at end of file
... ...
src/Template/TypeSuivis/index.ctp
  Diff comments   View file @3a0887a
... ... @@ -33,13 +33,14 @@
33 33  
34 34 </div>
35 35  
36   -
  36 +<!--
37 37 <div class="actions">
38   - <?php echo $this->element('menu') ?>
39   - <?php
  38 + <php echo $this->element('menu') ?>
  39 + <php
40 40  
41 41 echo $this->element('menu_index', [
42 42 'pluralHumanName' => 'Types suivis',
43 43 'singularHumanName' => 'Type suivi'
44 44 ])?>
45   - </div>
46 45 \ No newline at end of file
  46 + </div>
  47 +-->
47 48 \ No newline at end of file
... ...
src/Template/TypeSuivis/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -17,6 +17,7 @@
17 17 'action' => 'edit',
18 18 $typeSuivi->id
19 19 ], [
  20 + 'style' => 'margin-right: 40px; display: inline-block',
20 21 'escape' => false,
21 22 'onclick' => 'return true;'
22 23 ]);
... ... @@ -29,7 +30,7 @@
29 30 'action' => 'delete',
30 31 $typeSuivi->id
31 32 ], [
32   - 'style' => 'margin-left: 110px',
  33 + 'style' => 'display: inline-block',
33 34 'escape' => false,
34 35 'confirm' => __('Êtes-vous sur de vouloir supprimer # {0}?', $typeSuivi->id)
35 36 ]);
... ... @@ -69,13 +70,15 @@
69 70  
70 71 </div>
71 72  
  73 +<!--
72 74 <div class="actions">
73   - <?php echo $this->element('menu') ?>
74   - <?php
  75 + <php echo $this->element('menu') ?>
  76 + <php
75 77  
76 78 echo $this->element('menu_view', [
77 79 'pluralHumanName' => 'Types Suivis',
78 80 'singularHumanName' => 'Type Suivi',
79 81 'lien' => $typeSuivi->id
80 82 ])?>
81   - </div>
82 83 \ No newline at end of file
  84 + </div>
  85 +-->
83 86 \ No newline at end of file
... ...
src/Template/Unites/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -14,11 +14,13 @@
14 14 <?= $this->Form->end() ?>
15 15 </div>
16 16  
  17 +<!--
17 18 <div class="actions">
18   - <?php
  19 + <php
19 20 echo $this->element('menu');
20 21 echo $this->element('menu_form', [
21 22 'pluralHumanName' => 'Unites'
22 23 ]);
23 24 ?>
24   -</div>
25 25 \ No newline at end of file
  26 +</div>
  27 +-->
26 28 \ No newline at end of file
... ...
src/Template/Unites/edit.ctp
  Diff comments   View file @3a0887a
... ... @@ -14,11 +14,13 @@
14 14 <?= $this->Form->end() ?>
15 15 </div>
16 16  
  17 +<!--
17 18 <div class="actions">
18   - <?php
  19 + <php
19 20 echo $this->element('menu');
20 21 echo $this->element('menu_form', [
21 22 'pluralHumanName' => 'Unites'
22 23 ]);
23 24 ?>
24   -</div>
25 25 \ No newline at end of file
  26 +</div>
  27 +-->
26 28 \ No newline at end of file
... ...
src/Template/Unites/index.ctp
  Diff comments   View file @3a0887a
... ... @@ -47,12 +47,14 @@ foreach ($unites as $unite) :
47 47  
48 48 </div>
49 49  
  50 +<!--
50 51 <div class="actions">
51   - <?php echo $this->element('menu') ?>
52   - <?php
  52 + <php echo $this->element('menu') ?>
  53 + <php
53 54  
54 55 echo $this->element('menu_index', [
55 56 'pluralHumanName' => 'Unites',
56 57 'singularHumanName' => 'Unite'
57 58 ])?>
58   - </div>
59 59 \ No newline at end of file
  60 + </div>
  61 + -->
60 62 \ No newline at end of file
... ...
src/Template/Unites/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -71,14 +71,15 @@
71 71  
72 72 </div>
73 73  
74   -
  74 +<!--
75 75 <div class="actions">
76   - <?php echo $this->element('menu') ?>
77   - <?php
  76 + <php echo $this->element('menu') ?>
  77 + <php
78 78  
79 79 echo $this->element('menu_view', [
80 80 'pluralHumanName' => 'Unites',
81 81 'singularHumanName' => 'Unite',
82 82 'lien' => $unite->id
83 83 ])?>
84   - </div>
85 84 \ No newline at end of file
  85 + </div>
  86 +-->
86 87 \ No newline at end of file
... ...
src/Template/Users/add.ctp
  Diff comments   View file @3a0887a
... ... @@ -98,12 +98,14 @@ $users_login_and_email = $users_login_and_email;
98 98 <?= $this->Form->end() ?>
99 99 </div>
100 100  
  101 +<!--
101 102 <div class="actions">
102   -<?php
  103 +<php
103 104 echo $this->element('menu');
104 105 echo $this->element('menu_form', [ 'pluralHumanName' => 'Utilisateurs' ]);
105 106 ?>
106 107 </div>
  108 +-->
107 109  
108 110 <?php
109 111 // Javascript functions, only if LDAP
... ...
src/Template/Users/edit.ctp
  Diff comments   View file @3a0887a
1 1  
2   -<div class="utilisateurs form">
  2 +<div class="utilisateurs form col-lg-5 col-md-7 col-sm-9">
3 3 <?= $this->Form->create($user) ?>
4 4 <?php $LDAP_USED = $configuration->ldap_used; ?>
5 5 <fieldset>
... ... @@ -98,15 +98,18 @@
98 98  
99 99 ?>
100 100 </fieldset>
101   - <?= $this->Form->submit(__('Valider')) ?>
  101 + <!--<= $this->Form->submit(__('Valider')) ?>-->
  102 + <?= $this->Form->button('Valider', [ 'class'=>'btn btn-outline-success', 'type'=>'submit', 'style'=>'margin-left:20px' ])?>
102 103 <?= $this->Form->end() ?>
103 104 </div>
104 105  
  106 +<!--
105 107 <div class="actions">
106   - <?php
  108 + <php
107 109 echo $this->element('menu');
108 110 echo $this->element('menu_form', [
109 111 'pluralHumanName' => 'Utilisateurs'
110 112 ]);
111 113 ?>
112 114 </div>
  115 +-->
113 116 \ No newline at end of file
... ...
src/Template/Users/index.ctp
  Diff comments   View file @3a0887a
... ... @@ -41,12 +41,14 @@
41 41 ?>
42 42 </div>
43 43  
  44 +<!--
44 45 <div class="actions">
45   - <?php echo $this->element('menu') ?>
46   - <?php
  46 + <php echo $this->element('menu') ?>
  47 + <php
47 48  
48 49 echo $this->element('menu_index', [
49 50 'pluralHumanName' => 'Utilisateurs',
50 51 'singularHumanName' => 'Utilisateur'
51 52 ])?>
52   - </div>
53 53 \ No newline at end of file
  54 + </div>
  55 +-->
54 56 \ No newline at end of file
... ...
src/Template/Users/index_recap.ctp
  Diff comments   View file @3a0887a
... ... @@ -40,12 +40,14 @@
40 40  
41 41 </div>
42 42  
  43 +<!--
43 44 <div class="actions">
44   - <?php echo $this->element('menu') ?>
45   - <?php
  45 + <php echo $this->element('menu') ?>
  46 + <php
46 47  
47 48 echo $this->element('menu_index', [
48 49 'pluralHumanName' => 'Utilisateurs',
49 50 'singularHumanName' => 'Utilisateur'
50 51 ])?>
51   - </div>
52 52 \ No newline at end of file
  53 + </div>
  54 + -->
53 55 \ No newline at end of file
... ...
src/Template/Users/login.ctp
  Diff comments   View file @3a0887a
1   -<div class="index">
  1 +<div class="index col-lg-5 col-md-7 col-sm-9">
2 2 <h2>
3 3 <i class="icon-key"></i> Page de connexion
4 4 </h2>
... ... @@ -10,11 +10,15 @@
10 10 <?= $this->Form->control('ldap', ['label' => $label, 'div' => 'input required']) ?>
11 11 <?= $this->Form->control('password', ['label' => 'Mot de passe', 'div' => 'input required']) ?>
12 12 </fieldset>
13   - <?= $this->Form->submit(__('Se Connecter')); ?>
  13 + <!--<= $this->Form->submit(__('Se Connecter')); ?>-->
  14 + <?= $this->Form->button('Se Connecter',[ 'class'=>'btn btn-outline-success', 'type'=>'submit', 'style' => 'margin: 0px;' ])?>
  15 +
14 16 <?= $this->Form->end() ?>
15 17  
16 18 </div>
17 19  
  20 +<!--
18 21 <div class="actions">
19   - <?php echo $this->element('menu') ?>
20   - </div>
21 22 \ No newline at end of file
  23 + <php echo $this->element('menu') ?>
  24 + </div>
  25 +-->
22 26 \ No newline at end of file
... ...
src/Template/Users/view.ctp
  Diff comments   View file @3a0887a
... ... @@ -15,6 +15,7 @@
15 15 'action' => 'edit',
16 16 $user->id
17 17 ], [
  18 + 'style' => 'margin-right: 40px; display: inline-block',
18 19 'escape' => false,
19 20 'onclick' => 'return true;'
20 21 ]);
... ... @@ -28,7 +29,7 @@
28 29 'action' => 'delete',
29 30 $user->id
30 31 ], [
31   - 'style' => 'margin-left: 110px',
  32 + 'style' => 'display: inline-block;',
32 33 'escape' => false,
33 34 'confirm' => __('Êtes-vous sur de vouloir supprimer ?', $user->nom)
34 35 ]);
... ... @@ -58,14 +59,15 @@
58 59 </table>
59 60 </div>
60 61  
61   -
  62 +<!--
62 63 <div class="actions">
63   - <?php echo $this->element('menu') ?>
64   - <?php
  64 + <php echo $this->element('menu') ?>
  65 + <php
65 66  
66 67 echo $this->element('menu_view', [
67 68 'pluralHumanName' => 'Utilisateurs',
68 69 'singularHumanName' => 'Utilisateur',
69 70 'lien' => $user->id
70 71 ])?>
71   - </div>
72 72 \ No newline at end of file
  73 + </div>
  74 +-->
73 75 \ No newline at end of file
... ...
webroot/css/responsive.css 0 → 100644
  Diff comments   View file @3a0887a
... ... @@ -0,0 +1,162 @@
  1 +/*CSS JEANNE*/
  2 +
  3 +#header{
  4 + padding: 10px 20px;
  5 + border-bottom: 1px solid #CCC;
  6 + margin-right: 0px;
  7 + margin-left: 0px;
  8 +}
  9 +#header .user {
  10 + padding-top: 0px;
  11 +}
  12 +
  13 +#footer {
  14 + clear: both;
  15 + padding: auto;
  16 + text-align: left;
  17 + border-top: 1px solid #CCC;
  18 + margin-right: 0px;
  19 + margin-left: 0px;
  20 + align-self: center;
  21 +}
  22 +
  23 +/*menu*/
  24 +#barre{
  25 + width: auto;
  26 +
  27 +}
  28 +#barre > form:nth-child(1){
  29 + display: flex;
  30 +}
  31 +#police{
  32 + font-style : normal;
  33 +}
  34 +.aligner{
  35 + display: ruby-base;
  36 + margin-top: 0.17em;
  37 +}
  38 +.navbar-expand-lg .navbar-nav .nav-link {
  39 + padding-right: 0rem;
  40 + padding-left: 0rem;
  41 +}
  42 +ul, li {
  43 + margin: 0 6px;
  44 +}
  45 +/*fin menu*/
  46 +
  47 +
  48 +section.row {
  49 + text-align: center;
  50 + align-items: center;
  51 + padding-right: initial;
  52 + padding-left: 25px;
  53 +}
  54 +
  55 +div.form, div.index, div.view {
  56 + border-left: none;
  57 + width: 100%;
  58 +}
  59 +
  60 +#cadre{
  61 + background: #f0f0f0;
  62 + padding: 15px;
  63 + box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
  64 +}
  65 +
  66 +
  67 +div.form, div.index, div.view {
  68 + float: left;
  69 +}
  70 +
  71 +/*boutons*/
  72 +#boutons > a:nth-child(1) {
  73 + margin-right: 20px;
  74 + display: inline-block;
  75 + margin-bottom: 10px;
  76 +}
  77 +#boutons > a:nth-child(2) {
  78 + margin-right: 20px;
  79 + display: inline-block;
  80 + margin-bottom: 10px;
  81 +}
  82 +#boutons > a:nth-child(3) {
  83 + margin-right: 20px;
  84 + display: inline-block;
  85 + margin-bottom: 10px;
  86 +}
  87 +#boutons > a:nth-child(6) {
  88 + margin-right: 20px;
  89 + margin-top:10px;
  90 + display:inline-block;
  91 + color:red
  92 +}
  93 +#boutons > a:nth-child(4) {
  94 + margin-right: 10px;
  95 + display: inline-block;
  96 + margin-bottom: 10px;
  97 +}
  98 +#boutons > a:nth-child(10) {
  99 + margin-right: 10px;
  100 + background: green;
  101 + color: white;
  102 + display: inline-block;
  103 +}
  104 +#materiel_images > img:nth-child(1) {
  105 + float: right;
  106 + padding-top: 17px;
  107 +}
  108 +
  109 +
  110 +/* Élément | http://labinvent.test/materiels */
  111 +
  112 +div.actions > p:nth-child(1) > a:nth-child(3) {
  113 + display: inline-block;
  114 + margin-bottom: 10px;
  115 +}
  116 +
  117 +/* Élément | http://labinvent.test/materiels */
  118 +
  119 +div.actions > p:nth-child(1) > a:nth-child(4) {
  120 + display: inline-block;
  121 + margin-bottom: 10px;
  122 +}
  123 +
  124 +/* Élément | http://labinvent.test/materiels */
  125 +
  126 +div.actions > p:nth-child(1) > a:nth-child(5) {
  127 + display: inline-block;
  128 + margin-bottom: 10px;
  129 +}
  130 +
  131 +/* Élément | http://labinvent.test/materiels */
  132 +
  133 +div.actions > p:nth-child(1) > a:nth-child(6) {
  134 + display: inline-block;
  135 + margin-bottom: 10px;
  136 +}
  137 +
  138 +/* Élément | http://labinvent.test/materiels */
  139 +
  140 +div.actions > p:nth-child(1) > a:nth-child(7) {
  141 + display: inline-block;
  142 + margin-bottom: 10px;
  143 +}
  144 +
  145 +
  146 +/* Élément | http://labinvent.test/materiels/index/CREATED */
  147 +
  148 +div.actions > a:nth-child(2) {
  149 + /* margin-right: 50px; */
  150 + margin-right: 40px;
  151 + display: inline-block;
  152 + margin-bottom: 10px;
  153 +}
  154 +
  155 +/* Élément | http://labinvent.test/materiels/index/CREATED */
  156 +
  157 +div.actions > a:nth-child(3) {
  158 + /* margin-right: 50px; */
  159 + display: inline-block;
  160 + margin-bottom: 10px;
  161 +}
  162 +
... ...