diff options
| -rw-r--r-- | modules_v3/googlemap/css/googlemap_style.css | 62 | ||||
| -rw-r--r-- | modules_v3/googlemap/css/wt_v3_googlemap.css | 53 | ||||
| -rw-r--r-- | modules_v3/googlemap/css/wt_v3_places_edit.css | 37 | ||||
| -rw-r--r-- | modules_v3/googlemap/pedigree_map.php | 4 | ||||
| -rw-r--r-- | modules_v3/googlemap/placehierarchy.php | 6 | ||||
| -rw-r--r-- | modules_v3/googlemap/places_edit.php | 3 | ||||
| -rw-r--r-- | modules_v3/googlemap/wt_v3_places_edit.js.php | 3 |
7 files changed, 64 insertions, 104 deletions
diff --git a/modules_v3/googlemap/css/googlemap_style.css b/modules_v3/googlemap/css/googlemap_style.css deleted file mode 100644 index 92d972a24c..0000000000 --- a/modules_v3/googlemap/css/googlemap_style.css +++ /dev/null @@ -1,62 +0,0 @@ -/** - * Stylesheet for Googlemap module - * - * webtrees: Web based Family History software - * Copyright (C) 2010 webtrees development team. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * @package webtrees - * @subpackage Modules - * @version $Id$ - */ - -#map_type -{ - margin: 0; - padding: 0; - font-family: Arial; - font-size: 10px; - list-style: none; -} -#map_type li -{ - display: block; - width: 70px; - text-align: center; - padding: 2px; - border: 1px solid black; - cursor: pointer; - float: left; - margin-left: 2px; -} -#map_type li.non_active -{ - background: white; - color: black; - font-weight: normal; -} -#map_type li.active -{ - background: gray; - color: white; - font-weight: bold; -} -#map_type li:hover -{ - background: #ddd; -} - -#googlemap_left{margin-top: -14px!important;}
\ No newline at end of file diff --git a/modules_v3/googlemap/css/wt_v3_googlemap.css b/modules_v3/googlemap/css/wt_v3_googlemap.css index d4b45ed254..3d04a943f5 100644 --- a/modules_v3/googlemap/css/wt_v3_googlemap.css +++ b/modules_v3/googlemap/css/wt_v3_googlemap.css @@ -270,3 +270,56 @@ margin-left:-130px; */ .icon_deat { background-position: -0px -120px; width: 60px; height: 60px; } .icon_occu { background-position: -60px -120px; width: 60px; height: 60px; } .icon_birt { background-position: -120px -120px; width: 60px; height: 60px; } + + +/* === places_edit === */ +#gname { + vertical-align: text-middle; + margin-top: 0px; + white-space:pre-wrap; + width:200px; + height: 60px; + +#namelink { + padding-bottom: 5px; +} + + +/* === googlemap_style === */ +#map_type +{ + margin: 0; + padding: 0; + font-family: Arial; + font-size: 10px; + list-style: none; +} +#map_type li +{ + display: block; + width: 70px; + text-align: center; + padding: 2px; + border: 1px solid black; + cursor: pointer; + float: left; + margin-left: 2px; +} +#map_type li.non_active +{ + background: white; + color: black; + font-weight: normal; +} +#map_type li.active +{ + background: gray; + color: white; + font-weight: bold; +} +#map_type li:hover +{ + background: #ddd; +} + +#googlemap_left{margin-top: -14px!important;} diff --git a/modules_v3/googlemap/css/wt_v3_places_edit.css b/modules_v3/googlemap/css/wt_v3_places_edit.css deleted file mode 100644 index 508b79c950..0000000000 --- a/modules_v3/googlemap/css/wt_v3_places_edit.css +++ /dev/null @@ -1,37 +0,0 @@ -/* - * webtrees googlemap V3 css - * - * webtrees: Web based Family History software - * Copyright (C) 2011 webtrees development team. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * @package webtrees - * @subpackage Module - * $Id$ - * - * @author Brian Holland -*/ - -#gname { - vertical-align: text-middle; - margin-top: 0px; - white-space:pre-wrap; - width:200px; - height: 60px; - -#namelink { - padding-bottom: 5px; -}
\ No newline at end of file diff --git a/modules_v3/googlemap/pedigree_map.php b/modules_v3/googlemap/pedigree_map.php index dcfef35018..66e7aa1cb2 100644 --- a/modules_v3/googlemap/pedigree_map.php +++ b/modules_v3/googlemap/pedigree_map.php @@ -65,7 +65,9 @@ $MAX_PEDIGREE_GENERATIONS = min($MAX_PEDIGREE_GENERATIONS, 8); $controller->setPageTitle(/* I18N: %s is a person's name */ WT_I18N::translate('Pedigree map of %s', $controller->getPersonName())); $controller->pageHeader(); -echo '<link type="text/css" href ="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/googlemap_style.css" rel="stylesheet" />'; +// echo '<link type="text/css" href ="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/googlemap_style.css" rel="stylesheet" />'; +echo '<link type="text/css" href ="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/wt_v3_googlemap.css" rel="stylesheet" />'; + if ($ENABLE_AUTOCOMPLETE) require WT_ROOT.'js/autocomplete.js.htm'; echo '<div><table><tr><td valign="middle">'; diff --git a/modules_v3/googlemap/placehierarchy.php b/modules_v3/googlemap/placehierarchy.php index 8d99f82bc7..54e3c075fc 100644 --- a/modules_v3/googlemap/placehierarchy.php +++ b/modules_v3/googlemap/placehierarchy.php @@ -472,8 +472,10 @@ function map_scripts($numfound, $level, $parent, $linklevels, $placelevels, $pla echo "<script> var numMarkers = '".$numfound."';</script>"; echo "<script> var mapLevel = '".$level."';</script>"; echo "<script> var placezoom = '", $plzoom, "';</script>"; - - echo '<link type="text/css" href ="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/googlemap_style.css" rel="stylesheet" />'; + +// echo '<link type="text/css" href ="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/googlemap_style.css" rel="stylesheet" />'; +echo '<link type="text/css" href ="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/wt_v3_googlemap.css" rel="stylesheet" />'; + ?> <script type="text/javascript"> // <![CDATA[ diff --git a/modules_v3/googlemap/places_edit.php b/modules_v3/googlemap/places_edit.php index be9b28fbd2..76b5d8fb5b 100644 --- a/modules_v3/googlemap/places_edit.php +++ b/modules_v3/googlemap/places_edit.php @@ -46,7 +46,8 @@ if (!WT_USER_IS_ADMIN) { echo "<br /><br /><br />\n"; exit; } -echo '<link type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/googlemap_style.css" rel="stylesheet" />'; +// echo '<link type="text/css" href ="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/googlemap_style.css" rel="stylesheet" />'; +echo '<link type="text/css" href ="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/wt_v3_googlemap.css" rel="stylesheet" />'; ?> <script type="text/javascript"> <!-- diff --git a/modules_v3/googlemap/wt_v3_places_edit.js.php b/modules_v3/googlemap/wt_v3_places_edit.js.php index 88a81bdaa2..99c93bb3d2 100644 --- a/modules_v3/googlemap/wt_v3_places_edit.js.php +++ b/modules_v3/googlemap/wt_v3_places_edit.js.php @@ -32,7 +32,8 @@ if (!defined('WT_WEBTREES')) { <head> <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script> <script type="text/javascript" src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/wt_v3_places_edit_overlays.js.php"></script> - <link type="text/css" href="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/css/wt_v3_places_edit.css" rel="stylesheet" /> + <!-- <link type="text/css" href="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/css/wt_v3_places_edit.css" rel="stylesheet" /> --> + <link type="text/css" href="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/css/wt_v3_googlemap.css" rel="stylesheet" /> <script type="text/javascript"> var map; |