Browse Source

Merge branch 'master' of gogs-figureslibres.io:bachir/popsu-d9

bach 3 years ago
parent
commit
eee287afd8

+ 1 - 1
.gitignore

@@ -6,7 +6,7 @@
 /web/themes/contrib/
 /web/profiles/contrib/
 /web/libraries/
-
+composer.lock
 # Ignore sensitive information
 /web/sites/*/settings.php
 /web/sites/*/settings.local.php

+ 64 - 65
composer.lock

@@ -2628,17 +2628,17 @@
         },
         {
             "name": "drupal/autocomplete_deluxe",
-            "version": "2.0.0-rc1",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/autocomplete_deluxe.git",
-                "reference": "2.0.0-rc1"
+                "reference": "2.0.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/autocomplete_deluxe-2.0.0-rc1.zip",
-                "reference": "2.0.0-rc1",
-                "shasum": "9f3c63862652862322184bb892cc1fa80c9f47c1"
+                "url": "https://ftp.drupal.org/files/projects/autocomplete_deluxe-2.0.0.zip",
+                "reference": "2.0.0",
+                "shasum": "b3b8a3b89692e6f9c6a4847b6900d5fd6cef2264"
             },
             "require": {
                 "drupal/core": "^8 || ^9"
@@ -2646,11 +2646,11 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.0-rc1",
-                    "datestamp": "1592389562",
+                    "version": "2.0.0",
+                    "datestamp": "1622966404",
                     "security-coverage": {
-                        "status": "not-covered",
-                        "message": "RC releases are not covered by Drupal security advisories."
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
                     }
                 }
             },
@@ -2669,10 +2669,6 @@
                     "homepage": "https://www.drupal.org/mediacurrent",
                     "role": "Supporting organization"
                 },
