Merge pull request #132 from thatsdc/add-change-results-colors-option

Added the option to change the results colors

Author: malice00

src/main/css/index.css

@@ -66,13 +66,13 @@
 }
 
 .fc-event.event-result-success {
-  background-color: var(--success-color);
-  border-color: var(--success-color);
+  background-color: var(--result-success-color);
+  border-color: var(--result-success-color);
 }
 
 .fc-event.event-result-failure {
-  background-color: var(--error-color);
-  border-color:var(--error-color);
+  background-color: var(--result-failure-color);
+  border-color:var(--result-failure-color);
 }
 
 .fc-event.event-result-unstable {
@@ -102,10 +102,10 @@
   background:#aaa;
 }
 .fc-event.event-result-success.event-selected {
-  background:var(--light-green);
+  background:var(--result-success-selected-color);
 }
 .fc-event.event-result-failure.event-selected {
-  background:var(--light-red);
+  background:var(--result-failure-selected-color);
 }
 .fc-event.event-result-unstable.event-selected {
   background:var(--light-orange);

src/main/java/io/jenkins/plugins/view/calendar/CalendarView.java

@@ -67,8 +67,13 @@ public static enum CalendarViewType {
        MONTH, WEEK, DAY;
     }
 
+    public static enum ResultsColors {
+        GREEN_RED, CYAN_RED
+    }
+
     private CalendarViewEventsType calendarViewEventsType;
     private CalendarViewType calendarViewType;
+    private ResultsColors resultsColors;
 
     private Boolean useCustomFormats;
     private Boolean useCustomWeekSettings;
@@ -124,6 +129,14 @@ public void setCalendarViewType(final CalendarViewType calendarViewType) {
         this.calendarViewType = calendarViewType;
     }
 
+    public ResultsColors getResultsColors() {
+        return defaultIfNull(resultsColors, ResultsColors.GREEN_RED);
+    }
+
+    public void setResultsColors(final ResultsColors resultsColors) {
+        this.resultsColors = resultsColors;
+    }
+
     public boolean isUseCustomFormats() {
         return defaultIfNull(useCustomFormats, false);
     }
@@ -366,6 +379,7 @@ private void validate(final StaplerRequest2 req) throws Descriptor.FormException
     private void updateFields(final StaplerRequest2 req) {
         setCalendarViewEventsType(CalendarViewEventsType.valueOf(req.getParameter("calendarViewEventsType")));
         setCalendarViewType(CalendarViewType.valueOf(req.getParameter("calendarViewType")));
+        setResultsColors(ResultsColors.valueOf(req.getParameter("resultsColors")));
 
         setUseCustomFormats(req.getParameter("useCustomFormats") != null);
         setUseCustomWeekSettings(req.getParameter("useCustomWeekSettings") != null);

src/main/js/index.js

@@ -38,6 +38,20 @@ const hashParamOptions = hashParams.parse(window.location.hash);
 var timeout = null;
 
 $(function() {
+  const root = document.documentElement;
+  if (CalendarViewOptions.resultsColors === 'cyan_red') {
+    root.style.setProperty('--result-success-color', '#5291CB');
+    root.style.setProperty('--result-failure-color', '#CF0000');
+    root.style.setProperty('--result-success-selected-color', '#6A9AC7');
+    root.style.setProperty('--result-failure-selected-color', '#FF0000');
+  }
+  else{
+    root.style.setProperty('--result-success-color', '#00B80E');
+    root.style.setProperty('--result-failure-color', '#CF0000');
+    root.style.setProperty('--result-success-selected-color', '#00E610');
+    root.style.setProperty('--result-failure-selected-color', '#FF0000');
+  }
+
   $('#calendar-view').fullCalendar({
     events: 'events',
     defaultView: hashParamOptions['view'] || CalendarViewOptions.defaultView,

src/main/resources/io/jenkins/plugins/view/calendar/CalendarView/configure-entries.jelly

@@ -48,6 +48,13 @@ Portions of this code copied from the Jenkins Project. See LICENSE.md for notice
           </div>
         </f:entry>
 
+        <f:entry title="${%Success / Failure Colors}" field="resultsColors">
+            <div class="calendar-view-config-container">
+                <f:radio name="resultsColors" value="GREEN_RED" checked="${it.resultsColors=='GREEN_RED'}" title="${%Green / Red}"/>
+                <f:radio name="resultsColors" value="CYAN_RED" checked="${it.resultsColors=='CYAN_RED'}" title="${%Cyan / Red}"/>
+            </div>
+        </f:entry>
+
         <f:optionalBlock name="useCustomWeekSettings" title="${%Use custom week day settings}"
                          checked="${it.useCustomWeekSettings}">
             <f:entry title="${%Weeks}">

src/main/resources/io/jenkins/plugins/view/calendar/CalendarView/main.jelly

@@ -25,6 +25,7 @@ THE SOFTWARE.
 <?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:set var="views" value="${it.owner.views}" />
     <j:set var="currentView" value="${it}" />
 
@@ -35,10 +36,12 @@ THE SOFTWARE.
     </div>
 
     <link type="text/css" rel="stylesheet" href="${rootURL}/plugin/calendar-view/bundles/calendar-view.css" />
+
     <st:adjunct includes="io.jenkins.plugins.jquery3"/>
     <script id="calendar-view-data" type="application/json">{
-         "defaultView": "${it.calendarViewType.name().toLowerCase()}-view",
-         "buttonText": {
+        "defaultView": "${it.calendarViewType.name().toLowerCase()}-view",
+        "resultsColors": "${it.resultsColors.name().toLowerCase()}",
+        "buttonText": {
            "today": "${%ButtonText.Today}",
            "month-view": "${%ButtonText.Month}",
            "week-view": "${%ButtonText.Week}",
@@ -141,6 +144,7 @@ THE SOFTWARE.
          }
        }</script>
     <st:adjunct includes="io.jenkins.plugins.view.calendar.CalendarView.resource"/>
+
     <script type="text/javascript" src="${rootURL}/plugin/calendar-view/bundles/calendar-view.js"></script>
 
 </j:jelly>