Remove the dependency on the out-dated backend-theme library and instead drop a layout in this repo

Fixes WEBSITE_346
This commit is contained in:
R. Tyler Croy 2017-04-06 09:13:40 -07:00
parent 79b97cef1c
commit d5cf84abc9
No known key found for this signature in database
GPG Key ID: 1426C7DC3F51E16F
18 changed files with 408 additions and 27 deletions

View File

@ -24,12 +24,11 @@ dependencies {
compile('org.kohsuke.stapler:stapler-jelly:[1.203,2.0)')
compile 'org.kohsuke.stapler:stapler-openid-server:[1.0,2.0)'
compile 'org.jvnet.hudson:commons-jelly-tags-define:1.0.1-hudson-20071021'
compile 'javax.mail:mail:[1.4,2.0)'
compile 'javax.activation:activation:1.1.1'
/* needed for the app skin */
compile 'org.jenkins-ci.backend:jenkins-ci.org-theme:1.3'
compile('io.jenkins.backend:jira-rest-ldap-syncer:1.1') {
exclude module: 'javamail'
}

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="Administration">
<h1>Manage Users</h1>
<p>

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="Password reset">
<p>
The password of ${user.id} (${user.mail}) is reset to <tt>${password}</tt>

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="Administration">
<table>
<tr>

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="Administration">
<p>
Confirm creating the following user

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="Done!">
<h1>Done!</h1>
</t:layout>

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="Done!">
<h1>Done!</h1>
<p>

View File

@ -1,13 +1,15 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="Account self-service app">
<p>
You can create/manage your user account that you use for accessing
<a href="http://wiki.jenkins-ci.org/" target="_top">Wiki</a> and <a href="http://issues.jenkins-ci.org/" target="_top">JIRA</a>,
</p>
<div style="width: 100%;">
<p>
You can create/manage your user account that you use for accessing
<a href="http://wiki.jenkins-ci.org/" target="_top">Wiki</a> and <a href="http://issues.jenkins-ci.org/" target="_top">JIRA</a>,
</p>
</div>
<style>
#account-menu H1 {
margin: 0.5em;
margin: 1rem;
}
</style>

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="Login">
<h1>Login</h1>
@ -22,4 +22,4 @@
}
</script>
</t:layout>
</j:jelly>
</j:jelly>

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="Reset your password">
<h1>Reset your password</h1>
@ -18,4 +18,4 @@
</p>
</form>
</t:layout>
</j:jelly>
</j:jelly>

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="Sign up">
<h1>Sign up</h1>
@ -35,4 +35,4 @@
<input type="submit" style="margin-top:2em; display:block"/>
</form>
</t:layout>
</j:jelly>
</j:jelly>

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="Account App">
<h1>Done!</h1>
</t:layout>

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="Your Profile">
<h1>Your Profile</h1>
@ -42,4 +42,4 @@
<input type="submit" style="margin-top:2em; display:block"/>
</form>
</t:layout>
</j:jelly>
</j:jelly>

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/backend/taglib/layout" xmlns:st="jelly:stapler">
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib" xmlns:st="jelly:stapler">
<st:statusCode value="500" />
<t:layout title="Error">
<h1>Oops!</h1>

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:t="/org/jenkinsci/account/taglib">
<t:layout title="OpenID">
<div style="padding-bottom:1em">
You are trying to login to <b>${it.realm}</b> with your Jenkins ID <b>${it.identity.nick}</b>

View File

@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:t="/org/jenkinsci/backend/taglib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:t="/org/jenkinsci/account/taglib">
<!-- this tells the client to get XRDS elsewhere -->
<st:header name="X-XRDS-Location" value="${it.server.address}xrds"/>
<!-- the rest is human readable -->

View File

