Changeset 93773 in spip-zone

Timestamp:

Dec 17, 2015, 11:18:30 PM (4 years ago)

Author:

p@…

Message:

Simplifier le pipeline CSS

Location:

_plugins_/foundation_6/trunk

Files:

• foundation_6_pipelines.php (modified) (1 diff)
• inc/foundation.php (modified) (1 diff)

_plugins_/foundation_6/trunk/foundation_6_pipelines.php

@@ -32 +32 @@
 */
 function foundation_6_insert_head_css ($flux) {
-  include_spip('inc/foundation');
-  return foundation_get_css($flux);
+
+    // Si on est en mode app, on revoie le bon squelette
+  if (_FOUNDATION_SASS) {
+      $flux .= recuperer_fond('inclure/css/head-foundation-app');
+  }
+  else {
+    $flux .= recuperer_fond('inclure/css/head-foundation');
+  }
+
+  return $flux;
 }

_plugins_/foundation_6/trunk/inc/foundation.php

@@ -20 +20 @@
   return wrap($matches[0], '<div class="flex-video'.$vimeo.'">');;
 }
-
-
-/**
- * Récupération des fichier css de foundation
- */
-function foundation_get_css($flux = '') {
-
-  // On lit la configuration du plugin pour savoir quel version de Foundation charger.
-  $config = lire_config('foundation');
-
-  // Si on est en mode app, on revoie le bon squelette
-  if (_FOUNDATION_SASS) {
-      $flux .= recuperer_fond('inclure/css/head-foundation-app');
-      return $flux;
-  }
-
-  // On renvoie le flux head avec le squelette foundation correspondant.
-  if ($config['variante'] == '3')
-    return $flux.recuperer_fond('inclure/css/head-foundation-3');
-  elseif ($config['variante'] == '4')
-    return $flux.recuperer_fond('inclure/css/head-foundation-4');
-  elseif ($config['variante'] == '5')
-    return $flux.recuperer_fond('inclure/css/head-foundation-5');
-  // Si foundation est désactivé, on revoie directement le flux, sans aller chercher le head-foundation.
-  else
-    return $flux;
-}