From fef70f69956f12de71c155a4a1d66a060d393f53 Mon Sep 17 00:00:00 2001
From: Hugo F <hforestier@protonmail.com>
Date: Sun, 20 Jan 2019 18:37:58 +0100
Subject: [PATCH 1/5] Update to Bootstrap 4

---
 .../Templates/bootstrap/views/form.ctp        | 14 ++++----
 .../Templates/bootstrap/views/index.ctp       | 16 ++++-----
 .../Templates/bootstrap/views/view.ctp        | 18 +++++-----
 app/View/Elements/navigation.ctp              | 36 +++++++++----------
 app/View/Layouts/bootstrap.ctp                |  8 ++---
 5 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/app/Console/Templates/bootstrap/views/form.ctp b/app/Console/Templates/bootstrap/views/form.ctp
index 56de970a4..eac6eeeb4 100755
--- a/app/Console/Templates/bootstrap/views/form.ctp
+++ b/app/Console/Templates/bootstrap/views/form.ctp
@@ -20,7 +20,7 @@
 <div class="<?php echo $pluralVar; ?> form">
 
 	<div class="row">
-		<div class="col-md-12">
+		<div class="col-lg-12">
 			<div class="page-header">
 				<h1><?php printf("<?php echo __('%s %s'); ?>", Inflector::humanize($action), $singularHumanName); ?></h1>
 			</div>
@@ -30,12 +30,12 @@
 
 
 	<div class="row">
-		<div class="col-md-3">
+		<div class="col-lg-3">
 			<div class="actions">
-				<div class="panel panel-default">
-					<div class="panel-heading"><?php echo "<?php echo __('Actions'); ?>";?></div>
-						<div class="panel-body">
-							<ul class="nav nav-pills nav-stacked">
+				<div class="card">
+					<div class="card-header"><?php echo "<?php echo __('Actions'); ?>";?></div>
+						<div class="card-body">
+							<ul class="nav nav-pills flex-column">
 
 							<?php if (strpos($action, 'add') === false): ?>
 									<li><?php echo "<?php echo \$this->Form->postLink('<span class=\"glyphicon glyphicon-remove\"></span>&nbsp;&nbsp;'.__('Delete'), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), array('escape' => false), __('Are you sure you want to delete # %s?', \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>"; ?></li>
@@ -58,7 +58,7 @@
 					</div>
 				</div>			
 		</div><!-- end col md 3 -->
