diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 5dd5842..0000000 --- a/flake.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - description = "Invoiceplane invoice template development shell"; - - inputs.nixpkgs.url = "nixpkgs/master"; - - outputs = { self, nixpkgs, ... }@inputs: - let - pkgs = nixpkgs.legacyPackages.x86_64-linux; - start = - pkgs.writeShellScriptBin "start" '' - set -e - export NIXPKGS_ALLOW_INSECURE=1 - export QEMU_NET_OPTS="hostfwd=tcp::8080-:80" - ${pkgs.nixos-shell}/bin/nixos-shell --flake . - ''; - in { - nixosConfigurations.vm = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs.inputs = inputs; - pkgs = import nixpkgs { - overlays = [ - (self: super: { - froide-govplan = super.froide-govplan.overridePythonAttrs (oldAttrs: rec { - src = ./.; - #pkgs.fetchFromGitHub { - # owner = "onny"; - # repo = "froide-govplan"; - # rev = "81697ce37cfdee7b5d0f667c50b13062ed9786c3"; - # hash = "sha256-ooHGlCKgZL+TMh6OtopKtbkV0MhT4udLCOIC+C3Ytdw="; - #}; - - dependencies = oldAttrs.dependencies ++ [ oldAttrs.passthru.python.pkgs.mastodon-py ]; - - postInstall = oldAttrs.postInstall + '' - rm -r $out/${pkgs.python3.sitePackages}/froide_govplan/templates - ln -sf /var/lib/froide-govplan/templates $out/${pkgs.python3.sitePackages}/froide_govplan/templates - cp -r froide_govplan/static $out/${pkgs.python3.sitePackages}/froide_govplan/ - ''; - }); - }) - ]; - }; - modules = [ - ({ lib, config, pkgs, ... }: { - - virtualisation = { - memorySize = 8000; - diskSize = 4096; - cores = 4; - }; - - disabledModules = [ "services/web-apps/froide-govplan.nix" ]; - - imports = [ ./froide-govplan.nix ]; - - services.froide-govplan = { - enable = true; - package = pkgs.froide-govplan; - settings = { - DEBUG = lib.mkForce true; - CSRF_TRUSTED_ORIGINS = [ "http://localhost:8080" ]; - MASTODON_ACCESS_TOKEN = "WvUND5mp_tPQ9dgMrKWVXpUbP2gKpxRD3ejg10z74pg"; - MASTODON_API_BASE_URL = "https://social.project-insanity.org"; - }; - }; - - nixos-shell.mounts.extraMounts = { - "/var/lib/froide-govplan/templates" = { - target = /home/onny/projects/froide-govplan/froide_govplan/templates; - cache = "none"; - }; - }; - - system.stateVersion = "25.05"; - services.getty.autologinUser = "root"; - }) - ]; - }; - - packages = { inherit start; }; - defaultPackage.x86_64-linux = start; - - }; -} - diff --git a/froide_govplan/static/froide_govplan/images/mastodon-footer.svg b/froide_govplan/static/froide_govplan/images/mastodon-footer.svg new file mode 100644 index 0000000..d27f75d --- /dev/null +++ b/froide_govplan/static/froide_govplan/images/mastodon-footer.svg @@ -0,0 +1 @@ + diff --git a/froide_govplan/templates/cms/mypage.html b/froide_govplan/templates/cms/mypage.html index fce957d..e933ab9 100644 --- a/froide_govplan/templates/cms/mypage.html +++ b/froide_govplan/templates/cms/mypage.html @@ -139,6 +139,17 @@ .mx-auto { max-width: 1320px; } + + .bg-gray-700 { + background-color: rgba(55,65,81,1); + border-color: transparent; + border-radius: .375rem; + color: rgba(249,250,251,1); + font-size: .875rem; + line-height: 1.25rem; + text-decoration: none; + display: inline-flex; + } {% block extra_css %} {% endblock %} diff --git a/froide_govplan/templates/froide_govplan/base.html b/froide_govplan/templates/froide_govplan/base.html index 04f49a4..ce263cb 100644 --- a/froide_govplan/templates/froide_govplan/base.html +++ b/froide_govplan/templates/froide_govplan/base.html @@ -106,8 +106,8 @@
- - @verwaltungstracker on Mastodon + + Follow us on Mastodon
diff --git a/froide_govplan/templates/froide_govplan/detail.html b/froide_govplan/templates/froide_govplan/detail.html index 3c221cd..65dfbe5 100644 --- a/froide_govplan/templates/froide_govplan/detail.html +++ b/froide_govplan/templates/froide_govplan/detail.html @@ -156,10 +156,9 @@

-
{% include "froide_govplan/plugins/updates.html" with wrapper_classes="col col-12 col-lg-6 d-flex mb-4" %} {% if government.active %} -
+

Neue Entwicklung melden

diff --git a/froide_govplan/templates/froide_govplan/plugins/updates.html b/froide_govplan/templates/froide_govplan/plugins/updates.html index 3be1917..9735184 100644 --- a/froide_govplan/templates/froide_govplan/plugins/updates.html +++ b/froide_govplan/templates/froide_govplan/plugins/updates.html @@ -244,6 +244,5 @@

{% endfor %} -
{% endif %} \ No newline at end of file