Merge pull request #597 from comicrelief/feature/PLAT-561_update_ds

PLAT-561 update ds
comicrelief · Nov 4, 2016 · ff1172e · ff1172e
2 parents 95c6c5c + 9e237ac
commit ff1172e
Show file tree

Hide file tree

Showing 185 changed files with 2,608 additions and 1,875 deletions.
diff --git a/profiles/cr/drupal-org.make.yml b/profiles/cr/drupal-org.make.yml
@@ -54,7 +54,7 @@ projects:
   inline_entity_form:
     version: 1.0-alpha6
   layout_plugin:
-    version: 1.0-alpha22
+    version: 1.0-alpha23
   page_manager:
     version: 1.0-alpha23
   panels:
@@ -64,7 +64,7 @@ projects:
   panelizer:
     version: 3.0-alpha2
   ds:
-    version: 2.4
+    version: 2.6
   field_group:
     version: 1.0-rc4
   entity_reference_revisions:

diff --git a/profiles/cr/modules/contrib/ds/composer.json b/profiles/cr/modules/contrib/ds/composer.json
@@ -25,8 +25,5 @@
     "issues": "https://www.drupal.org/project/issues/ds",
     "irc": "irc://irc.freenode.org/drupal-contribute",
     "source": "http://git.drupal.org/project/ds.git"
-  },
-  "require": {
-    "drupal/layout_plugin": "8.*"
   }
 }
diff --git a/profiles/cr/modules/contrib/ds/config/install/ds.settings.yml b/profiles/cr/modules/contrib/ds/config/install/ds.settings.yml
@@ -5,3 +5,4 @@ ft-show-colon: false
 classes:
   region: {  }
   field: {  }
+use_field_names: true
diff --git a/profiles/cr/modules/contrib/ds/config/schema/ds.entity_display.schema.yml b/profiles/cr/modules/contrib/ds/config/schema/ds.entity_display.schema.yml
@@ -18,6 +18,9 @@ core.entity_view_display.*.*.*.third_party.ds:
         disable_css:
           type: boolean
           label: 'Disable CSS or not'
+        entity_classes:
+          type: string
+          label: 'Entity, bundle and view mode classes'
         settings:
           type: mapping
           label: 'Display Suite layout settings'

diff --git a/profiles/cr/modules/contrib/ds/config/schema/ds.schema.yml b/profiles/cr/modules/contrib/ds/config/schema/ds.schema.yml
@@ -32,3 +32,6 @@ ds.settings:
           sequence:
             - type: string
               label: 'Field class'
+    use_field_names:
+      type: boolean
+      label: 'Use field names as field keys'
diff --git a/profiles/cr/modules/contrib/ds/css/ds-2col-fluid.css b/profiles/cr/modules/contrib/ds/css/ds-2col-fluid.css
@@ -9,7 +9,7 @@
 }
 
 [dir="rtl"] .ds-2col-fluid > .group-left {
-    float: right;
+  float: right;
 }
 
 .ds-2col-fluid > .group-right {
@@ -18,7 +18,7 @@
 }
 
 [dir="rtl"] .ds-2col-fluid > .group-right {
-    float: left;
+  float: left;
 }
 
 .ds-2col-fluid.group-one-column > .group-left,

diff --git a/profiles/cr/modules/contrib/ds/css/ds-2col-stacked-fluid.css b/profiles/cr/modules/contrib/ds/css/ds-2col-stacked-fluid.css
@@ -3,16 +3,13 @@
  * Styling for the ds-2col-stacked-fluid template.
  */
 
-.ds-2col-stacked-fluid > .group-header {
-}
-
 .ds-2col-stacked-fluid > .group-left {
   float: left; /* LTR */
   width: 50%;
 }
 
 [dir="rtl"] .ds-2col-stacked-fluid > .group-left {
-    float: right;
+  float: right;
 }
 
 .ds-2col-stacked-fluid > .group-right {
@@ -21,7 +18,7 @@
 }
 
 [dir="rtl"] .ds-2col-stacked-fluid > .group-right {
-    float: left;
+  float: left;
 }
 
 .ds-2col-stacked-fluid.group-one-column > .group-left,