-		<div class="col-md-9">
+		<div class="col-lg-9">
 <?php 		echo "\t\t\t<?php echo \$this->Form->create('{$modelClass}', array('role' => 'form')); ?>\n\n"; ?>
 <?php
 		foreach ($fields as $field) {
diff --git a/app/Console/Templates/bootstrap/views/index.ctp b/app/Console/Templates/bootstrap/views/index.ctp
index b0b7cdb36..db0bb0ba4 100755
--- a/app/Console/Templates/bootstrap/views/index.ctp
+++ b/app/Console/Templates/bootstrap/views/index.ctp
@@ -20,7 +20,7 @@
 <div class="<?php echo $pluralVar; ?> index">
 
 	<div class="row">
-		<div class="col-md-12">
+		<div class="col-lg-12">
 			<div class="page-header">
 				<h1><?php echo "<?php echo __('{$pluralHumanName}'); ?>"; ?></h1>
 			</div>
@@ -31,12 +31,12 @@
 
 	<div class="row">
 
-		<div class="col-md-3">
+		<div class="col-lg-3">
 			<div class="actions">
-				<div class="panel panel-default">
-					<div class="panel-heading"><?php echo "<?php echo __('Actions'); ?>";?></div>
-						<div class="panel-body">
-							<ul class="nav nav-pills nav-stacked">
+				<div class="card">
+					<div class="card-header"><?php echo "<?php echo __('Actions'); ?>";?></div>
+						<div class="card-body">
+							<ul class="nav nav-pills flex-column">
 								<li><?php echo "<?php echo \$this->Html->link('<span class=\"glyphicon glyphicon-plus\"></span>&nbsp;&nbsp;'.__('New " . $singularHumanName . "'), array('action' => 'add'), array('escape' => false)); ?>"; ?></li>
 						<?php
 							$done = array();
@@ -56,7 +56,7 @@
 			</div><!-- end actions -->
 		</div><!-- end col md 3 -->
 
-		<div class="col-md-9">
+		<div class="col-lg-9">
 			<table cellpadding="0" cellspacing="0" class="table table-striped">
 				<thead>
 					<tr>
@@ -125,4 +125,4 @@
 	</div><!-- end row -->
 
 
-</div><!-- end containing of content -->
\ No newline at end of file
+</div><!-- end containing of content -->
diff --git a/app/Console/Templates/bootstrap/views/view.ctp b/app/Console/Templates/bootstrap/views/view.ctp
index 9a33077bf..3703642d2 100755
--- a/app/Console/Templates/bootstrap/views/view.ctp
+++ b/app/Console/Templates/bootstrap/views/view.ctp
@@ -19,7 +19,7 @@
 ?>
 <div class="<?php echo $pluralVar; ?> view">
 	<div class="row">
-		<div class="col-md-12">
+		<div class="col-lg-12">
 			<div class="page-header">
 				<h1><?php echo "<?php echo __('{$singularHumanName}'); ?>"; ?></h1>
 			</div>
@@ -28,12 +28,12 @@
 
 	<div class="row">
 
-		<div class="col-md-3">
+		<div class="col-lg-3">
 			<div class="actions">
-				<div class="panel panel-default">
-					<div class="panel-heading"><?php echo "<?php echo __('Actions'); ?>";?></div>
-						<div class="panel-body">
-							<ul class="nav nav-pills nav-stacked">
+				<div class="card">
+					<div class="card-header"><?php echo "<?php echo __('Actions'); ?>";?></div>
+						<div class="card-body">
+							<ul class="nav nav-pills flex-column">
 							<?php
 								echo "\t\t<li><?php echo \$this->Html->link(__('<span class=\"glyphicon glyphicon-edit\"></span>&nbsp&nbsp;Edit " . $singularHumanName ."'), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('escape' => false)); ?> </li>\n";
 								echo "\t\t<li><?php echo \$this->Form->postLink(__('<span class=\"glyphicon glyphicon-remove\"></span>&nbsp;&nbsp;Delete " . $singularHumanName . "'), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('escape' => false), __('Are you sure you want to delete # %s?', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
@@ -57,7 +57,7 @@
 			</div><!-- end actions -->
 		</div><!-- end col md 3 -->
 
-		<div class="col-md-9">			
+		<div class="col-lg-9">			
 			<table cellpadding="0" cellspacing="0" class="table table-striped">
 				<tbody>
 				<?php
@@ -93,7 +93,7 @@
 if (!empty($associations['hasOne'])) :
 	foreach ($associations['hasOne'] as $alias => $details): ?>
 	<div class="row related">
-		<div class="col-md-12">
+		<div class="col-lg-12">
 			<h3><?php echo "<?php echo __('Related " . Inflector::humanize($details['controller']) . "'); ?>"; ?></h3>
 			<table class="table table-striped">
 			<tbody>
@@ -129,7 +129,7 @@ foreach ($relations as $alias => $details):
 	$otherPluralHumanName = Inflector::humanize($details['controller']);
 	?>
 <div class="related row">
-	<div class="col-md-12">
+	<div class="col-lg-12">
 	<h3><?php echo "<?php echo __('Related " . $otherPluralHumanName . "'); ?>"; ?></h3>
 	<?php echo "<?php if (!empty(\${$singularVar}['{$alias}'])): ?>\n"; ?>
 	<table cellpadding = "0" cellspacing = "0" class="table table-striped">
diff --git a/app/View/Elements/navigation.ctp b/app/View/Elements/navigation.ctp
index d83c4b5fd..a052b83ea 100644
--- a/app/View/Elements/navigation.ctp
+++ b/app/View/Elements/navigation.ctp
@@ -1,19 +1,17 @@
-    <div class="navbar navbar-inverse navbar-fixed-top">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="#">Project name</a>
-        </div>
-        <div class="collapse navbar-collapse">
-          <ul class="nav navbar-nav">
-            <li class="active"><a href="#">Home</a></li>
-            <li><a href="#about">About</a></li>
-            <li><a href="#contact">Contact</a></li>
-          </ul>
-        </div><!--/.nav-collapse -->
-      </div>
-    </div>
\ No newline at end of file
+<div class="navbar navbar-dark bg-dark fixed-top navbar-expand-md">
+    <div class="container">
+        <button type="button" class="navbar-toggler" data-toggle="collapse" data-target=".navbar-collapse">&#x2630;</button> <a class="navbar-brand" href="#">Project name</a>
+        <div
+        class="collapse navbar-collapse">
+            <ul class="nav navbar-nav">
+                <li class="active nav-item"><a href="#" class="nav-link">Home</a>
+                </li>
+                <li class="nav-item"><a href="#about" class="nav-link">About</a>
+                </li>
+                <li class="nav-item"><a href="#contact" class="nav-link">Contact</a>
+                </li>
+            </ul>
+    </div>
+    <!--/.nav-collapse -->
+</div>
+</div>
diff --git a/app/View/Layouts/bootstrap.ctp b/app/View/Layouts/bootstrap.ctp
index d74a680e3..a4ec42fce 100644
--- a/app/View/Layouts/bootstrap.ctp
+++ b/app/View/Layouts/bootstrap.ctp
@@ -18,11 +18,11 @@
 	?>
 
   	<!-- Latest compiled and minified CSS -->
-  	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
-
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
   	<!-- Latest compiled and minified JavaScript -->
-  	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-  	<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>

From d29d5faf3784d9ded2569da98f47d8bd4d8b06c7 Mon Sep 17 00:00:00 2001
From: Hugo F <hforestier@protonmail.com>
Date: Sun, 20 Jan 2019 18:49:29 +0100
Subject: [PATCH 2/5] Replace support dropped Glyphicons with fontawesome

---
 .../Templates/bootstrap/views/form.ctp        |  8 ++++----
 .../Templates/bootstrap/views/index.ctp       | 12 +++++------
 .../Templates/bootstrap/views/view.ctp        | 20 +++++++++----------
 app/View/Layouts/bootstrap.ctp                |  1 +
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/app/Console/Templates/bootstrap/views/form.ctp b/app/Console/Templates/bootstrap/views/form.ctp
index eac6eeeb4..e60f4bcc2 100755
--- a/app/Console/Templates/bootstrap/views/form.ctp
+++ b/app/Console/Templates/bootstrap/views/form.ctp
@@ -38,16 +38,16 @@
 							<ul class="nav nav-pills flex-column">
 
 							<?php if (strpos($action, 'add') === false): ?>
-									<li><?php echo "<?php echo \$this->Form->postLink('<span class=\"glyphicon glyphicon-remove\"></span>&nbsp;&nbsp;'.__('Delete'), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), array('escape' => false), __('Are you sure you want to delete # %s?', \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>"; ?></li>
+									<li><?php echo "<?php echo \$this->Form->postLink('<span class=\"fa fa-remove\"></span>&nbsp;&nbsp;'.__('Delete'), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), array('escape' => false), __('Are you sure you want to delete # %s?', \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>"; ?></li>
 							<?php endif; ?>
-									<li><?php echo "<?php echo \$this->Html->link('<span class=\"glyphicon glyphicon-list\"></span>&nbsp;&nbsp;'.__('List " . $pluralHumanName . "'), array('action' => 'index'), array('escape' => false)); ?>"; ?></li>
+									<li><?php echo "<?php echo \$this->Html->link('<span class=\"fa fa-list\"></span>&nbsp;&nbsp;'.__('List " . $pluralHumanName . "'), array('action' => 'index'), array('escape' => false)); ?>"; ?></li>
 							<?php
 									$done = array();
 									foreach ($associations as $type => $data) {
 										foreach ($data as $alias => $details) {
 											if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
-												echo "\t\t<li><?php echo \$this->Html->link('<span class=\"glyphicon glyphicon-list\"></span>&nbsp;&nbsp;'.__('List " . Inflector::humanize($details['controller']) . "'), array('controller' => '{$details['controller']}', 'action' => 'index'), array('escape' => false)); ?> </li>\n";
-												echo "\t\t<li><?php echo \$this->Html->link('<span class=\"glyphicon glyphicon-plus\"></span>&nbsp;&nbsp;'.__('New " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add'), array('escape' => false)); ?> </li>\n";
+												echo "\t\t<li><?php echo \$this->Html->link('<span class=\"fa fa-list\"></span>&nbsp;&nbsp;'.__('List " . Inflector::humanize($details['controller']) . "'), array('controller' => '{$details['controller']}', 'action' => 'index'), array('escape' => false)); ?> </li>\n";
+												echo "\t\t<li><?php echo \$this->Html->link('<span class=\"fa fa-plus\"></span>&nbsp;&nbsp;'.__('New " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add'), array('escape' => false)); ?> </li>\n";
 												$done[] = $details['controller'];
 											}
 										}
diff --git a/app/Console/Templates/bootstrap/views/index.ctp b/app/Console/Templates/bootstrap/views/index.ctp
index db0bb0ba4..8f6561e58 100755
--- a/app/Console/Templates/bootstrap/views/index.ctp
+++ b/app/Console/Templates/bootstrap/views/index.ctp
@@ -37,14 +37,14 @@
 					<div class="card-header"><?php echo "<?php echo __('Actions'); ?>";?></div>
 						<div class="card-body">
 							<ul class="nav nav-pills flex-column">
-								<li><?php echo "<?php echo \$this->Html->link('<span class=\"glyphicon glyphicon-plus\"></span>&nbsp;&nbsp;'.__('New " . $singularHumanName . "'), array('action' => 'add'), array('escape' => false)); ?>"; ?></li>
+								<li><?php echo "<?php echo \$this->Html->link('<span class=\"fa fa-plus\"></span>&nbsp;&nbsp;'.__('New " . $singularHumanName . "'), array('action' => 'add'), array('escape' => false)); ?>"; ?></li>
 						<?php
 							$done = array();
 							foreach ($associations as $type => $data) {
 								foreach ($data as $alias => $details) {
 									if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
-										echo "\t\t<li><?php echo \$this->Html->link('<span class=\"glyphicon glyphicon-list\"></span>&nbsp;&nbsp;List'.__('" . Inflector::humanize($details['controller']) . "'), array('controller' => '{$details['controller']}', 'action' => 'index'), array('escape' => false)); ?> </li>\n";
-										echo "\t\t<li><?php echo \$this->Html->link('<span class=\"glyphicon glyphicon-plus\"></span>&nbsp;&nbsp;New'.__('" . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add'), array('escape' => false)); ?> </li>\n";
+										echo "\t\t<li><?php echo \$this->Html->link('<span class=\"fa fa-list\"></span>&nbsp;&nbsp;List'.__('" . Inflector::humanize($details['controller']) . "'), array('controller' => '{$details['controller']}', 'action' => 'index'), array('escape' => false)); ?> </li>\n";
+										echo "\t\t<li><?php echo \$this->Html->link('<span class=\"fa fa-plus\"></span>&nbsp;&nbsp;New'.__('" . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add'), array('escape' => false)); ?> </li>\n";
 										$done[] = $details['controller'];
 									}
 								}
@@ -87,9 +87,9 @@
 				}
 
 				echo "\t\t\t\t\t\t<td class=\"actions\">\n";
