Skip to content

Settings icon for LDAP and encryption #3244

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
MorrisJobke merged 3 commits into from
Jan 26, 2017
Merged

Settings icon for LDAP and encryption #3244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e46410e
Add icon to admin page sidebar for LDAP
MorrisJobke Jan 24, 2017
f9c3639
add icon for encryption settings on personal page
MorrisJobke Jan 24, 2017
95ef625
Fix tests
nickvergessen Jan 25, 2017
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
5 changes: 5 additions & 0 deletions apps/encryption/css/settings-personal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@
, #recoveryEnabledSuccess {
display: none;
}

/* icons for sidebar */
.nav-icon-basic-encryption-module {
background-image: url('../img/app.svg?v=1');
}
4 changes: 4 additions & 0 deletions apps/user_ldap/img/app-dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion apps/user_ldap/lib/Settings/Section.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@ public function getPriority() {
* {@inheritdoc}
*/
public function getIcon() {
return $this->url->imagePath('user_ldap', 'app.svg');
return $this->url->imagePath('user_ldap', 'app-dark.svg');
}
}
2 changes: 1 addition & 1 deletion apps/user_ldap/tests/Settings/SectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function testGetPriority() {
public function testGetIcon() {
$this->url->expects($this->once())
->method('imagePath')
->with('user_ldap', 'app.svg')
->with('user_ldap', 'app-dark.svg')
->willReturn('icon');

$this->assertSame('icon', $this->section->getIcon());
Expand Down