A lot of style updates and a bit of functionality update. Cleared out foundation remnants to use bootstrap instead. Restyled event list, menu, mostly fixed front page. We can now save future dates. Brought back google maps autocomplete, with map on edit if there's already an address. Maps display on event pages, initially static map that gets replaced with a js map. edit form in progress. Parsing date input in progress. Styles from Daniella on event/show. More things.

A lot of style updates and a bit of functionality update. Cleared out foundation remnants to use bootstrap instead. Restyled event list, menu, mostly fixed front page. We can now save future dates. Brought back google maps location search. Probably want to include a live map on the form. Need to make sure we're saving lat/long. I probably did some more things, too.

styles

more styles! and restructuring files. probably needs more scoping so things only get iterpreted in the proper place

some cleanup and defining field types as email and tel when editing email and telephone nunmbers

more cleanup

ignore date on time_select, parse date coming in from date_field so rails can combine it with time_select, fix floats

fixed tests, scoped a js, made sure admin-created events parse dates, moving in the direction of better semantic markup for button actions without text

actually get lat and lon from a google place search, and iterate through array to find and assign the city. we probably will want to do this for all the address_components

created a global .red-banner style for everywhere we use the red banner

merged in daniella's work on the event/show and some updates

bring in daniella's work on event/show with a bit of updating

bringing in some hidden address fields to update them by parsing the location result from google.

allow some fields to be saved

change in event/index markup to bring in red-banner styles

on the edit form we'll show a map with the current location if there is one, or of madison in general if not, and update that map based on user input

udpate flash markup to use boostrap defaults

add read more link on lists

remove binding

not using default form on event edit page since we want to mirror the layout of the single event page is possible. this might be a bad idea.

sort upcoming events ascending so that those about to happen are first

update scoping so we don't overlap periods

rearranged some content on the event view, but more significantly brought in a map showing actual location. First we load in a static map tile from google, based on event lat lng, but then we enhance it with a js interactable map. we should probably have the static map link somewhere, like that spot on google maps.

styles

include event actions on event

updated a test

check for current user before checking for methods on the current user. also rearranged text and icons on event actions buttons

changed zoom level on map, for consistency

styles

trying to handle date parsing when date is incomplete. still problematic

add link around static map, check for org before printing org info, proper event reference on attendance link

add object-fit declaration on inline styles so static map isn't squished

Author: mbrakken

Gemfile

@@ -11,7 +11,6 @@ gem 'jquery-ui-rails'
 gem 'turbolinks'
 gem 'pry-rails'
 gem 'haml-rails'
-gem 'foundation-rails'
 gem 'omniauth'
 gem 'omniauth-facebook'
 gem 'omniauth-twitter'
@@ -36,6 +35,7 @@ gem 'sidekiq'
 gem 'sidekiq-failures'
 gem 'coveralls', require: false
 gem 'bootstrap-sass'
+gem 'rails_autolink'
 
 
 # Don't require so Object does not get all Sintra DSL methods

Gemfile.lock

@@ -102,9 +102,6 @@ GEM
     figaro (0.7.0)
       bundler (~> 1.0)
       rails (>= 3, < 5)
-    foundation-rails (5.2.0.0)
-      railties (>= 3.1.0)
-      sass (>= 3.2.0)
     google-api-client (0.7.1)
       addressable (>= 2.3.2)
       autoparse (>= 0.3.3)
@@ -233,6 +230,8 @@ GEM
     rails_12factor (0.0.2)
       rails_serve_static_assets
       rails_stdout_logging
+    rails_autolink (1.1.5)
+      rails (> 3.1)
     rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
     railties (4.0.3)
@@ -352,7 +351,6 @@ DEPENDENCIES
   email_spec
   factory_girl_rails
   figaro
-  foundation-rails
   google-api-client
   haml-rails
   httparty
@@ -376,6 +374,7 @@ DEPENDENCIES
   rails (= 4.0.3)
   rails3-jquery-autocomplete
   rails_12factor
+  rails_autolink
   rspec-rails
   sass-rails
   sentry-raven

app/assets/images/add.png

@@ -12,8 +12,8 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery_ui
+//= require jquery.ui.autocomplete
 //= require autocomplete-rails
 //= require bootstrap
-//= require jquery-timepicker-addon
 //= require users
+//= require events

app/assets/images/amp.png

