diff --git a/app/FormSubmission.php b/app/FormSubmission.php index aa861200..42b577dd 100644 --- a/app/FormSubmission.php +++ b/app/FormSubmission.php @@ -286,6 +286,13 @@ public function load($vars, $module): array if (isset($vars["no_highlight_xref_list"]) && $this->isXrefListValid($vars["no_highlight_xref_list"])) { $settings['no_highlight_xref_list'] = $vars["no_highlight_xref_list"]; } + $settings['highlight_custom_indis'] = isset($vars["highlight_custom_indis"]); + if (isset($vars["highlight_custom_col"]) && $this->isValidColourHex($vars["highlight_custom_col"])) { + $settings['highlight_custom_col'] = $vars["highlight_custom_col"]; + } + if (isset($vars["highlight_custom"]) && $this->isXrefListValid($vars["highlight_custom"])) { + $settings['highlight_custom'] = $vars["highlight_custom"]; + } if (isset($vars["border_col"]) && $this->isValidColourHex($vars["border_col"])) { $settings['border_col'] = $vars["border_col"]; } diff --git a/app/Person.php b/app/Person.php index 544d4e6f..40518f71 100644 --- a/app/Person.php +++ b/app/Person.php @@ -187,7 +187,9 @@ function printPersonLabel(string $pid, SharedNoteList $sharednotes, bool $relate } // Get background colour - if ($this->isStartingIndividual($pid) && $this->dot->settings['highlight_start_indis'] == "true" && !$this->isValueInList($this->dot->settings['no_highlight_xref_list'], $pid)) { + if ($this->dot->settings['highlight_custom_indis'] && $this->isValueInList($this->dot->settings['highlight_custom'], $pid)) { + $indi_bg_colour = $this->dot->settings["highlight_custom_col"]; + } else if ($this->isStartingIndividual($pid) && $this->dot->settings['highlight_start_indis'] == "true" && !$this->isValueInList($this->dot->settings['no_highlight_xref_list'], $pid)) { $indi_bg_colour = $this->dot->settings["highlight_col"]; } else if ($this->dot->settings["sharednote_col_enable"] && $sharednotes->indiHasSharedNote($pid)) { $indi_bg_colour = $sharednotes->getSharedNoteColour($pid); diff --git a/app/Settings.php b/app/Settings.php index 1d5df2ad..1507e9b1 100644 --- a/app/Settings.php +++ b/app/Settings.php @@ -67,7 +67,7 @@ public function __construct(){ $this->defaultSettings['stripe_col_type_options'] = [self::OPTION_STRIPE_NONE => 'No stripe', self::OPTION_STRIPE_SEX_COLOUR => 'Based on individual's sex', self::OPTION_STRIPE_VITAL_COLOUR => 'Based on vital status', self::OPTION_STRIPE_AGE_COLOUR => 'Based on age']; $this->defaultSettings['border_col_type_options'] = [self::OPTION_BORDER_CUSTOM_COLOUR => 'Custom', self::OPTION_BORDER_SEX_COLOUR => 'Based on individual's sex', self::OPTION_BORDER_FAMILY => 'Same as family border', self::OPTION_BORDER_VITAL_COLOUR => 'Based on vital status', self::OPTION_BORDER_AGE_COLOUR => 'Based on age']; $this->defaultSettings['settings_sort_order_options'] = [0 => 'Oldest first', 10 => 'Newest first', 20 => 'Alphabetical order', 30 => 'Reverse alphabetical order']; - $this->defaultSettings['click_action_indi_options'] = [0 => 'Open individual\'s page', 10 => 'Add individual to list of starting individuals', 20 => 'Replace starting individuals with this individual', 30 => 'Add this individual to the list of stopping individuals', 40 => 'Replace stopping individuals with this individual', 50 => 'Show menu', 60 => 'Do nothing']; + $this->defaultSettings['click_action_indi_options'] = [0 => 'Open individual\'s page', 10 => 'Add individual to list of starting individuals', 20 => 'Replace starting individuals with this individual', 30 => 'Add this individual to the list of stopping individuals', 40 => 'Replace stopping individuals with this individual', 70 => 'Add to list of individuals to highlight', 50 => 'Show menu', 60 => 'Do nothing']; $this->defaultSettings['countries'] = $this->getCountryAbbreviations(); if (!$this->isGraphvizAvailable($this->defaultSettings['graphviz_bin'])) { $this->defaultSettings['graphviz_bin'] = ""; diff --git a/config.php b/config.php index ab311561..b5f40df6 100644 --- a/config.php +++ b/config.php @@ -117,8 +117,11 @@ 'indi_background_age_low' => 0, // For background colour option for age, this is the age for the low colour - this age and anything younger gets the low colour 'indi_background_age_high' => 100, // For background colour option for age, this is the age for the high colour - this age and anything older gets this colour 'highlight_start_indis' => false, // Whether to use a different colour for starting individuals - 'no_highlight_xref_list' => '', // XREFs in this list are not highlighted - 'highlight_col' => '#FFFDC3', // Background of starting individuals + 'no_highlight_xref_list' => '', // XREFs in this list are not highlighted when highlighting starting individuals + 'highlight_col' => '#FFFDC3', // Background of starting individuals + 'highlight_custom_indis' => '', // Whether to highlight a customer list of XREFs in addition to the about starting individuals + 'highlight_custom_col' => '#FFFDC3', // The colour to highlight the custom highlighted individuals + 'highlight_custom' => '', // List of XREFs of other individuals to highlight 'border_col' => '#606060', // Border colour (in UI this is Family border colour, but by default the individual border is the same as family) 'indi_border_col' => '#606060', // Border colour of individuals 'birth_prefix' => '*', // Text shown on chart before the birthdate diff --git a/resources/css/gvexport.css b/resources/css/gvexport.css index 4a599fdf..a7c9b7e8 100644 --- a/resources/css/gvexport.css +++ b/resources/css/gvexport.css @@ -464,6 +464,10 @@ span.NAME { margin-left: 10px; } +#highlight_custom { + width: calc(100% - 48px); +} + .align-middle-container { display:flex; align-items:center; diff --git a/resources/javascript/MainPage/Form.js b/resources/javascript/MainPage/Form.js index 73bdaf23..accc5f13 100644 --- a/resources/javascript/MainPage/Form.js +++ b/resources/javascript/MainPage/Form.js @@ -4,6 +4,36 @@ * @type {{}} */ const Form = { + + /** + * Triggers on form change, to update diagram if autoUpdate enabled + * + * @param xref xref of tile we want to keep in the same position + */ + handleFormChange(xref = null) { + if (autoUpdate) { + // If xref has been nominated, calculate the position on screen, so we can keep it in the same place + if (xref) { + let [found, x, y] = UI.tile.getElementPositionFromXref(xref); + if (found) { + let scale = panzoomInst.getTransform().scale; + // Why is this 1 1/3 number needed? + let zoomBase = scale * (1 + 1/3); + let zoom_value = zoomBase * parseFloat(document.getElementById("dpi").value) / 72; + const rendering = document.getElementById('rendering'); + const svg = rendering.getElementsByTagName('svg')[0]; + let transform = panzoomInst.getTransform(); + updateRender(x*zoom_value + transform.x, parseFloat(svg.getAttribute('height'))*zoomBase + y*zoom_value + transform.y, transform.scale, xref); + } else { + updateRender(); + } + // Nothing fany happening, just update + } else { + updateRender(); + } + } + }, + /** * Add or remove the % sign from the text input * @@ -484,7 +514,7 @@ const Form = { } listEl.value = indiList.join(','); setTimeout(()=>{refreshIndisFromXREFS(false)}, 100); - handleFormChange(); + Form.handleFormChange(); } } } diff --git a/resources/javascript/MainPage/UI.js b/resources/javascript/MainPage/UI.js index a0fc30dc..c8a18a5e 100644 --- a/resources/javascript/MainPage/UI.js +++ b/resources/javascript/MainPage/UI.js @@ -53,66 +53,39 @@ const UI = { } }, - // If the browser render is available, scroll to the xref provided (if it exists) - scrollToRecord(xref) { - const rendering = document.getElementById('rendering'); - const svg = rendering.getElementsByTagName('svg')[0].cloneNode(true); - let titles = svg.getElementsByTagName('title'); - for (let i=0; i maxX) { - maxX = x; - } - if (maxY === null || y > maxY) { - maxY = y; - } - } - - // Get the average of the largest and smallest, so we can position the element in the middle - x = (minX + maxX) / 2; - y = (minY + maxY) / 2; - } else { - x = group.getElementsByTagName('text')[0].getAttribute('x'); - y = group.getElementsByTagName('text')[0].getAttribute('y') - } - - // Why do we multiply the scale by 1 and 1/3? - let zoombase = panzoomInst.getTransform().scale * (1 + 1 / 3); - let zoom = zoombase * parseFloat(document.getElementById("dpi").value)/72; - panzoomInst.smoothMoveTo((rendering.offsetWidth / 2) - x * zoom, (rendering.offsetHeight / 2) - parseFloat(svg.getAttribute('height')) * zoombase - y * zoom); - return true; - } + /** + * Scroll the diagram to put the provided XREF at the given position on the screen + * Placed in middle of screen if no position specified + * + * @param xref xref of individual whose tile we are positioning + * @param scrollX Position middle of tile this far from left edge of view + * @param scrollY Position middle of tile this far from top of view + * @param zoom Set zoom level to this number + * @returns {boolean} + */ + scrollToRecord(xref, scrollX = null, scrollY = null, zoom = null) { + // Why do we multiply the scale by 1 and 1/3? + let zoomBase = (zoom ? zoom : panzoomInst.getTransform().scale) * (1 + 1 / 3); + let zoom_value = zoomBase * parseFloat(document.getElementById("dpi").value) / 72; + let [found, x, y] = UI.tile.getElementPositionFromXref(xref); + if (!found) { + // The xref isn't in the diagram + return false; + } else { + const rendering = document.getElementById('rendering'); + const svg = rendering.getElementsByTagName('svg')[0]; + if (zoom) { + panzoomInst.zoomTo(0, 0, zoom); } + if (scrollX && scrollY) { + // Jump xref tile to position. Note this does not scroll + panzoomInst.moveTo(scrollX - x * zoom_value, scrollY - parseFloat(svg.getAttribute('height')) * zoomBase - y * zoom_value); + } else { + // Put in middle of screen if no position specified + panzoomInst.smoothMoveTo((rendering.offsetWidth / 2) - x * zoom_value, (rendering.offsetHeight / 2) - parseFloat(svg.getAttribute('height')) * zoomBase - y * zoom_value); + } + return true; } - return false; }, tile: { @@ -181,7 +154,7 @@ const UI = { let linkElements = document.querySelectorAll("svg a"); linkElements = Array.from(linkElements).filter(function (aTag) { - return aTag.hasAttribute('xlink:href'); + return aTag.hasAttribute('xlink:href') && aTag.hasAttribute('xmlns:xlink'); }); for (let i = 0; i < linkElements.length; i++) { @@ -211,13 +184,13 @@ const UI = { Form.indiList.clearIndiList(false); Form.indiList.addIndiToList(xref); mainPage.Url.changeURLXref(xref); - handleFormChange(); + Form.handleFormChange(); } break; case '30':// Add to list of stopping individuals if (xref) { Form.stoppingIndiList.addIndiToStopList(xref); - handleFormChange(); + Form.handleFormChange(); } break; case '40':// Remove list of stopping individuals and have just this person @@ -225,12 +198,15 @@ const UI = { Form.stoppingIndiList.clearStopIndiList(false); Form.indiList.addIndiToList(xref); mainPage.Url.changeURLXref(xref); - handleFormChange(); + Form.handleFormChange(); } break; case '50': // Show a menu for user to choose UI.tile.showNodeContextMenu(e, url, xref); break; + case '70': // Add XREF to list of custom highlighted individuals + UI.tile.highlightIndividual(xref); + break; // Do nothing - default click action is fine case '0': // Allow link to trigger user page opening case '60': // Do nothing option @@ -260,6 +236,7 @@ const UI = { UI.contextMenu.addContextMenuOption('🔄', 'Replace starting individuals with this individual', UI.tile.replaceStartingIndividualsContextMenu); UI.contextMenu.addContextMenuOption('🛑', 'Add this individual to the list of stopping individuals', UI.tile.addIndividualToStoppingIndividualsContextMenu); UI.contextMenu.addContextMenuOption('🚫', 'Replace stopping individuals with this individual', UI.tile.replaceStoppingIndividualsContextMenu); + UI.contextMenu.addContextMenuOption('🖍️', 'Add to list of individuals to highlight', UI.tile.highlightIndividualContextMenu); }, /** @@ -307,6 +284,15 @@ const UI = { UI.tile.replaceStoppingIndividuals(e.currentTarget.parentElement.getAttribute('data-xref')); }, + /** + * Function for context menu item + * + * @param e Click event + */ + highlightIndividualContextMenu(e) { + UI.tile.highlightIndividual(e.currentTarget.parentElement.getAttribute('data-xref')); + }, + /** * Adds the individual to the starting individual list @@ -328,7 +314,7 @@ const UI = { addIndividualToStartingIndividualsList(xref) { if (xref) { Form.indiList.addIndiToList(xref); - handleFormChange(); + Form.handleFormChange(xref); UI.contextMenu.clearContextMenu(); } }, @@ -343,7 +329,7 @@ const UI = { Form.indiList.clearIndiList(false); Form.indiList.addIndiToList(xref); mainPage.Url.changeURLXref(xref); - handleFormChange(); + Form.handleFormChange(xref); UI.contextMenu.clearContextMenu(); } }, @@ -356,7 +342,7 @@ const UI = { addIndividualToStoppingIndividualsList(xref) { if (xref) { Form.stoppingIndiList.addIndiToStopList(xref); - handleFormChange(); + Form.handleFormChange(xref); UI.contextMenu.clearContextMenu(); } }, @@ -370,11 +356,37 @@ const UI = { if (xref) { Form.stoppingIndiList.clearStopIndiList(false); Form.stoppingIndiList.addIndiToStopList(xref); - handleFormChange(); + Form.handleFormChange(xref); UI.contextMenu.clearContextMenu(); } }, + /** + * Adds XREF to custom highlight list + * + * @param xref + */ + highlightIndividual(xref) { + if (xref) { + this.addIndiToCustomHighlightList(xref); + Form.handleFormChange(xref); + UI.contextMenu.clearContextMenu(); + } + }, + + /** + * Adds the XREF to the list of indiviudals to highlight + * + * @param xref + */ + addIndiToCustomHighlightList(xref) { + let list = document.getElementById('highlight_custom'); + const regex = new RegExp(`(?<=,|^)(${xref})(?=,|$)`); + if (!regex.test(list.value.replaceAll(" ','"))) { + appendXrefToList(xref, 'highlight_custom'); + } + }, + /** * Run when setting is changed for what to do when individual is clicked in diagram */ @@ -387,7 +399,70 @@ const UI = { Data.storeSettings.saveSettingsClient(ID_MAIN_SETTINGS).then(); } }); - } + }, + + /** + * Finds the individual's tile from the provided XREF, and returns position information + * + * @param xref The XREF of the individual we are looking for + * @returns {boolean[]|(boolean|string|number)[]} An array [true if found, x position, y position] + */ + getElementPositionFromXref(xref) { + const rendering = document.getElementById('rendering'); + const svg = rendering.getElementsByTagName('svg')[0].cloneNode(true); + let titles = svg.getElementsByTagName('title'); + for (let i=0; i maxX) { + maxX = x; + } + if (maxY === null || y > maxY) { + maxY = y; + } + } + + // Get the average of the largest and smallest, so we can position the element in the middle + x = (minX + maxX) / 2; + y = (minY + maxY) / 2; + + } else { + x = group.getElementsByTagName('text')[0].getAttribute('x'); + y = group.getElementsByTagName('text')[0].getAttribute('y') + } + return [true, x, y]; + } + } + } + return [false, null, null]; + }, }, /** diff --git a/resources/javascript/gvexport.js b/resources/javascript/gvexport.js index 1e1e1b61..19024813 100644 --- a/resources/javascript/gvexport.js +++ b/resources/javascript/gvexport.js @@ -253,11 +253,6 @@ function getComputedProperty(element, property) { return (parseFloat(style.getPropertyValue(property))); } - -function handleFormChange() { - if (autoUpdate) updateRender(); -} - function removeSettingsEllipsisMenu(menuElement) { document.querySelectorAll('.settings_ellipsis_menu').forEach(e => { if (e !== menuElement) e.remove(); @@ -319,7 +314,7 @@ function pageLoaded(Url) { const form = document.getElementById('gvexport'); let changeElems = form.querySelectorAll("input:not([type='file']):not(#save_settings_name):not(#stop_pid):not(.highlight_check):not(#sharednote_col_add), select:not(#simple_settings_list):not(#pid):not(#sharednote_col_add):not(#settings_sort_order):not(#click_action_indi)"); for (let i = 0; i < changeElems.length; i++) { - changeElems[i].addEventListener("change", handleFormChange); + changeElems[i].addEventListener("change", Form.handleFormChange); } let indiSelectEl = form.querySelector("#pid"); indiSelectEl.addEventListener('change', Form.indiList.indiSelectChanged); @@ -513,6 +508,7 @@ function loadSettings(data, isNamedSetting = false) { setSavedDiagramsPanel(); Form.showHide(document.getElementById('arrow_group'),document.getElementById('colour_arrow_related').checked) Form.showHide(document.getElementById('startcol_option'),document.getElementById('highlight_start_indis').checked) + Form.showHide(document.getElementById('highlight_custom_option'),document.getElementById('highlight_custom_indis').checked) toggleUpdateButton(); if (autoUpdatePrior) { if (firstRender) { @@ -801,7 +797,7 @@ function toggleHighlightCheckbox(e) { } else { addToXrefList(xref, 'no_highlight_xref_list'); } - handleFormChange(); + Form.handleFormChange(); } function addToXrefList(value, listElName) { diff --git a/resources/lang/ca.mo b/resources/lang/ca.mo index 0dff68e9..9e77c422 100644 Binary files a/resources/lang/ca.mo and b/resources/lang/ca.mo differ diff --git a/resources/lang/ca.po b/resources/lang/ca.po index 74a7b868..dbdc41d9 100644 --- a/resources/lang/ca.po +++ b/resources/lang/ca.po @@ -1930,17 +1930,154 @@ msgstr "La configuració s'ordena en funció del seu nom." #. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png #: msgid "Settings are sorted based on their name, but in reverse." -msgstr "" +msgstr "Els paràmetres s'ordenen en funció del seu nom, però al revés." #. Part of the help text for the Settings list sort order option: #. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png #: msgid "Note that if you update a saved setting, this will affect how it is sorted under the 'Oldest first' or 'Newest first' options." -msgstr "" +msgstr "Tingueu en compte que si actualitzeu una opció de configuració desada, això afectarà la manera com s'ordena a les opcions \"Els més antics primer\" o \"Els més nous primer\"." #. Part of the help text for the Settings list sort order option: #. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png #: msgid "This option lets you choose the order of saved settings. The options are" +msgstr "Aquesta opció us permet triar l'ordre de la configuració desada. Les opcions són:" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Add individual to list of starting individuals" +msgstr "Afegir individu a la llista d'individus inicials" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Open individual's page" +msgstr "Obrir pàgina individual" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Replace starting individuals with this individual" +msgstr "Substituïu els individus inicials per aquest individu" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Add this individual to the list of stopping individuals" +msgstr "Afegiu aquest individu a la llista d'individus aturats" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Replace stopping individuals with this individual" +msgstr "Substituïu l'aturada d'individus per aquest individu" + +#. New option to set what happens when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Action when individual clicked" +msgstr "Acció en què l'individu ha fet clic" + +#. One option in the list of things that can happen when you click an individual in the diagram. +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Show menu" +msgstr "Mostrar menú" + +#. One option in the list of things that can happen when you click an individual in the diagram. +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Do nothing" +msgstr "No fer res" + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "This option lets you choose what happens when you click on an individual in the diagram." +msgstr "Aquesta opció us permet triar què passa quan feu clic a una persona del diagrama." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "This is the default option. When you click on an individual, the webtrees page for that individual will open in a new tab or window." +msgstr "Aquesta és l'opció per defecte. Quan feu clic a una persona, la pàgina d'arbres web d'aquesta persona s'obrirà en una pestanya o finestra nova." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of starting individuals." +msgstr "Si se selecciona aquesta opció, fent clic a un individu del diagrama s'afegirà a la llista d'individus inicials." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of starting individuals and remove all others from the list." +msgstr "Si se selecciona aquesta opció, fent clic a un individu del diagrama s'afegirà a la llista d'individus inicials i s'eliminaran tots els altres de la llista." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of stopping individuals." +msgstr "Si se selecciona aquesta opció, fent clic a un individu del diagrama s'afegirà a la llista d'individus aturats." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of stopping individuals and remove all others from the list." +msgstr "Si se selecciona aquesta opció, fent clic a un individu del diagrama s'afegirà a la llista d'individus aturats i s'eliminaran tots els altres de la llista." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is chosen, when an individual is clicked on in the diagram, a menu will be shown with the above items to choose from." +msgstr "Si es tria aquesta opció, quan es faci clic a una persona en el diagrama, es mostrarà un menú amb els elements anteriors per triar." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "When an individual is clicked on in the diagram, nothing will happen." +msgstr "Quan es fa clic a un individu al diagrama, no passarà res." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "Note that there is currently no option for what to do when a family record is clicked on in the diagram. However, the option to add URLs to individuals and families will also affect families in the browser diagram. That is, if you click a family then if this option is enabled, the family page will open in webtrees." +msgstr "Tingueu en compte que actualment no hi ha cap opció sobre què fer quan es fa clic en un registre familiar al diagrama. No obstant això, l'opció d'afegir URL a individus i famílies també afectarà les famílies en el diagrama del navegador. És a dir, si feu clic a una família, si aquesta opció està habilitada, la pàgina de la família s'obrirà als arbres web.\n" +"" + +#. An extra paragraph for the section on URL links in the help page: https://s3.eu-west-1.amazonaws.com/po-pub/i/4Vxx95kI54pojXyfcC4CvyYc.png +#: +msgid "This also affects families in the diagram. If this option is enabled, you can click on family records to open the family webtrees page. Also see \\'Action when individual clicked\\' in the Browser render settings." +msgstr "Això també afecta les famílies del diagrama. Si aquesta opció està habilitada, podeu fer clic a registres familiars per obrir la pàgina d'arbres web de la família. Vegeu també \\'Action when individual clicked\\' a la configuració de renderització del navegador." + +#. Option for what to do when individual clicked on in diagram +#: +msgid "Add to list of individuals to highlight" +msgstr "" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Show additional individuals in different colour" +msgstr "" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Highlighted individuals background colour" +msgstr "" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Highlighted individuals XREFs" +msgstr "" + +#. Update to help text to add this new option +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/hepcgMX8Ou17qX7kH5upaW16.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of individuals with a coloured background for identification in the diagram. See the option \"Show additional individuals in different colour\", in the Colours section of the Tile design options." +msgstr "" + +#. Update to help text to add this new option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/taeaB9TOXPYyAr6SzuyMVLDJ.png +#: +msgid "Similar to the above option for starting individuals, but this option lets you choose a background colour to highlight a custom selection if individuals based on a list of XREFs. Also see option in Browser Render settings to choose what happens when an individual is clicked, as this may be an easier way to add individuals to this list." msgstr "" diff --git a/resources/lang/cs.mo b/resources/lang/cs.mo index 214a8c4b..e0fe9db0 100644 Binary files a/resources/lang/cs.mo and b/resources/lang/cs.mo differ diff --git a/resources/lang/cs.po b/resources/lang/cs.po index 64cc558b..aa2b1c28 100644 --- a/resources/lang/cs.po +++ b/resources/lang/cs.po @@ -1857,3 +1857,204 @@ msgstr "Můžete si také vybrat, zda chcete zobrazit celé datum sňatku, nebo msgid "Whether to show the place of marriage in the output. Also see option for abbreviating place names." msgstr "Zda se má ve výstupu zobrazit místo sňatku. Viz také nastavení zkracování názvů míst." +#. An option in new setting to sort the saved settings list: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/fSaYMVDGQqSSVdo1qxXE1pqY.png +#: +msgid "Oldest first" +msgstr "Od nejstaršího" + +#. An option in new setting to sort the saved settings list: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/fSaYMVDGQqSSVdo1qxXE1pqY.png +#: +msgid "Newest first" +msgstr "On nejnovějšího" + +#. An option in new setting to sort the saved settings list: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/fSaYMVDGQqSSVdo1qxXE1pqY.png +#: +msgid "Alphabetical order" +msgstr "Abecední řazení" + +#. An option in new setting to sort the saved settings list: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/fSaYMVDGQqSSVdo1qxXE1pqY.png +#: +msgid "Reverse alphabetical order" +msgstr "Obrácené abecední řazení" + +#. New setting to sort the saved settings list: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/fSaYMVDGQqSSVdo1qxXE1pqY.png +#: +msgid "Settings list sort order" +msgstr "Řazení seznamu nastavení" + +#. Part of the help text for the Settings list sort order option: https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png +#: +msgid "The default option. New settings are added to the bottom of the list." +msgstr "Výchozí možnost. Nová nastavení jsou přidávána na konec seznamu." + +#. Part of the help text for the Settings list sort order option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png +#: +msgid "New settings are added to the top of the list." +msgstr "Nová nastavení jsou přidávána na začátek seznamu." + +#. Part of the help text for the Settings list sort order option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png +#: +msgid "Settings are sorted based on their name." +msgstr "Nastavení jsou řazena podle jejich názvu." + +#. Part of the help text for the Settings list sort order option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png +#: +msgid "Settings are sorted based on their name, but in reverse." +msgstr "Nastavení jsou řazena podle jejich názvu, ale obráceně." + +#. Part of the help text for the Settings list sort order option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png +#: +msgid "Note that if you update a saved setting, this will affect how it is sorted under the 'Oldest first' or 'Newest first' options." +msgstr "Mějte na paměti, že pokud aktualizujete uložené nastavení, ovlivní to jeho pořadí pokud, je nastavena možnost \"Od nejstaršího\" nebo \"On nejnovějšího\"." + +#. Part of the help text for the Settings list sort order option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png +#: +msgid "This option lets you choose the order of saved settings. The options are" +msgstr "Tato možnost vám umožňuje zvolit pořadí uložených nastavení. Možnosti jsou" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Add individual to list of starting individuals" +msgstr "Přidat osobu do seznamu výchozích osob" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Open individual's page" +msgstr "Otevřít stránku osoby" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Replace starting individuals with this individual" +msgstr "Nahradit výchozí osoby touto osobou" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Add this individual to the list of stopping individuals" +msgstr "Přidat tuto osobu do seznamu zastavujících osob" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Replace stopping individuals with this individual" +msgstr "Nahradit zastavující osoby touto osobou" + +#. New option to set what happens when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Action when individual clicked" +msgstr "Akce po kliknutí na osobu" + +#. One option in the list of things that can happen when you click an individual in the diagram. +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Show menu" +msgstr "Zobrazit menu" + +#. One option in the list of things that can happen when you click an individual in the diagram. +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Do nothing" +msgstr "Nedělat nic" + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "This option lets you choose what happens when you click on an individual in the diagram." +msgstr "Tato možnost vám umožňuje zvolit, co se stane, když kliknete na osobu v diagramu." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "This is the default option. When you click on an individual, the webtrees page for that individual will open in a new tab or window." +msgstr "Toto je výchozí možnost. Když kliknete na osobu, stránka webtrees pro tuto osobu se otevře v nové záložce nebo okně." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of starting individuals." +msgstr "Pokud je tato možnost vybrána, kliknutím na osobu v diagramu ji přidáte do seznamu výchozích osob." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of starting individuals and remove all others from the list." +msgstr "Pokud je tato možnost vybrána, kliknutím na osobu v diagramu ji přidáte do seznamu výchozích osob a odstraníte všechny ostatní ze seznamu." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of stopping individuals." +msgstr "Pokud je tato možnost vybrána, kliknutím na osobu v diagramu ji přidáte do seznamu zastavujících osob." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of stopping individuals and remove all others from the list." +msgstr "Pokud je tato možnost vybrána, kliknutím na osobu v diagramu ji přidáte do seznamu zastavujících osob a odstraníte všechny ostatní ze seznamu." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is chosen, when an individual is clicked on in the diagram, a menu will be shown with the above items to choose from." +msgstr "Pokud je tato možnost vybrána, při kliknutí na osobu v diagramu se zobrazí menu s výše uvedenými položkami na výběr." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "When an individual is clicked on in the diagram, nothing will happen." +msgstr "Když kliknete na osobu v diagramu, nic se nestane." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "Note that there is currently no option for what to do when a family record is clicked on in the diagram. However, the option to add URLs to individuals and families will also affect families in the browser diagram. That is, if you click a family then if this option is enabled, the family page will open in webtrees." +msgstr "Všimněte si, že momentálně neexistuje žádná možnost nastavit, co dělat, když kliknete na rodinný záznam v diagramu. Možnost přidávat URL adresy k jednotlivcům a rodinám však ovlivní i rodiny v prohlížeči diagramu. To znamená, že pokud kliknete na rodinu, a tato možnost je povolena, stránka rodiny se otevře ve webtrees." + +#. An extra paragraph for the section on URL links in the help page: https://s3.eu-west-1.amazonaws.com/po-pub/i/4Vxx95kI54pojXyfcC4CvyYc.png +#: +msgid "This also affects families in the diagram. If this option is enabled, you can click on family records to open the family webtrees page. Also see \\'Action when individual clicked\\' in the Browser render settings." +msgstr "To také ovlivňuje rodiny v diagramu. Pokud je tato možnost povolena, můžete kliknout na rodinné záznamy a otevřít stránku rodiny ve webtrees. Podívejte se také na \\'Akce po kliknutí na osobu\\' v nastavení vykreslování prohlížeče." + +#. Option for what to do when individual clicked on in diagram +#: +msgid "Add to list of individuals to highlight" +msgstr "" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Show additional individuals in different colour" +msgstr "" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Highlighted individuals background colour" +msgstr "" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Highlighted individuals XREFs" +msgstr "" + +#. Update to help text to add this new option +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/hepcgMX8Ou17qX7kH5upaW16.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of individuals with a coloured background for identification in the diagram. See the option \"Show additional individuals in different colour\", in the Colours section of the Tile design options." +msgstr "" + +#. Update to help text to add this new option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/taeaB9TOXPYyAr6SzuyMVLDJ.png +#: +msgid "Similar to the above option for starting individuals, but this option lets you choose a background colour to highlight a custom selection if individuals based on a list of XREFs. Also see option in Browser Render settings to choose what happens when an individual is clicked, as this may be an easier way to add individuals to this list." +msgstr "" + diff --git a/resources/lang/de.mo b/resources/lang/de.mo index 8ab44906..00f0723d 100644 Binary files a/resources/lang/de.mo and b/resources/lang/de.mo differ diff --git a/resources/lang/de.po b/resources/lang/de.po index 4e7dd769..65d948f1 100644 --- a/resources/lang/de.po +++ b/resources/lang/de.po @@ -418,12 +418,12 @@ msgstr "Nicht-blutsverwandte Personen mit unbekanntem Geschlecht" #. Option allowing user to change the background colour of individual tiles (decorated and combined modes) #: msgid "Individual background colour" -msgstr "Hintergrundfarbe einer Personenbox" +msgstr "Hintergrundfarbe eines Personenkästchens" #. Option where user can change the background colour of the family record (ovals in simple/decorated mode, attached rectangle in combined mode). Default is a light yellow. #: msgid "Family background" -msgstr "Hintergrundfarbe einer Familienbox" +msgstr "Hintergrundfarbe eines Familienkästchens" #. Option where user can change the colour of the borders of the tiles and family records. #: @@ -505,7 +505,7 @@ msgstr "Suchen Sie nach einer Person im Auswahlfeld, um die herum das Diagramm e #: #, fuzzy msgid "This section includes options that let you decide how to build the tree from your starting individual(s).

