JENKINS-32133 styling issues for DSL reference help

jenkinsci · Jan 25, 2016 · 7d1fdbd · 7d1fdbd
1 parent ba0ab3f
commit 7d1fdbd
Show file tree

Hide file tree

Showing 8 changed files with 332 additions and 233 deletions.
diff --git a/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/EnvActionImpl/Binder/help.jelly b/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/EnvActionImpl/Binder/help.jelly
@@ -27,9 +27,11 @@ node {
         see the notes below the list for Pipeline-specific details.
     </p>
     <!-- Cf.  EnvironmentContributor/EnvVarsHtml/index.groovy -->
-    <j:forEach var="ec" items="${it.environmentContributors}">
-        <st:include it="${ec}" page="buildEnv" optional="true"/>
-    </j:forEach>
+    <dl class="env-vars">
+      <j:forEach var="ec" items="${it.environmentContributors}">
+          <st:include it="${ec}" page="buildEnv" optional="true"/>
+      </j:forEach>
+    </dl>
     <p>
         The following variables are currently unavailable inside a workflow script:
     </p>

diff --git a/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/css/workflow.css b/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/css/workflow.css
diff --git a/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/dslHelp.groovy b/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/dslHelp.groovy
@@ -6,14 +6,14 @@ import org.jenkinsci.plugins.workflow.cps.Snippetizer
 def st = namespace("jelly:stapler")
 
 p {
-    a(href: "${rootURL}/${Snippetizer.DSL_REF_URL}", target: "_blank") {
+    a(href: "${rootURL}/${Snippetizer.DSL_REF_URL}", target: "_dslRefHlp") {
        raw(_("Click here for the reference in a new window."))
     }
 
 }
 
 p {
-    a(href: "${rootURL}/${Snippetizer.GDSL_URL}", target: "_blank") {
+    a(href: "${rootURL}/${Snippetizer.GDSL_URL}", target: "_intjDsl") {
         raw(_("Click here for IntelliJ GDSL."))
     }
 

diff --git a/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/dslReference.groovy b/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/dslReference.groovy
@@ -10,21 +10,6 @@ l.layout(title:_("Jenkins Pipeline Reference")) {
 
     st.include(page: "sidepanel", it: app)
     l.main_panel {
-        p {
-            a(href: "${rootURL}/${Snippetizer.GDSL_URL}", target: "_blank") {
-                raw(_("Click here for IntelliJ GDSL."))
-            }
-
-        }
-
-        /* Commenting out DSLD until it's fixed.
-        p {
-            a(href: "${rootURL}/${Snippetizer.DSLD_URL}", target: "_blank") {
-                raw(_("Click here for Eclipse DSLD."))
-            }
-
-        }
-        */
         st.include(page: "dslReferenceContent")
     }
 }