change to Journal theme and tweak text

kcivey · Jul 19, 2012 · 42dfd8c · 42dfd8c
1 parent 37bdad3
commit 42dfd8c
Show file tree

Hide file tree

Showing 3 changed files with 765 additions and 19 deletions.
diff --git a/web/css/bootstrap.min.css b/web/css/bootstrap.min.css
diff --git a/web/index.html b/web/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" xmlns="http://www.w3.org/1999/html">
   <head>
     <meta charset="utf-8"/>
     <title>Run for ANC</title>
@@ -9,7 +9,7 @@
     <link href="css/bootstrap.min.css" rel="stylesheet"/>
     <style>
       body {
-        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+        padding-top: 88px; /* to make the container go all the way to the bottom of the topbar */
       }
       .countdown {
         width: 240px;
@@ -39,7 +39,7 @@
   <body>
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="container-fluid">
           <a class="brand" href="/">Run for ANC</a>
           <ul class="nav pull-right">
             <li><a href="http://anc.dc.gov">Office of ANCs</a></li>
@@ -49,8 +49,8 @@
       </div>
     </div>
 
-    <div class="container">
-      <div class="row">
+    <div class="container-fluid">
+      <div class="row-fluid">
         <div class="span6">
           <div class="hero-unit">
             <h1>Run for ANC</h1>
@@ -59,8 +59,10 @@ <h1>Run for ANC</h1>
         </div>
         <div class="span6">
           <form action="/" id="form-anc" class="form-horizontal">
-            Your address: <input type="text" id="address"/>
-            <button type="submit" class="btn btn-primary">Go</button>
+            <p>Enter your address to find your single-member district (SMD) and commissioner
+            and see what candidates are running:</p>
+            <p><input type="text" id="address"/>
+            <button type="submit" class="btn btn-primary">Go</button></p>
           </form>
           <div id="info" class="hide">
             <p id="address-found">Your address was recognized as <strong class="canonical-address"></strong>.</p>
@@ -69,7 +71,8 @@ <h1>Run for ANC</h1>
             <p id="smd-changing">Your SMD will be changing to <strong class="smd-2012"></strong> as a result of redistricting.</p>
             <p id="smd-not-changing">You will remain in the same SMD after redistricting.</p>
             <div id="candidates">
-              <p>So far <span class="number-candidates"></span> candidate<span class="candidate-plural"></span> <span class="candidate-verb"></span> running in <span class="smd-2012"></span>:</p>
+              <p>So far <span class="number-candidates"></span> candidate<span class="candidate-plural"></span>
+              <span class="candidate-verb"></span> picked up petitions to run in <span class="smd-2012"></span>:</p>
               <ul></ul>
             </div>
             <p id="no-candidates">There are as yet no candidates running in <span class="smd-2012"></span>.</p>

diff --git a/web/js/anc.js b/web/js/anc.js
@@ -95,9 +95,13 @@ jQuery(function ($) {
             ul = div.find('ul').empty();
             div.find('.number-candidates').text(n);
             div.find('.candidate-plural').text(n == 1 ? '' : 's');
-            div.find('.candidate-verb').text(n == 1 ? 'is' : 'are');
+            div.find('.candidate-verb').text(n == 1 ? 'has' : 'have');
             $.each(data, function (i, c) {
-                $('<li/>').text(fullName(c)).appendTo(ul);
+                var text = fullName(c);
+                if (c.filing_date) {
+                    text += ' (filed)';
+                }
+                $('<li/>').text(text).appendTo(ul);
             });
             $('#candidates').show();
         }