Move errors partial out of dashboard dir to prevent DashboardComposer running

2018-06-14 20:27:42 +01:00
parent aba944b6dd
commit deeb40cd48
41 changed files with 59 additions and 53 deletions
--- a/resources/views/dashboard/components/add.blade.php
+++ b/resources/views/dashboard/components/add.blade.php
@@ -13,7 +13,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-sm-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form name="CreateComponentForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.components.create', [], 'post') }}" method="POST">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/components/edit.blade.php
+++ b/resources/views/dashboard/components/edit.blade.php
@@ -13,7 +13,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-sm-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form name="EditComponentForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.components.edit', [$component->id], 'post') }}" method="POST">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/components/groups/add.blade.php
+++ b/resources/views/dashboard/components/groups/add.blade.php
@@ -13,7 +13,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-sm-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form name="CreateComponentGroupForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.components.groups.create', [], 'post') }}" method="POST">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/components/groups/edit.blade.php
+++ b/resources/views/dashboard/components/groups/edit.blade.php
@@ -13,7 +13,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-sm-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form name="EditComponentGroupForm" class="form-vertical" role="form" method="POST">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/components/groups/index.blade.php
+++ b/resources/views/dashboard/components/groups/index.blade.php
@@ -13,7 +13,7 @@
            </a>
            <div class="clearfix"></div>
        </div>
-        @include('dashboard.partials.errors')
+        @include('partials.errors')
        <div class="row">
            <div class="col-sm-12 striped-list" data-orderable-list="/dashboard/api/components/groups/order">
                @forelse($groups as $group)
--- a/resources/views/dashboard/components/index.blade.php
+++ b/resources/views/dashboard/components/index.blade.php
@@ -13,7 +13,7 @@
            </a>
            <div class="clearfix"></div>
        </div>
-        @include('dashboard.partials.errors')
+        @include('partials.errors')
        <div class="row">
            <div class="col-sm-12 striped-list" data-orderable-list="/dashboard/api/components/order">
                @forelse($components as $component)
--- a/resources/views/dashboard/incidents/add.blade.php
+++ b/resources/views/dashboard/incidents/add.blade.php
@@ -18,7 +18,7 @@
                {{ trans('forms.incidents.notify_disabled') }}
            </div>
            @endif
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <report-incident inline-template>
                <form class="form-vertical" name="IncidentForm" role="form" method="POST" autocomplete="off">
                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
--- a/resources/views/dashboard/incidents/edit.blade.php
+++ b/resources/views/dashboard/incidents/edit.blade.php
@@ -18,7 +18,7 @@
                    {{ trans('forms.incidents.notify_disabled') }}
                </div>
            @endif
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form class="form-vertical" name="IncidentForm" role="form" method="POST" autocomplete="off">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/incidents/index.blade.php
+++ b/resources/views/dashboard/incidents/index.blade.php
@@ -15,7 +15,7 @@
        </div>
        <div class="row">
            <div class="col-sm-12">
-                @include('dashboard.partials.errors')
+                @include('partials.errors')
                <p class="lead">{!! trans_choice('dashboard.incidents.logged', $incidents->count(), ['count' => $incidents->count()]) !!}</p>

                <div class="striped-list">
--- a/resources/views/dashboard/incidents/updates/add.blade.php
+++ b/resources/views/dashboard/incidents/updates/add.blade.php
@@ -18,7 +18,7 @@
                    {{ trans('forms.incidents.notify_disabled') }}
                </div>
            @endif
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form class="form-vertical" name="IncidentUpdateForm" role="form" method="POST" autocomplete="off">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/incidents/updates/edit.blade.php
+++ b/resources/views/dashboard/incidents/updates/edit.blade.php
@@ -18,7 +18,7 @@
                    {{ trans('forms.incidents.notify_disabled') }}
                </div>
            @endif
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form class="form-vertical" name="IncidentUpdateForm" role="form" method="POST" autocomplete="off">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/incidents/updates/index.blade.php
+++ b/resources/views/dashboard/incidents/updates/index.blade.php
@@ -19,7 +19,7 @@
    </div>
    <div class="row">
        <div class="col-sm-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')

            <div class="striped-list">
                @foreach($incident->updates as $update)
--- a/resources/views/dashboard/maintenance/add.blade.php
+++ b/resources/views/dashboard/maintenance/add.blade.php
@@ -13,7 +13,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-md-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form class="form-vertical" name="ScheduleForm" role="form" method="POST" autocomplete="off">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/maintenance/edit.blade.php
+++ b/resources/views/dashboard/maintenance/edit.blade.php
@@ -13,7 +13,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-md-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form class="form-vertical" name="ScheduleForm" role="form" method='POST' autocomplete="off">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <input type="hidden" name="visible" value="1">
--- a/resources/views/dashboard/maintenance/index.blade.php
+++ b/resources/views/dashboard/maintenance/index.blade.php
@@ -15,7 +15,7 @@
        </div>
        <div class="row">
            <div class="col-sm-12">
