From 4f8f40395d1d4060b6d71188c7b797c7ed693aba Mon Sep 17 00:00:00 2001 From: "Eric Richer eric.richer@vistoconsulting.com" Date: Wed, 4 Sep 2024 17:50:29 -0400 Subject: [PATCH 1/3] Changed component installer to module --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b82c495..36b93e8 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ }, "extra": { "laminas": { - "component": "Lmc\\Admin", + "module": "Lmc\\Admin", "config-provider": [ "LmcAdmin\\ConfigProvider" ] From 7a5bce848ca1057157432e13918685d887ca53ea Mon Sep 17 00:00:00 2001 From: "Eric Richer eric.richer@vistoconsulting.com" Date: Wed, 4 Sep 2024 17:50:29 -0400 Subject: [PATCH 2/3] Changed component installer to module --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b82c495..36b93e8 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ }, "extra": { "laminas": { - "component": "Lmc\\Admin", + "module": "Lmc\\Admin", "config-provider": [ "LmcAdmin\\ConfigProvider" ] diff --git a/composer.lock b/composer.lock index aabe86d..caaa625 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7005981cd9937043384c737e3b7c8f02", + "content-hash": "d4ded466d86cf50f44482c630407fed2", "packages": [ { "name": "brick/varexporter", From 5a7215dbb6f3aa305b9e092efdae1bc470ff5c42 Mon Sep 17 00:00:00 2001 From: "Eric Richer eric.richer@vistoconsulting.com" Date: Wed, 4 Sep 2024 17:56:01 -0400 Subject: [PATCH 3/3] Update layout to use Bootstrap 5 (#30) --- view/lmc/layout/admin.phtml | 69 ++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/view/lmc/layout/admin.phtml b/view/lmc/layout/admin.phtml index 6b508db..b89fdfe 100644 --- a/view/lmc/layout/admin.phtml +++ b/view/lmc/layout/admin.phtml @@ -3,45 +3,51 @@ - headTitle('LmcAdmin - Laminas MVC Framework Admin Interface')->setSeparator(' - ')->setAutoEscape(false) ?> + headTitle('LmcAdmin - LM-Commons')->setSeparator(' - ')->setAutoEscape(false) ?> headMeta()->appendName('viewport', 'width=device-width, initial-scale=1.0') ->appendHttpEquiv('X-UA-Compatible', 'IE=edge') ?> - - headLink()->prependStylesheet('//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css') ?> + + headLink()->prependStylesheet('https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css', + 'screen', false, [ + 'integrity' => 'sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH', + 'crossorigin' => 'anonymous' + ] + ); + ?> - headScript()->prependFile('//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js') - ->prependFile('https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js') - ->prependFile('https://oss.maxcdn.com/respond/1.4.2/respond.min.js', 'text/javascript', array('conditional' => 'lt IE 9',)) - ->prependFile('https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js', 'text/javascript', array('conditional' => 'lt IE 9',)) - ?> + headScript();?> - + -
@@ -55,6 +61,13 @@
- inlineScript() ?> + inlineScript() + ->prependFile('https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js', + 'text/javascript', [ + 'integrity' => 'sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz', + 'crossorigin' => 'anonymous' + ] + ) ?> +