Merge pull request #16 from CachetHQ/2.4

Update from upstream repo CachetHQ/Cachet
billmn · Oct 10, 2016 · e2441e7 · e2441e7
2 parents 931c4f5 + d7c1ced
commit e2441e7
Show file tree

Hide file tree

Showing 24 changed files with 74 additions and 74 deletions.
diff --git a/resources/views/dashboard/components/add.blade.php b/resources/views/dashboard/components/add.blade.php
@@ -19,7 +19,7 @@
                 <fieldset>
                     <div class="form-group">
                         <label for="component-name">{{ trans('forms.components.name') }}</label>
-                        <input type="text" class="form-control" name="component[name]" id="component-name" required>
+                        <input type="text" class="form-control" name="component[name]" id="component-name" required placeholder="{{ trans('forms.components.name') }}">
                     </div>
                     <div class="form-group">
                         <label for="component-status">{{ trans('forms.components.status') }}</label>
@@ -31,7 +31,7 @@
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.components.description') }}</label>
-                        <textarea name="component[description]" class="form-control" rows="5"></textarea>
+                        <textarea name="component[description]" class="form-control" rows="5" placeholder="{{ trans('forms.components.description') }}"></textarea>
                     </div>
                     @if($groups->count() > 0)
                     <div class="form-group">
@@ -49,11 +49,11 @@
                     <hr>
                     <div class="form-group">
                         <label>{{ trans('forms.components.link') }}</label>
-                        <input type="text" name="component[link]" class="form-control">
+                        <input type="text" name="component[link]" class="form-control" placeholder="{{ trans('forms.components.link') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.components.tags') }}</label>
-                        <input name="component[tags]" class="form-control">
+                        <input name="component[tags]" class="form-control" placeholder="{{ trans('forms.components.tags') }}">
                         <span class="help-block">{{ trans('forms.components.tags-help') }}</span>
                     </div>
                     <div class="checkbox">

diff --git a/resources/views/dashboard/components/edit.blade.php b/resources/views/dashboard/components/edit.blade.php
@@ -19,7 +19,7 @@
                 <fieldset>
                     <div class="form-group">
                         <label for="incident-name">{{ trans('forms.components.name') }}</label>
-                        <input type="text" class="form-control" name="component[name]" id="component-name" required value="{{ $component->name }}">
+                        <input type="text" class="form-control" name="component[name]" id="component-name" required value="{{ $component->name }}" placeholder="{{ trans('forms.components.name') }}">
                     </div>
                     <div class="form-group">
                         <label for="component-status">{{ trans('forms.components.status') }}</label>
@@ -31,7 +31,7 @@
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.components.description') }}</label>
-                        <textarea name="component[description]" class="form-control" rows="5">{{ $component->description }}</textarea>
+                        <textarea name="component[description]" class="form-control" rows="5" placeholder="{{ trans('forms.components.description') }}">{{ $component->description }}</textarea>
                     </div>
                     @if($groups->count() > 0)
                     <div class="form-group">
@@ -49,11 +49,11 @@
                     <hr>
                     <div class="form-group">
                         <label>{{ trans('forms.components.link') }}</label>
-                        <input type="text" name="component[link]" class="form-control" value="{{ $component->link }}">
+                        <input type="text" name="component[link]" class="form-control" value="{{ $component->link }}" placeholder="{{ trans('forms.components.link') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.components.tags') }}</label>
-                        <input name="component[tags]" class="form-control" value="{{ $component->tagsList }}">
+                        <input name="component[tags]" class="form-control" value="{{ $component->tagsList }}" placeholder="{{ trans('forms.components.tags') }}">
                         <span class="help-block">{{ trans('forms.components.tags-help') }}</span>
                     </div>
                     <div class="checkbox">

diff --git a/resources/views/dashboard/components/groups/add.blade.php b/resources/views/dashboard/components/groups/add.blade.php
@@ -19,7 +19,7 @@
                 <fieldset>
                     <div class="form-group">
                         <label>{{ trans('forms.components.groups.name') }}</label>
