mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDs 

Fix duplicate id "apps-management"
This commit is contained in:
Morris Jobke 2017-03-20 01:51:20 -06:00 committed by GitHub
parent 81647a58db 14f465879c
commit e446d22359
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/css/header.scss
View File

@ -324,7 +324,7 @@ nav {
}
/* Apps management */
#apps-management {
.apps-management {
min-height: initial;
height: initial;
margin: 0;

4
core/templates/layout.user.php
View File

@ -81,7 +81,7 @@
</a>
</li>
<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
<li id="apps-management" <?php if(count($_['navigation'])>$headerIconCount-1): ?>class="hidden"<?php endif; ?>>
<li <?php if(count($_['navigation'])>$headerIconCount-1): ?> class="hidden apps-management"<?php else: ?> class="apps-management" <?php endif; ?>>
<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4"
<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
<img src="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>" />
@ -119,7 +119,7 @@
/* show "More apps" link to app administration directly in app navigation, as last entry */
if(OC_User::isAdminUser(OC_User::getUser())):
?>
<li id="apps-management">
<li class="apps-management">
<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4"
<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
<svg width="32" height="32" viewBox="0 0 32 32" class="app-icon">

4
settings/js/apps.js
View File

@ -541,10 +541,10 @@ OC.Settings.Apps = OC.Settings.Apps || {
if (navEntries.length > 7) {
$('#more-apps').show();
$('#apps-management').hide();
$('.apps-management').hide();
} else {
$('#more-apps').hide();
$('#apps-management').show();
$('.apps-management').show();
}
}
});