-				echo "\t\t\t\t\t\t\t<?php echo \$this->Html->link('<span class=\"glyphicon glyphicon-search\"></span>', array('action' => 'view', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('escape' => false)); ?>\n";
-				echo "\t\t\t\t\t\t\t<?php echo \$this->Html->link('<span class=\"glyphicon glyphicon-edit\"></span>', array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('escape' => false)); ?>\n";
-				echo "\t\t\t\t\t\t\t<?php echo \$this->Form->postLink('<span class=\"glyphicon glyphicon-remove\"></span>', array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('escape' => false), __('Are you sure you want to delete # %s?', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
+				echo "\t\t\t\t\t\t\t<?php echo \$this->Html->link('<span class=\"fa fa-search\"></span>', array('action' => 'view', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('escape' => false)); ?>\n";
+				echo "\t\t\t\t\t\t\t<?php echo \$this->Html->link('<span class=\"fa fa-edit\"></span>', array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('escape' => false)); ?>\n";
+				echo "\t\t\t\t\t\t\t<?php echo \$this->Form->postLink('<span class=\"fa fa-remove\"></span>', array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('escape' => false), __('Are you sure you want to delete # %s?', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
 				echo "\t\t\t\t\t\t</td>\n";
 			echo "\t\t\t\t\t</tr>\n";
 