Include ancestors

Tick this option to include ancestors of your starting individual(s) and anyone in the tree.

Max levels

The number of generations of ancestors to include. For example, if you chose yourself as your starting person, you may want the diagram to include relatives back to your great-grandparents. In this case, you would type "3" in the Max levels box under Include ancestors, to include your parents' generation, your grandparents' generation, and your great-grandparents' generation.

Include descendants

Whether to include children, grandchildren, etc. of people listed in the tree.

Max levels

Similar to the same option for "Include ancestors", this option indicates how many descendant generations should be included.

Relation types to include

The type of relatives to include when generating the diagram.

Siblings

Include brothers and sisters of anyone in the tree.

All relations

Include cousins, nieces, nephews, and their descendants when generating the tree. Requires "Siblings" to be selected.

Partners

Include the husbands, wives, and partners of those in the tree even if they aren't blood-relatives. There is another option "Mark not blood-related people with different color" that allows these people to be marked in a different colour.

Anyone

Follow all links regardless of whether the person is related. In practice, this generally means that the family of non-relatives (i.e. spouses) are included in the tree.

Use this option to include all records of the selected generations. Note that only records with a link are included, so you may need to include more ancestor or descendant generations (or more starting individuals) to get all your records to show." -msgstr "In diesem Abschnitt können Sie entscheiden, welche Personen ausgehend von den Startpersonen bei der Erstellung des Diagramms berücksichtigt werden sollen.

