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)
?>
-
- 'people',
- 'controller' => 'people',
- 'action' => 'index',
- 'icon' => 'person',
- 'label' => __d('menu', 'co.people')
- ],
- [
- 'permission' => 'groups',
- 'controller' => 'groups',
- 'action' => 'index',
- 'icon' => 'group',
- 'label' => __d('menu', 'co.groups')
- ],
- [
- 'permission' => 'configuration',
- 'controller' => 'dashboards',
- 'action' => 'configuration',
- 'icon' => 'settings',
- 'label' => __d('menu', 'co.configuration')
- ]
- ];
-
- foreach($menuItems as $m) {
- if(!isset($m['permission']) || $vv_menu_permissions[ $m['permission'] ]) {
- $linkContent = '' . $m['icon'] . ' '
- . '';
-
- print ''
- . $this->Html->link(
- $linkContent,
- ['plugin' => null,
- 'controller' => $m['controller'],
- 'action' => $m['action'],
- '?' => [
- 'co_id' => $vv_cur_co->id
- ]],
- ['escape' => false]
- )
- . ' ';
+
+
+
+ 'people',
+ 'controller' => 'people',
+ 'action' => 'index',
+ 'icon' => 'person',
+ 'dropdown' => 'true',
+ 'label' => __d('menu', 'co.people')
+ ],
+ [
+ 'permission' => 'groups',
+ 'controller' => 'groups',
+ 'action' => 'index',
+ 'icon' => 'group',
+ 'dropdown' => 'true',
+ 'label' => __d('menu', 'co.structure')
+ ],
+ [
+ 'permission' => 'configuration',
+ 'controller' => 'dashboards',
+ 'action' => 'configuration',
+ 'icon' => 'cached',
+ 'dropdown' => 'true',
+ 'label' => __d('menu', 'co.lifecycle')
+ ],
+ [
+ 'permission' => 'configuration',
+ 'controller' => 'dashboards',
+ 'action' => 'configuration',
+ 'icon' => 'hub',
+ 'dropdown' => 'true',
+ 'label' => __d('menu', 'co.connections')
+ ],
+ [
+ 'permission' => 'configuration',
+ 'controller' => 'dashboards',
+ 'action' => 'configuration',
+ 'icon' => 'play_circle_outline',
+ 'dropdown' => 'true',
+ 'label' => __d('menu', 'co.operations')
+ ],
+ [
+ 'permission' => 'configuration',
+ 'controller' => 'dashboards',
+ 'action' => 'configuration',
+ 'icon' => 'settings',
+ 'label' => __d('menu', 'co.configuration')
+ ]
+ ];
+
+ foreach($menuItems as $m) {
+ if(!isset($m['permission']) || $vv_menu_permissions[ $m['permission'] ]) {
+ $linkContent = '' . $m['icon'] . ' '
+ . '';
+
+ print '';
+ print $this->Html->link(
+ $linkContent,
+ ['plugin' => null,
+ 'controller' => $m['controller'],
+ 'action' => $m['action'],
+ '?' => [
+ 'co_id' => $vv_cur_co->id
+ ]],
+ ['escape' => false, 'title' => $m['label']]
+ );
+ print ' ';
+ }
+ }
}
- }
- }
- ?>
-
+ ?>
+
+
+
+