From dd7943632ad0a66ffe9b9fdbdb035ea629dd1d59 Mon Sep 17 00:00:00 2001
From: Abhimanyu Sharma <abhimanyusharma003@gmail.com>
Date: Mon, 10 Oct 2016 15:51:02 +0530
Subject: [PATCH] Added placeholders

---
 .../views/dashboard/components/add.blade.php  |  8 +++----
 .../views/dashboard/components/edit.blade.php |  8 +++----
 .../dashboard/components/groups/add.blade.php |  2 +-
 .../components/groups/edit.blade.php          |  2 +-
 .../views/dashboard/incidents/add.blade.php   |  4 ++--
 .../views/dashboard/incidents/edit.blade.php  |  4 ++--
 .../views/dashboard/metrics/add.blade.php     | 12 +++++-----
 .../views/dashboard/metrics/edit.blade.php    | 12 +++++-----
 .../views/dashboard/schedule/add.blade.php    |  6 ++---
 .../views/dashboard/schedule/edit.blade.php   |  4 ++--
 .../dashboard/settings/analytics.blade.php    |  4 ++--
 .../dashboard/settings/app-setup.blade.php    |  8 +++----
 .../settings/customization.blade.php          |  4 ++--
 .../dashboard/settings/localization.blade.php |  2 +-
 .../dashboard/settings/stylesheet.blade.php   |  2 +-
 .../views/dashboard/settings/theme.blade.php  | 24 +++++++++----------
 .../views/dashboard/subscribers/add.blade.php |  2 +-
 resources/views/dashboard/team/add.blade.php  |  6 ++---
 resources/views/dashboard/team/edit.blade.php |  6 ++---
 .../views/dashboard/templates/add.blade.php   |  4 ++--
 .../views/dashboard/templates/edit.blade.php  |  4 ++--
 .../views/dashboard/user/index.blade.php      |  8 +++----
 resources/views/setup/index.blade.php         |  6 ++---
 resources/views/signup.blade.php              |  6 ++---
 24 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/resources/views/dashboard/components/add.blade.php b/resources/views/dashboard/components/add.blade.php
index 48dd35f5..e9e0c62d 100644
--- 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
index 6bcd63d8..3f665db2 100644
--- 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
index 2b6923a1..1c4e9899 100644
--- 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
index e7aacb9f..7de8f67d 100644
--- 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
index 0b2c393f..d925a21a 100644
--- 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
index 7009dcbc..9b419b18 100644
--- 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
index 88408762..840fd92f 100644
--- 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
index 4889f719..fc5ab321 100644
--- 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
index 1ad5cfbe..84fedbf0 100644
--- 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
index a336c16f..a9178a11 100644
--- 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
index e3b953f1..94b137b2 100644
--- a/resources/views/dashboard/settings/analytics.blade.php
+++ b/resources/views/dashboard/settings/analytics.blade.php
@@ -37,7 +37,7 @@
                             <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>
@@ -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="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>
diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php
index 7ae7f7e0..fbdb4ee3 100644
--- a/resources/views/dashboard/settings/app-setup.blade.php
+++ b/resources/views/dashboard/settings/app-setup.blade.php
@@ -21,7 +21,7 @@
                             <div class="col-xs-12">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.app-setup.site-name') }}</label>
-                                    <input type="text" class="form-control" name="app_name" value="{{ $app_name }}" required>
+                                    <input type="text" class="form-control" name="app_name" value="{{ $app_name }}" required placeholder="{{ trans('forms.settings.app-setup.site-name') }}">
                                 </div>
                             </div>
                         </div>
@@ -29,7 +29,7 @@
                             <div class="col-xs-12">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.app-setup.site-url') }}</label>
-                                    <input type="text" class="form-control" name="app_domain" value="{{ $app_domain }}" required>
+                                    <input type="text" class="form-control" name="app_domain" value="{{ $app_domain }}" required placeholder="{{ trans('forms.settings.app-setup.site-url') }}">
                                 </div>
                             </div>
                         </div>
