Merge pull request #110 from JulianNorton/development

Development

README.md

@@ -42,5 +42,6 @@ Open source, General Public License v2. Basically do whatever you want with it.
 
 ### Misc
 * [EJS template tutorial](http://www.embeddedjs.com/getting_started.html#create_template)
+* [EJS github repo](https://github.com/mde/ejs)
 * [Sublime text syntax package for `.ejs` files](https://packagecontrol.io/packages/EJS%202)
 * Use [EditorConfig](http://editorconfig.org/) to maintain a consistent coding style between contributors. See [EditorConfig plugins](http://editorconfig.org/#download).

views/partials/change-location.ejs

@@ -3,8 +3,15 @@
   <form action="/" method="get">
     <label for="change-location">Enter a city, place, or zipcode</label>
     <span class="flex wrap m-b-xs">
-      <input type="search" id="change-location" name="location" placeholder="New York, NY" />
+      <% if (typeof error == "undefined") { %>
+        <%# If there's no page error %>
+        <input type="search" id="change-location" name="location" placeholder="<%- params.formatted_location %>"/>
+        <% } else { %>
+        <%# If this is the error page, don't use the location for the placeholder %>
+        <input type="search" id="change-location" name="location" placeholder="New York, NY"/>
+      <% } %>
       <button class="btn large" type="submit">Change location</button>
     </span>
   </form>
 </nav>
+