Skip to content
Snippets Groups Projects
Commit c62469ce authored by Martin Lowe's avatar Martin Lowe :flag_ca:
Browse files

Merge branch 'zacharysabourin/master/68' into 'master' 

feat: Update UI to add breadcrumb and change check/X to yes/no

Closes #68

See merge request !102
parents bca52d5e e7510e06
No related branches found
No related tags found
1 merge request!102feat: Update UI to add breadcrumb and change check/X to yes/no
Pipeline #10951 passed
Stage: external
    Hide whitespace changes
    Inline Side-by-side
    src/main/resources/templates/eclipse_breadcrumb.html 0 → 100644
    + 14
    − 0
    View file @ c62469ce
    <section id="breadcrumb" class="default-breadcrumbs hidden-print">
    <div class="container">
    <div class="row">
    <div class="col-xs-24 padding-left-30">
    <ol class="breadcrumb">
    <li><a href="https://www.eclipse.org/">Home</a></li>
    <li><a href="https://www.eclipse.org/legal/">Legal</a></li>
    <li><a href="https://www.eclipse.org/legal/ECA.php">ECA</a></li>
    <li><a href="https://github.com/apps/eclipse-eca-validation">Validation Service</a></li>
    </ol>
    </div>
    </div>
    </div>
    </section>
    \ No newline at end of file
    src/main/resources/templates/simple_fingerprint_ui.html
    + 93
    − 68
    View file @ c62469ce
    {#include eclipse_header /}
    {#include eclipse_breadcrumb /}
    {|<style>
    .panel.list-group > div {
    .panel.list-group>div {
    background-color: white;
    border-left: 1px solid #ddd;
    border-right: 1px solid #ddd;
    }
    .panel.list-group .list-group-item .badge {
    }
    .panel.list-group .list-group-item .badge {
    background-color: #ffd8cc;
    color: #c74922;
    border-color: #c74922;
    }
    @media (min-width: 992px){
    .main-sidebar-default-margin {
    margin-top: 0px;
    }
    }
    .icon-toggle.glyphicon {
    top: 3px;
    }</style>|}
    }
    @media (min-width: 992px) {
    .main-sidebar-default-margin {
    margin-top: 0px;
    }
    }
    .icon-toggle.glyphicon {
    top: 3px;
    }
    </style>|}
    <div class="container" id="main-page-content">
    <div id="main-content-row" class="row">
    <section id="main-content" class="col-md-18 col-sm-16 margin-bottom-20">
    ......@@ -29,9 +35,19 @@
    <h2 class="h4 margin-top-0">About this project</h2>
    <ul>
    <li><strong>Eclipse Foundation Project:</strong>
    <i class="fa {project ? 'fa-check brand-success' : 'fa-times brand-danger'}" aria-hidden="true"></i></li>
    {#if project}
    YES
    {#else}
    NO
    {/if}
    </li>
    <li><strong>Eclipse Foundation Specification Project:</strong>
    <i class="fa {project.getSpecWorkingGroup ? 'fa-check brand-success' : 'fa-times brand-danger'}" aria-hidden="true"></i></li>
    {#if project.getSpecWorkingGroup}
    YES
    {#else}
    NO
    {/if}
    </li>
    </ul>
    <a href="{repoUrl}" target="_blank" class="btn btn-primary margin-top-10">Project repository</a>
    </div>
    ......@@ -41,94 +57,103 @@
    <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) covered by necessary legal agreements
    </div>
    <div class="panel-body background-white">
    <ul class="list-group-item-text">
    {#for error in statuses.getValidationErrors}
    <li>{error.getMessageForError}</li>
    <li>{error.getMessageForError}</li>
    {/for}
    </ul>
    </div>
    </div>
    </div>
    </div>
    <a id="more-details" href="#accordion" class="big" data-toggle="collapse">More details
    <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>
    <div id="accordion" class="collapse">
    <div class="panel list-group">
    {#for status in statuses.orEmpty}
    <a href="#{status.commitHash}" data-parent="#accordion" data-toggle="collapse" class="list-group-item">
    {#if status.errors.size > 0}
    <span class="badge">{status.errors.size}</span>
    {/if}
    {#if status.errors.size > 0}
    <span class="badge">{status.errors.size}</span>
    {/if}
    <p>SHA: <strong>{status.commitHash}</strong></p>
    </a>
    <div class="padding-30 collapse" id="{status.commitHash}">
    <div>Last validated: <em>{status.lastModified.format('d MMM uuuu')}</em></div>
    <div>Errors: <em>{status.errors.size}</em></div>
    <ul class="list-group-item-text">
    {#for error in status.errors.orEmpty}
    <li>{error.getMessageForError}</li>
    <li>{error.getMessageForError}</li>
    {/for}
    </ul>
    </div>
    {/for}
    </div>
    {#else}
    <div class="panel panel-success">
    <div class="panel-heading"><i class="fa fa-check" aria-hidden="true"></i>
    Author(s) covered by necessary legal agreements
    </div>
    </div>
    {/if}
    {#else}
    <div class="panel panel-success">
    <div class="panel-heading"><i class="fa fa-check" aria-hidden="true"></i>
    Author(s) covered by necessary legal agreements
    </div>
    </div>
    {/if}
    </section>
    <aside id="main-sidebar-secondy" role="complementary" class="col-md-6 col-sm-8 margin-bottom-30">
    <aside id="main-sidebar-secondy" role="complementary" class="col-md-6 col-sm-8 margin-bottom-60">
    <div class="region region-sidebar-second solstice-region-element-count-2">
    <section id="block-site-login-eclipse-eca-sle-eca-lookup-tool" class="block block-site-login-eclipse-eca block-region-sidebar-second solstice-block solstice-block-default solstice-block-white-bg block-sle-eca-lookup-tool clearfix">
    <h2 class="block-title">ECA Validation Tool</h2>
    <div class="block-content">
    <form id="eclipse-eca-lookup-form" accept-charset="UTF-8">
    <div class="form-item form-item-input form-type-textfield form-group">
    <input placeholder="Enter email address" class="form-control form-text" type="text" id="email-input" name="email-input" value="" size="21" maxlength="128" autofill-prediction="UNKNOWN_TYPE">
    <div class="help-block">Enter email address of an Eclipse account.</div>
    </div>
    <button class="btn-success btn form-submit" type="submit" id="edit-submit">Verify ECA</button>
    </div>
    </form>
    </div>
    </section>
    <section id="block-eclipse-api-github-eclipse-api-github-links" class="block block-eclipse-api-github contextual-links-region block-region-sidebar-second solstice-block block-eclipse-api-github-links clearfix">
    <section id="block-site-login-eclipse-eca-sle-eca-lookup-tool"
    class="block block-site-login-eclipse-eca block-region-sidebar-second solstice-block solstice-block-default solstice-block-white-bg block-sle-eca-lookup-tool clearfix">
    <h2 class="block-title">ECA Validation Tool</h2>
    <div class="block-content">
    <aside class="main-sidebar-default-margin" id="main-sidebar">
    <ul id="leftnav" class="ul-left-nav fa-ul hidden-print">
    <li class="separator"><a class="separator" href="https://www.eclipse.org/legal/ECA.php"> ECA </a></li>
    <li><i class="fa fa-caret-right fa-fw"></i> <a href="https://accounts.eclipse.org/user/eca" target="_self"> Sign
    </a></li>
    <li class="separator"><a class="separator" href="https://www.eclipse.org/legal/licenses.php"> Licenses </a></li>
    <li><i class="fa fa-caret-right fa-fw"></i> <a href="https://www.eclipse.org/legal/licenses.php#approved" target="_self"> Approved 3rd Party </a></li>
    <li><i class="fa fa-caret-right fa-fw"></i> <a href="https://www.eclipse.org/legal/licenses.php#nonapproved" target="_self"> Non Approved </a></li>
    <li><i class="fa fa-caret-right fa-fw"></i> <a href="https://www.eclipse.org/legal/noncodelicenses.php" target="_self"> Docs &amp; examples </a></li>
    </ul>
    </aside>
    <form id="eclipse-eca-lookup-form" accept-charset="UTF-8">
    <div class="form-item form-item-input form-type-textfield form-group">
    <input placeholder="Enter email address" class="form-control form-text" type="text" id="email-input"
    name="email-input" value="" size="21" maxlength="128" autofill-prediction="UNKNOWN_TYPE">
    <div class="help-block">Enter email address of an Eclipse account.</div>
    </div>
    <button class="btn-success btn form-submit" type="submit" id="edit-submit">Verify ECA</button>
    </div>
    </section>
    </form>
    </div>
    </aside>
    </section>
    <section id="block-eclipse-api-github-eclipse-api-github-links"
    class="block block-eclipse-api-github contextual-links-region block-region-sidebar-second solstice-block block-eclipse-api-github-links clearfix">
    <div class="block-content">
    <aside class="main-sidebar-default-margin" id="main-sidebar">
    <ul id="leftnav" class="ul-left-nav fa-ul hidden-print">
    <li class="separator"><a class="separator" href="https://www.eclipse.org/legal/ECA.php"> ECA </a></li>
    <li><i class="fa fa-caret-right fa-fw"></i> <a href="https://accounts.eclipse.org/user/eca"
    target="_self"> Sign
    </a></li>
    <li class="separator"><a class="separator" href="https://www.eclipse.org/legal/licenses.php"> Licenses
    </a></li>
    <li><i class="fa fa-caret-right fa-fw"></i> <a href="https://www.eclipse.org/legal/licenses.php#approved"
    target="_self"> Approved 3rd Party </a></li>
    <li><i class="fa fa-caret-right fa-fw"></i> <a
    href="https://www.eclipse.org/legal/licenses.php#nonapproved" target="_self"> Non Approved </a></li>
    <li><i class="fa fa-caret-right fa-fw"></i> <a href="https://www.eclipse.org/legal/noncodelicenses.php"
    target="_self"> Docs &amp; examples </a></li>
    </ul>
    </aside>
    </div>
    </section>
    </div>
    </aside>
    </div>
    </div>
    {|<script>
    document.addEventListener("DOMContentLoaded", function() {
    {|
    <script>
    document.addEventListener("DOMContentLoaded", function () {
    function toggleIcon(e) {
    $(e.target)
    .prev()
    .find('.icon-toggle')
    .toggleClass('glyphicon-plus glyphicon-minus');
    .prev()
    .find('.icon-toggle')
    .toggleClass('glyphicon-plus glyphicon-minus');
    }
    function escapeHTML(s) {
    function escapeHTML(s) {
    return s.replace(/&/g, '&amp;')
    .replace(/"/g, '&quot;')
    .replace(/</g, '&lt;')
    ......@@ -140,8 +165,8 @@
    const $newToast = $(`<div class="margin-top-20 fade in alert alert-${type}">${message}<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>`);
    $toastTarget.append($newToast);
    // auto dismiss after 10s
    setTimeout(function() {
    $newToast.fadeOut("slow");
    setTimeout(function () {
    $newToast.fadeOut("slow");
    }, 10000);
    }
    $('#accordion').on('hidden.bs.collapse', toggleIcon);
    ......@@ -160,10 +185,10 @@
    data: {
    email: inputVal
    },
    success: function( data ) {
    success: function (data) {
    toast(`There is a valid ECA on file for <em>${escapeHTML(inputVal)}</em>`, 'success');
    },
    error: function(xhr) {
    error: function (xhr) {
    console.log(xhr.status);
    if (xhr.status == '403') {
    toast(`There is no valid ECA on file for <em>${escapeHTML(inputVal)}</em>`, 'danger');
    ......@@ -171,7 +196,7 @@
    toast(`No Eclipse Foundation account found for <em>${escapeHTML(inputVal)}</em>`, 'warning');
    }
    },
    complete: function() {
    complete: function () {
    $submitButton.removeAttr("disabled");
    }
    });
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment

    Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent