big update

2018-09-07 10:54:01 +02:00
parent 8fb74fdf95
commit fdd2f67cc6
243 changed files with 18538 additions and 2087 deletions
--- a/sites/default/modules/features/popsu_structure/popsu_structure.box.inc
+++ b/sites/default/modules/features/popsu_structure/popsu_structure.box.inc
@@ -19,21 +19,19 @@ function popsu_structure_default_box() {
  $box->description = 'Google Analytics tracking code';
  $box->options = array(
    'body' => array(
-      'value' => '<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push([\'_setAccount\', \'UA-37066369-1\']);
-  _gaq.push([\'_trackPageview\']);
-
-  (function() {
-    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;
-    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';
-    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
+      'value' => '<script>
+  (function(i,s,o,g,r,a,m){i[\'GoogleAnalyticsObject\']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,\'script\',\'//www.google-analytics.com/analytics.js\',\'ga\');
+
+  ga(\'create\', \'UA-39618469-1\', \'archi.fr\');
+  ga(\'send\', \'pageview\');
+
 </script>',
      'format' => 'php_code',
    ),
+    'additional_classes' => '',
  );
  $export['popsu_google_analytics'] = $box;

@@ -46,9 +44,9 @@ function popsu_structure_default_box() {
  $box->description = 'POPSU Logo Baseline (box)';
  $box->options = array(
    'body' => array(
-      'value' => 'PLATE-FORME<br>
-D’OBSERVATION<br>
-DES PROJETS<br>
+      'value' => 'PLATE-FORME<br>
+D’OBSERVATION<br>
+DES PROJETS<br>
 DE STRATÉGIES URBAINES',
      'format' => 'php_code',
    ),
@@ -103,6 +101,55 @@ DE STRATÉGIES URBAINES',
  );
  $export['popsu_logo_popsueurope'] = $box;

+  $box = new stdClass();
+  $box->disabled = FALSE; /* Edit this to true to make a default box disabled initially */
+  $box->api_version = 1;
+  $box->delta = 'popsu_logo_popsumetropoles';
+  $box->plugin_key = 'simple';
+  $box->title = '<none>';
+  $box->description = 'POPSU Logo POPSU Metropoles (box)';
+  $box->options = array(
+    'body' => array(
+      'value' => '<a class="logo" href="popsu-metropoles/accueil" rel="home" title="Aller à l\'accueil de POPSU Metropoles">Aller à l\'accueil de POPSU Metropoles</a>',
+      'format' => 'php_code',
+    ),
+    'additional_classes' => '',
+  );
+  $export['popsu_logo_popsumetropoles'] = $box;
+
+  $box = new stdClass();
+  $box->disabled = FALSE; /* Edit this to true to make a default box disabled initially */
+  $box->api_version = 1;
+  $box->delta = 'popsu_logo_popsumonde';
+  $box->plugin_key = 'simple';
+  $box->title = '<none>';
+  $box->description = 'POPSU Logo POPSU Monde (box)';
+  $box->options = array(
+    'body' => array(
+      'value' => '<a class="logo" href="popsu-monde/accueil" rel="home" title="Aller à l\'accueil de POPSU Monde">Aller à l\'accueil de POPSU Monde</a>
+',
+      'format' => 'php_code',
+    ),
+    'additional_classes' => '',
+  );
+  $export['popsu_logo_popsumonde'] = $box;
+
+  $box = new stdClass();
+  $box->disabled = FALSE; /* Edit this to true to make a default box disabled initially */
+  $box->api_version = 1;
+  $box->delta = 'popsu_logo_popsuterrritoires';
+  $box->plugin_key = 'simple';
+  $box->title = '<none>';
+  $box->description = 'POPSU Logo POPSU Territoires (box)';
+  $box->options = array(
+    'body' => array(
+      'value' => '<a class="logo" href="/popsu-territoires/accueil" rel="home" title="Aller à l\'accueil de POPSU Territoires">Aller à l\'accueil de POPSU Territoires</a>',
+      'format' => 'php_code',
+    ),
+    'additional_classes' => '',
+  );
+  $export['popsu_logo_popsuterrritoires'] = $box;
+
  $box = new stdClass();
  $box->disabled = FALSE; /* Edit this to true to make a default box disabled initially */
  $box->api_version = 1;
@@ -112,8 +159,8 @@ DE STRATÉGIES URBAINES',
  $box->description = 'POPSU Trigger de menu niveau 1 (box)';
  $box->options = array(
    'body' => array(
-      'value' => '<div id="menu-trigger-level1" class="menu-trigger-level1">Retour au menu</div>
-<div id="menu-trigger-level1-off" class="menu-trigger-level1">Masquer le menu</i></div>
+      'value' => '<div id="menu-trigger-level1" class="menu-trigger-level1">Retour au menu</div>
+<div id="menu-trigger-level1-off" class="menu-trigger-level1">Masquer le menu</i></div>
 <div id="menu-trigger-level1-static" class="menu-trigger-level1"><a href="/popsu1/accueil">Retour au menu</a></div>',
      'format' => 'php_code',
    ),
--- a/sites/default/modules/features/popsu_structure/popsu_structure.context.inc
+++ b/sites/default/modules/features/popsu_structure/popsu_structure.context.inc
@@ -32,18 +32,18 @@ function popsu_structure_context_default_contexts() {
          'region' => 'content',
          'weight' => '-10',
        ),
-        'menu-menu-popsu-menu-footer' => array(
-          'module' => 'menu',
-          'delta' => 'menu-popsu-menu-footer',
-          'region' => 'footer',
-          'weight' => '-10',
-        ),
        'menu-menu-popsu-footer-droite' => array(
          'module' => 'menu',
          'delta' => 'menu-popsu-footer-droite',
          'region' => 'footer',
          'weight' => '-10',
        ),
+        'menu-menu-popsu-menu-footer' => array(
+          'module' => 'menu',
+          'delta' => 'menu-popsu-menu-footer',
+          'region' => 'footer',
+          'weight' => '-10',
+        ),
      ),
    ),
  );
--- a/sites/default/modules/features/popsu_structure/popsu_structure.features.inc
+++ b/sites/default/modules/features/popsu_structure/popsu_structure.features.inc
@@ -4,71 +4,19 @@
 * popsu_structure.features.inc
 */

-/**
- * Implements hook_block_class_features_default_class().
- */
-function popsu_structure_block_class_features_default_class() {
-  return array(
-    'menu:menu-popsu-menu-footer' => array(
-      'module' => 'menu',
-      'delta' => 'menu-popsu-menu-footer',
-      'css_classes' => 'menu-footer menu-inline',
-    ),
-    'menu:menu-popus-menu-header' => array(
-      'module' => 'menu',
-      'delta' => 'menu-popus-menu-header',
-      'css_classes' => 'span1 menu-header',
-    ),
-    'menu_block:1' => array(
-      'module' => 'menu_block',
-      'delta' => '1',
-      'css_classes' => 'left-nav left-nav-level-2',
-    ),
-    'menu_block:2' => array(
-      'module' => 'menu_block',
-      'delta' => '2',
-      'css_classes' => 'left-nav left-nav-level-0',
-    ),
-    'menu_block:3' => array(
-      'module' => 'menu_block',
-      'delta' => '3',
-      'css_classes' => 'left-nav left-nav-level-1',
-    ),
-    'menu_block:4' => array(
-      'module' => 'menu_block',
-      'delta' => '4',
-      'css_classes' => 'left-nav left-nav-level-1',
-    ),
-    'menu_block:5' => array(
-      'module' => 'menu_block',
-      'delta' => '5',
-      'css_classes' => 'left-nav left-nav-level-2',
-    ),
-    'menu_block:6' => array(
-      'module' => 'menu_block',
-      'delta' => '6',
-      'css_classes' => 'left-nav left-nav-level-1',
-    ),
-  );
-}
-
 /**
 * Implements hook_ctools_plugin_api().
 */
-function popsu_structure_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
+function popsu_structure_ctools_plugin_api($module = NULL, $api = NULL) {
  if ($module == "boxes" && $api == "box") {
    return array("version" => "1");
  }
-  list($module, $api) = func_get_args();
  if ($module == "context" && $api == "context") {
    return array("version" => "3");
  }
-  list($module, $api) = func_get_args();
  if ($module == "panels" && $api == "layouts") {
    return array("version" => "1");
  }
-  list($module, $api) = func_get_args();
  if ($module == "strongarm" && $api == "strongarm") {
    return array("version" => "1");
  }
--- a/sites/default/modules/features/popsu_structure/popsu_structure.info
+++ b/sites/default/modules/features/popsu_structure/popsu_structure.info
@@ -2,7 +2,6 @@ name = POPSU Structure du site
 description = POPSU - Structure du site
 core = 7.x
 package = POPSU
-php = 5.2.4
 version = 7.x-1.0-beta9
 project = popsu_structure
 dependencies[] = block
@@ -22,19 +21,14 @@ dependencies[] = search
 dependencies[] = uuid
 dependencies[] = uuid_features
 dependencies[] = uuid_path
-features[block_class][] = menu:menu-popsu-menu-footer
-features[block_class][] = menu:menu-popus-menu-header
-features[block_class][] = menu_block:1
-features[block_class][] = menu_block:2
-features[block_class][] = menu_block:3
-features[block_class][] = menu_block:4
-features[block_class][] = menu_block:5
-features[block_class][] = menu_block:6
 features[box][] = popsu_google_analytics
 features[box][] = popsu_logo_baseline
 features[box][] = popsu_logo_popsu1
 features[box][] = popsu_logo_popsu2
 features[box][] = popsu_logo_popsueurope
+features[box][] = popsu_logo_popsumetropoles
+features[box][] = popsu_logo_popsumonde
+features[box][] = popsu_logo_popsuterrritoires
 features[box][] = popsu_menu_trigger
 features[context][] = popsu-structure-global
 features[context][] = popsu-structure-homepage
@@ -43,5 +37,5 @@ features[ctools][] = boxes:box:1
 features[ctools][] = context:context:3
 features[ctools][] = panels:layouts:1
 features[ctools][] = strongarm:strongarm:1
-features[features_api][] = api:1
+features[features_api][] = api:2
 features[panels_layout][] = popsu_70_30_accordion