[JENKINS-24093] Clean jelly code

jenkinsci · Aug 3, 2014 · 36b2517 · 36b2517
1 parent f73ff44
commit 36b2517
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 43 deletions.
diff --git a/src/main/resources/hudson/plugins/sloccount/SloccountBuildAction/summary.jelly b/src/main/resources/hudson/plugins/sloccount/SloccountBuildAction/summary.jelly
@@ -1,5 +1,4 @@
 <j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson" xmlns:st="jelly:stapler">
-
     <t:summary icon="/plugin/sloccount/icons/sloccount-48.png">
         <div><a href="${it.urlName}">${it.displayName}</a></div>
 

diff --git a/src/main/resources/hudson/plugins/sloccount/SloccountProjectAction/floatingBox.jelly b/src/main/resources/hudson/plugins/sloccount/SloccountProjectAction/floatingBox.jelly
@@ -1,4 +1,4 @@
-<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" xmlns:i="jelly:fmt" xmlns:local="local">
+<j:jelly xmlns:j="jelly:core">
     <j:if test="${from.hasValidResults()}">
         <div align="right">
             <p/>

diff --git a/src/main/resources/hudson/plugins/sloccount/SloccountPublisher/config.jelly b/src/main/resources/hudson/plugins/sloccount/SloccountPublisher/config.jelly
@@ -1,5 +1,4 @@
-<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" xmlns:u="/util">
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
     <f:entry title="${%SLOCCount reports}"
            description="${%description.pattern('http://ant.apache.org/manual/Types/fileset.html')}">
         <f:textbox name="pattern" value="${instance.pattern}"/>

diff --git a/src/main/resources/hudson/plugins/sloccount/SloccountResult/files.jelly b/src/main/resources/hudson/plugins/sloccount/SloccountResult/files.jelly
@@ -1,6 +1,4 @@
-<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"
-  xmlns:i="jelly:fmt" xmlns:local="local">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <st:header name="Content-Type" value="text/html;charset=UTF-8" />
   <table class="pane sortable" id="files">
     <thead>

diff --git a/src/main/resources/hudson/plugins/sloccount/SloccountResult/folders.jelly b/src/main/resources/hudson/plugins/sloccount/SloccountResult/folders.jelly
@@ -1,6 +1,4 @@
-<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"
-  xmlns:i="jelly:fmt" xmlns:local="local">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <st:header name="Content-Type" value="text/html;charset=UTF-8" />
   <table class="pane sortable" id="files">
     <thead>

diff --git a/src/main/resources/hudson/plugins/sloccount/SloccountResult/index.jelly b/src/main/resources/hudson/plugins/sloccount/SloccountResult/index.jelly
@@ -1,14 +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" xmlns:i="jelly:fmt">
-    <l:layout norefresh="true">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
+    <l:layout norefresh="true" title="${%SLOCCount Results}">
         <st:include it="${it.owner}" page="sidepanel.jelly" />
         <l:main-panel>
-
             <h1>${%SLOCCount Results}</h1>
-
             <st:include page="/tabview/main.jelly" />
-
         </l:main-panel>
     </l:layout>
 </j:jelly>
diff --git a/src/main/resources/hudson/plugins/sloccount/SloccountResult/languages.jelly b/src/main/resources/hudson/plugins/sloccount/SloccountResult/languages.jelly
@@ -1,6 +1,4 @@
-<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"
-  xmlns:i="jelly:fmt" xmlns:local="local">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <st:header name="Content-Type" value="text/html;charset=UTF-8" />
   <table class="pane sortable" id="files">
     <thead>

diff --git a/src/main/resources/hudson/plugins/sloccount/SloccountResult/modules.jelly b/src/main/resources/hudson/plugins/sloccount/SloccountResult/modules.jelly
@@ -1,6 +1,4 @@
-<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"
-  xmlns:i="jelly:fmt" xmlns:local="local">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <st:header name="Content-Type" value="text/html;charset=UTF-8" />
   <table class="pane sortable" id="modules">
     <thead>

diff --git a/src/main/resources/hudson/plugins/sloccount/dashboard/SloccountTablePortlet/portlet.jelly b/src/main/resources/hudson/plugins/sloccount/dashboard/SloccountTablePortlet/portlet.jelly
@@ -1,10 +1,6 @@
 <j:jelly xmlns:j="jelly:core"
     xmlns:st="jelly:stapler"
-    xmlns:d="jelly:define"
-    xmlns:dp="/hudson/plugins/view/dashboard"
-    xmlns:l="/lib/layout"
-    xmlns:t="/lib/hudson"
-    xmlns:f="/lib/form">
+    xmlns:dp="/hudson/plugins/view/dashboard">
 
     <!-- According to https://wiki.jenkins-ci.org/display/JENKINS/Dashboard+View -->
     <dp:decorate portlet="${it}">

diff --git a/src/main/resources/hudson/plugins/sloccount/dashboard/SloccountTablePortlet/table.jelly b/src/main/resources/hudson/plugins/sloccount/dashboard/SloccountTablePortlet/table.jelly
@@ -1,8 +1,4 @@
-<j:jelly xmlns:j="jelly:core"
-    xmlns:st="jelly:stapler" 
-    xmlns:l="/lib/layout"
-    xmlns:t="/lib/hudson"
-    xmlns:dp="/hudson/plugins/view/dashboard">
+<j:jelly xmlns:j="jelly:core" xmlns:dp="/hudson/plugins/view/dashboard">
 
     <style type="text/css">
         .sloccountTablePortlet .number { text-align: right; }

diff --git a/src/main/resources/tabview/css.jelly b/src/main/resources/tabview/css.jelly
@@ -1,4 +1,4 @@
-<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" xmlns:i="jelly:fmt" xmlns:local="local">
+<j:jelly xmlns:j="jelly:core">
     <style type="text/css">
 
         /* .yui-navset defaults to .yui-navset-top */

diff --git a/src/main/resources/tabview/distribution-graph.jelly b/src/main/resources/tabview/distribution-graph.jelly
@@ -1,6 +1,4 @@
-<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"
-  xmlns:i="jelly:fmt" xmlns:local="local">
+<j:jelly xmlns:j="jelly:core">
 
   <table cellpadding="0" cellspacing="0" width="100%">
     <tr style="height:10;padding:0">

diff --git a/src/main/resources/tabview/main.jelly b/src/main/resources/tabview/main.jelly
@@ -1,10 +1,8 @@
-<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"
-  xmlns:i="jelly:fmt" xmlns:local="local">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
     <st:header name="Content-Type" value="text/html;charset=UTF-8" />
-    <script type="text/javascript" src="${rootURL}/plugin/sloccount/yui/utilities.js"></script>
-    <script type="text/javascript" src="${rootURL}/plugin/sloccount/yui/tabview-min.js"></script>
-    <script type="text/javascript" src="${rootURL}/plugin/sloccount/yui/dispatcher-min.js"></script>
+    <script type="text/javascript" src="${rootURL}/plugin/sloccount/yui/utilities.js"/>
+    <script type="text/javascript" src="${rootURL}/plugin/sloccount/yui/tabview-min.js"/>
+    <script type="text/javascript" src="${rootURL}/plugin/sloccount/yui/dispatcher-min.js"/>
 
     <script type="text/javascript">
         var myTabs = new YAHOO.widget.TabView("statistics");