diff --git a/profiles/cr/modules/contrib/ds/css/ds-2col-stacked.css b/profiles/cr/modules/contrib/ds/css/ds-2col-stacked.css
@@ -3,16 +3,13 @@
  * Styling for the ds-2col-stacked template.
  */
 
-.ds-2col-stacked > .group-header {
-}
-
 .ds-2col-stacked > .group-left {
   float: left; /* LTR */
   width: 50%;
 }
 
 [dir="rtl"] .ds-2col-stacked > .group-left {
-    float: right;
+  float: right;
 }
 
 .ds-2col-stacked > .group-right {
@@ -21,7 +18,7 @@
 }
 
 [dir="rtl"] .ds-2col-stacked > .group-right {
-    float: left;
+  float: left;
 }
 
 .ds-2col-stacked > .group-footer {

diff --git a/profiles/cr/modules/contrib/ds/css/ds-2col.css b/profiles/cr/modules/contrib/ds/css/ds-2col.css
@@ -9,7 +9,7 @@
 }
 
 [dir="rtl"] .ds-2col > .group-left {
-    float: right;
+  float: right;
 }
 
 .ds-2col > .group-right {
@@ -18,5 +18,5 @@
 }
 
 [dir="rtl"] .ds-2col > .group-right {
-    float: right;
+  float: right;
 }
diff --git a/profiles/cr/modules/contrib/ds/css/ds-3col-equal-width.css b/profiles/cr/modules/contrib/ds/css/ds-3col-equal-width.css
@@ -9,7 +9,7 @@
 }
 
 [dir="rtl"] .ds-3col-equal > .group-left {
-    float: right;
+  float: right;
 }
 
 .ds-3col-equal > .group-middle {
@@ -18,7 +18,7 @@
 }
 
 [dir="rtl"] .ds-3col-equal > .group-middle {
-    float: right;
+  float: right;
 }
 
 .ds-3col-equal > .group-right {
@@ -27,5 +27,5 @@
 }
 
 [dir="rtl"] .ds-3col-equal > .group-right {
-    float: left;
+  float: left;
 }
diff --git a/profiles/cr/modules/contrib/ds/css/ds-3col-stacked-equal-width.css b/profiles/cr/modules/contrib/ds/css/ds-3col-stacked-equal-width.css
@@ -13,7 +13,7 @@
 }
 
 [dir="rtl"] .ds-3col-stacked-equal > .group-left {
-    float: right;
+  float: right;
 }
 
 .ds-3col-stacked-equal > .group-middle {
@@ -22,7 +22,7 @@
 }
 
 [dir="rtl"] .ds-3col-stacked-equal > .group-middle {
-    float: right;
+  float: right;
 }
 
 .ds-3col-stacked-equal > .group-right {
@@ -31,7 +31,7 @@
 }
 
 [dir="rtl"] .ds-3col-stacked-equal > .group-right {
-    float: left;
+  float: left;
 }
 
 .ds-3col-stacked-equal > .group-footer {

diff --git a/profiles/cr/modules/contrib/ds/css/ds-3col-stacked-fluid.css b/profiles/cr/modules/contrib/ds/css/ds-3col-stacked-fluid.css
@@ -13,7 +13,7 @@
 }
 
 [dir="rtl"] .ds-3col-stacked-fluid > .group-left {
-    float: right;
+  float: right;
 }
 
 .ds-3col-stacked-fluid > .group-middle {
@@ -22,7 +22,7 @@
 }
 
 [dir="rtl"] .ds-3col-stacked-fluid > .group-middle {
-    float: right;
+  float: right;
 }
 
 .ds-3col-stacked-fluid.group-one-sidebar > .group-middle {
@@ -39,7 +39,7 @@
 }
 
 [dir="rtl"] .ds-3col-stacked-fluid > .group-right {
-    float: left;
+  float: left;
 }
 
 .ds-3col-stacked-fluid > .group-footer {

diff --git a/profiles/cr/modules/contrib/ds/css/ds-3col-stacked.css b/profiles/cr/modules/contrib/ds/css/ds-3col-stacked.css
@@ -13,7 +13,7 @@
 }
 
 [dir="rtl"] .ds-3col-stacked > .group-left {
-    float: right;
+  float: right;
 }
 
 .ds-3col-stacked > .group-middle {
@@ -22,7 +22,7 @@
 }
 
 [dir="rtl"] .ds-3col-stacked > .group-middle {
-    float: right;
+  float: right;
 }
 
 .ds-3col-stacked > .group-right {
@@ -31,7 +31,7 @@
 }
 
 [dir="rtl"] .ds-3col-stacked > .group-right {
-    float: left;
+  float: left;
 }
 
 .ds-3col-stacked > .group-footer {

diff --git a/profiles/cr/modules/contrib/ds/css/ds-3col.css b/profiles/cr/modules/contrib/ds/css/ds-3col.css
@@ -9,7 +9,7 @@
 }
 
 [dir="rtl"] .ds-3col > .group-left {
-    float: right;
+  float: right;
 }
 
 .ds-3col > .group-middle {
@@ -18,7 +18,7 @@
 }
 
 [dir="rtl"] .ds-3col > .group-middle {
-    float: right;
+  float: right;
 }
 
 .ds-3col > .group-right {
@@ -27,5 +27,5 @@
 }
 
 [dir="rtl"] .ds-3col > .group-right {
-    float: left;
+  float: left;
 }