Vorfahren einbeziehen

Wählen Sie hier aus, ob die Vorfahren der Startpersonen und aller anderen Personen im angezeigten Stammbaum einbezogen werden sollen.

Nachkommen einbeziehen

Ob die Kinder, Enkel, etc. der Personen im angezeigten Baum einbezogen werden sollen.

Maximale Generationen

Hier wählen Sie die Anzahl der Vorfahren- und Nachkommengenerationen aus. Wenn Sie beispielsweise sich selbst als Startperson ausgewählt haben und möchten, dass das Diagramm Vorfahren bis zu ihren Urgroßeltern enthält, wählen Sie die "3" im Feld für die maximalen Generationen für die Vorfahren. Somit werden ihre Eltern, die Generation ihrer Großeltern und die Generation ihrer Urgroßeltern einbezogen. Entsprechendes gilt für die maximalen Generationen der Nachkommen.

Einzubeziehende Verbindungsarten

Hier wählen Sie die Art von Verwandten aus, die bei der Erzeugung des Diagramms einbezogen werden sollen.

Geschwister

Brüder und Schwestern aller Personen im Baum werden einbezogen.

Alle Verwandten

Dies bezieht Cousins, Cousinen, Nichten, Neffen und ggf. deren Nachkommen in die Erstellung des Baums ein. Diese Option erfordert auch die Auswahl der "Geschwister".

