Skip to content

Commit d8b4805

Browse files
committed
Try out jenkis-io-components
1 parent a6040ba commit d8b4805

File tree

2 files changed

+16
-270
lines changed

2 files changed

+16
-270
lines changed

content/_layouts/frame.html.haml

Lines changed: 15 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -87,134 +87,28 @@
8787
%script{:src => expand_link("/assets/bower/anchor-js/anchor.min.js")}
8888
%script{:src => expand_link("/assets/bower/@popperjs/core/umd/popper.min.js")}
8989
%script{:src => expand_link("/assets/bower/bootstrap/js/bootstrap.min.js")}
90+
%script{:src => "https://unpkg.com/lit@2.4.0/polyfill-support.js"}
91+
%script{:src => "https://unpkg.com/@webcomponents/webcomponentsjs@2.6.0/webcomponents-loader.js"}
92+
9093
%script{:src => "https://cdnjs.cloudflare.com/ajax/libs/ionicons/5.5.2/ionicons/ionicons.esm.js",
9194
:type => "module",
95+
:defer => "",
9296
:data-stencil-namespace => "ionicons"}
9397
%script{:src => "https://cdnjs.cloudflare.com/ajax/libs/ionicons/5.5.2/ionicons/ionicons.js",
9498
:nomodule => "",
99+
:defer => "",
95100
:data-stencil-namespace => "ionicons"}
96-
%footer#footer
97-
.container
98-
.row
99-
.col-md-4
100-
- unless page.uneditable
101-
%p.box
102-
%a{:href => "https://github.com/jenkins-infra/jenkins.io/edit/master/content/#{page.relative_source_path}",
103-
:title => "Edit #{page.relative_source_path} on GitHub",
104-
}
105-
%img.icon-improve{:src => '/images/github-mark.svg', :alt => "Edit #{page.relative_source_path} on GitHub"}
106-
Improve this page
107-
 
108-
%a{:href => "https://github.com/jenkins-infra/jenkins.io/issues/new?labels=bug&template=4-bug.md&title=#{page.title} page - TODO: Put a summary here&body=Problem with the [#{page.title}](https://www.jenkins.io#{page.url}) page, [source file](https://github.com/jenkins-infra/jenkins.io/blob/master/content#{page.relative_source_path})%0A%0ATODO: Describe the expected and actual behavior here %0A%0A%23%23 Screenshots %0A%0A TODO: Add screenshots if possible %0A%0A%23%23 Possible Solution %0A%0A%3C!-- If you have suggestions on a fix for the bug, please describe it here. --%3E %0A%0AN/A",
109-
:title => "Report a problem with #{page.relative_source_path}",
110-
}
111-
%ion-icon.report{:name=>"warning"}
112-
Report a problem
113-
114-
.license-box
115-
#creativecommons
116-
%a{:href => 'https://creativecommons.org/licenses/by-sa/4.0/'}
117-
%p
118-
%img{:src => 'https://licensebuttons.net/l/by-sa/4.0/88x31.png', :alt => 'Creative Commons Attribution-ShareAlike license'}/
119-
120-
%p
121-
The content driving this site is licensed under the Creative
122-
Commons Attribution-ShareAlike 4.0 license.
123-
124-
.links.col-md-8
125-
.container
126-
.row
127-
.area.col-md-3
128-
.div-mar
129-
%h5 Resources
130-
131-
%ul.resources
132-
%li
133-
%a{:href => expand_link("download")}
134-
Downloads
135-
%li
136-
%a{:href => expand_link("node")}
137-
Blog
138-
%li
139-
%a{:href => expand_link("doc")}
140-
Documentation
141-
%li
142-
%a{:href => 'https://plugins.jenkins.io/'}
143-
Plugins
144-
%li
145-
%a{:href => expand_link("security")}
146-
Security
147-
%li
148-
%a{:href => expand_link("participate")}
149-
Contributing
150-
151-
.area.col-md-3
152-
.div-mar
153-
%h5 Project
154-
155-
%ul.project
156-
%li
157-
%a{:href => expand_link("project")}
158-
Structure and governance
159-
%li
160-
%a{:href => 'https://issues.jenkins.io'}
161-
Issue tracker
162-
%li
163-
%a{:href => expand_link("project/roadmap")}
164-
Roadmap
165-
%li
166-
%a{:href => 'https://github.com/jenkinsci'}
167-
GitHub
168-
%li
169-
%a{:href => 'https://ci.jenkins.io'}
170-
Jenkins on Jenkins
171-
172-
.area.col-md-3
173-
.div-mar
174-
%h5 Community
175-
176-
%ul.community
177-
%li
178-
%a{:href => 'https://community.jenkins.io'}
179-
Forum
180-
%li
181-
%a{:href => expand_link("events")}
182-
Events
183-
%li
184-
%a{:href => expand_link("mailing-lists")}
185-
Mailing lists
186-
%li
187-
%a{:href => expand_link("chat")}
188-
Chats
189-
%li
190-
%a{:href => expand_link("sigs")}
191-
Special Interest Groups
192-
%li
193-
%a{:href => 'https://twitter.com/jenkinsci'}
194-
Twitter
195-
%li
196-
%a{:href => 'https://reddit.com/r/jenkinsci'}
197-
Reddit
198-
.area.col-md-3
199-
.div-mar
200-
%h5 Other
101+
%script{:src => "https://unpkg.com/@jenkinsci/jenkins-io-components?module",
102+
:type => "module",
103+
:defer => ""}
104+
%script{:src => "https://unpkg.com/@jenkinsci/jenkins-io-components",
105+
:nomodule => "",
106+
:defer => ""}
201107

