Iterate in the template, and improve layout while we are at it.

horde · Aug 13, 2016 · 9ff75ed · 9ff75ed
1 parent ac3c51c
commit 9ff75ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/horde/lib/Block/Metar.php b/horde/lib/Block/Metar.php
@@ -215,25 +215,9 @@ protected function _content()
         }
 
         // Clouds.
-        // @todo - fix units, fix indentation
-        if (isset($weather['clouds'])) {
-            $view->clouds = '';
-            foreach ($weather['clouds'] as $cloud) {
-                if (!empty($view->clouds)) {
-                    $view->clouds .= '<br />  ';
-                }
-                if (isset($cloud['height'])) {
-                    $view->clouds .= sprintf(
-                        _("%s at %s %s"),
-                        $cloud['amount'],
-                        $cloud['height'],
-                        $units['height']
-                    );
-                } else {
-                    $view->clouds .= $cloud['amount'];
-                }
-            }
-        }
+        $view->clouds = isset($weather['clouds'])
+            ? $weather['clouds']
+            : array();
 
         // Remarks.
         if (isset($weather['remark'])) {

diff --git a/horde/templates/block/metar_content.html.php b/horde/templates/block/metar_content.html.php
@@ -24,7 +24,15 @@
     <strong><?php echo _("Humidity")?>:</strong> <?php echo $this->weather['humidity']?>
   <?php endif;?>
   <?php if (isset($this->clouds)):?>
-    <br /><strong><?php echo _("Clouds")?>:</strong> <?php echo $this->clouds ?>
+    <br /><strong><?php echo _("Clouds")?>:</strong>
+     <?php foreach ($this->clouds as $clouds): ?>
+        <div style="margin-left: 8px;">
+          <?php if (isset($clouds['height'])):?>
+            <?php echo sprintf(_("%s at %s %s"), $clouds['amount'], $clouds['height'], $this->units['height']);?></div>
+          <?php elseif (!empty($clouds)): ?>
+            <?php echo $clouds['amount']?>
+         <?php endif;?>
+     <?php endforeach;?>
   <?php endif;?>
   <?php if (isset($this->weather['conditions'])):?>
     <br /><strong><?php echo _("Conditions")?>:</strong> <?php echo $this->weather['conditions'] ?>