diff --git a/app/Console/Templates/bootstrap/views/view.ctp b/app/Console/Templates/bootstrap/views/view.ctp
index 3703642d2..e73308d22 100755
--- a/app/Console/Templates/bootstrap/views/view.ctp
+++ b/app/Console/Templates/bootstrap/views/view.ctp
@@ -35,17 +35,17 @@
 						<div class="card-body">
 							<ul class="nav nav-pills flex-column">
 							<?php
-								echo "\t\t<li><?php echo \$this->Html->link(__('<span class=\"glyphicon glyphicon-edit\"></span>&nbsp&nbsp;Edit " . $singularHumanName ."'), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('escape' => false)); ?> </li>\n";
-								echo "\t\t<li><?php echo \$this->Form->postLink(__('<span class=\"glyphicon glyphicon-remove\"></span>&nbsp;&nbsp;Delete " . $singularHumanName . "'), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('escape' => false), __('Are you sure you want to delete # %s?', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
-								echo "\t\t<li><?php echo \$this->Html->link(__('<span class=\"glyphicon glyphicon-list\"></span>&nbsp&nbsp;List " . $pluralHumanName . "'), array('action' => 'index'), array('escape' => false)); ?> </li>\n";
-								echo "\t\t<li><?php echo \$this->Html->link(__('<span class=\"glyphicon glyphicon-plus\"></span>&nbsp&nbsp;New " . $singularHumanName . "'), array('action' => 'add'), array('escape' => false)); ?> </li>\n";
+								echo "\t\t<li><?php echo \$this->Html->link(__('<span class=\"fa fa-edit\"></span>&nbsp&nbsp;Edit " . $singularHumanName ."'), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('escape' => false)); ?> </li>\n";
+								echo "\t\t<li><?php echo \$this->Form->postLink(__('<span class=\"fa fa-remove\"></span>&nbsp;&nbsp;Delete " . $singularHumanName . "'), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('escape' => false), __('Are you sure you want to delete # %s?', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
+								echo "\t\t<li><?php echo \$this->Html->link(__('<span class=\"fa fa-list\"></span>&nbsp&nbsp;List " . $pluralHumanName . "'), array('action' => 'index'), array('escape' => false)); ?> </li>\n";
+								echo "\t\t<li><?php echo \$this->Html->link(__('<span class=\"fa fa-plus\"></span>&nbsp&nbsp;New " . $singularHumanName . "'), array('action' => 'add'), array('escape' => false)); ?> </li>\n";
 
 								$done = array();
 								foreach ($associations as $type => $data) {
 									foreach ($data as $alias => $details) {
 										if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
-											echo "\t\t<li><?php echo \$this->Html->link(__('<span class=\"glyphicon glyphicon-list\"></span>&nbsp&nbsp;List " . Inflector::humanize($details['controller']) . "'), array('controller' => '{$details['controller']}', 'action' => 'index'), array('escape' => false)); ?> </li>\n";
-											echo "\t\t<li><?php echo \$this->Html->link(__('<span class=\"glyphicon glyphicon-plus\"></span>&nbsp&nbsp;New " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add'), array('escape' => false)); ?> </li>\n";
+											echo "\t\t<li><?php echo \$this->Html->link(__('<span class=\"fa fa-list\"></span>&nbsp&nbsp;List " . Inflector::humanize($details['controller']) . "'), array('controller' => '{$details['controller']}', 'action' => 'index'), array('escape' => false)); ?> </li>\n";
+											echo "\t\t<li><?php echo \$this->Html->link(__('<span class=\"fa fa-plus\"></span>&nbsp&nbsp;New " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add'), array('escape' => false)); ?> </li>\n";
 											$done[] = $details['controller'];
 										}
 									}
