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

Issue #7132 Update demos #7133

Merged
merged 5 commits into from
Dec 7, 2021
Merged

Issue #7132 Update demos #7133

merged 5 commits into from
Dec 7, 2021

Conversation

janbartel
Copy link
Contributor

Clean up of demos that are linked off the distro landing page:

  • to remove old/incorrect text
  • to remove old banners
  • to add consistent menu headers with links to Demo Home, Jetty Home, Demo Source, Documentation & Commercial Support to all demos
  • update look and feel to match landing page

Added demos/demo-template with resources to be used in new demos:

  • demo.css : stylesheet
  • index.html: page layout
  • small_powered_by.gif : footer image

@janbartel
Copy link
Contributor Author

Example of new look
example-demo

@janbartel janbartel self-assigned this Nov 18, 2021
@janbartel janbartel requested a review from olamy November 30, 2021 05:23
joakime
joakime reviewed Dec 1, 2021
View reviewed changes
demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html
</p>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-async-rest">Source</a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will need to be manually changed for the merge to 11.0.x

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Only the once though.

joakime
joakime reviewed Dec 1, 2021
View reviewed changes
demos/demo-jaas-webapp/src/main/webapp/auth.html
</head>

<body>
<h1>SUCCESS! You are AUTHENTICATED and AUTHORIZED</h1>
In order to see this page, you must have been JAAS authentictated using the
configured Login Module. You have also been AUTHORIZED according to this webapp's role-based web security constraints.
In order to see this page, you must have been JAAS <i>authenticated</i> using the
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should probably be <em> instead of <i>

joakime
joakime reviewed Dec 1, 2021
View reviewed changes
demos/demo-jaas-webapp/src/main/webapp/demo.css Outdated
font-size: 11pt;
font-family:sans-serif;
}
A:visited
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Odd spacing.

In fact, why is this entire css even indented?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

joakime
joakime reviewed Dec 1, 2021
View reviewed changes
demos/demo-jaas-webapp/src/main/webapp/index.html
</center>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jaas-webapp">Source</a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto on the manual merge to 11.0.x

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, It's very very rare that these files change.

joakime
joakime reviewed Dec 1, 2021
View reviewed changes
demos/demo-jaas-webapp/src/main/webapp/login.html
<p>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jaas-webapp">Source</a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, It's very very rare that these files change.

joakime
joakime reviewed Dec 1, 2021
View reviewed changes
demos/demo-jetty-webapp/src/main/webapp/auth.html

<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, It's very very rare that these files change.

joakime
joakime requested changes Dec 1, 2021
View reviewed changes
Copy link
Contributor

@joakime joakime left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you run an IDE reformat of the css files?
To get rid of the odd whole-file indentation and spacing?

Reminder: we have to be careful on the merge of this to 11.0.x. (to update the html href versions)

@janbartel
Copy link
Contributor Author

@joakime done, please rereview.

@janbartel
Copy link
Contributor Author

@joakime nudge

@janbartel janbartel merged commit 9bd1e43 into jetty-10.0.x Dec 7, 2021
@janbartel janbartel deleted the jetty-10.0.x-7132-demos-update branch December 7, 2021 22:18
@janbartel janbartel mentioned this pull request Dec 20, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joakime joakime joakime approved these changes

@olamy olamy Awaiting requested review from olamy

Assignees

@janbartel janbartel

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@janbartel @joakime