FSFE/fsfe-website
28
32
Fork 93
Code Issues 64 Pull Requests 13 Wiki Activity

refactor: rename selections, add a new selection, require specifics for custom (#5296)
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #5296
Co-authored-by: hl <hl@fsfe.org>
Co-committed-by: hl <hl@fsfe.org>
This commit was merged in pull request #5296.
This commit is contained in:
hl
2025-09-11 12:31:47 +00:00
committed by tobiasd
parent 7cd71b4990
commit 32a38cf5a4
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fsfe.org/cgi-bin/promotion.php
View File

@@ -137,14 +137,16 @@ $msg_to_staff .= "{$_POST['street']}\n" .
"\n" .
"Specifics of the Order:\n";
# Default or custom package?
if ($_POST['packagetype'] == 'standard') {
$msg_to_staff .= "Standard package: Something from everything listed here, depending on size, language selection and availability.\n";
} else if ($_POST['packagetype'] == 'standardplus') {
$msg_to_staff .= "Standard Plus package: Something from everything listed here, depending on size, language selection and availability.\n";
if ($_POST['packagetype'] == 'basic_sticker') {
$msg_to_staff .= "My Laptop: Basic Set of Stickers.\n";
} else if ($_POST['packagetype'] == 'basic_combo') {
$msg_to_staff .= "Postcards and Stickers.\n";
} else if ($_POST['packagetype'] == 'basicsticker') {
$msg_to_staff .= "Small package with stickers.\n";
} else if ($_POST['packagetype'] == 'basicpostcard') {
$msg_to_staff .= "Small package with stickers and postcards.\n";
} else if ($_POST['packagetype'] == 'more_stickers') {
$msg_to_staff .= "Stickers for me and my friend: Twice the amount of our most popular stickers.\n";
} else if ($_POST['packagetype'] == 'standard') {
$msg_to_staff .= "Standard Package.\n";
} else {
$msg_to_staff .= "Custom package:\n" .
"{$_POST['specifics']}\n";

7
fsfe.org/contribute/spreadtheword.en.xhtml
View File

@@ -101,13 +101,14 @@ On this page, you'll find an overview of our available materials and detailed in
<legend>Compose your package</legend>
<div>
<span class="formlabel">Package selection*:</span>
<label for="basicsticker"><input type="radio" name="packagetype" id="basicsticker" value="basicsticker" required="required"/>Basic: Our most popular stickers.</label>
<label for="basicpostcard"><input type="radio" name="packagetype" id="basicpostcard" value="basicpostcard" required="required"/>Basic Plus: Our most popular stickers and some of our postcards.</label>
<label for="basicsticker"><input type="radio" name="packagetype" id="basicsticker" value="basicsticker" required="required"/>My Laptop: Our most popular stickers.</label>
<label for="basicpostcard"><input type="radio" name="packagetype" id="basicpostcard" value="basicpostcard" required="required"/>I Want Postcards: Our most popular postcards.</label>
<label for="morestickers"><input type="radio" name="packagetype" id="morestickers" value="morestickers" required="required"/>Stickers for me and my friend: Twice the amount of our most popular stickers.</label>
<label for="standard"><input type="radio" name="packagetype" id="standard" value="standard" required="required"/>Standard: The basic FSFE promotional material kit with all of our stickers, postcards, and posters. Select <em>Custom</em> if you would like to set preferences.</label>
<div>
<label for="custom"><input type="radio" name="packagetype" id="custom" value="custom" required="required"/>Custom: You can set preferences, e.g. specific campaigns or the type of promotion materials. Unfortunately we cannot guarantee to fulfill all wishes.
<div class="reveal">
<textarea name="specifics" rows="6" cols="40" placeholder="For example: Only leaflets explaining Free Software, no posters..."/>
<textarea name="specifics" rows="6" cols="40" placeholder="For example: Only leaflets explaining Free Software, no posters..." required="required"/>
</div>
</label>
</div>