[JENKINS-70602] Do not overwrite system font on examples page (#169)

* Replace inline page modification * Fix loading CSS
jenkinsci · Feb 12, 2023 · 1edb5e6 · 1edb5e6
1 parent 827e873
commit 1edb5e6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 60 deletions.
diff --git a/src/main/resources/org/jenkinsci/plugins/badge/actions/JobBadgeAction/ClickHandler.js b/src/main/resources/org/jenkinsci/plugins/badge/actions/JobBadgeAction/ClickHandler.js
@@ -0,0 +1,8 @@
+Behaviour.register({
+  "INPUT.select-all" : function(e) {
+    e.onclick = function () {
+      e.focus();
+      e.select();
+    }
+  }
+});
diff --git a/src/main/resources/org/jenkinsci/plugins/badge/actions/JobBadgeAction/index.groovy b/src/main/resources/org/jenkinsci/plugins/badge/actions/JobBadgeAction/index.groovy
@@ -8,36 +8,8 @@ l.layout(type: "one-column") {
     l.main_panel {
         h2(_("Embeddable Build Status Icon"))
         p(raw(_("blurb")))
-        raw("""
-<p>
-</p>
-<script>
-    Behaviour.register({
-        "INPUT.select-all" : function(e) {
-            e.onclick = function () {
-                e.focus();
-                e.select();
-            }
-        }
-    });
-</script>
-<style>
-    INPUT {
-        font-family: Console, "Courier New", Courier, monospace;
-        border: none;
-        font-size: -2;
-    }
-    INPUT.select-all {
-        width:100%;
-    }
-    IMG#badge {
-        margin-left:2em;
-    }
-    h3 {
-        border-bottom: 1px solid grey;
-    }
-</style>
-""")
+        st.adjunct(includes: "org.jenkinsci.plugins.badge.actions.JobBadgeAction.ClickHandler")
+        l.css(src: "/plugin/embeddable-build-status/css/design.css")
 
         def fullJobName = URLEncoder.encode(my.project.fullName, "UTF-8");
         def jobUrl =  "${app.rootUrl}${my.project.url}";

diff --git a/src/main/resources/org/jenkinsci/plugins/badge/actions/RunBadgeAction/index.groovy b/src/main/resources/org/jenkinsci/plugins/badge/actions/RunBadgeAction/index.groovy
@@ -8,36 +8,8 @@ l.layout(type: "one-column") {
     l.main_panel {
         h2(_("Embeddable Build Status Icon"))
         p(raw(_("blurb")))
-        raw("""
-<p>
-</p>
-<script>
-    Behaviour.register({
-        "INPUT.select-all" : function(e) {
-            e.onclick = function () {
-                e.focus();
-                e.select();
-            }
-        }
-    });
-</script>
-<style>
-    INPUT {
-        font-family: Console, "Courier New", Courier, monospace;
-        border: none;
-        font-size: -2;
-    }
-    INPUT.select-all {
-        width:100%;
-    }
-    IMG#badge {
-        margin-left:2em;
-    }
-    h3 {
-        border-bottom: 1px solid grey;
-    }
-</style>
-""")
+        st.adjunct(includes: "org.jenkinsci.plugins.badge.actions.JobBadgeAction.ClickHandler")
+        l.css(src: "/plugin/embeddable-build-status/css/design.css")
 
         def fullJobName = URLEncoder.encode(my.project.fullName, "UTF-8");
         def jobUrl =  "${app.rootUrl}${my.project.url}${my.run.number}/";

diff --git a/src/main/webapp/css/design.css b/src/main/webapp/css/design.css
@@ -0,0 +1,14 @@
+INPUT {
+    border: none;
+    font-size: -2;
+}
+INPUT.select-all {
+    width:100%;
+    font-family: Console, "Courier New", Courier, monospace;
+}
+IMG#badge {
+    margin-left:2em;
+}
+h3 {
+    border-bottom: 1px solid grey;
+}