Merge branch 'develop' of github.com:/dev-fsociety/DFS-2016 into develop

src/Controller/AppController.php

@@ -59,7 +59,7 @@ class AppController extends Controller
                 'action' => 'login'
             ],
             'loginRedirect' => [
-                'controller' => 'Categories',
+                'controller' => 'Users',
                 'action' => 'index'
             ],
             'logoutRedirect' => [

src/Controller/UsersController.php

@@ -19,10 +19,13 @@ class UsersController extends AppController
      */
     public function index()
     {
-        $users = $this->paginate($this->Users);
-
-        $this->set(compact('users'));
-        $this->set('_serialize', ['users']);
+        $user = $this->Auth->user();
+        if($user['role'] == 0)
+            return $this->redirect(['controller' => 'Camps', 'action' => 'view', $user['camp_id']]);
+        else if($user['role'] == 1)
+            return $this->redirect(['controller' => 'Users', 'action' => 'view', $user['id']]);
+        else if($user['role'] == 2)
+            return $this->redirect(['controller' => 'Categories', 'action' => 'index']);
     }
 
     /**
@@ -39,7 +42,6 @@ class UsersController extends AppController
         ]);
 
         $this->set('user', $user);
-        $this->set('_serialize', ['user']);
     }
 
     /**

src/Template/Layout/default.ctp

@@ -31,7 +31,8 @@ $cakeDescription = 'CampCare';
     <?= $this->Html->css('icons/foundation-icons.css') ?>
     <?= $this->Html->css('custom.css') ?>
     <?= $this->Html->css('login.css') ?>
-
+    
+    
     <?= $this->fetch('meta') ?>
     <?= $this->fetch('css') ?>
     <?= $this->fetch('script') ?>
@@ -65,10 +66,18 @@ $cakeDescription = 'CampCare';
     <div class="container clearfix">
         <?= $this->fetch('content') ?>
     </div>
+    
     <footer>
-
-    <span class="copyright">Copyright NDI - Team /dev/fsociety</span>
-
+      <div class="row">
+          <a href=""><?= $this->Html->image('long_logo_gris.svg', array('class'=>'footer_logo')); ?></a>
+          <p class="links">
+            <a href="https://twitter.com/dev_fsociety">Twitter</a>
+            <a href="http://www.nuitdelinfo.com/">Nuit de l'Info</a>
+            <a href="https://github.com/dev-fsociety/DFS-2016">Git Hub</a>
+            <a href="#">About</a>
+          </p>
+          <p class="copywrite">Copywrite /DEV/FSOCIETY © 2016</p>
+      </div>
     </footer>
 
     <!-- JS Calls -->
@@ -77,10 +86,7 @@ $cakeDescription = 'CampCare';
     <?= $this->Html->script('vendor/foundation') ?>
     <?= $this->Html->script('custom') ?>
 
-
-
     <script>$(document).foundation();</script>
 
-
 </body>
 </html>

webroot/css/custom.css

@@ -20,10 +20,43 @@
 	height: 37px;
 }
 
-footer{
-	height: 25px;
-	background-color: #e6e6e6;
-}
+
+footer {
+  background-color: #292c2f;
+  text-align: center;
+  font-size: 1.2rem;
+  }
+
+  footer p.slogan {
+    color: #8d9093;
+    font-size: 1.8rem;
+    margin: 0 0 1rem; }
+
+  footer p.copywrite {
+    color: #8f9296;
+    font-size: 0.875rem;
+	}
+
+  footer .links a {
+    list-style: none;
+    font-weight: bold;
+    color: #ffffff;
+    padding: 3rem 0 2rem;
+    margin: 0; }
+
+    footer .links a::after {
+      content: "•";
+      padding: 0 0.4rem 0 0.8rem; }
+
+    footer .links a:last-child::after {
+      content: "";
+      padding: 0 0.4rem 0 0.8rem; }
+
+    .footer_logo{
+		height: 37px;
+		margin-top: 10px;
+	}
+
 
 .copyright{
 	margin-left: 10px;

webroot/css/footer.css

@@ -0,0 +1,31 @@
+
+footer {
+  background-color: #292c2f;
+  text-align: center;
+  font-size: 1.2rem;
+  }
+
+  footer p.slogan {
+    color: #8d9093;
+    font-size: 1.8rem;
+    margin: 0 0 1rem; }
+
+  footer p.copywrite {
+    color: #8f9296;
+    font-size: 0.875rem;
+    margin: 0; }
+
+  footer .links a {
+    list-style: none;
+    font-weight: bold;
+    color: #ffffff;
+    padding: 3rem 0 2rem;
+    margin: 0; }
+
+    footer .links a::after {
+      content: "•";
+      padding: 0 0.4rem 0 0.8rem; }
+
+    footer .links a:last-child::after {
+      content: "";
+      padding: 0 0.4rem 0 0.8rem; }

webroot/css/login.css

@@ -7,3 +7,42 @@
   	margin-bottom: 10px; 
   	margin-top: 10px;
 }
+
+.event {
+  padding: 1rem 1rem 1rem 0;
+  display: table; }
+
+.event-date {
+  width: 6rem;
+  margin: 0 auto 1rem;
+  display: table-cell;
+  width: auto; }
+  .event-date .event-month {
+    margin: 0;
+    background: #eee;
+    padding: 0.5rem 2rem;
+    text-align: center; }
+  .event-date .event-day {
+    margin: 0;
+    border: 1px solid #eee;
+    padding: 0 2rem;
+    text-align: center;
+    font-size: 2rem; }
+
+.event-desc {
+  padding: 0 0 0 1rem;
+  text-align: left;
+  display: table-cell;
+  vertical-align: top; }
+  .event-desc .event-desc-header {
+    margin: 0 0 0.5rem 0;
+    padding: 0; }
+  .event-desc .event-desc-detail {
+    margin: 0 0 0.25rem;
+    padding: 0; }
+  .event-desc .event-desc-time {
+    font-weight: bold; }
+  .event-desc .rsvp.button {
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+    margin: 0; }