Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #246: Header must be fetched from jakarta.ee #293

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fix #246: Header must be fetched from jakarta.ee #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2869655
Fetch Header/Footer Functionality
yashTEF Jan 10, 2024
c44903b
Fix Indent
yashTEF Jan 10, 2024
ca20f2f
Merge branch 'eclipse-ee4j:master' into master
yashTEF Jun 1, 2024
2440d6a
overwrite header/footer with updated files from remote url
yashTEF Jun 1, 2024
7a58a51
change to debug logs
yashTEF Jun 1, 2024
c43ddea
fetch-changes
yashTEF Nov 30, 2024
6c43afc
Merge branch 'eclipse-ee4j-master'
yashTEF Nov 30, 2024
e861f02
merge-changes
yashTEF Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 62 additions & 1 deletion ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<email>[email protected]</email>
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/eclipse-ee4j/starter.git</connection>
<developerConnection>scm:git:ssh://github.com:eclipse-ee4j/starter.git</developerConnection>
Expand Down Expand Up @@ -135,6 +134,68 @@
</resources>

<plugins>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.3.0</version>
<executions>
<execution>
<id>my-id-0</id>
<phase>process-resources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://jakarta.ee/templates/header/</url>
<outputFileName>_template_header_.html</outputFileName>
<outputDirectory>${project.build.directory}/jakarta-starter-ui</outputDirectory>
<overwrite>true</overwrite>
<skipCache>true</skipCache>
</configuration>
</execution>
<execution>
<id>my-id-1</id>
<phase>process-resources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://jakarta.ee/templates/footer/</url>
<outputFileName>_template_footer_.html</outputFileName>
<outputDirectory>${project.build.directory}/jakarta-starter-ui</outputDirectory>
<overwrite>true</overwrite>
<skipCache>true</skipCache>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.cosium.html</groupId>
<artifactId>html-to-xhtml-maven-plugin</artifactId>
<version>1.2</version>
<executions>
<!-- On Maven generate-resources phase, convert ${project.basedir}/example.html to ${project.build.outputDirectory}/example.xhtml -->
<execution>
<id>convert-html-to-xhtml</id>
<phase>package</phase>
<goals>
<goal>html-to-xhtml</goal>
</goals>
</execution>
</executions>
<configuration>
<conversions>
<conversion>
<htmlInputFilePath>${project.build.directory}/jakarta-starter-ui/_template_header_.html</htmlInputFilePath>
<xhtmlOutputFilePath>${project.build.directory}/jakarta-starter-ui/WEB-INF/header_fragment.xhtml</xhtmlOutputFilePath>
</conversion>
<!-- <conversion>
<htmlInputFilePath>${project.build.directory}/jakarta-starter-ui/_template_footer_.html</htmlInputFilePath>
<xhtmlOutputFilePath>${project.build.directory}/jakarta-starter-ui/WEB-INF/footer_fragment.xhtml</xhtmlOutputFilePath>
</conversion> -->
</conversions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
101 changes: 3 additions & 98 deletions ui/src/main/webapp/WEB-INF/footer.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,100 +1,5 @@
<ui:composition
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns="http://www.w3.org/1999/xhtml">
<footer id="solstice-footer">
<div class="container">
<div class="row">
<a class="scrollup" href="#">Back to the top</a>
<div class="col-sm-24 margin-top-20">
<div class="row">
<div class="col-md-16" id="copyright">
<p id="copyright-text">Copyright © Eclipse Foundation, Inc. All Rights Reserved.</p>
</div>
<div class="col-md-8 social-media">
<ul class="list-inline">
<li>
<a class="social-media-link fa-stack fa-lg" href="https://twitter.com/JakartaEE">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-twitter fa-stack-1x"></i>
<span class="sr-only">Twitter account</span>
</a>
</li>
<li>
<a class="social-media-link fa-stack fa-lg"
href="https://www.facebook.com/JakartaEE">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-facebook fa-stack-1x"></i>
<span class="sr-only">Facebook account</span>
</a>
</li>
<li>
<a class="social-media-link fa-stack fa-lg"
href="https://www.youtube.com/channel/UC4M7h5b6elu9VlzjLfzuXyg">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-youtube fa-stack-1x"></i>
<span class="sr-only">Youtube account</span>
</a>
</li>
<li>
<a class="social-media-link fa-stack fa-lg"
href="https://www.linkedin.com/groups/13597511/" title="">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-linkedin fa-stack-1x"></i>
<span class="sr-only">Linkedin account</span>
</a>
</li>
</ul>
</div>
</div>
</div>
<section class="col-sm-6 hidden-print" id="footer-useful-links">
<h2 class="section-title">Useful Links</h2>
<ul class="nav">
<li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
<li><a href="//help.eclipse.org/">Documentation</a></li>
<li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
<li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
<li><a href="https://www.eclipse.org/forums/">Forums</a></li>
<li><a href="//marketplace.eclipse.org">Marketplace</a></li>
</ul>
</section>
<section class="col-sm-6 hidden-print" id="footer-other">
<h2 class="section-title">Other</h2>
<ul class="nav">
<li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
<li><a href="https://www.eclipse.org/projects">Projects</a></li>
<li><a href="https://www.eclipse.org/org/workinggroups/">Working Groups</a></li>
<li><a href="https://www.eclipse.org/org/research/">Research@Eclipse</a></li>
<li><a href="https://www.eclipse.org/security/">Report a Vulnerability</a></li>
<li><a href="https://status.eclipse.org">Service Status</a></li>
</ul>
</section>
<section class="col-sm-6 hidden-print" id="footer-eclipse-foundation">
<h2 class="section-title">Eclipse Foundation</h2>
<ul class="nav">
<li><a href="https://www.eclipse.org/org/">About Us</a></li>
<li><a href="https://www.eclipse.org/org/foundation/contact.php">Contact Us</a></li>
<li><a href="https://www.eclipse.org/donate">Donate</a></li>
<li><a href="https://www.eclipse.org/membership">Members</a></li>
<li><a href="https://www.eclipse.org/org/documents/">Governance</a></li>
<li><a href="https://www.eclipse.org/org/documents/Community_Code_of_Conduct.php">Code
of Conduct</a></li>
<li><a href="https://www.eclipse.org/artwork/">Logo and Artwork</a></li>
<li><a href="https://www.eclipse.org/org/foundation/directors.php">Board of
Directors</a></li>
</ul>
</section>
<section class="col-sm-6 hidden-print" id="footer-legal">
<h2 class="section-title">Legal</h2>
<ul class="nav">
<li><a href="https://www.eclipse.org/legal/privacy.php">Privacy Policy</a></li>
<li><a href="https://www.eclipse.org/legal/termsofuse.php">Terms of Use</a></li>
<li><a href="https://www.eclipse.org/legal/copyright.php">Copyright Agent</a></li>
<li><a href="https://www.eclipse.org/legal/epl-2.0/">Eclipse Public License</a></li>
<li><a href="https://www.eclipse.org/legal/">Legal Resources </a></li>
</ul>
</section>
</div>
</div>
</footer>
<script src="https://jakarta.ee/js/solstice.js"></script>
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://xmlns.jcp.org/jsf/html">
<ui:insert name="script"><script src="https://jakarta.ee/js/solstice.js"></script></ui:insert>
</ui:composition>
3 changes: 1 addition & 2 deletions ui/src/main/webapp/WEB-INF/template.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
margin-right: 10px;
}
</h:outputStylesheet>

<title>Eclipse Starter for Jakarta EE</title>

</h:head>
Expand Down Expand Up @@ -102,4 +101,4 @@

</h:body>

</html>
</html>
11 changes: 5 additions & 6 deletions ui/src/main/webapp/WEB-INF/topbar.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ui:composition
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns="http://www.w3.org/1999/xhtml">
<ui:composition template="/WEB-INF/header_fragment.xhtml" xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://xmlns.jcp.org/jsf/html">

<a class="sr-only" href="#content">Skip to main content</a>
<header class="header-wrapper header-default-bg-img" id="header-wrapper">
Expand Down Expand Up @@ -184,9 +184,8 @@
</li>
</ol>
</div>
<h3 class="sr-only">Breadcrumbs</h3>
</div>
<h3 class="sr-only">Breadcrumbs</h3>
</div>
</section>

</section>
</ui:define>
</ui:composition>