Etienne Pallier / labinvent

Commit cb50c8ce3615e84fa9007d9f6cae1370a44eee7e

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

cleanup du fichier layout default.ctp

Showing 2 changed files with 70 additions and 76 deletions   Show diff stats
Inline Side-by-side
src/Template/Layout/default.ctp
  Diff comments   View file @cb50c8c
... ... @@ -85,50 +85,46 @@ $this->append('script', $this->Html->script(['script', 'DatepickerConfig', 'onTa
85 85 <?= $this->fetch('css') ?>
86 86 <?= $this->fetch('script') ?>
87 87 <style>
88   -#footer a, #footer p, #footer font {
89   - font-size: x-small;
90   -}
91   -</style>
92   -
  88 + #footer a, #footer p, #footer font {
  89 + font-size: x-small;
  90 + }
  91 + </style>
93 92 </head>
94 93  
  94 +
95 95 <body>
96 96  
97 97 <div id="container">
98   - <div id="header">
99   -
100   -
101   -<?=$this->Html->image('logo_software.jpg', ['alt' => 'Logo de l\'application','border' => '0','height' => '80px','url' => '/'])?>
102 98  
  99 + <div id="header">
  100 + <?=$this->Html->image('logo_software.jpg', ['alt' => 'Logo de l\'application','border' => '0','height' => '80px','url' => '/'])?>
103 101 <div class="user">
104   -
105   -
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   - }
121   - ?>
122   -
123   - </div>
124   - </div>
125   -
126   -
  102 + <?php
  103 + if (isset($username) && $username != " ") {
  104 + echo 'Bienvenue ' . $username . '<br/>';
  105 + echo $role . '<br/>';
  106 + echo $this->Html->link('Se déconnecter', [
  107 + 'controller' => 'Users',
  108 + 'action' => 'logout'
  109 + ]);
  110 + } else {
  111 + echo 'Bienvenue invité<br/>';
  112 + echo $this->Html->link('Se connecter', [
  113 + 'controller' => 'Users',
  114 + 'action' => 'login'
  115 + ]);
  116 + }
  117 + ?>
  118 + </div> <!-- user -->
  119 + </div> <!-- header -->
  120 +
  121 +
  122 + <!-- Contenu principal de chaque page web -->
127 123 <div id="content">
128   - <?=$this->Flash->render()?>
129   - <?=$this->Flash->render('auth')?>
130   - <?=$this->fetch('content')?>
131   - </div>
  124 + <?=$this->Flash->render()?>
  125 + <?=$this->Flash->render('auth')?>
  126 + <?=$this->fetch('content')?>
  127 + </div> <!-- content -->
132 128  
133 129  
134 130 <div id="footer">
... ... @@ -198,9 +194,10 @@ $this-&gt;append(&#39;script&#39;, $this-&gt;Html-&gt;script([&#39;script&#39;, &#39;DatepickerConfig&#39;, &#39;onTa
198 194 </td>
199 195 </tr>
200 196 </table>
201   - </div>
  197 + </div> <!-- footer -->
202 198  
203   - </div>
  199 + </div> <!-- container -->
204 200  
205 201 </body>
  202 +
206 203 </html>
... ...
src/Template/Layout/default_avec_bootstrap.ctp
  Diff comments   View file @cb50c8c
... ... @@ -85,50 +85,46 @@ $this-&gt;append(&#39;script&#39;, $this-&gt;Html-&gt;script([&#39;script&#39;, &#39;DatepickerConfig&#39;, &#39;onTa
85 85 <?= $this->fetch('css') ?>
86 86 <?= $this->fetch('script') ?>
87 87 <style>
88   -#footer a, #footer p, #footer font {
89   - font-size: x-small;
90   -}
91   -</style>
92   -
  88 + #footer a, #footer p, #footer font {
  89 + font-size: x-small;
  90 + }
  91 + </style>
93 92 </head>
94 93  
  94 +
95 95 <body>
96 96  
97 97 <div id="container">
98   - <div id="header">
99   -
100   -
101   -<?=$this->Html->image('logo_software.jpg', ['alt' => 'Logo de l\'application','border' => '0','height' => '80px','url' => '/'])?>
102 98  
  99 + <div id="header">
  100 + <?=$this->Html->image('logo_software.jpg', ['alt' => 'Logo de l\'application','border' => '0','height' => '80px','url' => '/'])?>
103 101 <div class="user">
104   -
105   -
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   - }
121   - ?>
122   -
123   - </div>
124   - </div>
125   -
126   -
  102 + <?php
  103 + if (isset($username) && $username != " ") {
  104 + echo 'Bienvenue ' . $username . '<br/>';
  105 + echo $role . '<br/>';
  106 + echo $this->Html->link('Se déconnecter', [
  107 + 'controller' => 'Users',
  108 + 'action' => 'logout'
  109 + ]);
  110 + } else {
  111 + echo 'Bienvenue invité<br/>';
  112 + echo $this->Html->link('Se connecter', [
  113 + 'controller' => 'Users',
  114 + 'action' => 'login'
  115 + ]);
  116 + }
  117 + ?>
  118 + </div> <!-- user -->
  119 + </div> <!-- header -->
  120 +
  121 +
  122 + <!-- Contenu principal de chaque page web -->
127 123 <div id="content">
128   - <?=$this->Flash->render()?>
129   - <?=$this->Flash->render('auth')?>
130   - <?=$this->fetch('content')?>
131   - </div>
  124 + <?=$this->Flash->render()?>
  125 + <?=$this->Flash->render('auth')?>
  126 + <?=$this->fetch('content')?>
  127 + </div> <!-- content -->
132 128  
133 129  
134 130 <div id="footer">
... ... @@ -198,9 +194,10 @@ $this-&gt;append(&#39;script&#39;, $this-&gt;Html-&gt;script([&#39;script&#39;, &#39;DatepickerConfig&#39;, &#39;onTa
198 194 </td>
199 195 </tr>
200 196 </table>
201   - </div>
  197 + </div> <!-- footer -->
202 198  
203   - </div>
  199 + </div> <!-- container -->
204 200  
205 201 </body>
  202 +
206 203 </html>
... ...