Merge pull request #899 from cachethq/organize-views

Move dashboard partials into the dashboard directory
2025-02-13 03:45:26 +01:00 · 2015-08-13 22:37:57 +01:00 · 2015-08-13 22:37:57 +01:00 · 308ee1bd81
commit 308ee1bd81
parent bee4055228 3b487ea2ec
35 changed files with 40 additions and 40 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('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                <form name="CreateComponentForm" class="form-vertical" role="form" action="/dashboard/components/add" 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('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                <form name="EditComponentForm" class="form-vertical" role="form" action="/dashboard/components/{{ $component->id }}/edit" 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('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                <form name="CreateComponentGroupForm" class="form-vertical" role="form" action="/dashboard/components/groups/add" 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('partials.dashboard.errors')
+                @include('dashboard.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
@ -3,7 +3,7 @@
@section('content')
    <div class="content-panel">
        @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
        @endif
        <div class="content-wrapper">
            <div class="header sub-header">
--- a/resources/views/dashboard/components/index.blade.php
+++ b/resources/views/dashboard/components/index.blade.php
@ -3,7 +3,7 @@
@section('content')
    <div class="content-panel">
        @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
        @endif
        <div class="content-wrapper">
            <div class="header sub-header">
--- a/resources/views/dashboard/incidents/add.blade.php
+++ b/resources/views/dashboard/incidents/add.blade.php
@ -13,7 +13,7 @@
    <div class="content-wrapper">
        <div class="row">
            <div class="col-md-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.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/edit.blade.php
+++ b/resources/views/dashboard/incidents/edit.blade.php
@ -13,7 +13,7 @@
    <div class="content-wrapper">
        <div class="row">
            <div class="col-md-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.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
@ -3,7 +3,7 @@
@section('content')
    <div class="content-panel">
        @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
        @endif
        <div class="content-wrapper">
            <div class="header sub-header">
@ -17,7 +17,7 @@
            </div>
            <div class="row">
                <div class="col-sm-12">
-                    @include('partials.dashboard.errors')
+                    @include('dashboard.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/templates/add.blade.php
+++ b/resources/views/dashboard/incidents/templates/add.blade.php
@ -13,7 +13,7 @@
    <div class="content-wrapper">
        <div class="row">
            <div class="col-md-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.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/index.blade.php
+++ b/resources/views/dashboard/index.blade.php
@ -45,7 +45,7 @@
        </div>
    </div>
    @if(Session::get('setup.done'))
-    @include('partials.dashboard.welcome-modal')
+    @include('dashboard.partials.welcome-modal')
    <script>
        $(function() {
            $('#welcome-modal').modal('show');
--- 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('partials.dashboard.errors')
+                @include('dashboard.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('partials.dashboard.errors')
+                @include('dashboard.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('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                <div class="striped-list">
                    @foreach($metrics as $metric)
                    <div class="row striped-list-item">
--- a/resources/views/dashboard/partials/_error.blade.php
+++ b/resources/views/dashboard/partials/_error.blade.php
--- a/resources/views/dashboard/partials/errors.blade.php
+++ b/resources/views/dashboard/partials/errors.blade.php
@ -1,15 +1,15 @@
@if ($errors->any())
-  @include('partials.dashboard._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
+  @include('dashboard.partials._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
@endif

@if ($message = Session::get('success'))
-  @include('partials.dashboard._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
+  @include('dashboard.partials._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
@endif

@if ($message = Session::get('warning'))
-  @include('partials.dashboard._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
+  @include('dashboard.partials._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
@endif

@if ($message = Session::get('info'))
-  @include('partials.dashboard._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
+  @include('dashboard.partials._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
@endif
--- a/resources/views/dashboard/partials/head.blade.php
+++ b/resources/views/dashboard/partials/head.blade.php
--- a/resources/views/dashboard/partials/sidebar.blade.php
+++ b/resources/views/dashboard/partials/sidebar.blade.php
--- a/resources/views/dashboard/partials/sub-sidebar.blade.php
+++ b/resources/views/dashboard/partials/sub-sidebar.blade.php
--- a/resources/views/dashboard/partials/welcome-modal.blade.php
+++ b/resources/views/dashboard/partials/welcome-modal.blade.php
--- a/resources/views/dashboard/schedule/add.blade.php
+++ b/resources/views/dashboard/schedule/add.blade.php
@ -13,7 +13,7 @@
    <div class="content-wrapper">
        <div class="row">
            <div class="col-md-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.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="incident[visible]" value="1">
--- a/resources/views/dashboard/schedule/edit.blade.php
+++ b/resources/views/dashboard/schedule/edit.blade.php
@ -13,7 +13,7 @@
    <div class="content-wrapper">
        <div class="row">
            <div class="col-md-12">
-                @include('partials.dashboard.errors')
+                @include('dashboard.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="incident[visible]" value="1">
--- a/resources/views/dashboard/schedule/index.blade.php
+++ b/resources/views/dashboard/schedule/index.blade.php
@ -3,7 +3,7 @@
@section('content')
    <div class="content-panel">
        @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
        @endif
        <div class="content-wrapper">
            <div class="header sub-header">
@ -17,7 +17,7 @@
            </div>
            <div class="row">
                <div class="col-sm-12">
-                    @include('partials.dashboard.errors')
+                    @include('dashboard.partials.errors')

                    <div class="striped-list">
                        @foreach($schedule as $incident)
--- a/resources/views/dashboard/settings/app-setup.blade.php
+++ b/resources/views/dashboard/settings/app-setup.blade.php
@ -3,7 +3,7 @@
@section('content')
    <div class="content-panel">
        @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
        @endif
        <div class="content-wrapper">
            <div class="header sub-header" id="application-setup">
@ -15,7 +15,7 @@
                <div class="col-sm-12">
                    <form id="settings-form" name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST" enctype="multipart/form-data">
                        <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                        @include('partials.dashboard.errors')
+                        @include('dashboard.partials.errors')
                        <fieldset>
                            <div class="row">
                                <div class="col-xs-12">
--- a/resources/views/dashboard/settings/security.blade.php
+++ b/resources/views/dashboard/settings/security.blade.php
@ -3,7 +3,7 @@
@section('content')
    <div class="content-panel">
        @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
        @endif
        <div class="content-wrapper">
            <div class="header sub-header" id="security">
@ -15,7 +15,7 @@
                <div class="col-sm-12">
                    <form name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST">
                        <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                        @include('partials.dashboard.errors')
+                        @include('dashboard.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
@ -3,7 +3,7 @@
@section('content')
    <div class="content-panel">
        @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
        @endif
        <div class="content-wrapper">
            <div class="header sub-header" id="stylesheet">
@ -15,7 +15,7 @@
                <div class="col-sm-12">
                    <form name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST">
                        <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                        @include('partials.dashboard.errors')
+                        @include('dashboard.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
@ -3,7 +3,7 @@
@section('content')
    <div class="content-panel">
        @if(isset($sub_menu))
-        @include('partials.dashboard.sub-sidebar')
+        @include('dashboard.partials.sub-sidebar')
        @endif
        <div class="content-wrapper">
            <div class="header sub-header" id="theme">
@ -15,7 +15,7 @@
                <div class="col-sm-12">
                    <form name="SettingsForm" class="form-vertical" role="form" action="/dashboard/settings" method="POST">
                        <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                        @include('partials.dashboard.errors')
+                        @include('dashboard.partials.errors')
                        <fieldset>
                            <div class="row">
                                <div class="col-xs-6">
--- 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('partials.dashboard.errors')
+            @include('dashboard.partials.errors')
            <form name="SubscriberForm" class="form-vertical" role="form" action="/dashboard/subscribers/add" 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('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                <form name="UserForm" class="form-vertical" role="form" action="/dashboard/team/add" 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('partials.dashboard.errors')
+                @include('dashboard.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/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('partials.dashboard.errors')
+                @include('dashboard.partials.errors')
                <form name="UserForm" class="form-vertical" role="form" action="/dashboard/user" method="POST">
                    <fieldset>
                        <div class="form-group">
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@ -10,7 +10,7 @@
    <div class="clearfix"></div>

    <div class="section-messages">
-        @include('partials.dashboard.errors')
+        @include('dashboard.partials.errors')
    </div>

    @if($bannerImage = Setting::get('app_banner'))
--- a/resources/views/layout/clean.blade.php
+++ b/resources/views/layout/clean.blade.php
@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-@include('partials.dashboard.head')
+@include('dashboard.partials.head')

 <body class="dashboard @yield('bodyClass')">
    <div class="content">
--- a/resources/views/layout/dashboard.blade.php
+++ b/resources/views/layout/dashboard.blade.php
@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
-@include('partials.dashboard.head')
+@include('dashboard.partials.head')

 <body class="dashboard">
    <div class="wrapper">
-        @include('partials.dashboard.sidebar')
+        @include('dashboard.partials.sidebar')
        <div class="page-content">
            @yield('content')
        </div>
--- a/resources/views/subscribe.blade.php
+++ b/resources/views/subscribe.blade.php
@ -27,7 +27,7 @@
    </div>
    @endif

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

    <h1>{{ trans('cachet.subscriber.subscribe') }}</h1>
    <form action="{{ route('subscribe', [], false) }}" method="post">