diff --git a/profiles/cr/modules/contrib/ds/css/ds-4col.css b/profiles/cr/modules/contrib/ds/css/ds-4col.css
@@ -9,7 +9,7 @@
 }
 
 [dir="rtl"] .ds-4col > .group-first {
-    float: right;
+  float: right;
 }
 
 .ds-4col > .group-second {
@@ -18,7 +18,7 @@
 }
 
 [dir="rtl"] .ds-4col > .group-second {
-    float: right;
+  float: right;
 }
 
 .ds-4col > .group-third {
@@ -27,7 +27,7 @@
 }
 
 [dir="rtl"] .ds-4col > .group-third {
-    float: right;
+  float: right;
 }
 
 .ds-4col > .group-fourth {
@@ -36,5 +36,5 @@
 }
 
 [dir="rtl"] .ds-4col > .group-fourth {
-    float: right;
+  float: right;
 }
diff --git a/profiles/cr/modules/contrib/ds/css/ds.admin.css b/profiles/cr/modules/contrib/ds/css/ds.admin.css
@@ -1,13 +1,12 @@
-
 /**
  * @file
  * Administration CSS for Display Suite.
  */
+
 .ds-extras-field-template {
   margin-bottom: 1em;
 }
 
-
 #field-display-overview .ft-settings .ft-group {
   border-top: 1px solid #aaa;
   padding: 5px 0;
@@ -43,7 +42,7 @@
   width: 130px;
 }
 
-.ds-after-suggestion{
+.ds-after-suggestion {
   clear: both;
   padding-top: 10px;
 }
@@ -69,7 +68,7 @@ table th.ds-display-list-options {
 .vertical-tabs fieldset#edit-additional-settings-ds-page-title-options-page-option-contexts {
   margin: 1em 0;
   padding: 2.5em 0 0;
-  border: 1px solid #CCCCCC;
+  border: 1px solid #cccccc;
 }
 
 #edit-additional-settings-ds-page-title-options-page-option-contexts legend {
@@ -88,15 +87,15 @@ table th.ds-display-list-options {
 }
 
 .ds-layout-change-save {
-    clear: both;
+  clear: both;
 }
 
 .ds-layout-preview-arrow {
-    float: left;
-    margin: 80px 10px 0 5px;
+  float: left;
+  margin: 80px 10px 0 5px;
 }
 
 .ds-layout-regions {
-    float: left;
-    width: 210px;
+  float: left;
+  width: 210px;
 }
diff --git a/profiles/cr/modules/contrib/ds/drush/ExampleField.php b/profiles/cr/modules/contrib/ds/drush/ExampleField.php
@@ -1,15 +1,13 @@
 <?php
-/**
- * @file
- * Contains \Drupal\example_field\Plugin\DsField\ExampleField.
- */
 
 namespace Drupal\example_field\Plugin\DsField;
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\ds\Plugin\DsField\DsFieldBase;
 
 /**
+ * Generated field.
+ *
  * @DsField(
  *   id = "example_field_ExampleField",
  *   title = @Translation("ExampleField"),