Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Platform
Commits
1f50584d
Commit
1f50584d
authored
Sep 14, 2018
by
Christian Giupponi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fix the bug that prevent user to login or register to the site"
This reverts commit
8445397d
.
parent
e4ad318b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
18 deletions
+4
-18
helpers.php
Modules/Core/helpers.php
+0
-10
login.blade.php
Modules/User/Resources/views/public/login.blade.php
+1
-2
register.blade.php
Modules/User/Resources/views/public/register.blade.php
+1
-3
begin.blade.php
Modules/User/Resources/views/public/reset/begin.blade.php
+2
-3
No files found.
Modules/Core/helpers.php
View file @
1f50584d
...
@@ -54,13 +54,3 @@ if (! function_exists('asgard_editor')) {
...
@@ -54,13 +54,3 @@ if (! function_exists('asgard_editor')) {
return
view
(
'core::components.textarea-wrapper'
,
compact
(
'fieldName'
,
'labelName'
,
'content'
));
return
view
(
'core::components.textarea-wrapper'
,
compact
(
'fieldName'
,
'labelName'
,
'content'
));
}
}
}
}
if
(
!
function_exists
(
'localize_route'
))
{
function
localize_route
(
$route
,
$locale
=
null
)
{
$locale
=
$locale
?
:
app
()
->
getLocale
();
return
str_replace
(
env
(
'APP_URL'
),
rtrim
(
env
(
'APP_URL'
),
'/'
)
.
'/'
.
$locale
,
route
(
$route
));
}
}
\ No newline at end of file
Modules/User/Resources/views/public/login.blade.php
View file @
1f50584d
...
@@ -13,8 +13,7 @@
...
@@ -13,8 +13,7 @@
<p class="
login
-
box
-
msg
">{{ trans('user::auth.sign in welcome message') }}</p>
<p class="
login
-
box
-
msg
">{{ trans('user::auth.sign in welcome message') }}</p>
@include('partials.notifications')
@include('partials.notifications')
<form method="
POST
" action="
{{
localize_route
(
'login.post'
)}}
" accept-charset="
UTF
-
8
">
{!! Form::open(['route' => 'login.post']) !!}
{
{csrf_field()}
}
<div class="
form
-
group
has
-
feedback
{{
$errors
->
has
(
'email'
)
?
' has-error'
:
''
}}
">
<div class="
form
-
group
has
-
feedback
{{
$errors
->
has
(
'email'
)
?
' has-error'
:
''
}}
">
<input type="
email
" class="
form
-
control
" autofocus
<input type="
email
" class="
form
-
control
" autofocus
name="
email
" placeholder="
{{
trans
(
'user::auth.email'
)
}}
" value="
{{
old
(
'email'
)}}
">
name="
email
" placeholder="
{{
trans
(
'user::auth.email'
)
}}
" value="
{{
old
(
'email'
)}}
">
...
...
Modules/User/Resources/views/public/register.blade.php
View file @
1f50584d
...
@@ -11,9 +11,7 @@
...
@@ -11,9 +11,7 @@
<div class="
register
-
box
-
body
">
<div class="
register
-
box
-
body
">
<p class="
login
-
box
-
msg
">{{ trans('user::auth.register') }}</p>
<p class="
login
-
box
-
msg
">{{ trans('user::auth.register') }}</p>
@include('partials.notifications')
@include('partials.notifications')
{!! Form::open(['route' => 'register.post']) !!}
<form method="
POST
" action="
{{
localize_route
(
'register.post'
)}}
" accept-charset="
UTF
-
8
">
{
{csrf_field()}
}
<div class="
form
-
group
has
-
feedback
{{
$errors
->
has
(
'email'
)
?
' has-error has-feedback'
:
''
}}
">
<div class="
form
-
group
has
-
feedback
{{
$errors
->
has
(
'email'
)
?
' has-error has-feedback'
:
''
}}
">
<input type="
email
" name="
email
" class="
form
-
control
" autofocus
<input type="
email
" name="
email
" class="
form
-
control
" autofocus
placeholder="
{{
trans
(
'user::auth.email'
)
}}
" value="
{{
old
(
'email'
)
}}
">
placeholder="
{{
trans
(
'user::auth.email'
)
}}
" value="
{{
old
(
'email'
)
}}
">
...
...
Modules/User/Resources/views/public/reset/begin.blade.php
View file @
1f50584d
...
@@ -13,8 +13,7 @@
...
@@ -13,8 +13,7 @@
<p class="
login
-
box
-
msg
">{{ trans('user::auth.to reset password complete this form') }}</p>
<p class="
login
-
box
-
msg
">{{ trans('user::auth.to reset password complete this form') }}</p>
@include('partials.notifications')
@include('partials.notifications')
<form method="
POST
" action="
{{
localize_route
(
'reset.post'
)}}
" accept-charset="
UTF
-
8
">
{!! Form::open(['route' => 'reset.post']) !!}
{
{csrf_field()}
}
<div class="
form
-
group
has
-
feedback
{{
$errors
->
has
(
'email'
)
?
' has-error'
:
''
}}
">
<div class="
form
-
group
has
-
feedback
{{
$errors
->
has
(
'email'
)
?
' has-error'
:
''
}}
">
<input type="
email
" class="
form
-
control
" autofocus
<input type="
email
" class="
form
-
control
" autofocus
name="
email
" placeholder="
{{
trans
(
'user::auth.email'
)
}}
" value="
{{
old
(
'email'
)}}
">
name="
email
" placeholder="
{{
trans
(
'user::auth.email'
)
}}
" value="
{{
old
(
'email'
)}}
">
...
@@ -29,7 +28,7 @@
...
@@ -29,7 +28,7 @@
</button>
</button>
</div>
</div>
</div>
</div>
</form>
{!! Form::close() !!}
<a href="
{{
route
(
'login'
)
}}
" class="
text
-
center
">{{ trans('user::auth.I remembered my password') }}</a>
<a href="
{{
route
(
'login'
)
}}
" class="
text
-
center
">{{ trans('user::auth.I remembered my password') }}</a>
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment