Skip to content

Theming: Only link Entity in footer if a url is set #10875

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.

Sign up for GitHub

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

Merged
juliusknorr merged 2 commits into from
Aug 28, 2018
Merged

Theming: Only link Entity in footer if a url is set #10875

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5175e33
Theming: Only Entity in footer if a url is set
juliusknorr Aug 27, 2018
c4f34cc
Theming: Fix footer tests
juliusknorr Aug 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Theming: Only Entity in footer if a url is set 
fixes #10024

Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Aug 27, 2018
commit 5175e33e31a45035ad4162aef3c342a277a26894
10 changes: 7 additions & 3 deletions apps/theming/lib/ThemingDefaults.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,13 @@ public function getPrivacyUrl() {

public function getShortFooter() {
$slogan = $this->getSlogan();
$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
' rel="noreferrer noopener">' .$this->getEntity() . '</a>'.
($slogan !== '' ? ' – ' . $slogan : '');
if ($this->getBaseUrl() !== '') {
$footer = '<a href="' . $this->getBaseUrl() . '" target="_blank"' .
' rel="noreferrer noopener" class="entity-name">' . $this->getEntity() . '</a>';
} else {
$footer = '<span class="entity-name">' .$this->getEntity() . '</span>';
}
$footer .= ($slogan !== '' ? ' – ' . $slogan : '');

$links = [
[
Expand Down
2 changes: 1 addition & 1 deletion core/css/guest.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ footer {
margin-top: auto;
}

footer .info a {
footer .info .entity-name {
font-weight: 600;
}

Expand Down