Partner

Schließen Sie die Ehemänner, Ehefrauen und Partner der Personen im Baum ein, auch wenn diese keine Blutsverwandten sind. Es gibt eine weitere Option "Nicht blutsverwandte Personen in einer anderen Farbe markieren", mit der diese Personen in einer anderen Farbe dargestellt werden können.

Jeder

Diese Option folgt allen Verbindungen, unabhängig davon, ob die Person verwandt ist. Dies bedeutet im Allgemeinen, dass auch die Familien von über die Partner verschwägerten Personen in den Baum aufgenommen werden.

Verwenden Sie diese Option, um alle Datensätze der ausgewählten Generationen einzuschließen. Beachten Sie, dass nur Personen mit einer Verbindung zum Personenkreis im Diagramm enthalten sind, sodass Sie möglicherweise mehr Vorfahrengenerationen (oder mehr Startpersonen) hinzufügen müssen, wenn Sie alle ihre Datensätze anzeigen wollen." +msgstr "In diesem Abschnitt können Sie entscheiden, welche Personen ausgehend von den Startpersonen bei der Erstellung des Diagramms berücksichtigt werden sollen.

Vorfahren einbeziehen

Wählen Sie hier aus, ob die Vorfahren der Startpersonen und aller anderen Personen im angezeigten Stammbaum einbezogen werden sollen.

