grokus 1.0.0.3 → 1.0.0.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -7
- data/app/assets/javascripts/calagator/mapping.js +7 -7
- data/app/helpers/calagator/mapping_helper.rb +6 -2
- data/app/models/calagator/venue.rb +0 -4
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bec13a2504c3b3e12b54a9dc8ac168e9e0ed990d
|
4
|
+
data.tar.gz: a398a358becb750c3d51aada28a6d7cbd9d59672
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b9f319451237d995088644299ae643c5f73104df085f76b76de61e90e643ebbe6947bd91c7b442e4201ae12a61148cefcb1faa83c279f4621c970959a6de5223
|
7
|
+
data.tar.gz: ecce49cd092df26428425611be6be9dd478251984a84b4d942287bc050f9b268279335312c369221bdee8c5e42ab2ed93efa4d22c611884584abbebc8988ea6e
|
data/README.md
CHANGED
@@ -5,19 +5,13 @@
|
|
5
5
|
[![Dependency Status](https://gemnasium.com/calagator/calagator.svg)](https://gemnasium.com/calagator/calagator)
|
6
6
|
|
7
7
|
|
8
|
-
|
8
|
+
Calagator
|
9
9
|
=========
|
10
10
|
|
11
11
|
|
12
12
|
About
|
13
13
|
-----
|
14
14
|
|
15
|
-
Mainly I just need:
|
16
|
-
|
17
|
-
* Multi colored markers, depending on venue instance
|
18
|
-
* Devise, only some can edit
|
19
|
-
* Expand beyond Portland, this will be the tricky part
|
20
|
-
|
21
15
|
Calagator is an open source community calendaring platform:
|
22
16
|
|
23
17
|
* [Calagator.org](http://calagator.org/) is the flagship website running this software.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
//= require leaflet.awesome-markers
|
2
2
|
|
3
|
-
var map = function(layer_constructor, map_tiles, div_id, center, zoom, rawMarkers, should_fit_bounds) {
|
3
|
+
var map = function(layer_constructor, map_tiles, div_id, center, zoom, marker_color, rawMarkers, should_fit_bounds) {
|
4
4
|
klass = eval(layer_constructor)
|
5
5
|
var layer = new klass(map_tiles);
|
6
6
|
var map = new L.Map(div_id, {
|
@@ -15,13 +15,13 @@ var map = function(layer_constructor, map_tiles, div_id, center, zoom, rawMarker
|
|
15
15
|
|
16
16
|
map.addLayer(layer);
|
17
17
|
|
18
|
-
var
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
})
|
18
|
+
var venueIcon = L.AwesomeMarkers.icon({
|
19
|
+
icon: 'star',
|
20
|
+
prefix: 'fa',
|
21
|
+
markerColor: marker_color
|
22
|
+
})
|
24
23
|
|
24
|
+
var markers = rawMarkers.map(function(m) {
|
25
25
|
return L.marker([m.latitude, m.longitude], { title: m.title, icon: venueIcon}).bindPopup(m.popup);
|
26
26
|
});
|
27
27
|
var markerGroup = L.featureGroup(markers);
|
@@ -46,6 +46,7 @@ module MappingHelper
|
|
46
46
|
div_id,
|
47
47
|
center,
|
48
48
|
zoom,
|
49
|
+
marker_color,
|
49
50
|
markers,
|
50
51
|
should_fit_bounds
|
51
52
|
]
|
@@ -78,12 +79,15 @@ module MappingHelper
|
|
78
79
|
latitude: location[0],
|
79
80
|
longitude: location[1],
|
80
81
|
title: locatable_item.title,
|
81
|
-
popup: context.link_to(locatable_item.title, locatable_item)
|
82
|
-
marker_color: locatable_item.marker_color
|
82
|
+
popup: context.link_to(locatable_item.title, locatable_item)
|
83
83
|
}
|
84
84
|
end.compact
|
85
85
|
end
|
86
86
|
|
87
|
+
def marker_color
|
88
|
+
Calagator.mapping_marker_color
|
89
|
+
end
|
90
|
+
|
87
91
|
def locatable_items
|
88
92
|
@locatable_items ||= Array(items).select {|i| i.location.present? }
|
89
93
|
end
|
@@ -83,10 +83,6 @@ class Venue < ActiveRecord::Base
|
|
83
83
|
super UrlPrefixer.prefix(value)
|
84
84
|
end
|
85
85
|
|
86
|
-
def marker_color
|
87
|
-
Calagator.mapping_marker_color
|
88
|
-
end
|
89
|
-
|
90
86
|
# Display a single line address.
|
91
87
|
def full_address
|
92
88
|
full_address = "#{street_address}, #{locality} #{region} #{postal_code} #{country}"
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: grokus
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.0.
|
4
|
+
version: 1.0.0.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- The Calagator Team
|
@@ -1021,7 +1021,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1021
1021
|
version: '0'
|
1022
1022
|
requirements: []
|
1023
1023
|
rubyforge_project:
|
1024
|
-
rubygems_version: 2.5.1
|
1024
|
+
rubygems_version: 2.4.5.1
|
1025
1025
|
signing_key:
|
1026
1026
|
specification_version: 4
|
1027
1027
|
summary: A calendar for communities
|