@@ -38,7 +38,7 @@
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.app-setup.about-this-page') }}</label>
                                     <div class='markdown-control'>
-                                        <textarea name="app_about" class="form-control autosize" rows="4">{{ $raw_app_about }}</textarea>
+                                        <textarea name="app_about" class="form-control autosize" rows="4" placeholder="{{ trans('forms.settings.app-setup.about-this-page') }}">{{ $raw_app_about }}</textarea>
                                     </div>
                                 </div>
                             </div>
@@ -47,7 +47,7 @@
                             <div class="col-xs-12">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.app-setup.days-of-incidents') }}</label>
-                                    <input type="number" max="100" name="app_incident_days" class="form-control" value="{{ Config::get('setting.app_incident_days', 7) }}">
+                                    <input type="number" max="100" name="app_incident_days" class="form-control" value="{{ Config::get('setting.app_incident_days', 7) }}" placeholder="{{ trans('forms.settings.app-setup.days-of-incidents') }}">
                                 </div>
                             </div>
                         </div>
diff --git a/resources/views/dashboard/settings/customization.blade.php b/resources/views/dashboard/settings/customization.blade.php
index 7063dd86..cb2095a5 100644
--- a/resources/views/dashboard/settings/customization.blade.php
+++ b/resources/views/dashboard/settings/customization.blade.php
@@ -21,7 +21,7 @@
                             <div class="col-xs-12">
                                 <div class="form-group">
                                     <label>{{ trans('dashboard.settings.customization.header') }}</label>
-                                    <textarea name="header" class="form-control" rows="10">{{ Config::get('setting.header') }}</textarea>
+                                    <textarea name="header" class="form-control" rows="10" placeholder="{{ trans('dashboard.settings.customization.header') }}">{{ Config::get('setting.header') }}</textarea>
                                 </div>
                             </div>
                         </div>
@@ -29,7 +29,7 @@
                             <div class="col-xs-12">
                                 <div class="form-group">
                                     <label>{{ trans('dashboard.settings.customization.footer') }}</label>
-                                    <textarea name="footer" class="form-control" rows="10">{{ Config::get('setting.footer') }}</textarea>
+                                    <textarea name="footer" class="form-control" rows="10" placeholder="{{ trans('dashboard.settings.customization.footer') }}">{{ Config::get('setting.footer') }}</textarea>
                                 </div>
                             </div>
                         </div>
