Update views for latest CakeBootstrap template

jdmaymeow · Mar 4, 2017 · a1641cc · a1641cc
1 parent 639a710
commit a1641cc
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 81 deletions.
diff --git a/src/Template/Admin/Users/activate_two_fa.ctp b/src/Template/Admin/Users/activate_two_fa.ctp
@@ -1,17 +1,13 @@
-<?php $this->layout = 'CakeBootstrap.admin'; ?>
-
-<?php $this->start('admin_menu'); ?>
-<?= $this->element('CakeAuth.admin_menu') ?>
-<?php $this->end() ?>
+<?php $this->layout = 'CakeBootstrap.default'; ?>
 
 <?php $this->start('subtitle_for_page'); ?>
 Cms
 <?php $this->end(); ?>
 
 <!-- Header -->
-<div class="cinema border-bottom-gray">
-    <div class="container-fluid">
-        <h3><?= __('Users') ?>
+<div class="cinema border-bottom-gray with-nav-tabs">
+    <div class="container">
+        <h3><i class="fa fa-shield"></i> IAM & Admin / <?= __('Users') ?>
             <div class="pull-right">
 
                 <div class="btn-group">
@@ -26,6 +22,8 @@ Cms
             </div>
         </h3>
 
+        <?= $this->element('CakeAuth.admin_menu') ?>
+
     </div>
 </div>
 

diff --git a/src/Template/Admin/Users/add.ctp b/src/Template/Admin/Users/add.ctp
@@ -1,17 +1,13 @@
-<?php $this->layout = 'CakeBootstrap.admin'; ?>
-
-<?php $this->start('admin_menu'); ?>
-<?= $this->element('CakeAuth.admin_menu') ?>
-<?php $this->end() ?>
+<?php $this->layout = 'CakeBootstrap.default'; ?>
 
 <?php $this->start('subtitle_for_page'); ?>
 Cms
 <?php $this->end(); ?>
 
 <!-- Header -->
-<div class="cinema border-bottom-gray">
-    <div class="container-fluid">
-        <h3><?= __('Users') ?>
+<div class="cinema border-bottom-gray with-nav-tabs">
+    <div class="container">
+        <h3><i class="fa fa-shield"></i> IAM & Admin / <?= __('Users') ?>
             <div class="pull-right">
 
                 <div class="btn-group">
@@ -26,6 +22,8 @@ Cms
             </div>
         </h3>
 
+        <?= $this->element('CakeAuth.admin_menu') ?>
+
     </div>
 </div>
 

diff --git a/src/Template/Admin/Users/edit.ctp b/src/Template/Admin/Users/edit.ctp
@@ -1,17 +1,13 @@
-<?php $this->layout = 'CakeBootstrap.admin'; ?>
-
-<?php $this->start('admin_menu'); ?>
-<?= $this->element('CakeAuth.admin_menu') ?>
-<?php $this->end() ?>
+<?php $this->layout = 'CakeBootstrap.default'; ?>
 
 <?php $this->start('subtitle_for_page'); ?>
 Cms
 <?php $this->end(); ?>
 
 <!-- Header -->
-<div class="cinema border-bottom-gray">
-    <div class="container-fluid">
-        <h3><?= __('Users') ?>
+<div class="cinema border-bottom-gray with-nav-tabs">
+    <div class="container">
+        <h3><i class="fa fa-shield"></i> IAM & Admin / <?= __('Users') ?>
             <div class="pull-right">
 
                 <div class="btn-group">
@@ -26,6 +22,8 @@ Cms
             </div>
         </h3>
 
+        <?= $this->element('CakeAuth.admin_menu') ?>
+
     </div>
 </div>
 

diff --git a/src/Template/Admin/Users/index.ctp b/src/Template/Admin/Users/index.ctp
@@ -1,17 +1,13 @@
-<?php $this->layout = 'CakeBootstrap.admin'; ?>
-
-<?php $this->start('admin_menu'); ?>
-<?= $this->element('CakeAuth.admin_menu') ?>
-<?php $this->end() ?>
+<?php $this->layout = 'CakeBootstrap.default'; ?>
 
 <?php $this->start('subtitle_for_page'); ?>
 Cms
 <?php $this->end() ?>
 
 <!-- Header -->
