Handle errors better in the front end

This commit makes sure link and text is still readable. It also propagrate the error flag for each language into the parent field.
DeuxHuitHuit · Jun 21, 2017 · 294e1e9 · 294e1e9
1 parent 55f8a10
commit 294e1e9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/assets/multilingual_oembed_field.publish.css b/assets/multilingual_oembed_field.publish.css
@@ -4,4 +4,12 @@
 
 .field-multilingual-oembed .invalid .tab-panel label > div > i {
 	color: #a9a9a9;
-}
+}
+
+.field-multilingual-oembed .invalid .container span {
+	color: #222;
+}
+
+.field-multilingual-oembed .invalid .container a {
+	color: #3f69a5;
+}
diff --git a/fields/field.multilingual_oembed.php b/fields/field.multilingual_oembed.php
@@ -427,6 +427,14 @@ public function displayPublishPanel(&$wrapper, $data = null, $flagWithError = nu
         $all_langs = FLang::getAllLangs();
         $langs     = FLang::getLangs();
 
+        $errors = !$flagWithError ? array() : array_reduce(explode('.', $flagWithError), function ($carry, $item) {
+            $matches = array();
+            if (preg_match('/\[([a-z]+)\] (.+)/', $item, $matches) === 1) {
+                $carry[trim($matches[1])] = trim($matches[2]);
+            }
+            return $carry;
+        }, array());
+
         $wrapper->setAttribute('class', $wrapper->getAttribute('class') . ' field-multilingual field-oembed field-multilingual-oembed');
         $container = new XMLElement('div', null, array('class' => 'container'));
 
@@ -514,7 +522,13 @@ public function displayPublishPanel(&$wrapper, $data = null, $flagWithError = nu
                 'thumbnail_url' => $data["thumbnail_url-$lc"],
                 'driver' => $data["driver-$lc"]
             );
-            parent::displayPublishPanel($div, $translatedData, false, $fieldnamePrefix, $fieldnamePostfix . "[$lc]");
+            parent::displayPublishPanel(
+                $div,
+                $translatedData,
+                !isset($errors[$lc]) ? null : $errors[$lc],
+                $fieldnamePrefix,
+                $fieldnamePostfix . "[$lc]"
+            );
             $container->appendChild($div);
         }
         $this->set('label', $label_text);