[JENKINS-34628] - Bundle "Font Awesome" and "Google Fints: Roboto" de…

…pendencies to prevent failures in the offline mode (#2318) * [JENKINS-34628] Remove dependencies with external static resources * [JENKINS-34628] License files were added * [JENKINS-34628] Added references in the About page
jenkinsci · May 15, 2016 · 606794a · 606794a
1 parent 5762eb9
commit 606794a
Show file tree

Hide file tree

Showing 48 changed files with 4,644 additions and 18 deletions.
diff --git a/core/src/main/resources/hudson/AboutJenkins/index.jelly b/core/src/main/resources/hudson/AboutJenkins/index.jelly
@@ -34,7 +34,8 @@ THE SOFTWARE.
         <div class="col-md-24">
           <h1 version="${app.VERSION}">${%about(app.VERSION)}</h1>
           <p>${%blurb}</p>
-          <p>${%dependencies}</p>
+          <h2>${%dependencies}</h2>
+          <h3>Mavenized dependencies</h3>
           <j:set var="uri" value="${it.licensesURL}"/>
           <j:choose>
             <j:when test="${uri != null}">
@@ -46,7 +47,12 @@ THE SOFTWARE.
               <p>${%No information recorded}</p>
             </j:otherwise>
           </j:choose>
-          <p>${%plugin.dependencies}</p>
+          <h3>${%static.dependencies}</h3>
+          <ul>
+            <li><a href="http://fontawesome.io">Font Awesome</a>, created by <a href="https://twitter.com/davegandy">Dave Gandy</a>. <a href="http://scripts.sil.org/OFL">SIL OFL 1.1 License</a> and <a href="http://opensource.org/licenses/mit-license.html">MIT License</a></li>
+            <li><a href="https://www.google.com/fonts/specimen/Roboto">Google Fonts: Roboto</a>, created by <a href="https://plus.google.com/110879635926653430880/about">Christian Robertson</a>. <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, version 2.0</a></li>
+          </ul>
+          <h2>${%plugin.dependencies}</h2>
           <ul>
             <j:forEach var="p" items="${app.pluginManager.plugins}"> <!-- TODO sort -->
             <li>

diff --git a/core/src/main/resources/hudson/AboutJenkins/index.properties b/core/src/main/resources/hudson/AboutJenkins/index.properties
@@ -23,5 +23,6 @@
 about=About Jenkins {0}
 blurb=<a href="http://jenkins-ci.org/">Jenkins</a> is a community-developed open-source continuous integration server.
 
-dependencies=Jenkins depends on the following 3rd party libraries.
-plugin.dependencies=License and dependency information for plugins:
+dependencies=Jenkins depends on the following 3rd party libraries
+plugin.dependencies=License and dependency information for plugins
+static.dependencies=Static resources
diff --git a/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly b/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly
@@ -3,11 +3,13 @@
 -->
 <?jelly escape-by-default='true'?>
 <l:html norefresh="true" title="${it.displayName}" xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+
   <l:main-panel>
+
+    <link rel="stylesheet" href="${resURL}/css/google-fonts/roboto/css/roboto.css" type="text/css" />
+
     <style type="text/css">
-      @import url(https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css);
-      @import url(https://fonts.googleapis.com/css?family=Roboto:400,300,500,900,700);
-
+
       #main-panel {
           margin: 0;
           padding: 0;

diff --git a/war/package.json b/war/package.json
@@ -17,7 +17,8 @@
     "jenkins-js-builder": "0.0.40",
     "jenkins-js-test": "^1.0.0",
     "jshint": "^2.9.2",
-    "gulp-jshint": "^2.0.0"
+    "gulp-jshint": "^2.0.0",
+    "gulp-less": "^3.1.0"
   },
   "dependencies": {
     "bootstrap-detached": "^3.3.5-v1",

diff --git a/war/pom.xml b/war/pom.xml
@@ -42,7 +42,7 @@ THE SOFTWARE.
     <contextPath>/jenkins</contextPath><!-- context path during test -->
     <port>8080</port><!-- HTTP listener port -->
     <node.version>4.0.0</node.version>
-    <npm.version>2.13.1</npm.version>
+    <npm.version>3.8.9</npm.version>
   </properties>
 
   <dependencies>

diff --git a/war/src/main/less/pluginSetupWizard.less b/war/src/main/less/pluginSetupWizard.less
@@ -1,7 +1,6 @@
-@import (css) 'https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css';
-@import (css) '../css/icons/icomoon.css';
-@import url(https://fonts.googleapis.com/css?family=Roboto:400,300,500,900,700);
-
+@import (css) '../css/font-awesome/css/font-awesome.min.css';
+@import (css) '../css/icomoon/css/icomoon.css';
+@import (css) '../css/google-fonts/roboto/css/roboto.css';
 
 .plugin-setup-wizard() {
     position: fixed;

diff --git a/war/src/main/webapp/css/font-awesome/css/LICENSE.txt b/war/src/main/webapp/css/font-awesome/css/LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Dave Gandy
+
+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.