From cc06950e0304141e270ba36e45623871da5d6990 Mon Sep 17 00:00:00 2001 From: Theo Weijmer Date: Thu, 5 Apr 2018 21:10:15 +0200 Subject: [PATCH] aanpassen styling voor side menu --- application/core/MY_Controller.php | 2 +- application/views/main_view.old | 55 ++++ application/views/main_view.php | 88 ++++--- application/views/modals/customer_modal.php | 37 +-- application/views/modals/external_modal.php | 49 ++-- application/views/modals/offer_modal.php | 69 ++--- application/views/modals/user_modal.php | 31 +-- application/views/pages/customers_view.php | 128 +++++----- .../views/pages/employeehours_view.php | 148 ++++++----- .../views/pages/employeehoursreport_view.php | 4 +- application/views/pages/externals_view.php | 132 +++++----- .../views/pages/monthlyemployeehours_view.php | 4 +- application/views/pages/offers_view.php | 165 ++++++------ application/views/pages/projects_view.php | 164 ++++++------ application/views/pages/users_view.php | 132 +++++----- application/views/partials/_css.php | 7 +- application/views/partials/_js.php | 48 +--- application/views/partials/_navbar-left.php | 30 ++- .../employeehours/employeemonthhours_view.php | 6 +- .../views/reports/invoices/_invoicetable.php | 4 +- .../monthlyemployeehours/euro_view.php | 12 +- application/views/specials/tellme_modal.php | 3 +- public/css/correction.css | 21 ++ public/css/main.css | 14 +- public/css/menu.css | 236 ++++++++++++++++++ public/css/vendor/bootstrap-extend.css | 2 +- public/js/lib/main.js | 2 + public/js/lib/modules/menuModule.js | 10 +- 28 files changed, 948 insertions(+), 655 deletions(-) create mode 100644 application/views/main_view.old create mode 100644 public/css/menu.css diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index c004fcd..0659722 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -16,7 +16,7 @@ class MY_Controller extends CI_Controller { { parent::__construct(); - $this->version = '0.00.00'; + $this->version = '0.10.AA'; $this->load->library( 'beheer/session/RetrieveUserSession' ); diff --git a/application/views/main_view.old b/application/views/main_view.old new file mode 100644 index 0000000..b8de45f --- /dev/null +++ b/application/views/main_view.old @@ -0,0 +1,55 @@ + + + + + + + + + + + + + +** De Beleidsonderzoeker ** + +load->view( 'partials/_css' ); ?> + +load->view( 'partials/_fonts' ); ?> + + + + +load->view( 'partials/_modals' ); ?> + +
+
+ load->view( 'partials/_navbar-left' ); ?> +
+
+ +
+
+ + diff --git a/application/views/main_view.php b/application/views/main_view.php index 6672b9d..f0b885c 100644 --- a/application/views/main_view.php +++ b/application/views/main_view.php @@ -1,51 +1,73 @@ - - + + + + + - - - - - - + - + ** De Beleidsonderzoeker ** -** De Beleidsonderzoeker ** - -load->view( 'partials/_css' ); ?> - -load->view( 'partials/_fonts' ); ?> + load->view( 'partials/_css' ); ?> + load->view( 'partials/_fonts' ); ?> + -load->view('partials/_modals'); ?> +load->view( 'partials/_modals' ); ?> +
+ load->view( 'partials/_navbar-left' ); ?> -load->view( 'partials/_navbar-left' ); ?> - -