Maximale Generationen

Hier wählen Sie die Anzahl der Vorfahrengenerationen aus. Wenn Sie beispielsweise sich selbst als Startperson ausgewählt haben und möchten, dass das Diagramm Vorfahren bis zu ihren Urgroßeltern enthält, wählen Sie die "3" im Feld für die maximalen Generationen für die Vorfahren. Somit werden ihre Eltern, die Generation ihrer Großeltern und die Generation ihrer Urgroßeltern einbezogen.

Nachkommen einbeziehen

Ob die Kinder, Enkel, etc. der Personen im angezeigten Baum einbezogen werden sollen.

Maximale Generationen

Ähnlich wie bei der gleichen Option für "Vorfahren einbeziehen" gibt diese Option an, wie viele Nachkommengenerationen einbezogen werden sollen.

Einzubeziehende Verbindungsarten

Hier wählen Sie die Art von Verwandten aus, die bei der Erzeugung des Diagramms einbezogen werden sollen.

Geschwister

Brüder und Schwestern aller Personen im Baum werden einbezogen.

Alle Verwandten

Dies bezieht Cousins, Cousinen, Nichten, Neffen und ggf. deren Nachkommen in die Erstellung des Baums ein. Diese Option erfordert auch die Auswahl der "Geschwister".

Partner

Schließen Sie die Ehemänner, Ehefrauen und Partner der Personen im Baum ein, auch wenn diese keine Blutsverwandten sind. Es gibt eine weitere Option "Nicht blutsverwandte Personen in einer anderen Farbe markieren", mit der diese Personen in einer anderen Farbe dargestellt werden können.

Jeder

Diese Option folgt allen Verbindungen, unabhängig davon, ob die Person verwandt ist. Dies bedeutet im Allgemeinen, dass auch die Familien von über die Partner verschwägerten Personen in den Baum aufgenommen werden.

