Skip to content

Commit

Permalink
Small cleanup and compile all themes.
Browse files Browse the repository at this point in the history
  • Loading branch information
lwesterhof committed Oct 23, 2023
1 parent 0d55227 commit d3386b4
Show file tree
Hide file tree
Showing 5 changed files with 11,982 additions and 23 deletions.
2 changes: 1 addition & 1 deletion group_manager/static/group_manager/css/group_manager.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
font-weight: medium;
}

#properties-create-link, #properties-update-link {
#properties-update-link {
text-decoration: none;
}

Expand Down
17 changes: 5 additions & 12 deletions group_manager/static/group_manager/js/group_manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -565,13 +565,6 @@ $(function () {
$('.users').addClass('hidden')
$('.properties-create').removeClass('hidden')

// Make all kinds of group properties un-collapsed for consistency when switching back to group-properties-update
$(".collapsible-group-properties").addClass("show")
$('#properties-create-link, #properties-update-link').find('.triangle')
.removeClass('fa-caret-right')
.addClass('fa-caret-down')
Yoda.storage.session.set('is-collapsed', 'false')

const selectedGroup = Yoda.storage.session.get('selected-group')
const that = Yoda.groupManager

Expand Down Expand Up @@ -2034,16 +2027,16 @@ $(function () {

// Group properties {{{
// When user collapses group properties
$('.properties').on('hide.bs.collapse', function (e) {
$('#properties-create-link, #properties-update-link').find('.triangle')
$('.properties-update').on('hide.bs.collapse', function (e) {
$('#properties-update-link').find('.triangle')
.removeClass('fa-caret-down')
.addClass('fa-caret-right')
Yoda.storage.session.set('is-collapsed', 'true')
})

// When user opens up group properties
$('.properties').on('show.bs.collapse', function (e) {
$('#properties-create-link, #properties-update-link').find('.triangle')
$('.properties-update').on('show.bs.collapse', function (e) {
$('#properties-update-link').find('.triangle')
.removeClass('fa-caret-right')
.addClass('fa-caret-down')
Yoda.storage.session.set('is-collapsed', 'false')
Expand Down Expand Up @@ -2245,7 +2238,7 @@ $(function () {
if (isCollapsed !== null && isCollapsed === 'true') {
$(".collapsible-group-properties").removeClass("show")
// Make sure the triangle is facing the correct direction
$(".properties").find(".triangle")
$(".properties-update").find(".triangle")
.removeClass('fa-caret-down')
.addClass('fa-caret-right')
}
Expand Down
12 changes: 4 additions & 8 deletions group_manager/templates/group_manager/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,9 @@ <h1>Group manager</h1>
<div class="col-md-6">
<div class="sticky-top">
<!--- CREATE -->
<div class="card properties-create properties hidden">
<a id="properties-create-link" href=".collapsible-group-properties" role="button" data-bs-toggle="collapse" aria-controls="group-properties-create">
<div class="card-header">
<i class="fa-solid fa-caret-down triangle" aria-hidden="true"></i> Create new group</span>
</div>
</a>
<div class="card-body collapse show collapsible-group-properties" id="group-properties-create">
<div class="card properties-create hidden">
<div class="card-header">Create new group</div>
<div class="card-body" id="group-properties-create">
<form class="form-horizontal" id="f-group-create" action="{{ url_for('group_manager_bp.group_create') }}" method="POST">
<div class="mb-3 row">
<label class="col-sm-4 form-label" for="f-group-create-name">Group name
Expand Down Expand Up @@ -195,7 +191,7 @@ <h1>Group manager</h1>
</div>

<!--- UPDATE -->
<div class="card properties-update properties">
<div class="card properties-update">
<a id="properties-update-link" href=".collapsible-group-properties" role="button" data-bs-toggle="collapse" aria-controls="group-properties">
<div class="card-header">
<i class="fa-solid fa-caret-down triangle" aria-hidden="true"></i> Group properties <span class="float-end" id="group-properties-group-name"></span>
Expand Down
11,972 changes: 11,971 additions & 1 deletion static/css/yoda-portal.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/css/yoda-portal.css.map

Large diffs are not rendered by default.

0 comments on commit d3386b4

Please sign in to comment.