diff --git a/resources/views/dashboard/settings/localization.blade.php b/resources/views/dashboard/settings/localization.blade.php
index 0cd28976..95611c89 100644
--- a/resources/views/dashboard/settings/localization.blade.php
+++ b/resources/views/dashboard/settings/localization.blade.php
@@ -54,7 +54,7 @@
                                         {{ 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>
                                     </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' }}">
+                                    <input type="text" class="form-control" name="incident_date_format" value="{{ Config::get('setting.incident_date_format') ?: 'l jS F Y H:i:s' }}" placeholder="{{ trans('forms.settings.localization.incident-date-format') }}">
                                 </div>
                             </div>
                         </div>
diff --git a/resources/views/dashboard/settings/stylesheet.blade.php b/resources/views/dashboard/settings/stylesheet.blade.php
index 6a700418..8dcc25cc 100644
--- a/resources/views/dashboard/settings/stylesheet.blade.php
+++ b/resources/views/dashboard/settings/stylesheet.blade.php
@@ -21,7 +21,7 @@
                             <div class="col-xs-12">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.stylesheet.custom-css') }}</label>
-                                    <textarea class="form-control autosize" name="stylesheet" rows="10">{{ Config::get('setting.stylesheet') }}</textarea>
+                                    <textarea class="form-control autosize" name="stylesheet" rows="10" placeholder="{{ trans('forms.settings.stylesheet.custom-css') }}">{{ Config::get('setting.stylesheet') }}</textarea>
                                 </div>
                             </div>
                         </div>
diff --git a/resources/views/dashboard/settings/theme.blade.php b/resources/views/dashboard/settings/theme.blade.php
index c8419323..1ce39d3a 100644
--- a/resources/views/dashboard/settings/theme.blade.php
+++ b/resources/views/dashboard/settings/theme.blade.php
@@ -39,13 +39,13 @@
                             <div class="col-xs-6">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.theme.background-color') }}</label>
-                                    <input type="text" class="form-control color-code" name="style.background_color" value="{{ $theme_background_color }}">
+                                    <input type="text" class="form-control color-code" name="style.background_color" value="{{ $theme_background_color }}" placeholder="{{ trans('forms.settings.theme.background-color') }}">
                                 </div>
                             </div>
                             <div class="col-xs-6">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.theme.text-color') }}</label>
-                                    <input type="text" class="form-control color-code" name="style.text_color" value="{{ $theme_text_color }}">
+                                    <input type="text" class="form-control color-code" name="style.text_color" value="{{ $theme_text_color }}" placeholder="{{ trans('forms.settings.theme.text-color') }}">
                                 </div>
                             </div>
                         </div>
@@ -54,13 +54,13 @@
                             <div class="col-xs-6">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.theme.banner-background-color') }}</label>
-                                    <input type="text" class="form-control color-code" name="style.banner_background_color" value="{{ $theme_banner_background_color }}">
+                                    <input type="text" class="form-control color-code" name="style.banner_background_color" value="{{ $theme_banner_background_color }}" placeholder="{{ trans('forms.settings.theme.banner-background-color') }}">
                                 </div>
                             </div>
                             <div class="col-xs-6">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.theme.banner-padding') }}</label>
-                                    <input type="text" class="form-control" name="style.banner_padding" value="{{ $theme_banner_padding }}">
+                                    <input type="text" class="form-control" name="style.banner_padding" value="{{ $theme_banner_padding }}" placeholder="{{ trans('forms.settings.theme.banner-padding') }}">
                                 </div>
                             </div>
                             <div class="col-xs-12">
@@ -78,13 +78,13 @@
                             <div class="col-xs-6">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.theme.reds') }}</label>
-                                    <input type="text" class="form-control color-code" name="style.reds" value="{{ $theme_reds }}">
+                                    <input type="text" class="form-control color-code" name="style.reds" value="{{ $theme_reds }}" placeholder="{{ trans('forms.settings.theme.reds') }}">
                                 </div>
                             </div>
                             <div class="col-xs-6">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.theme.blues') }}</label>
-                                    <input type="text" class="form-control color-code" name="style.blues" value="{{ $theme_blues }}">
+                                    <input type="text" class="form-control color-code" name="style.blues" value="{{ $theme_blues }}" placeholder="{{ trans('forms.settings.theme.blues') }}">
                                 </div>
                             </div>
                         </div>
@@ -92,13 +92,13 @@
                             <div class="col-xs-6">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.theme.greens') }}</label>
-                                    <input type="text" class="form-control color-code" name="style.greens" value="{{ $theme_greens }}">
+                                    <input type="text" class="form-control color-code" name="style.greens" value="{{ $theme_greens }}" placeholder="{{ trans('forms.settings.theme.greens') }}">
                                 </div>
                             </div>
                             <div class="col-xs-6">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.theme.yellows') }}</label>
-                                    <input type="text" class="form-control color-code" name="style.yellows" value="{{ $theme_yellows }}">
+                                    <input type="text" class="form-control color-code" name="style.yellows" value="{{ $theme_yellows }}" placeholder="{{ trans('forms.settings.theme.yellows') }}">
                                 </div>
                             </div>
                         </div>
@@ -106,13 +106,13 @@
                             <div class="col-xs-6">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.theme.oranges') }}</label>
-                                    <input type="text" class="form-control color-code" name="style.oranges" value="{{ $theme_oranges }}">
+                                    <input type="text" class="form-control color-code" name="style.oranges" value="{{ $theme_oranges }}" placeholder="{{ trans('forms.settings.theme.oranges') }}">
                                 </div>
                             </div>
                             <div class="col-xs-6">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.theme.metrics') }}</label>
-                                    <input type="text" class="form-control color-code" name="style.metrics" value="{{ $theme_metrics }}">
+                                    <input type="text" class="form-control color-code" name="style.metrics" value="{{ $theme_metrics }}" placeholder="{{ trans('forms.settings.theme.metrics') }}">
                                 </div>
                             </div>
                         </div>
@@ -120,13 +120,13 @@
                             <div class="col-xs-6">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.theme.links') }}</label>
-                                    <input type="text" class="form-control color-code" name="style.links" value="{{ $theme_links }}">
+                                    <input type="text" class="form-control color-code" name="style.links" value="{{ $theme_links }}" placeholder="{{ trans('forms.settings.theme.links') }}">
                                 </div>
                             </div>
                             <div class="col-xs-6">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.theme.background-fills') }}</label>
-                                    <input type="text" class="form-control color-code" name="style.background_fills" value="{{ $theme_background_fills }}">
+                                    <input type="text" class="form-control color-code" name="style.background_fills" value="{{ $theme_background_fills }}" placeholder="{{ trans('forms.settings.theme.background-fills') }}">
                                 </div>
                             </div>
                         </div>
diff --git a/resources/views/dashboard/subscribers/add.blade.php b/resources/views/dashboard/subscribers/add.blade.php
index 3f479a0e..3914e27a 100644
--- a/resources/views/dashboard/subscribers/add.blade.php
+++ b/resources/views/dashboard/subscribers/add.blade.php
@@ -18,7 +18,7 @@
             <fieldset>
             <div class="form-group">
                 <label>{{ trans('forms.user.email') }}</label>
-                <textarea rows="5" class="form-control" name="email" required>{{ Binput::old('email') }}</textarea>
+                <textarea rows="5" class="form-control" name="email" required placeholder="{{ trans('forms.user.email') }}">{{ Binput::old('email') }}</textarea>
                 <span class="help-block">{{ trans('dashboard.subscribers.add.help') }}</span>
             </div>
             </fieldset>
diff --git a/resources/views/dashboard/team/add.blade.php b/resources/views/dashboard/team/add.blade.php
index 8aac628a..a6597ffd 100644
--- a/resources/views/dashboard/team/add.blade.php
+++ b/resources/views/dashboard/team/add.blade.php
@@ -18,15 +18,15 @@
                 <fieldset>
                     <div class="form-group">
                         <label>{{ trans('forms.user.username') }}</label>
-                        <input type="text" class="form-control" name="username" value="{{ Binput::old('username') }}" required>
+                        <input type="text" class="form-control" name="username" value="{{ Binput::old('username') }}" required placeholder="{{ trans('forms.user.username') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.user.email') }}</label>
-                        <input type="email" class="form-control" name="email" value="{{ Binput::old('email') }}" required>
+                        <input type="email" class="form-control" name="email" value="{{ Binput::old('email') }}" required placeholder="{{ trans('forms.user.email') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.user.password') }}</label>
-                        <input type="password" class="form-control password-strength" name="password" value="">
+                        <input type="password" class="form-control password-strength" name="password" value="" placeholder="{{ trans('forms.user.password') }}">
                         <div class="strengthify-wrapper"></div>
                     </div>
                     @if($current_user->isAdmin)
diff --git a/resources/views/dashboard/team/edit.blade.php b/resources/views/dashboard/team/edit.blade.php
index 2274d028..46d9bca3 100644
--- a/resources/views/dashboard/team/edit.blade.php
+++ b/resources/views/dashboard/team/edit.blade.php
@@ -18,15 +18,15 @@
                 <fieldset>
                     <div class="form-group">
                         <label>{{ trans('forms.user.username') }}</label>
-                        <input type="text" class="form-control" name="username" value="{{ $user->username }}" required>
+                        <input type="text" class="form-control" name="username" value="{{ $user->username }}" required placeholder="{{ trans('forms.user.username') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.user.email') }}</label>
-                        <input type="email" class="form-control" name="email" value="{{ $user->email }}" required>
+                        <input type="email" class="form-control" name="email" value="{{ $user->email }}" required placeholder="{{ trans('forms.user.email') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.user.password') }}</label>
-                        <input type="password" class="form-control password-strength" name="password" value="" {{ !$current_user->isAdmin ? "disabled": "" }}>
+                        <input type="password" class="form-control password-strength" name="password" value="" {{ !$current_user->isAdmin ? "disabled": "" }} placeholder="{{ trans('forms.user.password') }}">
                         <div class="strengthify-wrapper"></div>
                     </div>
                     @if($current_user->isAdmin)
diff --git a/resources/views/dashboard/templates/add.blade.php b/resources/views/dashboard/templates/add.blade.php
index b8931da2..3bb9bf16 100644
--- a/resources/views/dashboard/templates/add.blade.php
+++ b/resources/views/dashboard/templates/add.blade.php
@@ -38,11 +38,11 @@
                 <fieldset>
                     <div class="form-group">
                         <label for="template-name">{{ trans('forms.incidents.templates.name') }}</label>
-                        <input type="text" class="form-control" name="template[name]" id="template-name" required>
+                        <input type="text" class="form-control" name="template[name]" id="template-name" required placeholder="{{ trans('forms.incidents.templates.name') }}">
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.incidents.templates.template') }}</label>
-                        <textarea name="template[template]" id="cm-editor" class="form-control" rows="8"></textarea>
+                        <textarea name="template[template]" id="cm-editor" class="form-control" rows="8" placeholder="{{ trans('forms.incidents.templates.template') }}"></textarea>
                         <span class="help-block">{!! trans('forms.incidents.templates.twig') !!}</span>
                     </div>
                 </fieldset>
diff --git a/resources/views/dashboard/templates/edit.blade.php b/resources/views/dashboard/templates/edit.blade.php
index 148622cc..84735420 100644
--- a/resources/views/dashboard/templates/edit.blade.php
+++ b/resources/views/dashboard/templates/edit.blade.php
@@ -47,11 +47,11 @@
                     <fieldset>
                         <div class="form-group">
                             <label for="template-name">{{ trans('forms.incidents.templates.name') }}</label>
-                            <input type="text" class="form-control" name="template[name]" id="template-name" required value="{{ $template->name }}">
+                            <input type="text" class="form-control" name="template[name]" id="template-name" required value="{{ $template->name }}" placeholder="{{ trans('forms.incidents.templates.name') }}">
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.incidents.templates.template') }}</label>
-                            <textarea name="template[template]" id="cm-editor" class="form-control" rows="8">{{ $template->template }}</textarea>
+                            <textarea name="template[template]" id="cm-editor" class="form-control" rows="8" placeholder="{{ trans('forms.incidents.templates.template') }}">{{ $template->template }}</textarea>
                             <span class="help-block">{!! trans('forms.incidents.templates.twig') !!}</span>
                         </div>
                     </fieldset>
diff --git a/resources/views/dashboard/user/index.blade.php b/resources/views/dashboard/user/index.blade.php
index ae8a19e5..e19e4e93 100644
--- a/resources/views/dashboard/user/index.blade.php
+++ b/resources/views/dashboard/user/index.blade.php
@@ -23,22 +23,22 @@
                             </div>
                             <div class="form-group">
                                 <label>{{ trans('forms.user.username') }}</label>
-                                <input type="text" class="form-control" name="username" value="{{ $current_user->username }}" required>
+                                <input type="text" class="form-control" name="username" value="{{ $current_user->username }}" required placeholder="{{ trans('forms.user.username') }}">
                             </div>
                             <div class="form-group">
                                 <label>{{ trans('forms.user.email') }}</label>
-                                <input type="email" class="form-control" name="email" value="{{ $current_user->email }}" required>
+                                <input type="email" class="form-control" name="email" value="{{ $current_user->email }}" required placeholder="{{ trans('forms.user.email') }}">
                             </div>
                             <div class="form-group">
                                 <label>{{ trans('forms.user.password') }}</label>
-                                <input type="password" class="form-control password-strength" name="password" value="">
+                                <input type="password" class="form-control password-strength" name="password" value="" placeholder="{{ trans('forms.user.password') }}">
                                 <div class="strengthify-wrapper"></div>
                             </div>
                             <hr>
                             <div class="form-group">
                                 <label>{{ trans('forms.user.api-token') }}</label>
                                 <div class="input-group">
-                                    <input type="text" class="form-control" name="api_key" disabled value="{{ $current_user->api_key }}">
+                                    <input type="text" class="form-control" name="api_key" disabled value="{{ $current_user->api_key }}" placeholder="{{ trans('forms.user.api-token') }}">
                                     <a href="/dashboard/user/{{ $current_user->id }}/api/regen" class="input-group-addon btn btn-danger">{{ trans('cachet.api.regenerate') }}</a>
                                 </div>
                                 <span class="help-block">{{ trans('forms.user.api-token-help') }}</span>
diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php
index f6ae2ede..8ff4d3fa 100644
--- a/resources/views/setup/index.blade.php
+++ b/resources/views/setup/index.blade.php
@@ -85,7 +85,7 @@
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.setup.mail_host') }} (optional)</label>
-                        <input type="text" class="form-control" name="env[mail_host]" value="{{ Binput::old('env.mail_host', $mail_config['host']) }}">
+                        <input type="text" class="form-control" name="env[mail_host]" value="{{ Binput::old('env.mail_host', $mail_config['host']) }}" placeholder="{{ trans('forms.setup.mail_host') }}">
                         @if($errors->has('env.mail_host'))
                         <span class="text-danger">{{ $errors->first('env.mail_host') }}</span>
                         @endif
@@ -99,14 +99,14 @@
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.setup.mail_username') }}</label>
-                        <input type="text" class="form-control" name="env[mail_username]" value="{{ Binput::old('env.mail_username', $mail_config['username']) }}">
+                        <input type="text" class="form-control" name="env[mail_username]" value="{{ Binput::old('env.mail_username', $mail_config['username']) }}" placeholder="{{ trans('forms.setup.mail_username') }}">
                         @if($errors->has('env.mail_username'))
                         <span class="text-danger">{{ $errors->first('env.mail_username') }}</span>
                         @endif
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.setup.mail_password') }}</label>
-                        <input type="password" class="form-control" name="env[mail_password]" value="{{ Binput::old('env.mail_password', $mail_config['password']) }}" autocomplete="off">
+                        <input type="password" class="form-control" name="env[mail_password]" value="{{ Binput::old('env.mail_password', $mail_config['password']) }}" autocomplete="off" placeholder="{{ trans('forms.setup.mail_password') }}">
                         @if($errors->has('env.mail_password'))
                         <span class="text-danger">{{ $errors->first('env.mail_password') }}</span>
                         @endif
diff --git a/resources/views/signup.blade.php b/resources/views/signup.blade.php
index 70216601..310a48e0 100644
--- a/resources/views/signup.blade.php
+++ b/resources/views/signup.blade.php
@@ -30,15 +30,15 @@
             <input type="hidden" name="_token" value="{{ csrf_token() }}">
             <div class="form-group">
                 <label for="username">{{ trans('cachet.signup.username') }}</label>
-                <input class="form-control" type="text" name="username" value="{{ $username }}">
+                <input class="form-control" type="text" name="username" value="{{ $username }}" placeholder="{{ trans('cachet.signup.username') }}">
             </div>
             <div class="form-group">
                 <label for="email">{{ trans('cachet.signup.email') }}</label>
-                <input class="form-control" type="email" name="email" value="{{ $email }}">
+                <input class="form-control" type="email" name="email" value="{{ $email }}" placeholder="{ trans('cachet.signup.email') }}">
             </div>
             <div class="form-group">
                 <label for="password">{{ trans('cachet.signup.password') }}</label>
-                <input class="form-control" type="password" name="password">
+                <input class="form-control" type="password" name="password" placeholder="{{ trans('cachet.signup.password') }}">
             </div>
             <button type="submit" class="btn btn-success">{{ trans('forms.signup') }}</button>
         </form>