[FIXED JENKINS-13387] Converted "Delete this build" buttons into link…

…s in the sidepanel, added German translations for "Delete Build" links in Matrix Builds
jenkinsci · Apr 9, 2012 · be88e01 · be88e01
1 parent 1803f9d
commit be88e01
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 15 deletions.
diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_de.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/confirmDeleteAll_de.properties
@@ -0,0 +1,25 @@
+# The MIT License
+#
+# Copyright (c) 2004-2012, Frederic Gurr
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Warning=Warnung
+Are\ you\ sure\ about\ deleting\ the\ build\ and\ all\ configurations\ in\ this\ build?=Sollen dieses Build und alle Konfigurationen dieses Builds wirklich gelöscht werden?
+Yes=Ja
diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete.jelly b/core/src/main/resources/hudson/matrix/MatrixBuild/delete.jelly
@@ -23,16 +23,12 @@ THE SOFTWARE.
 -->
 
 <!--
-  Displays the button to delete the build.
+  Displays the links to delete the build.
 -->
 <?jelly escape-by-default='true'?>
 <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">
   <j:if test="${!it.keepLog and !it.building}">
-  	<form method="get" action="confirmDelete" style="margin-top:1em">
-      <f:submit value="${%Delete this build}" />
-    </form>
-    <form method="get" action="confirmDeleteAll" style="margin-top:1em">
-      <f:submit value="${%Delete this build and all configurations in this build}" />
-    </form>
+    <l:task icon="images/24x24/edit-delete.png" href="${buildUrl.baseUrl}/confirmDelete" title="${%Delete Build}" permission="${it.DELETE}" />
+  	<l:task icon="images/24x24/edit-delete.png" href="${buildUrl.baseUrl}/confirmDeleteAll" title="${%Delete this build and all configurations in this build}" permission="${it.DELETE}" />
   </j:if>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_de.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_de.properties
@@ -0,0 +1,24 @@
+# The MIT License
+#
+# Copyright (c) 2004-2012, Frederic Gurr
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Delete\ Build=Build löschen
+Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=Build und alle Konfigurationen dieses Builds löschen
diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ja.properties b/core/src/main/resources/hudson/matrix/MatrixBuild/delete_ja.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Delete\ this\ build=\u30d3\u30eb\u30c9\u3092\u524a\u9664
+Delete\ Build=\u30d3\u30eb\u30c9\u3092\u524a\u9664
 Delete\ this\ build\ and\ all\ configurations\ in\ this\ build=\
   \u30d3\u30eb\u30c9\u3068\u8a2d\u5b9a\u3092\u524a\u9664
diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index.jelly b/core/src/main/resources/hudson/model/AbstractBuild/index.jelly
@@ -32,9 +32,6 @@ THE SOFTWARE.
         <l:hasPermission permission="${it.UPDATE}">
           <st:include page="logKeep.jelly" />
         </l:hasPermission>
-        <l:hasPermission permission="${it.DELETE}">
-          <st:include page="delete.jelly" />
-        </l:hasPermission>
         <div style="margin-top:1em">
           ${%startedAgo(it.timestampString)}
           </div><div>

diff --git a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly
@@ -32,6 +32,7 @@ THE SOFTWARE.
     <l:tasks>
       <j:set var="buildUrl" value="${h.decompose(request)}" />
       <st:include page="tasks.jelly"/>
+      <st:include page="delete.jelly" />
       <st:include page="actions.jelly" />
       <j:if test="${it.previousBuild!=null}">
         <l:task icon="images/24x24/previous.png" href="${buildUrl.previousBuildUrl}" title="${%Previous Build}" contextMenu="false"/>

diff --git a/core/src/main/resources/hudson/model/Run/delete.jelly b/core/src/main/resources/hudson/model/Run/delete.jelly
@@ -23,13 +23,11 @@ THE SOFTWARE.
 -->
 
 <!--
-  Displays the button to delete the build.
+  Displays the link to delete the build.
 -->
 <?jelly escape-by-default='true'?>
 <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">
   <j:if test="${!it.keepLog and !it.building}">
-    <form method="get" action="confirmDelete" style="margin-top:1em">
-      <f:submit value="${%Delete this build}" />
-    </form>
+    <l:task icon="images/24x24/edit-delete.png" href="${buildUrl.baseUrl}/confirmDelete" title="${%Delete this build}" permission="${it.DELETE}" />
   </j:if>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/Run/delete.properties b/core/src/main/resources/hudson/model/Run/delete.properties
@@ -0,0 +1,23 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Frederic Gurr
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Delete\ this\ build=Delete Build