From ed79eacb9dc9ce64c32327bf188818d79bf1d266 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 31 Aug 2020 19:55:30 -0700 Subject: [PATCH] Updated help text --- resources/views/layouts/default.blade.php | 10 ++++ resources/views/layouts/edit-form.blade.php | 51 ++++++++------------ resources/views/partials/more-info.blade.php | 4 +- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index a0ecb9e851..44ee626683 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -742,7 +742,17 @@

@yield('title') + +

+ + @if (isset($helpText)) + @include ('partials.more-info', + [ + 'helpText' => $helpText, + 'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left' + ]) + @endif
@yield('header_right')
diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php index 03557765ed..20a8c99e71 100644 --- a/resources/views/layouts/edit-form.blade.php +++ b/resources/views/layouts/edit-form.blade.php @@ -24,48 +24,37 @@
-
+
-
+
-
+
-
- - @if (isset($helpText)) -
- @include ('partials.more-info', - [ - 'helpText' => $helpText, - 'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left' - ]) -
- @endif - - @if ($item->id) -
-

+
+
+ @if ($item->id) +

{{ $item->display_name }}

-
- @endif + @endif +
+
+ + {{ trans('button.cancel') }} + + +
+

+
- @if ((isset($topSubmit)) && ($topSubmit =='true')) -
- @include('partials.forms.edit.submit-button') -
- @endif - -
- - - -
diff --git a/resources/views/partials/more-info.blade.php b/resources/views/partials/more-info.blade.php index 7a00c10bea..0c45ca4eb8 100644 --- a/resources/views/partials/more-info.blade.php +++ b/resources/views/partials/more-info.blade.php @@ -1 +1,3 @@ - + + +