-                {
-                    "name": "RajabNatshah",
-                    "homepage": "https://www.drupal.org/user/1414312"
-                },
                 {
                     "name": "edwardchiapet",
                     "homepage": "https://www.drupal.org/user/2354784"
@@ -3632,17 +3628,17 @@
         },
         {
             "name": "drupal/context",
-            "version": "4.0.0-beta5",
+            "version": "4.0.0-beta6",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/context.git",
-                "reference": "8.x-4.0-beta5"
+                "reference": "8.x-4.0-beta6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/context-8.x-4.0-beta5.zip",
-                "reference": "8.x-4.0-beta5",
-                "shasum": "893d7e6ce07b23764baa6fd609da811ec80c5a04"
+                "url": "https://ftp.drupal.org/files/projects/context-8.x-4.0-beta6.zip",
+                "reference": "8.x-4.0-beta6",
+                "shasum": "c377c12d8c23e8f39151f2da1d85d58b294033df"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9"
@@ -3650,8 +3646,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-4.0-beta5",
-                    "datestamp": "1600783508",
+                    "version": "8.x-4.0-beta6",
+                    "datestamp": "1619440410",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Beta releases are not covered by Drupal security advisories."
@@ -5216,7 +5212,7 @@
             "extra": {
                 "drupal": {
                     "version": "8.x-1.6",
-                    "datestamp": "1614961993",
+                    "datestamp": "1615218226",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -5375,7 +5371,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/filefield_sources.git",
-                "reference": "bbcd869d2d3430235ec88b06b4dacaae1a9256d5"
+                "reference": "12a9918a4e2e31ff10c127766610bfbac13d6487"
             },
             "require": {
                 "drupal/core": "^8 || ^9"
@@ -5389,8 +5385,8 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.0-alpha4+2-dev",
-                    "datestamp": "1610733921",
+                    "version": "8.x-1.0-alpha4+4-dev",
+                    "datestamp": "1620787542",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Dev releases are not covered by Drupal security advisories."
@@ -5750,29 +5746,29 @@
         },
         {
             "name": "drupal/imagemagick",
-            "version": "3.1.0",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/imagemagick.git",
-                "reference": "8.x-3.1"
+                "reference": "8.x-3.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/imagemagick-8.x-3.1.zip",
-                "reference": "8.x-3.1",
-                "shasum": "f427b06312325aa667c549fed261f73f29e231e7"
+                "url": "https://ftp.drupal.org/files/projects/imagemagick-8.x-3.2.zip",
+                "reference": "8.x-3.2",
+                "shasum": "35346cda3bb9c989387a282dd7f7bb4da4f70fce"
             },
             "require": {
-                "drupal/core": "^8.8 || ^9",
+                "drupal/core": "^8.9 || ^9.1",
                 "drupal/file_mdm": "^2",
                 "drupal/sophron": "^1",
-                "php": ">=7"
+                "php": ">=7.1"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-3.1",
-                    "datestamp": "1581420882",
+                    "version": "8.x-3.2",
+                    "datestamp": "1622711751",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -6768,7 +6764,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/login_destination.git",
-                "reference": "0a2c46abd451b4c83e2f5a50cb791e68b141a8ab"
+                "reference": "bb4d8e7b31589d53fb0e6aeaa86dd35870479c63"
             },
             "require": {
                 "drupal/core": "^8.7.10 || ^9"
@@ -6797,12 +6793,14 @@
             ],
             "authors": [
                 {
-                    "name": "3CWebDev",
-                    "homepage": "https://www.drupal.org/user/61221"
+                    "name": "rsvelko",
+                    "homepage": "https://www.drupal.org/u/rsvelko",
+                    "role": "Creator, Maintainer"
                 },
                 {
-                    "name": "Oliver Huynh",
-                    "homepage": "https://www.drupal.org/user/243730"
+                    "name": "Other Contributors",
+                    "homepage": "https://www.drupal.org/node/69051/committers",
+                    "role": "Contributors"
                 },
                 {
                     "name": "beautifulmind",
@@ -6837,10 +6835,11 @@
                     "homepage": "https://www.drupal.org/user/337401"
                 }
             ],
-            "description": "The Login Destination module add possibility customize the destination that the user is redirected to after login.",
-            "homepage": "https://www.drupal.org/project/login_destination",
+            "description": "Customizes the destination the user is redirected to after login/logout/registration/one-time login.",
+            "homepage": "https://drupal.org/project/login_destination",
             "support": {
-                "source": "https://git.drupalcode.org/project/login_destination"
+                "source": "https://git.drupalcode.org/project/login_destination",
+                "issues": "https://drupal.org/project/issues/login_destination"
             }
         },
         {
@@ -7194,8 +7193,8 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.6+8-dev",
-                    "datestamp": "1609550251",
+                    "version": "8.x-1.6+9-dev",
+                    "datestamp": "1612055345",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Dev releases are not covered by Drupal security advisories."
@@ -7542,20 +7541,20 @@
         },
         {
             "name": "drupal/pagerer",
-            "version": "2.0.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/pagerer.git",
-                "reference": "8.x-2.0"
+                "reference": "8.x-2.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/pagerer-8.x-2.0.zip",
-                "reference": "8.x-2.0",
-                "shasum": "de54dee5aa1336c1d6e6c5aeccfbd602d5898c7f"
+                "url": "https://ftp.drupal.org/files/projects/pagerer-8.x-2.1.zip",
+                "reference": "8.x-2.1",
+                "shasum": "a08539fde32372b66771afbaeba4105de19ddb14"
             },
             "require": {
-                "drupal/core": "^8.8 || ^9",
+                "drupal/core": "^8.9 || ^9.1",
                 "drupal/jquery_ui_button": "*",
                 "drupal/jquery_ui_slider": "*",
                 "php": ">=7.1"
@@ -7563,8 +7562,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-2.0",
-                    "datestamp": "1589289359",
+                    "version": "8.x-2.1",
+                    "datestamp": "1621878520",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -9230,17 +9229,17 @@
         },
         {
             "name": "drupal/views_bulk_operations",
-            "version": "3.12.0",
+            "version": "3.13.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/views_bulk_operations.git",
-                "reference": "8.x-3.12"
+                "reference": "8.x-3.13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.12.zip",
-                "reference": "8.x-3.12",
-                "shasum": "88a545c54680362162bfbfdb0639ce923a1a60a9"
+                "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.13.zip",
+                "reference": "8.x-3.13",
+                "shasum": "70583d08b91be3b5e008f571589425c2176eb73b"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9"
@@ -9254,8 +9253,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-3.12",
-                    "datestamp": "1616148482",
+                    "version": "8.x-3.13",
+                    "datestamp": "1619697066",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -9370,16 +9369,16 @@
         },
         {
             "name": "drush/drush",
-            "version": "10.4.2",
+            "version": "10.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drush-ops/drush.git",
-                "reference": "0d48a046f5511dd8fda10ac3376b97bb65a2b7ec"
+                "reference": "3fd9f7e62ffb7f221e4be8151a738529345d22d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drush-ops/drush/zipball/0d48a046f5511dd8fda10ac3376b97bb65a2b7ec",
-                "reference": "0d48a046f5511dd8fda10ac3376b97bb65a2b7ec",
+                "url": "https://api.github.com/repos/drush-ops/drush/zipball/3fd9f7e62ffb7f221e4be8151a738529345d22d5",
+                "reference": "3fd9f7e62ffb7f221e4be8151a738529345d22d5",
                 "shasum": ""
             },
             "require": {
@@ -9503,7 +9502,7 @@
                 "irc": "irc://irc.freenode.org/drush",
                 "issues": "https://github.com/drush-ops/drush/issues",
                 "slack": "https://drupal.slack.com/messages/C62H9CWQM",
-                "source": "https://github.com/drush-ops/drush/tree/10.4.2"
+                "source": "https://github.com/drush-ops/drush/tree/10.5.0"
             },
             "funding": [
                 {
@@ -9511,7 +9510,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-04-06T03:37:46+00:00"
+            "time": "2021-05-08T15:49:30+00:00"
         },
         {
             "name": "egulias/email-validator",
@@ -15340,5 +15339,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.1.0"
 }

File diff suppressed because it is too large
+ 0 - 0
web/themes/custom/popsu/js/main.js


+ 3 - 5
web/themes/custom/popsu/lib/script.js

@@ -2,9 +2,7 @@ import 'slick-carousel';
 
 $(document).ready(function(){
 	console.log("$ ready !!");
-	$('.last-news').slick();
-	$('.last-ressources').slick();
-	/*const swiper = new Swiper('.last-news', {
-		slideClass: 'views-row'
-	});*/
+	//$('.last-news').slick();
+	//$('.last-ressources').slick();
+	
 });

+ 52 - 0
web/themes/custom/popsu/popsu.theme

@@ -0,0 +1,52 @@
+<?php
+/*
+	* @files
+	* Theme Template Funtions
+*/
+
+use Drupal\Core\Template\Attribute;
+
+
+/* implements template_preprocess_views_view_unformatted() */
+
+function popsu_preprocess_views_view_unformatted(&$variables) {
+
+  $view = $variables['view'];
+  if($view->id() == "programmes"){
+    $rows = $variables['rows'];
+        foreach ($rows as $id => $row) {
+            
+            $variables['rows'][$id]['attributes'] = new Attribute();
+            $c = $variables['rows'][$id]['content']["#row"]->nid;
+            $variables['rows'][$id]['attributes']->addClass("popsu-node-".$c);
+            //kint($variables['rows'][$id]['content']["#row"]->nid);
+        }
+
+
+  }else{
+    if ($view->current_display == "block_1") {
+        $rows = $variables['rows'];
+        foreach ($rows as $id => $row) {
+            $variables['rows'][$id]['attributes'] = new Attribute();
+            $c = $variables['rows'][$id]['content']["#row"]->nid;
+            $variables['rows'][$id]['attributes']->addClass("popsu-node-".$c);
+        }
+    }
+
+  }
+
+  /*$rows = $variables['rows'];
+  $style = $view->style_plugin;
+  $options = $style->options;
+  $variables['default_row_class'] = !empty($options['default_row_class']);*/
+/*  foreach ($rows as $id => $row) {
+    $variables['rows'][$id] = array();
+    $variables['rows'][$id]['content'] = $row;
+    $variables['rows'][$id]['attributes'] = new Attribute();
+    if ($row_class = $view->style_plugin
+      ->getRowClass($id)) {
+      $variables['rows'][$id]['attributes']
+        ->addClass($row_class);
+    }
+  }*/
+};

+ 40 - 0
web/themes/custom/popsu/popsuNoteTheme

@@ -0,0 +1,40 @@
+/* implements template_preprocess_region() */ 
+
+/*function popsu_preprocess_region(&$variables){
+  kint($variables);
+  if (isset($variables['region']) && $variables['region'] == 'header_top_right') {
+      $variables['attributes']['class'][] = "poopooboy" ; 
+    }
+}*/
+
+/*function popsu_preprocess_views_view_unformatted(&$variables){
+  $variables['attributes']['class'][] = "test" ;
+  //kint($variables).die();
+
+}*/
+
+
+
+/**
+ * Add an alternative to file name suggestions the Custom Search form block.
+ *
+ * Implements hook__suggestions_HOOK_alter().
+ * @return array Suggestions.
+*/
+/*function popsu_theme_suggestions_views_view_unformatted_alter(array &$suggestions, array $variables) {
+  $suggestions[] = 'views_view__headerView';
+    /*if($variables['elements']['#id'] == 'customsearchform'){
+        $suggestions[] = 'block__custom_search_form';
+    }*/
+//}
+
+/*
+ * Implements hook__suggestions_HOOK_alter().
+ * @return array Suggestions.
+*/
+/*function popsu_theme_suggestions_block_alter(array &$suggestions, array $variables) {
+
+    if($variables['elements']['#id'] == 'customsearchform'){
+        $suggestions[] = 'block__custom_search_form';
+    }
+}*/

+ 0 - 13
web/themes/custom/popsu/templates/blocks/block--identitedusite.html.twig

@@ -1,13 +0,0 @@
-{% extends "block.html.twig" %}
-
-{% block content %}
-  {% if site_logo %}
-    <a href="{{ path('<front>') }}" rel="home">
-      <img src="{{ site_logo }}" alt="{{ 'Home'|t }}" />
-    </a>
-  {% endif %}
-  {% if site_name %}
-    <a href="{{ path('<front>') }}" rel="home">{{ site_name }}</a>
-  {% endif %}
-  {{ site_slogan }}
-{% endblock %}

+ 0 - 41
web/themes/custom/popsu/templates/blocks/block--views-block--home-blocks-block-1.html.twig

@@ -1,41 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a block.
- *
- * Available variables:
- * - plugin_id: The ID of the block implementation.
- * - label: The configured label of the block if visible.
- * - configuration: A list of the block's configuration values.
- *   - label: The configured label for the block.
- *   - label_display: The display settings for the label.
- *   - provider: The module or other provider that provided this block plugin.
- *   - Block plugin specific settings will also be stored here.
- * - content: The content of this block.
- * - attributes: array of HTML attributes populated by modules, intended to
- *   be added to the main container tag of this template.
- *   - id: A valid HTML ID and guaranteed unique.
- * - title_attributes: Same as attributes, except applied to the main title
- *   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.
- *
- * @see template_preprocess_block()
- *
- * @ingroup themeable
- */
-#}
-
-<div{{ attributes }}>
-    {{ title_prefix }}
-    {% if label %}
-      <h2{{ title_attributes }}>{{ label }}</h2>
-    {% endif %}
-    {{ title_suffix }}
-    {% block content %}
-      
-      {{ content }}
-    {% endblock %}
-</div>

+ 21 - 0
web/themes/custom/popsu/templates/regions/region--header-top-rigth.html.twig

@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Default theme implementation to display a region.
+ *
+ * Available variables:
+ * - content: The content for this region, typically blocks.
+ * - attributes: HTML attributes for the region <div>.
+ * - region: The name of the region variable as defined in the theme's
+ *   .info.yml file.
+ *
+ * @see template_preprocess_region()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if content %}
+  <div{{ attributes }}>
+    {{ content }}
+  </div>
+{% endif %}

Some files were not shown because too many files changed in this diff