@ -0,0 +1,380 @@
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define">
<st:documentation>
<st:attribute name="title" use="required"/>
</st:documentation>
<st:contentType value="text/html;charset=UTF-8" />
<html>
<head>
<title>
${attrs.title} | Jenkins
</title>
<meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
<meta content='Jenkins is an open source automation server' name='description'/>
<link href='/sites/default/files/jenkins_favicon.ico' rel='shortcut icon' type='image/x-icon'/>
<meta charset='utf-8'/>
<meta content='width=device-width, initial-scale=1' name='viewport'/>
<meta content='ie=edge' http-equiv='x-ua-compatible'/>
<link href='img/favicon.ico' rel='icon' sizes='32x32' type='img/png'/>
<link href='img/favicon-32x32.png' rel='icon' sizes='32x32' type='image/png'/>
<link href='img/favicon-16x16.png' rel='icon' sizes='16x16' type='image/png'/>
<link href='img/apple-touch-icon-76x76.png' rel='apple-touch-icon' sizes='76x76'/>
<link href='img/apple-touch-icon-120x120.png' rel='apple-touch-icon' sizes='120x120'/>
<link href='img/apple-touch-icon-152x152.png' rel='apple-touch-icon' sizes='152x152'/>
<meta content='Jenkins Plugins' name='apple-mobile-web-app-title'/>
<!-- Twitter Card data -->
<meta content='summary_large_image' name='twitter:card'/>
<meta content='@JenkinsCI' name='twitter:site'/>
<meta content='Jenkins Plugins' name='twitter:title'/>
<meta content='Jenkins Continuous Delivery for every team' name='twitter:description'/>
<meta content='@JenkinsCI' name='twitter:creator'/>
<!-- Twitter Summary card images must be at least 120x120px -->
<!-- Open Graph data -->
<meta content='${attrs.title}' property='og:title'/>
<meta content='article' property='og:type'/>
<meta content='Jenkins Continuous Delivery for every team' property='og:description'/>
<link href='https://jenkins.io/assets/bower/bootstrap/css/bootstrap.min.css' media='screen' rel='stylesheet'/>
<link href='https://jenkins.io/assets/bower/tether/css/tether.min.css' media='screen' rel='stylesheet'/>
<link href='https://jenkins.io/css/font-icons.css' media='screen' rel='stylesheet'/>
<link href='https://jenkins.io/css/jenkins.css' media='screen' rel='stylesheet'/>
<!-- Non-obtrusive CSS styles -->
<link href='https://jenkins.io/assets/bower/ionicons/css/ionicons.min.css' media='screen' rel='stylesheet'/>
<link href='https://jenkins.io/css/footer.css' media='screen' rel='stylesheet'/>
<link href='https://jenkins.io/css/font-awesome.min.css' media='screen' rel='stylesheet'/>
</head>
<body>
<script src='https://jenkins.io/assets/bower/jquery/jquery.js'></script>
<!-- starting partial toptoolbar.html.haml -->
<nav class='navbar navbar-toggleable-md navbar-inverse top bg-inverse fixed-top' id='ji-toolbar'>
<div class='container'>
<button class='navbar-toggler navbar-toggler-rght hidden-lg-up float-right' data-target='#CollapsingNavbar' data-toggle='collapse' type='button'>
<i class='ion-navicon'></i>
</button>
<a class='navbar-brand' href='https://jenkins.io'>
Jenkins
</a>
<div class='collapse navbar-collapse' id='CollapsingNavbar'>
<ul class='nav navbar-nav ml-auto'>
<li class='nav-item'>
<a class='nav-link' href='https://jenkins.io/node'>
Blog
</a>
</li>
<li class='nav-item'>
<a class='nav-link' href='https://jenkins.io/doc'>
Documentation
</a>
</li>
<li class='nav-item'>
<a class='nav-link' href='https://plugins.jenkins.io/'>
Plugins
</a>
</li>
<li class='nav-item dropdown'>
<div aria-expanded='false' aria-haspopup='true' class='nav-link dropdown-toggle' data-toggle='dropdown' role='button'>
Use-cases
</div>
<div class='dropdown-menu'>
<a class='dropdown-item feature' href='https://jenkins.io/solutions/android'>
Android
</a>
<a class='dropdown-item feature' href='https://jenkins.io/solutions/c'>
C/C++
</a>
<a class='dropdown-item feature' href='https://jenkins.io/solutions/docker'>
Docker
</a>
<a class='dropdown-item feature' href='https://jenkins.io/solutions/embedded'>
Embedded
</a>
<a class='dropdown-item feature' href='https://jenkins.io/solutions/github'>
GitHub
</a>
<a class='dropdown-item feature' href='https://jenkins.io/solutions/java'>
Java
</a>
<a class='dropdown-item feature' href='https://jenkins.io/solutions/pipeline'>
Continuous Delivery
</a>
<a class='dropdown-item feature' href='https://jenkins.io/solutions/python'>
Python
</a>
<a class='dropdown-item feature' href='https://jenkins.io/solutions/ruby'>
Ruby
</a>
</div>
</li>
<li class='nav-item'>
<a class='nav-link' href='https://jenkins.io/participate'>
Participate
</a>
</li>
<li class='dropdown nav-item'>
<div aria-expanded='false' aria-haspopup='true' class='nav-link dropdown-toggle' data-toggle='dropdown' role='button'>Sub-projects</div>
<div class='dropdown-menu'>
<a class='dropdown-item feature' href='https://jenkins.io/projects/'>
Overview
</a>
<a class='dropdown-item feature' href='https://jenkins.io//projects/blueocean/'>
Blue Ocean
</a>
<a class='dropdown-item feature' href='https://jenkins.io//projects/gsoc/'>
Google Summer of Code
</a>
<a class='dropdown-item feature' href='https://jenkins.io//projects/infrastructure/'>
Infrastructure
</a>
<a class='dropdown-item feature' href='https://jenkins.io//projects/jam/'>
Jenkins Area Meetups
</a>
</div>
</li>
<li class='nav-item dropdown'>
<div aria-expanded='false' aria-haspopup='true' class='active nav-link dropdown-toggle' data-toggle='dropdown' role='button'>
Resources
</div>
<div class='dropdown-menu'>
<a class='active dropdown-item feature' href='https://accounts.jenkins.io/' title='Create/manage your account for accessing wiki, issue tracker, etc'>
Account Management
</a>
<a class='dropdown-item' href='https://jenkins.io/chat' title='Chat with the rest of the Jenkins community on IRC'>
Chat
</a>
<a class='dropdown-item feature' href='https://issues.jenkins-ci.org/'>
Issue Tracker
</a>
<a class='dropdown-item' href='https://jenkins.io/mailing-lists' title='Browse Jenkins mailing list archives and/or subscribe to lists'>
Mailing Lists
</a>
<a class='dropdown-item feature' href='https://wiki.jenkins-ci.org/'>
Wiki
</a>
</div>
</li>
<li class='nav-item dropdown'>
<div aria-expanded='false' aria-haspopup='true' class='nav-link dropdown-toggle' data-toggle='dropdown' role='button'>
About
</div>
<div class='dropdown-menu'>
<a class='dropdown-item' href='https://jenkins.io/security'>
Security
</a>
<a class='dropdown-item' href='https://jenkins.io/press'>
Press
</a>
<a class='dropdown-item' href='https://jenkins.io/project/conduct'>
Conduct
</a>
</div>
</li>
<li class='nav-item'>
<a class='nav-link btn btn-outline-secondary' href='https://jenkins.io/download'>
Download
</a>
</li>
</ul>
</div>
</div>
</nav>
<!-- Spacing to make the fixed-top sticky navbar not occlude any content below it -->
<div class='pt-5'>
&#160;
</div>
<!-- ending partial toptoolbar.html.haml -->
<div class='container'>
<div class='row'>
<div class="col-md-12">
<d:invokeBody />
</div>
</div>
</div>
<script src='https://jenkins.io/assets/bower/anchor-js/anchor.min.js'></script>
<script src='https://jenkins.io/assets/bower/tether/js/tether.min.js'></script>
<script src='https://jenkins.io/assets/bower/bootstrap/js/bootstrap.min.js'></script>
<footer id='footer'>
<div class='container'>
<div class='row'>
<div class='col-md-4'>
<div class='license-box'>
<div id='creativecommons'>
<a href='https://creativecommons.org/licenses/by-sa/4.0/'>
<p>
<img src='https://licensebuttons.net/l/by-sa/4.0/88x31.png'/>
</p>
</a>
<p>
The content driving this site is licensed under the Creative
Commons Attribution-ShareAlike 4.0 license.
</p>
</div>
</div>
</div>
<div class='links col-md-8'>
<div class='container'>
<div class='row'>
<div class='area col-md-3'>
<div class='div-mar'>
<h5>Resources</h5>
<ul class='resources'>
<li>
<a href='/events'>
Events
</a>
</li>
<li>
<a href='/doc'>
Documentation
</a>
</li>
<li>
<a href='/node'>
Blog
</a>
</li>
</ul>
</div>
</div>
<div class='area col-md-3'>
<div class='div-mar'>
<h5>Solutions</h5>
<ul>
<li>
<a href='/solutions/android'>
Android
</a>
</li>
<li>
<a href='/solutions/c'>
C/C++
</a>
</li>
<li>
<a href='/solutions/docker'>
Docker
</a>
</li>
<li>
<a href='/solutions/embedded'>
Embedded
</a>
</li>
<li>
<a href='/solutions/github'>
GitHub
</a>
</li>
<li>
<a href='/solutions/java'>
Java
</a>
</li>
<li>
<a href='/solutions/pipeline'>
Continuous Delivery
</a>
</li>
<li>
<a href='/solutions/python'>
Python
</a>
</li>
<li>
<a href='/solutions/ruby'>
Ruby
</a>
</li>
</ul>
</div>
</div>
<div class='area col-md-3'>
<div class='div-mar'>
<h5>Project</h5>
<ul class='project'>
<li>
<a href='https://issues.jenkins-ci.org'>
Issue tracker
</a>
</li>
<li>
<a href='https://wiki.jenkins-ci.org'>
Wiki
</a>
</li>
<li>
<a href='https://github.com/jenkinsci'>
GitHub
</a>
</li>
<li>
<a href='https://ci.jenkins.io'>
Jenkins on Jenkins
</a>
</li>
</ul>
</div>
</div>
<div class='area col-md-3'>
<div class='div-mar'>
<h5>Community</h5>
<ul class='community'>
<li>
<a href='https://groups.google.com/forum/#!forum/jenkinsci-users'>
Users mailing list
</a>
</li>
<li>
<a href='https://groups.google.com/forum/#!forum/jenkinsci-dev'>
Developers mailing list
</a>
</li>
<li>
<a href='https://twitter.com/jenkinsci'>
Twitter
</a>
</li>
<li>
<a href='https://reddit.com/r/jenkinsci'>
Reddit
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</footer>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-4216293-5', 'auto');
ga('send', 'pageview');
ga('set', 'anonymizeIp', true);
</script>
<script>
!function(d,s,id) {
var js, fjs=d.getElementsByTagName(s)[0];
if (!d.getElementById(id)) {
js = d.createElement(s);
js.id=id;
js.src="//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js,fjs);
}
}(document,"script","twitter-wjs");
</script>
</body>
</html>
</j:jelly>