@@ -0,0 +1,88 @@
+if $('body').hasClass('events')
+  if $('body').hasClass('new')
+    seachOptions =
+      center: new google.maps.LatLng(43.0667, -89.4000)
+      radius: 50000
+    autocomplete = new google.maps.places.Autocomplete(document.getElementById('places-autocomplete'), seachOptions)
+    google.maps.event.addListener autocomplete, 'place_changed', ()->
+      place = autocomplete.getPlace()
+      addressArray = place.address_components
+      i = 0
+
+      $('#event_lat').val(place.geometry.location.A)
+      $('#event_lon').val(place.geometry.location.k)
+      while i < addressArray.length
+        if addressArray[i].types[0] is "locality"
+          $("#event_city").val place.address_components[i].long_name
+          break
+        i++
+
+  if $('body').hasClass('edit')
+
+    lat = document.getElementById('event_lat').value
+    lon = document.getElementById('event_lon').value
+
+    initialize = ->
+      if lat? and lon?
+        initialLatLng = new google.maps.LatLng(lon, lat)
+      else
+        initialLatLng = new google.maps.LatLng(43.0667, -89.4000)
+      mapOptions =
+        center: initialLatLng
+        radius: 50000
+        zoom: 14
+        mapTypeId: google.maps.MapTypeId.ROADMAP
+      searchOptions =
+        center: new google.maps.LatLng(43.0667, -89.4000)
+        radius: 50000
+      map = new google.maps.Map(document.getElementById("map-canvas"), mapOptions)
+      # infowindow = new google.maps.InfoWindow()
+      marker = new google.maps.Marker(
+        position: initialLatLng
+        map: map
+      autocomplete = new google.maps.places.Autocomplete(document.getElementById('places-autocomplete'), searchOptions)
+      autocomplete.bindTo "bounds", map
+      )
+      google.maps.event.addListener autocomplete, 'place_changed', ->
+        # infowindow.close()
+        marker.setVisible false
+        place = autocomplete.getPlace()
+        addressArray = place.address_components
+        i = 0
+
+        $('#event_lat').val(place.geometry.location.A)
+        $('#event_lon').val(place.geometry.location.k)
+        while i < addressArray.length
+          if addressArray[i].types[0] is "locality"
+            $("#event_city").val place.address_components[i].long_name
+            break
+          i++
+
+        if place.geometry.viewport
+          map.fitBounds place.geometry.viewport
+        else
+          map.setCenter place.geometry.location
+          map.setZoom 14 # Why 17? Because it looks good.
+        marker.setIcon (
+          url: place.icon
+          size: new google.maps.Size(71, 71)
+          origin: new google.maps.Point(0, 0)
+          anchor: new google.maps.Point(17, 34)
+          scaledSize: new google.maps.Size(35, 35)
+        )
+        marker.setPosition place.geometry.location
+        marker.setVisible true
+
+        # address = ""
+        # if place.address_components
+        #   address = [
+        #     place.address_components[0] and place.address_components[0].short_name or ""
+        #     place.address_components[1] and place.address_components[1].short_name or ""
+        #     place.address_components[2] and place.address_components[2].short_name or ""
+        #   ].join(" ")
+        # infowindow.setContent "<div><strong>" + place.name + "</strong><br>" + address
+        # infowindow.open map, marker
+        return
+
+      return
+    google.maps.event.addDomListener window, "load", initialize

app/assets/images/check.png

@@ -2,14 +2,10 @@ $(document).ready ->
   $("form.edit_user input[type=radio]").click ->
     $(this).closest('form').submit()
 
-  $('.edit-default-email').click (event) ->
+  $('.edit-defaults').click (event) ->
     event.preventDefault()
     $('.default-identity .names').hide()
-    $('.email').show()
-    $('.save').show()
-
-  $('.edit-default-mobile').click (event) ->
-    event.preventDefault()
-    $('.default-identity .names').hide()
-    $('.mobile_num').show()
-    $('.save').show()
+    $('.edit-defaults').hide()
+    $('.email').removeClass('hidden')
+    $('.mobile_num').removeClass('hidden')
+    $('.save').removeClass('hidden')

app/assets/javascripts/application.js

@@ -10,7 +10,4 @@
  *
  *= require_self
  *= require corgi
- *= require jquery-timepicker-addon
  */
-
-@import 'bootstrap';