Skip to content
Snippets Groups Projects

templates/origin-save: Update "Save code now" page layout

1 unresolved thread

Make the save request form always visible by moving it from the "Create save request" tab to the top of the page.

Rename "Create save request" tab to "Help".

Make all html alerts closable.

Closes #2324 (closed)

Depends on !330 (closed).


Migrated from D3245 (view on Phabricator)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Build is green

    Patch application report for D3245 (id=11504)

    Could not rebase; Attempt merge onto 3e17ef16...

    Updating 3e17ef16..0c1bb13d
    Fast-forward
     cypress/fixtures/origin-save.json               | 86 +++++++++++++++++++++++++
     cypress/integration/origin-save.spec.js         | 32 +++++++++
     swh/web/assets/src/bundles/admin/origin-save.js | 21 +++---
     swh/web/assets/src/bundles/save/index.js        | 47 ++++++++------
     swh/web/templates/misc/origin-save.html         | 74 +++++++++++----------
     5 files changed, 196 insertions(+), 64 deletions(-)
     create mode 100644 cypress/fixtures/origin-save.json
    Changes applied before test
    commit 0c1bb13d373a09a756a764c66486dcaccfc55928
    Author: Antoine Lambert <antoine.lambert@inria.fr>
    Date:   Mon Jun 8 18:01:56 2020 +0200
    
        templates/origin-save: Update "Save code now" page layout
        
        Make the save request form always visible by moving it from the "Create
        save request" tab to the top of the page.
        
        Rename "Create save request" tab to "Help".
        
        Rename "Submit" button to "Save".
        
        Make all html alerts closable.
        
        Closes #2324
    
    commit 086efa0b58f1f92860fc8c0b27c3fa370069c3a4
    Author: Antoine Lambert <antoine.lambert@inria.fr>
    Date:   Mon Jun 8 16:10:53 2020 +0200
    
        assets/save: Improve links in save requests table
        
        Make the main link in each row targets the origin copy in the archive
        if it has been successfully loaded.
        
        Add a link to each origin through an external link icon.
        
        Closes #2405

    See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/160/ for more details.

  • vlorentz
    vlorentz @vlorentz started a thread on the diff
34 <div class="form-group col-md-2">
35 <label for="swh-input-visit-type">Visit type</label>
36 <select id="swh-input-visit-type" class="form-control" required>
37 {% comment %} <option selected value="">Choose...</option> {% endcomment %}
38 </select>
39 <div class="invalid-feedback">The visit type must be specified</div>
40 </div>
41 <div class="form-group col-md-6">
42 <label for="swh-input-origin-url">Origin url</label>
43 <input type="text" class="form-control" id="swh-input-origin-url" oninput="swh.save.validateSaveOriginUrl(this)" required>
44 <div class="invalid-feedback">The origin url is not valid or does not reference a code repository</div>
45 </div>
46 <div class="col-md-2">
47 <div class="form-group">
48 <label for="swh-input-origin-save-submit">&#8203;</label>
49 <button type="submit" id="swh-input-origin-save-submit" class="btn btn-default btn-block">Submit</button>
  • Merge request was accepted

  • vlorentz approved this merge request

    approved this merge request

  • Author Maintainer

    Update: Revert "Rename Submit button to Save"

  • Build is green

    Patch application report for D3245 (id=11513)

    Could not rebase; Attempt merge onto 3e17ef16...

    Updating 3e17ef16..02a2d3f7
    Fast-forward
     cypress/fixtures/origin-save.json               | 86 +++++++++++++++++++++++++
     cypress/integration/origin-save.spec.js         | 32 +++++++++
     swh/web/assets/src/bundles/admin/origin-save.js | 21 +++---
     swh/web/assets/src/bundles/save/index.js        | 47 ++++++++------
     swh/web/templates/misc/origin-save.html         | 74 +++++++++++----------
     5 files changed, 196 insertions(+), 64 deletions(-)
     create mode 100644 cypress/fixtures/origin-save.json
    Changes applied before test
    commit 02a2d3f7639f884c799571044910f119fd8e9146
    Author: Antoine Lambert <antoine.lambert@inria.fr>
    Date:   Mon Jun 8 18:01:56 2020 +0200
    
        templates/origin-save: Update "Save code now" page layout
        
        Make the save request form always visible by moving it from the "Create
        save request" tab to the top of the page.
        
        Rename "Create save request" tab to "Help".
        
        Make all html alerts closable.
        
        Closes #2324
    
    commit 086efa0b58f1f92860fc8c0b27c3fa370069c3a4
    Author: Antoine Lambert <antoine.lambert@inria.fr>
    Date:   Mon Jun 8 16:10:53 2020 +0200
    
        assets/save: Improve links in save requests table
        
        Make the main link in each row targets the origin copy in the archive
        if it has been successfully loaded.
        
        Add a link to each origin through an external link icon.
        
        Closes #2405

    See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/161/ for more details.

  • Author Maintainer

    Merge request was merged

  • Please register or sign in to reply
    Loading