Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
frontend-users
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
13
Issues
13
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
QUIQQER
frontend-users
Commits
1928ba4f
Commit
1928ba4f
authored
Jul 25, 2019
by
Henning Leutz
🥋
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://dev.quiqqer.com/quiqqer/frontend-users
into dev
parents
49e2ac6e
73257b26
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
11 deletions
+18
-11
src/QUI/FrontendUsers/Controls/Login.css
src/QUI/FrontendUsers/Controls/Login.css
+1
-0
src/QUI/FrontendUsers/Controls/Login.html
src/QUI/FrontendUsers/Controls/Login.html
+3
-1
src/QUI/FrontendUsers/Controls/Login.php
src/QUI/FrontendUsers/Controls/Login.php
+4
-3
src/QUI/FrontendUsers/Controls/RegistrationSignUp.html
src/QUI/FrontendUsers/Controls/RegistrationSignUp.html
+3
-1
src/QUI/FrontendUsers/Controls/RegistrationSignUp.php
src/QUI/FrontendUsers/Controls/RegistrationSignUp.php
+7
-6
No files found.
src/QUI/FrontendUsers/Controls/Login.css
View file @
1928ba4f
...
...
@@ -19,6 +19,7 @@
.quiqqer-fu-login-container
{
position
:
relative
;
width
:
100%
;
}
.quiqqer-fu-login-container
h2
{
...
...
src/QUI/FrontendUsers/Controls/Login.html
View file @
1928ba4f
...
...
@@ -15,7 +15,9 @@
{else}
<section
class=
"quiqqer-fu-login-container"
style=
"display: none"
>
<h2>
{locale group="quiqqer/frontend-users" var="control.login.title"}
</h2>
{if $this->getAttribute('header')}
<h2>
{locale group="quiqqer/frontend-users" var="control.login.title"}
</h2>
{/if}
<div
class=
"quiqqer-fu-login-social"
>
{foreach $authenticators as $entry}
...
...
src/QUI/FrontendUsers/Controls/Login.php
View file @
1928ba4f
...
...
@@ -30,12 +30,13 @@ class Login extends QUI\Control
'authenticators'
=>
[],
'Authenticator'
=>
false
,
// currently executed Registrar
'mail'
=>
true
,
// show mail authenticator
'passwordReset'
=>
true
// show password reset
'passwordReset'
=>
true
,
// show password reset
'header'
=>
true
// show header title
]);
$this
->
setAttributes
(
$attributes
);
$this
->
addCSSFile
(
dirname
(
__FILE__
)
.
'/Login.css'
);
$this
->
addCSSFile
(
dirname
(
__FILE__
)
.
'/Login.css'
);
$this
->
addCSSClass
(
'quiqqer-fu-login'
);
$this
->
setJavaScriptControl
(
...
...
@@ -124,7 +125,7 @@ class Login extends QUI\Control
'showPasswordReset'
=>
$showPasswordReset
]);
return
$Engine
->
fetch
(
dirname
(
__FILE__
)
.
'/Login.html'
);
return
$Engine
->
fetch
(
dirname
(
__FILE__
)
.
'/Login.html'
);
}
/**
...
...
src/QUI/FrontendUsers/Controls/RegistrationSignUp.html
View file @
1928ba4f
...
...
@@ -12,7 +12,9 @@
{locale group="quiqqer/frontend-users" var="message.types.registration.already_registered"}
</div>
{else}
<h2>
{locale group="quiqqer/frontend-users" var="control.registration.sign.up.title"}
</h2>
{if $this->getAttribute('header')}
<h2>
{locale group="quiqqer/frontend-users" var="control.registration.sign.up.title"}
</h2>
{/if}
{if $msgSuccess}
<div
class=
"message-success"
>
...
...
src/QUI/FrontendUsers/Controls/RegistrationSignUp.php
View file @
1928ba4f
...
...
@@ -37,14 +37,15 @@ class RegistrationSignUp extends QUI\Control
'Registrar'
=>
false
,
// currently executed Registrar
'content'
=>
''
,
// right content
'registration-trial'
=>
false
// use registration trial
'registration-trial'
=>
false
,
// use registration trial
'header'
=>
true
// how header title
]);
$this
->
setAttributes
(
$attributes
);
$this
->
id
=
QUI\FrontendUsers\Handler
::
getInstance
()
->
createRegistrationId
();
$this
->
addCSSFile
(
\dirname
(
__FILE__
)
.
'/RegistrationSignUp.css'
);
$this
->
addCSSFile
(
\dirname
(
__FILE__
)
.
'/RegistrationSignUp.css'
);
$this
->
addCSSClass
(
'quiqqer-fu-registrationSignUp'
);
$this
->
setJavaScriptControl
(
...
...
@@ -117,7 +118,7 @@ class RegistrationSignUp extends QUI\Control
]);
$Engine
->
assign
([
'captchaHTML'
=>
$Engine
->
fetch
(
\dirname
(
__FILE__
)
.
'/RegistrationSignUp.Captcha.html'
)
'captchaHTML'
=>
$Engine
->
fetch
(
\dirname
(
__FILE__
)
.
'/RegistrationSignUp.Captcha.html'
)
]);
// default stuff
...
...
@@ -183,7 +184,7 @@ class RegistrationSignUp extends QUI\Control
case
'userdelete'
:
$msgSuccess
=
QUI
::
getLocale
()
->
get
(
'quiqqer/frontend-users'
,
'RegistrationSignUp.message.success.'
.
$_GET
[
'success'
]
'RegistrationSignUp.message.success.'
.
$_GET
[
'success'
]
);
$showLoggedInWarning
=
false
;
...
...
@@ -198,7 +199,7 @@ class RegistrationSignUp extends QUI\Control
case
'userdelete'
:
$msgError
=
QUI
::
getLocale
()
->
get
(
'quiqqer/frontend-users'
,
'RegistrationSignUp.message.error.'
.
$_GET
[
'error'
]
'RegistrationSignUp.message.error.'
.
$_GET
[
'error'
]
);
$showLoggedInWarning
=
false
;
...
...
@@ -231,7 +232,7 @@ class RegistrationSignUp extends QUI\Control
'redirect'
=>
$redirect
]);
return
$Engine
->
fetch
(
\dirname
(
__FILE__
)
.
'/RegistrationSignUp.html'
);
return
$Engine
->
fetch
(
\dirname
(
__FILE__
)
.
'/RegistrationSignUp.html'
);
}
/**
...
...
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