Browse Source

big update for home v2

Bachir Soussi Chiadmi 10 năm trước cách đây
mục cha
commit
3ffbc09c10
26 tập tin đã thay đổi với 2542 bổ sung195 xóa
  1. BIN
      materio_base_d7-updated.sql
  2. 1 1
      sites/all/modules/features/materio_administration/materio_administration.strongarm.inc
  3. 1 2
      sites/all/modules/features/materio_administration/materio_administration.views_default.inc
  4. 315 13
      sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc
  5. 33 0
      sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc
  6. 1 0
      sites/all/modules/features/materio_content_types/materio_content_types.info
  7. 16 0
      sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc
  8. 67 34
      sites/all/modules/features/materio_home_v2/materio_home_v2.pages_default.inc
  9. 12 0
      sites/all/modules/features/materio_home_v2/materio_home_v2.views_default.inc
  10. 12 0
      sites/all/modules/features/materio_publications/materio_publications.features.field_instance.inc
  11. 6 0
      sites/all/modules/features/materio_publications/materio_publications.features.user_role.inc
  12. 33 8
      sites/all/modules/features/materio_publications/materio_publications.features.workflow_access.inc
  13. 4 0
      sites/all/modules/features/materio_publications/materio_publications.info
  14. 18 0
      sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.field_instance.inc
  15. 11 1
      sites/all/modules/gui/materiobasemod/materio_display.module
  16. 1 1
      sites/all/themes/gui/materiobasetheme/Gruntfile.js
  17. 1506 0
      sites/all/themes/gui/materiobasetheme/css/styles.css
  18. 1 1
      sites/all/themes/gui/materiobasetheme/js/script.js
  19. 19 2
      sites/all/themes/gui/materiobasetheme/preprocess/node.pre.php
  20. 20 0
      sites/all/themes/gui/materiobasetheme/scss/colors.scss
  21. 44 18
      sites/all/themes/gui/materiobasetheme/scss/layout.scss
  22. 20 2
      sites/all/themes/gui/materiobasetheme/scss/misc.scss
  23. 305 66
      sites/all/themes/gui/materiobasetheme/scss/styles.scss
  24. 17 0
      sites/all/themes/gui/materiobasetheme/templates/node--page--homeblock.tpl.php
  25. 28 0
      sites/all/themes/gui/materiobasetheme/templates/node--simplenews--teaser.tpl.php
  26. 51 46
      sites/all/themes/gui/materiobasetheme/templates/page.tpl.php

BIN
materio_base_d7-updated.sql


+ 1 - 1
sites/all/modules/features/materio_administration/materio_administration.strongarm.inc

@@ -61,7 +61,7 @@ function materio_administration_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'admin_menu_position_fixed';
-  $strongarm->value = 0;
+  $strongarm->value = 1;
   $export['admin_menu_position_fixed'] = $strongarm;
 
   $strongarm = new stdClass();

+ 1 - 2
sites/all/modules/features/materio_administration/materio_administration.views_default.inc

@@ -952,11 +952,10 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['type']['id'] = 'type';
   $handler->display->display_options['fields']['type']['table'] = 'node';
   $handler->display->display_options['fields']['type']['field'] = 'type';
-  /* Champ: Contenu : Title */
+  /* Champ: Contenu : Titre */
   $handler->display->display_options['fields']['title_field']['id'] = 'title_field';
   $handler->display->display_options['fields']['title_field']['table'] = 'field_data_title_field';
   $handler->display->display_options['fields']['title_field']['field'] = 'title_field';
-  $handler->display->display_options['fields']['title_field']['label'] = 'Titre';
   $handler->display->display_options['fields']['title_field']['element_type'] = 'strong';
   $handler->display->display_options['fields']['title_field']['link_to_entity'] = 1;
   /* Champ: Contenu : Référence Materio */

+ 315 - 13
sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc

@@ -57,6 +57,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 1,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -140,6 +146,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'computed_field_plain',
         'weight' => 10,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -226,6 +238,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'hidden',
         'weight' => 8,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -303,6 +321,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'hidden',
         'weight' => 9,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -379,6 +403,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'hidden',
         'weight' => 4,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -467,6 +497,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'hidden',
         'weight' => 7,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -560,6 +596,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'hidden',
         'weight' => 5,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -644,6 +686,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'hidden',
         'weight' => 3,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -744,6 +792,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'image',
         'weight' => 2,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -833,6 +887,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'computed_field_plain',
         'weight' => 11,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -916,6 +976,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'text_plain',
         'weight' => 0,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -1000,6 +1066,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 0,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'text',
@@ -1085,6 +1157,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'file_default',
         'weight' => 10,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -1168,6 +1246,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 5,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -1247,6 +1331,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 4,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'text',
@@ -1325,6 +1415,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 2,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -1406,6 +1502,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'list_default',
         'weight' => 3,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -1505,6 +1607,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'addressfield_default',
         'weight' => 9,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'addressfield',
@@ -1601,6 +1709,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'email_default',
         'weight' => 7,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'email',
@@ -1680,6 +1794,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'global_phone_number',
         'weight' => 8,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'cck_phone',
@@ -2000,6 +2120,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'hidden',
         'weight' => 11,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'taxonomy',
@@ -2086,6 +2212,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'link_default',
         'weight' => 6,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'link',
@@ -2182,6 +2314,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'file_default',
         'weight' => 9,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -2264,6 +2402,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'entityreference_label',
         'weight' => 23,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -2351,6 +2495,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'i18n_taxonomy_term_reference_link',
         'weight' => 18,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'module' => 'tode',
@@ -2442,6 +2592,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'i18n_taxonomy_term_reference_link',
         'weight' => 17,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'module' => 'tode',
@@ -2527,6 +2683,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 0,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'text',
@@ -2607,6 +2769,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'list_default',
         'weight' => 19,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -2682,6 +2850,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'computed_field_plain',
         'weight' => 20,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -2760,6 +2934,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 14,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'text',
@@ -2860,6 +3040,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'image',
         'weight' => 6,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'image',
@@ -2960,6 +3146,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'entityreference_label',
         'weight' => 22,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -3037,6 +3229,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'hidden',
         'weight' => 8,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -3119,6 +3317,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 1,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'title',
@@ -3202,6 +3406,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'i18n_taxonomy_term_reference_link',
         'weight' => 16,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -3292,6 +3502,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'computed_field_plain',
         'weight' => 21,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'computed_field',
@@ -3368,6 +3584,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'i18n_taxonomy_term_reference_link',
         'weight' => 15,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -3446,6 +3668,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'video_filter_field_default',
         'weight' => 7,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -3522,6 +3750,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'hidden',
         'weight' => 24,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -3605,6 +3839,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 12,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'hidden',
         'module' => 'text',
@@ -3688,6 +3928,15 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 3,
       ),
+      'homeblock' => array(
+        'label' => 'hidden',
+        'module' => 'text',
+        'settings' => array(
+          'trim_length' => 600,
+        ),
+        'type' => 'text_summary_or_trimmed',
+        'weight' => 4,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -3701,7 +3950,7 @@ function materio_content_types_field_default_field_instances() {
           'trim_length' => 600,
         ),
         'type' => 'text_summary_or_trimmed',
-        'weight' => 0,
+        'weight' => 3,
       ),
     ),
     'entity_type' => 'node',
@@ -3771,10 +4020,24 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'image',
         'weight' => 1,
       ),
+      'homeblock' => array(
+        'label' => 'hidden',
+        'module' => 'image',
+        'settings' => array(
+          'image_link' => '',
+          'image_style' => '',
+        ),
+        'type' => 'image',
+        'weight' => 0,
+      ),
       'teaser' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
