Skip to content
This repository has been archived by the owner on May 13, 2018. It is now read-only.

Commit

Permalink
Merge remote branch 'github/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	css/simple_geo.css
	js/edit.js
	js/micromap.js
	simple_geo.module
  • Loading branch information
Linus Lundahl committed Apr 9, 2010
2 parents ff8f600 + 55f8704 commit 7d351a0
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 20 deletions.
8 changes: 8 additions & 0 deletions css/simple_geo.css
View file
Expand Up @@ -58,4 +58,12 @@
background-color: #fff;
border: 1px solid #000;
padding: 5px;
}

.reset-position {
margin: 3px 0 0 0;
}

.reset-position .remove-button {
margin: 0 5px 0 0;
}
11 changes: 11 additions & 0 deletions css/simple_geo_admin.css
View file
@@ -0,0 +1,11 @@
#edit-simple-geo-overview-map-size { width: 35px !important; }

#edit-simple-geo-zoom-level { margin: 0 !important; }

#edit-simple-geo-min-zoom-wrapper,
#edit-simple-geo-max-zoom-wrapper {
width: 70px;
display: inline-block;
clear: none;
margin: 0 0 2px 0 !important;
}
8 changes: 8 additions & 0 deletions js/edit.js
View file
Expand Up @@ -177,6 +177,12 @@ if (google && google.load) {
map = new google.maps.Map2(placeholder);
map.addControl(new google.maps.SmallMapControl());

if (Drupal.settings.simple_geo_overview_map_show) {
var size = Drupal.settings.simple_geo_overview_map_size;
var ovcontrol = new GOverviewMapControl(new GSize(size,size));
map.addControl(ovcontrol);
}

//Get coordinate data
aCoords = jQuery('#edit-simple-geo-area').attr('value');
pCoords = jQuery('#edit-simple-geo-position-wrapper input[type=text]').attr('value');
Expand All @@ -201,7 +207,9 @@ if (google && google.load) {
}

resetBox = jQuery('<div class="reset-position"></div>');

marker = new google.maps.Marker(position, {draggable: true, icon: icon});

//Add the marker to the map
if (has_position) {
map.addOverlay(marker);
Expand Down
17 changes: 13 additions & 4 deletions js/micromap.js
View file
Expand Up @@ -14,7 +14,7 @@ if (google && google.load) {
if (positions.length > 0) {
placeholder = document.getElementById('micro-map-widget');
if (!placeholder) {
placeholder_html = '<div id="micro-map" class="small"><h2 class="title">' + Drupal.t('Map') + '</h2><div id="micro-map-widget"></div>' + '<span class="button" id="micro-map-size"><a href="#" class="micro-map-size-link">&lt; ' + Drupal.t('Wider map') + '</a></span></div>';
placeholder_html = '<div id="micro-map" class="small"><h2 class="title">' + Drupal.t('Map') + '</h2><div id="micro-map-widget"></div>' + '<span class="button small" id="micro-map-size"><a href="#" class="micro-map-size-link">' + Drupal.t('Wider map') + '</a></span></div>';
micromap_parent = Drupal.settings.simple_geo_micromap_parent ? Drupal.settings.simple_geo_micromap_parent : '#main-inner';
micromap_add_mode = Drupal.settings.simple_geo_micromap_add_mode ? Drupal.settings.simple_geo_micromap_add_mode : 'prepend';

Expand All @@ -37,7 +37,14 @@ if (google && google.load) {
map = new google.maps.Map2(placeholder);
map.addControl(new google.maps.SmallMapControl());

icon = new google.maps.Icon(google.maps.DEFAULT_ICON);
if (Drupal.settings.simple_geo_overview_map_show) {
var size = Drupal.settings.simple_geo_overview_map_size;
var ovcontrol = new GOverviewMapControl(new GSize(size,size));
map.addControl(ovcontrol);
}

icon = new GIcon(G_DEFAULT_ICON);

if (Drupal.settings.user_map) {
icon.shadow = null;
icon.iconSize = new google.maps.Size(20, 29);
Expand Down Expand Up @@ -129,13 +136,15 @@ if (google && google.load) {
e.preventDefault();
switch (map_state) {
case 0:
jQuery(this).find('*').text(Drupal.t('Smaller map') + ' >');
jQuery(this).find('*').text(Drupal.t('Smaller map'));
jQuery('#micro-map').removeClass('small').addClass('large');
jQuery('#micro-map-size').removeClass('small').addClass('large');
map_state = 1;
break;
case 1:
jQuery(this).find('*').text('< ' + Drupal.t('Wider map'));
jQuery(this).find('*').text(Drupal.t('Wider map'));
jQuery('#micro-map').addClass('small').removeClass('large');
jQuery('#micro-map-size').addClass('small').removeClass('large');
map_state = 0;
break;
}
Expand Down
5 changes: 5 additions & 0 deletions simple_geo.install
View file
Expand Up @@ -57,6 +57,11 @@ function simple_geo_uninstall() {
'simple_geo_search_address_icon',
'simple_geo_show_map_link',
'simple_geo_add_microformat_tag',
'simple_geo_min_zoom',
'simple_geo_max_zoom',
'simple_geo_overview_map_show',
'simple_geo_overview_map_size',
'simple_geo_manually_load',
);

foreach ($vars as $var) {
Expand Down
21 changes: 12 additions & 9 deletions simple_geo.module
View file
Expand Up @@ -12,7 +12,7 @@ define('SIMPLE_GEO_COORDINATE_SEPARATOR', ' ');
require('includes/simple_geo_themeable_functions.php');

function simple_geo_init() {
if (variable_get('simple_geo_manually_load', 0)) {
if (variable_get('simple_geo_manually_load', 1)) {
simple_geo_load();
}
}
Expand All @@ -28,18 +28,21 @@ function simple_geo_load() {
if ($def_pos) {
$settings['simple_geo_default_position'] = $def_pos;
}
$min_zoom = variable_get('simple_geo_min_zoom', 1);
$max_zoom = variable_get('simple_geo_max_zoom', 14);
$search_address = variable_get('simple_geo_search_address', 1);
$search_address_icon = variable_get('simple_geo_search_address_icon', 1);
$settings['simple_geo_search_address'] = $search_address;
$settings['simple_geo_search_address_icon'] = $search_address_icon;
$settings['simple_geo_min_zoom'] = $min_zoom;
$settings['simple_geo_max_zoom'] = $max_zoom;

$settings['simple_geo_search_address'] = variable_get('simple_geo_search_address', 1);
$settings['simple_geo_search_address_icon'] = variable_get('simple_geo_search_address_icon', 1);
$settings['simple_geo_min_zoom'] = variable_get('simple_geo_min_zoom', 1);
$settings['simple_geo_max_zoom'] = variable_get('simple_geo_max_zoom', 14);
$settings['simple_geo_overview_map_show'] = variable_get('simple_geo_overview_map_show', 0);
$settings['simple_geo_overview_map_size'] = variable_get('simple_geo_overview_map_size', 150);
$settings['simple_geo_micromap_parent'] = variable_get('simple_geo_micromap_parent', '#main-inner');
$settings['simple_geo_micromap_add_mode'] = variable_get('simple_geo_micromap_add_mode', 'prepend');

$gc_suffix = variable_get('simple_geo_geocoding_suffix', '');
if (!empty($gc_suffix)) {
$settings['simple_geo_geocoding_suffix'] = $gc_suffix;
}

$settings['simple_geo_micromap_parent'] = variable_get('simple_geo_micromap_parent', '#main-inner');
$settings['simple_geo_micromap_add_mode'] = variable_get('simple_geo_micromap_add_mode', 'prepend');

Expand Down
39 changes: 32 additions & 7 deletions simple_geo_admin.inc.php
View file
Expand Up @@ -7,6 +7,8 @@
*/

function simple_geo_settings() {
drupal_add_css(drupal_get_path('module', 'simple_geo') .'/css/simple_geo_admin.css');

$form = array();

$form['position_set'] = array(
Expand Down Expand Up @@ -115,22 +117,45 @@ function simple_geo_settings() {

$array = drupal_map_assoc(range(1, 17));

$form['micromap_set']['simple_geo_max_zoom'] = array(
// $form['micromap_set']['simple_geo_zoom_title'] = array(
// '#type' => 'item',
// '#title' => 'Zoom level',
// );

$form['micromap_set']['simple_geo_min_zoom'] = array(
'#type' => 'select',
'#title' => t('Max zoom level'),
'#prefix' => '<div id="edit-simple-geo-zoom-level" class="form-item"><label>' . t('Zoom level') . '</label></div>',
'#title' => t('Min'),
'#options' => $array,
'#default_value' => variable_get('simple_geo_max_zoom', 14),
'#description' => t('This affects only the zoom level that\'s automatically chosen by the micromap'),
'#default_value' => variable_get('simple_geo_min_zoom', 1),
);

$form['micromap_set']['simple_geo_min_zoom'] = array(
$form['micromap_set']['simple_geo_max_zoom'] = array(
'#type' => 'select',
'#title' => t('Minimum zoom level'),
'#title' => t('Max'),
'#options' => $array,
'#default_value' => variable_get('simple_geo_min_zoom', 1),
'#default_value' => variable_get('simple_geo_max_zoom', 14),
);

$form['micromap_set']['simple_geo_zoom_desc'] = array(
'#type' => 'item',
'#description' => t('This affects only the zoom level that\'s automatically chosen by the micromap'),
);

$form['micromap_set']['simple_geo_overview_map_show'] = array(
'#type' => 'checkbox',
'#default_value' => variable_get('simple_geo_overview_map_show', 0),
'#title' => t('Show overview map in lower right corner'),
);

$form['micromap_set']['simple_geo_overview_map_size'] = array(
'#type' => 'textfield',
'#default_value' => variable_get('simple_geo_overview_map_size', 150),
'#title' => t('Overview map size'),
'#description' => t('Choose the size of the overview map, (value x value)'),
'#field_suffix' => 'px',
);

$form['google'] = array(
'#type' => 'fieldset',
'#title' => t('Google maps'),
Expand Down

0 comments on commit 7d351a0

Please sign in to comment.