Skip to content

Commit

Permalink
Merge pull request #2122 from abhimanyu003/2.4
Browse files Browse the repository at this point in the history 
HTML Fixes
  • Loading branch information
@jbrooksuk
jbrooksuk committed Oct 2, 2016
2 parents f21a2b4 + 0f4c14a commit 5666321
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 33 deletions.
2 changes: 1 addition & 1 deletion app/Models/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public function setPasswordAttribute($password)
*/
public function getGravatarAttribute($size = 200)
{
return sprintf('https://www.gravatar.com/avatar/%s?size=%d', md5($this->email), $size);
return sprintf('https://www.gravatar.com/avatar/%s?size=%d', md5(strtolower($this->email)), $size);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions resources/views/dashboard/components/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<label for="component-status">{{ trans('forms.components.status') }}</label>
<select name="component[status]" class="form-control">
@foreach(trans('cachet.components.status') as $statusID => $status)
<option value="{{ $statusID }}" {{ $statusID === $component->status ? "selected" : "" }}>{{ $status }}</option>
<option value="{{ $statusID }}" {{ $statusID === $component->status ? 'selected' : "" }}>{{ $status }}</option>
@endforeach
</select>
</div>
Expand Down Expand Up @@ -59,7 +59,7 @@
<div class="checkbox">
<label>
<input type="hidden" value="0" name="component[enabled]">
<input type="checkbox" value="1" name="component[enabled]" {{ $component->enabled ? "checked" : null }}>
<input type="checkbox" value="1" name="component[enabled]" {{ $component->enabled ? 'checked' : null }}>
{{ trans('forms.components.enabled') }}
</label>
</div>
Expand Down
18 changes: 9 additions & 9 deletions resources/views/dashboard/incidents/add.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,32 +57,32 @@
</div>
<div class="form-group">
<label for="incident-name">{{ trans('forms.incidents.visibility') }}</label>
<select name='visible' class="form-control">
<option value='1' selected>{{ trans('forms.incidents.public') }}</option>
<option value='0'>{{ trans('forms.incidents.logged_in_only') }}</option>
<select name="visible" class="form-control">
<option value="1" selected>{{ trans('forms.incidents.public') }}</option>
<option value="0">{{ trans('forms.incidents.logged_in_only') }}</option>
</select>
</div>
<div class="form-group">
<label for="incident-name">{{ trans('forms.incidents.stick_status') }}</label>
<select name='stickied' class="form-control">
<select name="stickied" class="form-control">
<option value='1'>{{ trans('forms.incidents.stickied') }}</option>
<option value='0' selected>{{ trans('forms.incidents.not_stickied') }}</option>
</select>
</div>
@if(!$components_in_groups->isEmpty() || !$components_out_groups->isEmpty())
<div class="form-group">
<label>{{ trans('forms.incidents.component') }}</label>
<select name='component_id' class='form-control'>
<option value='0' selected></option>
<select name="component_id" class="form-control">
<option value="0" selected></option>
@foreach($components_in_groups as $group)
<optgroup label="{{ $group->name }}">
@foreach($group->components as $component)
<option value='{{ $component->id }}'>{{ $component->name }}</option>
<option value="{{ $component->id }}">{{ $component->name }}</option>
@endforeach
</optgroup>
@endforeach
@foreach($components_out_groups as $component)
<option value='{{ $component->id }}'>{{ $component->name }}</option>
<option value="{{ $component->id }}">{{ $component->name }}</option>
@endforeach
</select>
<span class='help-block'>{{ trans('forms.optional') }}</span>
Expand All @@ -106,7 +106,7 @@
</div>
<div class="form-group">
<label>{{ trans('forms.incidents.message') }}</label>
<div class='markdown-control'>
<div class="markdown-control">
<textarea name="message" class="form-control autosize" rows="5" required>{{ Binput::old('message') }}</textarea>
</div>
</div>
Expand Down
18 changes: 9 additions & 9 deletions resources/views/dashboard/incidents/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,42 +24,42 @@
<div class="form-group">
<label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
<label class="radio-inline">
<input type="radio" name="status" value="1" {{ ($incident->status == 1) ? "checked=checked" : "" }}>
<input type="radio" name="status" value="1" {{ ($incident->status == 1) ? "checked='checked'" : "" }}>
<i class="ion ion-flag"></i>
{{ trans('cachet.incidents.status')[1] }}
</label>
<label class="radio-inline">
<input type="radio" name="status" value="2" {{ ($incident->status == 2) ? "checked=checked" : "" }}>
<input type="radio" name="status" value="2" {{ ($incident->status == 2) ? "checked='checked'" : "" }}>
<i class="ion ion-alert-circled"></i>
{{ trans('cachet.incidents.status')[2] }}
</label>
<label class="radio-inline">
<input type="radio" name="status" value="3" {{ ($incident->status == 3) ? "checked=checked" : "" }}>
<input type="radio" name="status" value="3" {{ ($incident->status == 3) ? "checked='checked'" : "" }}>
<i class="ion ion-eye"></i>
{{ trans('cachet.incidents.status')[3] }}
</label>
<label class="radio-inline">
<input type="radio" name="status" value="4" {{ ($incident->status == 4) ? "checked=checked" : "" }}>
<input type="radio" name="status" value="4" {{ ($incident->status == 4) ? "checked='checked'" : "" }}>
<i class="ion ion-checkmark"></i>
{{ trans('cachet.incidents.status')[4] }}
</label>
</div>
<div class="form-group">
<label for="incident-visibility">{{ trans('forms.incidents.visibility') }}</label>
<select name="visible" id="incident-visibility" class="form-control">
<option value='1' {{ $incident->visible === 1 ? 'selected' : null }}>{{ trans('forms.incidents.public') }}</option>
<option value='0' {{ $incident->visible === 0 ? 'selected' : null }}>{{ trans('forms.incidents.logged_in_only') }}</option>
<option value="1" {{ $incident->visible === 1 ? 'selected' : null }}>{{ trans('forms.incidents.public') }}</option>
<option value="0" {{ $incident->visible === 0 ? 'selected' : null }}>{{ trans('forms.incidents.logged_in_only') }}</option>
</select>
</div>
<div class="form-group">
<label for="incident-stick">{{ trans('forms.incidents.stick_status') }}</label>
<select name="stickied" id="incident-stick" class="form-control">
<option value='1' {{ $incident->stickied === 1 ? 'selected' : null }}>{{ trans('forms.incidents.stickied') }}</option>
<option value='0' {{ $incident->stickied === 0 ? 'selected' : null }}>{{ trans('forms.incidents.not_stickied') }}</option>
<option value="1" {{ $incident->stickied === 1 ? 'selected' : null }}>{{ trans('forms.incidents.stickied') }}</option>
<option value="0" {{ $incident->stickied === 0 ? 'selected' : null }}>{{ trans('forms.incidents.not_stickied') }}</option>
</select>
</div>
@if($incident->component)
<div class="form-group" id='component-status'>
<div class="form-group" id="component-status">
<div class="panel panel-default">
<div class="panel-heading"><strong>{{ $incident->component->name }}</strong></div>
<div class="panel-body">
Expand Down
6 changes: 3 additions & 3 deletions resources/views/dashboard/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
<div class="row">
<div class="col-sm-12 col-lg-6">
<div class="stats-widget">
<div class='stats-top'>
<span class='stats-value'>{{ trans('dashboard.widgets.support') }}</span>
<span class='stats-label'>{!! trans('dashboard.widgets.support_subtitle') !!}</span>
<div class="stats-top">
<span class="stats-value">{{ trans('dashboard.widgets.support') }}</span>
<span class="stats-label">{!! trans('dashboard.widgets.support_subtitle') !!}</span>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/dashboard/metrics/add.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="row">
<div class="col-md-12">
@include('dashboard.partials.errors')
<form class='form-vertical' name='MetricsForm' role='form' method='POST'>
<form class="form-vertical" name="MetricsForm" role="form" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
<div class="form-group">
Expand Down Expand Up @@ -67,8 +67,8 @@
</label>
</div>
</fieldset>
<div class='form-group'>
<div class='btn-group'>
<div class="form-group">
<div class="btn-group">
<button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
<a class="btn btn-default" href="{{ route('dashboard.metrics.index') }}">{{ trans('forms.cancel') }}</a>
</div>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/dashboard/metrics/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="row">
<div class="col-md-12">
@include('dashboard.partials.errors')
<form class='form-vertical' name='MetricsForm' role='form' method='POST'>
<form class="form-vertical" name="MetricsForm" role="form" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
<div class="form-group">
Expand Down Expand Up @@ -70,8 +70,8 @@

<input type="hidden" name="id" value={{$metric->id}}>

<div class='form-group'>
<div class='btn-group'>
<div class="form-group">
<div class="btn-group">
<button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
<a class="btn btn-default" href="{{ route('dashboard.metrics.index') }}">{{ trans('forms.cancel') }}</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/dashboard/subscribers/add.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="form-group">
<label>{{ trans('forms.user.email') }}</label>
<textarea rows="5" class="form-control" name="email" required>{{ Binput::old('email') }}</textarea>
<span class="help-block">{{ trans('dashboard.subscribers.add.help') }}</p>
<span class="help-block">{{ trans('dashboard.subscribers.add.help') }}</span>
</div>
</fieldset>

Expand Down
2 changes: 1 addition & 1 deletion resources/views/dashboard/templates/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</div>
@endif

<form class='form-vertical' name='IncidentTemplateForm' role='form' method='POST'>
<form class="form-vertical" name="IncidentTemplateForm" role="form" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
<div class="form-group">
Expand Down
1 change: 0 additions & 1 deletion resources/views/partials/modals/subscribe.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<div class="form-group">
<input class="form-control" type="email" name="email" placeholder="[email protected]">
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans("cachet.modal.close") }}</button>
Expand Down

0 comments on commit 5666321

Please sign in to comment.