-                @include('dashboard.partials.errors')
+                @include('partials.errors')
                <p class="lead">{!! trans_choice('dashboard.schedule.logged', $schedule->count(), ['count' => $schedule->count()]) !!}</p>

                <div class="striped-list">
--- a/resources/views/dashboard/metrics/add.blade.php
+++ b/resources/views/dashboard/metrics/add.blade.php
@@ -13,7 +13,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-md-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form class="form-vertical" name="MetricsForm" role="form" method="POST">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/metrics/edit.blade.php
+++ b/resources/views/dashboard/metrics/edit.blade.php
@@ -13,7 +13,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-md-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form class="form-vertical" name="MetricsForm" role="form" method="POST">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/metrics/index.blade.php
+++ b/resources/views/dashboard/metrics/index.blade.php
@@ -16,7 +16,7 @@
 <div class="content-wrapper header-fixed">
    <div class="row">
        <div class="col-sm-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <div class="striped-list">
                @forelse($metrics as $metric)
                <div class="row striped-list-item">
--- a/resources/views/dashboard/partials/errors.blade.php
+++ b/resources/views/dashboard/partials/errors.blade.php
@@ -1,15 +0,0 @@
-@if ($errors->any())
-@include('dashboard.partials._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
-@endif
-
-@if ($message = Session::get('success'))
-@include('dashboard.partials._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
-@endif
-
-@if ($message = Session::get('warning'))
-@include('dashboard.partials._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
-@endif
-
-@if ($message = Session::get('info'))
-@include('dashboard.partials._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
-@endif
--- a/resources/views/dashboard/settings/analytics.blade.php
+++ b/resources/views/dashboard/settings/analytics.blade.php
@@ -13,7 +13,7 @@
            <div class="col-sm-12">
                <form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST" enctype="multipart/form-data">
                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                    @include('dashboard.partials.errors')
+                    @include('partials.errors')
                    <fieldset>
                        <div class="row">
                            <div class="col-xs-12">
--- a/resources/views/dashboard/settings/app-setup.blade.php
+++ b/resources/views/dashboard/settings/app-setup.blade.php
@@ -13,7 +13,7 @@
            <div class="col-sm-12">
                <form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST">
                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                    @include('dashboard.partials.errors')
+                    @include('partials.errors')
                    <fieldset>
                        <div class="row">
                            <div class="col-xs-12">
--- a/resources/views/dashboard/settings/customization.blade.php
+++ b/resources/views/dashboard/settings/customization.blade.php
@@ -13,7 +13,7 @@
            <div class="col-sm-12">
                <form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST" enctype="multipart/form-data">
                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                    @include('dashboard.partials.errors')
+                    @include('partials.errors')
                    <fieldset>
                        <div class="row">
                            <div class="col-xs-12">
--- a/resources/views/dashboard/settings/localization.blade.php
+++ b/resources/views/dashboard/settings/localization.blade.php
@@ -13,7 +13,7 @@
            <div class="col-sm-12">
                <form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST" enctype="multipart/form-data">
                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                    @include('dashboard.partials.errors')
+                    @include('partials.errors')
                    <fieldset>
                        <div class="row">
                            <div class="col-xs-12">
--- a/resources/views/dashboard/settings/mail.blade.php
+++ b/resources/views/dashboard/settings/mail.blade.php
@@ -13,7 +13,7 @@
            <div class="col-sm-12">
                <form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings.mail', [], 'post') }}" method="POST" enctype="multipart/form-data">
                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                    @include('dashboard.partials.errors')
+                    @include('partials.errors')
                    <fieldset>
                        <div class="form-group">
                            <label>{{ trans('forms.setup.mail_driver') }}</label>
--- a/resources/views/dashboard/settings/security.blade.php
+++ b/resources/views/dashboard/settings/security.blade.php
@@ -13,7 +13,7 @@
            <div class="col-sm-12">
                <form name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST">
                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                    @include('dashboard.partials.errors')
+                    @include('partials.errors')
                    <fieldset>
                        <div class="row">
                            <div class="col-xs-12">
--- a/resources/views/dashboard/settings/stylesheet.blade.php
+++ b/resources/views/dashboard/settings/stylesheet.blade.php
@@ -13,7 +13,7 @@
            <div class="col-sm-12">
                <form name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST">
                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                    @include('dashboard.partials.errors')
+                    @include('partials.errors')
                    <fieldset>
                        <div class="row">
                            <div class="col-xs-12">
--- a/resources/views/dashboard/settings/theme.blade.php
+++ b/resources/views/dashboard/settings/theme.blade.php
@@ -13,7 +13,7 @@
            <div class="col-sm-12">
                <form name="SettingsForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.settings', [], 'post') }}" method="POST"  enctype="multipart/form-data">
                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                    @include('dashboard.partials.errors')
+                    @include('partials.errors')
                    <div class="row">
                        <div class="col-xs-12">
                            <div class="form-group">
--- a/resources/views/dashboard/subscribers/add.blade.php
+++ b/resources/views/dashboard/subscribers/add.blade.php
@@ -12,7 +12,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-sm-12">
-        @include('dashboard.partials.errors')
+        @include('partials.errors')
        <form name="SubscriberForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.subscribers.create', [], 'post') }}" method="POST">
            <input type="hidden" name="_token" value="{{ csrf_token() }}">
            <fieldset>
--- a/resources/views/dashboard/team/add.blade.php
+++ b/resources/views/dashboard/team/add.blade.php
@@ -12,7 +12,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-sm-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form name="UserForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.team.create', [], 'post') }}" method="POST">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/team/edit.blade.php
+++ b/resources/views/dashboard/team/edit.blade.php
@@ -12,7 +12,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-sm-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form name="UserForm" class="form-vertical" role="form" action="/dashboard/team/{{ $user->id }}" method="POST">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/team/invite.blade.php
+++ b/resources/views/dashboard/team/invite.blade.php
@@ -13,7 +13,7 @@
    <invite-team inline-template>
        <div class="row">
            <div class="col-sm-12">
-                @include('dashboard.partials.errors')
+                @include('partials.errors')
                <form name="UserForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.team.invite', [], 'post') }}" method="POST">
                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
                    <fieldset>
--- a/resources/views/dashboard/templates/add.blade.php
+++ b/resources/views/dashboard/templates/add.blade.php
@@ -33,7 +33,7 @@ window.addEventListener("DOMContentLoaded", function(e) {
 <div class="content-wrapper">
    <div class="row">
        <div class="col-md-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form class="form-vertical" name="IncidentForm" role="form" method="POST" autocomplete="off">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <fieldset>
--- a/resources/views/dashboard/templates/index.blade.php
+++ b/resources/views/dashboard/templates/index.blade.php
@@ -15,7 +15,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-sm-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <div class="striped-list">
                @forelse($incident_templates as $template)
                <div class="row striped-list-item">
--- a/resources/views/dashboard/user/index.blade.php
+++ b/resources/views/dashboard/user/index.blade.php
@@ -12,7 +12,7 @@
 <div class="content-wrapper">
    <div class="row">
        <div class="col-sm-12">
-            @include('dashboard.partials.errors')
+            @include('partials.errors')
            <form name="UserForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.user', [], 'post') }}" method="POST">
                {!! csrf_field() !!}
                <fieldset>
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -1,7 +1,13 @@
@extends('layout.master')

@section('content')
-@modules
+@include('partials.modules.messages')
+@include('partials.modules.status')
+@include('partials.modules.components')
+@include('partials.modules.metrics')
+@include('partials.modules.stickied')
+@include('partials.modules.scheduled')
+@include('partials.modules.timeline')
@stop

@section('bottom-content')
--- a/resources/views/dashboard/partials/_error.blade.php
+++ b/resources/views/dashboard/partials/_error.blade.php
--- a/resources/views/partials/errors.blade.php
+++ b/resources/views/partials/errors.blade.php
@@ -0,0 +1,15 @@
+@if ($errors->any())
+@include('partials.error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
+@endif
+
+@if ($message = Session::get('success'))
+@include('partials.error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
+@endif
+
+@if ($message = Session::get('warning'))
+@include('partials.error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
+@endif
+
+@if ($message = Session::get('info'))
+@include('partials.error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
+@endif
--- a/resources/views/partials/modules/messages.blade.php
+++ b/resources/views/partials/modules/messages.blade.php
@@ -1,3 +1,3 @@
 <div class="section-messages">
-    @include('dashboard.partials.errors')
+    @include('partials.errors')
 </div>
--- a/resources/views/signup.blade.php
+++ b/resources/views/signup.blade.php
@@ -21,7 +21,7 @@
 </div>
@endif

-@include('dashboard.partials.errors')
+@include('partials.errors')

 <div class="panel panel-meassage">
    <div class="panel-heading">
--- a/resources/views/subscribe/manage.blade.php
+++ b/resources/views/subscribe/manage.blade.php
@@ -8,7 +8,7 @@

 <div class="clearfix"></div>

-@include('dashboard.partials.errors')
+@include('partials.errors')

 <div class="row">
    <div class="col-xs-12 col-lg-offset-2 col-lg-8">
--- a/resources/views/subscribe/subscribe.blade.php
+++ b/resources/views/subscribe/subscribe.blade.php
@@ -11,7 +11,7 @@

 <div class="clearfix"></div>

-@include('dashboard.partials.errors')
+@include('partials.errors')

 <div class="row">
    <div class="col-xs-12 col-lg-offset-2 col-lg-8">