@@ -152,9 +152,9 @@ echo "\t<?php foreach (\${$singularVar}['{$alias}'] as \${$otherSingularVar}): ?
 			}
 
 			echo "\t\t\t<td class=\"actions\">\n";
-			echo "\t\t\t\t<?php echo \$this->Html->link(__('<span class=\"glyphicon glyphicon-search\"></span>'), array('controller' => '{$details['controller']}', 'action' => 'view', \${$otherSingularVar}['{$details['primaryKey']}']), array('escape' => false)); ?>\n";
-			echo "\t\t\t\t<?php echo \$this->Html->link(__('<span class=\"glyphicon glyphicon-edit\"></span>'), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$otherSingularVar}['{$details['primaryKey']}']), array('escape' => false)); ?>\n";
-			echo "\t\t\t\t<?php echo \$this->Form->postLink(__('<span class=\"glyphicon glyphicon-remove\"></span>'), array('controller' => '{$details['controller']}', 'action' => 'delete', \${$otherSingularVar}['{$details['primaryKey']}']), array('escape' => false), __('Are you sure you want to delete # %s?', \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
+			echo "\t\t\t\t<?php echo \$this->Html->link(__('<span class=\"fa fa-search\"></span>'), array('controller' => '{$details['controller']}', 'action' => 'view', \${$otherSingularVar}['{$details['primaryKey']}']), array('escape' => false)); ?>\n";
+			echo "\t\t\t\t<?php echo \$this->Html->link(__('<span class=\"fa fa-edit\"></span>'), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$otherSingularVar}['{$details['primaryKey']}']), array('escape' => false)); ?>\n";
+			echo "\t\t\t\t<?php echo \$this->Form->postLink(__('<span class=\"fa fa-remove\"></span>'), array('controller' => '{$details['controller']}', 'action' => 'delete', \${$otherSingularVar}['{$details['primaryKey']}']), array('escape' => false), __('Are you sure you want to delete # %s?', \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
 			echo "\t\t\t</td>\n";
 		echo "\t\t</tr>\n";
 
