[openstreetmap-website] Time slider2 (#774)

[JaimeLynSchatz]

The time_slider can be used to select a year, but won't render anything for that time frame *yet*. The code needs a review/reality check.
You can merge this Pull Request by running:

  git pull https://github.com/OpenHistoricalMap/ohm-website time_slider2

Or you can view, comment on it, or merge it online at:

  https://github.com/openstreetmap/openstreetmap-website/pull/774

-- Commit Summary --

  * Syncing the new OHM repo with old changes. Adding layers and fixing text.
  * Cherry pick jeff's ohm commit on top of latest osm master, with additional string changes and fixes
  * Change strings to openhistoricalmap, replace image used in rss feeds etc
  * merge to master
  * Dont display OSM & OSMF specific contributor terms. Put in simple placeholder text for the moment. fixes #13
  * Disable Bing imagery and Mapbox Satellite on iD editor  - choosing open aerail as default. refs #13
  * remove old non working layers. Promote historical map tiles to first / default
  * change some id strings and id locale strings to say openhistoricalmap
  * bring back 2008 and 2009 layers to site
  * first commit of time_slider2 branch - WIP
  * add ts files to index.js
  * remove duplicative div with class of query_wraper
  * mod to console.logs for error checking
  * Allow for multiple sliders, fix slider code being executed twice
  * Merge branch 'time_slider2' of https://github.com/JaimeLynSchatz/ohm-website into time_slider2
  * another attempt at the timeslider hook
  * undo hairbrained scheme in early stage
  * small tweak to outer nubs and day/month data-step text boxes
  * ya attempt to capture start_year from data-step input
  * another attempt to capture start_year from data-step input
  * take 12 with link_to for Time Search
  * syntax error fix?
  * another error: unexpected tIDENTIFIER, expecting ')'
  * fails on second tag
  * no errors but still not correct
  * back to ground zero
  * cosmetic change
  * possibly on right track with nested form
  * attempt at workaround to force form button to submit even for same location
  * workaround failed - hangs on search
  * old fashioned debugging with alerts
  * coding edison-style, I know what won't work
  * strip out old console.log statements
  * wild idea to make time search button work when clicked
  * typo fix and put id in span
  * # goes in the quotations
  * using deprecated syntax for .click(function)
  * further syntax fix
  * try first-child to select the button
  * the :selected selector seemed like a good idea at the time
  * :select didn't work
  * mimicking the current .search_form behavior for .time_search
  * data-step = year
  * nested forms == no
  * need controller method here
  * the query is returning nil here
  * tracking returning nil error
  * getting query value but crashes in geocoder query type if/elsif block
  * baby steps to the query delivering the start_year data
  * what's under the hood in index.js when we call this.search
  * yes, JS, puts is an unexpected identifier
  * mimicking the router call for locational search - not DRY
  * taking a step back and looking under the hood of the router call for time_search
  * two steps forward with router call
  * pull out code that broke the location search
  * move year match regex **below** zip/postal codes
  * hack to force interpretation as year and not postal code
  * modify regex for years to accomodate ce/bce, etc
  * add action for search_start_year
  * add search_start_year to routes.rb
  * shot in the dark to produce something when querying start_year
  * failed attempt at having something to render for search_start_year
  * changed results syntax to no avail
  * breadcrumbs
  * capture query from params[];
  * trying to redirect start_year_search to google.com
  * need to use the search portion of the url
  * comment out code - last resort to see why full url is still running
  * found a workaround for the route 500 server error
  * first attempt at wikidata api
  * another attempt at using api written in php
  * small change, left off assignment
  * revert to modded error message to show query being used, new way only uses Nominatum
  * one big toe into rendering?

-- File Changes --

    M app/assets/images/favicon.ico (0)
    M app/assets/images/mag_map-rss2.0.png (0)
    M app/assets/images/osm_logo.png (0)
    M app/assets/javascripts/embed.js.erb (2)
    M app/assets/javascripts/index.js (13)
    M app/assets/javascripts/leaflet.map.js.erb (42)
    M app/assets/javascripts/osm.js.erb (3)
    A app/assets/javascripts/ts_main.js (69)
    A app/assets/javascripts/ts_slider.js (207)
    M app/assets/stylesheets/common.css.scss (43)
    M app/assets/stylesheets/parameters.scss (3)
    A app/assets/stylesheets/time_slider.css (42)
    M app/controllers/geocoder_controller.rb (23)
    M app/views/api/permissions.builder (2)
    M app/views/diary_entry/rss.rss.builder (4)
    M app/views/export/embed.html.erb (2)
    M app/views/layouts/_head.html.erb (4)
    M app/views/layouts/_header.html.erb (2)
    M app/views/layouts/_search.html.erb (13)
    M app/views/site/about.html.erb (6)
    M app/views/user/terms.html.erb (6)
    M config/example.application.yml (12)
    M config/locales/en.yml (88)
    M config/routes.rb (1)
    M db/structure.sql (31)
    M vendor/assets/iD/iD.js (73)
    M vendor/assets/iD/iD/locales/en.json (18)
    M vendor/assets/leaflet/leaflet.osm.js (21)

-- Patch Links --

https://github.com/openstreetmap/openstreetmap-website/pull/774.patch
https://github.com/openstreetmap/openstreetmap-website/pull/774.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/774
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstreetmap.org/pipermail/rails-dev/attachments/20140704/1c65fb66/attachment-0001.html>