diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 13ed6938..3cfa25ce 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -127,6 +127,10 @@ jobs: db: "mysql:5.7" - php: '8.3' db: "mariadb:10.2" + - php: '8.4' + db: "mysql:8.0" + - php: '8.4' + db: "mariadb:10.3" name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} @@ -264,6 +268,8 @@ jobs: db: "postgres:9.5" - php: '8.3' db: "postgres:9.5" + - php: '8.4' + db: "postgres:9.5" name: PHP ${{ matrix.php }} - ${{ matrix.db }} @@ -348,7 +354,7 @@ jobs: # START Other Tests Job (SQLite 3 and mssql) other-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-22.04' when https://github.com/microsoft/mssql-docker/issues/899 resolved. strategy: matrix: include: @@ -358,17 +364,17 @@ jobs: db: "mcr.microsoft.com/mssql/server:2017-latest" db_alias: 'MSSQL 2017' - php: '8.1' - db: "mcr.microsoft.com/mssql/server:2019-latest" + db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04" db_alias: 'MSSQL 2019' - php: '8.1' - db: "mcr.microsoft.com/mssql/server:2022-latest" + db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04" db_alias: 'MSSQL 2022' name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} services: mssql: - image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} + image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} env: SA_PASSWORD: "Pssw0rd_12" ACCEPT_EULA: "y" @@ -408,7 +414,7 @@ jobs: env: MATRIX_DB: ${{ matrix.db }} run: | - if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-latest' ] + if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ] then db='mssql' else diff --git a/README.md b/README.md index 5154a327..0991baa6 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Tailor your custom BBCodes to perfection by arranging and sorting them in any de Install Advanced BBCode Box today and unlock a world of enhanced formatting possibilities for your phpBB3 forum. -[![Build Status](https://github.com/iMattPro/abbc3/workflows/Tests/badge.svg)](https://github.com/iMattPro/abbc3/actions) +[![Build Status](https://github.com/iMattPro/abbc3/actions/workflows/tests.yml/badge.svg)](https://github.com/iMattPro/abbc3/actions) [![Maintainability](https://api.codeclimate.com/v1/badges/8d41d4a3ec4e8a3e4e76/maintainability)](https://codeclimate.com/github/iMattPro/abbc3/maintainability) [![codecov](https://codecov.io/gh/iMattPro/abbc3/branch/master/graph/badge.svg?token=C5Big3OlKM)](https://codecov.io/gh/iMattPro/abbc3) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/iMattPro/abbc3/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/iMattPro/abbc3/?branch=master) diff --git a/adm/style/acp_abbc3.css b/adm/style/acp_abbc3.css index f3f5cb78..b729b14e 100644 --- a/adm/style/acp_abbc3.css +++ b/adm/style/acp_abbc3.css @@ -45,6 +45,14 @@ color: #333333; } +.toast.toast-dark { + background: hsl(0, 0%, 20%); +} + +.toast.toast-dark .toast-message .toast-text { + color: #ffffff; +} + #abbc3_icons_type { vertical-align: top; } diff --git a/adm/style/acp_abbc3_settings.html b/adm/style/acp_abbc3_settings.html index 03ac6f03..8b0d1f57 100644 --- a/adm/style/acp_abbc3_settings.html +++ b/adm/style/acp_abbc3_settings.html @@ -1,11 +1,26 @@ {% include 'overall_header.html' %} {% INCLUDECSS '@vse_abbc3/acp_abbc3.css' %} +{% set links = { + 'faq': { + 'url': 'https://www.phpbb.com/customise/db/extension/advanced_bbcode_box/faq/1551', + 'text': lang('FAQ') + }, + 'media_embed': { + 'url': 'https://www.phpbb.com/customise/db/extension/mediaembed/', + 'text': lang('DOWNLOAD') + } +} %} + +{% macro external_link(url, text) -%} + + Icon('font', 'arrow-up-right-from-square', '', true) + {{ text -}} + +{%- endmacro %} + -{% set LINK_FAQ = '' %} -{% set LINK_ME_EXT = '' %} -{% set LINK_ICON = Icon('font', 'arrow-up-right-from-square', '', true) ~ '' %} -
{{ lang('ABBC3_SETTINGS_EXPLAIN', LINK_FAQ, LINK_ICON) }}
+{{ lang('ABBC3_SETTINGS_EXPLAIN', _self.external_link(links.faq.url, links.faq.text)) }}