Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Hillel Coren 2017-04-12 17:05:03 +03:00
parent 0d4dcb2ad0
commit eccb33ab59
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/views/partials/sign_up.blade.php
View File

@ -160,7 +160,7 @@
<div class="panel-body"> <div class="panel-body">
<div id="signUpDiv" onkeyup="validateSignUp()" onclick="validateSignUp()" onkeydown="checkForEnter(event)"> <div id="signUpDiv" onkeyup="validateSignUp()" onclick="validateSignUp()" onkeydown="checkForEnter(event)">
{!! Former::open('signup/submit')->addClass('signUpForm')->autocomplete('on') !!} {!! Former::open('signup/submit')->addClass('signUpForm')->autocomplete('off') !!}
@if (Auth::check() && ! Auth::user()->registered) @if (Auth::check() && ! Auth::user()->registered)
{!! Former::populateField('new_first_name', Auth::user()->first_name) !!} {!! Former::populateField('new_first_name', Auth::user()->first_name) !!}
@ -222,6 +222,7 @@
->label(' ') !!} ->label(' ') !!}
{!! Former::password('new_password') {!! Former::password('new_password')
->placeholder(trans('texts.password')) ->placeholder(trans('texts.password'))
->autocomplete('new-password')
->label(' ') !!} ->label(' ') !!}
{{ Former::setOption('TwitterBootstrap3.labelWidths.large', 4) }} {{ Former::setOption('TwitterBootstrap3.labelWidths.large', 4) }}

2
resources/views/users/account_management.blade.php
View File

@ -37,7 +37,7 @@
@if ($account->user_id == Auth::user()->id) @if ($account->user_id == Auth::user()->id)
<b>{{ trans('texts.logged_in')}}</b> <b>{{ trans('texts.logged_in')}}</b>
@else @else
{!! Button::primary(trans('texts.unlink'))->withAttributes(['onclick'=>"return showUnlink({$account->id}, {$account->user_id})"]) !!} {{-- Button::primary(trans('texts.unlink'))->withAttributes(['onclick'=>"return showUnlink({$account->id}, {$account->user_id})"]) --}}
@endif @endif
</td> </td>
</tr> </tr>