ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #693 from madd15/patch-2

Browse Source 
Remove forgot password link, fix save icon, if locked button disabled
This commit is contained in:
snipe
2015-03-25 13:28:44 -07:00
parent f0d3d1b036 e2a2746ed6
commit 2cf8256079
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/frontend/account/change-email.blade.php
+1 -2
View File
@@ -66,8 +66,7 @@ Change your Email
<label class="col-md-2 control-label"></label>
<div class="col-md-7">
<a class="btn btn-link" href="{{ route('view-assets') }}">@lang('button.cancel')</a>
<button type="submit" class="btn btn-success"><i class="fa fa-ok icon-white"></i> @lang('general.save')</button>
<a href="{{ route('forgot-password') }}" class="btn btn-link">I forgot my password</a>
<button type="submit" class="btn btn-success" {{ ((Config::get('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}><i class="fa fa-check icon-white"></i> @lang('general.save')</button>
</div>
</div>
app/views/frontend/account/change-password.blade.php
+2 -3
View File
@@ -60,10 +60,9 @@ Change your Password
<label class="col-md-2 control-label"></label>
<div class="col-md-7">
<a class="btn btn-link" href="{{ route('view-assets') }}">@lang('button.cancel')</a>
<button type="submit" class="btn btn-success"><i class="fa fa-ok icon-white"></i> @lang('general.save')</button>
<a href="{{ route('forgot-password') }}" class="btn btn-link">I forgot my password</a>
<button type="submit" class="btn btn-success" {{ ((Config::get('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}><i class="fa fa-check icon-white"></i> @lang('general.save')</button>
</div>
</div>
</form>
@stop
@stop