From c3c8b0860a28a1ab7f5c051cfb396127d41b519b Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Fri, 27 May 2022 13:59:52 -0400 Subject: [PATCH 1/8] First commit of Registry 5.x default theme (CFM-174) --- app/resources/locales/en_US/field.po | 3 + app/resources/locales/en_US/menu.po | 14 +- app/resources/locales/en_US/operation.po | 3 + app/templates/element/javascript.php | 68 +- app/templates/element/links.php | 52 + app/templates/element/menuMain.php | 144 +-- app/templates/element/menuTop.php | 6 +- app/templates/element/searchGlobal.php | 44 + app/templates/layout/default.php | 89 +- app/webroot/css/co-base.css | 227 +++-- app/webroot/css/co-color.css | 26 +- app/webroot/css/co-responsive.css | 131 ++- app/webroot/css/fonts/inter/Inter-Black.woff | Bin 0 -> 138764 bytes app/webroot/css/fonts/inter/Inter-Black.woff2 | Bin 0 -> 102868 bytes .../css/fonts/inter/Inter-BlackItalic.woff | Bin 0 -> 146824 bytes .../css/fonts/inter/Inter-BlackItalic.woff2 | Bin 0 -> 108752 bytes app/webroot/css/fonts/inter/Inter-Bold.woff | Bin 0 -> 143208 bytes app/webroot/css/fonts/inter/Inter-Bold.woff2 | Bin 0 -> 106140 bytes .../css/fonts/inter/Inter-BoldItalic.woff | Bin 0 -> 151052 bytes .../css/fonts/inter/Inter-BoldItalic.woff2 | Bin 0 -> 111808 bytes .../css/fonts/inter/Inter-ExtraBold.woff | Bin 0 -> 142920 bytes .../css/fonts/inter/Inter-ExtraBold.woff2 | Bin 0 -> 106108 bytes .../fonts/inter/Inter-ExtraBoldItalic.woff | Bin 0 -> 150628 bytes .../fonts/inter/Inter-ExtraBoldItalic.woff2 | Bin 0 -> 111708 bytes .../css/fonts/inter/Inter-ExtraLight.woff | Bin 0 -> 140724 bytes .../css/fonts/inter/Inter-ExtraLight.woff2 | Bin 0 -> 104232 bytes .../fonts/inter/Inter-ExtraLightItalic.woff | Bin 0 -> 149996 bytes .../fonts/inter/Inter-ExtraLightItalic.woff2 | Bin 0 -> 111392 bytes app/webroot/css/fonts/inter/Inter-Italic.woff | Bin 0 -> 144372 bytes .../css/fonts/inter/Inter-Italic.woff2 | Bin 0 -> 106876 bytes app/webroot/css/fonts/inter/Inter-Light.woff | Bin 0 -> 140632 bytes app/webroot/css/fonts/inter/Inter-Light.woff2 | Bin 0 -> 104332 bytes .../css/fonts/inter/Inter-LightItalic.woff | Bin 0 -> 150092 bytes .../css/fonts/inter/Inter-LightItalic.woff2 | Bin 0 -> 111332 bytes app/webroot/css/fonts/inter/Inter-Medium.woff | Bin 0 -> 142552 bytes .../css/fonts/inter/Inter-Medium.woff2 | Bin 0 -> 105924 bytes .../css/fonts/inter/Inter-MediumItalic.woff | Bin 0 -> 150988 bytes .../css/fonts/inter/Inter-MediumItalic.woff2 | Bin 0 -> 112184 bytes .../css/fonts/inter/Inter-Regular.woff | Bin 0 -> 133844 bytes .../css/fonts/inter/Inter-Regular.woff2 | Bin 0 -> 98868 bytes .../css/fonts/inter/Inter-SemiBold.woff | Bin 0 -> 142932 bytes .../css/fonts/inter/Inter-SemiBold.woff2 | Bin 0 -> 105804 bytes .../css/fonts/inter/Inter-SemiBoldItalic.woff | Bin 0 -> 151180 bytes .../fonts/inter/Inter-SemiBoldItalic.woff2 | Bin 0 -> 112048 bytes app/webroot/css/fonts/inter/Inter-Thin.woff | Bin 0 -> 135920 bytes app/webroot/css/fonts/inter/Inter-Thin.woff2 | Bin 0 -> 99632 bytes .../css/fonts/inter/Inter-ThinItalic.woff | Bin 0 -> 145480 bytes .../css/fonts/inter/Inter-ThinItalic.woff2 | Bin 0 -> 106496 bytes .../css/fonts/inter/Inter-italic.var.woff2 | Bin 0 -> 245036 bytes .../css/fonts/inter/Inter-roman.var.woff2 | Bin 0 -> 227180 bytes app/webroot/css/fonts/inter/Inter.var.woff2 | Bin 0 -> 324864 bytes app/webroot/css/fonts/inter/inter.css | 200 ++++ .../css/fonts/material-icons/codepoints | 932 ++++++++++++++++++ app/webroot/img/COmanage-Gears.svg | 1 + 54 files changed, 1627 insertions(+), 313 deletions(-) create mode 100644 app/templates/element/links.php create mode 100644 app/templates/element/searchGlobal.php create mode 100644 app/webroot/css/fonts/inter/Inter-Black.woff create mode 100644 app/webroot/css/fonts/inter/Inter-Black.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-BlackItalic.woff create mode 100644 app/webroot/css/fonts/inter/Inter-BlackItalic.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-Bold.woff create mode 100644 app/webroot/css/fonts/inter/Inter-Bold.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-BoldItalic.woff create mode 100644 app/webroot/css/fonts/inter/Inter-BoldItalic.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-ExtraBold.woff create mode 100644 app/webroot/css/fonts/inter/Inter-ExtraBold.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-ExtraBoldItalic.woff create mode 100644 app/webroot/css/fonts/inter/Inter-ExtraBoldItalic.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-ExtraLight.woff create mode 100644 app/webroot/css/fonts/inter/Inter-ExtraLight.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-ExtraLightItalic.woff create mode 100644 app/webroot/css/fonts/inter/Inter-ExtraLightItalic.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-Italic.woff create mode 100644 app/webroot/css/fonts/inter/Inter-Italic.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-Light.woff create mode 100644 app/webroot/css/fonts/inter/Inter-Light.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-LightItalic.woff create mode 100644 app/webroot/css/fonts/inter/Inter-LightItalic.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-Medium.woff create mode 100644 app/webroot/css/fonts/inter/Inter-Medium.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-MediumItalic.woff create mode 100644 app/webroot/css/fonts/inter/Inter-MediumItalic.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-Regular.woff create mode 100644 app/webroot/css/fonts/inter/Inter-Regular.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-SemiBold.woff create mode 100644 app/webroot/css/fonts/inter/Inter-SemiBold.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-SemiBoldItalic.woff create mode 100644 app/webroot/css/fonts/inter/Inter-SemiBoldItalic.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-Thin.woff create mode 100644 app/webroot/css/fonts/inter/Inter-Thin.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-ThinItalic.woff create mode 100644 app/webroot/css/fonts/inter/Inter-ThinItalic.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-italic.var.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter-roman.var.woff2 create mode 100644 app/webroot/css/fonts/inter/Inter.var.woff2 create mode 100644 app/webroot/css/fonts/inter/inter.css create mode 100644 app/webroot/css/fonts/material-icons/codepoints create mode 100644 app/webroot/img/COmanage-Gears.svg diff --git a/app/resources/locales/en_US/field.po b/app/resources/locales/en_US/field.po index 634a4e8a7..9d2b8f184 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 d8ba9d422..b7a15e410 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,8 @@ msgstr "Groups" msgid "co.people" msgstr "People" +msgid "co.structure" +msgstr "Structure" + 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 249e6092d..c1491edeb 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/javascript.php b/app/templates/element/javascript.php index bda30938a..53263386c 100644 --- a/app/templates/element/javascript.php +++ b/app/templates/element/javascript.php @@ -33,71 +33,21 @@ $('.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"); - } - } - }); - - // 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-menu-collapse').click(function(){ + $('#navigation-drawer').toggleClass('closed'); }); - // 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"); - } + $('#co-hamburger').click(function() { + $('#navigation-drawer').toggleClass('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 000000000..492674593 --- /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 0ee9e64e1..67059f827 100644 --- a/app/templates/element/menuMain.php +++ b/app/templates/element/menuMain.php @@ -27,60 +27,92 @@ // The following menu will only render if we have a user and CO (see default.ctp) ?> - + + + diff --git a/app/templates/element/menuTop.php b/app/templates/element/menuTop.php index 06ea25f00..fefd059ad 100644 --- a/app/templates/element/menuTop.php +++ b/app/templates/element/menuTop.php @@ -29,12 +29,12 @@