Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show face as thumbnail if image has a XMP face tag. #757

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
3 changes: 2 additions & 1 deletion admin_site_config.php
Original file line number Diff line number Diff line change
Expand Up @@ -432,8 +432,9 @@
<div class="form-group">
<div class="col-sm-offset-3 col-sm-9">
<p class="small text-muted">
<?php echo Theme::theme()->htmlAlert(I18N::translate('To use a Google mail account, use the following settings: server=smtp.gmail.com, port=587, security=tls, [email protected], password=[your gmail password]'), 'info', false) ?>
<?php echo Theme::theme()->htmlAlert(I18N::translate('To use a Google mail account, use the following settings: server=smtp.gmail.com, port=587, security=tls, [email protected], password=[your gmail password]') . '<br>' . I18N::translate('You must also enable ‘less secure applications’ in your Google account.') . ' <a href="https://support.google.com/a/answer/6260879">https://support.google.com/a/answer/6260879</a>', 'info', false) ?>
</p>

</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion edit_interface.php
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@ function check_form(frm) {
$newgedrec .= "\n1 REPO @" . $REPO . '@';
$CALN = Filter::post('CALN');
if ($CALN) {
$newgedrec .= "\n1 CALN " . $CALN;
$newgedrec .= "\n2 CALN " . $CALN;
}
}
$EVEN = Filter::postArray('EVEN', WT_REGEX_TAG);
Expand Down
2 changes: 1 addition & 1 deletion modules_v3/GEDFact_assistant/census/census-edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$census = new $census;
$controller->restrictAccess($census instanceof CensusInterface);
$date = new Date($census->censusDate());
$year = strip_tags($date->display(false, '%Y', false));
$year = $date->minimumDate()->format('%Y');

$headImg = '<i class="icon-button_head"></i>';

Expand Down
4 changes: 4 additions & 0 deletions note.php
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@

<div id="note-edit">
<table class="facts_table">
<colgroup>
<col class="width20">
<col class="width80">
</colgroup>
<tr>
<td class="descriptionbox">
<?php if (Auth::isEditor($controller->record->getTree())) { ?>
Expand Down
1 change: 1 addition & 0 deletions themes/clouds/css-1.7.4/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2162,6 +2162,7 @@ dd .deletelink {
clear: both;
}

#note-edit .facts_table,
#notes_content .facts_table,
#personal_facts_content .facts_table {
table-layout: fixed;
Expand Down
1 change: 1 addition & 0 deletions themes/colors/css-1.7.4/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2166,6 +2166,7 @@ dd .deletelink {
clear: both;
}

#note-edit .facts_table,
#notes_content .facts_table,
#personal_facts_content .facts_table {
table-layout: fixed;
Expand Down
1 change: 1 addition & 0 deletions themes/fab/css-1.7.4/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2081,6 +2081,7 @@ dd .deletelink {
clear: both;
}

#note-edit .facts_table,
#notes_content .facts_table,
#personal_facts_content .facts_table {
table-layout: fixed;
Expand Down
1 change: 1 addition & 0 deletions themes/minimal/css-1.7.4/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2067,6 +2067,7 @@ dd .deletelink {
clear: both;
}

#note-edit .facts_table,
#notes_content .facts_table,
#personal_facts_content .facts_table {
table-layout: fixed;
Expand Down
1 change: 1 addition & 0 deletions themes/webtrees/css-1.7.4/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2077,6 +2077,7 @@ dd .deletelink {
clear: both;
}

#note-edit .facts_table,
#notes_content .facts_table,
#personal_facts_content .facts_table {
table-layout: fixed;
Expand Down
1 change: 1 addition & 0 deletions themes/xenea/css-1.7.4/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2091,6 +2091,7 @@ dd .deletelink {
clear: both;
}

#note-edit .facts_table,
#notes_content .facts_table,
#personal_facts_content .facts_table {
table-layout: fixed;
Expand Down