Skip to content

Clean up menu and IA to remove unavailable features and placeholders (CFM-90) #109

Merged
merged 1 commit into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
7 changes: 2 additions & 5 deletions app/resources/locales/en_US/menu.po
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,12 @@ msgstr "Attributes"
msgid "co.configuration"
msgstr "Configuration"

msgid "co.configuration.az"
msgstr "A-Z Config"
msgid "co.configuration.short"
msgstr "Config"

msgid "co.configuration.char"
msgstr "C"

msgid "co.configuration.panel.az"
msgstr "A-Z Listing"

msgid "co.configuration.panel.title"
msgstr "Configuration"

Expand Down
2 changes: 1 addition & 1 deletion app/templates/element/menuMain.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
],
[
'permission' => 'configuration',
'label' => __d('menu', 'co.configuration.az'),
'label' => __d('menu', 'co.configuration.short'),
'char' => __d('menu', 'co.configuration.char'),
'controller' => 'dashboards',
'action' => 'configuration'
Expand Down
56 changes: 23 additions & 33 deletions app/templates/element/menuPanel.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,18 @@
*/ ?>
</ul>

<?php /* XXX These sidepanel links are disabled until needed, but we will leave them in the code to
provide hints to where they may belong. Plugins related to this panel may also appear here.
<div class="menu-panel-sidepanel">
<?php /* XXX if we want a title for the side menu, use an h3 like so:
<? php /* XXX if we want a title for the side menu, use an h3 like so:
<h3>
<?= __d('menu','related.configurations') ?>
</h3> */
?>
</h3> * /
? >
<div class="menu-panel-sidepanel-content">
<ul class="menu-panel-links menu-panel-links-inner">
<li><a href="#" class="nospin"><em class="material-icons" aria-hidden="true">apps</em> placeholder</a></li>
<?php /* Placeholders below. Replace with real links and text replacement:
<? php /* Placeholders below. Replace with real links and text replacement:
<li><a href="#"><em class="material-icons" aria-hidden="true">lock</em> Authenticators</a></li>
<li><a href="#"><em class="material-icons" aria-hidden="true">forward</em> Enrollment Flows</a></li>
<li><a href="#"><em class="material-icons" aria-hidden="true">access_alarm</em> Expiration Policies</a></li>
Expand All @@ -92,10 +94,11 @@
<li><a href="#"><em class="material-icons" aria-hidden="true">check_circle</em> Identifier Validators</a></li>
<li><a href="#"><em class="material-icons" aria-hidden="true">cloud_upload</em> Provisioning Targets</a></li>
<li><!-- more links here, including plugins --></li>
*/ ?>
* / ? >
</ul>
</div>
</div>
*/ ?>
</div>
<?php endif; ?>
<?php if($panel == 'structure'): ?>
Expand Down Expand Up @@ -161,16 +164,8 @@
</div>
</a>
</li>
*/ ?>
*/ ?>
</ul>
<div class="menu-panel-sidepanel">
<div class="menu-panel-sidepanel-content">
<ul class="menu-panel-links menu-panel-links-inner">
<li><a href="#" class="nospin"><em class="material-icons" aria-hidden="true">apps</em> placeholder</a></li>
<li><!-- more links here, including plugins --></li>
</ul>
</div>
</div>
</div>
<?php endif; ?>
<?php if($panel == 'connections'): ?>
Expand Down Expand Up @@ -246,7 +241,10 @@
<div class="menu-panel-link-desc"><?= __d('menu','co.operations.jobs.desc') ?></div>
</div>
</a>
</li><li>
</li>
<?php
/* XXX Enable highlighted menu items as needed:
<li>
<?php
$menuUrl = $this->Url->build(
['plugin' => null,
Expand All @@ -265,26 +263,12 @@
</div>
</a>
</li>
</ul>
<!-- Add the menu-panel-sidepanel here for plugins and other links. Copy the structure from the People panel above. -->
*/ ?>
</ul>
</div>
<?php endif; ?>
<?php if($panel == 'config'): ?>
<h2><?= __d('menu','co.configuration.panel.title') ?></h2>
<div class="az-link">
<?= $this->Html->link(
__d('menu','co.configuration.panel.az'),
[
'plugin' => null,
'controller' => 'dashboards',
'action' => 'configuration',
'?' => [
'co_id' => $vv_cur_co->id
]
]
);
?>
</div>
<div class="menu-panel-content">
<?php if($vv_cur_co->id == 1): ?>
<?php
Expand Down Expand Up @@ -389,6 +373,11 @@
</ul>
</li>
</ul>

<?php /* XXX The "Personalization" links are disabled until needed, but we will leave them in the code to
provide hints to where they belong. The description ('co.configuration.panel.personalization.desc')
reads "Dashboards, custom text, and theming". When such things are ready, place them here.
<ul class="menu-panel-links">
<li>
<h3><?= __d('menu','co.configuration.panel.personalization') ?></h3>
Expand All @@ -403,10 +392,11 @@
<li><a href="#"><em class="material-icons" aria-hidden="true">email</em> Message Templates</a></li>
<li><a href="#"><em class="material-icons" aria-hidden="true">room_service</em> Self Service Permissions</a></li>
<li><a href="#"><em class="material-icons" aria-hidden="true">wallpaper</em> Themes</a></li>
*/ ?>
* / ? >
</ul>
</li>
</ul>
*/ ?>
</div>
<div class="comanage-version">
<?php print __('registry.version', chop(file_get_contents(CONFIG . "VERSION"))); ?>
Expand Down
9 changes: 0 additions & 9 deletions app/webroot/css/co-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -585,15 +585,6 @@ ul.form-list li.alert-banner .co-alert {
.menu-panel-link-desc {
color: var(--cmg-color-body-txt);
}
.menu-panel .az-link {
position: absolute;
right: 6em;
top: 2em;
font-size: 1.1em;
}
#main-menu .az-link a {
padding: 0;
}
.menu-panel-sidepanel {
padding: 0 1em 2em 1.25em;
}
Expand Down
2 changes: 1 addition & 1 deletion app/webroot/css/co-responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
.menu-panel {
left: calc(100% + 1px);
padding: 1rem 1.5rem;
width: 80vw;
width: 70vw;
min-height: 520px;
border-right: 1px solid var(--cmg-color-bg-006);
border-bottom: 1px solid var(--cmg-color-bg-006);
Expand Down