[livejournal] r18096: LJSUP-7772: text on admin/comm/elections...

U   trunk/htdocs/admin/comm/elections.bml

Modified: trunk/htdocs/admin/comm/elections.bml
===================================================================
--- trunk/htdocs/admin/comm/elections.bml	2011-01-25 04:41:46 UTC (rev 18095)
+++ trunk/htdocs/admin/comm/elections.bml	2011-01-25 05:09:26 UTC (rev 18096)
@@ -21,9 +21,9 @@
     $ret .= "<form method='POST'>\n";
     $ret .= LJ::form_auth();
 
-    $ret .= "Find election: ";
+    $ret .= "<p><label for='comm_name'><strong>Find election:</strong></label>&nbsp;";
     my $comm_name = $POST{'comm_name'} ? $POST{'comm_name'} : '';
-    $ret .= "<input type='text' name='comm_name' value='$comm_name'>";
+    $ret .= "<input type='text' id='comm_name' name='comm_name' value='$comm_name'/>";
 
     $ret .= "&nbsp;" . LJ::html_submit('search', 'Search') . "</p>";
 
@@ -56,8 +56,8 @@
                 my @qs = $poll->questions;
                 my @items = $qs[0]->items;
 
-                $ret .= "Active election:<br/>";
-                $ret .= "Election period: from $create_time to $close_time<br/><br/>";
+                $ret .= "<br/><h3>Active election:</h3>";
+                $ret .= "<p>Election period: from $create_time to $close_time</p>";
 
                 my $maintainers = LJ::load_rel_user($comm->{userid}, 'A');
                 my $users = LJ::load_userids(@$maintainers);
@@ -68,7 +68,7 @@
                     }
                 }
 
-                $ret .= "Maintainers (participants of the election): " . @alive_mainteiners . "<br/>";
+                $ret .= "<p>Maintainers (participants of the election): " . @alive_mainteiners . "</p>";
 
                 my $sth;
                 my $dbr = LJ::get_db_reader();
@@ -89,16 +89,17 @@
                     $i++;
                 }
 
-                $ret .= "Maintainers (voted already): " . $i . "<br/>";
+                $ret .= "<p>Maintainers (voted already): " . $i . "</p>";
 
-                $ret .= "<br/>Current state of election: <br/>";
+                $ret .= "<br/><h3>Current state of election:</h3>";
+		$ret .= "<ul style='padding:0;list-style:none;'>";
                 foreach my $u (values %$users) {
                     my $vote_for = $items[$result_users{$u->userid} - 1]->{item};
                     LJ::Poll->clean_poll(\$vote_for);
-                    $ret .= LJ::ljuser($u) . " - " . ( $result_users{$u->userid} ? " voted for " . $vote_for : " not voted yet ") . "<br/>";
+                    $ret .= "<li>" . LJ::ljuser($u) . " &mdash; " . ( $result_users{$u->userid} ? " voted for " . $vote_for : " not voted yet ") . "</li>";
                 }
 
-                $ret .= "";
+                $ret .= "</ul>";
 
             }