diff options
26 files changed, 64 insertions, 118 deletions
diff --git a/admin_media.php b/admin_media.php index 91a78ab80c..8f18e1e96b 100644 --- a/admin_media.php +++ b/admin_media.php @@ -371,7 +371,7 @@ function media_paths($media_folder) { " FROM `##media`" . " JOIN `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" . " WHERE setting_value = :media_folder" . - " AND m_filename NOT LIKE 'http://%'" . + " AND m_filename NOT LIKE 'http://%'" . " AND m_filename NOT LIKE 'https://%'" . " GROUP BY 1" . " ORDER BY 1" @@ -456,7 +456,7 @@ function all_media_files($media_folder, $media_path, $subfolders, $filter) { " AND m_filename LIKE CONCAT(:media_path_2, '%')" . " AND (SUBSTRING_INDEX(m_filename, '/', -1) LIKE CONCAT('%', :filter_1, '%')" . " OR m_titl LIKE CONCAT('%', :filter_2, '%'))" . - " AND m_filename NOT LIKE 'http://%'" . + " AND m_filename NOT LIKE 'http://%'" . " AND m_filename NOT LIKE 'https://%'" )->execute(array( 'media_path_1' => $media_path, diff --git a/app/Functions/FunctionsRtl.php b/app/Functions/FunctionsRtl.php index 7d9d943496..9f6d7ac242 100644 --- a/app/Functions/FunctionsRtl.php +++ b/app/Functions/FunctionsRtl.php @@ -96,7 +96,7 @@ class FunctionsRtl { $workingText = str_replace(array('<span class="starredname"><br>', '<span<br>class="starredname">'), '<br><span class="starredname">', $workingText); // Reposition some incorrectly placed line breaks $workingText = self::stripLrmRlm($workingText); // Get rid of any existing UTF8 control codes - // $nothing = '‌'; // Zero Width Non-Joiner (not sure whether this is still needed to work around a TCPDF bug) + // $nothing = '‌'; // Zero Width Non-Joiner (not sure whether this is still needed to work around a TCPDF bug) $nothing = ''; self::$startLTR = '<LTR>'; // This will become '<span dir="ltr">' at the end diff --git a/app/Module/BatchUpdateModule.php b/app/Module/BatchUpdateModule.php index e61b51405b..d3418a6c0c 100644 --- a/app/Module/BatchUpdateModule.php +++ b/app/Module/BatchUpdateModule.php @@ -241,7 +241,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface <div id="batch_update2" class="col-sm-12"> <?php if ($this->curr_xref): ?> <?php // Create an object, so we can get the latest version of the name. ?> - <?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE); ?> + <?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE); ?> <div class="form-group"> <?php echo self::createSubmitButton(I18N::translate('previous'), $this->prev_xref) ?> <?php echo self::createSubmitButton(I18N::translate('next'), $this->next_xref) ?> diff --git a/app/Module/ClippingsCartModule.php b/app/Module/ClippingsCartModule.php index d5e8303f73..65036dfc20 100644 --- a/app/Module/ClippingsCartModule.php +++ b/app/Module/ClippingsCartModule.php @@ -356,7 +356,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface, </td> <td class="optionbox"><input type="checkbox" name="IncludeMedia" value="yes"></td></tr> - <?php if (Auth::isManager($WT_TREE)) { ?> + <?php if (Auth::isManager($WT_TREE)) { ?> <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Apply privacy settings'); ?></td> <td class="optionbox"> <input type="radio" name="privatize_export" value="none" checked> <?php echo I18N::translate('None'); ?><br> @@ -694,17 +694,17 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface, $out .= '<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings') . '</td>' . '<td class="optionbox">' . - ' <input type="radio" name="privatize_export" value="none" checked> ' . I18N::translate('None') . '<br>' . - ' <input type="radio" name="privatize_export" value="gedadmin"> ' . I18N::translate('Manager') . '<br>' . - ' <input type="radio" name="privatize_export" value="user"> ' . I18N::translate('Member') . '<br>' . - ' <input type="radio" name="privatize_export" value="visitor"> ' . I18N::translate('Visitor') . + '<input type="radio" name="privatize_export" value="none" checked> ' . I18N::translate('None') . '<br>' . + '<input type="radio" name="privatize_export" value="gedadmin"> ' . I18N::translate('Manager') . '<br>' . + '<input type="radio" name="privatize_export" value="user"> ' . I18N::translate('Member') . '<br>' . + '<input type="radio" name="privatize_export" value="visitor"> ' . I18N::translate('Visitor') . '</td></tr>'; } elseif (Auth::isMember($WT_TREE)) { $out .= '<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings') . '</td>' . '<td class="list_value">' . - ' <input type="radio" name="privatize_export" value="user" checked> ' . I18N::translate('Member') . '<br>' . - ' <input type="radio" name="privatize_export" value="visitor"> ' . I18N::translate('Visitor') . + '<input type="radio" name="privatize_export" value="user" checked> ' . I18N::translate('Member') . '<br>' . + '<input type="radio" name="privatize_export" value="visitor"> ' . I18N::translate('Visitor') . '</td></tr>'; } diff --git a/app/Module/GoogleMapsModule.php b/app/Module/GoogleMapsModule.php index 2359ac35cc..8c9b08726a 100644 --- a/app/Module/GoogleMapsModule.php +++ b/app/Module/GoogleMapsModule.php @@ -480,8 +480,8 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, <div class="col-sm-9"> <?php $ph_options = array( - 'G_DEFAULT_ICON' => I18N::translate('Standard'), - 'G_FLAG' => I18N::translate('Flag'), + 'G_DEFAULT_ICON' => I18N::translate('Standard'), + 'G_FLAG' => I18N::translate('Flag'), ); echo FunctionsEdit::selectEditControl('GM_PH_MARKER', $ph_options, null, $this->getSetting('GM_PH_MARKER'), 'class="form-control"'); ?> @@ -2740,9 +2740,8 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, echo "</td></tr>"; echo "</table>"; } - // Next line puts Place hierarchy on new row ----- echo '</td></tr><tr>'; - } // End Streetview window =================================================================== + } } /** @@ -2961,11 +2960,6 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, new google.maps.Point(0,0), new google.maps.Point(9, 34)); } - // *** Clickable area of icon - To be refined later *** =================================== - // var iconShape = { - // coord: [9,0,6,1,4,2,2,4,0,8,0,12,1,14,2,16,5,19,7,23,8,26,9,30,9,34,11,34,11,30,12,26,13,24,14,21,16,18,18,16,20,12,20,8,18,4,16,2,15,1,13,0], - // type: "poly" - // }; } else { var iconImage = new google.maps.MarkerImage("https://maps.google.com/mapfiles/marker.png", new google.maps.Size(20, 34), @@ -2975,11 +2969,6 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, new google.maps.Size(37, 34), new google.maps.Point(0,0), new google.maps.Point(9, 34)); - // *** Clickable area of icon - To be refined later *** =================================== - // var iconShape = { - // coord: [9,0,6,1,4,2,2,4,0,8,0,12,1,14,2,16,5,19,7,23,8,26,9,30,9,34,11,34,11,30,12,26,13,24,14,21,16,18,18,16,20,12,20,8,18,4,16,2,15,1,13,0], - // type: "poly" - // }; } var posn = new google.maps.LatLng(0,0); var marker = new google.maps.Marker({ @@ -3513,8 +3502,8 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, } else if (pl_name == 'England') { // England var returnGeom1 = '-4.74361,50.66750|-4.78361,50.59361|-4.91584,50.57722|-5.01750,50.54264|-5.02569,50.47271|-5.04729,50.42750|-5.15208,50.34374|-5.26805,50.27389|-5.43194,50.19326|-5.49584,50.21695|-5.54639,50.20527|-5.71000,50.12916|-5.71681,50.06083|-5.66174,50.03631|-5.58278,50.04777|-5.54166,50.07055|-5.53416,50.11569|-5.47055,50.12499|-5.33361,50.09138|-5.27666,50.05972|-5.25674,50.00514|-5.19306,49.95527|-5.16070,50.00319|-5.06555,50.03750|-5.07090,50.08166|-5.04806,50.17111|-4.95278,50.19333|-4.85750,50.23166|-4.76250,50.31138|-4.67861,50.32583|-4.54334,50.32222|-4.48278,50.32583|-4.42972,50.35139|-4.38000,50.36388|-4.16555,50.37028|-4.11139,50.33027|-4.05708,50.29791|-3.94389,50.31346|-3.87764,50.28139|-3.83653,50.22972|-3.78944,50.21222|-3.70666,50.20972|-3.65195,50.23111|-3.55139,50.43833|-3.49416,50.54639|-3.46181,50.58792|-3.41139,50.61610|-3.24416,50.67444|-3.17347,50.68833|-3.09445,50.69222|-2.97806,50.70638|-2.92750,50.73125|-2.88278,50.73111|-2.82305,50.72027|-2.77139,50.70861|-2.66195,50.67334|-2.56305,50.63222|-2.45861,50.57500|-2.44666,50.62639|-2.39097,50.64166|-2.19722,50.62611|-2.12195,50.60722|-2.05445,50.58569|-1.96437,50.59674|-1.95441,50.66536|-2.06681,50.71430|-1.93416,50.71277|-1.81639,50.72306|-1.68445,50.73888|-1.59278,50.72416|-1.33139,50.79138|-1.11695,50.80694|-1.15889,50.84083|-1.09445,50.84584|-0.92842,50.83966|-0.86584,50.79965|-0.90826,50.77396|-0.78187,50.72722|-0.74611,50.76583|-0.67528,50.78111|-0.57722,50.79527|-0.25500,50.82638|-0.19084,50.82583|-0.13805,50.81833|0.05695,50.78083|0.12334,50.75944|0.22778,50.73944|0.28695,50.76500|0.37195,50.81638|0.43084,50.83111|0.56722,50.84777|0.67889,50.87681|0.71639,50.90500|0.79334,50.93610|0.85666,50.92556|0.97125,50.98111|0.99778,51.01903|1.04555,51.04944|1.10028,51.07361|1.26250,51.10166|1.36889,51.13583|1.41111,51.20111|1.42750,51.33111|1.38556,51.38777|1.19195,51.37861|1.05278,51.36722|0.99916,51.34777|0.90806,51.34069|0.70416,51.37749|0.61972,51.38304|0.55945,51.40596|0.64236,51.44042|0.69750,51.47084|0.59195,51.48777|0.53611,51.48806|0.48916,51.48445|0.45215,51.45562|0.38894,51.44822|0.46500,51.50306|0.65195,51.53680|0.76695,51.52138|0.82084,51.53556|0.87528,51.56110|0.95250,51.60923|0.94695,51.72556|0.90257,51.73465|0.86306,51.71166|0.76140,51.69164|0.70111,51.71847|0.86211,51.77361|0.93236,51.80583|0.98278,51.82527|1.03569,51.77416|1.08834,51.77056|1.13222,51.77694|1.18139,51.78972|1.22361,51.80888|1.26611,51.83916|1.28097,51.88096|1.20834,51.95083|1.16347,52.02361|1.27750,51.98555|1.33125,51.92875|1.39028,51.96999|1.58736,52.08388|1.63000,52.19527|1.68576,52.32630|1.73028,52.41138|1.74945,52.45583|1.74590,52.62021|1.70250,52.71583|1.64528,52.77111|1.50361,52.83749|1.43222,52.87472|1.35250,52.90972|1.28222,52.92750|1.18389,52.93889|0.99472,52.95111|0.94222,52.95083|0.88472,52.96638|0.66722,52.97611|0.54778,52.96618|0.49139,52.93430|0.44431,52.86569|0.42903,52.82403|0.36334,52.78027|0.21778,52.80694|0.16125,52.86250|0.05778,52.88916|0.00211,52.87985|0.03222,52.91722|0.20389,53.02805|0.27666,53.06694|0.33916,53.09236|0.35389,53.18722|0.33958,53.23472|0.23555,53.39944|0.14347,53.47527|0.08528,53.48638|0.02694,53.50972|-0.10084,53.57306|-0.20722,53.63083|-0.26445,53.69083|-0.30166,53.71319|-0.39022,53.70794|-0.51972,53.68527|-0.71653,53.69638|-0.65445,53.72527|-0.60584,53.72972|-0.54916,53.70611|-0.42261,53.71755|-0.35728,53.73056|-0.29389,53.73666|-0.23139,53.72166|-0.10584,53.63166|-0.03472,53.62555|0.04416,53.63916|0.08916,53.62666|0.14945,53.58847|0.12639,53.64527|0.06264,53.70389|-0.12750,53.86388|-0.16916,53.91847|-0.21222,54.00833|-0.20569,54.05153|-0.16111,54.08806|-0.11694,54.13222|-0.20053,54.15171|-0.26250,54.17444|-0.39334,54.27277|-0.42166,54.33222|-0.45750,54.37694|-0.51847,54.44749|-0.56472,54.48000|-0.87584,54.57027|-1.06139,54.61722|-1.16528,54.64972|-1.30445,54.77138|-1.34556,54.87138|-1.41278,54.99944|-1.48292,55.08625|-1.51500,55.14972|-1.56584,55.28722|-1.58097,55.48361|-1.63597,55.58194|-1.69000,55.60556|-1.74695,55.62499|-1.81764,55.63306|-1.97681,55.75416|-2.02166,55.80611|-2.08361,55.78054|-2.22000,55.66499|-2.27916,55.64472|-2.27416,55.57527|-2.21528,55.50583|-2.18278,55.45985|-2.21236,55.42777|-2.46305,55.36111|-2.63055,55.25500|-2.69945,55.17722|-2.96278,55.03889|-3.01500,55.05222|-3.05103,54.97986|-3.13292,54.93139|-3.20861,54.94944|-3.28931,54.93792|-3.39166,54.87639|-3.42916,54.81555|-3.56916,54.64249|-3.61306,54.48861|-3.49305,54.40333|-3.43389,54.34806|-3.41056,54.28014|-3.38055,54.24444|-3.21472,54.09555|-3.15222,54.08194|-2.93097,54.15333|-2.81361,54.22277|-2.81750,54.14277|-2.83361,54.08500|-2.93250,53.95055|-3.05264,53.90764|-3.03708,53.74944|-2.99278,53.73277|-2.89979,53.72499|-2.97729,53.69382|-3.07306,53.59805|-3.10563,53.55993|-3.00678,53.41738|-2.95389,53.36027|-2.85736,53.32083|-2.70493,53.35062|-2.77639,53.29250|-2.89972,53.28916|-2.94250,53.31056|-3.02889,53.38191|-3.07248,53.40936|-3.16695,53.35708|-3.12611,53.32500|-3.08860,53.26001|-3.02000,53.24722|-2.95528,53.21555|-2.91069,53.17014|-2.89389,53.10416|-2.85695,53.03249|-2.77792,52.98514|-2.73109,52.96873|-2.71945,52.91902|-2.79278,52.90207|-2.85069,52.93875|-2.99389,52.95361|-3.08639,52.91611|-3.13014,52.88486|-3.13708,52.79312|-3.06806,52.77027|-3.01111,52.71166|-3.06666,52.63527|-3.11750,52.58666|-3.07089,52.55702|-3.00792,52.56902|-2.98028,52.53083|-3.02736,52.49792|-3.11916,52.49194|-3.19514,52.46722|-3.19611,52.41027|-3.02195,52.34027|-2.95486,52.33117|-2.99750,52.28139|-3.05125,52.23347|-3.07555,52.14804|-3.12222,52.11805|-3.11250,52.06945|-3.08500,52.01930|-3.04528,51.97639|-2.98889,51.92555|-2.91757,51.91569|-2.86639,51.92889|-2.77861,51.88583|-2.65944,51.81806|-2.68334,51.76957|-2.68666,51.71889|-2.66500,51.61500|-2.62916,51.64416|-2.57889,51.67777|-2.46056,51.74666|-2.40389,51.74041|-2.47166,51.72445|-2.55305,51.65722|-2.65334,51.56389|-2.77055,51.48916|-2.85278,51.44472|-2.96000,51.37499|-3.00695,51.30722|-3.01278,51.25632|-3.02834,51.20611|-3.30139,51.18111|-3.39361,51.18138|-3.43729,51.20638|-3.50722,51.22333|-3.57014,51.23027|-3.63222,51.21805|-3.70028,51.23000|-3.79250,51.23916|-3.88389,51.22416|-3.98472,51.21695|-4.11666,51.21222|-4.22805,51.18777|-4.22028,51.11054|-4.23702,51.04659|-4.30361,51.00416|-4.37639,50.99110|-4.42736,51.00958|-4.47445,51.01416|-4.52132,51.01424|-4.54334,50.92694|-4.56139,50.77625|-4.65139,50.71527|-4.74361,50.66750'; //|-3.08860,53.26001|-3.33639,53.34722|-3.38806,53.34361|-3.60986,53.27944|-3.73014,53.28944|-3.85445,53.28444|-4.01861,53.23750|-4.06639,53.22639|-4.15334,53.22556|-4.19639,53.20611|-4.33028,53.11222|-4.36097,53.02888|-4.55278,52.92889|-4.61889,52.90916|-4.72195,52.83611|-4.72778,52.78139|-4.53945,52.79306|-4.47722,52.85500|-4.41416,52.88472|-4.31292,52.90499|-4.23334,52.91499|-4.13569,52.87888|-4.13056,52.77777|-4.05334,52.71666|-4.10639,52.65084|-4.12597,52.60375|-4.08056,52.55333|-4.05972,52.48584|-4.09666,52.38583|-4.14305,52.32027|-4.19361,52.27638|-4.23166,52.24888|-4.52722,52.13083|-4.66945,52.13027|-4.73695,52.10361|-4.76778,52.06444|-4.84445,52.01388|-5.09945,51.96056|-5.23916,51.91638|-5.25889,51.87056|-5.18500,51.86958|-5.11528,51.83333|-5.10257,51.77895|-5.16111,51.76222|-5.24694,51.73027|-5.19111,51.70888|-5.00739,51.70349|-4.90875,51.71249|-4.86111,51.71334|-4.97061,51.67577|-5.02128,51.66861|-5.05139,51.62028|-5.00528,51.60638|-4.94139,51.59416|-4.89028,51.62694|-4.83569,51.64534|-4.79063,51.63340|-4.69028,51.66666|-4.64584,51.72666|-4.57445,51.73416|-4.43611,51.73722|-4.26222,51.67694|-4.19750,51.67916|-4.06614,51.66804|-4.11639,51.63416|-4.17750,51.62235|-4.25055,51.62861|-4.29208,51.60743|-4.27778,51.55666|-4.20486,51.53527|-3.94972,51.61278|-3.83792,51.61999|-3.78166,51.56750|-3.75160,51.52931|-3.67194,51.47388|-3.54250,51.39777|-3.40334,51.37972|-3.27097,51.38014|-3.16458,51.40909|-3.15166,51.45305|-3.11875,51.48750|-3.02111,51.52527|-2.95472,51.53972|-2.89278,51.53861|-2.84778,51.54500|-2.71472,51.58083|-2.66500,51.61500|-2.68666,51.71889|-2.68334,51.76957|-2.65944,51.81806|-2.77861,51.88583|-2.86639,51.92889|-2.91757,51.91569|-2.98889,51.92555|-3.04528,51.97639|-3.08500,52.01930|-3.11250,52.06945|-3.12222,52.11805|-3.07555,52.14804|-3.05125,52.23347|-2.99750,52.28139|-2.95486,52.33117|-3.02195,52.34027|-3.19611,52.41027|-3.19514,52.46722|-3.11916,52.49194|-3.02736,52.49792|-2.98028,52.53083|-3.00792,52.56902|-3.07089,52.55702|-3.11750,52.58666|-3.06666,52.63527|-3.01111,52.71166|-3.06806,52.77027|-3.13708,52.79312|-3.13014,52.88486|-3.08639,52.91611|-2.99389,52.95361|-2.85069,52.93875|-2.79278,52.90207|-2.71945,52.91902|-2.73109,52.96873|-2.77792,52.98514|-2.85695,53.03249|-2.89389,53.10416|-2.91069,53.17014|-2.95528,53.21555|-3.02000,53.24722|-3.08860,53.26001'; - // Wales Test - // var returnGeom2 = '-3.08860,53.26001|-3.33639,53.34722|-3.38806,53.34361|-3.60986,53.27944|-3.73014,53.28944|-3.85445,53.28444|-4.01861,53.23750|-4.06639,53.22639|-4.15334,53.22556|-4.19639,53.20611|-4.33028,53.11222|-4.36097,53.02888|-4.55278,52.92889|-4.61889,52.90916|-4.72195,52.83611|-4.72778,52.78139|-4.53945,52.79306|-4.47722,52.85500|-4.41416,52.88472|-4.31292,52.90499|-4.23334,52.91499|-4.13569,52.87888|-4.13056,52.77777|-4.05334,52.71666|-4.10639,52.65084|-4.12597,52.60375|-4.08056,52.55333|-4.05972,52.48584|-4.09666,52.38583|-4.14305,52.32027|-4.19361,52.27638|-4.23166,52.24888|-4.52722,52.13083|-4.66945,52.13027|-4.73695,52.10361|-4.76778,52.06444|-4.84445,52.01388|-5.09945,51.96056|-5.23916,51.91638|-5.25889,51.87056|-5.18500,51.86958|-5.11528,51.83333|-5.10257,51.77895|-5.16111,51.76222|-5.24694,51.73027|-5.19111,51.70888|-5.00739,51.70349|-4.90875,51.71249|-4.86111,51.71334|-4.97061,51.67577|-5.02128,51.66861|-5.05139,51.62028|-5.00528,51.60638|-4.94139,51.59416|-4.89028,51.62694|-4.83569,51.64534|-4.79063,51.63340|-4.69028,51.66666|-4.64584,51.72666|-4.57445,51.73416|-4.43611,51.73722|-4.26222,51.67694|-4.19750,51.67916|-4.06614,51.66804|-4.11639,51.63416|-4.17750,51.62235|-4.25055,51.62861|-4.29208,51.60743|-4.27778,51.55666|-4.20486,51.53527|-3.94972,51.61278|-3.83792,51.61999|-3.78166,51.56750|-3.75160,51.52931|-3.67194,51.47388|-3.54250,51.39777|-3.40334,51.37972|-3.27097,51.38014|-3.16458,51.40909|-3.15166,51.45305|-3.11875,51.48750|-3.02111,51.52527|-2.95472,51.53972|-2.89278,51.53861|-2.84778,51.54500|-2.71472,51.58083|-2.66500,51.61500|-2.68666,51.71889|-2.68334,51.76957|-2.65944,51.81806|-2.77861,51.88583|-2.86639,51.92889|-2.91757,51.91569|-2.98889,51.92555|-3.04528,51.97639|-3.08500,52.01930|-3.11250,52.06945|-3.12222,52.11805|-3.07555,52.14804|-3.05125,52.23347|-2.99750,52.28139|-2.95486,52.33117|-3.02195,52.34027|-3.19611,52.41027|-3.19514,52.46722|-3.11916,52.49194|-3.02736,52.49792|-2.98028,52.53083|-3.00792,52.56902|-3.07089,52.55702|-3.11750,52.58666|-3.06666,52.63527|-3.01111,52.71166|-3.06806,52.77027|-3.13708,52.79312|-3.13014,52.88486|-3.08639,52.91611|-2.99389,52.95361|-2.85069,52.93875|-2.79278,52.90207|-2.71945,52.91902|-2.73109,52.96873|-2.77792,52.98514|-2.85695,53.03249|-2.89389,53.10416|-2.91069,53.17014|-2.95528,53.21555|-3.02000,53.24722|-3.08860,53.26001'; + // Wales Test + // var returnGeom2 = '-3.08860,53.26001|-3.33639,53.34722|-3.38806,53.34361|-3.60986,53.27944|-3.73014,53.28944|-3.85445,53.28444|-4.01861,53.23750|-4.06639,53.22639|-4.15334,53.22556|-4.19639,53.20611|-4.33028,53.11222|-4.36097,53.02888|-4.55278,52.92889|-4.61889,52.90916|-4.72195,52.83611|-4.72778,52.78139|-4.53945,52.79306|-4.47722,52.85500|-4.41416,52.88472|-4.31292,52.90499|-4.23334,52.91499|-4.13569,52.87888|-4.13056,52.77777|-4.05334,52.71666|-4.10639,52.65084|-4.12597,52.60375|-4.08056,52.55333|-4.05972,52.48584|-4.09666,52.38583|-4.14305,52.32027|-4.19361,52.27638|-4.23166,52.24888|-4.52722,52.13083|-4.66945,52.13027|-4.73695,52.10361|-4.76778,52.06444|-4.84445,52.01388|-5.09945,51.96056|-5.23916,51.91638|-5.25889,51.87056|-5.18500,51.86958|-5.11528,51.83333|-5.10257,51.77895|-5.16111,51.76222|-5.24694,51.73027|-5.19111,51.70888|-5.00739,51.70349|-4.90875,51.71249|-4.86111,51.71334|-4.97061,51.67577|-5.02128,51.66861|-5.05139,51.62028|-5.00528,51.60638|-4.94139,51.59416|-4.89028,51.62694|-4.83569,51.64534|-4.79063,51.63340|-4.69028,51.66666|-4.64584,51.72666|-4.57445,51.73416|-4.43611,51.73722|-4.26222,51.67694|-4.19750,51.67916|-4.06614,51.66804|-4.11639,51.63416|-4.17750,51.62235|-4.25055,51.62861|-4.29208,51.60743|-4.27778,51.55666|-4.20486,51.53527|-3.94972,51.61278|-3.83792,51.61999|-3.78166,51.56750|-3.75160,51.52931|-3.67194,51.47388|-3.54250,51.39777|-3.40334,51.37972|-3.27097,51.38014|-3.16458,51.40909|-3.15166,51.45305|-3.11875,51.48750|-3.02111,51.52527|-2.95472,51.53972|-2.89278,51.53861|-2.84778,51.54500|-2.71472,51.58083|-2.66500,51.61500|-2.68666,51.71889|-2.68334,51.76957|-2.65944,51.81806|-2.77861,51.88583|-2.86639,51.92889|-2.91757,51.91569|-2.98889,51.92555|-3.04528,51.97639|-3.08500,52.01930|-3.11250,52.06945|-3.12222,52.11805|-3.07555,52.14804|-3.05125,52.23347|-2.99750,52.28139|-2.95486,52.33117|-3.02195,52.34027|-3.19611,52.41027|-3.19514,52.46722|-3.11916,52.49194|-3.02736,52.49792|-2.98028,52.53083|-3.00792,52.56902|-3.07089,52.55702|-3.11750,52.58666|-3.06666,52.63527|-3.01111,52.71166|-3.06806,52.77027|-3.13708,52.79312|-3.13014,52.88486|-3.08639,52.91611|-2.99389,52.95361|-2.85069,52.93875|-2.79278,52.90207|-2.71945,52.91902|-2.73109,52.96873|-2.77792,52.98514|-2.85695,53.03249|-2.89389,53.10416|-2.91069,53.17014|-2.95528,53.21555|-3.02000,53.24722|-3.08860,53.26001'; num_arrays = 2; } else if (pl_name == 'Wales') { var returnGeom1 = '-3.08860,53.26001|-3.33639,53.34722|-3.38806,53.34361|-3.60986,53.27944|-3.73014,53.28944|-3.85445,53.28444|-4.01861,53.23750|-4.06639,53.22639|-4.15334,53.22556|-4.19639,53.20611|-4.33028,53.11222|-4.36097,53.02888|-4.55278,52.92889|-4.61889,52.90916|-4.72195,52.83611|-4.72778,52.78139|-4.53945,52.79306|-4.47722,52.85500|-4.41416,52.88472|-4.31292,52.90499|-4.23334,52.91499|-4.13569,52.87888|-4.13056,52.77777|-4.05334,52.71666|-4.10639,52.65084|-4.12597,52.60375|-4.08056,52.55333|-4.05972,52.48584|-4.09666,52.38583|-4.14305,52.32027|-4.19361,52.27638|-4.23166,52.24888|-4.52722,52.13083|-4.66945,52.13027|-4.73695,52.10361|-4.76778,52.06444|-4.84445,52.01388|-5.09945,51.96056|-5.23916,51.91638|-5.25889,51.87056|-5.18500,51.86958|-5.11528,51.83333|-5.10257,51.77895|-5.16111,51.76222|-5.24694,51.73027|-5.19111,51.70888|-5.00739,51.70349|-4.90875,51.71249|-4.86111,51.71334|-4.97061,51.67577|-5.02128,51.66861|-5.05139,51.62028|-5.00528,51.60638|-4.94139,51.59416|-4.89028,51.62694|-4.83569,51.64534|-4.79063,51.63340|-4.69028,51.66666|-4.64584,51.72666|-4.57445,51.73416|-4.43611,51.73722|-4.26222,51.67694|-4.19750,51.67916|-4.06614,51.66804|-4.11639,51.63416|-4.17750,51.62235|-4.25055,51.62861|-4.29208,51.60743|-4.27778,51.55666|-4.20486,51.53527|-3.94972,51.61278|-3.83792,51.61999|-3.78166,51.56750|-3.75160,51.52931|-3.67194,51.47388|-3.54250,51.39777|-3.40334,51.37972|-3.27097,51.38014|-3.16458,51.40909|-3.15166,51.45305|-3.11875,51.48750|-3.02111,51.52527|-2.95472,51.53972|-2.89278,51.53861|-2.84778,51.54500|-2.71472,51.58083|-2.66500,51.61500|-2.68666,51.71889|-2.68334,51.76957|-2.65944,51.81806|-2.77861,51.88583|-2.86639,51.92889|-2.91757,51.91569|-2.98889,51.92555|-3.04528,51.97639|-3.08500,52.01930|-3.11250,52.06945|-3.12222,52.11805|-3.07555,52.14804|-3.05125,52.23347|-2.99750,52.28139|-2.95486,52.33117|-3.02195,52.34027|-3.19611,52.41027|-3.19514,52.46722|-3.11916,52.49194|-3.02736,52.49792|-2.98028,52.53083|-3.00792,52.56902|-3.07089,52.55702|-3.11750,52.58666|-3.06666,52.63527|-3.01111,52.71166|-3.06806,52.77027|-3.13708,52.79312|-3.13014,52.88486|-3.08639,52.91611|-2.99389,52.95361|-2.85069,52.93875|-2.79278,52.90207|-2.71945,52.91902|-2.73109,52.96873|-2.77792,52.98514|-2.85695,53.03249|-2.89389,53.10416|-2.91069,53.17014|-2.95528,53.21555|-3.02000,53.24722|-3.08860,53.26001'; @@ -3529,29 +3518,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, // show nothing } - /* - // Set borders and fill parameters ------- Not finished yet. --------------- - if (map.mapTypeId == 'roadmap') { - var colorStroke = "#444444"; - var weightStroke = 1.2; - var opacityFill = 0.1; - } else if (map.mapTypeId == 'satellite') { - var colorStroke = "#000000"; - var weightStroke = 0.1; - var opacityFill = 0; - } else if (map.mapTypeId == 'hybrid') { - var colorStroke = "#ffffff"; - var weightStroke = 1.2; - var opacityFill = 0; - } else if (map.mapTypeId == 'terrain') { - var colorStroke = "#ffffff"; - var weightStroke = 1.2; - var opacityFill = 0; - } - // ------------------------------------------------------------------------- - */ - - // If showing one country only (num_arrays == 1) --------------------------- + // If showing one country only (num_arrays == 1) // Calculate polygon if (num_arrays == 1 ) { var geomAry1 = returnGeom1.split('|'); @@ -3573,7 +3540,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, polygon1.setMap(map); } - // If showing two countries at the same time (num_arrays == 2) -------------- + // If showing two countries at the same time (num_arrays == 2) if (num_arrays == 2) { // Calculate polygon1 var geomAry1 = returnGeom1.split('|'); @@ -3863,7 +3830,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface, for (var i=0; i<response.length; i++) { // 5 decimal places is approx 1 metre accuracy. var name = '<div id="gname" class="iwstyle">'+response[i].address_components[0].short_name+'<br>('+response[i].geometry.location.lng().toFixed(5)+','+response[i].geometry.location.lat().toFixed(5)+''; - name += '<br><a href="#" onclick="setLoc(' + response[i].geometry.location.lat() + ', ' + response[i].geometry.location.lng() + ');"><div id="namelink"><?php echo I18N::translate('Use this value') ?></div></a>'; + name += '<br><a href="#" onclick="setLoc(' + response[i].geometry.location.lat() + ', ' + response[i].geometry.location.lng() + ');"><div id="namelink"><?php echo I18N::translate('Use this value') ?></div></a>'; name += '</div>'; var point = response[i].geometry.location; var marker = createMarker(i, point, name); diff --git a/app/Module/InteractiveTreeModule.php b/app/Module/InteractiveTreeModule.php index 1bb0a3d862..e98bca7ff0 100644 --- a/app/Module/InteractiveTreeModule.php +++ b/app/Module/InteractiveTreeModule.php @@ -80,10 +80,10 @@ class InteractiveTreeModule extends AbstractModule implements ModuleTabInterface document.createStyleSheet("' . $this->css() . '"); // For Internet Explorer } else { var newSheet=document.createElement("link"); - newSheet.setAttribute("rel","stylesheet"); - newSheet.setAttribute("type","text/css"); - newSheet.setAttribute("href","' . $this->css() . '"); - document.getElementsByTagName("head")[0].appendChild(newSheet); + newSheet.setAttribute("rel","stylesheet"); + newSheet.setAttribute("type","text/css"); + newSheet.setAttribute("href","' . $this->css() . '"); + document.getElementsByTagName("head")[0].appendChild(newSheet); } </script>'; } diff --git a/assets/js-1.7.2/webtrees.js b/assets/js-1.7.2/webtrees.js index bd799e3769..5f3cac47be 100644 --- a/assets/js-1.7.2/webtrees.js +++ b/assets/js-1.7.2/webtrees.js @@ -1127,12 +1127,12 @@ function activate_colorbox(config) { // Enable colorbox for audio using <audio></audio>, where supported //jQuery('html.video a[type^=video].gallery').colorbox({ - // rel: 'nofollow' // Slideshows are just for images + // rel: 'nofollow' // Slideshows are just for images //}); // Enable colorbox for video using <video></video>, where supported //jQuery('html.audio a[type^=audio].gallery').colorbox({ - // rel: 'nofollow', // Slideshows are just for images + // rel: 'nofollow', // Slideshows are just for images //}); // Allow all other media types remain as download links diff --git a/descendancy.php b/descendancy.php index 78a00837e4..82aeb1e34c 100644 --- a/descendancy.php +++ b/descendancy.php @@ -44,7 +44,7 @@ $controller <tbody> <tr> <td class="descriptionbox"> - <?php echo I18N::translate('Individual'); ?> + <?php echo I18N::translate('Individual'); ?> </td> <td class="optionbox"> <input class="pedigree_form" data-autocomplete-type="INDI" type="text" id="rootid" name="rootid" size="3" value="<?php echo $controller->root->getXref(); ?>"> diff --git a/familybook.php b/familybook.php index 660e790a20..57c198fa46 100644 --- a/familybook.php +++ b/familybook.php @@ -55,7 +55,7 @@ $controller </td> <td class="optionbox"> <?php echo FunctionsEdit::twoStateCheckbox('show_full', $controller->showFull()); ?> - </td> + </td> <td rowspan="3" class="topbottombar vmiddle"> <input type="submit" value="<?php echo /* I18N: Submit button, on a form */ I18N::translate('View'); ?>"> </td> diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php index d74cadf70b..fcfa26e651 100644 --- a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php +++ b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php @@ -211,14 +211,12 @@ function fillInRows() { // CONFIG // myRowObject is an object for storing information about the table rows //function myRowObject(zero, one, two, three, four, five, six, seven, eight, nine, ten, cb, ra) -function myRowObject(zero, one, two, cb, ra) -{ - this.zero = zero; // text object - this.one = one; // input text object - this.two = two; // input text object - - this.cb = cb; // input checkbox object - this.ra = ra; // input radio object +function myRowObject(zero, one, two, cb, ra) { + this.zero = zero; // text object + this.one = one; // input text object + this.two = two; // input text object + this.cb = cb; // input checkbox object + this.ra = ra; // input radio object } /* @@ -234,7 +232,7 @@ function insertRowToTable(pid, nam, head) var rowToInsertAt = ""; // Get links list ==================================== - var links = document.getElementById('existLinkTbl'); + var links = document.getElementById('existLinkTbl'); var numrows = links.rows.length; var strRow = ''; for (var i=1; i<numrows; i++) { @@ -430,21 +428,18 @@ function deleteCurrentRow(obj) } } -function reorderRows(tbl, startingIndex) -{ +function reorderRows(tbl, startingIndex) { if (hasLoaded) { if (tbl.tBodies[0].rows[startingIndex]) { var count = startingIndex + ROW_BASE; for (var i=startingIndex; i<tbl.tBodies[0].rows.length; i++) { // CONFIG: next line is affected by myRowObject settings - tbl.tBodies[0].rows[i].myRow.zero.data = count; // text - - tbl.tBodies[0].rows[i].myRow.one.id = INPUT_NAME_PREFIX + count + '_1'; // input text - tbl.tBodies[0].rows[i].myRow.two.id = INPUT_NAME_PREFIX + count + '_2'; // input text - - tbl.tBodies[0].rows[i].myRow.one.name = INPUT_NAME_PREFIX + count + '_1'; // input text - tbl.tBodies[0].rows[i].myRow.two.name = INPUT_NAME_PREFIX + count + '_2'; // input text + tbl.tBodies[0].rows[i].myRow.zero.data = count; // text + tbl.tBodies[0].rows[i].myRow.one.id = INPUT_NAME_PREFIX + count + '_1'; // input text + tbl.tBodies[0].rows[i].myRow.two.id = INPUT_NAME_PREFIX + count + '_2'; // input text + tbl.tBodies[0].rows[i].myRow.one.name = INPUT_NAME_PREFIX + count + '_1'; // input text + tbl.tBodies[0].rows[i].myRow.two.name = INPUT_NAME_PREFIX + count + '_2'; // input text // tbl.tBodies[0].rows[i].myRow.cb.value = count; // input checkbox tbl.tBodies[0].rows[i].myRow.ra.value = count; // input radio diff --git a/modules_v3/GEDFact_assistant/census/census-save.php b/modules_v3/GEDFact_assistant/census/census-save.php index 395b592529..c31c368a4a 100644 --- a/modules_v3/GEDFact_assistant/census/census-save.php +++ b/modules_v3/GEDFact_assistant/census/census-save.php @@ -149,4 +149,4 @@ if ($record) { '); } -echo '</div>'; +echo '</div>'; diff --git a/modules_v3/ahnentafel_report/report.xml b/modules_v3/ahnentafel_report/report.xml index 156e058fe2..083b3b3fd3 100644 --- a/modules_v3/ahnentafel_report/report.xml +++ b/modules_v3/ahnentafel_report/report.xml @@ -103,7 +103,7 @@ <TextBox width="25" height="30"> <Text style="text"><var var="num" />.</Text> </TextBox> - <!-- Sentence 1 Individual, name... --> + <!-- Sentence 1 Individual, name... --> <TextBox height="12" newline="1"> <Text style="name"><GetPersonName id="" /> </Text> <if condition="$sources==1"> @@ -160,7 +160,7 @@ <if condition="(@desc=='Y') or (@DATE=='' and @PLAC=='')"><var var="I18N::translate(' but the details are unknown')" /></if>. </Text> </Gedcom> - <!-- Sentence 2 Individual, christened... --> + <!-- Sentence 2 Individual, christened... --> <Gedcom id="CHR"> <Text style="text"> <if condition="$gender=='m'"><var var="I18N::translate('He was christened')" /></if> @@ -189,7 +189,7 @@ </Text> </Gedcom> <if condition="$occu==1"> - <!-- Individual, occupation... --> + <!-- Individual, occupation... --> <RepeatTag tag="OCCU"> <Text style="text"> <if condition="$gender=='m'"><var var="I18N::translate('His occupation was')" /> <GedcomValue tag="OCCU" level="1" /></if> @@ -216,7 +216,7 @@ </RepeatTag> </if> <if condition="$resi==1"> - <!-- Individual, residence... --> + <!-- Individual, residence... --> <RepeatTag tag="RESI"> <Text style="text"> <if condition="$gender=='m'"><var var="I18N::translate('He resided at')" /> </if> @@ -372,7 +372,7 @@ <if condition="$children==1"> <!-- this section gets the children. --> <RepeatTag tag="FAMS"> - <SetVar name="individual" value="$cpid" /> + <SetVar name="individual" value="$cpid" /> <SetVar name="spouse" value="$spid" /> <Gedcom id="@FAMS"> <if condition="@CHIL!=''"> @@ -429,9 +429,8 @@ «<GedcomValue tag="TITL" />» <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <!-- </Footnote> --> <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> - <GedcomValue tag="SOUR:DATA:TEXT" /> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> diff --git a/modules_v3/descendancy_report/report.xml b/modules_v3/descendancy_report/report.xml index 50ca09a58c..8e480b5f60 100644 --- a/modules_v3/descendancy_report/report.xml +++ b/modules_v3/descendancy_report/report.xml @@ -61,7 +61,7 @@ <TextBox border="" height="40" newline="1"> <Text style="name"><GetPersonName id="" /> </Text> -<!-- main --> <if condition="$sources==1"> + <if condition="$sources==1"> <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> @@ -98,7 +98,7 @@ </if> <SetVar name="birtExists" value="false" /> <Gedcom id="BIRT"> - <SetVar name="birtExists" value="true" /> + <SetVar name="birtExists" value="true" /> <SetVar name="printPeriod" value="true" /> <if condition="$gender=='male'"> <Text style="label1"> <var var="I18N::translateContext('MALE', 'was born')" /> </Text> @@ -195,7 +195,7 @@ <if condition="$marrExists=='true'"> <Gedcom id="@WIFE"> <Text style="name"> <GetPersonName id="" /> </Text> -<!-- wife --> <if condition="$sources==1"> + <if condition="$sources==1"> <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> @@ -264,7 +264,7 @@ <if condition="$marrExists=='true'"> <Gedcom id="@HUSB"> <Text style="name"> <GetPersonName id="" /> </Text> -<!-- husband --> <if condition="$sources==1"> + <if condition="$sources==1"> <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> @@ -528,7 +528,7 @@ <TextBox height="20" newline="1"> <Text style="label1"><var var="familyChildRoman" /></Text> <Text style="name"> <GetPersonName id="" /> </Text> -<!-- children --> <if condition="$sources==1"> + <if condition="$sources==1"> <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> diff --git a/modules_v3/fact_sources/report.xml b/modules_v3/fact_sources/report.xml index 82880ef6f8..72e5bef40e 100644 --- a/modules_v3/fact_sources/report.xml +++ b/modules_v3/fact_sources/report.xml @@ -297,7 +297,7 @@ <if condition="@SOUR:DATA:TEXT!=''"> <br /><GedcomValue tag="SOUR:DATA:TEXT"/> </if> - </Cell> + </Cell> </List> <!-- Print the list counter --> diff --git a/modules_v3/family_group_report/report.xml b/modules_v3/family_group_report/report.xml index b711c1e97e..5975f34436 100644 --- a/modules_v3/family_group_report/report.xml +++ b/modules_v3/family_group_report/report.xml @@ -274,7 +274,7 @@ </if> <if condition="@PLAC!='' and @TEMP==''"> <GedcomValue tag="@fact:PLAC" /> - </if> + </if> <if condition="@PLAC=='' and @TEMP!=''"> <GedcomValue tag="@fact:TEMP" /> </if> diff --git a/modules_v3/missing_facts_report/report.xml b/modules_v3/missing_facts_report/report.xml index 2e5eb95723..a1b305fe77 100644 --- a/modules_v3/missing_facts_report/report.xml +++ b/modules_v3/missing_facts_report/report.xml @@ -55,10 +55,11 @@ <Cell align="center" border="1" newline="1" style="list_label"><var var="I18N::translate('Event')" /></Cell> </Header> -<!-- Start with BIRT GEDCOM tag. - Place any GEDCOM tags in GEDCOM alphabetic order here - End it with DEAT and BURI - Place any GEDCOM tags after DEAT/BURI witch has no additional subtags, such as RELI, in alphabetic order +<!-- +Start with BIRT GEDCOM tag. +Place any GEDCOM tags in GEDCOM alphabetic order here +nd it with DEAT and BURI +Place any GEDCOM tags after DEAT/BURI witch has no additional subtags, such as RELI, in alphabetic order --> <Body> diff --git a/modules_v3/relative_ext_report/report.xml b/modules_v3/relative_ext_report/report.xml index 45accb809b..d502207583 100644 --- a/modules_v3/relative_ext_report/report.xml +++ b/modules_v3/relative_ext_report/report.xml @@ -97,14 +97,6 @@ <if condition="@FAMC==''"> <TextBox height="2" newline="1"/> </if> - <!-- 2. Block --> -<!-- <TextBox height="$height2" left="$leftbdp" width="$width3"> - <Text style="mini"><GedcomValue tag="BIRT:PLAC" /></Text> - </TextBox> - <TextBox height="$height2" newline="1" width="$width4"> - <Text style="mini"><GedcomValue tag="DEAT:PLAC" /></Text> - </TextBox> ---> <!-- 3. Block --> <RepeatTag tag="FAMS"> <Gedcom id="@FAMS"> <TextBox height="$height2" left="$width1" width="$widthB2"> diff --git a/modules_v3/tree/css/treeview.css b/modules_v3/tree/css/treeview.css index 70adc5f554..2034bbdc9d 100644 --- a/modules_v3/tree/css/treeview.css +++ b/modules_v3/tree/css/treeview.css @@ -265,7 +265,7 @@ table#tvTreeBorder td, float: left; position: relative; padding: 0; /* required */ - margin: 0; + margin: 0; width: 24px; height: 24px; text-align: center; diff --git a/pedigree.php b/pedigree.php index 5adf8720d0..497c16cb52 100644 --- a/pedigree.php +++ b/pedigree.php @@ -36,8 +36,6 @@ $controller ->addInlineJavascript(' (function() { autocomplete(); -// I dont think this is still a problem with version 41.0.2272.76 m -// jQuery("html").css("overflow","visible"); // workaround for chrome v37 canvas bugs jQuery("#childarrow").on("click", ".menuselect", function(e) { e.preventDefault(); @@ -49,7 +47,7 @@ $controller .height(' . $controller->chartsize['y'] . '); // Set variables - var p0, p1, p2, // Holds the ids of the boxes used in the join calculations + var p0, p1, p2, // Holds the ids of the boxes used in the join calculations canvas = jQuery("#pedigree_canvas"), ctx = canvas[0].getContext("2d"), nodes = jQuery(".shadow").length, diff --git a/search.php b/search.php index 22fa80d1bb..b005c82c07 100644 --- a/search.php +++ b/search.php @@ -78,7 +78,7 @@ function checknames(frm) { <div class="value"> <input id="query" type="text" name="query" value="<?php echo Filter::escapeHtml($controller->query); ?>" size="40" autofocus> <?php echo FunctionsPrint::printSpecialCharacterLink('query'); ?> - </div> + </div> <div class="label"> <?php echo I18N::translate('Records'); ?> </div> @@ -259,8 +259,8 @@ function checknames(frm) { </p> <p> <input type="radio" name="soundex" value="DaitchM" <?php echo $controller->soundex === 'DaitchM' || $controller->soundex === '' ? 'checked' : ''; ?>> - <?php echo I18N::translate('Daitch-Mokotoff'); ?> - </p> + <?php echo I18N::translate('Daitch-Mokotoff'); ?> + </p> </div> <div class="label"> <?php echo I18N::translate('Associates'); ?> diff --git a/themes/clouds/css-1.7.0/style.css b/themes/clouds/css-1.7.0/style.css index 9a655aee38..4c55e15940 100644 --- a/themes/clouds/css-1.7.0/style.css +++ b/themes/clouds/css-1.7.0/style.css @@ -648,7 +648,6 @@ a:hover .nameZoom { } #childbox a.name1 { - /* font-weight: normal;*/ display: block; margin-left: 5px; } diff --git a/themes/colors/css-1.7.0/style.css b/themes/colors/css-1.7.0/style.css index 6021004804..50724e2d2e 100644 --- a/themes/colors/css-1.7.0/style.css +++ b/themes/colors/css-1.7.0/style.css @@ -656,7 +656,6 @@ a:hover .nameZoom { } #childbox a.name1 { - /* font-weight: normal;*/ display: block; margin-left: 5px; } diff --git a/themes/fab/css-1.7.0/style.css b/themes/fab/css-1.7.0/style.css index 03843c00d2..d5193082e5 100644 --- a/themes/fab/css-1.7.0/style.css +++ b/themes/fab/css-1.7.0/style.css @@ -611,7 +611,6 @@ a:hover .nameZoom { } #childbox a.name1 { - /* font-weight: normal;*/ display: block; margin-left: 5px; } diff --git a/themes/minimal/css-1.7.0/style.css b/themes/minimal/css-1.7.0/style.css index d6e0ee8a98..3005339aba 100644 --- a/themes/minimal/css-1.7.0/style.css +++ b/themes/minimal/css-1.7.0/style.css @@ -594,7 +594,6 @@ a:hover .nameZoom { } #childbox a.name1 { - /* font-weight: normal;*/ display: block; margin-left: 5px; } diff --git a/themes/webtrees/css-1.7.0/style.css b/themes/webtrees/css-1.7.0/style.css index f483f75719..37b02decf6 100644 --- a/themes/webtrees/css-1.7.0/style.css +++ b/themes/webtrees/css-1.7.0/style.css @@ -603,7 +603,6 @@ a:hover .nameZoom { } #childbox a.name1 { - /* font-weight: normal;*/ display: block; margin-left: 5px; } diff --git a/themes/xenea/css-1.7.0/style.css b/themes/xenea/css-1.7.0/style.css index 1996f9e077..f00b512af5 100644 --- a/themes/xenea/css-1.7.0/style.css +++ b/themes/xenea/css-1.7.0/style.css @@ -618,7 +618,6 @@ a:hover .nameZoom { } #childbox a.name1 { - /* font-weight: normal;*/ display: block; margin-left: 5px; } |