+        'label' => 'hidden',
+        'module' => 'image',
+        'settings' => array(
+          'image_link' => '',
+          'image_style' => '',
+        ),
+        'type' => 'image',
         'weight' => 0,
       ),
     ),
@@ -3854,11 +4117,27 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'video_embed_field',
         'weight' => 2,
       ),
+      'homeblock' => array(
+        'label' => 'hidden',
+        'module' => 'video_embed_field',
+        'settings' => array(
+          'description' => 1,
+          'description_position' => 'bottom',
+          'video_style' => 'normal',
+        ),
+        'type' => 'video_embed_field',
+        'weight' => 1,
+      ),
       'teaser' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
+        'label' => 'hidden',
+        'module' => 'video_embed_field',
+        'settings' => array(
+          'description' => 1,
+          'description_position' => 'bottom',
+          'video_style' => 'normal',
+        ),
+        'type' => 'video_embed_field',
+        'weight' => 1,
       ),
     ),
     'entity_type' => 'node',
@@ -3922,6 +4201,12 @@ function materio_content_types_field_default_field_instances() {
         'weight' => 0,
       ),
       'default' => array(
+        'label' => 'hidden',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'homeblock' => array(
         'label' => 'hidden',
         'module' => 'title',
         'settings' => array(
@@ -3930,7 +4215,7 @@ function materio_content_types_field_default_field_instances() {
           'title_style' => '',
         ),
         'type' => 'title_linked',
-        'weight' => 0,
+        'weight' => 3,
       ),
       'print' => array(
         'label' => 'above',
@@ -3939,10 +4224,15 @@ function materio_content_types_field_default_field_instances() {
         'weight' => 0,
       ),
       'teaser' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
+        'label' => 'hidden',
+        'module' => 'title',
+        'settings' => array(
+          'title_class' => '',
+          'title_link' => '',
+          'title_style' => '',
+        ),
+        'type' => 'title_linked',
+        'weight' => 2,
       ),
     ),
     'entity_type' => 'node',
@@ -4012,6 +4302,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 0,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -4092,6 +4388,12 @@ function materio_content_types_field_default_field_instances() {
         'type' => 'hidden',
         'weight' => 1,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),

+ 33 - 0
sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc

@@ -132,6 +132,39 @@ function materio_content_types_field_group_info() {
   );
   $export['group_contact_ope|node|materiau|form'] = $field_group;
 
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_content|node|page|homeblock';
+  $field_group->group_name = 'group_content';
+  $field_group->entity_type = 'node';
+  $field_group->bundle = 'page';
+  $field_group->mode = 'homeblock';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'content',
+    'weight' => '2',
+    'children' => array(
+      0 => 'body',
+      1 => 'title_field',
+    ),
+    'format_type' => 'div',
+    'format_settings' => array(
+      'label' => 'content',
+      'instance_settings' => array(
+        'id' => '',
+        'classes' => 'group-content field-group-div',
+        'description' => '',
+        'show_label' => '0',
+        'label_element' => 'h3',
+        'effect' => 'none',
+        'speed' => 'fast',
+      ),
+      'formatter' => 'open',
+    ),
+  );
+  $export['group_content|node|page|homeblock'] = $field_group;
+
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;

+ 1 - 0
sites/all/modules/features/materio_content_types/materio_content_types.info

@@ -76,6 +76,7 @@ features[field_group][] = group_4|node|materiau|cardbig
 features[field_group][] = group_base|node|breve|form
 features[field_group][] = group_base|node|materiau|form
 features[field_group][] = group_contact_ope|node|materiau|form
+features[field_group][] = group_content|node|page|homeblock
 features[field_group][] = group_fichiers|node|materiau|form
 features[field_group][] = group_head_right|node|materiau|print
 features[field_group][] = group_header|node|breve|bookmark

+ 16 - 0
sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc

@@ -374,12 +374,28 @@ function materio_content_types_strongarm() {
             'weight' => '5',
             'visible' => FALSE,
           ),
+          'teaser' => array(
+            'weight' => '4',
+            'visible' => FALSE,
+          ),
+          'homeblock' => array(
+            'weight' => '5',
+            'visible' => FALSE,
+          ),
         ),
         'workflow' => array(
           'default' => array(
             'weight' => '4',
             'visible' => TRUE,
           ),
+          'teaser' => array(
+            'weight' => '5',
+            'visible' => FALSE,
+          ),
+          'homeblock' => array(
+            'weight' => '6',
+            'visible' => FALSE,
+          ),
         ),
       ),
     ),

+ 67 - 34
sites/all/modules/features/materio_home_v2/materio_home_v2.pages_default.inc