@@ -164,7 +164,7 @@ echo "\t<?php endforeach; ?>\n";
 	</table>
 <?php echo "<?php endif; ?>\n\n"; ?>
 	<div class="actions">
-		<?php echo "<?php echo \$this->Html->link(__('<span class=\"glyphicon glyphicon-plus\"></span>&nbsp;&nbsp;New " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add'), array('escape' => false, 'class' => 'btn btn-default')); ?>"; ?> 
+		<?php echo "<?php echo \$this->Html->link(__('<span class=\"fa fa-plus\"></span>&nbsp;&nbsp;New " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add'), array('escape' => false, 'class' => 'btn btn-default')); ?>"; ?> 
 	</div>
 	</div><!-- end col md 12 -->
 </div>
diff --git a/app/View/Layouts/bootstrap.ctp b/app/View/Layouts/bootstrap.ctp
index a4ec42fce..1a6c8997e 100644
--- a/app/View/Layouts/bootstrap.ctp
+++ b/app/View/Layouts/bootstrap.ctp
@@ -23,6 +23,7 @@
     <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>

From 2daf2c5d5b7ac0ac33c45e5d3bee5dbd967b3271 Mon Sep 17 00:00:00 2001
From: Hugo F <hforestier@protonmail.com>
Date: Sun, 20 Jan 2019 18:58:16 +0100
Subject: [PATCH 3/5] Update README.md

---
 README.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7f0ac2849..ee6718414 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,15 @@
-# BootstrapCake Shell Template
+**Warning:** Only for CakePHP 4.x
 
