Index: user/des/fbce/lib/FBCE/Controller/Run.pm
===================================================================
--- user/des/fbce/lib/FBCE/Controller/Run.pm	(revision 333691)
+++ user/des/fbce/lib/FBCE/Controller/Run.pm	(revision 333692)
@@ -1,129 +1,133 @@
 package FBCE::Controller::Run;
 use Moose;
 use namespace::autoclean;
 
 BEGIN { extends 'Catalyst::Controller' }
 
 =head1 NAME
 
 FBCE::Controller::Run - Catalyst Controller
 
 =head1 DESCRIPTION
 
 Catalyst Controller.
 
 =head1 METHODS
 
 =cut
 
 =head2 index
 
 =cut
 
 sub index :Path :Args(0) {
     my ($self, $c) = @_;
 
     my $user = $c->user->get_object();
     $c->stash(user => $user);
 }
 
 sub register :Local :Args(0) {
     my ($self, $c) = @_;
 
     my $user = $c->user->get_object();
     if ($c->stash->{'nominating'} != 0 || !$user->active) {
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
     }
     $c->stash(user => $user);
     if ($user->statement) {
 	$c->res->redirect($c->uri_for('/run/edit'));
 	$c->detach();
     }
     my $p = $c->req->params;
     if ($p->{cancel}) {
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
     }
-    if ($p->{submit}) {
+    if ($p->{submit} && $p->{long}) {
 	my $stmt = $c->model('FBCE::Statement')->
 	    new({ person => $user, short => $p->{short}, long => $p->{long} });
 	$stmt->insert()
 	    or die("failed to register");
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
+    } elsif ($p->{submit}) {
+	$c->stash(error => "You must provide a stamement!");
     }
     $c->stash(short => $p->{short});
     $c->stash(long => $p->{long});
 }
 
 sub edit :Local :Args(0) {
     my ($self, $c) = @_;
 
     my $user = $c->user->get_object();
     if ($c->stash->{'nominating'} != 0 || !$user->active) {
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
     }
     $c->stash(user => $user);
     if (!$user->statement) {
 	$c->res->redirect($c->uri_for('/run/register'));
 	$c->detach();
     }
     my $p = $c->req->params;
     if ($p->{cancel}) {
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
     }
     my $statement = $user->statement;
-    if ($p->{submit}) {
+    if ($p->{submit} && $p->{long}) {
 	$statement->update({ short => $p->{short}, long => $p->{long} })
 	    or die("failed to update");
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
+    } elsif ($p->{submit}) {
+	$c->stash(error => "You must provide a stamement!");
     }
     $c->stash(short => $p->{short} // $statement->short);
     $c->stash(long => $p->{long} // $statement->long);
 }
 
 sub withdraw :Local :Args(0) {
     my ($self, $c) = @_;
 
     my $user = $c->user->get_object();
     if ($c->stash->{'nominating'} != 0 || !$user->active) {
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
     }
     $c->stash(user => $user);
     if (!$user->statement) {
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
     }
     my $p = $c->req->params;
     if ($p->{cancel}) {
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
     }
     my $statement = $user->statement;
     if ($p->{submit}) {
 	$statement->delete()
 	    or die("failed to delete");
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
     }
 }
 
 =head1 AUTHOR
 
 Dag-Erling Smørgrav
 
 =head1 LICENSE
 
 This library is free software. You can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut
 
 __PACKAGE__->meta->make_immutable;
 
 1;
Index: user/des/fbce/root/run/edit.tt
===================================================================
--- user/des/fbce/root/run/edit.tt	(revision 333691)
+++ user/des/fbce/root/run/edit.tt	(revision 333692)
@@ -1,27 +1,30 @@
 [%-# $FreeBSD$ -%]
 [% PROCESS lib/html_top %]
 [% PROCESS lib/header %]
 [% WRAPPER lib/main %]
 
 [% PROCESS run/when %]
 
 [% IF !user.active %]
 <p>You are not qualified to run in the election.  If you believe this is incorrect, please contact the election administrator.</p>
 [% ELSIF nominating == 0 %]
+[% IF error != '' %]
+  <div class="error">[% error | html %]</div>
+[% END %]
 <form method="post" action="">
-  <p>Slogan</p>
+  <p>Slogan (optional)</p>
   <input name="short" size="80" maxlength="64" value="[% short | html %]"/>
-  <p>Statement (<a href="http://search.cpan.org/~chromatic/Text-WikiFormat-0.79/lib/Text/WikiFormat.pm#Wiki_Format">WikiFormat</a>)</p> 
+  <p>Statement (<a href="http://search.cpan.org/~chromatic/Text-WikiFormat-0.81/lib/Text/WikiFormat.pm#Wiki_Format">WikiFormat</a>)</p> 
   <textarea name="long" cols="80" rows="24">[% long | html %]</textarea>
   </fieldset>
   <div>
     <input type="submit" name="submit" value="Update my statement!"/>
     <input type="submit" name="cancel" value="No, I'm fine."/>
     <input type="reset" value="Undo"/>
   </div>
 </form>
 [% END %]
 
 [% END %]
 [% PROCESS lib/footer %]
 [% PROCESS lib/html_bottom %]
Index: user/des/fbce/root/run/register.tt
===================================================================
--- user/des/fbce/root/run/register.tt	(revision 333691)
+++ user/des/fbce/root/run/register.tt	(revision 333692)
@@ -1,32 +1,35 @@
 [%-# $FreeBSD$ -%]
 [% PROCESS lib/html_top %]
 [% PROCESS lib/header %]
 [% WRAPPER lib/main %]
 
 [% PROCESS run/when %]
 
 [% IF !user.active %]
 <p>You are not qualified to run in the election.  If you believe this is incorrect, please contact the election administrator.</p>
 [% ELSIF nominating == 0 %]
 <p>To register as a candidate in the election, enter the following information:</p>
 <ul>
   <li>A short slogan which will appear next to your name on the list of candidates and at the top of your candidate page;</li>
   <li>A longer statement about your background, why you are running and what you intend to do if elected.</li>
 </ul>
 <p>If you have a <a href="http://en.gravatar.com/">Gravatar</a>, it will appear next to your statement.</p>
 <form method="post" action="">
-  <p>Slogan</p>
-  <input name="short" size="80" maxlength="64" value="[% short | html %]"/>
+[% IF error %]
+  <div class="error">[% error | html %]</div>
+[% END %]
+  <p>Slogan (optional)</p>
+  <input name="short" size="64" maxlength="64" value="[% short | html %]"/>
   <p>Statement (<a href="http://search.cpan.org/~cycles/Text-WikiFormat-0.81/lib/Text/WikiFormat.pm#Wiki_Format">WikiFormat</a>)</p>
   <textarea name="long" cols="80" rows="24">[% long | html %]</textarea>
   <div>
     <input type="submit" name="submit" value="I choose to run!"/>
     <input type="submit" name="cancel" value="Ah, screw this."/>
     <input type="reset" value="Undo"/>
   </div>
 </form>
 [% END %]
 
 [% END %]
 [% PROCESS lib/footer %]
 [% PROCESS lib/html_bottom %]
Index: user/des/fbce/root/see/candidate.tt
===================================================================
--- user/des/fbce/root/see/candidate.tt	(revision 333691)
+++ user/des/fbce/root/see/candidate.tt	(revision 333692)
@@ -1,21 +1,23 @@
 [%-# $FreeBSD$ -%]
 [% USE WikiFormat %]
 [% PROCESS lib/html_top %]
 [% PROCESS lib/header %]
 [% WRAPPER lib/main %]
 
 <div class="candidate-header">
 <img class="candidate-portrait" src="[% candidate.gravatar(c.request.secure ? 'https' : 'http') | html %]?s=64&d=mm"/>
 <h2 class="candidate-name">[% candidate.name | html %] ([% candidate.login %])</h2>
 [% IF candidate.incumbent %]<p class="candidate-incumbent">(incumbent)</p>[% END %]
 </div>
 <div class="statement">
+[% IF candidate.statement.short %]
   <h3 class="statement-title">[% candidate.statement.short | wiki %]</h3>
+[% END %]
   <div class="statement-body">
     [% candidate.statement.long | wiki %]
   </div>
 </div>
 
 [% END %]
 [% PROCESS lib/footer %]
 [% PROCESS lib/html_bottom %]
Index: user/des/fbce/root/see/index.tt
===================================================================
--- user/des/fbce/root/see/index.tt	(revision 333691)
+++ user/des/fbce/root/see/index.tt	(revision 333692)
@@ -1,25 +1,25 @@
 [%-# $FreeBSD$ -%]
 [% PROCESS lib/html_top %]
 [% PROCESS lib/header %]
 [% WRAPPER lib/main %]
 
 [% IF nominating < 0 %]
   <p>The nomination period starts on [% INCLUDE lib/datetime dt=nominating_starts %].</p>
 [% ELSIF candidates.count == 0 %]
 <p>There are no candidates yet.</p>
 [% ELSE %]
 [% IF candidates.count == 1 %]
 <p>The following person has registered as a candidate in the election:</p>
 [% ELSE %]
 <p>The following [% candidates.count %] people have registered as candidates in the election:</p>
 [% END %]
 <ul>
   [% WHILE (candidate = candidates.next) %]
-  <li>[% candidate.name | html %][% IF candidate.incumbent %] (incumbent)[% END %]: <a href="[% c.uri_for('/see/candidate', candidate.login) | html %]">[% candidate.statement.short | html %]</a></li>
+  <li>[% candidate.name | html %][% IF candidate.incumbent %] (incumbent)[% END %]: <a href="[% c.uri_for('/see/candidate', candidate.login) | html %]">[% IF candidate.statement.short %][% candidate.statement.short | html %][% ELSE %]see statement[% END %]</a></li>
   [% END %]
 </ul>
 [% END %]
 
 [% END %]
 [% PROCESS lib/footer %]
 [% PROCESS lib/html_bottom %]