diff --git a/flake.nix b/flake.nix index f8c1cf5..4e34de1 100644 --- a/flake.nix +++ b/flake.nix @@ -95,7 +95,5 @@ packages = { inherit start; }; defaultPackage.x86_64-linux = start; - nixosModule = (import ./module.nix); - }; } diff --git a/froide_govplan/templates/cms/mypage.html b/froide_govplan/templates/cms/mypage.html index 3f17019..cc3597a 100644 --- a/froide_govplan/templates/cms/mypage.html +++ b/froide_govplan/templates/cms/mypage.html @@ -329,11 +329,13 @@ function Xe() { a.open(r, o, !0), a.setRequestHeader("Content-type", "application/x-www-form-urlencoded"), a.setRequestHeader("X-Requested-With", "XMLHttpRequest"), a.onload = () => { var l, u; if (e.dataset.modalcontainer) { - const modalElement = document.querySelector(e.dataset.modalcontainer); - if (modalElement) { - const modal = new bootstrap.Modal(modalElement); - modal.show(); - } + const d = document.querySelector(e.dataset.modalcontainer); + d != null && (new $(d).show(), console.log("got modal")); + + const modalElement = document.getElementById('govplan-searchmodal-275111'); + const modal = new bootstrap.Modal(modalElement); + modal.show(); + } else if (e.dataset.modal) { const d = document.getElementById(e.dataset.modal); (l = d == null ? void 0 : d.dataset) != null && l.bsTarget && ((u = $.getInstance(document.querySelector(d.dataset.bsTarget))) == null || u.hide()) diff --git a/froide_govplan/templates/froide_govplan/base.html b/froide_govplan/templates/froide_govplan/base.html index 4fca08f..5816ccc 100644 --- a/froide_govplan/templates/froide_govplan/base.html +++ b/froide_govplan/templates/froide_govplan/base.html @@ -6,51 +6,9 @@ {% block body %} @@ -117,54 +75,53 @@ - + - - VerwaltungsTracker + + VerwaltungsTracker - - - + Status filtern - nicht begonnen - begonnen - teilweise umgesetzt - umgesetzt - zurückgestellt + + nicht begonnen + + begonnen + + teilweise umgesetzt + + umgesetzt + + zurückgestellt + - Suchen + + Suchen + - + + + - - - - - - - - - - - - - - - - - - Suchen + + + + + + Suchergebnisse + + - - + + + + + + @@ -280,32 +237,4 @@ - - - - - Suchergebnisse - - - - - - - - - - - - - - Suchergebnisse - - - - - - - - - {% endblock body %} \ No newline at end of file diff --git a/froide_govplan/templates/froide_govplan/detail.html b/froide_govplan/templates/froide_govplan/detail.html index 2eb3ed2..e1df6dc 100644 --- a/froide_govplan/templates/froide_govplan/detail.html +++ b/froide_govplan/templates/froide_govplan/detail.html @@ -25,7 +25,7 @@ {% endblock meta %} {% block app_body %} - {{ object.title }} + {{ object.title }} diff --git a/module.nix b/module.nix deleted file mode 100644 index 8fafa5c..0000000 --- a/module.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - config, - lib, - pkgs, - options, - ... -}: -let - - cfg = config.services.verwaltungstracker; - -in -{ - - options = { - services.verwaltungstracker = { - - enable = lib.mkEnableOption "Verwaltungstracker web app"; - - } // options.services.froide-govplan.settings; - }; - - config = lib.mkIf cfg.enable { - - nixpkgs.overlays = [ - (self: super: { - froide-govplan = super.froide-govplan.overridePythonAttrs (oldAttrs: { - src = pkgs.fetchFromGitea { - domain = "git.project-insanity.org"; - owner = "onny"; - repo = "verwaltungstracker"; - rev = "e5acfdf19d5af71bc5223c72713c128f3948f39f"; - hash = "sha256-SRxPKherMz9xv/1XZjmwYg74r7Qln+vfLWgHyG5RbxQ="; - }; - dependencies = oldAttrs.dependencies ++ [ oldAttrs.passthru.python.pkgs.mastodon-py ]; - passthru = oldAttrs.passthru // { - pythonPath = "${pkgs.python3.pkgs.makePythonPath [pkgs.python3.pkgs.mastodon-py]}:${oldAttrs.passthru.pythonPath}"; - }; - }); - }) - ]; - - services.froide-govplan = { - enable = true; - settings = cfg.settings; - }; - - }; - - meta = { - maintainers = with lib.maintainers; [ onny ]; - }; -}