diff options
| -rw-r--r-- | modules/googlemap/admin_placecheck.php | 82 | ||||
| -rw-r--r-- | modules/googlemap/admin_places.php | 80 | ||||
| -rw-r--r-- | themes/_administration/images/delete_grey.png | bin | 0 -> 758 bytes | |||
| -rw-r--r-- | themes/_administration/images/edit.png | bin | 467 -> 959 bytes | |||
| -rw-r--r-- | themes/_administration/style.css | 25 | ||||
| -rw-r--r-- | themes/_administration/theme.php | 2 |
6 files changed, 104 insertions, 85 deletions
diff --git a/modules/googlemap/admin_placecheck.php b/modules/googlemap/admin_placecheck.php index 5c9bc3467e..7aa06e14cf 100644 --- a/modules/googlemap/admin_placecheck.php +++ b/modules/googlemap/admin_placecheck.php @@ -57,28 +57,28 @@ echo '<table id="gm_config"><tr>', '</tr></table>'; //Start of User Defined options -echo "<table border='0' width='98%' height='100px' overflow='auto';>"; +echo "<table id=\"gm_check_outer\">"; echo "<form method='post' name='placecheck' action='module.php?mod=googlemap&mod_action=admin_placecheck'>"; echo "<tr valign='top'>"; echo "<td>"; -echo "<table align='left'>"; -echo "<tr><td colspan='2'class='descriptionbox' align='center'><strong>", WT_I18N::translate('PlaceCheck List Options'), "</strong></td></tr>"; +echo "<table class=\"gm_check_top\" align='left'>"; +echo "<tr><th colspan='2'>", WT_I18N::translate('PlaceCheck List Options'), "</th></tr>"; //Option box to select gedcom -echo "<tr><td class='descriptionbox'>".WT_I18N::translate('GEDCOM File:')."</td>"; -echo "<td class='optionbox'><select name='gedcom_id'>"; +echo "<tr><td>".WT_I18N::translate('GEDCOM File:')."</td>"; +echo "<td><select name='gedcom_id'>"; foreach (get_all_gedcoms() as $ged_id=>$gedcom) { echo '<option value="', $ged_id, '"', $ged_id==$gedcom_id?' selected="selected"':'', '>', htmlspecialchars($gedcom), '</option>'; } echo "</select></td></tr>"; //Option box for 'Open in new window' -echo "<tr><td class='descriptionbox'>".WT_I18N::translate('Open links in')."</td>"; -echo "<td class='optionbox'><select name='openinnew'>"; +echo "<tr><td>".WT_I18N::translate('Open links in')."</td>"; +echo "<td><select name='openinnew'>"; echo "<option value='0' ", $openinnew?" selected='selected'":"", ">".WT_I18N::translate('Same tab/window')."</option>"; echo "<option value='1' ", $openinnew?" selected='selected'":"", ">".WT_I18N::translate('New tab/window')."</option>"; echo "</select></td></tr>"; //Option box to select Country within Gedcom -echo "<tr><td class='descriptionbox'>", WT_I18N::translate('Country'), "</td>"; -echo "<td class='optionbox'><select name='country'>"; +echo "<tr><td>", WT_I18N::translate('Country'), "</td>"; +echo "<td><select name='country'>"; echo "<option value='XYZ' selected='selected'>", /* I18N: first/default option in a drop-down listbox */ WT_I18N::translate('<select>'), "</option>"; echo "<option value='XYZ'>", WT_I18N::translate('All'), "</option>"; $rows= @@ -96,8 +96,8 @@ echo "</select></td></tr>"; //Option box to select level 2 place within the selected Country if ($country!='XYZ') { - echo "<tr><td class='descriptionbox'>", /* I18N: Part of a country, state/region/county */ WT_I18N::translate('Subdivision'), "</td>"; - echo "<td class='optionbox'><select name='state'>"; + echo "<tr><td>", /* I18N: Part of a country, state/region/county */ WT_I18N::translate('Subdivision'), "</td>"; + echo "<td><select name='state'>"; echo "<option value='XYZ' selected='selected'>", WT_I18N::translate('<select>'), "</option>"; echo "<option value='XYZ'>", WT_I18N::translate('All'), "</option>"; $places= @@ -114,12 +114,12 @@ echo "</td>"; //Show Filter table if (!isset ($_POST["matching"])) {$matching=0;} else {$matching=1;} echo "<td>"; -echo "<table>"; -echo "<tr><td colspan='2' class='descriptionbox' align='center'>"; -echo "<strong>", WT_I18N::translate('List filtering options'), "</strong>", help_link('PLACECHECK_FILTER','googlemap'); -echo "</td></tr><tr><td class='descriptionbox'>"; +echo "<table class=\"gm_check_top\" align='center'>"; +echo "<tr><th colspan='2'>"; +echo WT_I18N::translate('List filtering options'), help_link('PLACECHECK_FILTER','googlemap'); +echo "</th></tr><tr><td>"; echo WT_I18N::translate('Include fully matched places: '), help_link('PLACECHECK_MATCH','googlemap'); -echo "</td><td class='optionbox'><input type=\"checkbox\" name=\"matching\" value=\"active\""; +echo "</td><td><input type=\"checkbox\" name=\"matching\" value=\"active\""; if ($matching==1) { echo " checked=\"checked\""; } @@ -129,12 +129,12 @@ echo "</td>"; //Show Key table echo "<td rowspan='2'>"; -echo "<table align='right'>"; -echo "<tr><td colspan='4' align='center' class='descriptionbox'><strong>", WT_I18N::translate('Key to colors used below'), "</strong></td></tr>"; -echo "<tr><td class='facts_value error'>", translate_fact('PLAC'), "</td><td class='facts_value error' align='center '><strong>X</strong></td><td align='center' class='facts_value error'><strong>X</strong></td><td class='facts_value'><font size=\"-2\">", WT_I18N::translate('This place and its coordinates do not exist in the GoogleMap tables.'), "</font></td></tr>"; -echo "<tr><td class='facts_value'><a>", translate_fact('PLAC'), "</a></td><td class='facts_value error' align='center '><strong>X</strong></td><td align='center' class='facts_value error'><strong>X</strong></td><td class='facts_value'><font size=\"-2\">", WT_I18N::translate('This place exists in the GoogleMap tables, but has no coordinates.'), "</font></td></tr>"; -echo "<tr><td class='facts_value'><strong>".WT_I18N::translate('unknown')."</font></td><td class='facts_value error' align='center '><strong>X</strong></td><td align='center' class='facts_value error'><strong>X</strong></td><td class='facts_value'><font size=\"-2\">", WT_I18N::translate('This place level is blank in your GEDCOM file. It should be added to GoogleMap places as "unknown" with coordinates from its parent level before you add any place to the next level.'), "</font></td></tr>"; -echo "<tr><td class='facts_value'><a>".WT_I18N::translate('unknown')."</a></td><td class='facts_value' align='center'>N55.0</td><td align='center' class='facts_value'>W75.0</td><td class='facts_value'><font size=\"-2\">", WT_I18N::translate('This place level is blank in your GEDCOM file, but exists as "unknown" in the GoogleMap places table with coordinates. No action required until the missing level can be entered.'), "</font></td></tr>"; +echo "<table class=\"gm_check_top\" align='right'>"; +echo "<tr><th colspan='4'>", WT_I18N::translate('Key to colors used below'), "</th></tr>"; +echo "<tr><td class='error'>", translate_fact('PLAC'), "</td><td class='error' align='center '><strong>X</strong></td><td align='center' class='error'><strong>X</strong></td><td class='check_comment'>", WT_I18N::translate('This place and its coordinates do not exist in the GoogleMap tables.'), "</td></tr>"; +echo "<tr><td><a>", translate_fact('PLAC'), "</a></td><td class='error' align='center '><strong>X</strong></td><td align='center' class='error'><strong>X</strong></td><td class='check_comment'>", WT_I18N::translate('This place exists in the GoogleMap tables, but has no coordinates.'), "</td></tr>"; +echo "<tr><td><strong>".WT_I18N::translate('unknown')."</font></td><td class='error' align='center '><strong>X</strong></td><td align='center' class='error'><strong>X</strong></td><td class='check_comment'>", WT_I18N::translate('This place level is blank in your GEDCOM file. It should be added to GoogleMap places as "unknown" with coordinates from its parent level before you add any place to the next level.'), "</td></tr>"; +echo "<tr><td><a>".WT_I18N::translate('unknown')."</a></td><td align='center'>N55.0</td><td align='center'>W75.0</td><td class='check_comment'>", WT_I18N::translate('This place level is blank in your GEDCOM file, but exists as "unknown" in the GoogleMap places table with coordinates. No action required until the missing level can be entered.'), "</td></tr>"; echo "</table>"; echo "</td>"; echo "</tr>"; @@ -150,7 +150,7 @@ echo "<hr />"; switch ($action) { case 'go': //Identify gedcom file - echo "<strong>", WT_I18N::translate('Place list for GEDCOM file'), ": </strong>", htmlspecialchars(get_gedcom_setting($gedcom_id, 'title')), "<br /><br />"; + echo "<div id=\"gm_check_title\"><span>", WT_I18N::translate('Place list for GEDCOM file'), ": </span>", htmlspecialchars(get_gedcom_setting($gedcom_id, 'title')), "</div>"; //Select all '2 PLAC ' tags in the file and create array $place_list=array(); $ged_data=WT_DB::prepare("SELECT i_gedcom FROM `##individuals` WHERE i_gedcom LIKE ? AND i_file=?") @@ -223,22 +223,23 @@ case 'go': //start to produce the display table $cols=0; $span=$max*3+3; - echo "<table class='facts_table' width='100%'><tr>"; - echo "<td rowspan='3' class='descriptionbox' align='center'><strong>", WT_I18N::translate('GEDCOM File Place Data<br />(2 PLAC tag)'), "</strong></td>"; - echo "<td class='descriptionbox' colspan='", $span, "' align='center'><strong>", WT_I18N::translate('GoogleMap Places Table Data'), "</strong></td></tr>"; + echo "<div class='gm_check_details'>"; + echo "<table class='gm_check_details'><tr>"; + echo "<th rowspan='3'>", WT_I18N::translate('GEDCOM File Place Data<br />(2 PLAC tag)'), "</th>"; + echo "<th colspan='", $span, "'>", WT_I18N::translate('GoogleMap Places Table Data'), "</th></tr>"; echo "<tr>"; while ($cols<$max) { if ($cols == 0) { - echo "<td class='descriptionbox' colspan='3' align='center'><strong>", PrintReady(WT_I18N::translate('Country')), "</strong></td>"; + echo "<th colspan='3'>", PrintReady(WT_I18N::translate('Country')), "</th>"; } else { - echo "<td class='descriptionbox' colspan='3' align='center'><strong>", PrintReady(WT_I18N::translate('Level')), " ", $cols+1, "</strong></td>"; + echo "<th colspan='3'>", PrintReady(WT_I18N::translate('Level')), " ", $cols+1, "</th>"; } $cols++; } echo "</tr><tr>"; $cols=0; while ($cols<$max) { - echo "<td class='descriptionbox' align='center'><strong>", translate_fact('PLAC'), "</strong></td><td class='descriptionbox' align='center'><strong>", WT_I18N::translate('Latitude'), "</strong><td class='descriptionbox' align='center'><strong>", WT_I18N::translate('Longitude'), "</strong></td></td>"; + echo "<th>", translate_fact('PLAC'), "</th><th>", WT_I18N::translate('Latitude'), "</th><th>", WT_I18N::translate('Longitude'), "</th></td>"; $cols++; } echo "</tr>"; @@ -255,7 +256,7 @@ case 'go': } $placestr.="level=".count($levels); $placestr.="\">".$place_list[$x]."</a>"; - $gedplace="<tr><td class='facts_value'>".$placestr."</td>"; + $gedplace="<tr><td>".$placestr."</td>"; $z=0; $y=0; $id=0; @@ -301,20 +302,20 @@ case 'go': $placestr2=$mapstr_add.$id."&place_name=".urlencode($levels[$z])."&level=".$level.$mapstr3.$mapstr7.'<span class="error">'.rtrim(ltrim($levels[$z])).'</span>'.$mapstr8;$matched[$x]++; } } - $plac[$z]="<td class='facts_value'>".$placestr2."</td>\n"; + $plac[$z]="<td>".$placestr2."</td>\n"; if ($row['pl_lati']=='0') { - $lati[$z]="<td class='facts_value error'><strong>".$row['pl_lati']."</strong></td>"; + $lati[$z]="<td class='error'><strong>".$row['pl_lati']."</strong></td>"; } else if ($row['pl_lati']!='') { - $lati[$z]="<td class='facts_value'>".$row['pl_lati']."</td>"; + $lati[$z]="<td>".$row['pl_lati']."</td>"; } else { - $lati[$z]="<td class='facts_value error' align='center'><strong>X</strong></td>";$matched[$x]++; + $lati[$z]="<td class='error' align='center'><strong>X</strong></td>";$matched[$x]++; } if ($row['pl_long']=='0') { - $long[$z]="<td class='facts_value error'><strong>".$row['pl_long']."</strong></td>"; + $long[$z]="<td class='error'><strong>".$row['pl_long']."</strong></td>"; } else if ($row['pl_long']!='') { - $long[$z]="<td class='facts_value'>".$row['pl_long']."</td>"; + $long[$z]="<td>".$row['pl_long']."</td>"; } else { - $long[$z]="<td class='facts_value error' align='center'><strong>X</strong></td>";$matched[$x]++; + $long[$z]="<td class='error' align='center'><strong>X</strong></td>";$matched[$x]++; } $level++; $mapstr3=$mapstr3."&parent[".$z."]=".addslashes(PrintReady($row['pl_placerequested'])); @@ -333,7 +334,7 @@ case 'go': echo $lati[$z]; echo $long[$z]; } else { - echo "<td class='facts_value'> </td><td class='facts_value'> </td><td class='facts_value'> </td>";} + echo "<td> </td><td> </td><td> </td>";} $z++; } echo "</tr>"; @@ -343,15 +344,14 @@ case 'go': } // echo final row of table - echo "<tr><td colspan=\"2\" class=\"list_label\">", WT_I18N::translate('Total unique places'), ": ", $countrows, "</td></tr></table><br /><br />"; + echo "<tr><td colspan=\"2\" class=\"accepted\">", WT_I18N::translate('Total unique places'), ": ", $countrows, "</td></tr></table></div>"; break; default: // Do not run until user selects a gedcom/place/etc. // Instead, show some useful help info. - echo "<p width=\"98%\">", WT_I18N::translate('This will list all the places from the selected GEDCOM file. By default this will NOT INCLUDE places that are fully matched between the GEDCOM file and the GoogleMap tables'), "</p><hr />"; + echo "<div class=\"gm_check_top accepted\">", WT_I18N::translate('This will list all the places from the selected GEDCOM file. By default this will NOT INCLUDE places that are fully matched between the GEDCOM file and the GoogleMap tables'), "</div>"; break; } //echo footers -echo "<hr />"; print_footer(); diff --git a/modules/googlemap/admin_places.php b/modules/googlemap/admin_places.php index da0333e032..0b6ca68397 100644 --- a/modules/googlemap/admin_places.php +++ b/modules/googlemap/admin_places.php @@ -39,7 +39,7 @@ if (!defined('WT_WEBTREES')) { require WT_ROOT.'modules/googlemap/defaultconfig.php'; -global $iso3166; +global $iso3166, $WT_IMAGES; $action=safe_REQUEST($_REQUEST, 'action'); if (isset($_REQUEST['parent'])) $parent=$_REQUEST['parent']; if (isset($_REQUEST['display'])) $display=$_REQUEST['display']; @@ -320,12 +320,12 @@ if ($action=="ImportFile") { <table class="facts_table"> <tr> <td class="descriptionbox"><?php echo WT_I18N::translate('File containing places (CSV)'), help_link('PLIF_FILENAME','googlemap'); ?></td> - <td class="optionbox"><input type="file" name="placesfile" size="50"></td> + <td><input type="file" name="placesfile" size="50"></td> </tr> <?php if (count($placefiles)>0) { ?> <tr> <td class="descriptionbox"><?php echo WT_I18N::translate('Server file containing places (CSV)'), help_link('PLIF_LOCALFILE','googlemap'); ?></td> - <td class="optionbox"> + <td> <select name="localfile"> <option></option> <?php foreach ($placefiles as $p=>$placefile) { ?> @@ -339,15 +339,15 @@ if ($action=="ImportFile") { <?php } ?> <tr> <td class="descriptionbox"><?php echo WT_I18N::translate('Clear all place-locations before import?'), help_link('PLIF_CLEAN','googlemap'); ?></td> - <td class="optionbox"><input type="checkbox" name="cleardatabase"></td> + <td><input type="checkbox" name="cleardatabase"></td> </tr> <tr> <td class="descriptionbox"><?php echo WT_I18N::translate('Update existing places only?'), help_link('PLIF_UPDATE','googlemap'); ?></td> - <td class="optionbox"><input type="checkbox" name="updateonly"></td> + <td><input type="checkbox" name="updateonly"></td> </tr> <tr> <td class="descriptionbox"><?php echo WT_I18N::translate('Overwrite location-data with data from file?'), help_link('PLIF_OVERWRITE','googlemap'); ?></td> - <td class="optionbox"><input type="checkbox" name="overwritedata"></td> + <td><input type="checkbox" name="overwritedata"></td> </tr> </table> <input id="savebutton" type="submit" value="<?php echo WT_I18N::translate('Continue Adding'); ?>" /><br /> @@ -515,7 +515,7 @@ if ($action=="DeleteRecord") { WT_DB::prepare("DELETE FROM `##placelocation` WHERE pl_id=?") ->execute(array($deleteRecord)); } else { - echo "<table class=\"facts_table\"><tr><td class=\"optionbox\">".WT_I18N::translate('Location not removed: this location contains sub-locations')."</td></tr></table>"; + echo "<table class=\"facts_table\"><tr><td>".WT_I18N::translate('Location not removed: this location contains sub-locations')."</td></tr></table>"; } } @@ -546,7 +546,7 @@ function delete_place(placeid) { //--> </script> <?php - +echo '<div id="gm_breadcrumb">'; $where_am_i=place_id_to_hierarchy($parent); foreach (array_reverse($where_am_i, true) as $id=>$place) { if ($id==$parent) { @@ -565,37 +565,37 @@ foreach (array_reverse($where_am_i, true) as $id=>$place) { } echo " - "; } -echo "<a href=\"module.php?mod=googlemap&mod_action=admin_places&parent=0&display=$display\">".WT_I18N::translate('Top Level')."</a>"; -echo "<br /><br /><form name=\"active\" method=\"post\" action=\"module.php?mod=googlemap&mod_action=admin_places&parent=$parent&display=$display\">"; -echo "\n<table><tr><td class=\"optionbox\">", WT_I18N::translate('Click here to show inactive places'), ": <input type=\"checkbox\" name=\"display\" value=\"inactive\""; -if ($display == 'inactive') echo " checked=\"checked\""; -echo ">\n<input type=\"submit\" value=\"", WT_I18N::translate('View'), "\" >"; +echo "<a href=\"module.php?mod=googlemap&mod_action=admin_places&parent=0&display=$display\">".WT_I18N::translate('Top Level')."</a></div>"; +echo "<form name=\"active\" method=\"post\" action=\"module.php?mod=googlemap&mod_action=admin_places&parent=$parent&display=$display\"><div id=\"gm_active\">"; +echo WT_I18N::translate('Click here to show inactive places'); echo help_link('PLE_ACTIVE','googlemap'); -echo "</td></tr></table>"; -echo "</form>"; +echo "<input type=\"checkbox\" name=\"display\" value=\"inactive\""; +if ($display == 'inactive') echo " checked=\"checked\""; +echo "> <input type=\"submit\" value=\"", WT_I18N::translate('View'), "\" >"; +echo "</div></form>"; $placelist=get_place_list_loc($parent, $display); -echo "<table class=\"facts_table\"><tr>"; -echo "<th class=\"descriptionbox\">", translate_fact('PLAC'), "</th>"; -echo "<th class=\"descriptionbox\">", translate_fact('LATI'), "</th>"; -echo "<th class=\"descriptionbox\">", translate_fact('LONG'), "</th>"; -echo "<th class=\"descriptionbox\">".WT_I18N::translate('Zoom factor')."</th>"; -echo "<th class=\"descriptionbox\">".WT_I18N::translate('Icon')."</th>"; -echo "<th class=\"descriptionbox\" colspan=\"2\">"; +echo "<table id=\"gm_plac_edit\"><tr>"; +echo "<th>", translate_fact('PLAC'), "</th>"; +echo "<th>", translate_fact('LATI'), "</th>"; +echo "<th>", translate_fact('LONG'), "</th>"; +echo "<th>".WT_I18N::translate('Zoom factor')."</th>"; +echo "<th>".WT_I18N::translate('Icon')."</th>"; +echo "<th colspan=\"2\">"; echo WT_I18N::translate('Edit geographic location'), help_link('PL_EDIT_LOCATION','googlemap'), "</th></tr>"; if (count($placelist) == 0) - echo "<tr><td colspan=\"7\" class=\"facts_value\">", WT_I18N::translate('No places found'), "</td></tr>"; + echo "<tr><td colspan=\"7\" class=\"accepted\">", WT_I18N::translate('No places found'), "</td></tr>"; foreach ($placelist as $place) { - echo "<tr><td class=\"optionbox\"><a href=\"module.php?mod=googlemap&mod_action=admin_places&parent={$place['place_id']}&display={$display}\">"; + echo "<tr><td><a href=\"module.php?mod=googlemap&mod_action=admin_places&parent={$place['place_id']}&display={$display}\">"; if ($place["place"] != "Unknown") echo PrintReady($place["place"]), "</a></td>"; else echo WT_I18N::translate('unknown'), "</a></td>"; - echo "<td class=\"optionbox\">{$place['lati']}</td>"; - echo "<td class=\"optionbox\">{$place['long']}</td>"; - echo "<td class=\"optionbox\">{$place['zoom']}</td>"; - echo "<td class=\"optionbox\">"; + echo "<td>{$place['lati']}</td>"; + echo "<td>{$place['long']}</td>"; + echo "<td>{$place['zoom']}</td>"; + echo "<td>"; if (($place["icon"] == NULL) || ($place["icon"] == "")) { if (($place['lati'] == NULL) || ($place['long'] == NULL) || (($place['lati'] == "0") && ($place['long'] == "0"))) { echo " "; @@ -609,15 +609,15 @@ foreach ($placelist as $place) { echo "<img src=\"", $place["icon"], " \"width=\"25\" height=\"15\">"; } echo "</td>"; - echo "<td class=\"optionbox\"><a href=\"javascript:;\" onclick=\"edit_place_location({$place['place_id']});return false;\">", WT_I18N::translate('Edit'), "</a></td>"; + echo "<td class=\"narrow\"><a href=\"javascript:;\" onclick=\"edit_place_location({$place['place_id']});return false;\"><img src=\"", $WT_IMAGES["edit"], "\" border=\"0\" alt=\"", WT_I18N::translate("Edit"), "\" /></a></td>"; $noRows= WT_DB::prepare("SELECT COUNT(pl_id) FROM `##placelocation` WHERE pl_parent_id=?") ->execute(array($place["place_id"])) ->fetchOne(); if ($noRows==0) { ?> - <td class="optionbox"><a href="javascript:;" onclick="delete_place(<?php echo $place["place_id"], ");return false;\">"; ?><img src="images/remove.gif" border="0" alt="<?php echo WT_I18N::translate('Remove'); ?>" /></a></td> + <td><a href="javascript:;" onclick="delete_place(<?php echo $place["place_id"], ");return false;\">"; ?><img src="<?php echo $WT_IMAGES["remove"];?>" border="0" alt="<?php echo WT_I18N::translate('Remove'); ?>" /></a></td> <?php } else { ?> - <td class="optionbox"><img src="images/remove-dis.png" border="0" alt="" /> </td> + <td><img src="<?php echo $WT_IMAGES["remove_grey"];?>" border="0" alt="" /> </td> <?php } ?> </tr> <?php @@ -626,19 +626,17 @@ foreach ($placelist as $place) { </table> <?php ?> - <table class="facts_table"> - <tr> - <td class="optionbox" colspan="2"><a href="javascript:;" onclick="add_place_location(<?php echo $parent; ?>);return false;"><?php echo WT_I18N::translate('Add place'); ?></a><?php echo help_link('PL_ADD_LOCATION','googlemap'); ?></td> - </tr> + <table id="gm_manage"> <tr> - <td class="optionbox"><a href="module.php?mod=googlemap&mod_action=admin_places&action=ImportGedcom&mode=curr"><?php echo WT_I18N::translate('Import from current GEDCOM'); ?></a><?php echo help_link('PL_IMPORT_GEDCOM','googlemap'); ?></td> - <td class="optionbox"><a href="module.php?mod=googlemap&mod_action=admin_places&action=ImportGedcom&mode=all"><?php echo WT_I18N::translate('Import from all GEDCOMs'); ?></a><?php echo help_link('PL_IMPORT_ALL_GEDCOM','googlemap'); ?></td> + <td colspan="3"><a href="javascript:;" onclick="add_place_location(<?php echo $parent; ?>);return false;"><?php echo WT_I18N::translate('Add place'); ?></a><?php echo help_link('PL_ADD_LOCATION','googlemap'); ?></td> </tr> <tr> - <td class="optionbox" colspan="2"><a href="module.php?mod=googlemap&mod_action=admin_places&action=ImportFile&mode=add"><?php echo WT_I18N::translate('Import from file'); ?></a><?php echo help_link('PL_IMPORT_FILE','googlemap'); ?></td> + <td><a href="module.php?mod=googlemap&mod_action=admin_places&action=ImportGedcom&mode=curr"><?php echo WT_I18N::translate('Import from current GEDCOM'); ?></a><?php echo help_link('PL_IMPORT_GEDCOM','googlemap'); ?></td> + <td><a href="module.php?mod=googlemap&mod_action=admin_places&action=ImportGedcom&mode=all"><?php echo WT_I18N::translate('Import from all GEDCOMs'); ?></a><?php echo help_link('PL_IMPORT_ALL_GEDCOM','googlemap'); ?></td> + <td><a href="module.php?mod=googlemap&mod_action=admin_places&action=ImportFile&mode=add"><?php echo WT_I18N::translate('Import from file'); ?></a><?php echo help_link('PL_IMPORT_FILE','googlemap'); ?></td> </tr> <tr> - <td class="optionbox"> + <td> <?php if (count($where_am_i)<=4) { echo "<a href=\"module.php?mod=googlemap&mod_action=admin_places&action=ExportFile&parent={$parent}\">"; @@ -647,11 +645,11 @@ foreach ($placelist as $place) { } else { echo " "; } - echo "</td><td class=\"optionbox\">"; + echo "</td><td colspan=\"2\">"; echo "<a href=\"module.php?mod=googlemap&mod_action=admin_places&action=ExportFile&parent=0\">"; echo WT_I18N::translate('Export all locations to file'), "</a>"; echo help_link('PL_EXPORT_ALL_FILE','googlemap'); - echo "</td></tr></table><br />"; + echo "</td></tr></table>"; if (empty($SEARCH_SPIDER)) print_footer(); else { diff --git a/themes/_administration/images/delete_grey.png b/themes/_administration/images/delete_grey.png Binary files differnew file mode 100644 index 0000000000..b489f3d924 --- /dev/null +++ b/themes/_administration/images/delete_grey.png diff --git a/themes/_administration/images/edit.png b/themes/_administration/images/edit.png Binary files differindex 0c0759811e..5eacc770dc 100644 --- a/themes/_administration/images/edit.png +++ b/themes/_administration/images/edit.png diff --git a/themes/_administration/style.css b/themes/_administration/style.css index c59bb5a39a..a1c1dea730 100644 --- a/themes/_administration/style.css +++ b/themes/_administration/style.css @@ -40,7 +40,7 @@ h3 {margin:0} h4 {margin: 5px 3px; font-weight:normal; font-style:italic;} .icon {border:none; padding-left:0pt;padding-right:5pt;} .warning, .error, .red { font-weight:bold; color:red;} -.accepted { font-weight:bold; color:green;} +.accepted {font-weight:bold; color:green;} .center {text-align:center;} .ltr {text-align:left;} .rtl {text-align:right;} @@ -247,9 +247,28 @@ table#faq_module, table#faq_module2 {background:OldLace; border:1px inset #D9D6C #faq_module2 th, #faq_module2 td {vertical-align:top; text-align:left;} /* GOOGLEMAP MODULE*/ -table#gm_config {background:OldLace; border:1px inset #D9D6C4; border-collapse: separate; border-spacing: 0; margin:10px 0; width:98%;} +table#gm_config {background:OldLace; border:1px inset #D9D6C4; border-collapse: separate; border-spacing: 0; margin:0 auto 10px; width:100%;} #gm_config th {font-size:105%; font-weight:bold; padding:5px; text-align: left;} table#gm_edit_config {background:OldLace; border:1px inset #D9D6C4; border-collapse: separate; border-spacing: 0; margin:10px 0; width:98%;} #gm_edit_config th {border-bottom:1px solid LightGrey; font-weight:bold; padding:5px; text-align: left; vertical-align:top;} #gm_edit_config td {border-bottom:1px solid LightGrey; margin-left:20px;} - +#gm_breadcrumb, #gm_breadcrumb a { color:green; font-weight:bold; font=size:105%; margin-bottom:5px; padding:5px;} +#gm_active {padding: 5px; vertical-align:top;} +table#gm_plac_edit {background:OldLace; border:1px inset #D9D6C4; border-collapse: separate; border-spacing: 0; margin:10px 0; padding: 0 5px; width:98%;} +#gm_plac_edit th {border-bottom:2px solid LightGrey; font-size:105%; font-weight:bold; padding:5px; text-align: left;} +#gm_plac_edit td {border-bottom:1px solid LightGrey;} +table#gm_manage {background:OldLace; border:1px inset #D9D6C4; border-collapse: separate; border-spacing: 0; margin:10px 0; padding: 0 5px; width:98%;} +#gm_manage td {border-bottom:1px solid LightGrey;} +table.gm_check_outer {border-collapse: separate; border-spacing: 0; height:100px; overflow:auto; width:98%} +.gm_check_top {background:OldLace; border:1px inset #D9D6C4; border-collapse: separate; border-spacing: 0; margin:0; padding: 0;} +.gm_check_top th {border-bottom:2px solid LightGrey; font-size:105%; font-weight:bold; padding:5px; text-align: center; white-space:nowrap;} +.gm_check_top td {border-bottom:1px solid LightGrey; padding:3px; white-space:nowrap;} +.gm_check_top .check_comment {font-size:75%; white-space:normal;} +.gm_check_top a, .gm_check_top a:hover {color:blue;} +div.gm_check_top {padding:5px;} +#gm_check_title {padding: 5px;} +#gm_check_title span {font-weight:bold;} +div.gm_check_details {width:98%; max-height:420px; overflow:auto;} +table.gm_check_details {background:OldLace; border:1px inset #D9D6C4; border-collapse: separate; border-spacing: 0; margin:10px 0; width:100%;} +.gm_check_details th {border-right:1px solid LightGrey; border-left:1px solid LightGrey; border-bottom:2px solid LightGrey; border-top:0; font-size:95%; font-weight:bold; padding:2px; text-align: center;} +.gm_check_details td {border:1px solid LightGrey; border-top:0; font-size:95%;}
\ No newline at end of file diff --git a/themes/_administration/theme.php b/themes/_administration/theme.php index 2dbb533d2d..c13ac7efd9 100644 --- a/themes/_administration/theme.php +++ b/themes/_administration/theme.php @@ -42,6 +42,7 @@ $WT_USE_HELPIMG = true; $WT_IMAGES=array(
'webtrees'=>WT_THEME_DIR.'images/webtrees_s.png',
'help'=>WT_THEME_DIR.'images/help.png',
+ 'edit'=>WT_THEME_DIR.'images/edit.png',
'email'=>WT_THEME_DIR.'images/email.png',
'open'=>WT_THEME_DIR.'images/open.png',
'close'=>WT_THEME_DIR.'images/close.png',
@@ -51,6 +52,7 @@ $WT_IMAGES=array( 'minus'=>WT_THEME_DIR.'images/minus.gif',
'plus'=>WT_THEME_DIR.'images/open.png',
'remove'=>WT_THEME_DIR.'images/delete.png',
+ 'remove_grey'=>WT_THEME_DIR.'images/delete_grey.png',
'rarrow2'=>WT_THEME_DIR.'images/rarrow2.gif',
'larrow2'=>WT_THEME_DIR.'images/larrow2.gif',
'darrow2'=>WT_THEME_DIR.'images/darrow2.gif',
|
