From 928fcda0c95b3871f3c86dcecc38e52cc0375895 Mon Sep 17 00:00:00 2001 From: Mark Date: Sun, 8 Apr 2018 20:53:45 -0700 Subject: [PATCH 1/2] test --- images/blankCar.jpg | Bin images/car-rack-1.png | Bin images/rim1.png | Bin public/assets/css/default.css | 0 public/assets/js/index.js | 0 public/index.php | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 images/blankCar.jpg mode change 100755 => 100644 images/car-rack-1.png mode change 100755 => 100644 images/rim1.png mode change 100755 => 100644 public/assets/css/default.css mode change 100755 => 100644 public/assets/js/index.js mode change 100755 => 100644 public/index.php diff --git a/images/blankCar.jpg b/images/blankCar.jpg old mode 100755 new mode 100644 diff --git a/images/car-rack-1.png b/images/car-rack-1.png old mode 100755 new mode 100644 diff --git a/images/rim1.png b/images/rim1.png old mode 100755 new mode 100644 diff --git a/public/assets/css/default.css b/public/assets/css/default.css old mode 100755 new mode 100644 diff --git a/public/assets/js/index.js b/public/assets/js/index.js old mode 100755 new mode 100644 diff --git a/public/index.php b/public/index.php old mode 100755 new mode 100644 From 6be26a9f2b50d8a10f07676df2d10a178d33e017 Mon Sep 17 00:00:00 2001 From: Mark Date: Sun, 8 Apr 2018 23:20:22 -0700 Subject: [PATCH 2/2] Fixed menu bar #2 --- application/views/_menubar.php | 9 --------- application/views/homepage_template.php | 10 ++++++++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/application/views/_menubar.php b/application/views/_menubar.php index a88423e1..d3acd061 100644 --- a/application/views/_menubar.php +++ b/application/views/_menubar.php @@ -2,8 +2,6 @@ /* * Menu navbar, just an unordered list */ - -$plan = array('1' => 'Guest', '2' => 'User', '3' => 'Admin'); ?> - diff --git a/application/views/homepage_template.php b/application/views/homepage_template.php index c85189f4..aacebdea 100644 --- a/application/views/homepage_template.php +++ b/application/views/homepage_template.php @@ -17,11 +17,17 @@
-
-
{menubar}
+
+
+ {menubar} +
{content} {top} + +