diff --git a/app/templates/Petitions/resume.php b/app/templates/Petitions/resume.php index f976f50c6..8c77e5e51 100644 --- a/app/templates/Petitions/resume.php +++ b/app/templates/Petitions/resume.php @@ -30,33 +30,66 @@ // Track when we've rendered the current/next step so we know when to stop rendering links $seenNextStep = false; ?> - - - - - - - - - - - - - - - - + + +
ordr ?? "" ?>description ?>petition_step_results[0]->comment ?? "" ?>actor_type) ?>id ])) { - print $this->Html->link( - ($step->id == $vv_next_step_id) ? __d('operation', 'continue') : __d('operation', 'Petitions.rerun'), - $vv_dispatch_urls[ $step->id ] - ); - if($step->id == $vv_next_step_id) { - $seenNextStep = true; +
+
+

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

+
+
+ + +
+ Flash->render() ?> + + + + Alert->alert($b, 'warning') ?> + + + + + + Alert->alert($b, 'warning') ?> + + +
+ + +
+ + + + + + + + + + + + + + + + - - -
ordr ?? "" ?>description ?>petition_step_results[0]->comment ?? "" ?>actor_type) ?>id ])) { + print $this->Html->link( + ($step->id == $vv_next_step_id) ? + __d('operation', 'continue') . ' arrow_forward' : + __d('operation', 'Petitions.rerun') . ' restart_alt', + $vv_dispatch_urls[ $step->id ], + [ + 'class' => 'btn btn-sm ' . (($step->id == $vv_next_step_id) ? 'btn-tertiary ef-continue-step' : 'btn-default ef-rerun-step'), + 'escape' => false + ] + ); + + if($step->id == $vv_next_step_id) { + $seenNextStep = true; + } } - } - ?>
\ No newline at end of file + ?>
+ diff --git a/app/templates/Standard/dispatch.php b/app/templates/Standard/dispatch.php index 4d1e15c08..3c107eb52 100644 --- a/app/templates/Standard/dispatch.php +++ b/app/templates/Standard/dispatch.php @@ -35,6 +35,33 @@ // $vv_template_path will be set for plugins $templatePath = $vv_template_path ?? ROOT . DS . "templates" . DS . $modelsName; +?> + +
+
+

+
+
+ + +
+ Flash->render() ?> + + + + Alert->alert($b, 'warning') ?> + + + + + + Alert->alert($b, 'warning') ?> + + +
+ +Form->create(); diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index 4896a9dd2..3ff08ef4b 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -1897,6 +1897,15 @@ li[data-pc-section="emptymessage"] { .eis-meta.eis-item { width: 50%; } +/* PETITIONS */ +#petition-resume td { + vertical-align: middle; +} +.btn.ef-continue-step, +.btn.ef-rerun-step { + padding-right: 1em; + white-space: nowrap; +} /* GENERAL */ .hidden, .invisible, @@ -2173,14 +2182,37 @@ button, .btn, .btn:hover { color: var(--cmg-color-txt-inverse); border-color: var(--cmg-color-btn-bg-001); } -.btn-primary, -.btn-primary:active, .btn-secondary, +.btn-secondary:focus, .btn-secondary:active { + background-color: var(--cmg-color-btn-bg-004); + color: var(--cmg-color-txt-inverse); +} +.btn-tertiary, +.btn-tertiary:focus, +.btn-tertiary:active { + background-color: var(--cmg-color-btn-bg-005); + color: var(--cmg-color-txt-inverse); +} +.btn-default, +.btn-default:focus, +.btn-default:active { + background-color: var(--cmg-color-bg-005); +} +.btn-primary, +.btn-secondary, +.btn-tertiary, +.btn-default, +.btn-primary:active, +.btn-secondary:active, +.btn-tertiary:active, +.btn-default:active { box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12); } .btn-primary:hover, -.btn-secondary:hover { +.btn-secondary:hover, +.btn-tertiary:hover, +.btn-default:hover { background-color: var(--cmg-color-btn-bg-002); color: var(--cmg-color-txt-inverse) !important; border-color: var(--cmg-color-btn-bg-002); diff --git a/app/webroot/css/co-color.css b/app/webroot/css/co-color.css index a3bbf3ceb..c9b6524dd 100644 --- a/app/webroot/css/co-color.css +++ b/app/webroot/css/co-color.css @@ -51,7 +51,8 @@ --cmg-color-btn-bg-001: #115791; /* primary button background color (blue), submit buttons, .btn-primary, pagination */ --cmg-color-btn-bg-002: #000; /* primary button hover color (black) */ --cmg-color-btn-bg-003: #444; /* common background color (gray) */ - --cmg-color-btn-004: #c33; /* button (red) */ + --cmg-color-btn-bg-004: #c33; /* button (red) */ + --cmg-color-btn-bg-005: #17730d; /* button (green) */ /* General Background and Border Colors (Grayscale) */ --cmg-color-bg-001: #fafafa; /* background color */ @@ -128,7 +129,8 @@ html.dark-mode { --cmg-color-btn-bg-001: #0d4573; /* primary button background color (blue), submit buttons, .btn-primary, pagination */ --cmg-color-btn-bg-002: #333; /* primary button hover color (black) */ --cmg-color-btn-bg-003: #eee; /* common background color (gray) */ - --cmg-color-btn-004: #c33; /* button (red) */ + --cmg-color-btn-bg-004: #c33; /* button (red) */ + --cmg-color-btn-bg-005: #17730d; /* button (green) */ /* General Background and Border Colors (Grayscale) */ --cmg-color-bg-001: #121212; /* background color */