diff --git a/NOTICE b/NOTICE index 024a3bbc..71dfcfa8 100644 --- a/NOTICE +++ b/NOTICE @@ -56,6 +56,10 @@ files and utilities for further information: MIT License https://getbootstrap.com/ + Duet Date Picker (app/webroot/js/duet-datepicker) + MIT License + https://github.com/duetds/date-picker + Guzzle (app/AvailablePlugin/GithubProvisioner/Vendor/guzzle) MIT License https://github.com/guzzle/guzzle @@ -68,16 +72,28 @@ files and utilities for further information: MIT License https://bitbucket.org/pellepim/jstimezonedetect - noty (app/webroot/js/jquery/noty) - MIT License - http://ned.im/noty + Material Icons (app/webroot/css/fonts/material-icons) + Apache 2.0 + https://fonts.google.com/icons?selected=Material+Icons + + Open Sans (app/webroot/css/fonts/opensans) + Apache 2.0 + https://fonts.google.com/specimen/Open+Sans PHP GitHub API 2.0 (app/AvailablePlugin/GithubProvisioner/Vendor/guzzle/guzzle) MIT License https://github.com/KnpLabs/php-github-api + Select 2 + MIT License + https://select2.org/ + Shibboleth Embedded Discovery Service (app/webroot/js/eds) Apache 2.0 https://shibboleth.net/products/embedded-discovery-service.html + + vuejs + MIT License + https://vuejs.org/ --------------------------------------------------------------------------- diff --git a/app/resources/locales/en_US/field.po b/app/resources/locales/en_US/field.po index 634a4e8a..9d2b8f18 100644 --- a/app/resources/locales/en_US/field.po +++ b/app/resources/locales/en_US/field.po @@ -248,6 +248,9 @@ msgstr "Required" msgid "room" msgstr "Room" +msgid "search.placeholder" +msgstr "Search..." + msgid "sponsor" msgstr "Sponsor" diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po index d8ba9d42..2376b0bf 100644 --- a/app/resources/locales/en_US/menu.po +++ b/app/resources/locales/en_US/menu.po @@ -25,7 +25,16 @@ # Menu Messages msgid "co.configuration" -msgstr "Configuration" +msgstr "Config" + +msgid "co.connections" +msgstr "Connections" + +msgid "co.lifecycle" +msgstr "Lifecycle" + +msgid "co.operations" +msgstr "Operations" msgid "co.groups" msgstr "Groups" @@ -33,5 +42,45 @@ msgstr "Groups" msgid "co.people" msgstr "People" +msgid "co.people.enrollments.pending" +msgstr "Pending Enrollments" + +msgid "co.people.enrollments.pending.desc" +msgstr "See and manage in-progress enrollments (CO Petitions)" + +msgid "co.people.external.source.records" +msgstr "External Source Records" + +msgid "co.people.external.source.records.desc" +msgstr "See and manage information from your external sources" + +msgid "co.people.panel.title" +msgstr "People" + +msgid "co.people.panel.desc" +msgstr "COmanage Registry is a registry for people. This section contains the basic building blocks for modeling and managing people in COmanage." + +msgid "co.people.population" +msgstr "My Population" + +msgid "co.people.population.desc" +msgstr "Review and manage people in your collaboration (CO Person Records)" + +msgid "co.structure" +msgstr "Structure" + +msgid "co.structure.panel.title" +msgstr "Structure" + +msgid "co.structure.panel.desc" +msgstr "COmanage registry provides structures for modeling and managing your organization, including COUs, Groups, and Departments." + +msgid "co.structure.groups" +msgstr "Groups" + +msgid "co.structure.groups.all" +msgstr "All Groups" + msgid "co.switch" msgstr "Switch CO" + diff --git a/app/resources/locales/en_US/operation.po b/app/resources/locales/en_US/operation.po index 249e6092..c1491ede 100644 --- a/app/resources/locales/en_US/operation.po +++ b/app/resources/locales/en_US/operation.po @@ -114,6 +114,9 @@ msgstr "Remove" msgid "save" msgstr "Save" +msgid "search" +msgstr "Search" + msgid "skip_to_content" msgstr "Skip to main content" diff --git a/app/templates/element/badgeList.php b/app/templates/element/badgeList.php index 8c27a899..4c4b3f66 100644 --- a/app/templates/element/badgeList.php +++ b/app/templates/element/badgeList.php @@ -27,7 +27,7 @@ * 'color' => BadgeColorModeEnum::Blue, * 'outline' => false, * 'pill' => true, - * 'fa_class' => 'fa-key', + * 'icon' => 'material-icons-key', * ), * ); * @@ -48,13 +48,13 @@ foreach($vv_badge_list as $badge) { $badge_classes = []; - $fa_element = ""; + $icon = ""; if(isset($badge['pill']) && $badge['pill']) { $badge_classes[] = "rounded-pill"; } - if(!empty($badge['fa_class'])) { - $fa_element = ''; + if(!empty($badge['icon'])) { + $icon = ''; } if(isset($badge['outline']) && $badge['outline']) { $badge_classes[] = "bg-outline-" . $badge['color']; @@ -69,7 +69,7 @@ // Print the Badge print $this->Html->tag( 'span', - $fa_element . $badge['text'], + $icon . $badge['text'], [ 'class' => 'mr-1 badge ' . implode(' ', $badge_classes), 'escape' => false, diff --git a/app/templates/element/javascript.php b/app/templates/element/javascript.php index bda30938..97f28c83 100644 --- a/app/templates/element/javascript.php +++ b/app/templates/element/javascript.php @@ -33,71 +33,30 @@ $('.focusFirst').focus(); // DESKTOP MENU DRAWER BEHAVIOR - // Check the drawer half-closed cookie on first load and set the drawer state appropriately - if (Cookies.get("desktop-drawer-state") == "half-closed") { - $("#navigation-drawer").addClass("half-closed"); - $("#main").addClass("drawer-half-closed"); - } - - // Hamburger menu-drawer toggle - $('#co-hamburger').click(function () { - if($(window).width() < 768) { - // Mobile mode - $("#navigation-drawer").removeClass("half-closed").toggle(); - } else { - // Desktop mode - if ($("#navigation-drawer").hasClass("half-closed")) { - $("#navigation-drawer").removeClass("half-closed"); - $("#main").removeClass("drawer-half-closed"); - // set a cookie to hold drawer half-open state between requests - Cookies.set("desktop-drawer-state", "open"); - } else { - $("#navigation-drawer").addClass("half-closed"); - $("#main").addClass("drawer-half-closed"); - // set a cookie to hold drawer half-open state between requests - Cookies.set("desktop-drawer-state", "half-closed"); - } - } + $('#co-menu-collapse').click(function(){ + $('#navigation-drawer').toggleClass('closed'); }); - // Catch the edge-case of browser resize causing menu-drawer - // to remain hidden and vice versa. - $(window).resize(function() { - if($( window ).width() > 767) { - $("#navigation-drawer").show(); - } else { - $("#navigation-drawer").hide(); - } + $('#co-hamburger').click(function() { + $('#navigation-drawer').toggleClass('visible'); + }); + + $('.menu-panel-toggle').click(function() { + $(this).next('.menu-panel').toggleClass('visible'); }); - // Desktop half-closed drawer behavior & expandable menu items - $('#navigation-drawer a.menuTop').click(function () { - if (Cookies.get("desktop-drawer-state") == "half-closed") { - $("#navigation-drawer").toggleClass("half-closed"); - } + $('.menu-panel-close').click(function() { + $(this).closest('.menu-panel').removeClass('visible'); }); + // END DESKTOP MENU DRAWER BEHAVIOR - // USER MENU BEHAVIORS - $("#global-search label").click(function () { - $("#global-search-box").toggle(); + // GLOBAL SEARCH + $('#search-bar input').focus(function() { + $('#search-bar button').addClass('visible'); }); - - // Accordion - XXX Deprecated? - // $(".accordion").accordion(); - - // Click outside behaviors - // XXX Enable when / if needed (also enable popopvers below) - /*$(document).on('click', function (e) { - // Hide popovers on click outside but don't close current popover when interacting with content inside it - $('#content [data-bs-toggle="popover"]').each(function () { - if (!$(this).is(e.target) && $('.popover.show').has(e.target).length === 0) { - $(this).popover('hide'); - } - }); - });*/ - - // TOP SEARCH FILTER FORM + + // TOP FILTER FORM // Send only non-empty fields in the form $("#top-filters-form").submit(function() { $("#top-filters-form *").filter(':input').each(function () { diff --git a/app/templates/element/links.php b/app/templates/element/links.php new file mode 100644 index 00000000..49267459 --- /dev/null +++ b/app/templates/element/links.php @@ -0,0 +1,52 @@ + + +
+ +
+ \ No newline at end of file diff --git a/app/templates/element/menuMain.php b/app/templates/element/menuMain.php index 0ee9e64e..0a6fdbb1 100644 --- a/app/templates/element/menuMain.php +++ b/app/templates/element/menuMain.php @@ -27,60 +27,101 @@ // The following menu will only render if we have a user and CO (see default.ctp) ?> - + + + diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php new file mode 100644 index 00000000..2b87610e --- /dev/null +++ b/app/templates/element/menuPanel.php @@ -0,0 +1,124 @@ + +
+ +

+

+
+ +
+ + +

+

+
+ +
+ + +
+ diff --git a/app/templates/element/menuTop.php b/app/templates/element/menuTop.php index 06ea25f0..382d38f4 100644 --- a/app/templates/element/menuTop.php +++ b/app/templates/element/menuTop.php @@ -29,16 +29,16 @@