From f2e24a4ec60effaaf09cda79f10730e07131c78c Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 20 Jul 2023 17:27:52 +0200 Subject: [PATCH] wip #6108 @1.5 --- app/Models/QuizTheme.php | 20 ++++++++++++ composer.lock | 32 +++++++++---------- .../packages/fluidbook/toolbox/css/style.less | 9 ++++++ .../base/inc/sidebar_content.blade.php | 16 +++++++--- 4 files changed, 56 insertions(+), 21 deletions(-) create mode 100644 app/Models/QuizTheme.php diff --git a/app/Models/QuizTheme.php b/app/Models/QuizTheme.php new file mode 100644 index 000000000..7b7ad0ce9 --- /dev/null +++ b/app/Models/QuizTheme.php @@ -0,0 +1,20 @@ + 'quiz-theme', + 'singular' => 'thème', + 'plural' => 'thèmes']; + + protected $_enableBulk = false; + + protected static $_permissionBase = 'quiz'; + + public $registerMediaConversionsUsingModelInstance = false; +} diff --git a/composer.lock b/composer.lock index 39b387e07..6f051f235 100644 --- a/composer.lock +++ b/composer.lock @@ -1507,13 +1507,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "d01f1fb011d62a31fee594805a1a3aae78b9500c" + "reference": "afafc713f7bcdcdfd078a721dd5eeb322c62fba0" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack5-c7ee91.tar", - "reference": "d01f1fb011d62a31fee594805a1a3aae78b9500c", - "shasum": "83665ac6328cc59eb8a358b955311698eaa55996" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack5-c212b2.tar", + "reference": "afafc713f7bcdcdfd078a721dd5eeb322c62fba0", + "shasum": "3000d0d7b37fb32615096d7338b015fea4fa1f72" }, "require": { "backpack/backupmanager": "^v3.0.9", @@ -1592,7 +1592,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2023-07-07T11:56:14+00:00" + "time": "2023-07-18T11:00:07+00:00" }, { "name": "cubist/cms-front", @@ -2015,13 +2015,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_util.git", - "reference": "8945082d87f5d7bf5f9711bcf38095e145ec740b" + "reference": "1294b0cec6d528a667d6fa0fa7912929f8fdf3c3" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-d5f6bd.tar", - "reference": "8945082d87f5d7bf5f9711bcf38095e145ec740b", - "shasum": "244bd8deab3bffbc6321d3a3d5b9e8878e21d713" + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-f5eea9.tar", + "reference": "1294b0cec6d528a667d6fa0fa7912929f8fdf3c3", + "shasum": "467079644ce18c44880a8707feaeb54cadee234d" }, "require": { "cubist/net": "dev-master", @@ -2055,7 +2055,7 @@ } ], "description": "Utilities class", - "time": "2023-07-07T13:49:55+00:00" + "time": "2023-07-18T07:51:53+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -9297,16 +9297,16 @@ }, { "name": "spatie/laravel-honeypot", - "version": "4.3.2", + "version": "4.3.3", "source": { "type": "git", "url": "https://github.com/spatie/laravel-honeypot.git", - "reference": "eab92dd2096f1cdb83c28ced4f4632d3cfde2872" + "reference": "fa303f537e0f2119861ab75efaa9b5ef792da12d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-honeypot/zipball/eab92dd2096f1cdb83c28ced4f4632d3cfde2872", - "reference": "eab92dd2096f1cdb83c28ced4f4632d3cfde2872", + "url": "https://api.github.com/repos/spatie/laravel-honeypot/zipball/fa303f537e0f2119861ab75efaa9b5ef792da12d", + "reference": "fa303f537e0f2119861ab75efaa9b5ef792da12d", "shasum": "" }, "require": { @@ -9361,7 +9361,7 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/laravel-honeypot/tree/4.3.2" + "source": "https://github.com/spatie/laravel-honeypot/tree/4.3.3" }, "funding": [ { @@ -9369,7 +9369,7 @@ "type": "custom" } ], - "time": "2023-01-17T07:09:34+00:00" + "time": "2023-07-17T20:02:47+00:00" }, { "name": "spatie/laravel-medialibrary", diff --git a/public/packages/fluidbook/toolbox/css/style.less b/public/packages/fluidbook/toolbox/css/style.less index 06c3e0cae..b8da0dd30 100644 --- a/public/packages/fluidbook/toolbox/css/style.less +++ b/public/packages/fluidbook/toolbox/css/style.less @@ -209,6 +209,14 @@ a, a.btn-link, a:not([href]):not([tabindex]) { } } + .nav-divider { + height: 10px; + border-bottom: 1px solid #eee; + margin: -6px 15px 5px 25px; + list-style: none; + } + + &.bg-light { @media @sidebar-breakpoint { background-color: #fff !important; @@ -471,6 +479,7 @@ body.embeded { box-shadow: 0 0 4px rgba(0, 0, 0, 0.1); } + table.dataTable thead > tr > th.sorting_asc::before, table.dataTable thead > tr > th.sorting_desc::after, table.dataTable thead > tr > td.sorting_asc::before, table.dataTable thead > tr > td.sorting_desc::after { opacity: 1.0 !important; } diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php index 0b4419598..8d68af7ea 100644 --- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php +++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php @@ -61,7 +61,7 @@ @endcan -@canany(['quiz:read','quiztranslation:read','elearning_media:read']) +@canany(['quiz:read','quiz-theme:read','quiztranslation:read','elearning_media:read','elearning-package:read'])
  • {{__('e-Learning')}}
    • @endcanany -- 2.39.5