-<div class="cinema border-bottom-gray">
-    <div class="container-fluid">
-        <h3><?= __('Users') ?>
+<div class="cinema border-bottom-gray with-nav-tabs">
+    <div class="container">
+        <h3><i class="fa fa-shield"></i> IAM & Admin / <?= __('Users') ?>
             <div class="pull-right">
 
                 <div class="btn-group">
@@ -28,14 +24,16 @@ Cms
             </div>
         </h3>
 
+        <?= $this->element('CakeAuth.admin_menu') ?>
+
     </div>
 </div>
 
 <!-- Begin page content -->
 <main id="main-container">
 
     <!-- Content -->
-    <div class="container-fluid">
+    <div class="container">
         <div class="row">
             <div class="col-md-12">
 

diff --git a/src/Template/Admin/Users/view.ctp b/src/Template/Admin/Users/view.ctp
@@ -1,16 +1,12 @@
-<?php $this->layout = 'CakeBootstrap.admin'; ?>
-
-<?php $this->start('admin_menu'); ?>
-<?= $this->element('CakeAuth.admin_menu') ?>
-<?php $this->end() ?>
+<?php $this->layout = 'CakeBootstrap.default'; ?>
 
 <?php $this->start('subtitle_for_page'); ?>
 Cms
 <?php $this->end() ?>
 <!-- Header -->
-<div class="cinema border-bottom-gray">
-    <div class="container-fluid">
-        <h3><i class="fa fa-diamond text-amethyst"></i> <?= h($user->username) ?>
+<div class="cinema border-bottom-gray with-nav-tabs">
+    <div class="container">
+        <h3><i class="fa fa-diamond text-amethyst"></i> Users / <?= h($user->username) ?>
             <div class="pull-right">
 
                 <div class="btn-group">
@@ -27,6 +23,9 @@ Cms
                 </div>
             </div>
         </h3>
+
+        <?= $this->element('CakeAuth.admin_menu') ?>
+
     </div>
 </div>
 
@@ -35,7 +34,7 @@ Cms
 <main id="main-container">
 
     <!-- Content -->
-    <div class="container-fluid">
+    <div class="container">
 
         <table class="table table-hover">
             <tr>

diff --git a/src/Template/Element/admin_menu.ctp b/src/Template/Element/admin_menu.ctp
@@ -1,6 +1,3 @@
-<div class="cinema border-bottom-gray">
-    <h3><i class="fa fa-shield"></i> IAM & Admin</h3>
-</div>
-<ul class="nav nav-sidebar">
-    <li class="<?= $this->request->params['controller'] == 'Users' ? 'active' : '' ?>"><?= $this->Html->link(__('<i class="fa fa-user"></i> Users'), ['controller' => 'Users', 'action' => 'index'], ['escape' => false]) ?> </li>
+<ul class="nav nav-tabs">
+    <li role="presentation" class="<?= $this->request->params['controller'] == 'Users' ? 'active' : '' ?>"><?= $this->Html->link(__('<i class="fa fa-user"></i> Users'), ['controller' => 'Users', 'action' => 'index'], ['escape' => false]) ?> </li>
 </ul>
diff --git a/src/Template/Users/add.ctp b/src/Template/Users/add.ctp
@@ -1,17 +1,13 @@
-<?php $this->layout = 'CakeBootstrap.admin'; ?>
-
-<?php $this->start('admin_menu'); ?>
-<?= $this->element('CakeAuth.admin_menu') ?>
-<?php $this->end() ?>
+<?php $this->layout = 'CakeBootstrap.default'; ?>
 
 <?php $this->start('subtitle_for_page'); ?>
 Cms
 <?php $this->end(); ?>
 
 <!-- Header -->
-<div class="cinema border-bottom-gray">
-    <div class="container-fluid">
-        <h3><?= __('Users') ?>
+<div class="cinema border-bottom-gray with-nav-tabs">
+    <div class="container">
+        <h3><i class="fa fa-shield"></i> IAM & Admin
             <div class="pull-right">
 
                 <div class="btn-group">