Verwenden Sie diese Option, um alle Datensätze der ausgewählten Generationen einzuschließen. Beachten Sie, dass nur Personen mit einer Verbindung zum Personenkreis im Diagramm enthalten sind, sodass Sie möglicherweise mehr Vorfahrengenerationen (oder mehr Startpersonen) hinzufügen müssen, wenn Sie alle ihre Datensätze anzeigen wollen." #. This help message is displayed when the user clicks the help icon next to "Graph direction". https://s3.eu-west-1.amazonaws.com/po-pub/i/MpbVhXyRxeLgMO8FZVXHZhHG.png #: @@ -988,17 +988,17 @@ msgstr "Ausgewählte Hintergrundfarbe" #. New option for setting the colour of the stripe on individual tiles: https://s3.eu-west-1.amazonaws.com/po-pub/i/foB5NxsPsztrvQxIxo0R7HvG.png #: msgid "Individual stripe colour" -msgstr "Balkenfarbe einer Personenbox" +msgstr "Balkenfarbe eines Personenkästchens" #. Option to set the border colour of individuals: https://s3.eu-west-1.amazonaws.com/po-pub/i/U91BOGzE90DmKPN8uGvur5k9.png #: msgid "Individual border colour" -msgstr "Randfarbe einer Personenbox" +msgstr "Randfarbe eines Personenkästchens" #. New name for existing option to set the border colour of tiles: https://s3.eu-west-1.amazonaws.com/po-pub/i/JBcfI43E8P0ZCxLo51Bhpa8U.png #: msgid "Family border colour" -msgstr "Randfarbe der Familienbox" +msgstr "Randfarbe der Familienkästchen" #. Option in dropdown box for stripe, border, and background colour option: https://s3.eu-west-1.amazonaws.com/po-pub/i/foB5NxsPsztrvQxIxo0R7HvG.png #: @@ -1013,7 +1013,7 @@ msgstr "Kein Balken" #. Option to set individuals border colour to the same as families (this is the default): https://s3.eu-west-1.amazonaws.com/po-pub/i/U91BOGzE90DmKPN8uGvur5k9.png #: msgid "Same as family border" -msgstr "Genau wie die Randfarbe einer Familienbox" +msgstr "Genau wie die Randfarbe der Familienkästchen" #. New grouping of settings within new Tile contents section: https://s3.eu-west-1.amazonaws.com/po-pub/i/vjxGtnJth5ODT2NSpQ8tm7WB.png #: @@ -1698,7 +1698,7 @@ msgstr "Symbol für Heirat" #. https://s3.eu-west-1.amazonaws.com/po-pub/i/F5T8grIN2Crn5G9tGzAVeCBL.png #: msgid "Abbreviated month names" -msgstr "" +msgstr "Abgekürzte Monatsnamen" #. Part of help page: https://s3.eu-west-1.amazonaws.com/po-pub/i/08Z4pSSmjQhf0V1ym9AEETTC.png #: @@ -1788,7 +1788,7 @@ msgstr "Hinweis: Der CLDR-Anzeigename wird für den Abgleich verwendet. Die Date #. Part of help page for abbreviations: https://s3.eu-west-1.amazonaws.com/po-pub/i/yVRNezroLkh7Cky5dWr4YYyp.png #: msgid "Selecting this box will shorten the month names. This uses the webtrees built in date shortening; in most cases, the month name will be shortened to three characters, e.g. \\\"Jan\\\" for January" -msgstr "" +msgstr "Wenn Sie dieses Kästchen auswählen, werden die Monatsnamen abgekürzt. Dies nutzt die in webtrees eingebaute Datumsverkürzung; In den meisten Fällen wird der Monatsname auf drei Zeichen gekürzt, z. B. \\\"Jan\\“ für Januar" #. Part of help page for choosing what goes on individual's tiles: https://s3.eu-west-1.amazonaws.com/po-pub/i/u1x88hjQ3UFSTpqwJGuCdDSz.png #: @@ -1857,3 +1857,204 @@ msgstr "Sie können auch wählen, ob das vollständige Heiratsdatum oder nur das msgid "Whether to show the place of marriage in the output. Also see option for abbreviating place names." msgstr "Ob der Ort der Eheschließung im Diagramm angezeigt werden soll. Siehe auch Option zum Abkürzen von Ortsnamen." +#. An option in new setting to sort the saved settings list: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/fSaYMVDGQqSSVdo1qxXE1pqY.png +#: +msgid "Oldest first" +msgstr "Älteste zuerst" + +#. An option in new setting to sort the saved settings list: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/fSaYMVDGQqSSVdo1qxXE1pqY.png +#: +msgid "Newest first" +msgstr "Neueste zuerst" + +#. An option in new setting to sort the saved settings list: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/fSaYMVDGQqSSVdo1qxXE1pqY.png +#: +msgid "Alphabetical order" +msgstr "Alphabetische Reihenfolge" + +#. An option in new setting to sort the saved settings list: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/fSaYMVDGQqSSVdo1qxXE1pqY.png +#: +msgid "Reverse alphabetical order" +msgstr "Umgekehrte alphabetische Reihenfolge" + +#. New setting to sort the saved settings list: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/fSaYMVDGQqSSVdo1qxXE1pqY.png +#: +msgid "Settings list sort order" +msgstr "Sortierung der Liste der Einstellungen" + +#. Part of the help text for the Settings list sort order option: https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png +#: +msgid "The default option. New settings are added to the bottom of the list." +msgstr "Standardauswahl. Neue Einstellungen werden am Ende der Liste eingefügt." + +#. Part of the help text for the Settings list sort order option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png +#: +msgid "New settings are added to the top of the list." +msgstr "Neue Einstellungen werden zu Beginn der Liste eingefügt." + +#. Part of the help text for the Settings list sort order option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png +#: +msgid "Settings are sorted based on their name." +msgstr "Einstellungen werden nach ihrem Namen sortiert." + +#. Part of the help text for the Settings list sort order option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png +#: +msgid "Settings are sorted based on their name, but in reverse." +msgstr "Einstellungen werden nach ihrem Namen sortiert, aber in umgekehrter Reihenfolge." + +#. Part of the help text for the Settings list sort order option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png +#: +msgid "Note that if you update a saved setting, this will affect how it is sorted under the 'Oldest first' or 'Newest first' options." +msgstr "Beachten Sie beim Aktualisieren einer gespeicherten Einstellung, dass dies einen Einfluss darauf hat, wie es unter Beachtung der Option 'Älteste zuerst' bzw. 'Neueste zuerst' sortiert wird." + +#. Part of the help text for the Settings list sort order option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/yZYMz48ukCKc7zl43L5QhV0a.png +#: +msgid "This option lets you choose the order of saved settings. The options are" +msgstr "Diese Option erlaubt es die Reihenfolge der gespeicherten Einstellungen auszuwählen. Die Möglichkeiten sind" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Add individual to list of starting individuals" +msgstr "Person zur Liste der Startpersonen hinzufügen" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Open individual's page" +msgstr "Seite der Person öffnen" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Replace starting individuals with this individual" +msgstr "Startpersonen durch diese Person ersetzen" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Add this individual to the list of stopping individuals" +msgstr "Person zur Liste der Stopp-Personen hinzufügen" + +#. One option in the list of things that can happen when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Replace stopping individuals with this individual" +msgstr "Liste der Stopp-Personen durch diese Person ersetzen" + +#. New option to set what happens when you click an individual in the diagram. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Action when individual clicked" +msgstr "Aktion beim Anklicken eines Personenkästchens" + +#. One option in the list of things that can happen when you click an individual in the diagram. +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Show menu" +msgstr "Menü anzeigen" + +#. One option in the list of things that can happen when you click an individual in the diagram. +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/KpMTncLFJrS21Y0UPolZeCDD.png +#: +msgid "Do nothing" +msgstr "Nichts tun" + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "This option lets you choose what happens when you click on an individual in the diagram." +msgstr "Mit dieser Option können Sie auswählen, was passiert, wenn Sie auf ein Personenkästchen im Diagramm klicken." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "This is the default option. When you click on an individual, the webtrees page for that individual will open in a new tab or window." +msgstr "Dies ist die Standardoption. Wenn Sie auf ein Personenkästchen klicken, wird die webtrees-Seite für diese Person in einem neuen Tab oder Fenster geöffnet." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of starting individuals." +msgstr "Wenn diese Option ausgewählt ist, wird durch Klicken auf eine Person im Diagramm diese zur Liste der Startpersonen hinzugefügt." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of starting individuals and remove all others from the list." +msgstr "Wenn diese Option ausgewählt ist, wird durch Klicken auf eine Personenbox im Diagramm diese Person zur Liste der Startpersonen hinzugefügt und alle anderen aus der Liste entfernt." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of stopping individuals." +msgstr "Wenn diese Option ausgewählt ist, wird durch Klicken auf eine Personenbox im Diagramm diese zur Liste der Stopp-Personen hinzugefügt." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of stopping individuals and remove all others from the list." +msgstr "Wenn diese Option ausgewählt ist, wird durch Klicken auf eine Personenbox im Diagramm diese zur Liste der Stopp-Personen hinzugefügt und alle anderen aus der Liste entfernt." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "If this option is chosen, when an individual is clicked on in the diagram, a menu will be shown with the above items to choose from." +msgstr "Wenn diese Option ausgewählt ist und auf ein Personenkästchen im Diagramm geklickt wird, wird ein Menü mit den oben genannten Elementen zur Auswahl angezeigt." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "When an individual is clicked on in the diagram, nothing will happen." +msgstr "Wenn im Diagramm auf ein Personenkästchen geklickt wird, passiert nichts." + +#. Part of the help text for the option "Action when individual clicked". +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/oh4Yjz8fjz3l2aFFkAV608mv.png +#: +msgid "Note that there is currently no option for what to do when a family record is clicked on in the diagram. However, the option to add URLs to individuals and families will also affect families in the browser diagram. That is, if you click a family then if this option is enabled, the family page will open in webtrees." +msgstr "Beachten Sie, dass es derzeit keine Option gibt, die festlegt was geschehen soll, wenn im Diagramm auf ein Familienelement geklickt wird. Die Option zum Hinzufügen von URLs zu Einzelpersonen und Familien wirkt sich jedoch auch auf Familien im Browserdiagramm aus. Das heißt, wenn Sie auf eine Familie klicken und diese Option aktiviert ist, wird die Familienseite in webtrees geöffnet." + +#. An extra paragraph for the section on URL links in the help page: https://s3.eu-west-1.amazonaws.com/po-pub/i/4Vxx95kI54pojXyfcC4CvyYc.png +#: +msgid "This also affects families in the diagram. If this option is enabled, you can click on family records to open the family webtrees page. Also see \\'Action when individual clicked\\' in the Browser render settings." +msgstr "Dies betrifft auch Familien im Diagramm. Wenn diese Option aktiviert ist, können Sie auf Familienelemente klicken, um die webtrees-Seite mit der Familie zu öffnen. Siehe auch \\'Aktion beim Anklicken eines Personenkästchens\\' in den Browser-Einstellungen." + +#. Option for what to do when individual clicked on in diagram +#: +msgid "Add to list of individuals to highlight" +msgstr "" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Show additional individuals in different colour" +msgstr "" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Highlighted individuals background colour" +msgstr "" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Highlighted individuals XREFs" +msgstr "" + +#. Update to help text to add this new option +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/hepcgMX8Ou17qX7kH5upaW16.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of individuals with a coloured background for identification in the diagram. See the option \"Show additional individuals in different colour\", in the Colours section of the Tile design options." +msgstr "" + +#. Update to help text to add this new option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/taeaB9TOXPYyAr6SzuyMVLDJ.png +#: +msgid "Similar to the above option for starting individuals, but this option lets you choose a background colour to highlight a custom selection if individuals based on a list of XREFs. Also see option in Browser Render settings to choose what happens when an individual is clicked, as this may be an easier way to add individuals to this list." +msgstr "" + diff --git a/resources/lang/en-GB.mo b/resources/lang/en-GB.mo index 19c2bac3..46f4580c 100644 Binary files a/resources/lang/en-GB.mo and b/resources/lang/en-GB.mo differ diff --git a/resources/lang/en-GB.po b/resources/lang/en-GB.po index c4ea1712..55d320a6 100644 --- a/resources/lang/en-GB.po +++ b/resources/lang/en-GB.po @@ -2022,3 +2022,38 @@ msgstr "Note that there is currently no option for what to do when a family reco msgid "This also affects families in the diagram. If this option is enabled, you can click on family records to open the family webtrees page. Also see \\'Action when individual clicked\\' in the Browser render settings." msgstr "This also affects families in the diagram. If this option is enabled, you can click on family records to open the family webtrees page. Also see \\'Action when individual clicked\\' in the Browser render settings." +#. Option for what to do when individual clicked on in diagram +#: +msgid "Add to list of individuals to highlight" +msgstr "Add to list of individuals to highlight" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Show additional individuals in different colour" +msgstr "Show additional individuals in different colour" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Highlighted individuals background colour" +msgstr "Highlighted individuals background colour" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Highlighted individuals XREFs" +msgstr "Highlighted individuals XREFs" + +#. Update to help text to add this new option +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/hepcgMX8Ou17qX7kH5upaW16.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of individuals with a coloured background for identification in the diagram. See the option \"Show additional individuals in different colour\", in the Colours section of the Tile design options." +msgstr "If this option is selected, clicking on an individual in the diagram will add them to the list of individuals with a coloured background for identification in the diagram. See the option \"Show additional individuals in different colour\", in the Colours section of the Tile design options." + +#. Update to help text to add this new option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/taeaB9TOXPYyAr6SzuyMVLDJ.png +#: +msgid "Similar to the above option for starting individuals, but this option lets you choose a background colour to highlight a custom selection if individuals based on a list of XREFs. Also see option in Browser Render settings to choose what happens when an individual is clicked, as this may be an easier way to add individuals to this list." +msgstr "Similar to the above option for starting individuals, but this option lets you choose a background colour to highlight a custom selection if individuals based on a list of XREFs. Also see option in Browser Render settings to choose what happens when an individual is clicked, as this may be an easier way to add individuals to this list." + diff --git a/resources/lang/en-US.mo b/resources/lang/en-US.mo index ddf0ea1c..67fe1c6d 100644 Binary files a/resources/lang/en-US.mo and b/resources/lang/en-US.mo differ diff --git a/resources/lang/en-US.po b/resources/lang/en-US.po index c58a32a4..2ec3afcc 100644 --- a/resources/lang/en-US.po +++ b/resources/lang/en-US.po @@ -2022,3 +2022,38 @@ msgstr "Note that there is currently no option for what to do when a family reco msgid "This also affects families in the diagram. If this option is enabled, you can click on family records to open the family webtrees page. Also see \\'Action when individual clicked\\' in the Browser render settings." msgstr "This also affects families in the diagram. If this option is enabled, you can click on family records to open the family webtrees page. Also see \\'Action when individual clicked\\' in the Browser render settings." +#. Option for what to do when individual clicked on in diagram +#: +msgid "Add to list of individuals to highlight" +msgstr "Add to list of individuals to highlight" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Show additional individuals in different colour" +msgstr "Show additional individuals in different color" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Highlighted individuals background colour" +msgstr "Highlighted individuals background color" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Highlighted individuals XREFs" +msgstr "Highlighted individuals XREFs" + +#. Update to help text to add this new option +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/hepcgMX8Ou17qX7kH5upaW16.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of individuals with a coloured background for identification in the diagram. See the option \"Show additional individuals in different colour\", in the Colours section of the Tile design options." +msgstr "If this option is selected, clicking on an individual in the diagram will add them to the list of individuals with a colored background for identification in the diagram. See the option \"Show additional individuals in different color\", in the Colors section of the Tile design options." + +#. Update to help text to add this new option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/taeaB9TOXPYyAr6SzuyMVLDJ.png +#: +msgid "Similar to the above option for starting individuals, but this option lets you choose a background colour to highlight a custom selection if individuals based on a list of XREFs. Also see option in Browser Render settings to choose what happens when an individual is clicked, as this may be an easier way to add individuals to this list." +msgstr "Similar to the above option for starting individuals, but this option lets you choose a background color to highlight a custom selection if individuals based on a list of XREFs. Also see option in Browser Render settings to choose what happens when an individual is clicked, as this may be an easier way to add individuals to this list." + diff --git a/resources/lang/nl.po b/resources/lang/nl.po index a7cdde43..564f324a 100644 --- a/resources/lang/nl.po +++ b/resources/lang/nl.po @@ -2022,3 +2022,38 @@ msgstr "Merk op dat er momenteel geen optie is voor wat er moet gebeuren als er msgid "This also affects families in the diagram. If this option is enabled, you can click on family records to open the family webtrees page. Also see \\'Action when individual clicked\\' in the Browser render settings." msgstr "Dit heeft ook invloed op gezinnen in het diagram. Als deze optie is ingeschakeld, kunt u op gezinsrecords klikken om de webtreespagina van het gezin te openen. Zie ook 'Actie bij klikken op persoon' in de weergave-instellingen van de browser." +#. Option for what to do when individual clicked on in diagram +#: +msgid "Add to list of individuals to highlight" +msgstr "" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Show additional individuals in different colour" +msgstr "" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Highlighted individuals background colour" +msgstr "" + +#. Part of new option to highlight a custom list of individuals +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/iMke2fkhJ5QFsxPD8JHlabfu.png +#: +msgid "Highlighted individuals XREFs" +msgstr "" + +#. Update to help text to add this new option +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/hepcgMX8Ou17qX7kH5upaW16.png +#: +msgid "If this option is selected, clicking on an individual in the diagram will add them to the list of individuals with a coloured background for identification in the diagram. See the option \"Show additional individuals in different colour\", in the Colours section of the Tile design options." +msgstr "" + +#. Update to help text to add this new option: +#. https://s3.eu-west-1.amazonaws.com/po-pub/i/taeaB9TOXPYyAr6SzuyMVLDJ.png +#: +msgid "Similar to the above option for starting individuals, but this option lets you choose a background colour to highlight a custom selection if individuals based on a list of XREFs. Also see option in Browser Render settings to choose what happens when an individual is clicked, as this may be an easier way to add individuals to this list." +msgstr "" + diff --git a/resources/views/MainPage/Appearance/TileDesign.phtml b/resources/views/MainPage/Appearance/TileDesign.phtml index 6c7933f5..18a02267 100644 --- a/resources/views/MainPage/Appearance/TileDesign.phtml +++ b/resources/views/MainPage/Appearance/TileDesign.phtml @@ -161,7 +161,7 @@ use Fisharebest\Webtrees\Auth;

