Loading elections/admin.py +1 −1 Changes for elections/admin.py: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -101,7 +101,7 @@ class ElectionAdmin(NoQuerySetAdminActionsMixin, AdminActionFormsMixin): @optional_queryset_action() def card_printout(self, request, queryset, data): election = get_object_or_404(Election, pk=data["election"].id) return render(request, "printouts/card.html", context={"election":election, "iterateover":range(data["number_of_cards"]), "go_back_url":reverse("admin:elections_election_changelist")}) return render(request, "printouts/card.html", context={"election":election, "iterateover":range(data["number_of_cards"]), "go_back_url":reverse("admin:elections_election_changelist"), "print_description":data["print_description"]}) actions = ["card_printout"] Loading elections/forms.py +4 −0 Changes for elections/forms.py: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -6,3 +6,7 @@ from elections.models import Election class CardPrintoutActionForm(AdminActionForm): election = forms.ModelChoiceField(Election.objects, label="Głosowanie") number_of_cards = forms.IntegerField(label="Liczba kart", min_value=1) print_description = forms.BooleanField(label="Drukuj opis", required=False, initial=True) class Meta: confirm_button_text = "Drukuj" No newline at end of file elections/templates/printouts/card.html +11 −14 Changes for elections/templates/printouts/card.html: 11 added lines, 14 removed lines. Original line number Diff line number Diff line Loading @@ -22,7 +22,7 @@ } .header h1 { font-size: 22px; font-size: 16px; margin: 0 0 5px 0; letter-spacing: 1px; } Loading @@ -36,7 +36,7 @@ .instructions h3 { margin: 0 0 5px 0; font-size: 14px; font-size: 11px; text-transform: uppercase; } Loading @@ -45,7 +45,7 @@ align-items: center; border: 1px solid #000; margin-top: -1px; padding: 15px; padding: 8px; background: #fff; } Loading @@ -58,20 +58,15 @@ } .visual-checkbox { width: 28px; height: 28px; width: 24px; height: 24px; border: 2px solid #000; background: #fff; box-sizing: border-box; } .option-details { padding-left: 15px; flex-grow: 1; } .candidate-name { font-size: 18px; font-size: 16px; font-weight: bold; margin: 0; } Loading Loading @@ -112,7 +107,7 @@ margin-bottom: 10px; border: 2px solid #000; box-shadow: none; padding: 15px; padding: 10px; max-width: 100%; page-break-inside: avoid; break-inside: avoid; Loading @@ -120,8 +115,8 @@ .instructions { border: 1px solid #000; padding: 15px; margin-bottom: 20px; padding: 7px; margin-bottom: 10px; font-size: 13px; background-color: #fff; } Loading @@ -138,7 +133,9 @@ <div class="voting-card"> <div class="header"> <h1>{{election.name}}</h1> {% if print_description and election.description %} <h2>{{election.description}}</h2> {% endif %} </div> {% if election.paper_card_instruction %} Loading Loading
elections/admin.py +1 −1 Changes for elections/admin.py: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -101,7 +101,7 @@ class ElectionAdmin(NoQuerySetAdminActionsMixin, AdminActionFormsMixin): @optional_queryset_action() def card_printout(self, request, queryset, data): election = get_object_or_404(Election, pk=data["election"].id) return render(request, "printouts/card.html", context={"election":election, "iterateover":range(data["number_of_cards"]), "go_back_url":reverse("admin:elections_election_changelist")}) return render(request, "printouts/card.html", context={"election":election, "iterateover":range(data["number_of_cards"]), "go_back_url":reverse("admin:elections_election_changelist"), "print_description":data["print_description"]}) actions = ["card_printout"] Loading
elections/forms.py +4 −0 Changes for elections/forms.py: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -6,3 +6,7 @@ from elections.models import Election class CardPrintoutActionForm(AdminActionForm): election = forms.ModelChoiceField(Election.objects, label="Głosowanie") number_of_cards = forms.IntegerField(label="Liczba kart", min_value=1) print_description = forms.BooleanField(label="Drukuj opis", required=False, initial=True) class Meta: confirm_button_text = "Drukuj" No newline at end of file
elections/templates/printouts/card.html +11 −14 Changes for elections/templates/printouts/card.html: 11 added lines, 14 removed lines. Original line number Diff line number Diff line Loading @@ -22,7 +22,7 @@ } .header h1 { font-size: 22px; font-size: 16px; margin: 0 0 5px 0; letter-spacing: 1px; } Loading @@ -36,7 +36,7 @@ .instructions h3 { margin: 0 0 5px 0; font-size: 14px; font-size: 11px; text-transform: uppercase; } Loading @@ -45,7 +45,7 @@ align-items: center; border: 1px solid #000; margin-top: -1px; padding: 15px; padding: 8px; background: #fff; } Loading @@ -58,20 +58,15 @@ } .visual-checkbox { width: 28px; height: 28px; width: 24px; height: 24px; border: 2px solid #000; background: #fff; box-sizing: border-box; } .option-details { padding-left: 15px; flex-grow: 1; } .candidate-name { font-size: 18px; font-size: 16px; font-weight: bold; margin: 0; } Loading Loading @@ -112,7 +107,7 @@ margin-bottom: 10px; border: 2px solid #000; box-shadow: none; padding: 15px; padding: 10px; max-width: 100%; page-break-inside: avoid; break-inside: avoid; Loading @@ -120,8 +115,8 @@ .instructions { border: 1px solid #000; padding: 15px; margin-bottom: 20px; padding: 7px; margin-bottom: 10px; font-size: 13px; background-color: #fff; } Loading @@ -138,7 +133,9 @@ <div class="voting-card"> <div class="header"> <h1>{{election.name}}</h1> {% if print_description and election.description %} <h2>{{election.description}}</h2> {% endif %} </div> {% if election.paper_card_instruction %} Loading