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

New user UI #85

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
+96 −77
Open

New user UI #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12ade73
Replaced UI to old style for repository
anusharanganathan Oct 23, 2024
9fdb62a
Replaced UI to old style for publisher
anusharanganathan Oct 23, 2024
673f97e
Changed style of reporitory user page to juse accoridions
anusharanganathan Oct 23, 2024
54fefbd
Renamed and modified connection_details_sftp
anusharanganathan Oct 23, 2024
b68d9a0
Files renamed
anusharanganathan Oct 23, 2024
4f89988
Changed style of publisher user page to use accordions
anusharanganathan Oct 23, 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
83 changes: 6 additions & 77 deletions service/templates/account/user/_repository.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,6 @@
<!-- Routing history accordion -->
<div class="accordion-row">Routing History
<button class="accordion-button">
<a href="/account/details/{{account.id}}?since=01/06/2019&api_key={{current_user.data['api_key']}}">View</a>
<i class="fa fa-external-link" aria-hidden="true"></i>
</button>
</div>
<!-- Profile settings accordion -->
<div class="accordion-row">Profile settings
<button class="accordion-section" data-panel="section-view-profile">View</button>
<button class="accordion-section" data-panel="section-update-profile">Update</button>
<button class="accordion-section" data-panel="section-update-email">Update email</button>
<button class="accordion-section" data-panel="section-update-password">Update password</button>
<div class="panel section-view-profile">
{% include 'account/user/repository/_profile_settings.html' %}
</div>
<div class="panel section-update-profile">
{% include 'account/user/repository/_profile_settings_form.html' %}
</div>
<div class="panel section-update-email">
{% include 'account/user/_update_email.html' %}
</div>
<div class="panel section-update-password">
{% include 'account/user/_update_password.html' %}
</div>
</div>
<!-- Repo config accordion -->
<div class="accordion-row">Repository configuration for matching
<button class="accordion-button">
<a target="_blank" href="/account/configview{% if current_user.has_role('admin') %}/{{account.id}}?api_key={{current_user.data['api_key']}}{% else %}?api_key={{account.data['api_key']}}{% endif %}">View</a>
<i class="fa fa-external-link" aria-hidden="true"></i>
</button>
<form class="inline" method="GET" action="{{request.path}}/config">
<button class="accordion-button" id="download_match" type="submit">Download</button>
</form>
<button class="accordion-section" data-panel="section-update-config">Update</button>
<div class="panel section-update-config">
{% include 'account/user/repository/_matching_details_form.html' %}
</div>
</div>
<!-- Licenses accordion -->
<div class="accordion-row">Licenses associated with your institution
<button class="accordion-section" data-panel="section-license">View and select</button>
<div class="panel section-license">
{% include 'account/user/repository/_select_licenses.html' %}
</div>
</div>
<!-- Sword settings accordion -->
<div class="accordion-row">Sword settings
<button class="accordion-section" data-panel="section-view-sword">View</button>
<button class="accordion-section" data-panel="section-update-sword">Update</button>
<div class="panel section-view-sword">
{% include 'account/user/repository/_sword_settings.html' %}
</div>
<div class="panel section-update-sword">
{% include 'account/user/repository/_sword_settings_form.html' %}
</div>
</div>
<!-- Sword status accordion -->
<div class="accordion-row">Sword status
{% if sword_status.status == 'problem' %}
{% set cls = "warning" %}
{% elif sword_status.status == 'failing' %}
{% set cls = "danger" %}
{% else %}
{% set cls = "success" %}
{% endif %}
<butoon class="{{cls}} accordion-section" data-panel="section-sword-status">{{ sword_status.status }}</butoon>
<button class="accordion-button">
<a target="_blank" href="/account/sword_logs/{{account.id}}">View logs</a>
</button>
{% include 'account/user/repository/_modify_sword_status_form.html' %}
<div class="panel section-sword-status">
{% include 'account/user/repository/_sword_status.html' %}
</div>
</div>

