From 4b1b467f15da3e6558d9cbd88f6d86743f882c93 Mon Sep 17 00:00:00 2001
From: Martin Lowe <martin.lowe@eclipse-foundation.org>
Date: Wed, 11 Jan 2023 14:30:43 -0500
Subject: [PATCH 1/2] Iss #112 - Add help message related to common
troubleshooting to ui
---
.../templates/simple_fingerprint_ui.html | 22 ++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/main/resources/templates/simple_fingerprint_ui.html b/src/main/resources/templates/simple_fingerprint_ui.html
index 9dbdefc9..d08968c1 100644
--- a/src/main/resources/templates/simple_fingerprint_ui.html
+++ b/src/main/resources/templates/simple_fingerprint_ui.html
@@ -57,7 +57,7 @@
<div class="col-md-24 margin-bottom-20">
<div class="panel panel-danger">
<div class="panel-heading"><i class="fa fa-times" aria-hidden="true"></i>
- Author(s) covered by necessary legal agreements
+ Author(s) not covered by necessary legal agreements
</div>
<div class="panel-body background-white">
<ul class="list-group-item-text">
@@ -69,6 +69,7 @@
</div>
</div>
</div>
+
<a id="more-details" href="#accordion" class="big" data-toggle="collapse">More details
<i class="margin-left-10 icon-toggle glyphicon glyphicon-plus"></i>
</a>
@@ -93,6 +94,25 @@
</div>
{/for}
</div>
+ </div>
+ <div class="row">
+ <div class="col-md-24 margin-top-20 margin-bottom-20">
+ <h3 class="alert-heading margin-top-0"><i class="fa fa-info margin-right-15" aria-hidden="true"></i>Common troubleshooting tips</h3>
+ <p>
+ A common error experienced by users is that the email associated with commits do not align with the email set in the Eclipse Foundation account. If you have an Eclipse Foundation account and a signed ECA-equivalent document, there are ways to validate the users and email addresses associated with a commit.
+ </p>
+ <p>
+ Below are 3 sample commands that will display the committer and author emails for a given commit or range. The first command shows the latest commit, while the second command will show results for a given commit, replacing `<SHA>` with the commit SHA. The last example will render a range of sequential commits. As is, it will show the last 5 commits starting from HEAD for the current branch. Both sides of the range can be replaced with commit SHAs to represent a different range.
+ </p>
+ <code>
+ <span>git show -s --format='Commit: %h, Committer: %ce, Author: %ae</span>
+ <br>
+ <span>git show -s --format='Commit: %h, Committer: %ce, Author: %ae' <SHA></span>
+ <br>
+ <span>git show -s --format='Commit: %h, Committer: %ce, Author: %ae' HEAD...HEAD~5</span>
+ </code>
+ </div>
+ </div>
{#else}
<div class="panel panel-success">
<div class="panel-heading"><i class="fa fa-check" aria-hidden="true"></i>
--
GitLab
From 6b491d8261fb320bafb5b45d3e89eb47ebfa97a4 Mon Sep 17 00:00:00 2001
From: Martin Lowe <martin.lowe@eclipse-foundation.org>
Date: Tue, 17 Jan 2023 15:10:11 -0500
Subject: [PATCH 2/2] Update style of help window to use panel instead of alert
---
.../templates/simple_fingerprint_ui.html | 32 +++++++++++--------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/templates/simple_fingerprint_ui.html b/src/main/resources/templates/simple_fingerprint_ui.html
index d08968c1..97fb849b 100644
--- a/src/main/resources/templates/simple_fingerprint_ui.html
+++ b/src/main/resources/templates/simple_fingerprint_ui.html
@@ -97,20 +97,24 @@
</div>
<div class="row">
<div class="col-md-24 margin-top-20 margin-bottom-20">
- <h3 class="alert-heading margin-top-0"><i class="fa fa-info margin-right-15" aria-hidden="true"></i>Common troubleshooting tips</h3>
- <p>
- A common error experienced by users is that the email associated with commits do not align with the email set in the Eclipse Foundation account. If you have an Eclipse Foundation account and a signed ECA-equivalent document, there are ways to validate the users and email addresses associated with a commit.
- </p>
- <p>
- Below are 3 sample commands that will display the committer and author emails for a given commit or range. The first command shows the latest commit, while the second command will show results for a given commit, replacing `<SHA>` with the commit SHA. The last example will render a range of sequential commits. As is, it will show the last 5 commits starting from HEAD for the current branch. Both sides of the range can be replaced with commit SHAs to represent a different range.
- </p>
- <code>
- <span>git show -s --format='Commit: %h, Committer: %ce, Author: %ae</span>
- <br>
- <span>git show -s --format='Commit: %h, Committer: %ce, Author: %ae' <SHA></span>
- <br>
- <span>git show -s --format='Commit: %h, Committer: %ce, Author: %ae' HEAD...HEAD~5</span>
- </code>
+ <div class="panel info-panel">
+ <h3 class="panel-heading margin-top-0"><i class="fa fa-info margin-right-15" aria-hidden="true"></i>Common troubleshooting tips</h3>
+ <div class="panel-body">
+ <p>
+ A common error experienced by users is that the email associated with commits do not align with the email set in the Eclipse Foundation account. If you have an Eclipse Foundation account and a signed ECA-equivalent document, there are ways to validate the users and email addresses associated with a commit.
+ </p>
+ <p>
+ Below are 3 sample commands that will display the committer and author emails for a given commit or range. The first command shows the latest commit, while the second command will show results for a given commit, replacing `<SHA>` with the commit SHA. The last example will render a range of sequential commits. As is, it will show the last 5 commits starting from HEAD for the current branch. Both sides of the range can be replaced with commit SHAs to represent a different range.
+ </p>
+ <code>
+ <span>git show -s --format='Commit: %h, Committer: %ce, Author: %ae</span>
+ <br>
+ <span>git show -s --format='Commit: %h, Committer: %ce, Author: %ae' <SHA></span>
+ <br>
+ <span>git show -s --format='Commit: %h, Committer: %ce, Author: %ae' HEAD...HEAD~5</span>
+ </code>
+ </div>
+ </div>
</div>
</div>
{#else}
--
GitLab