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

Icon on apps settings #6627

Merged
merged 2 commits into from
Sep 25, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
54 changes: 54 additions & 0 deletions core/css/icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -488,3 +488,57 @@ img, object, video, button, textarea, input, select {
.icon-picture {
background-image: url('../img/places/picture.svg?v=1');
}

/* APP CATEGORIES ------------------------------------------------------------------- */
.icon-category-installed {
background-image: url('../img/actions/user.svg?v=1');
}
.icon-category-enabled {
background-image: url('../img/actions/checkmark.svg?v=1');
}
.icon-category-disabled {
background-image: url('../img/actions/close.svg?v=1');
}
.icon-category-app-bundles {
background-image: url('../img/categories/bundles.svg?v=1');
}

.icon-category-files {
background-image: url('../img/categories/files.svg?v=1');
}

.icon-category-social {
background-image: url('../img/categories/social.svg?v=1');
}

.icon-category-office {
background-image: url('../img/categories/office.svg?v=1');
}

.icon-category-auth {
background-image: url('../img/categories/auth.svg?v=1');
}

.icon-category-monitoring {
background-image: url('../img/categories/monitoring.svg?v=1');
}

.icon-category-multimedia {
background-image: url('../img/categories/multimedia.svg?v=1');
}

.icon-category-organization {
background-image: url('../img/categories/organization.svg?v=1');
}

.icon-category-customization {
background-image: url('../img/categories/customization.svg?v=1');
}

.icon-category-integration {
background-image: url('../img/categories/integration.svg?v=1');
}

.icon-category-tools {
background-image: url('../img/actions/settings-dark.svg?v=1');
}
5 changes: 4 additions & 1 deletion core/img/actions/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions core/img/categories/auth.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions core/img/categories/bundles.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions core/img/categories/customization.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions core/img/categories/files.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions core/img/categories/integration.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions core/img/categories/monitoring.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions core/img/categories/multimedia.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions core/img/categories/office.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions core/img/categories/organization.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions core/img/categories/social.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions settings/js/apps.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ OC.Settings.Apps = OC.Settings.Apps || {
this._loadCategoriesCall.abort();
}

var categories = [
{displayName: t('settings', 'Enabled apps'), ident: 'enabled', id: '0'},
{displayName: t('settings', 'Disabled apps'), ident: 'disabled', id: '1'},
{displayName: t('settings', 'Your apps'), ident: 'installed', id: '2'}
var categories = [,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the , please

{displayName: t('settings', 'Your apps'), ident: 'installed', id: '0'},
{displayName: t('settings', 'Enabled apps'), ident: 'enabled', id: '1',},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the , please

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How did I missed that... 🙈
Thanks!!

{displayName: t('settings', 'Disabled apps'), ident: 'disabled', id: '2'}
];

var source = $("#categories-template").html();
Expand Down
4 changes: 2 additions & 2 deletions settings/templates/apps.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
<script id="categories-template" type="text/x-handlebars-template">
{{#each this}}
<li id="app-category-{{ident}}" data-category-id="{{ident}}" tabindex="0">
<a href="#">{{displayName}}</a>
<a href="#" class="icon-category-{{ident}}">{{displayName}}</a>
</li>
{{/each}}

<?php if($_['appstoreEnabled']): ?>
<li>
<a class="app-external" target="_blank" rel="noreferrer" href="https://docs.nextcloud.org/server/12/developer_manual/"><?php p($l->t('Developer documentation'));?> ↗</a>
<a class="app-external icon-info" target="_blank" rel="noreferrer" href="https://docs.nextcloud.org/server/12/developer_manual/"><?php p($l->t('Developer documentation'));?> ↗</a>
</li>
<?php endif; ?>
</script>
Expand Down