Skip to content

Commit

Permalink
Merge pull request #88 from mawinter69/styling
Browse files Browse the repository at this point in the history 
update styling
  • Loading branch information
@froque
froque authored Jul 3, 2023
2 parents 7c08704 + 56d4b19 commit eea7f24
Show file tree
Hide file tree
Showing 10 changed files with 218 additions and 162 deletions.
43 changes: 17 additions & 26 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.54</version>
<version>4.66</version>
</parent>

<artifactId>disk-usage</artifactId>
Expand All @@ -27,11 +27,25 @@
<tag>HEAD</tag>
</scm>

<properties>
<jenkins.version>2.401.1</jenkins.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.401.x</artifactId>
<version>2198.v39c76fc308ca</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>mailer</artifactId>
<version>435.v79ef3972b_5c7</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -41,42 +55,19 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
<version>1.20</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>jakarta-mail-api</artifactId>
<version>2.0.1-2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>promoted-builds</artifactId>
<version>3.0</version>
<version>892.vd6219fc0a_efb</version>
<scope>test</scope>
</dependency>


</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<configuration>
<systemProperties>
<property>
<name>hudson.udp</name>
<value>-1</value>
</property>
</systemProperties>
<reuseForks>false</reuseForks>
<forkCount>2</forkCount>
</configuration>
</plugin>
</plugins>
</build>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/hudson/plugins/disk_usage/DiskUsageManagement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class DiskUsageManagement extends ManagementLink implements RootAction {

@Override
public String getIconFileName() {
return "/plugin/disk-usage/icons/disk-usage.svg";
return "symbol-disk-usage plugin-disk-usage";
}

@Override
Expand All @@ -52,5 +52,4 @@ public Category getCategory() {
public void doIndex(StaplerRequest req, StaplerResponse res) throws ServletException, IOException {
res.sendRedirect(Jenkins.get().getRootUrlFromRequest() + "plugin/disk-usage");
}

}
Empty file modified src/main/resources/hudson/plugins/disk_usage/DiskUsagePlugin/calculation.properties
100755 → 100644
View file
Empty file.
52 changes: 26 additions & 26 deletions src/main/resources/hudson/plugins/disk_usage/DiskUsagePlugin/index.jelly
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
<?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">
<l:layout title="${%Disk Usage}">

<l:side-panel>
<l:tasks>
<l:task icon="icon-up icon-md" href="${rootURL}/" title="${%Back to Dashboard}"/>
</l:tasks>
</l:side-panel>

<l:layout title="${%Disk Usage}" type="one-column">
<l:breadcrumb title="Disk Usage"/>
<l:main-panel>
<st:adjunct includes="hudson.plugins.disk_usage.styles"/>
<j:set var="projects" value="${it.getProjectList()}" />

<div style="width:auto; float:right; margin:12px;">
Expand All @@ -20,7 +15,7 @@
</div>
</div>

<h1><img src="${resURL}/plugin/disk-usage/icons/disk-usage.svg" /> ${%Disk usage} </h1>
<h1><l:icon src="symbol-disk-usage plugin-disk-usage" class="icon-xlg"/> ${%Disk usage} </h1>

<ul>
<li><b>${%Jobs}:</b><st:nbsp/>${it.getDiskUsageInString(it.getCashedGlobalJobsDiskUsage())}</li>
Expand All @@ -33,27 +28,32 @@
<!-- project table -->
<j:new var="calendar" className="java.util.GregorianCalendar" />
<j:new var="string" className="java.lang.String" />
<f:form name="filter" action="filter" method="post">
<div>
${%Builds older than }<input type="text" name="older" value="${request.getParameter('older')}"/>
<f:form name="filter" action="filter" method="post" class="jenkins-!-margin-bottom-3">
<div class="dup-filter">
<div class="dup-filter__label">${%Builds older than }</div>
<f:number name="older" value="${request.getParameter('older')}"/>
<j:set var="olderUnit" value="${request.getParameter('olderUnit')}" />
<select name="olderUnit">
<f:option value="${calendar.DAY_OF_YEAR}" selected="${olderUnit==null || string.valueOf(calendar.DAY_OF_YEAR).equals(olderUnit)}">day ago</f:option>
<f:option value="${calendar.WEEK_OF_YEAR}" selected="${olderUnit.equals(string.valueOf(calendar.WEEK_OF_YEAR))}">week ago</f:option>
<f:option value="${calendar.MONTH}" selected="${olderUnit.equals(string.valueOf(calendar.MONTH))}">month ago</f:option>
</select>
</div>
<div>
${%Builds younger than }<input type="text" name="younger" value="${request.getParameter('younger')}"/>
<div class="jenkins-select">
<select name="olderUnit" class="jenkins-select__input">
<f:option value="${calendar.DAY_OF_YEAR}" selected="${olderUnit==null || string.valueOf(calendar.DAY_OF_YEAR).equals(olderUnit)}">day(s) ago</f:option>
<f:option value="${calendar.WEEK_OF_YEAR}" selected="${olderUnit.equals(string.valueOf(calendar.WEEK_OF_YEAR))}">week(s) ago</f:option>
<f:option value="${calendar.MONTH}" selected="${olderUnit.equals(string.valueOf(calendar.MONTH))}">month(s) ago</f:option>
</select>
</div>
<div class="dup-filter__break"/>
<div class="dup-filter__label">${%Builds younger than }</div>
<f:number name="younger" value="${request.getParameter('younger')}"/>
<j:set var="youngerUnit" value="${request.getParameter('youngerUnit')}" />
<select name="youngerUnit">
<f:option value="${calendar.DAY_OF_YEAR}" selected="${youngerUnit==null || youngerUnit.equals(string.valueOf(calendar.DAY_OF_YEAR))}">day ago</f:option>
<f:option value="${calendar.WEEK_OF_YEAR}" selected="${youngerUnit.equals(string.valueOf(calendar.WEEK_OF_YEAR))}">week ago</f:option>
<f:option value="${calendar.MONTH}" selected="${youngerUnit.equals(string.valueOf(calendar.MONTH))}">month ago</f:option>
</select>
<div class="jenkins-select">
<select name="youngerUnit" class="jenkins-select__input">
<f:option value="${calendar.DAY_OF_YEAR}" selected="${youngerUnit==null || youngerUnit.equals(string.valueOf(calendar.DAY_OF_YEAR))}">day(s) ago</f:option>
<f:option value="${calendar.WEEK_OF_YEAR}" selected="${youngerUnit.equals(string.valueOf(calendar.WEEK_OF_YEAR))}">week(s) ago</f:option>
<f:option value="${calendar.MONTH}" selected="${youngerUnit.equals(string.valueOf(calendar.MONTH))}">month(s) ago</f:option>
</select>
</div>
</div>
<div>
<input name="submit" type="submit" value="Filter"/>
<button class="jenkins-button" name="submit" type="submit">Filter</button>
</div>
</f:form>

Expand Down
Empty file modified src/main/resources/hudson/plugins/disk_usage/DiskUsagePlugin/index_ja.properties
100755 → 100644
View file
Empty file.
Loading

0 comments on commit eea7f24

Please sign in to comment.