[JENKINS-31162] Support for Item categorization in Jenkins 2

jenkinsci · Apr 4, 2016 · a7691cc · a7691cc
1 parent 40b4966
commit a7691cc
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 4 deletions.
diff --git a/src/main/java/com/cloudbees/hudson/plugins/folder/AbstractFolderDescriptor.java b/src/main/java/com/cloudbees/hudson/plugins/folder/AbstractFolderDescriptor.java
@@ -40,6 +40,40 @@ public String getDisplayName() {
         return Messages.Folder_DisplayName();
     }
 
+    /**
+     * Needed if it wants Folders are categorized in Jenkins 2.x.
+     *
+     * TODO: Override when the baseline is upgraded to 2.x
+     * TODO: Replace to {@code NestedProjectsCategory.ID}
+     *
+     * @return A string it represents a ItemCategory identifier.
+     */
+    public String getCategoryId() {
+        return "nestedprojects";
+    }
+
+    /**
+     * Needed if it wants Folders are categorized in Jenkins 2.x.
+     *
+     * TODO: Override when the baseline is upgraded to 2.x
+     *
+     * @return A string with the Item description.
+     */
+    public String getDescription() {
+        return Messages.Folder_Description();
+    }
+
+    /**
+     * Needed if it wants Folder are categorized in Jenkins 2.x.
+     *
+     * TODO: Override when the baseline is upgraded to 2.x
+     *
+     * @return A string it represents a URL pattern to get the Item icon in different sizes.
+     */
+    public String getIconFilePathPattern() {
+        return "plugin/cloudbees-folder/images/:size/folder.png";
+    }
+
     /**
      * Properties that can be configured for this type of {@link AbstractFolder} subtype.
      */

diff --git a/src/main/resources/com/cloudbees/hudson/plugins/folder/Folder/newInstanceDetail.jelly b/src/main/resources/com/cloudbees/hudson/plugins/folder/Folder/newInstanceDetail.jelly
@@ -23,5 +23,5 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <div>
-  ${%body}
+  <j:out value="${it.description}"/>
 </div>
diff --git a/src/main/resources/com/cloudbees/hudson/plugins/folder/Folder/newInstanceDetail.properties b/src/main/resources/com/cloudbees/hudson/plugins/folder/Folder/newInstanceDetail.properties
diff --git a/src/main/resources/com/cloudbees/hudson/plugins/folder/Messages.properties b/src/main/resources/com/cloudbees/hudson/plugins/folder/Messages.properties
@@ -1,4 +1,8 @@
 Folder.DisplayName=Folder
 Folder.DefaultPronoun=Item
+Folder.Description=Creates a container that stores nested items in it. Useful for grouping things together. Unlike \
+  view, which is just a filter, a folder creates a separate namespace, so you can have multiple things of the same name \
+  as long as they are in different folders.
+
 RelocateAction.permission.desc=Required to move a job from one folder (or Jenkins root) to another.
 RelocateAction.displayName=Move
diff --git a/src/main/webapp/images/48x48/folder.png b/src/main/webapp/images/48x48/folder.png