Skip to content

Commit

Permalink
Upgrade to Jenkins 2.176.2 and plugins with fixes
Browse files Browse the repository at this point in the history
- Pulled in the latest jenkins-bootstrap-shared which includes fixes for
  interacting with the buggy Jenkins scriptText endpoint including
  leading spaces in its response.
- Upgraded all plugins to their latest revisions.
- Fixed the welcome page style due to CSS changes from upgrading the
  dashboard-view plugin to version 2.11.
  • Loading branch information
samrocketman committed Aug 26, 2019
1 parent 7ac7c29 commit 52ff634
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 111 deletions.
61 changes: 35 additions & 26 deletions configs/view_welcome_config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.1" encoding="UTF-8"?>
<hudson.plugins.view.dashboard.Dashboard plugin="dashboard-view@2.10">
<hudson.plugins.view.dashboard.Dashboard plugin="dashboard-view@2.11">
<name>Welcome</name>
<filterExecutors>false</filterExecutors>
<filterQueue>false</filterQueue>
Expand All @@ -23,7 +23,6 @@
<rightPortlets/>
<topPortlets>
<org.korosoft.jenkins.plugin.rtp.StaticTextPortlet plugin="[email protected]">
<id>dashboard_portlet_4858</id>
<name>Bootstrapped Jenkins for Jervis</name>
<text>&lt;style&gt;
/* hide distracting elements in the UI */
Expand All @@ -40,12 +39,12 @@ div.dashboard div:last-child {
display: none;
}
/* uses a CSS selector to hide portlet buttons */
div[id^=title-dashboard_portlet] * {
div[id^=title-portlet-topPortlets] * {
display: none !important;
}

/* cleaner and clear borders and no drop shadows */
table[id^=dashboard_portlet] {
table[id^=portlet-topPortlets] {
border-width: 0px;
}
* {
Expand All @@ -54,6 +53,10 @@ table[id^=dashboard_portlet] {
div.pane-frame {
border: 3px solid #f0f0f0;
}
tr#job__jervis_generator &gt; td:nth-child(1) {
font-size: 120%;
width: 55%;
}

/* change positioning of the generate job text for prominence */
table#projectstatus tbody tr td {
Expand All @@ -70,10 +73,10 @@ div#page-body div#main-panel, div#main-panel {

/* responsive welcome message */
@media screen and (min-width: 824px) {
div[id^=title-dashboard_portlet] {
div[id^=title-portlet-topPortlets] {
width: 768px !important;
}
table[id^=dashboard_portlet] {
table[id^=portlet-topPortlets] {
width: 768px !important;
}
}
Expand All @@ -84,7 +87,7 @@ div#page-body div#main-panel, div#main-panel {
}

/* cleaner welcome page */
div[id^=title-dashboard_portlet] {
div[id^=title-portlet-topPortlets] {
-moz-border-bottom-colors: none !important;
-moz-border-left-colors: none !important;
-moz-border-right-colors: none !important;
Expand All @@ -100,29 +103,29 @@ div[id^=title-dashboard_portlet] {
line-height: 55px !important;
padding: 10px 10px 10px !important;
}
table[id^=dashboard_portlet] {
table[id^=portlet-topPortlets] {
background-color: #fff !important;
border: 1px solid #ddd !important;
border-bottom-left-radius: 3px !important;
border-bottom-right-radius: 3px !important;
}
table[id^=dashboard_portlet] tbody tr td {
table[id^=portlet-topPortlets] tbody tr td {
padding: 30px !important;
word-wrap: break-word !important;
font-family: &quot;Helvetica Neue&quot;,Helvetica,&quot;Segoe UI&quot;,Arial,freesans,sans-serif !important;
}
table[id^=dashboard_portlet] tbody tr td p, table[id^=dashboard_portlet] tbody tr td li {
table[id^=portlet-topPortlets] tbody tr td p, table[id^=portlet-topPortlets] tbody tr td li {
font-size: 16px !important;
line-height: 1.6 !important;
}
table[id^=dashboard_portlet] tbody tr td a {
table[id^=portlet-topPortlets] tbody tr td a {
color: #4078c0;
text-decoration: none;
}
table[id^=dashboard_portlet] tbody tr td a:hover, table[id^=dashboard_portlet] tbody tr td a:active {
table[id^=portlet-topPortlets] tbody tr td a:hover, table[id^=portlet-topPortlets] tbody tr td a:active {
text-decoration: underline;
}
table[id^=dashboard_portlet] tbody tr td tt, table[id^=dashboard_portlet] tbody tr td code, table[id^=dashboard_portlet] tbody tr td pre {
table[id^=portlet-topPortlets] tbody tr td tt, table[id^=portlet-topPortlets] tbody tr td code, table[id^=portlet-topPortlets] tbody tr td pre {
font-family: Consolas,&quot;Liberation Mono&quot;,Courier,monospace;
font-size: 14px;
}
Expand Down Expand Up @@ -228,7 +231,8 @@ pre code:before, pre code:after, pre tt:before, pre tt:after {

&lt;h3&gt;Documentation&lt;/h3&gt;

&lt;p&gt;Visit the &lt;a href=&quot;https://github.com/samrocketman/jervis/wiki&quot;&gt;Jervis wiki&lt;/a&gt; for comprehensive documentation on how to configure and manage Jenkins as a service.&lt;/p&gt;</text>
&lt;p&gt;Visit the &lt;a href=&quot;https://github.com/samrocketman/jervis/wiki&quot;&gt;Jervis wiki&lt;/a&gt; for comprehensive documentation on how to configure and manage Jenkins as a service.&lt;/p&gt;
</text>
<richText>&lt;style&gt;
/* hide distracting elements in the UI */
div#side-panel, div#right-top-nav, div#description {
Expand All @@ -244,12 +248,12 @@ div.dashboard div:last-child {
display: none;
}
/* uses a CSS selector to hide portlet buttons */
div[id^=title-dashboard_portlet] * {
div[id^=title-portlet-topPortlets] * {
display: none !important;
}

/* cleaner and clear borders and no drop shadows */
table[id^=dashboard_portlet] {
table[id^=portlet-topPortlets] {
border-width: 0px;
}
* {
Expand All @@ -258,6 +262,10 @@ table[id^=dashboard_portlet] {
div.pane-frame {
border: 3px solid #f0f0f0;
}
tr#job__jervis_generator &gt; td:nth-child(1) {
font-size: 120%;
width: 55%;
}

/* change positioning of the generate job text for prominence */
table#projectstatus tbody tr td {
Expand All @@ -274,10 +282,10 @@ div#page-body div#main-panel, div#main-panel {

/* responsive welcome message */
@media screen and (min-width: 824px) {
div[id^=title-dashboard_portlet] {
div[id^=title-portlet-topPortlets] {
width: 768px !important;
}
table[id^=dashboard_portlet] {
table[id^=portlet-topPortlets] {
width: 768px !important;
}
}
Expand All @@ -288,7 +296,7 @@ div#page-body div#main-panel, div#main-panel {
}

/* cleaner welcome page */
div[id^=title-dashboard_portlet] {
div[id^=title-portlet-topPortlets] {
-moz-border-bottom-colors: none !important;
-moz-border-left-colors: none !important;
-moz-border-right-colors: none !important;
Expand All @@ -304,29 +312,29 @@ div[id^=title-dashboard_portlet] {
line-height: 55px !important;
padding: 10px 10px 10px !important;
}
table[id^=dashboard_portlet] {
table[id^=portlet-topPortlets] {
background-color: #fff !important;
border: 1px solid #ddd !important;
border-bottom-left-radius: 3px !important;
border-bottom-right-radius: 3px !important;
}
table[id^=dashboard_portlet] tbody tr td {
table[id^=portlet-topPortlets] tbody tr td {
padding: 30px !important;
word-wrap: break-word !important;
font-family: &quot;Helvetica Neue&quot;,Helvetica,&quot;Segoe UI&quot;,Arial,freesans,sans-serif !important;
}
table[id^=dashboard_portlet] tbody tr td p, table[id^=dashboard_portlet] tbody tr td li {
table[id^=portlet-topPortlets] tbody tr td p, table[id^=portlet-topPortlets] tbody tr td li {
font-size: 16px !important;
line-height: 1.6 !important;
}
table[id^=dashboard_portlet] tbody tr td a {
table[id^=portlet-topPortlets] tbody tr td a {
color: #4078c0;
text-decoration: none;
}
table[id^=dashboard_portlet] tbody tr td a:hover, table[id^=dashboard_portlet] tbody tr td a:active {
table[id^=portlet-topPortlets] tbody tr td a:hover, table[id^=portlet-topPortlets] tbody tr td a:active {
text-decoration: underline;
}
table[id^=dashboard_portlet] tbody tr td tt, table[id^=dashboard_portlet] tbody tr td code, table[id^=dashboard_portlet] tbody tr td pre {
table[id^=portlet-topPortlets] tbody tr td tt, table[id^=portlet-topPortlets] tbody tr td code, table[id^=portlet-topPortlets] tbody tr td pre {
font-family: Consolas,&quot;Liberation Mono&quot;,Courier,monospace;
font-size: 14px;
}
Expand Down Expand Up @@ -432,7 +440,8 @@ pre code:before, pre code:after, pre tt:before, pre tt:after {

&lt;h3&gt;Documentation&lt;/h3&gt;

&lt;p&gt;Visit the &lt;a href=&quot;https://github.com/samrocketman/jervis/wiki&quot;&gt;Jervis wiki&lt;/a&gt; for comprehensive documentation on how to configure and manage Jenkins as a service.&lt;/p&gt;</richText>
&lt;p&gt;Visit the &lt;a href=&quot;https://github.com/samrocketman/jervis/wiki&quot;&gt;Jervis wiki&lt;/a&gt; for comprehensive documentation on how to configure and manage Jenkins as a service.&lt;/p&gt;
</richText>
<parserName>HTML</parserName>
</org.korosoft.jenkins.plugin.rtp.StaticTextPortlet>
</topPortlets>
Expand Down
Loading

0 comments on commit 52ff634

Please sign in to comment.