aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

Merge user settings page #101

Merged
aheathershaw merged 8 commits from feature/99-user-settings-page into master 2018-09-12 21:25:02 +01:00
Conversation 1 Commits 8 Files Changed 15 +32 -7
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 37375eb7e6 - Show all commits

3
resources/lang/en/forms.php
View File

@ -24,6 +24,7 @@ return [
'download_action' => 'Download', 'download_action' => 'Download',
'edit_action' => 'Edit', 'edit_action' => 'Edit',
'email_label' => 'E-mail address:', 'email_label' => 'E-mail address:',
'enable_profile_page_label' => 'Allow others to see my profile page',
'labels_label' => 'Labels:', 'labels_label' => 'Labels:',
'login_action' => 'Login', 'login_action' => 'Login',
'name_label' => 'Name:', 'name_label' => 'Name:',
@ -33,6 +34,8 @@ return [
'password_confirm_label' => 'Confirm password:', 'password_confirm_label' => 'Confirm password:',
'please_select' => '- Select an Option -', 'please_select' => '- Select an Option -',
'private_album_label' => 'Private album (only visible to me)', 'private_album_label' => 'Private album (only visible to me)',
'profile_alias_label' => 'Alias:',
'profile_alias_help' => 'The profile alias is used to create a unique URL direct to your profile page.',
'quick_upload_file_label' => 'Photo:', 'quick_upload_file_label' => 'Photo:',
'realname_label' => 'Your name:', 'realname_label' => 'Your name:',
'register_action' => 'Create account', 'register_action' => 'Create account',

1
resources/lang/en/gallery.php
View File

@ -80,7 +80,6 @@ return [
], ],
'user_settings' => [ 'user_settings' => [
'change_password' => 'Change password', 'change_password' => 'Change password',
'show_public_profile' => 'Allow others to see my profile page',
'title' => 'Change my settings' 'title' => 'Change my settings'
] ]
]; ];

35
resources/views/themes/base/gallery/user_settings.blade.php
View File

@ -46,18 +46,41 @@
</div> </div>
</div> </div>
<div class="row"> <div class="form-group row">
<div class="col-md-6 offset-md-4"> <div class="col-md-6 offset-md-4">
<a href="{{ route('auth.changePassword') }}" class="btn btn-link"><i class="fa fa-lock"></i>&nbsp;&nbsp;@lang('gallery.user_settings.change_password')</a> <a href="{{ route('auth.changePassword') }}" class="btn btn-link"><i class="fa fa-lock"></i>&nbsp;&nbsp;@lang('gallery.user_settings.change_password')</a>
</div> </div>
</div> </div>
<div class="form-check mt-4"> <fieldset class="mt-4">
<input type="checkbox" class="form-check-input" id="is-admin" name="is_admin"@if (old('is_admin', $user->is_admin)) checked="checked"@endif> <legend class="ml-md-5">Public profile</legend>
<label class="form-check-label" for="is-admin">@lang('forms.admin_user_label')</label>
</div>
<div class="text-right" style="margin-top: 20px;"> <div class="form-group row{{ $errors->has('profile_alias') ? ' has-danger' : '' }}">
<label class="col-md-4 col-form-label text-md-right" for="profile-alias">@lang('forms.profile_alias_label')</label>
<div class="col-md-6">
<input type="text" class="form-control{{ $errors->has('profile_alias') ? ' is-invalid' : '' }}" id="profile-alias" name="profile_alias" value="{{ old('profile_alias', $user->profile_alias) }}">
<small id="emailHelp" class="form-text text-muted">@lang('forms.profile_alias_help')</small>
@if ($errors->has('profile_alias'))
<div class="invalid-feedback">
<strong>{{ $errors->first('profile_alias') }}</strong>
</div>
@endif
</div>
</div>
<div class="form-group row">
<div class="col-md-6 offset-md-4">
<div class="form-check">
<input type="checkbox" class="form-check-input" id="enable-profile-page" name="enable_profile_page"@if (old('enable_profile_page', $user->enable_profile_page)) checked="checked"@endif>
<label class="form-check-label" for="enable-profile-page">@lang('forms.enable_profile_page_label')</label>
</div>
</div>
</div>
</fieldset>
<div class="text-right mt-5">
<a href="{{ route('home') }}" class="btn btn-link">@lang('forms.cancel_action')</a> <a href="{{ route('home') }}" class="btn btn-link">@lang('forms.cancel_action')</a>
<button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('forms.save_action')</button> <button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('forms.save_action')</button>
</div> </div>