Skip to content

Commit ced2730

Browse files
committed
Removed culprit causing autocomplete js error (was in theme). Updated feature to reflect new openlayers (presets now maps).
1 parent ace1eff commit ced2730

8 files changed

+42
-58
lines changed

modules/taxonomy/taxonomy.info

+6
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,9 @@ dependencies[] = options
77
files[] = taxonomy.module
88
files[] = taxonomy.test
99
configure = admin/structure/taxonomy
10+
11+
; Information added by drupal.org packaging script on 2011-08-31
12+
version = "7.8"
13+
project = "drupal"
14+
datestamp = "1314817616"
15+

sites/all/modules/custom/citygroups/community_group_form/community_group_form.module

-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ function community_group_form_form_submit(&$form, &$form_values) {
244244
break;
245245
}
246246
}
247-
dpm( $form_values);
248247
}
249248
}
250249

sites/all/modules/features/community_group_content_type/community_group_content_type.features.field.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1577,7 +1577,7 @@ function community_group_content_type_field_default_fields() {
15771577
'module' => 'geofield',
15781578
'settings' => array(
15791579
'data' => 'full',
1580-
'map_preset' => 'citygroups_group_display',
1580+
'map_preset' => 'citygroups',
15811581
),
15821582
'type' => 'geofield_openlayers',
15831583
'weight' => '6',

sites/all/modules/features/community_group_content_type/community_group_content_type.field_group.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function community_group_content_type_field_group_info() {
5959
'format_settings' => array(
6060
'label' => 'Location',
6161
'instance_settings' => array(
62-
'classes' => 'grid_4',
62+
'classes' => 'grid_8',
6363
'description' => '',
6464
'effect' => 'none',
6565
'speed' => 'fast',

sites/all/modules/features/community_group_content_type/community_group_content_type.openlayers_maps.inc

+6-11
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function community_group_content_type_openlayers_maps() {
1818
$openlayers_maps->description = 'A map for CityGroups';
1919
$openlayers_maps->data = array(
2020
'width' => 'auto',
21-
'height' => '350px',
21+
'height' => '400px',
2222
'image_path' => '',
2323
'css_path' => '',
2424
'proxy_host' => '',
@@ -34,22 +34,17 @@ function community_group_content_type_openlayers_maps() {
3434
),
3535
),
3636
'behaviors' => array(
37-
'openlayers_behavior_geofield' => array(),
3837
'openlayers_behavior_attribution' => array(),
3938
'openlayers_behavior_keyboarddefaults' => array(),
40-
'openlayers_behavior_layerswitcher' => array(
41-
'ascending' => 1,
42-
),
4339
'openlayers_behavior_navigation' => array(
4440
'zoomWheelEnabled' => 1,
4541
'documentDrag' => 0,
4642
),
4743
'openlayers_behavior_dragpan' => array(),
48-
'openlayers_behavior_boxselect' => array(),
4944
'openlayers_behavior_scaleline' => array(),
5045
'openlayers_behavior_zoompanel' => array(),
5146
'openlayers_behavior_zoomtolayer' => array(
52-
'zoomtolayer' => 'geofield_formatter',
47+
'zoomtolayer' => 'google_hybrid',
5348
'point_zoom_level' => '5',
5449
),
5550
),
@@ -71,15 +66,15 @@ function community_group_content_type_openlayers_maps() {
7166
'community_groups_map_openlayers_1' => 0,
7267
),
7368
'layer_switcher' => array(
74-
'geofield_formatter' => 'geofield_formatter',
69+
'geofield_formatter' => 0,
7570
'community_groups_map_openlayers_1' => 0,
7671
),
7772
'projection' => '900913',
7873
'displayProjection' => '4326',
7974
'styles' => array(
80-
'default' => 'city_group_map_form_style',
81-
'select' => 'city_group_map_form_style',
82-
'temporary' => 'city_group_map_form_style',
75+
'default' => 'default',
76+
'select' => 'default',
77+
'temporary' => 'default',
8378
),
8479
);
8580
$export['citygroups'] = $openlayers_maps;

sites/all/modules/features/community_group_content_type/community_group_content_type.strongarm.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ function community_group_content_type_strongarm() {
9494
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
9595
$strongarm->api_version = 1;
9696
$strongarm->name = 'openlayers_layers_google_api';
97-
$strongarm->value = 'ABQIAAAA69Pr8X6qVjpuLObW66yHqxSCA4djylbTmgnd_4AK0UV0cebb8xTsnWNf2AISG823RjH866KVA9r1Aw ';
97+
$strongarm->value = 'ABQIAAAA69Pr8X6qVjpuLObW66yHqxSCA4djylbTmgnd_4AK0UV0cebb8xTsnWNf2AISG823RjH866KVA9r1Aw';
9898
$export['openlayers_layers_google_api'] = $strongarm;
9999

100100
$strongarm = new stdClass;
101101
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
102102
$strongarm->api_version = 1;
103103
$strongarm->name = 'openlayers_source';
104-
$strongarm->value = 'sites/all/libraries/openlayers-2.11/OpenLayers.js';
104+
$strongarm->value = 'sites/all/libraries/openlayers-2.10/OpenLayers.js';
105105
$export['openlayers_source'] = $strongarm;
106106

107107
return $export;

sites/all/modules/features/community_group_content_type/community_group_content_type.views_default.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function community_group_content_type_views_default_views() {
3131
$handler->display->display_options['query']['options']['query_comment'] = FALSE;
3232
$handler->display->display_options['exposed_form']['type'] = 'basic';
3333
$handler->display->display_options['pager']['type'] = 'full';
34-
$handler->display->display_options['pager']['options']['items_per_page'] = '200';
34+
$handler->display->display_options['pager']['options']['items_per_page'] = '50';
3535
$handler->display->display_options['pager']['options']['offset'] = '0';
3636
$handler->display->display_options['pager']['options']['id'] = '0';
3737
$handler->display->display_options['pager']['options']['expose']['items_per_page_options_all'] = 0;

sites/all/themes/citygroups_base/js/citygroups_base.js

+25-41
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,32 @@
22

33
Drupal.behaviors.citygroups_base = {
44
attach: function (context, settings) {
5-
/*
6-
$('select.form-select', context).once('select.form-select').each(function() {
7-
$(this).sSelect();
8-
});
5+
/*
6+
$('select.form-select', context).once('select.form-select').each(function() {
7+
$(this).sSelect();
8+
});
9+
10+
// also: http://robertmarkbramprogrammer.blogspot.com/2010/09/event-handling-with-jquery-autocomplete.html
11+
*/
12+
// $('div.views-exposed-widgets select.form-select').sSelect();
13+
14+
var neighborhoods = [];
15+
/*
16+
$('select#edit-field-neighborhood-tid option').each(function(){
17+
var html = $(this).html();
18+
var value = $(this).val();
19+
neighborhoods.push(html);
20+
});
21+
*/
22+
//console.log(neighborhoods);
23+
/* $('div.views-exposed-widgets').append('<div class="ui-widget"><div class="neighborhoods-autocomplete">autocomplete</div></div>'); */
924

10-
// also: http://robertmarkbramprogrammer.blogspot.com/2010/09/event-handling-with-jquery-autocomplete.html
11-
*/
12-
// $('div.views-exposed-widgets select.form-select').sSelect();
13-
14-
15-
$('div.views-number-results div.label').html('groups');
16-
17-
18-
var neighborhoods = [];
19-
20-
// Remove delay from autocomplete.
21-
Drupal.ACDB = function (uri) {
22-
this.uri = uri;
23-
this.delay = 10;
24-
this.cache = {};
25-
};
26-
27-
/*
28-
$('select#edit-field-neighborhood-tid option').each(function(){
29-
var html = $(this).html();
30-
var value = $(this).val();
31-
neighborhoods.push(html);
32-
});
33-
*/
34-
//console.log(neighborhoods);
35-
/* $('div.views-exposed-widgets').append('<div class="ui-widget"><div class="neighborhoods-autocomplete">autocomplete</div></div>'); */
36-
37-
/*
38-
39-
$("div.neighborhoods-autocomplete").autocomplete({
40-
source: neighborhoods
41-
});
42-
*/
43-
44-
45-
46-
25+
/*
26+
27+
$("div.neighborhoods-autocomplete").autocomplete({
28+
source: neighborhoods
29+
});
30+
*/
4731
}
4832
};
4933

0 commit comments

Comments
 (0)