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

CONCD-997 Updates #2645

Merged
merged 2 commits into from
Dec 20, 2024
Merged

CONCD-997 Updates #2645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a606e09
CONCD-997 The 'Go' buttons should be slightly smaller, making the con…
rasarkar Dec 17, 2024
ff6ed53
CONCD-997 Text updates
rasarkar Dec 19, 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
2 changes: 1 addition & 1 deletion concordia/static/scss/base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ body .disabled > .page-link {

.btn {
border-radius: 0;
padding: 1.5px 10px;
padding: 1.25px 10px;
}
}

Expand Down
8 changes: 4 additions & 4 deletions concordia/templates/transcriptions/campaign_list_small_blocks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ <h1>Completed Campaigns</h1>
<a class="btn btn-primary" onclick="toggleCampaignView();">Go</a>
</div>
<div class="d-flex align-items-center mx-2">
<label for="campaign-type" class="pe-1">Campaign Type</label>
<label for="campaign-type" class="pe-1">Campaign Status</label>
<select id="campaign-type">
<option value="completed"{% if request.GET.type != 'retired' %} selected{% endif %}>Completed Campaigns</option>
<option value="retired"{% if request.GET.type == 'retired' %} selected{% endif %}>Retired Campaigns</option>
<option value="completed"{% if request.GET.type != 'retired' %} selected{% endif %}>Completed</option>
<option value="retired"{% if request.GET.type == 'retired' %} selected{% endif %}>Retired</option>
</select>
<a class="btn btn-primary" onclick="toggleCampaignType();" type="submit">Go</a>
</div>
{% if research_centers %}
<div class="d-flex align-items-center ms-2">
<label for="research-center" class="pe-1">Research Center</label>
<select id="research-center">
<option value="all"{% if 'research_center' not in request.GET %} selected{% endif %}>All Research Centers</option>
<option value="all"{% if 'research_center' not in request.GET %} selected{% endif %}>All</option>
{% for research_center in research_centers %}
<option value="{{ research_center.pk }}"{% if request.GET.research_center|add:"0" == research_center.pk %} selected{% endif %}>
{{ research_center.title }}
Expand Down
Loading