-BootstrapCake is a shell template for rapidly developing beautiful Bootstrap themed CakePHP applications through the CakePHP console. The default template uses the ugly CakePHP styling but this template makes your app look beautiful by default.
+# Bootstrap4Cake Shell Template
+
+Bootstrap4Cake is a shell template for rapidly developing beautiful Bootstrap 4 themed CakePHP applications through the CakePHP  2.x console. The default template uses the ugly CakePHP styling but this template makes your app look beautiful by default.
+
+![2019-01-20-185335_2720x986_scrot](https://user-images.githubusercontent.com/9076747/51443177-224beb00-1ce5-11e9-8839-a6c6d3b3a0a6.png)
 
 ## Requirements
 
 * [CakePHP](http://cakephp.org/) >= 2.3
-* [Bootstrap](http://getbootstrap.com/) >= 3.0
+* [Bootstrap](http://getbootstrap.com/) >= 4.0
 
 ## Installation
 
@@ -23,4 +27,4 @@ class AppController extends Controller {
 * Start baking! If you've never used the console, here's a great tutorial: [http://book.cakephp.org/2.0/en/console-and-shells/code-generation-with-bake.html](http://book.cakephp.org/2.0/en/console-and-shells/code-generation-with-bake.html)
 * Make sure you select the bootstrap template when prompted
 
-For more information and screenshots, please visit [http://www.ekoim.com/blog/bootstrap-cakephp-bootstrapcake/](http://www.ekoim.com/blog/bootstrap-cakephp-bootstrapcake/)
\ No newline at end of file
+For more information and screenshots, please visit [http://www.ekoim.com/blog/bootstrap-cakephp-bootstrapcake/](http://www.ekoim.com/blog/bootstrap-cakephp-bootstrapcake/) (Bootstrap3 Version)

From 2beeb23917c4818afb31699b75969f14dd390d5a Mon Sep 17 00:00:00 2001
From: Hugo F <hforestier@protonmail.com>
Date: Mon, 21 Jan 2019 15:46:36 +0100
Subject: [PATCH 4/5] Update to Bootstrap 4.2.1

---
 app/View/Layouts/bootstrap.ctp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/View/Layouts/bootstrap.ctp b/app/View/Layouts/bootstrap.ctp
index 1a6c8997e..8e2319a46 100644
--- a/app/View/Layouts/bootstrap.ctp
+++ b/app/View/Layouts/bootstrap.ctp
@@ -18,13 +18,14 @@
 	?>
 
   	<!-- Latest compiled and minified CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-  	<!-- Latest compiled and minified JavaScript -->
-    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
 
+  	<!-- Latest compiled and minified JavaScript -->
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
+
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.2/html5shiv.js"></script>

From ee380e340731717d8facd0ff39fbd5203c06fbeb Mon Sep 17 00:00:00 2001
From: Hugo F <hforestier@protonmail.com>
Date: Thu, 24 Jan 2019 18:17:54 +0100
Subject: [PATCH 5/5] Fixed buttons

---
 app/Console/Templates/bootstrap/views/form.ctp | 2 +-
 app/Console/Templates/bootstrap/views/view.ctp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Console/Templates/bootstrap/views/form.ctp b/app/Console/Templates/bootstrap/views/form.ctp
index e60f4bcc2..be83461f6 100755
--- a/app/Console/Templates/bootstrap/views/form.ctp
+++ b/app/Console/Templates/bootstrap/views/form.ctp
@@ -80,7 +80,7 @@
 ?>
 <?php
 				echo "\t\t\t\t<div class=\"form-group\">\n";
-				echo "\t\t\t\t\t<?php echo \$this->Form->submit(__('Submit'), array('class' => 'btn btn-default')); ?>\n";
+				echo "\t\t\t\t\t<?php echo \$this->Form->submit(__('Submit'), array('class' => 'btn btn-primary')); ?>\n";
 				echo "\t\t\t\t</div>\n\n";
 
 			echo "\t\t\t<?php echo \$this->Form->end() ?>\n\n";
diff --git a/app/Console/Templates/bootstrap/views/view.ctp b/app/Console/Templates/bootstrap/views/view.ctp
index e73308d22..45519dd70 100755
--- a/app/Console/Templates/bootstrap/views/view.ctp
+++ b/app/Console/Templates/bootstrap/views/view.ctp
@@ -110,7 +110,7 @@ if (!empty($associations['hasOne'])) :
 			</tbody>
 			</table>
 			<div class="actions">
-				<?php echo "<?php echo \$this->Html->link(__('Edit " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$singularVar}['{$alias}']['{$details['primaryKey']}']), array('escape' => false, 'class' => 'btn btn-default')); ?>\n"; ?>
+				<?php echo "<?php echo \$this->Html->link(__('Edit " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$singularVar}['{$alias}']['{$details['primaryKey']}']), array('escape' => false, 'class' => 'btn btn-primary')); ?>\n"; ?>
 			</div>
 		</div><!-- end col md 12 -->
 	</div>
@@ -164,7 +164,7 @@ echo "\t<?php endforeach; ?>\n";
 	</table>
 <?php echo "<?php endif; ?>\n\n"; ?>
 	<div class="actions">
-		<?php echo "<?php echo \$this->Html->link(__('<span class=\"fa fa-plus\"></span>&nbsp;&nbsp;New " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add'), array('escape' => false, 'class' => 'btn btn-default')); ?>"; ?> 
+		<?php echo "<?php echo \$this->Html->link(__('<span class=\"fa fa-plus\"></span>&nbsp;&nbsp;New " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add'), array('escape' => false, 'class' => 'btn btn-primary')); ?>"; ?> 
 	</div>
 	</div><!-- end col md 12 -->
 </div>