{% include 'account/user/repository/_routing_history_accordion.html' %}
{% include 'account/user/repository/_profile_settings_accordion.html' %}
{% include 'account/user/repository/_repo_config_accordion.html' %}
{% include 'account/user/repository/_licenses_accordion.html' %}
{% include 'account/user/repository/_sword_settings_accordion.html' %}
{% include 'account/user/repository/_sword_status_accordion.html' %}
14 changes: 14 additions & 0 deletions service/templates/account/user/publisher/_connection_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div class="box box--padding-large box--brd-mgreyblue">
<h2>Connecting to DeepGreen</h2>
<hr>
{% include 'account/user/publisher/_connection_details_api.html' %}
<hr>
{% include 'account/user/publisher/_connection_details_sword.html' %}
<hr>
{% include 'account/user/publisher/_connection_details_sftp.html' %}
{% include 'account/user/publisher/_sftp_server_settings_form.html' %}
{#% include 'account/user/publisher/_delete_sftp_server_details.html' %#}
<hr>
{% include 'account/user/publisher/_list_ssh_keys.html' %}
{% include 'account/user/publisher/_add_ssh_key.html' %}
</div>
7 changes: 7 additions & 0 deletions service/templates/account/user/repository/_licenses_accordion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<!-- Licenses accordion -->
<div class="accordion-row">Licenses associated with your institution
<button class="accordion-section" data-panel="section-license">View and select</button>
<div class="panel section-license">
{% include 'account/user/repository/_select_licenses.html' %}
</div>
</div>
19 changes: 19 additions & 0 deletions service/templates/account/user/repository/_profile_settings_accordion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!-- Profile settings accordion -->
<div class="accordion-row">Profile settings
<button class="accordion-section" data-panel="section-view-profile">View</button>
<button class="accordion-section" data-panel="section-update-profile">Update</button>
<button class="accordion-section" data-panel="section-update-email">Update email</button>
<button class="accordion-section" data-panel="section-update-password">Update password</button>
<div class="panel section-view-profile">
{% include 'account/user/repository/_profile_settings.html' %}
</div>
<div class="panel section-update-profile">
{% include 'account/user/repository/_profile_settings_form.html' %}
</div>
<div class="panel section-update-email">
{% include 'account/user/_update_email.html' %}
</div>
<div class="panel section-update-password">
{% include 'account/user/_update_password.html' %}
</div>
</div>
14 changes: 14 additions & 0 deletions service/templates/account/user/repository/_repo_config_accordion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!-- Repo config accordion -->
<div class="accordion-row">Repository configuration for matching
<button class="accordion-button">
<a target="_blank" href="/account/configview{% if current_user.has_role('admin') %}/{{account.id}}?api_key={{current_user.data['api_key']}}{% else %}?api_key={{account.data['api_key']}}{% endif %}">View</a>
<i class="fa fa-external-link" aria-hidden="true"></i>
</button>
<form class="inline" method="GET" action="{{request.path}}/config">
<button class="accordion-button" id="download_match" type="submit">Download</button>
</form>
<button class="accordion-section" data-panel="section-update-config">Update</button>
<div class="panel section-update-config">
{% include 'account/user/repository/_matching_details_form.html' %}
</div>
</div>
7 changes: 7 additions & 0 deletions service/templates/account/user/repository/_routing_history_accordion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<!-- Routing history accordion -->
<div class="accordion-row">Routing History
<button class="accordion-button">
<a href="/account/details/{{account.id}}?since=01/06/2019&api_key={{current_user.data['api_key']}}">View</a>
<i class="fa fa-external-link" aria-hidden="true"></i>
</button>
</div>
11 changes: 11 additions & 0 deletions service/templates/account/user/repository/_sword_settings_accordion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!-- Sword settings accordion -->
<div class="accordion-row">Sword settings
<button class="accordion-section" data-panel="section-view-sword">View</button>
<button class="accordion-section" data-panel="section-update-sword">Update</button>
<div class="panel section-view-sword">
{% include 'account/user/repository/_sword_settings.html' %}
</div>
<div class="panel section-update-sword">
{% include 'account/user/repository/_sword_settings_form.html' %}
</div>
</div>
18 changes: 18 additions & 0 deletions service/templates/account/user/repository/_sword_status_accordion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!-- Sword status accordion -->
<div class="accordion-row">Sword status
{% if sword_status.status == 'problem' %}
{% set cls = "warning" %}
{% elif sword_status.status == 'failing' %}
{% set cls = "danger" %}
{% else %}
{% set cls = "success" %}
{% endif %}
<butoon class="{{cls}} accordion-section" data-panel="section-sword-status">{{ sword_status.status }}</butoon>
<button class="accordion-button">
<a target="_blank" href="/account/sword_logs/{{account.id}}">View logs</a>
</button>
{% include 'account/user/repository/_modify_sword_status_form.html' %}
<div class="panel section-sword-status">
{% include 'account/user/repository/_sword_status.html' %}
</div>
</div>