added, designed and configured better_messages module
This commit is contained in:
@@ -0,0 +1,339 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
@@ -0,0 +1,12 @@
|
||||
name: Better Messages
|
||||
type: module
|
||||
description: This module adds simple functions to make Drupal messages look and act better.
|
||||
package: User interface
|
||||
# core: 8.x
|
||||
configure: better_messages.settings_form
|
||||
|
||||
# Information added by Drupal.org packaging script on 2018-02-03
|
||||
version: '8.x-1.0-alpha2'
|
||||
core: '8.x'
|
||||
project: 'better_messages'
|
||||
datestamp: 1517663884
|
||||
@@ -0,0 +1,14 @@
|
||||
better_messages:
|
||||
version: 1.x
|
||||
css:
|
||||
theme:
|
||||
css/better_messages.css: {}
|
||||
js:
|
||||
js/better_messages.js: {}
|
||||
dependencies:
|
||||
- core/jquery
|
||||
- core/jquery.once
|
||||
- core/jquery.ui.draggable
|
||||
- core/jquery.ui.resizable
|
||||
- core/drupal
|
||||
- core/drupalSettings
|
||||
@@ -0,0 +1,5 @@
|
||||
better_messages.settings_form:
|
||||
title: 'Better Messages settings'
|
||||
description: 'Better handling of Drupal messages UI'
|
||||
route_name: better_messages.settings_form
|
||||
parent: system.admin_config_ui
|
||||
@@ -0,0 +1,138 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Implements hook_theme().
|
||||
*/
|
||||
function better_messages_theme() {
|
||||
return [
|
||||
'better_messages_wrapper' => [
|
||||
'render element' => 'element',
|
||||
'variables' => [
|
||||
'children' => '',
|
||||
'message_list' => [],
|
||||
],
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_element_info_alter().
|
||||
*/
|
||||
function better_messages_element_info_alter(array &$info) {
|
||||
// Replace the default pre_render for status_messages with our custom one.
|
||||
$info['status_messages']['#pre_render'][0] = 'better_messages_status_messages_pre_render';
|
||||
}
|
||||
|
||||
/**
|
||||
* Pre render callback for 'status_messages' render element.
|
||||
*/
|
||||
function better_messages_status_messages_pre_render(array $element) {
|
||||
// The code below is heavily copied from StatusMessages::renderMessages().
|
||||
$element = [
|
||||
'#lazy_builder' => ['better_messages_status_messages_lazy_builder', [$element['#display']]],
|
||||
'#create_placeholder' => TRUE,
|
||||
];
|
||||
|
||||
// Directly create a placeholder as we need this to be placeholdered
|
||||
// regardless if this is a POST or GET request.
|
||||
// @todo remove this when https://www.drupal.org/node/2367555 lands.
|
||||
return \Drupal::service('render_placeholder_generator')->createPlaceholder($element);
|
||||
}
|
||||
|
||||
/**
|
||||
* Lazy builder for 'status_messages'.
|
||||
*
|
||||
* Improved version of StatusMessages::renderMessages() that additionally wraps
|
||||
* the output into an overlay markup whenever necessary.
|
||||
*
|
||||
* @param string|null $type
|
||||
* Limit the messages returned by type. Defaults to NULL, meaning all types.
|
||||
* Passed on to drupal_get_messages(). These values are supported:
|
||||
* - NULL
|
||||
* - 'status'
|
||||
* - 'warning'
|
||||
* - 'error'
|
||||
*
|
||||
* @return array
|
||||
* A renderable array containing the messages.
|
||||
*/
|
||||
function better_messages_status_messages_lazy_builder($type) {
|
||||
$render = \Drupal\Core\Render\Element\StatusMessages::renderMessages($type);
|
||||
if (!empty($render)) {
|
||||
$render['#theme_wrappers'][] = 'better_messages_wrapper';
|
||||
$render['#attached']['library'][] = 'better_messages/better_messages';
|
||||
$render['#attached']['drupalSettings']['better_messages'] = \Drupal::config('better_messages.settings')->get();
|
||||
}
|
||||
|
||||
return $render;
|
||||
}
|
||||
|
||||
/**
|
||||
* Preprocess for 'better_messages_wrapper' theme hook.
|
||||
*/
|
||||
function template_preprocess_better_messages_wrapper(&$variables) {
|
||||
$settings = \Drupal::config('better_messages.settings');
|
||||
$cache = \Drupal\Core\Cache\CacheableMetadata::createFromRenderArray($variables);
|
||||
$cache->addCacheTags($settings->getCacheTags());
|
||||
$cache->addCacheContexts($settings->getCacheContexts());
|
||||
$cache->mergeCacheMaxAge($settings->getCacheMaxAge());
|
||||
|
||||
// Inject the messages from $variables into our "better_messages" context
|
||||
// since now we have crossed beyond the point where "current" messages are
|
||||
// retrievable via drupal_get_messages().
|
||||
\Drupal::service('better_messages.context')->setMessages($variables['message_list']);
|
||||
|
||||
/** @var \Drupal\Core\Condition\ConditionManager $condition_manager */
|
||||
$condition_manager = \Drupal::service('plugin.manager.condition');
|
||||
/** @var \Drupal\Core\Plugin\Context\ContextRepositoryInterface $context_repository */
|
||||
$context_repository = \Drupal::service('context.repository');
|
||||
/** @var \Drupal\Core\Plugin\Context\ContextHandlerInterface $context_handler */
|
||||
$context_handler = \Drupal::service('context.handler');
|
||||
|
||||
$pass = TRUE;
|
||||
foreach ($settings->get('visibility') as $condition_id => $condition) {
|
||||
$condition = $condition_manager->createInstance($condition_id, $condition);
|
||||
if ($condition instanceof \Drupal\Core\Plugin\ContextAwarePluginInterface) {
|
||||
try {
|
||||
$contexts = $context_repository->getRuntimeContexts(array_values($condition->getContextMapping()));
|
||||
$context_handler->applyContextMapping($condition, $contexts);
|
||||
}
|
||||
catch (\Drupal\Component\Plugin\Exception\ContextException $e) {
|
||||
// We couldn't initialize the condition, so it just cannot participate.
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
$pass = $condition->execute();
|
||||
}
|
||||
catch (\Drupal\Component\Plugin\Exception\ContextException $e) {
|
||||
// Condition couldn't evaluate itself. Let's skip it.
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($condition instanceof \Drupal\Core\Cache\CacheableDependencyInterface) {
|
||||
$cache->addCacheTags($condition->getCacheTags());
|
||||
$cache->addCacheContexts($condition->getCacheContexts());
|
||||
$cache->mergeCacheMaxAge($condition->getCacheMaxAge());
|
||||
}
|
||||
|
||||
if (!$pass) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$cache->applyTo($variables);
|
||||
|
||||
if ($pass && !empty($variables['message_list'])) {
|
||||
$variables['attributes']['class'][] = 'better-messages-overlay';
|
||||
|
||||
if (\Drupal::config('better_messages.settings')->get('fixed')) {
|
||||
$variables['attributes']['class'][] = 'better-messages-position-fixed';
|
||||
}
|
||||
|
||||
if (isset($variables['message_list']['error'])) {
|
||||
$variables['attributes']['class'][] = 'better-messages-has-errors';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
configure better messages:
|
||||
title: 'Configure better messages'
|
||||
description: 'Configure settings of the Better Messages module.'
|
||||
@@ -0,0 +1,7 @@
|
||||
better_messages.settings_form:
|
||||
path: /admin/config/user-interface/better-messages
|
||||
defaults:
|
||||
_form: 'Drupal\better_messages\Form\BetterMessagesSettingsForm'
|
||||
_title: 'Better Message settings'
|
||||
requirements:
|
||||
_permission: 'configure better messages'
|
||||
@@ -0,0 +1,5 @@
|
||||
services:
|
||||
better_messages.context:
|
||||
class: Drupal\better_messages\ContextProvider\MessagesContext
|
||||
tags:
|
||||
- { name: 'context_provider' }
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"name": "drupal/better_messages",
|
||||
"description": "Better Messages module for Drupal 8.",
|
||||
"type": "drupal-module"
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
position: 'center'
|
||||
vertical: 0
|
||||
horizontal: 10
|
||||
fixed: 1
|
||||
width: '400px'
|
||||
autoclose: 0
|
||||
opendelay: 0.3
|
||||
disable_autoclose: 0
|
||||
show_countdown: 1
|
||||
hover_autoclose: 1
|
||||
popin:
|
||||
effect: 'fadeIn'
|
||||
duration: 'slow'
|
||||
popout:
|
||||
effect: 'fadeOut'
|
||||
duration: 'slow'
|
||||
jquery_ui:
|
||||
draggable: 1
|
||||
resizable: 0
|
||||
visibility: []
|
||||
+70
@@ -0,0 +1,70 @@
|
||||
better_messages.settings:
|
||||
type: config_entity
|
||||
label: 'Better Messages settings'
|
||||
mapping:
|
||||
position:
|
||||
type: string
|
||||
label: 'Position'
|
||||
vertical:
|
||||
type: integer
|
||||
label: 'Vertical'
|
||||
horizontal:
|
||||
type: integer
|
||||
label: 'Horizontal'
|
||||
fixed:
|
||||
type: integer
|
||||
label: 'Fixed'
|
||||
width:
|
||||
type: string
|
||||
label: 'Width'
|
||||
autoclose:
|
||||
type: integer
|
||||
label: 'autoclose'
|
||||
opendelay:
|
||||
type: float
|
||||
label: 'Opendelay'
|
||||
disable_autoclose:
|
||||
type: integer
|
||||
label: 'Disable autoclose'
|
||||
show_countdown:
|
||||
type: integer
|
||||
label: 'Show countdown'
|
||||
hover_autoclose:
|
||||
type: integer
|
||||
label: 'Hover autoclose'
|
||||
popin:
|
||||
type: mapping
|
||||
label: 'Popin effect'
|
||||
mapping:
|
||||
effect:
|
||||
type: string
|
||||
label: 'Effect'
|
||||
duration:
|
||||
type: string
|
||||
label: 'Duration'
|
||||
popout:
|
||||
type: mapping
|
||||
label: 'Popout effect'
|
||||
mapping:
|
||||
effect:
|
||||
type: string
|
||||
label: 'Effect'
|
||||
duration:
|
||||
type: string
|
||||
label: 'Duration'
|
||||
jquery_ui:
|
||||
type: mapping
|
||||
label: 'jQuery UI enhancement'
|
||||
mapping:
|
||||
draggable:
|
||||
type: integer
|
||||
label: 'Draggable'
|
||||
resizable :
|
||||
type: integer
|
||||
label: 'Resizable'
|
||||
visibility:
|
||||
type: sequence
|
||||
label: 'Visibility Conditions'
|
||||
sequence:
|
||||
type: condition.plugin.[id]
|
||||
label: 'Visibility Condition'
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
condition.plugin.message_type:
|
||||
type: condition.plugin
|
||||
mapping:
|
||||
message_types:
|
||||
type: sequence
|
||||
label: 'Allowed message types'
|
||||
sequence:
|
||||
type: string
|
||||
label: 'Message type'
|
||||
@@ -0,0 +1,7 @@
|
||||
#better-messages-default .better-messages-close {
|
||||
float: left;
|
||||
}
|
||||
|
||||
#better-messages-default .better-messages-timer {
|
||||
float: right;
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
/** We want the admin toolbar to be on top of our overlay when it's
|
||||
horizontal. */
|
||||
.toolbar-horizontal #toolbar-administration {
|
||||
z-index: 520;
|
||||
}
|
||||
|
||||
/** Hide the messages if we have JS support */
|
||||
.js #better-messages-default.better-messages-overlay {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#better-messages-default.better-messages-overlay {
|
||||
z-index: 510;
|
||||
position: absolute;
|
||||
background: #FFFFFF;
|
||||
padding: 1em;
|
||||
-webkit-box-shadow: 0 2px 10px #000000;
|
||||
-moz-box-shadow: 0 2px 10px #000000;
|
||||
box-shadow: 0 2px 10px #000000;
|
||||
-webkit-border-radius: 1em;
|
||||
-moz-border-radius: 1em;
|
||||
border-radius: 1em;
|
||||
}
|
||||
|
||||
#better-messages-default.better-messages-overlay.better-messages-position-fixed {
|
||||
position: fixed;
|
||||
}
|
||||
|
||||
#better-messages-default.better-messages-overlay .better-messages-footer {
|
||||
border-top: 1px solid #DDDDDD;
|
||||
margin-top: 10px;
|
||||
padding-top: 5px;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
#better-messages-default.better-messages-overlay .better-messages-close {
|
||||
display: block;
|
||||
float: right;
|
||||
color: #676767;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
#better-messages-default.better-messages-overlay .better-messages-close span {
|
||||
background: transparent url(../images/closelabel.gif) no-repeat;
|
||||
display: block;
|
||||
float: right;
|
||||
height: 22px;
|
||||
width: 22px;
|
||||
}
|
||||
|
||||
#better-messages-default.better-messages-overlay .better-messages-timer {
|
||||
float: left;
|
||||
line-height: 22px;
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 687 B |
@@ -0,0 +1,124 @@
|
||||
|
||||
(function ($) {
|
||||
|
||||
'use strict';
|
||||
|
||||
Drupal.behaviors.betterMessages = {
|
||||
attach: function (context, settings) {
|
||||
|
||||
var betterMessages = settings.better_messages;
|
||||
var message_box = $('#better-messages-default.better-messages-overlay', context).once('better-messages');
|
||||
|
||||
if (message_box.length > 0) {
|
||||
/* jQuery UI Enhancements */
|
||||
if (betterMessages.jquery_ui.draggable == '1') {
|
||||
message_box.draggable();
|
||||
}
|
||||
if (betterMessages.jquery_ui.resizable == '1') {
|
||||
message_box.resizable();
|
||||
}
|
||||
|
||||
/* Functions to determine the popin/popout animation */
|
||||
betterMessages.open = function () {
|
||||
var method = 'fadeIn';
|
||||
switch (betterMessages.popin.effect) {
|
||||
case 'fadeIn':
|
||||
case 'slideDown':
|
||||
method = betterMessages.popin.effect;
|
||||
break;
|
||||
}
|
||||
message_box[method](betterMessages.popin.duration);
|
||||
};
|
||||
betterMessages.close = function () {
|
||||
var method = 'fadeOut';
|
||||
switch (betterMessages.popout.effect) {
|
||||
case 'fadeOut':
|
||||
break;
|
||||
case 'slideUp':
|
||||
method = betterMessages.popout.effect;
|
||||
break;
|
||||
}
|
||||
message_box[method](betterMessages.popout.duration);
|
||||
};
|
||||
|
||||
/* Function to determine closing count */
|
||||
betterMessages.countDownClose = function (seconds) {
|
||||
if (!message_box.hasClass('better-messages-has-errors') || !betterMessages.disable_autoclose) {
|
||||
if (seconds > 0) {
|
||||
seconds--;
|
||||
if (betterMessages.show_countdown == '1') {
|
||||
$('.better-messages-timer', message_box).text(Drupal.t('Closing in !seconds seconds', {'!seconds': seconds}));
|
||||
}
|
||||
if (seconds > 0) {
|
||||
betterMessages.countDown = setTimeout(function () {
|
||||
betterMessages.countDownClose(seconds);
|
||||
}, 1000);
|
||||
}
|
||||
else {
|
||||
betterMessages.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
if (betterMessages.width) {
|
||||
message_box.css('width', betterMessages.width);
|
||||
}
|
||||
|
||||
/* Determine Popup Message position */
|
||||
var vertical = betterMessages.vertical;
|
||||
var horizontal = betterMessages.horizontal;
|
||||
var cssPosition = {};
|
||||
switch (betterMessages.position) {
|
||||
case 'center':
|
||||
vertical = ($(window).height() - message_box.height()) / 2;
|
||||
horizontal = ($(window).width() - message_box.width()) / 2;
|
||||
cssPosition = {top: vertical + 'px', left: horizontal + 'px'};
|
||||
break;
|
||||
case 'tl':
|
||||
cssPosition = {top: vertical + 'px', left: horizontal + 'px'};
|
||||
break;
|
||||
case 'tr':
|
||||
cssPosition = {top: vertical + 'px', right: horizontal + 'px'};
|
||||
break;
|
||||
case 'bl':
|
||||
cssPosition = {bottom: vertical + 'px', left: horizontal + 'px'};
|
||||
break;
|
||||
case 'br':
|
||||
cssPosition = {bottom: vertical + 'px', right: horizontal + 'px'};
|
||||
break;
|
||||
}
|
||||
message_box.css(cssPosition);
|
||||
|
||||
/* Here we control closing and opening effects and controls */
|
||||
setTimeout(function () {
|
||||
betterMessages.open();
|
||||
}, betterMessages.opendelay * 1000);
|
||||
|
||||
if (betterMessages.autoclose != 0) {
|
||||
betterMessages.countDownClose(betterMessages.autoclose);
|
||||
}
|
||||
if (betterMessages.hover_autoclose == '1') {
|
||||
message_box.hover(function () {
|
||||
clearTimeout(betterMessages.countDown);
|
||||
$('.better-messages-timer', message_box).fadeOut('slow');
|
||||
});
|
||||
}
|
||||
$('.better-messages-close', message_box).click(function (event) {
|
||||
betterMessages.close();
|
||||
event.preventDefault();
|
||||
});
|
||||
|
||||
/* Esc key handler for closing the message. This doesn't work on Safari or Chrome
|
||||
See the issue here: http://code.google.com/p/chromium/issues/detail?id=14635
|
||||
*/
|
||||
$(document).keypress(function (e) {
|
||||
if (e.keyCode == 27) {
|
||||
betterMessages.close();
|
||||
return e.preventDefault();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
})(jQuery);
|
||||
+82
@@ -0,0 +1,82 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\better_messages\ContextProvider;
|
||||
|
||||
use Drupal\Core\Cache\CacheableMetadata;
|
||||
use Drupal\Core\Plugin\Context\Context;
|
||||
use Drupal\Core\Plugin\Context\ContextDefinition;
|
||||
use Drupal\Core\Plugin\Context\ContextProviderInterface;
|
||||
use Drupal\Core\StringTranslation\StringTranslationTrait;
|
||||
|
||||
/**
|
||||
* Provides current Drupal status messages as a context.
|
||||
*/
|
||||
class MessagesContext implements ContextProviderInterface {
|
||||
|
||||
use StringTranslationTrait;
|
||||
|
||||
/**
|
||||
* Current status messages.
|
||||
*
|
||||
* If this property is NULL, it means we haven't hit the rendering yet and
|
||||
* current messages can be queried from Drupal core. Otherwise the currently
|
||||
* rendered messages will be stored in here.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $messages = NULL;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getRuntimeContexts(array $unqualified_context_ids) {
|
||||
$result = [];
|
||||
|
||||
$context_definition = new ContextDefinition('map', NULL, FALSE);
|
||||
$context = new Context($context_definition, $this->getMessages());
|
||||
|
||||
$cacheability = new CacheableMetadata();
|
||||
// We cannot cache this context as literally a few lines below some message
|
||||
// might be added.
|
||||
$cacheability->setCacheMaxAge(0);
|
||||
// Since messages are stored in session, we must vary by it.
|
||||
$cacheability->addCacheContexts(['session']);
|
||||
$context->addCacheableDependency($cacheability);
|
||||
|
||||
$result['better_messages'] = $context;
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getAvailableContexts() {
|
||||
$context = new Context(new ContextDefinition('map', $this->t('Current status messages')));
|
||||
return ['better_messages' => $context];
|
||||
}
|
||||
|
||||
/**
|
||||
* Store currently rendered status messages.
|
||||
*
|
||||
* @param array $messages
|
||||
* Messages array to store (supposedly it should be the currently rendered
|
||||
* ones)
|
||||
*/
|
||||
public function setMessages(array $messages) {
|
||||
$this->messages = $messages;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve current status messages.
|
||||
*
|
||||
* @return array
|
||||
* Array of current messages. It will either be a result of
|
||||
* drupal_get_messages() or $this->messages should we already be beyond the
|
||||
* phase of rendering status messages on the current page request
|
||||
*/
|
||||
protected function getMessages() {
|
||||
return is_null($this->messages) ? drupal_get_messages(NULL, FALSE) : $this->messages;
|
||||
}
|
||||
|
||||
}
|
||||
+356
@@ -0,0 +1,356 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\better_messages\Form;
|
||||
|
||||
use Drupal\Core\Condition\ConditionManager;
|
||||
use Drupal\Core\Config\ConfigFactoryInterface;
|
||||
use Drupal\Core\Form\ConfigFormBase;
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
use Drupal\Core\Form\SubformState;
|
||||
use Drupal\Core\Plugin\Context\ContextRepositoryInterface;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
/**
|
||||
* Admin settings form of the module.
|
||||
*/
|
||||
class BetterMessagesSettingsForm extends ConfigFormBase {
|
||||
|
||||
/**
|
||||
* The condition plugin manager.
|
||||
*
|
||||
* @var \Drupal\Core\Condition\ConditionManager
|
||||
*/
|
||||
protected $conditionManager;
|
||||
|
||||
/**
|
||||
* The context repository service.
|
||||
*
|
||||
* @var \Drupal\Core\Plugin\Context\ContextRepositoryInterface
|
||||
*/
|
||||
protected $contextRepository;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function create(ContainerInterface $container) {
|
||||
return new static(
|
||||
$container->get('config.factory'),
|
||||
$container->get('plugin.manager.condition'),
|
||||
$container->get('context.repository')
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* BetterMessagesSettingsForm constructor.
|
||||
*/
|
||||
public function __construct(ConfigFactoryInterface $config_factory, ConditionManager $condition_manager, ContextRepositoryInterface $context_repository) {
|
||||
parent::__construct($config_factory);
|
||||
|
||||
$this->conditionManager = $condition_manager;
|
||||
$this->contextRepository = $context_repository;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getFormId() {
|
||||
return 'better_messages_settings_form';
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function getEditableConfigNames() {
|
||||
return ['better_messages.settings'];
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function buildForm(array $form, FormStateInterface $form_state) {
|
||||
$config = $this->config('better_messages.settings');
|
||||
|
||||
$form_state->setTemporaryValue('gathered_contexts', $this->contextRepository->getAvailableContexts());
|
||||
|
||||
$settings = $config->get();
|
||||
|
||||
$form['position'] = array(
|
||||
'#type' => 'details',
|
||||
'#title' => $this->t('Messages positions and basic properties'),
|
||||
'#weight' => -5,
|
||||
'#open' => TRUE
|
||||
);
|
||||
|
||||
$form['position']['pos'] = array(
|
||||
'#type' => 'radios',
|
||||
'#title' => $this->t('Set position of Message'),
|
||||
'#default_value' => $settings['position'],
|
||||
'#description' => $this->t('Position of message relative to screen'),
|
||||
'#attributes' => array('class' => array('better-messages-admin-radios')),
|
||||
'#options' => array(
|
||||
'center' => $this->t('Center screen'),
|
||||
'tl' => $this->t('Top left'),
|
||||
'tr' => $this->t('Top right'),
|
||||
'bl' => $this->t('Bottom left'),
|
||||
'br' => $this->t('Bottom right'),
|
||||
),
|
||||
);
|
||||
|
||||
$form['position']['fixed'] = array(
|
||||
'#type' => 'checkbox',
|
||||
'#default_value' => $settings['fixed'],
|
||||
'#title' => $this->t('Keep fixed position of message as you scroll.'),
|
||||
);
|
||||
|
||||
$form['position']['width'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => $this->t('Custom width'),
|
||||
'#description' => $this->t('Width in pixel (e.g. 400px) or percentage (e.g. 100%). Leave empty if you prefer your theme to control the width.'),
|
||||
'#default_value' => $settings['width'],
|
||||
'#size' => 20,
|
||||
'#maxlength' => 20,
|
||||
);
|
||||
|
||||
$form['position']['horizontal'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => $this->t('Left/Right spacing'),
|
||||
'#default_value' => $settings['horizontal'],
|
||||
'#size' => 20,
|
||||
'#maxlength' => 20,
|
||||
'#required' => TRUE,
|
||||
'#field_suffix' => $this->t('px'),
|
||||
'#states' => [
|
||||
'invisible' => [
|
||||
':input[name="pos"]' => ['value' => 'center'],
|
||||
],
|
||||
],
|
||||
);
|
||||
|
||||
$form['position']['vertical'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => $this->t('Top/Down spacing'),
|
||||
'#default_value' => $settings['vertical'],
|
||||
'#size' => 20,
|
||||
'#maxlength' => 20,
|
||||
'#required' => TRUE,
|
||||
'#field_suffix' => $this->t('px'),
|
||||
'#states' => [
|
||||
'invisible' => [
|
||||
':input[name="pos"]' => ['value' => 'center'],
|
||||
],
|
||||
],
|
||||
);
|
||||
|
||||
$form['animation'] = array(
|
||||
'#type' => 'details',
|
||||
'#title' => $this->t('Messages animation settings'),
|
||||
'#weight' => -3,
|
||||
'#open' => TRUE,
|
||||
);
|
||||
|
||||
$form['animation']['popin_effect'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => $this->t('Pop-in (show) message box effect'),
|
||||
'#default_value' => $settings['popin']['effect'],
|
||||
'#options' => array(
|
||||
'fadeIn' => $this->t('Fade in'),
|
||||
'slideDown' => $this->t('Slide down'),
|
||||
),
|
||||
);
|
||||
|
||||
$form['animation']['popin_duration'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => $this->t('Duration of (show) effect'),
|
||||
'#description' => $this->t('A string representing one of the three predefined speeds ("slow", "normal", or "fast").<br />Or the number of milliseconds to run the animation (e.g. 1000).'),
|
||||
'#default_value' => $settings['popin']['duration'],
|
||||
'#size' => 20,
|
||||
'#maxlength' => 20,
|
||||
);
|
||||
|
||||
$form['animation']['popout_effect'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => $this->t('Pop-out (close) message box effect'),
|
||||
'#default_value' => $settings['popout']['effect'],
|
||||
'#options' => array(
|
||||
'fadeIn' => $this->t('Fade out'),
|
||||
'slideUp' => $this->t('Slide Up'),
|
||||
),
|
||||
);
|
||||
|
||||
$form['animation']['popout_duration'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => $this->t('Duration of (close) effect'),
|
||||
'#description' => $this->t('A string representing one of the three predefined speeds ("slow", "normal", or "fast").<br />Or the number of milliseconds to run the animation (e.g. 1000).'),
|
||||
'#default_value' => $settings['popout']['duration'],
|
||||
'#size' => 20,
|
||||
'#maxlength' => 20,
|
||||
);
|
||||
|
||||
$form['animation']['autoclose'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => $this->t('Number of seconds to auto close after the page has loaded'),
|
||||
'#description' => $this->t('0 for never. You can set it as 0.25 for quarter second'),
|
||||
'#default_value' => $settings['autoclose'],
|
||||
'#size' => 20,
|
||||
'#maxlength' => 20,
|
||||
);
|
||||
|
||||
$form['animation']['disable_autoclose'] = array(
|
||||
'#type' => 'checkbox',
|
||||
'#title' => $this->t('Disable auto close if messages include an error message'),
|
||||
'#default_value' => $settings['disable_autoclose'],
|
||||
);
|
||||
|
||||
$form['animation']['show_countdown'] = array(
|
||||
'#type' => 'checkbox',
|
||||
'#title' => $this->t('Show countdown timer'),
|
||||
'#default_value' => $settings['show_countdown'],
|
||||
);
|
||||
|
||||
$form['animation']['hover_autoclose'] = array(
|
||||
'#type' => 'checkbox',
|
||||
'#title' => $this->t('Stop auto close timer when hover'),
|
||||
'#default_value' => $settings['hover_autoclose'],
|
||||
);
|
||||
|
||||
$form['animation']['open_delay'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => $this->t('Number of seconds to delay message after the page has loaded'),
|
||||
'#description' => $this->t('0 for never. You can set it as 0.25 for quarter second'),
|
||||
'#default_value' => $settings['opendelay'],
|
||||
'#size' => 20,
|
||||
'#maxlength' => 20,
|
||||
);
|
||||
|
||||
$form['jquery_ui'] = array(
|
||||
'#type' => 'details',
|
||||
'#title' => $this->t('jQuery UI enhancements'),
|
||||
'#weight' => 10,
|
||||
'#description' => $this->t('These settings require jQuery UI.'),
|
||||
'#open' => TRUE,
|
||||
);
|
||||
|
||||
$form['jquery_ui']['draggable'] = array(
|
||||
'#type' => 'checkbox',
|
||||
'#title' => $this->t('Make Better Messages draggable'),
|
||||
'#default_value' => $settings['jquery_ui']['draggable'],
|
||||
);
|
||||
$form['jquery_ui']['resizable'] = array(
|
||||
'#type' => 'checkbox',
|
||||
'#title' => $this->t('Make Better Messages resizable'),
|
||||
'#default_value' => $settings['jquery_ui']['resizable'],
|
||||
);
|
||||
|
||||
$form['visibility'] = $this->buildVisibility([], $form_state);
|
||||
|
||||
return parent::buildForm($form, $form_state);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function validateForm(array &$form, FormStateInterface $form_state) {
|
||||
parent::validateForm($form, $form_state);
|
||||
|
||||
foreach ($form_state->getValue('visibility') as $condition_id => $values) {
|
||||
// All condition plugins use 'negate' as a Boolean in their schema.
|
||||
// However, certain form elements may return it as 0/1. Cast here to
|
||||
// ensure the data is in the expected type.
|
||||
if (array_key_exists('negate', $values)) {
|
||||
$form_state->setValue(['visibility', $condition_id, 'negate'], (bool) $values['negate']);
|
||||
}
|
||||
|
||||
// Allow the condition to validate the form.
|
||||
$condition = $form_state->get(['conditions', $condition_id]);
|
||||
$condition->validateConfigurationForm($form['visibility'][$condition_id], SubformState::createForSubform($form['visibility'][$condition_id], $form, $form_state));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function submitForm(array &$form, FormStateInterface $form_state) {
|
||||
$config = $this->config('better_messages.settings');
|
||||
$config->set('position', $form_state->getValue('pos'))
|
||||
->set('fixed', $form_state->getValue('fixed'))
|
||||
->set('width', $form_state->getValue('width'))
|
||||
->set('horizontal', intval($form_state->getValue('horizontal')))
|
||||
->set('vertical', intval($form_state->getValue('vertical')))
|
||||
->set('popin.effect', $form_state->getValue('popin_effect'))
|
||||
->set('popin.duration', $form_state->getValue('popin_duration'))
|
||||
->set('popout.effect', $form_state->getValue('popout_effect'))
|
||||
->set('popout.duration', $form_state->getValue('popout_duration'))
|
||||
->set('autoclose', $form_state->getValue('autoclose'))
|
||||
->set('disable_autoclose', $form_state->getValue('disable_autoclose'))
|
||||
->set('show_countdown', $form_state->getValue('show_countdown'))
|
||||
->set('hover_autoclose', $form_state->getValue('hover_autoclose'))
|
||||
->set('opendelay', $form_state->getValue('open_delay'))
|
||||
->set('jquery_ui.draggable', $form_state->getValue('draggable'))
|
||||
->set('jquery_ui.resizable', $form_state->getValue('resizable'))
|
||||
->set('visibility', []);
|
||||
|
||||
foreach ($form_state->getValue('visibility') as $condition_id => $values) {
|
||||
// Allow the condition to submit the form.
|
||||
$condition = $form_state->get(['conditions', $condition_id]);
|
||||
$condition->submitConfigurationForm($form['visibility'][$condition_id], SubformState::createForSubform($form['visibility'][$condition_id], $form, $form_state));
|
||||
$config->set('visibility.' . $condition_id, $condition->getConfiguration());
|
||||
}
|
||||
|
||||
$config->save();
|
||||
|
||||
parent::submitForm($form, $form_state);
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate form elements for visibility controls.
|
||||
*
|
||||
* @param array $form
|
||||
* Form array chunk where the genreated visibility controls will be embedded
|
||||
* @param \Drupal\Core\Form\FormStateInterface $form_state
|
||||
* Form state that corresponds to $form
|
||||
*
|
||||
* @return array
|
||||
* Form elements for visibility controls
|
||||
*/
|
||||
protected function buildVisibility($form, FormStateInterface $form_state) {
|
||||
$form['#tree'] = TRUE;
|
||||
|
||||
$form['visibility_tabs'] = [
|
||||
'#type' => 'vertical_tabs',
|
||||
'#title' => $this->t('Visibility'),
|
||||
'#parents' => ['visibility_tabs'],
|
||||
];
|
||||
|
||||
$visibility = $this->config($this->getEditableConfigNames()[0])->get('visibility');
|
||||
foreach ($this->conditionManager->getDefinitionsForContexts($form_state->getTemporaryValue('gathered_contexts')) as $condition_id => $definition) {
|
||||
/** @var \Drupal\Core\Condition\ConditionInterface $condition */
|
||||
$condition = $this->conditionManager->createInstance($condition_id, isset($visibility[$condition_id]) ? $visibility[$condition_id] : []);
|
||||
$form_state->set(['conditions', $condition_id], $condition);
|
||||
$condition_form = $condition->buildConfigurationForm([], $form_state);
|
||||
$condition_form['#type'] = 'details';
|
||||
$condition_form['#title'] = $condition->getPluginDefinition()['label'];
|
||||
$condition_form['#group'] = 'visibility_tabs';
|
||||
$form[$condition_id] = $condition_form;
|
||||
}
|
||||
|
||||
// The "current_theme" condition is very raw, and has bugs:
|
||||
// https://www.drupal.org/node/2787529 and
|
||||
// https://www.drupal.org/node/2787529
|
||||
// so we prefer to ditch it.
|
||||
unset($form['current_theme']);
|
||||
|
||||
if (isset($form['request_path'])) {
|
||||
$form['request_path']['#title'] = $this->t('Pages');
|
||||
$form['request_path']['negate']['#type'] = 'radios';
|
||||
$form['request_path']['negate']['#default_value'] = (int) $form['request_path']['negate']['#default_value'];
|
||||
$form['request_path']['negate']['#title_display'] = 'invisible';
|
||||
$form['request_path']['negate']['#options'] = [
|
||||
$this->t('Show for the listed pages'),
|
||||
$this->t('Hide for the listed pages'),
|
||||
];
|
||||
}
|
||||
|
||||
return $form;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
<?php
|
||||
|
||||
namespace Drupal\better_messages\Plugin\Condition;
|
||||
|
||||
use Drupal\Component\Utility\Unicode;
|
||||
use Drupal\Core\Condition\ConditionPluginBase;
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
use Drupal\Core\Path\AliasManagerInterface;
|
||||
use Drupal\Core\Path\CurrentPathStack;
|
||||
use Drupal\Core\Path\PathMatcherInterface;
|
||||
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
|
||||
use Drupal\Core\Plugin\ContextAwarePluginInterface;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
use Symfony\Component\HttpFoundation\RequestStack;
|
||||
|
||||
/**
|
||||
* Provides a 'Message type' condition.
|
||||
*
|
||||
* @Condition(
|
||||
* id = "message_type",
|
||||
* label = @Translation("Message type"),
|
||||
* context = {
|
||||
* "better_messages" = @ContextDefinition("map",
|
||||
* label = @Translation("Current better messages")
|
||||
* )
|
||||
* }
|
||||
* )
|
||||
*/
|
||||
class MessageType extends ConditionPluginBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function defaultConfiguration() {
|
||||
return ['message_types' => []] + parent::defaultConfiguration();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
|
||||
$form['message_types'] = [
|
||||
'#type' => 'checkboxes',
|
||||
'#title' => $this->t('Message types'),
|
||||
'#default_value' => $this->configuration['message_types'],
|
||||
'#options' => $this->messageTypeOptions(),
|
||||
'#description' => $this->t('Specify for which message types to active the condition. Leaving empty means for all message types.'),
|
||||
];
|
||||
return parent::buildConfigurationForm($form, $form_state);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
|
||||
$this->configuration['message_types'] = array_values(array_filter($form_state->getValue('message_types')));
|
||||
parent::submitConfigurationForm($form, $form_state);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function summary() {
|
||||
$message_labels = array_intersect_key($this->messageTypeOptions(), array_combine($this->configuration['message_types'], $this->configuration['message_types']));
|
||||
return implode(', ', $message_labels);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function evaluate() {
|
||||
$messages = $this->getContextValue('better_messages');
|
||||
$intersect = array_intersect($this->configuration['message_types'], array_keys($messages));
|
||||
return empty($this->configuration['message_types']) || !empty($intersect);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve a list of known message types.
|
||||
*
|
||||
* @return array
|
||||
* Array of known message types. Keys are their machine names whereas values
|
||||
* are the corresponding human friendly labels
|
||||
*/
|
||||
protected function messageTypeOptions() {
|
||||
return [
|
||||
'status' => $this->t('Status'),
|
||||
'warning' => $this->t('Warning'),
|
||||
'error' => $this->t('Error'),
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
{#
|
||||
/**
|
||||
* @file
|
||||
* Default theme for better_messages_wrapper theme hook.
|
||||
*
|
||||
* Wrap the system messages into additional markup required for presenting the
|
||||
* messages in an overlay.
|
||||
*
|
||||
* Available variables:
|
||||
* - children: The system messages
|
||||
*/
|
||||
#}
|
||||
<div{{ attributes.setAttribute('id', 'better-messages-default') }}>
|
||||
<div id="better-messages-inner">
|
||||
{%block children%}
|
||||
<div class="better-messages-content">
|
||||
{{ children }}
|
||||
</div>
|
||||
{% if attributes.hasClass('better-messages-overlay') %}
|
||||
<div class="better-messages-footer"><span class="better-messages-timer"></span><a class="better-messages-close" href="#">{{ 'Close' | t }}<span></span></a></div>
|
||||
{% endif %}
|
||||
{%endblock%}
|
||||
</div>
|
||||
</div>
|
||||
@@ -2875,3 +2875,19 @@ footer {
|
||||
font-size: 0.82em;
|
||||
font-weight: normal;
|
||||
line-height: 1.4; }
|
||||
|
||||
#better-messages-default.better-messages-overlay {
|
||||
border-radius: 0;
|
||||
padding: 0.8em;
|
||||
-webkit-box-shadow: 0 2px 10px #716f6f;
|
||||
box-shadow: 0 2px 10px #716f6f; }
|
||||
#better-messages-default.better-messages-overlay .better-messages-footer {
|
||||
border-top: none; }
|
||||
#better-messages-default.better-messages-overlay .better-messages-footer .better-messages-close {
|
||||
font-size: 0.82em;
|
||||
font-weight: normal;
|
||||
line-height: 1.4; }
|
||||
#better-messages-default.better-messages-overlay .better-messages-footer .better-messages-close span {
|
||||
height: 15px;
|
||||
width: 15px;
|
||||
background-size: contain; }
|
||||
|
||||
@@ -2049,3 +2049,22 @@ footer{
|
||||
@include content_courant;
|
||||
}
|
||||
}
|
||||
|
||||
#better-messages-default.better-messages-overlay{
|
||||
border-radius: 0;
|
||||
padding:0.8em;
|
||||
box-shadow: 0 2px 10px #716f6f;
|
||||
.better-messages-content{
|
||||
|
||||
}
|
||||
.better-messages-footer{
|
||||
border-top: none;
|
||||
.better-messages-close{
|
||||
@include content_courant;
|
||||
span{
|
||||
height:15px; width:15px;
|
||||
background-size: contain;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
position: tr
|
||||
vertical: 70
|
||||
horizontal: 10
|
||||
fixed: 1
|
||||
width: 400px
|
||||
autoclose: 7
|
||||
opendelay: 0.3
|
||||
disable_autoclose: 1
|
||||
show_countdown: 0
|
||||
hover_autoclose: 1
|
||||
popin:
|
||||
effect: fadeIn
|
||||
duration: normal
|
||||
popout:
|
||||
effect: fadeIn
|
||||
duration: fast
|
||||
jquery_ui:
|
||||
draggable: 0
|
||||
resizable: 0
|
||||
visibility:
|
||||
message_type:
|
||||
id: message_type
|
||||
message_types: { }
|
||||
negate: false
|
||||
context_mapping:
|
||||
better_messages: '@better_messages.context:better_messages'
|
||||
'entity_bundle:node':
|
||||
id: 'entity_bundle:node'
|
||||
bundles: { }
|
||||
negate: false
|
||||
context_mapping:
|
||||
node: '@node.node_route_context:node'
|
||||
domain:
|
||||
id: domain
|
||||
domains:
|
||||
encyclopediedelaparole_org: encyclopediedelaparole_org
|
||||
negate: false
|
||||
context_mapping: { }
|
||||
language:
|
||||
id: language
|
||||
langcodes: { }
|
||||
negate: false
|
||||
context_mapping:
|
||||
language: '@language.current_language_context:language_interface'
|
||||
node_type:
|
||||
id: node_type
|
||||
bundles: { }
|
||||
negate: false
|
||||
context_mapping:
|
||||
node: '@node.node_route_context:node'
|
||||
request_path:
|
||||
id: request_path
|
||||
pages: ''
|
||||
negate: false
|
||||
user_role:
|
||||
id: user_role
|
||||
roles: { }
|
||||
negate: false
|
||||
context_mapping:
|
||||
user: '@user.current_user_context:current_user'
|
||||
_core:
|
||||
default_config_hash: XQBA27Kvnm5zhyFSZw1jwBTFlwpas2sVJy6gncASxo0
|
||||
langcode: fr
|
||||
@@ -5,6 +5,7 @@ module:
|
||||
admin_toolbar_links_access_filter: 0
|
||||
audiofield: 0
|
||||
ban: 0
|
||||
better_messages: 0
|
||||
block: 0
|
||||
breakpoint: 0
|
||||
bulkdelete: 0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
country:
|
||||
default: FR
|
||||
first_day: 0
|
||||
first_day: 1
|
||||
timezone:
|
||||
default: Europe/Paris
|
||||
user:
|
||||
|
||||
Reference in New Issue
Block a user