diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po index bed987561..9020e1cd3 100644 --- a/app/resources/locales/en_US/menu.po +++ b/app/resources/locales/en_US/menu.po @@ -192,6 +192,9 @@ msgstr "medium" msgid "menu.density.large" msgstr "large" +msgid "menu.home" +msgstr "Home" + msgid "menu.introduction" msgstr "Please select an action from the menu." diff --git a/app/templates/EnrollmentFlowSteps/fields-nav.inc b/app/templates/EnrollmentFlowSteps/fields-nav.inc new file mode 100644 index 000000000..7eebea083 --- /dev/null +++ b/app/templates/EnrollmentFlowSteps/fields-nav.inc @@ -0,0 +1,31 @@ + 'enrollment_flow', + 'active' => 'steps' +]; \ No newline at end of file diff --git a/app/templates/Petitions/resume.php b/app/templates/Petitions/resume.php index 8c77e5e51..2a8b6ca6e 100644 --- a/app/templates/Petitions/resume.php +++ b/app/templates/Petitions/resume.php @@ -29,12 +29,45 @@ // Track when we've rendered the current/next step so we know when to stop rendering links $seenNextStep = false; + +$action_args = []; +if(!empty($vv_cur_co) && $vv_user_roles['authuser']) { + if($vv_user_roles['co'] || $vv_user_roles['platform']) { + $action_args['vv_actions'][] = [ + 'order' => $this->Menu->getMenuOrder('Default'), + 'icon' => 'pending_actions', + 'url' => [ + 'plugin' => null, + 'controller' => 'Petitions', + 'action' => 'index', + '?' => ['co_id' => $vv_cur_co->id] + ], + 'label' => __d('controller', 'Petitions', 99) + ]; + } + $action_args['vv_actions'][] = [ + 'order' => $this->Menu->getMenuOrder('Default'), + 'icon' => 'home', + 'url' => [ + 'plugin' => null, + 'controller' => 'Dashboards', + 'action' => 'dashboard', + '?' => ['co_id' => $vv_cur_co->id] + ], + 'label' => __d('menu', 'menu.home') + ]; +} ?>

name; // this is the Enrollment Flow name ?>

+ + +
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php index 3dd612797..cdc1bcdce 100644 --- a/app/templates/Standard/add-edit-view.php +++ b/app/templates/Standard/add-edit-view.php @@ -49,10 +49,6 @@ } } -if(file_exists($templatePath . DS . "fields-links.inc")) { - include($templatePath . DS . "fields-links.inc"); -} - // $linkFilter is used for models that belong to a specific parent model (eg: co_id) $linkFilter = []; diff --git a/app/templates/Standard/dispatch.php b/app/templates/Standard/dispatch.php index 3c107eb52..924fb12a7 100644 --- a/app/templates/Standard/dispatch.php +++ b/app/templates/Standard/dispatch.php @@ -35,12 +35,26 @@ // $vv_template_path will be set for plugins $templatePath = $vv_template_path ?? ROOT . DS . "templates" . DS . $modelsName; +$action_args['vv_actions'][] = [ + 'order' => $this->Menu->getMenuOrder('Default'), + 'icon' => 'list', + 'url' => [ + 'plugin' => null, + 'controller' => 'petitions', + 'action' => 'resume', + $vv_petition->id + ], + 'label' => __d('controller', 'EnrollmentFlowSteps', 99) +]; ?>

+
@@ -87,7 +101,7 @@ include($templatePath . DS . "dispatch.inc"); } -print $this->Field->submit(__d('operation', 'save')); +print $this->Field->submit(__d('operation', 'continue')); print $this->Form->end(); diff --git a/app/templates/layout/default.php b/app/templates/layout/default.php index 23e9e5769..8f40c765c 100644 --- a/app/templates/layout/default.php +++ b/app/templates/layout/default.php @@ -82,6 +82,7 @@ $bodyClasses = $controller_stripped . ' ' .$action_stripped; $isCoSelectView = $controller_stripped == 'cos' && $action_stripped == 'select'; $isDashboard = $controller_stripped == 'dashboards' && $action_stripped == 'dashboard'; + $isActivePetition = $vv_action == 'dispatch' || $vv_action == 'resume'; $generateHomeLink = (!$isCoSelectView && !empty($vv_cur_co)); // add further body classes as needed @@ -158,17 +159,19 @@ -
- -
-
menu
- element('searchGlobal') ?> + +
+ +
+
menu
+ element('searchGlobal') ?> +
+ +
+ element('menuTop') ?>
- -
- element('menuTop') ?>
-
+
- + element('menuMain') ?>
- + + +