Skip to content

add UI fixes for pagination, app cards and nav #346

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

Merged
hamzaimran08 merged 1 commit into from
Jun 9, 2025
Merged

add UI fixes for pagination, app cards and nav #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion static/css/serve-utilities.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ label.required::before {

.serve-main-nav {
color: #686b72!important;
font-weight: 600!important;
font-weight: 500!important;
font-size: 1rem!important;
}

Expand Down
10 changes: 5 additions & 5 deletions templates/common/app_card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="card-header d-flex card-footer-text justify-content-between align-items-center">
<div class="col-12 d-flex flex-row align-items-center">
<div class="col-8 d-flex align-items-center">
<h5 class="card-title fw-bold align-items-center m-0 me-1">{{ app.name }}</h5>
<h5 class="card-title fw-normal text-dark align-items-center m-0 me-1">{{ app.name }}</h5>
<i data-bs-toggle="tooltip" data-bs-placement="top" data-bs-delay='{"show":"500", "hide":"0"}' title="Waiting" style="color:orange;{% if app.status_group == "success" %}display: none;{% endif %}" class="bi bi-circle-fill align-items-center mt-1"></i>
</div>
<div class="col-4 d-flex justify-content-end">
Expand All @@ -19,7 +19,7 @@ <h5 class="card-title fw-bold align-items-center m-0 me-1">{{ app.name }}</h5>
</div>
<div class="card-body d-flex flex-column">
<div id="app-{{ app.id }}" class="card-text description-app">
<p class="card-description">
<p class="card-description fw-normal">
{% if app.description|length > 349 %}
<span class="description-short card-description">{{ app.description|slice:':349'}}<span class="description-dots">...</span><span class="description-more " style="display:none;">{{ app.description|slice:'349:' }}</span>
<button onclick="toggleDescription('app-{{ app.id }}')">[see more]</button>
Expand All @@ -29,11 +29,11 @@ <h5 class="card-title fw-bold align-items-center m-0 me-1">{{ app.name }}</h5>
</p>
<ul class="list-unstyled">
<li class="list-group-item row">
<div class="col-12"><span class="value-label fw-bold card-username">{{ app.owner.first_name }} {{ app.owner.last_name }}</span></div>
<div class="col-12"><span class="value-label fw-normal text-dark card-username">{{ app.owner.first_name }} {{ app.owner.last_name }}</span></div>

<div class="d-flex text-muted justify-content-between rounded-bottom">
<div class="text-start"><span class="text-muted value-label fw-bold card-font-sm card-institution">{% if app.owner.userprofile %}{{ app.owner.userprofile.affiliation | university_name }}{% endif %}</span></div>
<div class="text-end"><span class="text-muted value-label fw-bold card-font-sm card-department">{% if app.owner.userprofile %}{{ app.owner.userprofile.department }}{% endif %}</span></div>
<div class="text-start"><span class="text-muted value-label fw-normal card-font-sm card-institution">{% if app.owner.userprofile %}{{ app.owner.userprofile.affiliation | university_name }}{% endif %}</span></div>
<div class="text-end"><span class="text-muted value-label fw-normal card-font-sm card-department">{% if app.owner.userprofile %}{{ app.owner.userprofile.department }}{% endif %}</span></div>

</div>

Expand Down
9 changes: 8 additions & 1 deletion templates/portal/apps.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ <h3 class="h3 me-2">Public Applications & Models</h3>
page: 12,
pagination: {
listClass: 'pagination',
item: function(values) {return `<li class="page-item"><a class='page-link' onclick='addFirstLastButtons()'>${values.page}</a></li>`;},
item: function(values) {return `<li class="page-item"><a class='page-link' onclick='addFirstLastButtons()' href='#'>${values.page}</a></li>`;},
innerWindow: 2,
outerWindow: 2,
left: 2,
Expand All @@ -256,6 +256,13 @@ <h3 class="h3 me-2">Public Applications & Models</h3>
};

var publicAppList = new List('app-cards', options);
publicAppList.on('updated', function() {
if (publicAppList.matchingItems.length <= publicAppList.page) {
$('.pagination-nav').css('display', 'none');
} else {
$('.pagination-nav').css('display', 'flex');
}
});

$('#public-app-search').on('keyup', function() {
var searchString = $(this).val();
Expand Down
Loading