202-
%ul.other
203-
%li
204-
%a{:href => expand_link("conduct")}
205-
Code of Conduct
206-
%li
207-
%a{:href => expand_link("press")}
208-
Press information
209-
%li
210-
%a{:href => expand_link("merchandise")}
211-
Merchandise
212-
%li
213-
%a{:href => expand_link("artwork")}
214-
Artwork
215-
%li
216-
%a{:href => expand_link("awards")}
217-
Awards
108+
%jio-footer{:property => "https://www.jenkins.io",
109+
:githubRepo => "jenkins-infra/jenkins.io",
110+
:githubBranch => "master",
111+
:sourcePath=> page.uneditable ? "" : "content/#{page.relative_source_path}"}
218112

219113
= google_analytics_universal
220114

@@ -224,9 +118,6 @@
224118
:javascript
225119
$(function(){
226120
var $body = $(document.body);
227-
$(".nav-link.dropdown-toggle").on("mousedown", function(){
228-
$body.addClass("no-outline");
229-
})
230121
$body.on("keydown", function(){
231122
$body.removeClass("no-outline");
232123
})

content/_partials/toptoolbar.html.haml

Lines changed: 1 addition & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -1,149 +1,4 @@
1-
%nav#ji-toolbar.navbar.navbar-expand-lg.navbar-dark.bg-dark.fixed-top
2-
%a.navbar-brand{:href => expand_link('/')}
3-
= site.base_title
4-
%button.navbar-toggler{"data-bs-target" => "#CollapsingNavbar", "data-bs-toggle" => "collapse", :type => "button"}
5-
%span.navbar-toggler-icon
6-
#CollapsingNavbar.collapse.navbar-collapse
7-
8-
%ul.nav.navbar-nav.mr-auto
9-
%li.nav-item.dropdown
10-
= partial("dropdown.html.haml", :name => partial('cdf_logo.html.haml'))
11-
12-
.dropdown-menu
13-
%a.dropdown-item.feature{:href => "https://cd.foundation/"}
14-
What is CDF?
15-
%a.dropdown-item.feature{:href => "https://jenkins-x.io/"}
16-
Jenkins X
17-
%a.dropdown-item.feature{:href => "https://tekton.dev/"}
18-
Tekton
19-
%a.dropdown-item.feature{:href => "https://www.spinnaker.io/"}
20-
Spinnaker
21-
22-
%ul.nav.navbar-nav.ml-auto
23-
24-
%li.nav-item{:class => active_link?('blog')}
25-
%a.nav-link{:href => expand_link('node')}
26-
Blog
27-
28-
%li.nav-item.dropdown
29-
= partial("dropdown.html.haml", :name => "Documentation")
30-
31-
.dropdown-menu
32-
%a.dropdown-item.feature{:href => expand_link('doc/book')}
33-
%strong
34-
User Guide
35-
%a.dropdown-item{:href => expand_link('doc/book/installing/')}
36-
= ' - Installing Jenkins'
37-
%a.dropdown-item{:href => expand_link('doc/book/pipeline')}
38-
= ' - Jenkins Pipeline'
39-
%a.dropdown-item{:href => expand_link('doc/book/managing/')}
40-
= ' - Managing Jenkins'
41-
%a.dropdown-item{:href => expand_link('doc/book/security/')}
42-
= ' - Securing Jenkins'
43-
%a.dropdown-item{:href => expand_link('doc/book/system-administration')}
44-
= ' - System Administration'
45-
%a.dropdown-item{:href => expand_link('doc/book/troubleshooting')}
46-
= ' - Troubleshooting Jenkins'
47-
%a.dropdown-item{:href => expand_link('doc/book/glossary/')}
48-
= ' - Terms and Definitions'
49-
%a.dropdown-item{:href => expand_link('solutions')}
50-
%strong
51-
Solution Pages
52-
%a.dropdown-item{:href => expand_link('doc/tutorials/')}
53-
%strong
54-
Tutorials
55-
%a.dropdown-item{:href => expand_link('doc/pipeline/tour/getting-started/')}
56-
= ' - Guided Tour'
57-
%a.dropdown-item{:href => expand_link('doc/tutorials/')}
58-
= ' - More Tutorials'
59-
%a.dropdown-item.feature{:href => expand_link('doc/developer')}
60-
%strong
61-
Developer Guide
62-
%a.dropdown-item{:href => expand_link('participate')}
63-
%strong
64-
Contributor Guide
65-
66-
%li.nav-item{:class => active_link?('plugins')}
67-
%a.nav-link{:href => 'https://plugins.jenkins.io/'}
68-
Plugins
69-
70-
%li.nav-item.dropdown
71-
= partial("dropdown.html.haml", :name => "Community")
72-
73-
.dropdown-menu
74-
%a.dropdown-item.feature{:href => expand_link("participate")}
75-
Overview
76-
%a.dropdown-item.feature{:href => expand_link('chat'), :title => "Chat with the rest of the Jenkins community on IRC"}
77-
Chat
78-
%a.dropdown-item.feature{:href => expand_link('projects/jam')}
79-
Meet
80-
%a.dropdown-item.feature{:href => expand_link('events')}
81-
Events
82-
%a.dropdown-item.feature{:href => "https://community.jenkins.io/"}
83-
Forum
84-
%a.dropdown-item.feature{:href => "https://issues.jenkins.io/"}
85-
Issue Tracker
86-
%a.dropdown-item.feature{:href => expand_link('mailing-lists'),
87-
:title => "Browse Jenkins mailing list archives and/or subscribe to lists"}
88-
Mailing Lists
89-
%a.dropdown-item.feature{:href => expand_link('project/roadmap')}
90-
Roadmap
91-
%a.dropdown-item.feature{:href => "https://accounts.jenkins.io/", :title => "Create/manage your account for accessing wiki, issue tracker, etc"}
92-
Account Management
93-
94-
%a.dropdown-item.feature{:href => expand_link('sigs/')}
95-
%strong
96-
Special Interest Groups
97-
- site.pages.map do |page|
98-
- if page.url && page.url.match(/\/sigs\/([^\/]+)\/$/)
99-
%a.dropdown-item.feature{:href => expand_link(page.url)}
100-
= ' - ' + page.title
101-
102-
%li.dropdown.nav-item
103-
= partial("dropdown.html.haml", :name => "Subprojects")
104-
105-
.dropdown-menu
106-
%a.dropdown-item.feature{:href => expand_link('projects/')}
107-
Overview
108-
- site.pages.map do |page|
109-
- if page.url && page.url.match(/\/projects\/([^\/]+)\/$/) && page.layout == "project"
110-
%a.dropdown-item.feature{:href => expand_link(page.url)}
111-
= page.title
112-
%a.dropdown-item.feature{:href => expand_link('/sigs/docs/gsod/2020/projects/document-jenkins-on-kubernetes/')}
113-
Document Jenkins on Kubernetes
114-
115-
%li.nav-item.dropdown
116-
= partial("dropdown.html.haml", :name => "About")
117-
118-
.dropdown-menu
119-
%a.dropdown-item{:href => expand_link('project/roadmap')}
120-
Roadmap
121-
%a.dropdown-item{:href => expand_link('security')}
122-
Security
123-
%a.dropdown-item{:href => expand_link('press')}
124-
Press
125-
%a.dropdown-item{:href => expand_link('awards')}
126-
Awards
127-
%a.dropdown-item{:href => expand_link('project/conduct')}
128-
Conduct
129-
%a.dropdown-item{:href => expand_link('artwork')}
130-
Artwork
131-
%a.dropdown-item{:href => expand_link('books')}
132-
Books
133-
134-
%li.nav-item.dropdown
135-
= partial("dropdown.html.haml", :name => "English")
136-
137-
.dropdown-menu
138-
%a.dropdown-item{:href => expand_link('zh')}
139-
中文 Chinese
140-
141-
%li.nav-item.searchbox
142-
%input.form-control.searchbox{:type => "search", :placeholder => "Search", :aria => { :label => "Search" }}
143-
144-
%li.nav-item.download-btn
145-
%a.nav-link.btn.btn-outline-secondary{:href => expand_link('download')}
146-
Download
1+
%jio-navbar#ji-toolbar.fixed-top{:property=>"https://www.jenkins.io", :showSearchBox=>""}
1472

1483
/ Spacing to make the fixed-top sticky navbar not occlude any content below it
1494
.pt-4

0 commit comments

Comments
 (0)