diff --git a/sites/all/modules/contrib/fields/date_range_formatter/LICENSE.txt b/sites/all/modules/contrib/fields/date_range_formatter/LICENSE.txt new file mode 100644 index 000000000..d159169d1 --- /dev/null +++ b/sites/all/modules/contrib/fields/date_range_formatter/LICENSE.txt @@ -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. + + + Copyright (C) + + 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. + + , 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. diff --git a/sites/all/modules/contrib/fields/date_range_formatter/date_range_formatter.info.yml b/sites/all/modules/contrib/fields/date_range_formatter/date_range_formatter.info.yml new file mode 100644 index 000000000..cd3fb2567 --- /dev/null +++ b/sites/all/modules/contrib/fields/date_range_formatter/date_range_formatter.info.yml @@ -0,0 +1,12 @@ +name: 'Date range formatter' +type: module +description: 'Formats date ranges.' +package: Date/Time +# core: 8.x +dependencies: + - datetime_range +# Information added by Drupal.org packaging script on 2017-08-11 +version: '8.x-3.1' +core: '8.x' +project: 'date_range_formatter' +datestamp: 1502454546 diff --git a/sites/all/modules/contrib/fields/date_range_formatter/date_range_formatter.module b/sites/all/modules/contrib/fields/date_range_formatter/date_range_formatter.module new file mode 100644 index 000000000..b3d9bbc7f --- /dev/null +++ b/sites/all/modules/contrib/fields/date_range_formatter/date_range_formatter.module @@ -0,0 +1 @@ + '-', + 'single' => 'd F Y', + 'single_all_day' => 'd F Y', + 'one_day' => 'd F Y', + 'one_month' => 'd - {d} F Y', + 'several_months' => 'd F - {d} {F} Y', + 'several_years' => 'd F Y - {d} {F} {Y}', + ] + parent::defaultSettings(); + } + + /** + * {@inheritdoc} + */ + public function viewElements(FieldItemListInterface $items, $langcode) { + $elements = []; + + foreach ($items as $delta => $item) { + if (!empty($item->start_date) && !empty($item->end_date)) { + /** @var \Drupal\Core\Datetime\DrupalDateTime $start_date */ + $start_date = $item->start_date->getTimestamp(); + /** @var \Drupal\Core\Datetime\DrupalDateTime $end_date */ + $end_date = $item->end_date->getTimestamp(); + if ($start_date !== $end_date) { + $format = $this->getSetting('several_years'); + if (date('Y', $start_date) === date('Y', $end_date)) { + $format = $this->getSetting('several_months'); + } + if (date('m.Y', $start_date) === date('m.Y', $end_date)) { + $format = $this->getSetting('one_month'); + } + if (date('d.m.Y', $start_date) === date('d.m.Y', $end_date)) { + $format = $this->getSetting('one_day'); + } + + $date_str = format_date($start_date, 'custom', preg_replace('/\{([a-zA-Z])\}/', '{\\\$1}', t($format))); + $matches = array(); + if (preg_match_all('/\{([a-zA-Z])\}/', $date_str, $matches)) { + foreach ($matches[1] as $match) { + $date_str = preg_replace('/\{' . $match . '\}/', format_date($end_date, 'custom', $match), $date_str); + } + } + $elements[$delta] = ['#markup' => '' . $date_str . '',]; + + } + else { + $elements[$delta] = ['#markup' => date($this->getSetting('one_day'), $start_date)]; + } + } + } + return $elements; + } + + /** + * {@inheritdoc} + */ + public function settingsForm(array $form, FormStateInterface $form_state) { + $form = parent::settingsForm($form, $form_state); + unset($form['date_format']); + $form['single'] = [ + '#type' => 'textfield', + '#title' => t('Date format for single date'), + '#default_value' => $this->getSetting('single') ? : 'd F Y', + ]; + $form['single_all_day'] = [ + '#type' => 'textfield', + '#title' => t('Date format for the single date if the date is "all day"'), + '#default_value' => $this->getSetting('single_all_day') ? : 'd F Y', + ]; + $form['one_day'] = [ + '#type' => 'textfield', + '#title' => t('Date format for the single day date range'), + '#default_value' => $this->getSetting('one_day') ? : 'd F Y', + ]; + $form['one_month'] = [ + '#type' => 'textfield', + '#title' => t('Date format for the single month date range'), + '#default_value' => $this->getSetting('one_month') ? : 'd - {d} F Y', + ]; + $form['several_months'] = [ + '#type' => 'textfield', + '#title' => t('Date format for the single year date range'), + '#default_value' => $this->getSetting('several_months') ? : 'd F - {d} {F} Y', + ]; + $form['several_years'] = [ + '#type' => 'textfield', + '#title' => t('Date format for multiple years date range'), + '#default_value' => $this->getSetting('several_years') ? : 'd F Y - {d} {F} {Y}', + ]; + $form['help'] = [ + '#type' => 'markup', + '#markup' => t('A user-defined date format. See the PHP manual for available options.', ['@url' => 'http://php.net/manual/function.date.php']) . + '
' . t('Use letters in braces for end date elements, for example, {d} means the day of the end date.') . + '
' . t('These format values are translated, for example, t("d F Y") instead of "d F Y" will be used as the actual date format.'), + ]; + + return $form; + } + + /** + * {@inheritdoc} + */ + public function settingsSummary() { + $summary = parent::settingsSummary(); + $summary[] = $this->t('Display date range using formats: @single, @single_all_day, @one_day, @one_month, @several_months, @several_years', + array( + '@single' => $this->getSetting('single') ? : 'd F Y', + '@single_all_day' => $this->getSetting('single_all_day') ? : 'd F Y', + '@one_day' => $this->getSetting('one_day') ? : 'd F Y', + '@one_month' => $this->getSetting('one_month') ? : 'd - {d} F Y', + '@several_months' => $this->getSetting('several_months') ? : 'd F - {d} {F} Y', + '@several_years' => $this->getSetting('several_years') ? : 'd F Y - {d} {F} {Y}', + ) + ); + + return $summary; + } + +} diff --git a/sites/all/modules/figli/edlp_ajax/src/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatterAjax.php b/sites/all/modules/figli/edlp_ajax/src/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatterAjax.php new file mode 100644 index 000000000..adbf990d1 --- /dev/null +++ b/sites/all/modules/figli/edlp_ajax/src/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatterAjax.php @@ -0,0 +1,125 @@ +getSetting('link'); + + foreach ($this->getEntitiesToView($items, $langcode) as $delta => $entity) { + $label = $entity->label(); + // If the link is to be displayed and the entity has a uri, display a + // link. + if ($output_as_link && !$entity->isNew()) { + try { + $uri = $entity->urlInfo(); + $options = $uri->getOptions(); + $options += array( + 'attributes' => array( + 'class' => ['ajax-link'], + 'nid'=>$entity->id(), + 'data-drupal-link-system-path' => $uri->getInternalPath() + ) + ); + $uri->setOptions($options); + } + catch (UndefinedLinkTemplateException $e) { + // This exception is thrown by \Drupal\Core\Entity\Entity::urlInfo() + // and it means that the entity type doesn't have a link template nor + // a valid "uri_callback", so don't bother trying to output a link for + // the rest of the referenced entities. + $output_as_link = FALSE; + } + } + + if ($output_as_link && isset($uri) && !$entity->isNew()) { + $elements[$delta] = [ + '#type' => 'link', + '#title' => $label, + '#url' => $uri, + '#options' => $uri->getOptions(), + ]; + + if (!empty($items[$delta]->_attributes)) { + $elements[$delta]['#options'] += ['attributes' => []]; + $elements[$delta]['#options']['attributes'] += $items[$delta]->_attributes; + // Unset field item attributes since they have been included in the + // formatter output and shouldn't be rendered in the field template. + unset($items[$delta]->_attributes); + } + } + else { + $elements[$delta] = ['#plain_text' => $label]; + } + $elements[$delta]['#cache']['tags'] = $entity->getCacheTags(); + } + + return $elements; + } + + /** + * Generate the output appropriate for one field item. + * + * @param \Drupal\Core\Field\FieldItemInterface $item + * One field item. + * + * @return string + * The textual output generated. + */ + protected function viewValue(FieldItemInterface $item) { + // The text value has no text format assigned to it, so the user input + // should equal the output, including newlines. + return nl2br(Html::escape($item->value)); + } + +} diff --git a/sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js b/sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js index b88b42a9a..3c164a5c4 100644 --- a/sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js +++ b/sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js @@ -572,6 +572,7 @@ .add('a', '#block-footer.menu--footer') .add('a', '#block-productions') .add('a', 'article.node:not(.node--type-enregistrement) h2.node-title') + // .add('a', 'article.node--type-evenement.node--view-mode-teaser .field--name-field-page-liee') .add('a', '.productions-subtree') .add('a', '.productions-parent') // .add('a.index-link, a.notice-link', '#block-edlpentreesblock') diff --git a/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css b/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css index 054483009..c766ef166 100644 --- a/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css +++ b/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css @@ -1283,22 +1283,28 @@ main[role="main"] .agenda { font-weight: normal; line-height: 1.4; } -main[role="main"] article.node--type-evenement.node--view-mode-teaser .field--name-field-page-liee { +main[role="main"] article.node--type-evenement .field--name-field-page-liee { font-size: 0.82em; font-weight: 600; line-height: 1.6; text-transform: none; } -main[role="main"] article.node--type-evenement.node--view-mode-teaser .field--name-field-date { +main[role="main"] article.node--type-evenement .field--name-field-date { font-size: 0.82em; font-weight: normal; line-height: 1.4; } -main[role="main"] article.node--type-evenement.node--view-mode-teaser .field--name-title { +main[role="main"] article.node--type-evenement .field--name-title { font-size: 0.82em; font-weight: normal; line-height: 1.4; } +main[role="main"] article.node--type-evenement.node--view-mode-aside .field--name-field-date { + font-size: 0.82em; + font-weight: 600; + line-height: 1.6; + text-transform: none; } + main[role="main"] div.taxonomy-term > h2 { font-size: 0.82em; font-weight: 600; diff --git a/sites/all/themes/custom/edlptheme/assets/scripts/main.js b/sites/all/themes/custom/edlptheme/assets/scripts/main.js index b88b42a9a..3c164a5c4 100644 --- a/sites/all/themes/custom/edlptheme/assets/scripts/main.js +++ b/sites/all/themes/custom/edlptheme/assets/scripts/main.js @@ -572,6 +572,7 @@ .add('a', '#block-footer.menu--footer') .add('a', '#block-productions') .add('a', 'article.node:not(.node--type-enregistrement) h2.node-title') + // .add('a', 'article.node--type-evenement.node--view-mode-teaser .field--name-field-page-liee') .add('a', '.productions-subtree') .add('a', '.productions-parent') // .add('a.index-link, a.notice-link', '#block-edlpentreesblock') diff --git a/sites/all/themes/custom/edlptheme/assets/styles/app.scss b/sites/all/themes/custom/edlptheme/assets/styles/app.scss index 37f14c0e4..b1e4ddd8e 100644 --- a/sites/all/themes/custom/edlptheme/assets/styles/app.scss +++ b/sites/all/themes/custom/edlptheme/assets/styles/app.scss @@ -350,7 +350,7 @@ main[role="main"]{ } } - article.node--type-evenement.node--view-mode-teaser{ + article.node--type-evenement{ .field--name-field-page-liee{ @include content_subtitles; } @@ -362,6 +362,11 @@ main[role="main"]{ } // .field--name-body{} } + article.node--type-evenement.node--view-mode-aside{ + .field--name-field-date{ + @include content_subtitles; + } + } div.taxonomy-term{ >h2{ diff --git a/sites/all/themes/custom/edlptheme/templates/content/node--evenement--aside.html.twig b/sites/all/themes/custom/edlptheme/templates/content/node--evenement--aside.html.twig new file mode 100644 index 000000000..4e7f084f1 --- /dev/null +++ b/sites/all/themes/custom/edlptheme/templates/content/node--evenement--aside.html.twig @@ -0,0 +1,92 @@ +{# +/** + * @file + * Theme override to display a node. + * + * Available variables: + * - node: The node entity with limited access to object properties and methods. + * Only method names starting with "get", "has", or "is" and a few common + * methods such as "id", "label", and "bundle" are available. For example: + * - node.getCreatedTime() will return the node creation timestamp. + * - node.hasField('field_example') returns TRUE if the node bundle includes + * field_example. (This does not indicate the presence of a value in this + * field.) + * - node.isPublished() will return whether the node is published or not. + * Calling other methods, such as node.delete(), will result in an exception. + * See \Drupal\node\Entity\Node for a full list of public properties and + * methods for the node object. + * - label: The title of the node. + * - content: All node items. Use {{ content }} to print them all, + * or print a subset such as {{ content.field_example }}. Use + * {{ content|without('field_example') }} to temporarily suppress the printing + * of a given child element. + * - author_picture: The node author user entity, rendered using the "compact" + * view mode. + * - metadata: Metadata for this node. + * - date: Themed creation date field. + * - author_name: Themed author name field. + * - url: Direct URL of the current node. + * - display_submitted: Whether submission information should be displayed. + * - attributes: HTML attributes for the containing element. + * The attributes.class element may contain one or more of the following + * classes: + * - node: The current template type (also known as a "theming hook"). + * - node--type-[type]: The current node type. For example, if the node is an + * "Article" it would result in "node--type-article". Note that the machine + * name will often be in a short form of the human readable label. + * - node--view-mode-[view_mode]: The View Mode of the node; for example, a + * teaser would result in: "node--view-mode-teaser", and + * full: "node--view-mode-full". + * The following are controlled through the node publishing options. + * - node--promoted: Appears on nodes promoted to the front page. + * - node--sticky: Appears on nodes ordered above other non-sticky nodes in + * teaser listings. + * - node--unpublished: Appears on unpublished nodes visible only to site + * admins. + * - title_attributes: Same as attributes, except applied to the main title + * tag that appears in the template. + * - content_attributes: Same as attributes, except applied to the main + * content tag that appears in the template. + * - author_attributes: Same as attributes, except applied to the author of + * the node tag that appears in the template. + * - title_prefix: Additional output populated by modules, intended to be + * displayed in front of the main title tag that appears in the template. + * - title_suffix: Additional output populated by modules, intended to be + * displayed after the main title tag that appears in the template. + * - view_mode: View mode; for example, "teaser" or "full". + * - teaser: Flag for the teaser state. Will be true if view_mode is 'teaser'. + * - page: Flag for the full page state. Will be true if view_mode is 'full'. + * - readmore: Flag for more state. Will be true if the teaser content of the + * node cannot hold the main body content. + * - logged_in: Flag for authenticated user status. Will be true when the + * current user is a logged-in member. + * - is_admin: Flag for admin user status. Will be true when the current user + * is an administrator. + * + * @see template_preprocess_node() + * + * @todo Remove the id attribute (or make it a class), because if that gets + * rendered twice on a page this is invalid CSS for example: two lists + * in different view modes. + */ +#} +{% + set classes = [ + 'node', + 'node--type-' ~ node.bundle|clean_class, + node.isPromoted() ? 'node--promoted', + node.isSticky() ? 'node--sticky', + not node.isPublished() ? 'node--unpublished', + view_mode ? 'node--view-mode-' ~ view_mode|clean_class, + ] +%} +{{ attach_library('classy/node') }} + + + {{ content.field_date }} + + {{ label }} + + {{ content|without('field_page_liee')|without('field_date') }} + + diff --git a/sites/default/config/sync/core.entity_form_display.node.page.default.yml b/sites/default/config/sync/core.entity_form_display.node.page.default.yml index c4b244919..a39fdbc70 100644 --- a/sites/default/config/sync/core.entity_form_display.node.page.default.yml +++ b/sites/default/config/sync/core.entity_form_display.node.page.default.yml @@ -151,7 +151,7 @@ content: autocomplete: '1' search_all_fields: '1' source_attach: - path: file_attach + path: '' absolute: 0 attach_mode: move type: file_generic @@ -199,6 +199,11 @@ content: size: 60 placeholder: '' third_party_settings: { } + url_redirects: + weight: 50 + region: content + settings: { } + third_party_settings: { } hidden: created: true path: true diff --git a/sites/default/config/sync/core.entity_view_display.node.evenement.aside.yml b/sites/default/config/sync/core.entity_view_display.node.evenement.aside.yml index b514fb1e3..c698b235a 100644 --- a/sites/default/config/sync/core.entity_view_display.node.evenement.aside.yml +++ b/sites/default/config/sync/core.entity_view_display.node.evenement.aside.yml @@ -10,7 +10,7 @@ dependencies: - field.field.node.evenement.field_workflow_generic - node.type.evenement module: - - datetime_range + - date_range_formatter - text - user id: node.evenement.aside @@ -30,10 +30,16 @@ content: label: hidden settings: timezone_override: '' - date_format: 'l j F Y G\hi' + single: 'l d F Y' + single_all_day: 'l d F Y' + one_day: 'l d F Y' + one_month: '\D\u l d \a\u {l} {d} F Y' + several_months: '\D\u l d F \a\u {l} {d} {F} Y' + several_years: '\D\u l d F Y \a\u {l} {d} {F} {Y}' separator: '-' + date_format: 'Y-m-d\TH:i:s' third_party_settings: { } - type: daterange_custom + type: date_range_without_time region: content hidden: field_page_liee: true diff --git a/sites/default/config/sync/core.entity_view_display.node.evenement.default.yml b/sites/default/config/sync/core.entity_view_display.node.evenement.default.yml index 9edd36865..d0c9a918b 100644 --- a/sites/default/config/sync/core.entity_view_display.node.evenement.default.yml +++ b/sites/default/config/sync/core.entity_view_display.node.evenement.default.yml @@ -9,7 +9,8 @@ dependencies: - field.field.node.evenement.field_workflow_generic - node.type.evenement module: - - datetime_range + - date_range_formatter + - edlp_ajax - text - user id: node.evenement.default @@ -29,10 +30,16 @@ content: label: hidden settings: timezone_override: '' - date_format: 'l j F Y G\hi' + single: 'l d F Y' + single_all_day: 'l d F Y' + one_day: 'l d F Y' + one_month: '\D\u l d F \a\u {l} {d} {F} Y' + several_months: '\D\u l d F \a\u {l} {d} {F} Y' + several_years: '\D\u l d F Y \a\u {l} {d} {F} {Y}' separator: '-' + date_format: 'Y-m-d\TH:i:s' third_party_settings: { } - type: daterange_custom + type: date_range_without_time region: content field_page_liee: weight: 0 @@ -40,7 +47,7 @@ content: settings: link: true third_party_settings: { } - type: entity_reference_label + type: entity_reference_label_formatter_ajax region: content links: weight: 3 diff --git a/sites/default/config/sync/core.entity_view_display.node.evenement.teaser.yml b/sites/default/config/sync/core.entity_view_display.node.evenement.teaser.yml index 4298b4486..474bcd19c 100644 --- a/sites/default/config/sync/core.entity_view_display.node.evenement.teaser.yml +++ b/sites/default/config/sync/core.entity_view_display.node.evenement.teaser.yml @@ -10,7 +10,8 @@ dependencies: - field.field.node.evenement.field_workflow_generic - node.type.evenement module: - - datetime_range + - date_range_formatter + - edlp_ajax - text - user id: node.evenement.teaser @@ -26,17 +27,23 @@ content: third_party_settings: { } region: content field_date: - type: daterange_custom + type: date_range_without_time weight: 1 region: content label: hidden settings: timezone_override: '' - date_format: 'l j F Y' + single: 'l d F Y' + single_all_day: 'l d F Y' + one_day: 'l d F Y' + one_month: '\D\u l d \a\u {l} {d} F Y' + several_months: '\D\u l d F \a\u {l} {d} {F} Y' + several_years: '\D\u l d F Y \a\u {l} {d} {F} {Y}' separator: '-' + date_format: 'Y-m-d\TH:i:s' third_party_settings: { } field_page_liee: - type: entity_reference_label + type: entity_reference_label_formatter_ajax weight: 0 region: content label: hidden diff --git a/sites/default/config/sync/core.extension.yml b/sites/default/config/sync/core.extension.yml index 41e1c732e..8f8bb99a7 100644 --- a/sites/default/config/sync/core.extension.yml +++ b/sites/default/config/sync/core.extension.yml @@ -19,6 +19,7 @@ module: context_ui: 0 contextual: 0 ctools: 0 + date_range_formatter: 0 datetime: 0 datetime_range: 0 dblog: 0 diff --git a/sites/default/config/sync/views.view.content.yml b/sites/default/config/sync/views.view.content.yml index d7e744e06..2575db2e8 100644 --- a/sites/default/config/sync/views.view.content.yml +++ b/sites/default/config/sync/views.view.content.yml @@ -990,7 +990,7 @@ display: path: admin/content/production menu: type: tab - title: Content + title: Productions description: '' expanded: false parent: 'menu_link_content:8b5fed48-c008-4041-9bda-06f997582175' diff --git a/sites/default/config/sync/views.view.files.yml b/sites/default/config/sync/views.view.files.yml index b31fac927..3324002f7 100644 --- a/sites/default/config/sync/views.view.files.yml +++ b/sites/default/config/sync/views.view.files.yml @@ -670,7 +670,7 @@ display: relationship: none group_type: group admin_label: '' - operator: word + operator: contains value: '' group: 1 exposed: true @@ -687,7 +687,11 @@ display: remember_roles: authenticated: authenticated anonymous: '0' - administrator: '0' + collectionneur: '0' + admin: '0' + root: '0' + invite: '0' + user: '0' placeholder: '' is_grouped: false group_info: