summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-08-01 12:57:48 +0200
committerGitHub <noreply@github.com>2018-08-01 12:57:48 +0200
commite65ca39993c148035585e70aae1937c58eded3c5 (patch)
treeffeee38c35b129e425052d5d465ccc5481508834
parent369a6c13eb34a96fd04dd506b5dbd215bdf42087 (diff)
parentbee78a475e8a1dd171f52ab90a077f5dfbe5066d (diff)
downloadnextcloud-server-e65ca39993c148035585e70aae1937c58eded3c5.tar.gz
nextcloud-server-e65ca39993c148035585e70aae1937c58eded3c5.zip
Merge pull request #10479 from nextcloud/bugfix/noid/personal-settings-icon-visibility
Use icon classes in personal settings
-rw-r--r--settings/js/federationscopemenu.js17
1 files changed, 7 insertions, 10 deletions
diff --git a/settings/js/federationscopemenu.js b/settings/js/federationscopemenu.js
index 250830551aa..92db261b8fd 100644
--- a/settings/js/federationscopemenu.js
+++ b/settings/js/federationscopemenu.js
@@ -16,13 +16,10 @@
'{{#each items}}' +
'<li>' +
'<a href="#" class="menuitem action action-{{name}} permanent {{#if active}}active{{/if}}" data-action="{{name}}">' +
- '{{#if icon}}<img class="icon" src="{{icon}}"/>' +
- '{{else}}'+
- '{{#if iconClass}}' +
- '<span class="icon {{iconClass}}"></span>' +
- '{{else}}' +
- '<span class="no-icon"></span>' +
- '{{/if}}' +
+ '{{#if iconClass}}' +
+ '<span class="icon {{iconClass}}"></span>' +
+ '{{else}}' +
+ '<span class="no-icon"></span>' +
'{{/if}}' +
'<p><strong class="menuitem-text">{{displayName}}</strong><br>' +
'<span class="menuitem-text-detail">{{tooltip}}</span></p></a>' +
@@ -48,21 +45,21 @@
name: 'private',
displayName: (this.field === 'avatar' || this.field === 'displayname') ? t('settings', 'Local') : t('settings', 'Private'),
tooltip: (this.field === 'avatar' || this.field === 'displayname') ? t('settings', 'Only visible to local users') : t('settings', 'Only visible to you'),
- icon: OC.imagePath('core', 'actions/password'),
+ iconClass: 'icon-password',
active: false
},
{
name: 'contacts',
displayName: t('settings', 'Contacts'),
tooltip: t('settings', 'Visible to local users and to trusted servers'),
- icon: OC.imagePath('core', 'places/contacts'),
+ iconClass: 'icon-contacts-dark',
active: false
},
{
name: 'public',
displayName: t('settings', 'Public'),
tooltip: t('settings', 'Will be synced to a global and public address book'),
- icon: OC.imagePath('core', 'places/link'),
+ iconClass: 'icon-link',
active: false
}
];