grokus 1.0.0.3 → 1.0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75821d85a7aa6406e273ee87e711df835bdeb626
-  data.tar.gz: ff04078e294225ad869692d6ee04651d214f4e76
+  metadata.gz: bec13a2504c3b3e12b54a9dc8ac168e9e0ed990d
+  data.tar.gz: a398a358becb750c3d51aada28a6d7cbd9d59672
 SHA512:
-  metadata.gz: 6c6e4b59fd24d9263f5daca2c3ef9e3d0a4d6c0529c9e75ed56dd4255c2b500f38927958a5529e2e8f09a5f1796b7bae7ec31a8383655cf83f4233cf87755309
-  data.tar.gz: b21082280aa2e809e85cda26a6921f3cb5eca3d2d5e48ee2c9d5d1beca80be008e6c7ad27e4987685f6cd8f1065759b835867f47f21e59fb07a96a7f35ae0250
+  metadata.gz: b9f319451237d995088644299ae643c5f73104df085f76b76de61e90e643ebbe6947bd91c7b442e4201ae12a61148cefcb1faa83c279f4621c970959a6de5223
+  data.tar.gz: ecce49cd092df26428425611be6be9dd478251984a84b4d942287bc050f9b268279335312c369221bdee8c5e42ab2ed93efa4d22c611884584abbebc8988ea6e

data/README.md

@@ -5,19 +5,13 @@
 [![Dependency Status](https://gemnasium.com/calagator/calagator.svg)](https://gemnasium.com/calagator/calagator)
 
 
-My calagator fork
+Calagator
 =========
 
 
 About
 -----
 
-Mainly I just need:
-
-* Multi colored markers, depending on venue instance
-* Devise, only some can edit
-* Expand beyond Portland, this will be the tricky part
-
 Calagator is an open source community calendaring platform:
 
   * [Calagator.org](http://calagator.org/) is the flagship website running this software.

data/app/assets/javascripts/calagator/mapping.js

@@ -1,6 +1,6 @@
 //= require leaflet.awesome-markers
 
-var map = function(layer_constructor, map_tiles, div_id, center, zoom, rawMarkers, should_fit_bounds) {
+var map = function(layer_constructor, map_tiles, div_id, center, zoom, marker_color, rawMarkers, should_fit_bounds) {
   klass = eval(layer_constructor)
   var layer = new klass(map_tiles);
   var map = new L.Map(div_id, {
@@ -15,13 +15,13 @@ var map = function(layer_constructor, map_tiles, div_id, center, zoom, rawMarker
 
   map.addLayer(layer);
 
-  var markers = rawMarkers.map(function(m) {
-    var venueIcon = L.AwesomeMarkers.icon({
-      icon: 'star',
-      prefix: 'fa',
-      markerColor: m.marker_color
-    })
+  var venueIcon = L.AwesomeMarkers.icon({
+    icon: 'star',
+    prefix: 'fa',
+    markerColor: marker_color
+  })
 
+  var markers = rawMarkers.map(function(m) {
     return L.marker([m.latitude, m.longitude], { title: m.title, icon: venueIcon}).bindPopup(m.popup);
   });
   var markerGroup = L.featureGroup(markers);

data/app/helpers/calagator/mapping_helper.rb

@@ -46,6 +46,7 @@ module MappingHelper
         div_id,
         center,
         zoom,
+        marker_color,
         markers,
         should_fit_bounds
       ]
@@ -78,12 +79,15 @@ module MappingHelper
           latitude: location[0],
           longitude: location[1],
           title: locatable_item.title,
-          popup: context.link_to(locatable_item.title, locatable_item),
-          marker_color: locatable_item.marker_color
+          popup: context.link_to(locatable_item.title, locatable_item)
         }
       end.compact
     end
 
+    def marker_color
+      Calagator.mapping_marker_color
+    end
+
     def locatable_items
       @locatable_items ||= Array(items).select {|i| i.location.present? }
     end

data/app/models/calagator/venue.rb

@@ -83,10 +83,6 @@ class Venue < ActiveRecord::Base
     super UrlPrefixer.prefix(value)
   end
 
-  def marker_color
-    Calagator.mapping_marker_color
-  end
-
   # Display a single line address.
   def full_address
     full_address = "#{street_address}, #{locality} #{region} #{postal_code} #{country}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grokus
 version: !ruby/object:Gem::Version
-  version: 1.0.0.3
+  version: 1.0.0.5
 platform: ruby
 authors:
 - The Calagator Team
@@ -1021,7 +1021,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A calendar for communities