@@ -22,8 +22,9 @@ function materio_home_v2_default_page_manager_pages() {
         'name' => 'role',
         'settings' => array(
           'rids' => array(
-            0 => 3,
-            1 => 4,
+            0 => 11,
+            1 => 3,
+            2 => 4,
           ),
         ),
         'context' => 'logged-in-user',
@@ -51,8 +52,8 @@ function materio_home_v2_default_page_manager_pages() {
     'no_blocks' => 0,
     'pipeline' => 'standard',
     'body_classes_to_remove' => '',
-    'body_classes_to_add' => '',
-    'css_id' => 'homev2',
+    'body_classes_to_add' => 'home-v2',
+    'css_id' => 'home-v2',
     'css' => '',
     'contexts' => array(),
     'relationships' => array(),
@@ -71,6 +72,38 @@ function materio_home_v2_default_page_manager_pages() {
   $display->uuid = 'eca54323-0377-4ab0-b40c-69b96c16707a';
   $display->content = array();
   $display->panels = array();
+    $pane = new stdClass();
+    $pane->pid = 'new-d0ee2cb5-bc02-4ded-a907-91d2dbea37c7';
+    $pane->panel = 'middle';
+    $pane->type = 'node';
+    $pane->subtype = 'node';
+    $pane->shown = TRUE;
+    $pane->access = array();
+    $pane->configuration = array(
+      'nid' => '13097',
+      'links' => 0,
+      'leave_node_title' => 0,
+      'identifier' => '',
+      'build_mode' => 'homeblock',
+      'link_node_title' => 0,
+      'override_title' => 1,
+      'override_title_text' => '<No Title>',
+      'override_title_heading' => 'span',
+    );
+    $pane->cache = array();
+    $pane->style = array(
+      'settings' => NULL,
+    );
+    $pane->css = array(
+      'css_id' => '',
+      'css_class' => 'intro-video',
+    );
+    $pane->extras = array();
+    $pane->position = 0;
+    $pane->locks = array();
+    $pane->uuid = 'd0ee2cb5-bc02-4ded-a907-91d2dbea37c7';
+    $display->content['new-d0ee2cb5-bc02-4ded-a907-91d2dbea37c7'] = $pane;
+    $display->panels['middle'][0] = 'new-d0ee2cb5-bc02-4ded-a907-91d2dbea37c7';
     $pane = new stdClass();
     $pane->pid = 'new-78b5df28-c9fd-4904-8910-aa1b96c60e35';
     $pane->panel = 'middle';
@@ -89,11 +122,11 @@ function materio_home_v2_default_page_manager_pages() {
     );
     $pane->css = array();
     $pane->extras = array();
-    $pane->position = 0;
+    $pane->position = 1;
     $pane->locks = array();
     $pane->uuid = '78b5df28-c9fd-4904-8910-aa1b96c60e35';
     $display->content['new-78b5df28-c9fd-4904-8910-aa1b96c60e35'] = $pane;
-    $display->panels['middle'][0] = 'new-78b5df28-c9fd-4904-8910-aa1b96c60e35';
+    $display->panels['middle'][1] = 'new-78b5df28-c9fd-4904-8910-aa1b96c60e35';
     $pane = new stdClass();
     $pane->pid = 'new-c0f80278-c595-4c40-bcec-11063eb6fac5';
     $pane->panel = 'middle';
@@ -106,10 +139,10 @@ function materio_home_v2_default_page_manager_pages() {
       'links' => 1,
       'leave_node_title' => 0,
       'identifier' => 'showroom',
-      'build_mode' => 'teaser',
-      'link_node_title' => 1,
-      'override_title' => 0,
-      'override_title_text' => '',
+      'build_mode' => 'homeblock',
+      'link_node_title' => 0,
+      'override_title' => 1,
+      'override_title_text' => '<No Title>',
       'override_title_heading' => 'h2',
     );
     $pane->cache = array();
@@ -121,11 +154,11 @@ function materio_home_v2_default_page_manager_pages() {
       'css_class' => 'showroom',
     );
     $pane->extras = array();
-    $pane->position = 1;
+    $pane->position = 2;
     $pane->locks = array();
     $pane->uuid = 'c0f80278-c595-4c40-bcec-11063eb6fac5';
     $display->content['new-c0f80278-c595-4c40-bcec-11063eb6fac5'] = $pane;
-    $display->panels['middle'][1] = 'new-c0f80278-c595-4c40-bcec-11063eb6fac5';
+    $display->panels['middle'][2] = 'new-c0f80278-c595-4c40-bcec-11063eb6fac5';
     $pane = new stdClass();
     $pane->pid = 'new-71badc43-2232-4c2f-b454-e3be80726a22';
     $pane->panel = 'middle';
@@ -138,10 +171,10 @@ function materio_home_v2_default_page_manager_pages() {
       'links' => 1,
       'leave_node_title' => 0,
       'identifier' => 'database',
-      'build_mode' => 'teaser',
-      'link_node_title' => 1,
-      'override_title' => 0,
-      'override_title_text' => '',
+      'build_mode' => 'homeblock',
+      'link_node_title' => 0,
+      'override_title' => 1,
+      'override_title_text' => '<none>',
       'override_title_heading' => 'h2',
     );
     $pane->cache = array();
@@ -153,11 +186,11 @@ function materio_home_v2_default_page_manager_pages() {
       'css_class' => 'bdd',
     );
     $pane->extras = array();
-    $pane->position = 2;
+    $pane->position = 3;
     $pane->locks = array();
     $pane->uuid = '71badc43-2232-4c2f-b454-e3be80726a22';
     $display->content['new-71badc43-2232-4c2f-b454-e3be80726a22'] = $pane;
-    $display->panels['middle'][2] = 'new-71badc43-2232-4c2f-b454-e3be80726a22';
+    $display->panels['middle'][3] = 'new-71badc43-2232-4c2f-b454-e3be80726a22';
     $pane = new stdClass();
     $pane->pid = 'new-3b6cc0fd-a06a-403a-841e-404ea57fe234';
     $pane->panel = 'middle';
@@ -179,11 +212,11 @@ function materio_home_v2_default_page_manager_pages() {
       'css_class' => 'news-panel',
     );
     $pane->extras = array();
-    $pane->position = 3;
+    $pane->position = 4;
     $pane->locks = array();
     $pane->uuid = '3b6cc0fd-a06a-403a-841e-404ea57fe234';
     $display->content['new-3b6cc0fd-a06a-403a-841e-404ea57fe234'] = $pane;
-    $display->panels['middle'][3] = 'new-3b6cc0fd-a06a-403a-841e-404ea57fe234';
+    $display->panels['middle'][4] = 'new-3b6cc0fd-a06a-403a-841e-404ea57fe234';
     $pane = new stdClass();
     $pane->pid = 'new-e5d39cf0-472b-4779-9d31-a1548fe86bc7';
     $pane->panel = 'middle';
@@ -196,10 +229,10 @@ function materio_home_v2_default_page_manager_pages() {
       'links' => 1,
       'leave_node_title' => 0,
       'identifier' => 'formations',
-      'build_mode' => 'teaser',
-      'link_node_title' => 1,
-      'override_title' => 0,
-      'override_title_text' => '',
+      'build_mode' => 'homeblock',
+      'link_node_title' => 0,
+      'override_title' => 1,
+      'override_title_text' => '<none>',
       'override_title_heading' => 'h2',
     );
     $pane->cache = array();
@@ -211,11 +244,11 @@ function materio_home_v2_default_page_manager_pages() {
       'css_class' => 'formations',
     );
     $pane->extras = array();
-    $pane->position = 4;
+    $pane->position = 5;
     $pane->locks = array();
     $pane->uuid = 'e5d39cf0-472b-4779-9d31-a1548fe86bc7';
     $display->content['new-e5d39cf0-472b-4779-9d31-a1548fe86bc7'] = $pane;
-    $display->panels['middle'][4] = 'new-e5d39cf0-472b-4779-9d31-a1548fe86bc7';
+    $display->panels['middle'][5] = 'new-e5d39cf0-472b-4779-9d31-a1548fe86bc7';
     $pane = new stdClass();
     $pane->pid = 'new-9718c81e-6055-4e4e-a0e5-3796d58c6cbe';
     $pane->panel = 'middle';
@@ -228,10 +261,10 @@ function materio_home_v2_default_page_manager_pages() {
       'links' => 1,
       'leave_node_title' => 0,
       'identifier' => 'services',
-      'build_mode' => 'teaser',
-      'link_node_title' => 1,
-      'override_title' => 0,
-      'override_title_text' => '',
+      'build_mode' => 'homeblock',
+      'link_node_title' => 0,
+      'override_title' => 1,
+      'override_title_text' => '<none>',
       'override_title_heading' => 'h2',
     );
     $pane->cache = array();
@@ -243,11 +276,11 @@ function materio_home_v2_default_page_manager_pages() {
       'css_class' => 'services',
     );
     $pane->extras = array();
-    $pane->position = 5;
+    $pane->position = 6;
     $pane->locks = array();
     $pane->uuid = '9718c81e-6055-4e4e-a0e5-3796d58c6cbe';
     $display->content['new-9718c81e-6055-4e4e-a0e5-3796d58c6cbe'] = $pane;
-    $display->panels['middle'][5] = 'new-9718c81e-6055-4e4e-a0e5-3796d58c6cbe';
+    $display->panels['middle'][6] = 'new-9718c81e-6055-4e4e-a0e5-3796d58c6cbe';
     $pane = new stdClass();
     $pane->pid = 'new-639eb2c7-bf5d-4920-b1bb-c33d8f72a650';
     $pane->panel = 'middle';
@@ -265,11 +298,11 @@ function materio_home_v2_default_page_manager_pages() {
       'css_class' => 'publication',
     );
     $pane->extras = array();
-    $pane->position = 6;
+    $pane->position = 7;
     $pane->locks = array();
     $pane->uuid = '639eb2c7-bf5d-4920-b1bb-c33d8f72a650';
     $display->content['new-639eb2c7-bf5d-4920-b1bb-c33d8f72a650'] = $pane;
-    $display->panels['middle'][6] = 'new-639eb2c7-bf5d-4920-b1bb-c33d8f72a650';
+    $display->panels['middle'][7] = 'new-639eb2c7-bf5d-4920-b1bb-c33d8f72a650';
   $display->hide_title = PANELS_TITLE_NONE;
   $display->title_pane = '0';
   $handler->conf['display'] = $display;

+ 12 - 0
sites/all/modules/features/materio_home_v2/materio_home_v2.views_default.inc

@@ -79,6 +79,8 @@ function materio_home_v2_views_default_views() {
 
   /* Display: daily */
   $handler = $view->new_display('panel_pane', 'daily', 'panel_pane_2');
+  $handler->display->display_options['defaults']['title'] = FALSE;
+  $handler->display->display_options['title'] = 'Daily materiO\'';
   $handler->display->display_options['defaults']['pager'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'some';
   $handler->display->display_options['pager']['options']['items_per_page'] = '1';
@@ -131,6 +133,15 @@ function materio_home_v2_views_default_views() {
   );
   $handler->display->display_options['pane_category']['name'] = 'home v2';
   $handler->display->display_options['pane_category']['weight'] = '0';
+  $handler->display->display_options['allow']['use_pager'] = 0;
+  $handler->display->display_options['allow']['items_per_page'] = 0;
+  $handler->display->display_options['allow']['offset'] = 0;
+  $handler->display->display_options['allow']['link_to_view'] = 0;
+  $handler->display->display_options['allow']['more_link'] = 0;
+  $handler->display->display_options['allow']['path_override'] = 0;
+  $handler->display->display_options['allow']['title_override'] = 'title_override';
+  $handler->display->display_options['allow']['exposed_form'] = 0;
+  $handler->display->display_options['allow']['fields_override'] = 0;
   $translatables['news_home_v2'] = array(
     t('Master'),
     t('News'),
@@ -142,6 +153,7 @@ function materio_home_v2_views_default_views() {
     t('Desc'),
     t('home v2'),
     t('daily'),
+    t('Daily materiO\''),
   );
   $export['news_home_v2'] = $view;
 

+ 12 - 0
sites/all/modules/features/materio_publications/materio_publications.features.field_instance.inc

@@ -54,6 +54,12 @@ function materio_publications_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 1,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'teaser' => array(
         'label' => 'hidden',
         'module' => 'text',
@@ -131,6 +137,12 @@ function materio_publications_field_default_field_instances() {
         'type' => 'image',
         'weight' => 2,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'teaser' => array(
         'label' => 'above',
         'settings' => array(),

+ 6 - 0
sites/all/modules/features/materio_publications/materio_publications.features.user_role.inc

@@ -28,6 +28,12 @@ function materio_publications_user_default_roles() {
     'weight' => 2,
   );
 
+  // Exported role: Utilisateur Alpha Tester.
+  $roles['Utilisateur Alpha Tester'] = array(
+    'name' => 'Utilisateur Alpha Tester',
+    'weight' => 4,
+  );
+
   // Exported role: administrator.
   $roles['administrator'] = array(
     'name' => 'administrator',

+ 33 - 8
sites/all/modules/features/materio_publications/materio_publications.features.workflow_access.inc

@@ -52,12 +52,12 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['(creation)']['Adhérent'] = array(
+  $workflows['Publication']['(creation)']['Utilisateur Alpha Tester'] = array(
     'grant_view' => 0,
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['(creation)']['Premium'] = array(
+  $workflows['Publication']['(creation)']['Adhérent'] = array(
     'grant_view' => 0,
     'grant_update' => 0,
     'grant_delete' => 0,
@@ -67,6 +67,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
+  $workflows['Publication']['(creation)']['Premium'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Importé'] = array();
   $workflows['Publication']['Importé']['administrator'] = array(
     'grant_view' => 1,
@@ -108,12 +113,12 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Importé']['Adhérent'] = array(
+  $workflows['Publication']['Importé']['Utilisateur Alpha Tester'] = array(
     'grant_view' => 0,
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Importé']['Premium'] = array(
+  $workflows['Publication']['Importé']['Adhérent'] = array(
     'grant_view' => 0,
     'grant_update' => 0,
     'grant_delete' => 0,
@@ -123,6 +128,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
+  $workflows['Publication']['Importé']['Premium'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Édité'] = array();
   $workflows['Publication']['Édité']['Student'] = array(
     'grant_view' => 1,
@@ -174,12 +184,22 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
+  $workflows['Publication']['Édité']['Utilisateur Alpha Tester'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Édité']['Contact opérationnel'] = array(
     'grant_view' => 0,
     'grant_update' => 0,
     'grant_delete' => 0,
   );
   $workflows['Publication']['Masqué'] = array();
+  $workflows['Publication']['Masqué']['Utilisateur Alpha Tester'] = array(
+    'grant_view' => 1,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Masqué']['administrator'] = array(
     'grant_view' => 1,
     'grant_update' => 1,
@@ -225,12 +245,12 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Masqué']['Premium'] = array(
+  $workflows['Publication']['Masqué']['Contact opérationnel'] = array(
     'grant_view' => 0,
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Masqué']['Contact opérationnel'] = array(
+  $workflows['Publication']['Masqué']['Premium'] = array(
     'grant_view' => 0,
     'grant_update' => 0,
     'grant_delete' => 0,
@@ -261,12 +281,12 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Publié']['Adhérent'] = array(
+  $workflows['Publication']['Publié']['Utilisateur Alpha Tester'] = array(
     'grant_view' => 0,
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Publié']['Premium'] = array(
+  $workflows['Publication']['Publié']['Adhérent'] = array(
     'grant_view' => 0,
     'grant_update' => 0,
     'grant_delete' => 0,
@@ -276,6 +296,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
+  $workflows['Publication']['Publié']['Premium'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Publié']['administrator'] = array(
     'grant_view' => 0,
     'grant_update' => 1,

+ 4 - 0
sites/all/modules/features/materio_publications/materio_publications.info

@@ -3,7 +3,10 @@ core = 7.x
 package = Materio
 dependencies[] = ctools
 dependencies[] = features
+dependencies[] = image
 dependencies[] = materio_content_types
+dependencies[] = materio_page_title
+dependencies[] = materio_subscriptions
 dependencies[] = metatag
 dependencies[] = node
 dependencies[] = strongarm
@@ -24,6 +27,7 @@ features[user_permission][] = show publication title
 features[user_role][] = Contact opérationnel
 features[user_role][] = Student
 features[user_role][] = Unverified
+features[user_role][] = Utilisateur Alpha Tester
 features[user_role][] = administrator
 features[user_role][] = root
 features[user_role][] = utilisateur anonyme

+ 18 - 0
sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.field_instance.inc

@@ -54,6 +54,12 @@ function materio_subscriptions_field_default_field_instances() {
         'type' => 'text_default',
         'weight' => 0,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'teaser' => array(
         'label' => 'hidden',
         'module' => 'text',
@@ -129,6 +135,12 @@ function materio_subscriptions_field_default_field_instances() {
         'type' => 'i18n_taxonomy_term_reference_link',
         'weight' => 2,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'print' => array(
         'label' => 'above',
         'settings' => array(),
@@ -213,6 +225,12 @@ function materio_subscriptions_field_default_field_instances() {
         'type' => 'uc_product_image',
         'weight' => 0,
       ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'teaser' => array(
         'label' => 'hidden',
         'module' => 'uc_product',

+ 11 - 1
sites/all/modules/gui/materiobasemod/materio_display.module

@@ -54,5 +54,15 @@ function materio_display_preprocess_field(&$vars, $hook) {
 
     }
   }
+}
+
 
-}
+/**
+ * Implements hook_entity_info_alter().
+ */
+function materio_display_entity_info_alter(&$entity_info) {
+  $entity_info['node']['view modes']['homeblock'] = array(
+    'label' => t('Home block'),
+    'custom settings' => TRUE,
+  );
+}

+ 1 - 1
sites/all/themes/gui/materiobasetheme/Gruntfile.js

@@ -2,7 +2,7 @@ module.exports = function (grunt) {
   grunt.initConfig({
     watch: {
       compass: {
-        files: ['scss/styles.scss', 'scss/wysiwyg.scss'],
+        files: ['scss/styles.scss', 'scss/wysiwyg.scss', 'scss/layout.scss', 'scss/gui.scss', 'scss/misc.scss', 'scss/fonts.scss', 'scss/colors.scss'],
         tasks: ['compass:dev']
       },
       postcss: {

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1506 - 0
sites/all/themes/gui/materiobasetheme/css/styles.css


+ 1 - 1
sites/all/themes/gui/materiobasetheme/js/script.js

@@ -280,7 +280,7 @@
     * layout
     */
     function initLayout(){
-      if(!_max_768()){
+      if(!_max_768() && !$('body').is('.home-v2')){
         var height = $('#header').h() + $('#tasks').h();
 
         if(!_max_480() && !_touch ){

+ 19 - 2
sites/all/themes/gui/materiobasetheme/preprocess/node.pre.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 // dsm($vars);
 $node = $vars['node'];
@@ -40,4 +40,21 @@ if($vars['type'] == 'didactique'){
 	if(!empty($node->field_emvideo))
 		$vars['classes_array'][] = "emvideo";
 }
-	
+
+// for HOME V2 : remove all table and other html, remains only the picture, from simplenews daily materio
+if ($vars['type'] == 'simplenews' && $vars['view_mode'] == 'teaser') {
+  // get the body field
+  $body = $vars['content']['body']['#items'][0]['value'];
+  // get the frist image only
+  preg_match('/<img[^src]+src="([^"]+)"[^>]+>/i', $body, $matches);
+  // get the source path of the image
+  $img_src = preg_replace('/^\/?sites\/default\/files\//', '', $matches[1]);
+  // generate the uri of styled image
+  $img_uri = image_style_url("card-full", $img_src);
+  // generate the styled image file
+  image_style_create_derivative("card-full", $img_src, $img_uri);
+  // theme the new image tag
+  $img = theme('image', array('path'=>$img_uri));
+  // replace the body with this new styled image
+  $vars['content']['body'][0]['#markup'] = $img;
+}

+ 20 - 0
sites/all/themes/gui/materiobasetheme/scss/colors.scss

@@ -0,0 +1,20 @@
+/*
+              __
+  _________  / /___  __________
+ / ___/ __ \/ / __ \/ ___/ ___/
+/ /__/ /_/ / / /_/ / /  (__  )
+\___/\____/_/\____/_/  /____/
+
+*/
+$creme      : #f7f8f2;
+$orange     : rgb(255,116,0);
+$bleumarine : rgb(27,20,100);
+$vertgris   : rgb(95,159,131);
+$jaune      : rgb(230,222,28);
+$bleuclair  : rgb(105,205,207);
+$rose       : rgb(212,118,174);
+$vertclair  : rgb(121,230,68);
+$violet     : rgb(119,46,136);
+$rouge      : rgb(230,35,38);
+$bleu       : rgb(52,79,193);
+

+ 44 - 18
sites/all/themes/gui/materiobasetheme/scss/layout.scss

@@ -22,16 +22,17 @@
 
 // Here we define the breakpoints which will become the upper border for each media size.
 // The function em-calc() calculates the em-value from a px-value.
+/*
 $small-breakpoint:  em-calc(480)  !default;
 $medium-breakpoint: em-calc(768) !default;
 $large-breakpoint:  em-calc(980) !default;
 $xlarge-breakpoint: em-calc(1200) !default;
 
-$small-range:   (0, $small-breakpoint) !default; /* 0, 480px */
-$medium-range:  ($small-breakpoint  + em-calc(1), $medium-breakpoint) !default; /* 481px, 768px */
-$large-range:   ($medium-breakpoint + em-calc(1), $large-breakpoint)  !default; /* 769px, 980px */
-$xlarge-range:  ($large-breakpoint  + em-calc(1), $xlarge-breakpoint) !default; /* 981px, 1200px */
-$xxlarge-range: ($xlarge-breakpoint + em-calc(1), em-calc(99999999)) !default; /* 1201px, ... */
+$small-range:   (0, $small-breakpoint) !default; // 0, 480px
+$medium-range:  ($small-breakpoint  + em-calc(1), $medium-breakpoint) !default; 481px, 768px //
+$large-range:   ($medium-breakpoint + em-calc(1), $large-breakpoint)  !default; // 769px, 980px
+$xlarge-range:  ($large-breakpoint  + em-calc(1), $xlarge-breakpoint) !default; // 981px, 1200px
+$xxlarge-range: ($xlarge-breakpoint + em-calc(1), em-calc(99999999)) !default; // 1201px, ...
 
 // Media Queries
 $screen: "only screen" !default;
@@ -62,6 +63,9 @@ $retina: (
   "#{$screen} and (min-resolution: 192dpi)",
   "#{$screen} and (min-resolution: 2dppx)"
 );
+*/
+
+$row-width: rem-calc(1280);
 
 *{
  box-sizing: content-box;
@@ -118,41 +122,40 @@ $rootminwidth : 320px;
 /** NIVEAU 0 */
 #root{
   min-width:$rootminwidth;
-
   .ie8 &{min-width:1024px;}
 }
 
 /** NIVEAU 1 */
-#container{ 
-  margin:0 auto; position:relative; 
+#container{
+  margin:0 auto; position:relative;
   @include transition(padding-top 0.5s ease-out); // change this
+  // padding:0 1em;
 }
 
 /** NIVEAU 2 */
 @mixin padded(){ $p:2%; width:100%-2*$p; padding-left:$p; padding-right:$p; }
+// @mixin padded(){width:100%;}
 
 $header-z-index:1000;
 #header{
   @media #{$medium-up}{
-    position:fixed; top:0; margin:0 auto; @include bgc(#fff); min-width:$rootminwidth*0.97;
+    position:fixed; top:0; margin:0 auto; background-color: #fff; min-width:$rootminwidth*0.97;
   } //change this
   z-index:$header-z-index;
   @include padded;
-  .editmenu-enabled &{ @include mt(30px); }
-  .admin-menu &{ @include mt(35px); }
+  .admin-menu &{ margin-top:35px; }
 }
 
 #utilities{
   @media #{$medium-up}{
     html.no-touch &{
       position:fixed; top:0; margin:0 auto; min-width:$rootminwidth*0.97;
-      @include mt(60px);
+      margin-top:60px;
     }
-    html.no-touch .editmenu-enabled &{ @include mt(80px); }
-    html.no-touch .admin-menu &{ @include mt(85px); }
+    html.no-touch .admin-menu &{ margin-top:85px; }
   }
   @media #{$small-only}{
-    >.region{@include pt(5px); @include pb(5px);}
+    >.region{padding-top:5px; padding-bottom:5px;}
   } //change this
   z-index:999;
   @include bgc(#fff);
@@ -160,9 +163,14 @@ $header-z-index:1000;
 
 }
 
-#main{@include padded; overflow-x:hidden;}
+#main{
+  @include padded;
+  overflow-x:hidden;
+}
 
-#footer{@include padded;}
+#footer{
+  @include padded;
+}
 
 /** NIVEAU 3 */
 
@@ -176,11 +184,29 @@ $header-z-index:1000;
 // .footer-block .region, .header-block{ @include inlineblock();} change this
 
 /** NIVEAU 4 */
-#center{ padding:5px; }
+#center{
+//padding:5px;
+}
 
 /** Z-INDEX */
 #block-feedback-form{z-index:1001;}
 #admin-menu{z-index:1002;}
 #admin-toolbar{z-index:1003;}
 
+/*
+    __  __                             ___
+   / / / /___  ____ ___  ___     _   _|__ \
+  / /_/ / __ \/ __ `__ \/ _ \   | | / /_/ /
+ / __  / /_/ / / / / / /  __/   | |/ / __/
+/_/ /_/\____/_/ /_/ /_/\___/    |___/____/
+
+*/
+body.home-v2{
+  #header>.inner, #utilities>.inner, #main, #footer{
+    @include grid-row();
+  }
+  // #header,#utilities{
+  //   position:relative;
+  // }
+}
 

+ 20 - 2
sites/all/themes/gui/materiobasetheme/scss/misc.scss

@@ -1,5 +1,12 @@
 
-//** Messages. */
+/*
+    __  ___
+   /  |/  /__  ______________ _____ ____  _____
+  / /|_/ / _ \/ ___/ ___/ __ `/ __ `/ _ \/ ___/
+ / /  / /  __(__  |__  ) /_/ / /_/ /  __(__  )
+/_/  /_/\___/____/____/\__,_/\__, /\___/____/
+                            /____/
+*/
 @mixin messages(){
   padding: 9px;
   margin: 0.5em 0 0;
@@ -237,4 +244,15 @@ a:hover {
 /** devel */
 .not-logged-in{
   #tasks ul.tabs.primary{display:none;}
-}
+}
+
+/*
+             __          _
+  ____ _____/ /___ ___  (_)___     ____ ___  ___  ____  __  __
+ / __ `/ __  / __ `__ \/ / __ \   / __ `__ \/ _ \/ __ \/ / / /
+/ /_/ / /_/ / / / / / / / / / /  / / / / / /  __/ / / / /_/ /
+\__,_/\__,_/_/ /_/ /_/_/_/ /_/  /_/ /_/ /_/\___/_/ /_/\__,_/
+*/
+#admin-menu{
+  top:0;
+}

+ 305 - 66
sites/all/themes/gui/materiobasetheme/scss/styles.scss

@@ -19,19 +19,24 @@
 @import "../bower_components/foundation/scss/foundation/components/inline-lists";
 @import "../bower_components/foundation/scss/foundation/components/buttons";
 @import "../bower_components/foundation/scss/foundation/components/button-groups";
-// @import "../bower_components/foundation/scss/foundation/components/grid";
+@import "../bower_components/foundation/scss/foundation/components/grid";
 // @import "../bower_components/foundation/scss/foundation/components/top-bar";
 // @import "../bower_components/foundation/scss/foundation/components/block-grid";
 
 
 @import "gui.scss";
 
+@import "colors.scss";
 @import "fonts.scss";
 @import "layout.scss";
 @import "../fonts/icon/foundation-icons.css";
 
 #root{
   // background: #fff url('../img/beta-2.png') no-repeat 0px 0px;
+  body.home-v2 &{
+    background-color: $creme;
+  }
+
 }
 
 @mixin shadowBtn(){
@@ -490,7 +495,14 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
     }
   }
 }
+/*
+         __  _ ___ __  _
+  __  __/ /_(_) (_) /_(_)__  _____
+ / / / / __/ / / / __/ / _ \/ ___/
+/ /_/ / /_/ / / / /_/ /  __(__  )
+\__,_/\__/_/_/_/\__/_/\___/____/
 
+*/
 #utilities{
   margin-top:$headerouterheight;
   .not-logged-in &{ overflow:hidden; }
@@ -502,6 +514,19 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
     margin-top:0;
   }
 }
+/*
+                    _
+   ____ ___  ____ _(_)___
+  / __ `__ \/ __ `/ / __ \
+ / / / / / / /_/ / / / / /
+/_/ /_/ /_/\__,_/_/_/ /_/
+*/
+#main{
+  body.home-v2 &{
+    padding-top:$headerouterheight;
+  }
+}
+
 /*
     __    _       __    ___       __    __           __
    / /_  (_)___ _/ /_  / (_)___ _/ /_  / /____  ____/ /
@@ -1079,7 +1104,6 @@ $cardfull_h:610px;
   width:$w; height:$h;
   @include inlineblock(); position:relative; margin:7px;
 
-  //z-index:10; // pourquoi ce z-index ?
   @include rounded(5px); background-color: #FFF;
   @include drop-shadow(0, 0, 5px, 0.2);
   @include transition-simply-prefix(box-shadow 0.3s ease-out); // opacity 0.3s ease-out); //change this commas
@@ -1634,8 +1658,6 @@ body.print-node-materiau{
   {
     padding-bottom: 1em;
   }
-
-
 }
 
 /*
@@ -1684,9 +1706,6 @@ body.print-node-materiau{
   margin-bottom: 2em;
 }
 
-@import "misc.scss";
-
-
 /*
     ___   __  ____________  __________  __  _______  __    __________________
    /   | / / / /_  __/ __ \/ ____/ __ \/  |/  / __ \/ /   / ____/_  __/ ____/
@@ -2753,51 +2772,172 @@ body.page-node-11187{
   }
 }
 
-// ------ HOME PAGE ---------
-#homev2{
-  padding: 40px 40px;
-  h2{font-size: 3.8em; font-weight: 500;}
+/*
+    __  __                        _    _____
+   / / / /___  ____ ___  ___     | |  / /__ \
+  / /_/ / __ \/ __ `__ \/ _ \    | | / /__/ /
+ / __  / /_/ / / / / / /  __/    | |/ // __/
+/_/ /_/\____/_/ /_/ /_/\___/     |___//____/
+*/
+
+body.home-v2{
+  #center{
+    background-color: transparent;
+    padding:0;
+  }
+}
+
+#home-v2{
+  // padding: 40px 40px;
+  h2{font-size: 2.1em; font-weight: 300;}
   a{color: #000};
-  ul{margin-left: 0px;}
-  li{padding:0px;}
-  .menu {
-    margin-left: 0px;
-    li{display: inline-block;
-      a{
-        background-color: #4d4d4d;
+
+  .panel-separator{clear:both;}
+  >.panel-panel>div>.panel-pane {
+    // padding: 10px 15px;
+
+
+
+    &.pane-node{
+      @include rounded(5px);
+      overflow:hidden;
+      .pane-content, .node{
+        position:relative; width:100%; height:100%; overflow:hidden;
+      }
+
+      .links a{
+        background-color: rgba(255,255,255, 0.7);
         @include rounded(5px);
-        padding: 10px 10px;
-        color: #FFF;
-        font-size: 18px;
-        font-weight: 700;
-        &:hover{ background-color: #FFF; color:#4d4d4d;}
+        padding: 15px;
       }
     }
-  }
-  .pane-node {
-    height:450px;
-    margin-top: 40px;
-    font-size: 1.25em;
-    @include rounded(5px);
-    padding: 20px 30px;
-    .links a{
-      background-color: rgba(255,255,255, 0.7);
-      @include rounded(5px);
-      padding: 15px;
+
+    &.intro-video{
+      height:auto;
+      background-color: #f7f8f2;
+      margin-top:0; padding-top:0;
+      .field-name-field-emvideo{
+        .embedded-video{
+          margin:0 auto;
+          @media #{$small-only}{
+            width:320px; height:180px;
+          }
+          @media #{$medium-only}{
+            width:640px; height:360px;
+          }
+          @media #{$large-only}{
+            width:800px; height:450px;
+          }
+          @media #{$xlarge-up}{
+            width:1024px; height:576px;
+          }
+          .player, iframe{
+            width:100%; height:100%;
+          }
+
+        }
+      }
+      .field-name-title-field{
+        display:none;
+      }
+
+      .field-name-body{
+        // @include grid-row();
+        margin-top:1em;
+        text-align: center;
+        p{
+          // @include grid-column(6);
+          text-align: left;
+          @include inlineblock();
+          width:35%; margin-left:2%;
+          font-size:0.756em;
+        }
+      }
+
     }
-    .content{
-      margin-bottom: 20px;
+
+    &.pane-menu-menu-home-v2{
+      margin:2em 0;
+      ul.menu{
+        margin: 0px; text-align: center;
+      }
+      li{
+        margin:0 1em 0 0; padding:0px; list-style: none;
+        @include inlineblock();
+        a{
+          background-color: #4d4d4d;
+          @include rounded(5px);
+          padding: 5px 12px 7px;
+          color: $creme;
+          font-size: 18px;
+          font-weight: 500;
+          transition:opacity,background-color 0.2s ease-out;
+        }
+
+        &:nth-child(1){
+         // a{color:$orange;}
+         &:hover a{background-color: $orange; color:#4d4d4d;}
+        }
+        &:nth-child(2){
+         // a{color:$vertclair;}
+         &:hover a{background-color: $vertclair; color:#4d4d4d;}
+        }
+        &:nth-child(3){
+         // a{color:$bleuclair;}
+         &:hover a{background-color: $bleuclair; color:#4d4d4d;}
+        }
+        &:nth-child(4){
+         // a{color:$jaune;}
+         &:hover a{background-color: $jaune; color:#4d4d4d;}
+        }
+        &:nth-child(5){
+         // a{color:$rose;}
+         &:hover a{background-color: $rose; color:#4d4d4d;}
+        }
+        &:nth-child(6){
+         // a{color:$violet;}
+         &:hover a{background-color: $violet; color:#4d4d4d;}
+        }
+        &:nth-child(7){
+         // a{color:$rouge;}
+         &:hover a{background-color: $rouge; color:#4d4d4d;}
+       }
+      }
     }
+
     &.showroom{
-      background: url("http://carnet-aux-petites-choses.fr/wp-content/uploads/2015/02/un-oeil-sur-la-matiere-materiO-26_gagaone.jpg");
+      height:450px;
+      margin-top: 15px;
+      background-color: #fff;
+      // background: url("http://carnet-aux-petites-choses.fr/wp-content/uploads/2015/02/un-oeil-sur-la-matiere-materiO-26_gagaone.jpg");
       background-size: cover;
       position: relative;
-      .content{
-        background-color: rgba(255,255,255, 0.7);
-        width: 40%;
-        @include rounded(5px);
-        padding: 20px 30px;
+      .pane-content{
+        width:100%; height:100%; position:relative;
+        .node{position:absolute;height:100%;width:100%;}
+        .field-name-field-bandeau{
+          position:absolute; width:100%; height:100%; overflow:hidden;
+          img{width:100%; margin-top:-10%;}
+        }
+        .group-content{
+          position:relative;
+          z-index:2;
+          width:30%;
+          margin:3em 2em;
+          background-color: rgba(255,255,255, 0.7);
+          padding:1em;
+          @include rounded(5px);
+          .field-name-title-field{
+            font-size: 2.1em; font-weight: 300;
+          }
+          .field-name-body{
+            margin-top: 1em;
+          }
+        }
+
       }
+
+
       &:after{
         content:url("../img/bulle.png");
         transform: scale(0.8);
@@ -2808,10 +2948,28 @@ body.page-node-11187{
       }
     }
     &.bdd{
+      height:450px;
+      margin-top: 30px;
       background-color: #FFF;
       position: relative;
       .links a{background-color: #e6e6e6;}
-      .pane-content{width:30%; float:right;}
+
+      .field-name-field-bandeau{
+        @include inlineblock(); width:60%;
+      }
+      .group-content{
+        @include inlineblock(); width:35%;
+        background-color: rgba(255,255,255, 0.7);
+        padding:1em;
+        @include rounded(5px);
+        .field-name-title-field{
+          font-size: 2.1em; font-weight: 300;
+        }
+        .field-name-body{
+          margin-top: 1em;
+        }
+      }
+
       &:after{
         content:url("../img/boule.png");
         transform: scale(0.8);
@@ -2821,47 +2979,121 @@ body.page-node-11187{
       }
     }
     &.formations{
+      position: relative;
+      height:300px;
+      margin-top: 30px;
       background-color: #000;
       color: #FFF;
-      padding-right: 20%;
-      position: relative;
       a{color: #FFF;}
-      .pane-title, .pane-content{/*width: 60%; float:right;*/}
-      .pane-title:before{
-        content:url("../img/formations.png");
-        transform: scale(0.7);
-        float: left;
-        position: relative;
-        top:-20px;
-        margin: 0px 90px 0px 50px;
+
+      .node{
+        padding:0 0 0 30%; width:70%;
+
+        &:before{
+          content:" ";
+          background: transparent url("../img/formations.png") no-repeat center center;
+          background-clip: padding-box;
+          background-size: contain;
+          position: absolute; left:0;
+          // border: 1px solid red;
+          z-index: 2;
+          width:30%; height:100%;
+          // padding:0.5em;
+        }
+      }
+
+      .group-content{
+        padding:1em; position:relative;
+        .field-name-title-field{
+          font-size: 2.1em; font-weight: 300;
+        }
+        .field-name-body{
+          margin-top: 1em;
+        }
       }
     }
     &.services{
       background-color: #FFF;
-      .pane-title, .pane-content{/*width: 60%; float:left;*/}
-      .pane-title:before{
-        content:url("../img/services.png");
-        transform: scale(0.8);
-        float: right;
-        position: relative;
-        top:-20px;
-        margin: 0px 90px 0px 50px;
+      height:300px;
+      margin-top: 30px;
+
+      .node{
+        padding:0 30% 0 0; width:70%;
+
+        &:before{
+          content:" ";
+          background: transparent url("../img/services.png") no-repeat center center;
+          background-clip: padding-box;
+          background-size: contain;
+          position: absolute; right:0;
+          // border: 1px solid red;
+          z-index: 2;
+          width:30%; height:100%;
+          // padding:0.5em;
+        }
+      }
+
+      .group-content{
+        padding:1em; position:relative;
+        .field-name-title-field{
+          font-size: 2.1em; font-weight: 300;
+        }
+        .field-name-body{
+          margin-top: 1em;
+        }
       }
     }
   }
   //mini panneau news
-  .pane-news-home-v2{
-    margin-top: 40px;
+  >.panel-panel>div>.pane-news-home-v2{
+    background-color: #e6e6e6; @include rounded(10px);
+    margin-top: 30px; padding-top: 1em;
+    // padding:0;
     position: relative;
     // .panel-col-first{width:70%;}
     // .panel-col-last{width:29.9%;}
     h2{font-size: 30px;}
+
+    #mini-panel-news_home_v2 .center-wrapper{
+      @include grid-row();
+      .panel-panel{
+        overflow:hidden;
+        .inside{margin:0;}
+      }
+      .panel-col-first{@include grid-column(7);}
+      .panel-col-last{@include grid-column(4);}
+    }
+    #mini-panel-news_home_v2 .panel-col-bottom{
+      @include grid-row(); margin-top: 1.5em; margin-bottom: 1.5em;
+      >.inside{
+        @include grid-column(12);
+      }
+    }
+
     .view-news-home-v2{
-      .views-row{width: 30%; display: inline-block;}
+      .views-row{@include inlineblock();}
     }
     .node-simplenews{
-      h1{background-color: #FFF; text-align: center; padding: 20px;}
+      @include rounded(5px); background-color: #FFF;
+      @include drop-shadow(0, 0, 5px, 0.2);
+      @include transition-simply-prefix(box-shadow 0.3s ease-out);
+      overflow:hidden;
+      position:relative;
+      margin:7px;
+      >a{
+        position:absolute;
+        bottom:0; width:100%;
+        background-color: #FFF;
+        text-align: center;
+        h1{
+          padding: 10px; margin:0;
+          font-size:1em;
+        }
+      }
+
     }
+
+    //deco
     &:after{
       content:url("../img/point.png");
       //transform: scale(1);
@@ -2870,4 +3102,11 @@ body.page-node-11187{
       right: 0px;
     }
   }
-}
+}
+
+
+
+
+
+@import "misc.scss";
+// end

+ 17 - 0
sites/all/themes/gui/materiobasetheme/templates/node--page--homeblock.tpl.php

@@ -0,0 +1,17 @@
+<!-- start article.node -->
+<article class="<?php print $classes; ?>">
+
+    <?php
+      hide($content['comments']);
+      hide($content['links']);
+      print render($content);
+    ?>
+
+  <?php if ($links = render($content['links'])): ?>
+    <nav class="nav">
+     <?php print $links; ?>
+    </nav>
+  <?php endif; ?>
+
+</article>
+<!-- end article.node -->

+ 28 - 0
sites/all/themes/gui/materiobasetheme/templates/node--simplenews--teaser.tpl.php

@@ -0,0 +1,28 @@
+<?php
+
+?>
+
+<!-- start article.node -->
+<article class="<?php print $classes; ?>">
+
+  <?php if ($page == 0): ?>
+  <a href="<?php print $node_url?>"><h1 class="nodetitle"><?php print $title?></h1></a>
+  <?php endif; ?>
+
+  <section class="content">
+    <?php
+      hide($content['comments']);
+      hide($content['links']);
+      print render($content);
+    ?>
+  </section>
+
+  <?php //if ($submitted): ?>
+  <!-- <aside class="submitted"> -->
+  <?php //print $submitted?>
+  <!-- </aside> -->
+  <?php //endif; ?>
+
+
+</article>
+<!-- end article.node -->

+ 51 - 46
sites/all/themes/gui/materiobasetheme/templates/page.tpl.php

@@ -67,72 +67,77 @@
  */
 ?>
 <header id="header">
-  <hgroup class="logo"> <?php if ($site_title) { print $site_title; }?> </hgroup>		
+  <div class="inner">
+    <hgroup class="logo"> <?php if ($site_title) { print $site_title; }?> </hgroup>
 
-	<?php if ($page['headerblock_left'] || $page['headerblock_middle'] || $page['headerblock_right']): ?>
-		<div id="header-blocks">
-			<?php print render($page['headerblock_left']); ?>
-			<?php print render($page['headerblock_middle']); ?>
-			<?php print render($page['headerblock_right']); ?>
-    </div>
-	<?php endif; ?>
-	
-	<?php if ($breadcrumb): ?>
-    <section id="breadcrumb"><?php print $breadcrumb; ?></section>
-  <?php endif; ?>
-	
+  	<?php if ($page['headerblock_left'] || $page['headerblock_middle'] || $page['headerblock_right']): ?>
+  		<div id="header-blocks">
+  			<?php print render($page['headerblock_left']); ?>
+  			<?php print render($page['headerblock_middle']); ?>
+  			<?php print render($page['headerblock_right']); ?>
+      </div>
+  	<?php endif; ?>
+
+  	<?php if ($breadcrumb): ?>
+      <section id="breadcrumb"><?php print $breadcrumb; ?></section>
+    <?php endif; ?>
+  </div>
 </header><!-- /header -->
 
-<div id="utilities">
-	<?php print render($page['highlighted']); ?>
+<?php if ($page['content_top'] || $page['highlighted'] || $page['tool_bar'] || $primary_local_tasks || $secondary_local_tasks || $action_links): ?>
+  <div id="utilities">
+  	<div class="inner">
+      <?php print render($page['highlighted']); ?>
 
-	<?php print render($page['content_top']); ?>
+    	<?php print render($page['content_top']); ?>
 
-	<?php print render($page['tool_bar']); ?>
+    	<?php print render($page['tool_bar']); ?>
 
-	<?php if ($primary_local_tasks || $secondary_local_tasks || $action_links): ?>
-    <div id="tasks">
-      <?php if ($primary_local_tasks): ?>
-        <ul class="tabs primary"><?php print render($primary_local_tasks); ?></ul>
-      <?php endif; ?>
-      <?php if ($secondary_local_tasks): ?>
-        <ul class="tabs secondary"><?php print render($secondary_local_tasks); ?></ul>
-      <?php endif; ?>
-      <?php if ($action_links = render($action_links)): ?>
-        <ul class="action-links"><?php print $action_links; ?></ul>
+    	<?php if ($primary_local_tasks || $secondary_local_tasks || $action_links): ?>
+        <div id="tasks">
+          <?php if ($primary_local_tasks): ?>
+            <ul class="tabs primary"><?php print render($primary_local_tasks); ?></ul>
+          <?php endif; ?>
+          <?php if ($secondary_local_tasks): ?>
+            <ul class="tabs secondary"><?php print render($secondary_local_tasks); ?></ul>
+          <?php endif; ?>
+          <?php if ($action_links = render($action_links)): ?>
+            <ul class="action-links"><?php print $action_links; ?></ul>
+          <?php endif; ?>
+        </div>
       <?php endif; ?>
     </div>
-  <?php endif; ?>
-</div><!-- /utilities -->
+  </div><!-- /utilities -->
+<?php endif; ?>
 
 <div id="main">
-      
-	  <?php //print render($page['sidebar_first']); ?>	       	
-	
-		<section id="center">	
+
+	  <?php //print render($page['sidebar_first']); ?>
+
+		<section id="center">
 
 				<?php if ($show_messages && $messages): print $messages; endif; ?>
 
 				<?php print render($page['help']); ?>
-			
+
 				<?php if($title): ?><h1 class="page-title"><?php print $title ?></h1><?php endif; ?>
 				<?php print render($page['content']); ?>
 
 				<?php print render($page['content_bottom']); ?>
-	
-		</section><!-- /center -->					
-  
+
+		</section><!-- /center -->
+
 		<?php //print render($page['sidebar_second']) ?>
-          
-</div><!-- /main -->	
-		
+
+</div><!-- /main -->
+
 <footer id="footer">
-		
+
 		<?php print render($page['footer_top']); ?>
 
-		<?php if ($page['footer_left'] || $page['footer_middle_left'] || $page['footer_middle_right'] || $page['footer_right']): ?> 	        
-      <div class="footer-blocks">					
-				
+		<?php if ($page['footer_left'] || $page['footer_middle_left'] || $page['footer_middle_right'] || $page['footer_right']): ?>
+      <div class="footer-blocks">
+
 				<?php print render($page['footer_left']); ?>
 				<?php print render($page['footer_middle-left']); ?>
 				<?php print render($page['footer_midle-right']); ?>
@@ -141,6 +146,6 @@
       </div>
 		<?php endif; ?>
 
-		<?php print render($page['footer_bottom']); ?> 		
-</footer><!-- /footer -->	
+		<?php print render($page['footer_bottom']); ?>
+</footer><!-- /footer -->
 

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác