Merge pull request #4174 from cactysman/patch-1

Updated link to PHP manual for date formats

VERSION

@@ -1 +1 @@
-2.4.0-dev
+2.5.0-dev

composer.json

@@ -98,7 +98,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev"
+            "dev-master": "2.5-dev"
         }
     },
     "minimum-stability": "dev",

resources/views/dashboard/partials/component.blade.php

@@ -1,14 +1,14 @@
 <li class="list-group-item {{ $component->group_id ? "sub-component" : "component" }}">
-    <form class='component-inline form-vertical' data-messenger="{{trans('dashboard.components.edit.success')}}">
+    <form class='component-inline form-vertical' data-messenger="{{ trans('dashboard.components.edit.success') }}">
         <div class="row striped-list-item">
             <div class="col-lg-4 col-md-3 col-sm-12">
                 <h5 class="{{ $component->status_color }}">{{ $component->name }}</h5>
             </div>
             <div class="col-lg-8 col-md-9 col-sm-12 radio-items component-inline-update">
-                @foreach(trans('cachet.components.status') as $statusID => $status)
+                @foreach(trans('cachet.components.status') as $id => $status)
                 <div class="radio-inline">
                     <label>
-                        <input type="radio" name="status" value="{{ $statusID }}" {{ (int) $component->status === $statusID ? 'checked' : null }}>
+                        <input type="radio" name="status" value="{{ $id }}" {{ (int) $component->status === $id ? 'checked' : null }}>
                         {{ $status }}
                     </label>
                 </div>

resources/views/dashboard/partials/components.blade.php

@@ -1,13 +1,13 @@
 @if($component_groups->count() > 0)
-@foreach($component_groups as $componentGroup)
-@if($componentGroup->enabled_components->count() > 0)
+@foreach($component_groups as $component_group)
+@if($component_group->enabled_components)
 <ul class="list-group components">
     <li class="list-group-item group-name">
-        <i class="{{ $componentGroup->collapse_class }} group-toggle"></i>
-        <span class="component-group-name">{{ $componentGroup->name }}</span>
+        <i class="{{ $component_group->collapse_class }} group-toggle"></i>
+        <span class="component-group-name">{{ $component_group->name }}</span>
     </li>
-    <div class="group-items {{ $componentGroup->is_collapsed ? "hide" : null }}">
-        @foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component)
+    <div class="group-items {{ $component_group->is_collapsed ? "hide" : null }}">
+        @foreach($component_group->enabled_components()->orderBy('order')->get() as $component)
         @include('dashboard.partials.component', compact($component))
         @endforeach
     </div>

resources/views/dashboard/settings/analytics.blade.php

@@ -45,7 +45,7 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.analytics.analytics_piwik_siteid') }}</label>
-                                        <input type="number" min="1" max="100" name="app_analytics_piwik_site_id" class="form-control" value="{{ $app_analytics_piwik_site_id }}" placeholder="1">
+                                        <input type="number" min="1" max="1000" name="app_analytics_piwik_site_id" class="form-control" value="{{ $app_analytics_piwik_site_id }}" placeholder="1">
                                     </div>
                                 </div>
                             </div>

resources/views/dashboard/settings/localization.blade.php

@@ -41,7 +41,7 @@
                                     <div class="form-group">
                                         <label>
                                             {{ trans('forms.settings.localization.date-format') }}
-                                            <a href="http://php.net/manual/en/function.date.php" target="_blank"><i class="ion ion-help-circled"></i></a>
+                                            <a href="http://php.net/manual/en/datetime.format.php" target="_blank"><i class="ion ion-help-circled"></i></a>
                                         </label>
                                         <input type="text" class="form-control" name="date_format" value="{{ Config::get('setting.date_format') ?: 'l jS F Y' }}">
                                     </div>
@@ -52,7 +52,7 @@
                                     <div class="form-group">
                                         <label>
                                             {{ trans('forms.settings.localization.incident-date-format') }}
-                                            <a href="http://php.net/manual/en/function.date.php" target="_blank"><i class="ion ion-help-circled"></i></a>
+                                            <a href="http://php.net/manual/en/datetime.format.php" target="_blank"><i class="ion ion-help-circled"></i></a>
                                         </label>
                                         <input type="text" class="form-control" name="incident_date_format" value="{{ Config::get('setting.incident_date_format') ?: 'l jS F Y H:i:s' }}">
                                     </div>