-                        <input type="text" class="form-control" name="name" id="group-name" required>
+                        <input type="text" class="form-control" name="name" id="group-name" required placeholder="{{ trans('forms.components.groups.name') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.components.groups.collapsing') }}</label>

diff --git a/resources/views/dashboard/components/groups/edit.blade.php b/resources/views/dashboard/components/groups/edit.blade.php
@@ -19,7 +19,7 @@
                 <fieldset>
                     <div class="form-group">
                         <label>{{ trans('forms.components.groups.name') }}</label>
-                        <input type="text" class="form-control" name="name" id="group-name" value="{{ $group->name }}" required>
+                        <input type="text" class="form-control" name="name" id="group-name" value="{{ $group->name }}" required placeholder="{{ trans('forms.components.groups.name') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.components.groups.collapsing') }}</label>

diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php
@@ -30,7 +30,7 @@
                     @endif
                     <div class="form-group">
                         <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
-                        <input type="text" class="form-control" name="name" id="incident-name" required value="{{ Binput::old('name') }}">
+                        <input type="text" class="form-control" name="name" id="incident-name" required value="{{ Binput::old('name') }}" placeholder="{{ trans('forms.incidents.name') }}">
                     </div>
                     <div class="form-group">
                         <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
@@ -112,7 +112,7 @@
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.incidents.incident_time') }}</label> <small class="text-muted">{{ trans('forms.optional') }}</small>
-                        <input type="text" name="created_at" class="form-control" rel="datepicker-any">
+                        <input type="text" name="created_at" class="form-control" rel="datepicker-any" placeholder="{{ trans('forms.optional') }}">
                     </div>
                     <input type="hidden" name="notify" value="0">
                     @if(subscribers_enabled())

diff --git a/resources/views/dashboard/incidents/edit.blade.php b/resources/views/dashboard/incidents/edit.blade.php
@@ -19,7 +19,7 @@
                 <fieldset>
                     <div class="form-group">
                         <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
-                        <input type="text" class="form-control" name="name" id="incident-name" required value="{{$incident->name}}">
+                        <input type="text" class="form-control" name="name" id="incident-name" required value="{{$incident->name}}" placeholder="{{ trans('forms.incidents.name') }}">
                     </div>
                     <div class="form-group">
                         <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
@@ -85,7 +85,7 @@
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.incidents.incident_time') }}</label> <small class="text-muted">{{ trans('forms.optional') }}</small>
-                        <input type="text" name="created_at" class="form-control" rel="datepicker-any" value="{{ $incident->created_at_datetimepicker }}">
+                        <input type="text" name="created_at" class="form-control" rel="datepicker-any" value="{{ $incident->created_at_datetimepicker }}" placeholder="{{ trans('forms.optional') }}">
                     </div>
                 </fieldset>
 

diff --git a/resources/views/dashboard/metrics/add.blade.php b/resources/views/dashboard/metrics/add.blade.php
@@ -19,16 +19,16 @@
                 <fieldset>
                     <div class="form-group">
                         <label for="metric-name">{{ trans('forms.metrics.name') }}</label>
-                        <input type="text" class="form-control" name="metric[name]" id="metric-name" required value="{{ Binput::old('metric.name') }}">
+                        <input type="text" class="form-control" name="metric[name]" id="metric-name" required value="{{ Binput::old('metric.name') }}" placeholder="{{ trans('forms.metrics.name') }}">
                     </div>
                     <div class="form-group">
                         <label for="metric-suffix">{{ trans('forms.metrics.suffix') }}</label>
-                        <input type="text" class="form-control" name="metric[suffix]" id="metric-suffix" required value="{{ Binput::old('metric.suffix') }}">
+                        <input type="text" class="form-control" name="metric[suffix]" id="metric-suffix" required value="{{ Binput::old('metric.suffix') }}" placeholder="{{ trans('forms.metrics.suffix') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.metrics.description') }}</label>
                         <div class='markdown-control'>
