Bachir Soussi Chiadmi 5 лет назад
Родитель
Сommit
093073f4f5

+ 1 - 0
composer.json

@@ -21,6 +21,7 @@
         "cweagans/composer-patches": "^1.6.5",
         "drupal-composer/drupal-scaffold": "^2.5",
         "drupal/amswap": "^2.0",
+        "drupal/auto_entitylabel": "2.x-dev",
         "drupal/commerce": "^2.12",
         "drupal/commerce_license": "^2.0@alpha",
         "drupal/commerce_migrate": "^2.0",

+ 61 - 1
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fdf4dd3a621ca2c7754d1fc8ee5ee311",
+    "content-hash": "97ccc9c274817c838b8df4338cdee191",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -2521,6 +2521,65 @@
                 "issues": "https://www.drupal.org/project/issues/audiofield"
             }
         },
+        {
+            "name": "drupal/auto_entitylabel",
+            "version": "dev-2.x",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/auto_entitylabel.git",
+                "reference": "101b69dc799113d1485f5fe89b9fee07f6308522"
+            },
+            "require": {
+                "drupal/core": "~8.0"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-2.1-beta1+15-dev",
+                    "datestamp": "1536175980",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Dev releases are not covered by Drupal security advisories."
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Pravin Ajaaz",
+                    "homepage": "https://www.drupal.org/user/2910049"
+                },
+                {
+                    "name": "RenatoG",
+                    "homepage": "https://www.drupal.org/user/3326031"
+                },
+                {
+                    "name": "bforchhammer",
+                    "homepage": "https://www.drupal.org/user/216396"
+                },
+                {
+                    "name": "diqidoq",
+                    "homepage": "https://www.drupal.org/user/1001934"
+                },
+                {
+                    "name": "purushotam.rai",
+                    "homepage": "https://www.drupal.org/user/3193859"
+                }
+            ],
+            "description": "Allows hiding of entity label fields and automatic label creation.",
+            "homepage": "https://www.drupal.org/project/auto_entitylabel",
+            "support": {
+                "source": "https://git.drupalcode.org/project/auto_entitylabel",
+                "issues": "https://www.drupal.org/project/issues/auto_entitylabel"
+            },
+            "time": "2018-09-05T19:29:54+00:00"
+        },
         {
             "name": "drupal/autocomplete_deluxe",
             "version": "1.0.0-beta1",
@@ -16175,6 +16234,7 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
+        "drupal/auto_entitylabel": 20,
         "drupal/commerce_license": 15,
         "drupal/commerce_pricelist": 20,
         "drupal/commerce_recurring": 20,

+ 7 - 0
config/sync/auto_entitylabel.settings.node.frontpage.yml

@@ -0,0 +1,7 @@
+status: 1
+pattern: "<?php\r\nreturn t('Home');\r\n\r\n?>"
+php: true
+escape: false
+dependencies:
+  config:
+    - node.type.frontpage

+ 8 - 1
config/sync/block.block.pagetitle.yml

@@ -2,6 +2,8 @@ uuid: e24f300b-ad2d-47ff-851c-875b1c353ce0
 langcode: en
 status: true
 dependencies:
+  module:
+    - system
   theme:
     - materiotheme
 id: pagetitle
@@ -15,4 +17,9 @@ settings:
   label: 'Page title'
   provider: core
   label_display: '0'
-visibility: {  }
+visibility:
+  request_path:
+    id: request_path
+    pages: '<front>'
+    negate: true
+    context_mapping: {  }

+ 11 - 1
config/sync/block.block.tabs.yml

@@ -2,6 +2,8 @@ uuid: 338dfb90-8c89-416b-9928-740e40ad9181
 langcode: en
 status: true
 dependencies:
+  module:
+    - user
   theme:
     - materiotheme
 id: tabs
@@ -17,4 +19,12 @@ settings:
   label_display: '0'
   primary: true
   secondary: true
-visibility: {  }
+visibility:
+  user_role:
+    id: user_role
+    roles:
+      admin: admin
+      root: root
+    negate: false
+    context_mapping:
+      user: '@user.current_user_context:current_user'

+ 9 - 0
config/sync/core.entity_form_display.node.frontpage.default.yml

@@ -5,6 +5,7 @@ dependencies:
   config:
     - field.field.node.frontpage.field_a_database
     - field.field.node.frontpage.field_blabla
+    - field.field.node.frontpage.field_pricing
     - field.field.node.frontpage.field_showrooms
     - field.field.node.frontpage.field_what_is_materio
     - node.type.frontpage
@@ -31,6 +32,14 @@ content:
     third_party_settings: {  }
     type: text_textarea
     region: content
+  field_pricing:
+    weight: 26
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+    type: text_textarea
+    region: content
   field_showrooms:
     weight: 3
     settings:

+ 17 - 1
config/sync/core.entity_view_display.node.frontpage.default.yml

@@ -5,6 +5,7 @@ dependencies:
   config:
     - field.field.node.frontpage.field_a_database
     - field.field.node.frontpage.field_blabla
+    - field.field.node.frontpage.field_pricing
     - field.field.node.frontpage.field_showrooms
     - field.field.node.frontpage.field_what_is_materio
     - node.type.frontpage
@@ -57,6 +58,13 @@ content:
     third_party_settings: {  }
     type: text_default
     region: content
+  field_pricing:
+    weight: 7
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: text_default
+    region: content
   field_showrooms:
     weight: 3
     label: above
@@ -66,11 +74,19 @@ content:
     region: content
   field_what_is_materio:
     weight: 0
-    label: hidden
+    label: above
     settings: {  }
     third_party_settings: {  }
     type: text_default
     region: content
+  title:
+    type: string
+    weight: 8
+    region: content
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
 hidden:
   langcode: true
   links: true

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

@@ -7,6 +7,7 @@ module:
   advancedqueue: 0
   amswap: 0
   audiofield: 0
+  auto_entitylabel: 0
   autocomplete_deluxe: 0
   autologout: 0
   ban: 0

+ 21 - 0
config/sync/field.field.node.frontpage.field_pricing.yml

@@ -0,0 +1,21 @@
+uuid: b64692db-2acf-4668-9ce8-72a0e23ce1eb
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_pricing
+    - node.type.frontpage
+  module:
+    - text
+id: node.frontpage.field_pricing
+field_name: field_pricing
+entity_type: node
+bundle: frontpage
+label: Pricing
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: text_long

+ 19 - 0
config/sync/field.storage.node.field_pricing.yml

@@ -0,0 +1,19 @@
+uuid: f337a804-49e5-4d6b-b1d4-d6fb32937841
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - text
+id: node.field_pricing
+field_name: field_pricing
+entity_type: node
+type: text_long
+settings: {  }
+module: text
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

+ 1 - 0
config/sync/language/fr/field.field.node.frontpage.field_a_database.yml

@@ -0,0 +1 @@
+label: 'Une base de données intuitive'

+ 1 - 0
config/sync/language/fr/field.field.node.frontpage.field_pricing.yml

@@ -0,0 +1 @@
+label: 'Les offres'

+ 1 - 1
config/sync/language/fr/field.field.node.frontpage.field_showrooms.yml

@@ -1 +1 @@
-description: 'Des Showrooms foisonnants'
+label: 'Des Showrooms foisonnants'

+ 1 - 1
config/sync/language/fr/field.field.node.frontpage.field_what_is_materio.yml

@@ -1 +1 @@
-description: 'materiO'' c''est quoi?'
+label: 'materiO'' c''est quoi?'

+ 14 - 0
web/modules/custom/materio_home/materio_home.module

@@ -101,6 +101,20 @@ function materio_home_entity_bundle_field_info(EntityTypeInterface $entity_type,
       return $fields;
   }
 }