> -
> +
> " />
@@ -172,6 +172,17 @@ use Fisharebest\Webtrees\Auth;
+
+ > +
" > + " /> +
+ + + +
+
+
" />
diff --git a/resources/views/MainPage/Help/Detailed information/Appearance/Tile design.phtml b/resources/views/MainPage/Help/Detailed information/Appearance/Tile design.phtml index 52a2c309..f5a3994d 100644 --- a/resources/views/MainPage/Help/Detailed information/Appearance/Tile design.phtml +++ b/resources/views/MainPage/Help/Detailed information/Appearance/Tile design.phtml @@ -11,6 +11,7 @@ use vendor\WebtreesModules\gvexport\GVExport; use vendor\WebtreesModules\gvexport\Help; $page_name = Help::TILE_DESIGN; +$help = new Help(); ?> name() . '::MainPage/Help/HelpHeader',['name' => $page_name]); ?> @@ -33,6 +34,7 @@ $page_name = Help::TILE_DESIGN;

+

    @@ -88,10 +90,13 @@ $page_name = Help::TILE_DESIGN;

    +
    +

    +

    @@ -102,4 +107,11 @@ $page_name = Help::TILE_DESIGN;

    -

    \ No newline at end of file +

    + +

    +: +

    +
      +
    • getHelpLinkHtml(HELP::BROWSER_RENDER);?>
    • +
    \ No newline at end of file diff --git a/resources/views/MainPage/Help/Detailed information/General settings/Browser render.phtml b/resources/views/MainPage/Help/Detailed information/General settings/Browser render.phtml index 6f72ec55..c3314a66 100644 --- a/resources/views/MainPage/Help/Detailed information/General settings/Browser render.phtml +++ b/resources/views/MainPage/Help/Detailed information/General settings/Browser render.phtml @@ -31,6 +31,7 @@ $help = new Help();
  • -
  • -
  • -
  • +
  • -
  • -
  • -
