fixes in design of nordic free software award page

svn path=/branches/test/; revision=24410
This commit is contained in:
2012-09-21 00:40:38 +00:00
parent b5e46a492a
commit c297e4d1ba
2 changed files with 36 additions and 40 deletions
@@ -9,46 +9,42 @@
<h1>Nordic Free Software Award</h1>
<p>
The Nordic Free Software Award is given to people, projects or organisations in the Nordic countries that have made a prominent contribution to the advancement of Free Software. The award will be announced in November 2012.
The Nordic Free Software Award is given to people, projects or organisations in the nordic countries that have made a prominent contribution to the advancement of Free Software. The award will be announced in November 2012.
</p>
<p>
<h2>Nominate</h2>
<form class="labeledform" id="nfsa-award" method="post" action="/cgi-bin/nfsa-nominate.pl" accept-charset="utf-8">
To nominate a person, please enter information about this person.
<!-- Translators: please set the value for the language to your language code -->
<input type="hidden" name="language" value="en" />
<span class="formlabel">First name, Last name:</span>
<input type="text" name="firstname" placeholder="First Name" size="20" />
<input type="text" name="lastname" placeholder="Last Name" size="20" /><br/>
<span class="formlabel">Short Biography:</span>
<textarea name="biography" rows="6" cols="40"></textarea><br/>
<span class="formlabel">Website:</span>
<input type="text" name="website" placeholder="Email" size="40" /><br/>
<h2>Nominate</h2>
<form class="labeledform" id="nfsa-award" method="post" action="/cgi-bin/nfsa-nominate.pl" accept-charset="utf-8">
To nominate a person, please enter information about this person.<br />
<!-- Translators: please set the value for the language to your language code -->
<input type="hidden" name="language" value="en" />
<span class="formlabel">First name, Last name:</span>
<input type="text" name="firstname" placeholder="First Name" size="20" />
<input type="text" name="lastname" placeholder="Last Name" size="20" /><br/>
<span class="formlabel">Short Biography:</span>
<textarea name="biography" rows="6" cols="40"></textarea><br/>
<span class="formlabel">Motivation:</span>
<textarea name="motivation" rows="4" cols="40"></textarea><br/>
<span class="formlabel">Website:</span>
<input type="text" name="website" placeholder="Email" size="40" /><br/>
<span class="formlabel">Email:</span>
<input type="text" name="email" placeholder="Email" size="40" /><br/>
<span class="formlabel">Phone:</span>
<input type="text" name="phone" placeholder="Telephone Number" size="40" /><br/>
<span class="formlabel">Postal Address:</span>
Street:<input type="text" name="street" size="40" /><br/>
City, Zip:<input type="text" name="city" size="40" /><br/>
Country:<input type="text" name="country" size="40" /><br/>
<h3>Contact</h3>
Please enter at least either the email address, or the phone number, or the full postal address of the person you want to nominate. <br />
<span class="formlabel">Email:</span>
<input type="text" name="email" placeholder="Email" size="40" /><br/>
<span class="formlabel">Phone:</span>
<input type="text" name="phone" placeholder="Telephone Number" size="40" /><br/>
<span class="formlabel">Street, No.:</span>
<input type="text" name="street" size="40" /><br/>
<span class="formlabel">City, Zip:</span>
<input type="text" name="city" size="40" /><br/>
<span class="formlabel">Country:</span>
<input type="text" name="country" size="40" /><br/>
<span class="formlabel">Motivation:</span>
<textarea name="motivation" rows="4" cols="40"></textarea><br/>
<input type="submit" name="url" value="I am a spam robot" style="display:none;" />
<!-- Translators: please translate the label of this button (the value field) -->
<input type="submit" name="dothis" value="Order now!"/>
<input type="submit" name="url" value="I am a spam robot" style="display:none;" /><br/>
</form>
Send an email to award [AT] fscons.org (moderated mailing list) with
the following information:
* Name of nominee
* Bio of nominee
* Website
* Contact info
* Motivation
<input type="submit" name="url" value="I am a spam robot" style="display:none;" />
<!-- Translators: please translate the label of this button (the value field) -->
<input type="submit" name="dothis" value="Order now!"/>
<input type="submit" name="url" value="I am a spam robot" style="display:none;" /><br/>
</form>
</p>
<p>
<h2>Previous Award winners</h2>
+4 -4
View File
@@ -40,11 +40,11 @@ if (
) {
#send mail
open(MAIL, "|/usr/lib/sendmail -t -f $email");
open(MAIL, "|/usr/lib/sendmail -t -f noreply\@fsfe.org");
print MAIL
"Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
From: $email
From: noreply\@fsfe.org
To: paul\@fsfe.org
Subject: [NFSA Nomination] $reference $firstname $lastname
@@ -70,9 +70,9 @@ Preferred language was: $lang
";
close MAIL;
print "Location: http://fsfe.org/activities/nordic-free-software-award/nfsa-nominate-thanks.$lang.html\n\n";
print "Location: http://test.fsfe.org/activities/nordic-free-software-award/nfsa-nominate-thanks.$lang.html\n\n";
} else {
#something was wrong with the input
print "Location: http://fsfe.org/activities/nordic-free-software-award/nfsa-nominate-error.$lang.html\n\n";
print "Location: http://test.fsfe.org/activities/nordic-free-software-award/nfsa-nominate-error.$lang.html\n\n";
}