Combine advanced sections at the bottom of Slack

configuration section in the job configuration page. There is now a single advanced section at the bottom. Additionally: * Replaced mixed tabs with four spaces. * Moved Include Test Summary setting into Advanced section.
jenkinsci · Feb 2, 2015 · 34b0709 · 34b0709
1 parent b0088c5
commit 34b0709
Showing 1 changed file with 20 additions and 23 deletions.
diff --git a/src/main/resources/jenkins/plugins/slack/SlackNotifier/SlackJobProperty/config.jelly b/src/main/resources/jenkins/plugins/slack/SlackNotifier/SlackJobProperty/config.jelly
@@ -1,23 +1,9 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 
-	<f:section title="Slack Notifications">
-		<f:advanced>
-		    <f:entry title="Team Domain" help="${rootURL}/plugin/slack/help-projectConfig-slackTeamDomain.html">
-	    	    <f:textbox name="slackTeamDomain" value="${instance.getTeamDomain()}" />
-		    </f:entry>
-
-		    <f:entry title="Integration Token" help="${rootURL}/plugin/slack/help-projectConfig-slackToken.html">
-		        <f:textbox name="slackToken" value="${instance.getToken()}" />
-		    </f:entry>
-
-	    	<f:entry title="Project Channel" help="${rootURL}/plugin/slack/help-projectConfig-slackRoom.html">
-	      		<f:textbox name="slackProjectRoom" value="${instance.getRoom()}"/>
-	    	</f:entry>
-    	</f:advanced>
-
-    	<f:entry title="Notify Build Start">
-      		<f:checkbox name="slackStartNotification" value="true" checked="${instance.getStartNotification()}"/>
-    	</f:entry>
+    <f:section title="Slack Notifications">
+        <f:entry title="Notify Build Start">
+              <f:checkbox name="slackStartNotification" value="true" checked="${instance.getStartNotification()}"/>
+        </f:entry>
 
         <f:entry title="Notify Aborted">
             <f:checkbox name="slackNotifyAborted" value="true" checked="${instance.getNotifyAborted()}"/>
@@ -43,16 +29,27 @@
             <f:checkbox name="slackNotifyBackToNormal" value="true" checked="${instance.getNotifyBackToNormal()}"/>
         </f:entry>
 
-        <f:entry title="Include Test Summary">
-            <f:checkbox name="includeTestSummary" value="true" checked="${instance.includeTestSummary()}"/>
-        </f:entry>
-
         <f:advanced>
+            <f:entry title="Include Test Summary">
+                <f:checkbox name="includeTestSummary" value="true" checked="${instance.includeTestSummary()}"/>
+            </f:entry>
+
             <f:entry title="Show Commit List with Titles and Authors">
                 <f:checkbox name="slackShowCommitList" value="true" checked="${instance.getShowCommitList()}"/>
             </f:entry>
-        </f:advanced>
 
+            <f:entry title="Team Domain" help="${rootURL}/plugin/slack/help-projectConfig-slackTeamDomain.html">
+                <f:textbox name="slackTeamDomain" value="${instance.getTeamDomain()}" />
+            </f:entry>
+
+            <f:entry title="Integration Token" help="${rootURL}/plugin/slack/help-projectConfig-slackToken.html">
+                <f:textbox name="slackToken" value="${instance.getToken()}" />
+            </f:entry>
+
+            <f:entry title="Project Channel" help="${rootURL}/plugin/slack/help-projectConfig-slackRoom.html">
+                  <f:textbox name="slackProjectRoom" value="${instance.getRoom()}"/>
+            </f:entry>
+        </f:advanced>
     </f:section>
 
 </j:jelly>