Merge pull request #2936 from WPO-Foundation/master

update prod
catchpoint · Jun 26, 2023 · dafe6fd · dafe6fd
2 parents ff4c5c7 + 1c5a2d4
commit dafe6fd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/www/assets/css/pagestyle2.css b/www/assets/css/pagestyle2.css
@@ -5384,6 +5384,7 @@ label.test_preset_profile {
   max-width: 34rem;
   margin: 0 auto;
   padding: 3rem;
+  margin-top: 3rem;
 }
 
 .testerror h1 {

diff --git a/www/assets/js/site.js b/www/assets/js/site.js
@@ -252,6 +252,7 @@ async function initCodeField(source, language = "js") {
   const codeArea = new CodeFlask(codeEl, {
     language,
   });
+  codeArea.elTextarea.placeholder = originalTextarea.placeholder.replace(/\\n/g, '\n');
   codeArea.onUpdate((code) => (hidden.value = code));
   window.codeFlasks[source] = codeArea;
 }

diff --git a/www/home.php b/www/home.php
@@ -932,7 +932,7 @@ function enableDisableLHSimple(){
                                                         document.addEventListener('DOMContentLoaded', () => initFileReader('custom_metrics_file', 'custom'));
                                                     </script>
                                                 </p>
-                                                <textarea name="custom" class="large" id="custom" cols="0" rows="0"></textarea>
+                                                <textarea name="custom" class="large" id="custom" cols="0" rows="0" placeholder="[metricname]\nreturn code;"></textarea>
                                             </div>
                                             <div class="notification-container">
                                                 <div class="notification">

diff --git a/www/runtest.php b/www/runtest.php
@@ -1414,6 +1414,7 @@ function buildSelfHost($hosts)
             header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
             echo json_encode($ret);
         } else {
+            $body_class = 'common';
             $tpl = new Template('errors');
             if ($error == 'Not enough runs available') {
                 echo $tpl->render('runlimit');
@@ -1445,6 +1446,7 @@ function buildSelfHost($hosts)
         header("Content-type: application/json");
         echo json_encode($ret);
     } elseif (strlen($error)) {
+        $body_class = 'common';
         $tpl = new Template('errors');
         if ($error == 'Not enough runs available') {
             echo $tpl->render('runlimit');

diff --git a/www/templates/layouts/default.php b/www/templates/layouts/default.php
@@ -19,6 +19,7 @@
     global $page_description;
     global $cdnPath;
     global $support_link;
+    global $body_class;
 
     $page_title ??= 'WebPageTest';
     $body_class = $body_class ? ' class="' . $body_class . '"' : '';