@@ -43,5 +44,6 @@ $help = new Help();
  • getHelpLinkHtml(HELP::XREFs_OF_INDIVIDUALS);?>
  • getHelpLinkHtml(HELP::STOP_PROCESSING_ON);?>
  • +
  • getHelpLinkHtml(HELP::TILE_DESIGN);?>
  • getHelpLinkHtml(HELP::TILE_CONTENTS);?>
\ No newline at end of file diff --git a/resources/views/MainPage/Translations.phtml b/resources/views/MainPage/Translations.phtml index eb69b30b..dd408a61 100644 --- a/resources/views/MainPage/Translations.phtml +++ b/resources/views/MainPage/Translations.phtml @@ -39,5 +39,6 @@ use Fisharebest\Webtrees\I18N; "Replace starting individuals with this individual":"", "Add this individual to the list of stopping individuals":"", "Replace stopping individuals with this individual":"", + "Add to list of individuals to highlight":"", }; \ No newline at end of file diff --git a/resources/views/page.phtml b/resources/views/page.phtml index c73dabc6..0dea4abd 100644 --- a/resources/views/page.phtml +++ b/resources/views/page.phtml @@ -167,7 +167,12 @@ $usegraphviz = $vars['graphviz_bin'] != ""; const form = document.getElementById('gvexport'); const rendering = document.getElementById('rendering'); - + // Trigger action when button pressed to refresh diagram after changing custom highlight list + document.querySelector('#refresh_highlight_custom').addEventListener('click', function(e) { + if (!autoUpdate) { + updateRender(); + } + }); // Trigger action when "Update" button clicked document.querySelector('.update-browser-rendering').addEventListener('click', function(e) { if (Form.isIndiBlank() === false) { @@ -214,7 +219,7 @@ $usegraphviz = $vars['graphviz_bin'] != ""; } }); - function updateRender() { + function updateRender(scrollX = null, scrollY = null, zoom = null, xref = null) { // Don't overwrite browser settings with default settings if (!firstRender) { // Update settings in browser storage if logged out @@ -245,9 +250,12 @@ $usegraphviz = $vars['graphviz_bin'] != ""; } Form.showHideMatchCheckbox('mark_not_related', 'mark_related_subgroup'); document.getElementById("browser").value = "false"; - let lastDotStr, indiNum, famNum, messages; + let lastDotStr, messages; - rendering.innerHTML = '
Loading...
'; + // Show loading message unless we are doing some nice dynamic tree growing stuff + if (!scrollX || !scrollY) { + rendering.innerHTML = '
Loading...
'; + } rendering.hidden = false; const MARGIN = 50; @@ -344,12 +352,17 @@ $usegraphviz = $vars['graphviz_bin'] != ""; UI.showToast(messages[i]); } } - // Scroll render to last starting individual - let indiList = document.getElementById('xref_list').value.split(","); - for (let i = indiList.length-1; i>=0; i--) { - if (indiList[i].trim() !== "") { - UI.scrollToRecord(indiList[i].trim()); - break; + // scroll to the nominated individual + if (xref) { + UI.scrollToRecord(xref, scrollX, scrollY, zoom); + } else { + // Otherwise scroll to last individual on starting individuals list + let indiList = document.getElementById('xref_list').value.split(","); + for (let i = indiList.length - 1; i >= 0; i--) { + if (indiList[i].trim() !== "") { + UI.scrollToRecord(indiList[i].trim()); + break; + } } }