+/**
+ * Implement hook_entity_base_field_info_alter().
+ *
+ * @param $fields
+ * @param EntityTypeInterface $entity_type
+ */
+
+function materio_home_entity_base_field_info_alter(&$fields, EntityTypeInterface $entity_type) {
+  if ($entity_type->id() == 'node') {
+    if (isset($fields['title'])) {
+      $fields['title']->setDisplayConfigurable('view', TRUE);
+    }
+  }
+}
 
 /**
  * Implement hook_cron().

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
web/themes/custom/materiotheme/assets/dist/main.js


+ 33 - 0
web/themes/custom/materiotheme/assets/styles/main.scss

@@ -126,3 +126,36 @@ header[role="banner"]{
   }
 
 }
+
+aside.messages{
+  padding: 0;
+}
+
+// front
+article.node--type-frontpage{
+  .node__content{
+    .field--name-field-what-is-materio,
+    .field--name-field-a-database,
+    .field--name-field-showrooms,
+    .field--name-field-blabla,
+    .field--name-field-pricing{
+      &:not(:nth-child(1)){
+        margin-top: 1em;
+      }
+      .field__label{
+        font-size: 2.2em;
+        font-weight: bold;
+      }
+    }
+
+    .field--name-computed-materials-reference,
+    .field--name-computed-showrooms-reference,
+    .field--name-computed-articles-reference{
+      .field__item{
+        display: inline-block;
+        vertical-align: top;
+        max-width:250px;
+      }
+    }
+  }
+}

Некоторые файлы не были показаны из-за большого количества измененных файлов