@@ -27,6 +23,8 @@ Cms
             </div>
         </h3>
 
+        <?= $this->element('CakeAuth.admin_menu') ?>
+
     </div>
 </div>
 

diff --git a/src/Template/Users/edit.ctp b/src/Template/Users/edit.ctp
@@ -1,17 +1,13 @@
-<?php $this->layout = 'CakeBootstrap.admin'; ?>
-
-<?php $this->start('admin_menu'); ?>
-<?= $this->element('CakeAuth.admin_menu') ?>
-<?php $this->end() ?>
+<?php $this->layout = 'CakeBootstrap.default'; ?>
 
 <?php $this->start('subtitle_for_page'); ?>
 Cms
 <?php $this->end(); ?>
 
 <!-- Header -->
-<div class="cinema border-bottom-gray">
-    <div class="container-fluid">
-        <h3><?= __('Users') ?>
+<div class="cinema border-bottom-gray with-nav-tabs">
+    <div class="container">
+        <h3><i class="fa fa-shield"></i> IAM & Admin / <?= __('Users') ?>
             <div class="pull-right">
 
                 <div class="btn-group">
@@ -26,6 +22,8 @@ Cms
             </div>
         </h3>
 
+        <?= $this->element('CakeAuth.admin_menu') ?>
+
     </div>
 </div>
 

diff --git a/src/Template/Users/index.ctp b/src/Template/Users/index.ctp
@@ -1,17 +1,13 @@
-<?php $this->layout = 'CakeBootstrap.admin'; ?>
-
-<?php $this->start('admin_menu'); ?>
-<?= $this->element('CakeAuth.admin_menu') ?>
-<?php $this->end() ?>
+<?php $this->layout = 'CakeBootstrap.default'; ?>
 
 <?php $this->start('subtitle_for_page'); ?>
 Cms
 <?php $this->end() ?>
 
 <!-- Header -->
-<div class="cinema border-bottom-gray">
-    <div class="container-fluid">
-        <h3><?= __('Users') ?>
+<div class="cinema border-bottom-gray with-nav-tabs">
+    <div class="container">
+        <h3><i class="fa fa-shield"></i> IAM & Admin / <?= __('Users') ?>
             <div class="pull-right">
 
                 <div class="btn-group">
@@ -28,14 +24,16 @@ Cms
             </div>
         </h3>
 
+        <?= $this->element('CakeAuth.admin_menu') ?>
+
     </div>
 </div>
 
 <!-- Begin page content -->
 <main id="main-container">
 
     <!-- Content -->
-    <div class="container-fluid">
+    <div class="container">
         <div class="row">
             <div class="col-md-12">
 

diff --git a/src/Template/Users/view.ctp b/src/Template/Users/view.ctp
@@ -1,16 +1,12 @@
-<?php $this->layout = 'CakeBootstrap.admin'; ?>
-
-<?php $this->start('admin_menu'); ?>
-<?= $this->element('CakeAuth.admin_menu') ?>
-<?php $this->end() ?>
+<?php $this->layout = 'CakeBootstrap.default'; ?>
 
 <?php $this->start('subtitle_for_page'); ?>
 Cms
 <?php $this->end() ?>
 <!-- Header -->
-<div class="cinema border-bottom-gray">
-    <div class="container-fluid">
-        <h3><i class="fa fa-diamond text-amethyst"></i> <?= h($user->username) ?>
+<div class="cinema border-bottom-gray with-nav-tabs">
+    <div class="container">
+        <h3><i class="fa fa-diamond text-amethyst"></i> Users / <?= h($user->username) ?>
             <div class="pull-right">
 
                 <div class="btn-group">
@@ -27,6 +23,9 @@ Cms
                 </div>
             </div>
         </h3>
+
+        <?= $this->element('CakeAuth.admin_menu') ?>
+
     </div>
 </div>
 
@@ -35,7 +34,7 @@ Cms
 <main id="main-container">
 
     <!-- Content -->
-    <div class="container-fluid">
+    <div class="container">
 
         <table class="table table-hover">
             <tr>