Browse Source

meilleur mise en forme thématique

Yves Chedemois 14 years ago
parent
commit
521ddcddc8
2 changed files with 4 additions and 7 deletions
  1. BIN
      catalogue_template.odt
  2. 4 7
      fgcf.odt.inc

BIN
catalogue_template.odt


+ 4 - 7
fgcf.odt.inc

@@ -108,7 +108,8 @@ function fgcf_odt_replace_node_formation($segment, $node) {
     'formation_support',
     'formation_sanction',
     'formation_public',
-    'formation_thematique',
+    'formation_thematique_1',
+    'formation_thematique_2',
   );
   // Initialise replacements with 'unspecified' text.
   $replace = array_fill_keys($keys, '-');
@@ -237,17 +238,13 @@ function fgcf_odt_replace_node_formation($segment, $node) {
       $parents = taxonomy_get_parents($term->tid);
       if ($parents) {
         $parent = current($parents);
-        $values[] = strip_tags(filter_xss_admin($parent->description));
+        $replace['formation_thematique_1'] = strip_tags(filter_xss_admin($parent->description));
       }
 
-      $values[] = strip_tags(filter_xss_admin($term->description));
+      $replace['formation_thematique_2'] = strip_tags(filter_xss_admin($term->description));
       break;
     }
   }
-  if ($values) {
-    // @todo mise en forme ?
-    $replace['formation_thematique'] = implode(' / ', $values);
-  }
 
   _fgcf_odt_replace_segment($segment, $replace);
 }