Skip to content

move apps management from left apps menu to right settings menu #4079

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

Closed
jancborchardt wants to merge 1 commit into from
Closed

move apps management from left apps menu to right settings menu #4079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 1 addition & 25 deletions core/css/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,30 +321,6 @@ nav {
}
}

/* Apps management */
.apps-management {
min-height: initial;
height: initial;
margin: 0;
a {
svg,
span {
-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)';
opacity: .3;
}
/* icon opacity and hover effect */
&:hover svg,
&:focus svg,
&.active svg,
&:hover span,
&:focus span,
&.active span {
-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
opacity: 1;
}
}
}

#apps {
max-height: calc(100vh - 100px);
overflow: auto;
Expand Down Expand Up @@ -583,4 +559,4 @@ nav {
}
}

}
}
38 changes: 9 additions & 29 deletions core/templates/layout.user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,6 @@
<span><?php p($l->t('More apps')); ?></span>
</a>
</li>
<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
<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']); ?>" />
<div class="icon-loading-dark" style="display:none;"></div>
<span><?php p($l->t('Apps')); ?></span>
</a>
</li>
<?php endif; ?>
</ul>
</div>

Expand All @@ -115,25 +105,6 @@
</a>
</li>
<?php endforeach; ?>
<?php
/* show "More apps" link to app administration directly in app navigation, as last entry */
if(OC_User::isAdminUser(OC_User::getUser())):
?>
<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">
<defs><filter id="invert-appsmanagement"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
<image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-appsmanagement)" xlink:href="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>"></image>
</svg>
<div class="icon-loading-dark" style="display:none;"></div>
<span>
<?php p($l->t('Apps')); ?>
</span>
</a>
</li>
<?php endif; ?>

</ul>
</div>
</div></nav>
Expand Down Expand Up @@ -174,6 +145,15 @@
</a>
</li>
<?php endforeach; ?>
<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
<li>
<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>"
<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
<img src="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>" />
<?php p($l->t('Apps')); ?>
</a>
</li>
<?php endif; ?>
<li>
<a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>>
<img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg') . '?v=' . $_['versionHash']); ?>">
Expand Down
5 changes: 4 additions & 1 deletion settings/img/apps.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.
4 changes: 1 addition & 3 deletions settings/js/apps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,12 +539,10 @@ OC.Settings.Apps = OC.Settings.Apps || {



if (navEntries.length > 7) {
if (navEntries.length > 8) {
$('#more-apps').show();
$('.apps-management').hide();
} else {
$('#more-apps').hide();
$('.apps-management').show();
}
}
});
Expand Down