Changeset 75121 in spip-zone

Timestamp:

Aug 30, 2013, 12:01:11 PM (8 years ago)

Author:

marcimat@…

Message:

Pour l'écriture simplifiée des @var, en fait, c'est dans le template twig que ça doit se passer.

Location:

_galaxie_/code.spip.net/autodoc/trunk

Files:

• src/autodoc/Plugin/Core/Compiler/Pass/VarTagImprovement.php (deleted)
• src/autodoc/Plugin/Core/ServiceProvider.php (modified) (1 diff)
• templates/zora/inclure/descriptions/constants.twig (modified) (2 diffs)
• templates/zora/inclure/descriptions/properties.twig (modified) (2 diffs)

_galaxie_/code.spip.net/autodoc/trunk/src/autodoc/Plugin/Core/ServiceProvider.php

@@ -66 +66 @@
         $app['compiler']->insert(new SpipTagsCollector(),    SpipTagsCollector::COMPILER_PRIORITY);
         $app['compiler']->insert(new ApisCollector(),        ApisCollector::COMPILER_PRIORITY);
-        $app['compiler']->insert(new VarTagImprovement(),    VarTagImprovement::COMPILER_PRIORITY);
         $app['compiler']->insert(new Statistics(),           Statistics::COMPILER_PRIORITY);
     }

_galaxie_/code.spip.net/autodoc/trunk/templates/zora/inclure/descriptions/constants.twig

@@ -14 +14 @@
                                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#{{ id }}" href="#{{ ancre }}">
                                         <strong>{{ nom }}</strong>
+                                        {# résumé indiqué, sinon dans @var type Résumé #}
                                         {% if constant.summary %}
                                                 <div class='description'>{{ constant.summary|markdown|raw }}</div>
+                                        {% elseif constant.tags.var.0.description %}
+                                                <div class='description'>{{ constant.tags.var.0.description|markdown|raw }}</div>
                                         {% endif %}
                                 </a>
@@ -22 +25 @@
                                 <div class="accordion-inner">
                                         {% if constant.description %}
-                                        <div class="presentation">
-                                                {{ constant.description|markdown|raw }}
-                                        </div>
+                                                <div class="presentation">{{ constant.description|markdown|raw }}</div>
+                                        {% endif %}
+                                        {# résumé indiqué + @var type Résumé, afficher le résumé du @var #}
+                                        {% if constant.summary and constant.tags.var.0.description %}
+                                                <div class="presentation">{{ constant.tags.var.0.description|markdown|raw }}</div>
                                         {% endif %}
 

_galaxie_/code.spip.net/autodoc/trunk/templates/zora/inclure/descriptions/properties.twig

@@ -14 +14 @@
                                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#{{ id }}" href="#{{ ancre }}">
                                         <strong>{{ nom }}</strong>
+                                        {# résumé indiqué, sinon dans @var type Résumé #}
                                         {% if property.summary %}
                                                 <div class='description'>{{ property.summary|markdown|raw }}</div>
+                                        {% elseif property.tags.var.0.description %}
+                                                <div class='description'>{{ property.tags.var.0.description|markdown|raw }}</div>
                                         {% endif %}
                                 </a>
@@ -22 +25 @@
                                 <div class="accordion-inner">
                                         {% if property.description %}
-                                        <div class="presentation">
-                                                {{ property.description|markdown|raw }}
-                                        </div>
+                                                <div class="presentation">{{ property.description|markdown|raw }}</div>
+                                        {% endif %}
+                                        {# résumé indiqué + @var type Résumé, afficher le résumé du @var #}
+                                        {% if property.summary and property.tags.var.0.description %}
+                                                <div class="presentation">{{ property.tags.var.0.description|markdown|raw }}</div>
                                         {% endif %}