-                            <textarea name="metric[description]" class="form-control" rows="5">{{ Binput::old('metric.description') }}</textarea>
+                            <textarea name="metric[description]" class="form-control" rows="5" placeholder="{{ trans('forms.metrics.description') }}">{{ Binput::old('metric.description') }}</textarea>
                         </div>
                     </div>
                     <div class="form-group">
@@ -49,15 +49,15 @@
                     </div>
                     <div class="form-group">
                         <label for="metric-default_value">{{ trans('forms.metrics.default-value') }}</label>
-                        <input type="number" class="form-control" name="metric[default_value]" id="metric-default_value" value="{{ Binput::old('metric.default_value') }}">
+                        <input type="number" class="form-control" name="metric[default_value]" id="metric-default_value" value="{{ Binput::old('metric.default_value') }}" placeholder="{{ trans('forms.metrics.default-value') }}">
                     </div>
                     <div class="form-group">
                         <label for="metric-places">{{ trans('forms.metrics.places') }}</label>
-                        <input type="number" min="0" max="4" class="form-control" name="metric[places]" id="metric-places" required value="{{ Binput::old('metric.places') }}">
+                        <input type="number" min="0" max="4" class="form-control" name="metric[places]" id="metric-places" required value="{{ Binput::old('metric.places') }}" placeholder="{{ trans('forms.metrics.places') }}">
                     </div>
                     <div class="form-group">
                         <label for="metric-places">{{ trans('forms.metrics.threshold') }}</label>
-                        <input type="number" min="0" max="100" class="form-control" name="metric[threshold]" id="metric-threshold" required value="{{ Binput::old('metric.threshold') }}">
+                        <input type="number" min="0" max="100" class="form-control" name="metric[threshold]" id="metric-threshold" required value="{{ Binput::old('metric.threshold') }}" placeholder="{{ trans('forms.metrics.threshold') }}">
                     </div>
                     <div class="checkbox">
                         <label>

diff --git a/resources/views/dashboard/metrics/edit.blade.php b/resources/views/dashboard/metrics/edit.blade.php
@@ -19,16 +19,16 @@
                 <fieldset>
                     <div class="form-group">
                         <label for="metric-name">{{ trans('forms.metrics.name') }}</label>
-                        <input type="text" class="form-control" name="name" id="metric-name" required value="{{ $metric->name }}">
+                        <input type="text" class="form-control" name="name" id="metric-name" required value="{{ $metric->name }}" placeholder="{{ trans('forms.metrics.name') }}">
                     </div>
                     <div class="form-group">
                         <label for="metric-suffix">{{ trans('forms.metrics.suffix') }}</label>
-                        <input type="text" class="form-control" name="suffix" id="metric-suffix" required value="{{ $metric->suffix }}">
+                        <input type="text" class="form-control" name="suffix" id="metric-suffix" required value="{{ $metric->suffix }}" placeholder="{{ trans('forms.metrics.suffix') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.metrics.description') }}</label>
                         <div class='markdown-control'>
-                            <textarea name="description" class="form-control" rows="5">{{ $metric->description }}</textarea>
+                            <textarea name="description" class="form-control" rows="5" placeholder="{{ trans('forms.metrics.description') }}">{{ $metric->description }}</textarea>
                         </div>
                     </div>
                     <div class="form-group">
@@ -49,15 +49,15 @@
                     </div>
                     <div class="form-group">
                         <label for="metric-default_value">{{ trans('forms.metrics.default-value') }}</label>
-                        <input type="number" class="form-control" name="default_value" id="metric-default_value" value="{{ $metric->default_value }}">
+                        <input type="number" class="form-control" name="default_value" id="metric-default_value" value="{{ $metric->default_value }}" placeholder="{{ trans('forms.metrics.default-value') }}">
                     </div>
                     <div class="form-group">
                         <label for="metric-places">{{ trans('forms.metrics.places') }}</label>
