From 36a621a108f69881dd4a07035439851ffc7213a5 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sat, 6 Jun 2020 17:26:25 -0500 Subject: [PATCH] round buttons? --- .../Install/FinalizeController.php | 2 +- resources/views/install/finish.blade.php | 5 ++ .../views/install/user-created.blade.php | 1 - resources/views/layouts/install.blade.php | 71 ++++++++++++++----- 4 files changed, 59 insertions(+), 20 deletions(-) create mode 100644 resources/views/install/finish.blade.php diff --git a/app/Http/Controllers/Install/FinalizeController.php b/app/Http/Controllers/Install/FinalizeController.php index 8fa104ec3e..14d7161e0b 100644 --- a/app/Http/Controllers/Install/FinalizeController.php +++ b/app/Http/Controllers/Install/FinalizeController.php @@ -29,7 +29,7 @@ class FinalizeController extends \App\Http\Controllers\Controller { public function __invoke() { - // TODO: Implement __invoke() method. + return view('install.finish'); } private function writeConfigFile($config_file) diff --git a/resources/views/install/finish.blade.php b/resources/views/install/finish.blade.php new file mode 100644 index 0000000000..df3e28dc91 --- /dev/null +++ b/resources/views/install/finish.blade.php @@ -0,0 +1,5 @@ +@extends('layouts.install') + +@section('content') + +@endsection diff --git a/resources/views/install/user-created.blade.php b/resources/views/install/user-created.blade.php index bab4b10559..d04e06106b 100644 --- a/resources/views/install/user-created.blade.php +++ b/resources/views/install/user-created.blade.php @@ -11,4 +11,3 @@ @endsection -22 diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php index 359f15354c..18c48f14f1 100644 --- a/resources/views/layouts/install.blade.php +++ b/resources/views/layouts/install.blade.php @@ -10,12 +10,32 @@ +
-
+
-
+

{{ \LibreNMS\Config::get('project_name', 'LibreNMS') }} @@ -24,27 +44,42 @@

-
-

@lang('install.stage', ['stage' => $stage ?? 0, 'stages' => $stages ?? 6])

+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+ {{--
--}} + {{--
--}} + {{--
--}} + {{--
--}} + {{-- {{ ($stage ?? 0) / ($stages ?? 6) * 100 }}% Complete--}} + {{--
--}} + {{--
--}} + {{--
--}} + {{--
--}}
-
-
-
- {{ ($stage ?? 0) / ($stages ?? 6) * 100 }}% Complete -
-
+
+ @if(!empty($msg)) +
{{ $msg }}
+ @endif
-
-
- @if(!empty($msg)) -
{{ $msg }}
- @endif -
-
@yield('content')