Переглянути джерело

Merge branch 'master' of https://figureslibres.io/gogs/bachir/drupal-reha

ouidade 1 рік тому
батько
коміт
a0ffdcdf13

+ 1 - 1
.gitignore

@@ -12,7 +12,7 @@
 /web/sites/*/settings.local.php
 /web/sites/*/services*.yml
 /web/sites/*/salt.txt
-/web/sites/development.services.yml
+/web/sites/*/development.services.yml
 
 # Ignore Drupal's file directory
 /web/sites/*/files/

+ 2 - 1
config/sync/block.block.reha_config_pages.yml

@@ -3,6 +3,7 @@ langcode: fr
 status: true
 dependencies:
   module:
+    - block_class
     - config_pages
   theme:
     - reha
@@ -14,7 +15,7 @@ provider: null
 plugin: config_pages_block
 settings:
   id: config_pages_block
-  label: Contact
+  label: Contacts
   label_display: visible
   provider: config_pages
   config_page_type: contact

+ 38 - 38
config/sync/block.block.reha_socialmedialinks.yml

@@ -19,138 +19,138 @@ settings:
   label_display: '0'
   provider: social_media_links
   platforms:
+    linkedin:
+      value: company/plan-urbanisme-construction-architecture-puca
+      description: ''
+      weight: '-43'
     twitter:
-      value: reha
+      value: puca_gouv
       description: ''
-      weight: '-47'
+      weight: '-42'
     youtube:
-      value: reha
+      value: channel/UCOC9-aGNPangqvUXMraAkxw
       description: ''
-      weight: '-46'
+      weight: '-41'
     instagram:
       value: ''
       description: ''
-      weight: '-43'
+      weight: '-40'
     xing:
       value: ''
       description: ''
-      weight: '-42'
+      weight: '-39'
     contact:
       value: ''
       description: ''
-      weight: '-41'
+      weight: '-38'
     rss:
       value: ''
       description: ''
-      weight: '-40'
+      weight: '-37'
     tiktok:
       value: ''
       description: ''
-      weight: '-39'
+      weight: '-36'
     mastodon:
       value: ''
       description: ''
-      weight: '-38'
+      weight: '-35'
     amazon:
       value: ''
       description: ''
-      weight: '-37'
+      weight: '-34'
     bitbucket:
       value: ''
       description: ''
-      weight: '-36'
+      weight: '-33'
     patreon:
       value: ''
       description: ''
-      weight: '-35'
+      weight: '-32'
     vkontakte:
       value: ''
       description: ''
-      weight: '-34'
+      weight: '-31'
     slideshare:
       value: ''
       description: ''
-      weight: '-33'
+      weight: '-30'
     github:
       value: ''
       description: ''
-      weight: '-32'
+      weight: '-29'
     behance:
       value: ''
       description: ''
-      weight: '-31'
+      weight: '-28'
     vimeo:
       value: ''
       description: ''
-      weight: '-30'
+      weight: '-27'
     telegram:
       value: ''
       description: ''
-      weight: '-29'
+      weight: '-26'
     youtube_channel:
       value: ''
       description: ''
-      weight: '-28'
+      weight: '-25'
     googleplus:
       value: ''
       description: ''
-      weight: '-27'
+      weight: '-24'
     facebook:
       value: ''
       description: ''
-      weight: '-26'
+      weight: '-23'
     drupal:
       value: ''
       description: ''
-      weight: '-25'
+      weight: '-22'
     flickr:
       value: ''
       description: ''
-      weight: '-24'
+      weight: '-21'
     gitlab:
       value: ''
       description: ''
-      weight: '-23'
+      weight: '-20'
     tumblr:
       value: ''
       description: ''
-      weight: '-22'
+      weight: '-19'
     pinterest:
       value: ''
       description: ''
-      weight: '-21'
+      weight: '-18'
     email:
       value: ''
       description: ''
-      weight: '-20'
+      weight: '-17'
     goodreads:
       value: ''
       description: ''
-      weight: '-19'
+      weight: '-16'
     googleplay:
       value: ''
       description: ''
-      weight: '-18'
+      weight: '-15'
     whatsapp:
       value: ''
       description: ''
-      weight: '-17'
+      weight: '-14'
     meetup:
       value: ''
       description: ''
-      weight: '-16'
+      weight: '-13'
     website:
       value: ''
       description: ''
-      weight: '-10'
+      weight: '-12'
     glassdoor:
       value: ''
       description: ''
-      weight: '-9'
-    linkedin:
-      value: reha
-      description: ''
-      weight: '7'
+      weight: '-11'
   appearance:
     orientation: h
     show_name: 0

+ 2 - 2
config/sync/content_as_config.block_content.yml

@@ -8,7 +8,7 @@
   fields:
     field_lien:
       -
-        uri: 'http://reha.figli.io'
+        uri: 'internal:/'
         title: ''
         options: {  }
     field_logo:
@@ -126,7 +126,7 @@ bc48e271-75cf-4c3f-a4aa-ecc3c573c060:
         format: wysiwyg
     field_node_link:
       -
-        uri: 'internal:/user/register?destination=/node/add/operation'
+        uri: 'internal:/user/register?destination=/node/add/operation?destination=/mes_operations'
         title: 'Proposer un site'
         options: {  }
 e05f593a-38ab-4dba-ad1c-9ae23c1222a9:

+ 1 - 1
config/sync/content_as_config.menu_link_content.yml

@@ -1,7 +1,7 @@
 6af09942-a538-4c95-beb4-05ef50e8179a:
   uuid: 6af09942-a538-4c95-beb4-05ef50e8179a
   menu_name: footer
-  title: Contact
+  title: Contacts
   parent: ''
   link:
     -

+ 1 - 0
config/sync/core.extension.yml

@@ -97,6 +97,7 @@ module:
   persistent_login: 0
   phone_number: 0
   redis: 0
+  reha_mod: 0
   responsive_image: 0
   rules: 0
   search_api: 0

+ 1 - 1
config/sync/notify.settings.yml

@@ -6,7 +6,7 @@ notify_send_hour: '9'
 notify_attempts: '5'
 notify_include_updates: '1'
 notify_unpublished: '1'
-notify_watchdog: '3'
+notify_watchdog: '0'
 notify_weightur: '20'
 notify_reg_default: '0'
 notify_def_node: '0'

+ 2 - 1
config/sync/views.view.operations.yml

@@ -382,7 +382,7 @@ display:
           plugin_id: text
           empty: true
           content:
-            value: '<a href="/node/add/operation">Proposer un autre site</a>'
+            value: '<a href="/node/add/operation?destination=/mes_operations">Proposer un autre site</a>'
             format: wysiwyg
           tokenize: false
       display_extenders: {  }
@@ -397,6 +397,7 @@ display:
         - 'user.node_grants:view'
         - user.roles
       tags:
+        - 'config:core.entity_view_display.node.operation.compact'
         - 'config:core.entity_view_display.node.operation.default'
         - 'config:core.entity_view_display.node.operation.teaser'
         - 'config:core.entity_view_display.node.static.content_no_title'

+ 5 - 0
web/modules/reha_mod/reha_mod.info.yml

@@ -0,0 +1,5 @@
+name: reha_mod
+type: module
+description: Provides additional functionality for the site.
+package: Custom
+core_version_requirement: ^9 || ^10

+ 26 - 0
web/modules/reha_mod/reha_mod.module

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @file
+ * Primary module hooks for reha module.
+ */
+
+
+function reha_mod_form_user_register_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+  $form['actions']['submit']['#value'] = "valider";
+}
+
+function reha_mod_form_user_login_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+  $form['persistent_login']['#title'] = "rester connecté";
+}
+
+function reha_mod_form_node_operation_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+  $route = \Drupal::routeMatch();
+  $params = $route->getParameters();
+  /** @var Drupal\node\Entity\NodeType **/
+  $node_type = $route->getParameter('node_type');
+  $type = $node_type->id();
+  if($type === 'operation'){
+    $form['field_adresse']['widget'][0]['#type'] = 'container';
+  }
+}