-                        <input type="number" min="0" max="4" class="form-control" name="places" id="metric-places" required value="{{ $metric->places }}">
+                        <input type="number" min="0" max="4" class="form-control" name="places" id="metric-places" required value="{{ $metric->places }}" placeholder="{{ trans('forms.metrics.places') }}">
                     </div>
                     <div class="form-group">
                         <label for="metric-places">{{ trans('forms.metrics.threshold') }}</label>
-                        <input type="number" min="0" max="100" class="form-control" name="threshold" id="metric-threshold" required value="{{ $metric->threshold }}">
+                        <input type="number" min="0" max="100" class="form-control" name="threshold" id="metric-threshold" required value="{{ $metric->threshold }}" placeholder="{{ trans('forms.metrics.threshold') }}">
                     </div>
                     <div class="checkbox">
                         <label>

diff --git a/resources/views/dashboard/schedule/add.blade.php b/resources/views/dashboard/schedule/add.blade.php
@@ -31,17 +31,17 @@
                     @endif
                     <div class="form-group">
                         <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
-                        <input type="text" class="form-control" name="name" id="incident-name" required value="{{ Binput::old('incident.name') }}">
+                        <input type="text" class="form-control" name="name" id="incident-name" required value="{{ Binput::old('incident.name') }}" placeholder="{{ trans('forms.incidents.name') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.incidents.message') }}</label>
                         <div class="markdown-control">
-                            <textarea name="message" class="form-control autosize" rows="5" required>{{ Binput::old('incident.message') }}</textarea>
+                            <textarea name="message" class="form-control autosize" rows="5" required placeholder="{{ trans('forms.incidents.message') }}">{{ Binput::old('incident.message') }}</textarea>
                         </div>
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.incidents.scheduled_at') }}</label>
-                        <input type="text" name="scheduled_at" class="form-control" rel="datepicker" required>
+                        <input type="text" name="scheduled_at" class="form-control" rel="datepicker" required placeholder="{{ trans('forms.incidents.scheduled_at') }}">
                     </div>
                     @if(subscribers_enabled())
                     <div class="checkbox">

diff --git a/resources/views/dashboard/schedule/edit.blade.php b/resources/views/dashboard/schedule/edit.blade.php
@@ -31,7 +31,7 @@
                     @endif
                     <div class="form-group">
                         <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
-                        <input type="text" class="form-control" name="incident[name]" id="incident-name" required value="{{ $schedule->name }}">
+                        <input type="text" class="form-control" name="incident[name]" id="incident-name" required value="{{ $schedule->name }}" placeholder="{{ trans('forms.incidents.name') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.incidents.message') }}</label>
@@ -41,7 +41,7 @@
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.incidents.scheduled_at') }}</label>
-                        <input type="text" name="incident[scheduled_at]" class="form-control" rel="datepicker" value="{{ $schedule->scheduled_at_datetimepicker }}" required>
+                        <input type="text" name="incident[scheduled_at]" class="form-control" rel="datepicker" value="{{ $schedule->scheduled_at_datetimepicker }}" required placeholder="{{ trans('forms.incidents.scheduled_at') }}">
                     </div>
                 </fieldset>
 

diff --git a/resources/views/dashboard/settings/analytics.blade.php b/resources/views/dashboard/settings/analytics.blade.php
@@ -37,15 +37,15 @@
                             <div class="col-xs-12">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.analytics.analytics_piwik_url') }}</label>
-                                    <input type="text" name="app_analytics_piwik_url" class="form-control" value="{{ $app_analytics_piwik_url }}" placeholder="piwik.example.org">
+                                    <input type="text" name="app_analytics_piwik_url" class="form-control" value="{{ $app_analytics_piwik_url }}" placeholder="{{ trans('forms.settings.analytics.analytics_piwik_url') }}">
                                 </div>
                             </div>
                         </div>
                         <div class="row">
                             <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="100" name="app_analytics_piwik_site_id" class="form-control" value="{{ $app_analytics_piwik_site_id }}" placeholder="{{ trans('forms.settings.analytics.analytics_piwik_siteid') }}">
                                 </div>
                             </div>
                         </div>