Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
don
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
25
Issues
25
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
LQDN Adminsys
don
Commits
4679cecd
Commit
4679cecd
authored
Nov 26, 2018
by
Okhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Styling the error messages
parent
20d332d0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
7 deletions
+28
-7
app/MessageHelper.php
app/MessageHelper.php
+15
-6
app/controller/controller.php
app/controller/controller.php
+7
-0
app/view/toolbar.html
app/view/toolbar.html
+6
-1
No files found.
app/MessageHelper.php
View file @
4679cecd
<?php
class
MessageHelper
class
MessageHelper
extends
\
Prefab
{
/**
* Cette classe sert à afficher le code HTML stocké dans un tableau passé en argument
* et avec une classe éventuelle ajoutée en CSS
*/
public
static
function
render
(
$
args
)
public
static
function
render
(
$
node
)
{
$attr
=
$args
[
'@attrib'
];
$attr
=
$node
[
'@attrib'
];
if
(
!
isset
(
$attr
[
'messages'
]))
{
return
;
}
$html
=
'
<!-- Messages -->
'
;
$html
=
''
;
$class
=
isset
(
$attr
[
'class'
])
?
$attr
[
'class'
]
:
""
;
$messages
=
\
Template
::
instance
()
->
token
(
$attr
[
'messages'
]);
var_dump
(
$messages
);
$html
.
=
'<?php echo \Template::instance()->build('
.
$messages
.
', "'
.
$class
.
'"); ?>'
;
$html
.
=
'<?php \MessageHelper::instance()->build('
.
$messages
.
', "'
.
$class
.
'"); ?>'
;
return
sprintf
(
$html
);
}
public
function
build
(
$messages
,
$class
)
{
$html
=
''
;
foreach
(
$messages
as
$message
)
{
$html
.
=
"<div class=
\"
$class
\"
>"
;
$html
.
=
$message
;
$html
.
=
"</div>"
;
}
echo
$html
;
}
}
app/controller/controller.php
View file @
4679cecd
...
...
@@ -100,6 +100,13 @@ class Controller
return
;
}
// Test si il y a des messages
if
(
!
$f3
->
exists
(
'SESSION.message'
))
{
$f3
->
push
(
'SESSION.message'
,
''
);
}
if
(
!
$f3
->
exists
(
'SESSION.error'
))
{
$f3
->
push
(
'SESSION.error'
,
''
);
}
// Rendu de la page
if
(
$this
->
template
!=
''
)
{
echo
\
Template
::
instance
()
->
render
(
$this
->
template
);
...
...
app/view/toolbar.html
View file @
4679cecd
...
...
@@ -8,7 +8,10 @@
<input
type=
"hidden"
name=
"csrf"
id=
"csrf"
value=
"{{ @CSRF }}"
/>
<fieldset
class=
"form-group modal-form-only"
>
<h3>
{{ _("Le site de dons a changé. À présent, utilisez votre adresse e-mail comme identifiant.") }}
</h3>
<message
messages=
"{{ @SESSION.error }}"
class=
"modal-row alert alert-danger"
/>
<div
class=
"modal-row"
>
<message
messages=
"{{ @SESSION.error }}"
class=
"alert alert-danger"
/>
<message
messages=
"{{ @SESSION.message }}"
class=
"alert alert-default"
/>
</div>
<div
class=
"modal-row form-group"
>
<label
for=
"email"
>
{{ _("Adresse mail") }}
</label>
<input
class=
"form-control"
type=
"email"
name=
"email"
id=
"email"
required
>
...
...
@@ -151,5 +154,7 @@
</nav>
</div>
<section
id=
"messages"
>
<message
messages=
"@SESSION.message"
class=
"alert alert-default"
>
<message
messages=
"@SESSION.error"
class=
"alert alert-danger"
>
</section>
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