From 444e19b4f419dd94fe7d8d907c7a8499d2ddf67d Mon Sep 17 00:00:00 2001 From: Xpirix Date: Tue, 28 Jan 2025 13:19:20 +0300 Subject: [PATCH 1/2] Replace twitter with mastodon --- .../ci-test/tests/01-landing-page.spec.ts | 2 +- playwright/ci-test/tests/02-plugins.spec.ts | 2 +- .../ci-test/tests/09-planet-tab.spec.ts | 2 +- .../migrations/0013_alter_plugin_server.py | 18 ++++++++++++++++++ .../style/new/images/footer-mastodon.svg | 3 +++ .../style/new/images/footer-twitter.png | Bin 589 -> 0 bytes ...-style-updated.css => qgis-style-v1.0.css} | 4 ++-- qgis-app/templates/base.html | 4 ++-- 8 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 qgis-app/plugins/migrations/0013_alter_plugin_server.py create mode 100644 qgis-app/static/style/new/images/footer-mastodon.svg delete mode 100644 qgis-app/static/style/new/images/footer-twitter.png rename qgis-app/static/style/new/{qgis-style-updated.css => qgis-style-v1.0.css} (99%) diff --git a/playwright/ci-test/tests/01-landing-page.spec.ts b/playwright/ci-test/tests/01-landing-page.spec.ts index 03f54453..a5a530b8 100644 --- a/playwright/ci-test/tests/01-landing-page.spec.ts +++ b/playwright/ci-test/tests/01-landing-page.spec.ts @@ -57,7 +57,7 @@ test('landing page', async ({ page }) => { await expect(page.locator('header')).toContainText('Sustaining Members'); - await expect(page.locator('#twitter').getByRole('link')).toBeVisible(); + await expect(page.locator('#mastodon').getByRole('link')).toBeVisible(); await expect(page.locator('#facebook').getByRole('link')).toBeVisible(); diff --git a/playwright/ci-test/tests/02-plugins.spec.ts b/playwright/ci-test/tests/02-plugins.spec.ts index 6fa5f1ae..7d7b75a6 100644 --- a/playwright/ci-test/tests/02-plugins.spec.ts +++ b/playwright/ci-test/tests/02-plugins.spec.ts @@ -99,7 +99,7 @@ test('plugins', async ({ page }) => { await expect(page.getByRole('contentinfo')).toBeVisible(); - await expect(page.locator('#twitter').getByRole('link')).toBeVisible(); + await expect(page.locator('#mastodon').getByRole('link')).toBeVisible(); await expect(page.locator('#facebook').getByRole('link')).toBeVisible(); diff --git a/playwright/ci-test/tests/09-planet-tab.spec.ts b/playwright/ci-test/tests/09-planet-tab.spec.ts index 23ec9ccb..d0e35bb1 100644 --- a/playwright/ci-test/tests/09-planet-tab.spec.ts +++ b/playwright/ci-test/tests/09-planet-tab.spec.ts @@ -41,7 +41,7 @@ test('test planet tab', async ({ page }) => { await expect(page.locator('h3')).toContainText('Sustaining Members'); - await expect(page.locator('#twitter').getByRole('link')).toBeVisible(); + await expect(page.locator('#mastodon').getByRole('link')).toBeVisible(); await expect(page.locator('#facebook').getByRole('link')).toBeVisible(); diff --git a/qgis-app/plugins/migrations/0013_alter_plugin_server.py b/qgis-app/plugins/migrations/0013_alter_plugin_server.py new file mode 100644 index 00000000..8e3debe9 --- /dev/null +++ b/qgis-app/plugins/migrations/0013_alter_plugin_server.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.17 on 2025-01-06 03:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('plugins', '0012_pluginversionfeedback_modified_on'), + ] + + operations = [ + migrations.AlterField( + model_name='plugin', + name='server', + field=models.BooleanField(db_index=True, default=False, help_text='A server plugin is a plugin which can run on QGIS Server, by having a entrypoint serverClassFactory, see the documentation.', verbose_name='Server'), + ), + ] diff --git a/qgis-app/static/style/new/images/footer-mastodon.svg b/qgis-app/static/style/new/images/footer-mastodon.svg new file mode 100644 index 00000000..b22cab12 --- /dev/null +++ b/qgis-app/static/style/new/images/footer-mastodon.svg @@ -0,0 +1,3 @@ + + + diff --git a/qgis-app/static/style/new/images/footer-twitter.png b/qgis-app/static/style/new/images/footer-twitter.png deleted file mode 100644 index a08180b47baf94c1418e70a9ae6e440898a0e78b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 589 zcmV-T0 z-hd6l{xkrddw7ow3w!X~EP&~$mlTLFw?Pn7lm-LX-$h7Xp2$MVeVd@l5pRu>X0EqM z^0FqHx^fB`6&?B3DU-({jZ}M90%VvM68ACW_JMz0R&vT3>4QW~%Y^I2Q0q&C7bA=z zT+J*5HuCJq1mu!*Gg148B9#VrM!IbVptLhgLot2L(}Ck5)p0xvb6>$ez`6s$m@VN~ zr*8ounnb5mk;)cm2B3l0J!uj>%gzS_iWPcZtDf#?P)r_!wph)317l1y8uS+b*E@n~ z)LLa-T)lI2rllil3vIgkictrnQj>~$I;r$+3P zO-714Rgb=MTZoOA$)KsvxiCn2=?nGJ3a#%@!f}kuW+CHQ*a<+K_R?8JQNts6AuSHq z-wW6u*e_bBumS7~{+254C)hh&pKqm=bS$`iI({?Jj%uNS3ekF7h(H_{jN&&$ - + @@ -161,7 +161,7 @@
Silver Sponsors
    -
    • +
From 8da3ab38e9f23785c80aa3fe576e471c6fda4c3f Mon Sep 17 00:00:00 2001 From: Xpirix Date: Tue, 28 Jan 2025 13:23:42 +0300 Subject: [PATCH 2/2] Remove unwanted migration file --- .../migrations/0013_alter_plugin_server.py | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 qgis-app/plugins/migrations/0013_alter_plugin_server.py diff --git a/qgis-app/plugins/migrations/0013_alter_plugin_server.py b/qgis-app/plugins/migrations/0013_alter_plugin_server.py deleted file mode 100644 index 8e3debe9..00000000 --- a/qgis-app/plugins/migrations/0013_alter_plugin_server.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.2.17 on 2025-01-06 03:00 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0012_pluginversionfeedback_modified_on'), - ] - - operations = [ - migrations.AlterField( - model_name='plugin', - name='server', - field=models.BooleanField(db_index=True, default=False, help_text='A server plugin is a plugin which can run on QGIS Server, by having a entrypoint serverClassFactory, see the documentation.', verbose_name='Server'), - ), - ]