Skip to content

Commit

Permalink
Make /manage-grouping headings consistent (#949)
Browse files Browse the repository at this point in the history
  • Loading branch information
Prayag-Das authored Jun 25, 2024
1 parent 188bfd4 commit 46c394a
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 34 deletions.
1 change: 0 additions & 1 deletion src/main/resources/templates/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<body ng-app="UHGroupingsApp">
<nav th:replace="~{menubar :: copy}"></nav>

<!-- Content container -->
<main>
<div class="seafoam-bg pt-5 pb-5">
<div class="container">
Expand Down
12 changes: 9 additions & 3 deletions src/main/resources/templates/fragments/actions.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<th:block th:fragment="actions">

<h2 class="font-weight-bold text-dark pt-4">Grouping Actions</h2>
<div th:text="#{screen.message.common.preferences.info}"></div>
<div id="actions-display" class="tab-pane fade show active">
<div class="row pt-4 pb-5">
<div class="row">
<div class="col-md-8">
<h1 class="font-weight-bold text-dark pt-2 mb-0 d-inline-block">Grouping Actions</h1>
</div>
</div>
<br/>
<div th:text="#{screen.message.common.preferences.info}"></div>

<div class="row pt-4 pb-5">
<div class="col-md-6 col-12">
<h3> Reset Grouping</h3>
<div>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/fragments/basis.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<th:block th:fragment="basis">
<div id="basis-display" class="tab-pane show active">

<div id="basis-display" class="tab-pane show active">
<div class="row">
<div class="col-md-8">
<h1 class="font-weight-bold text-dark pt-2 mb-0 d-inline-block">Basis Members
Expand All @@ -13,7 +13,7 @@ <h1 class="font-weight-bold text-dark pt-2 mb-0 d-inline-block">Basis Members
<p class=" mb-1" ng-show="largeGrouping" th:text="#{screen.message.common.loading.toolarge}"><i
class="fa fa-check" aria-hidden="true"></i></p>
</div>
<div class="col-md-4 pt-2">
<div class="col-md-4 py-2">
<input placeholder="Filter Members..." type="text" title="Filter Members"
ng-model="basisQuery" class="form-control" aria-label="Filter Members..."
ng-change="filter(groupingBasis, 'pagedItemsBasis', 'currentPageBasis', basisQuery, true)"/>
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/templates/fragments/exclude.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<th:block th:fragment="exclude">

<div id="exclude-display" class="tab-pane fade show active">
<div class="row">
<div class="col-md-8">
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/templates/fragments/include.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<th:block th:fragment="include">

<div id="include-display" class="tab-pane show active">
<div class="row">
<div class="col-md-8">
Expand Down
2 changes: 0 additions & 2 deletions src/main/resources/templates/fragments/members.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<th:block th:fragment="members">

<div id="all" class="tab-pane fade show active">

<div class="row">
<div class="col-md-8">
<h1 class="font-weight-bold text-dark pt-2 mb-0 d-inline-block">All Members
Expand Down Expand Up @@ -29,7 +28,6 @@ <h1 class="font-weight-bold text-dark pt-2 mb-0 d-inline-block">All Members
</div>
</div>


<div class="table-responsive-sm">
<table class="table table-striped table-hover" aria-live="assertive">
<thead>
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/fragments/owners.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<th:block th:fragment="owners">

<div id="owners-display" class="tab-pane fade show active">

<div class="row">
<div class="col-md-8">
<h1 class="font-weight-bold text-dark pt-2 mb-0 d-inline-block">Owners ({{groupingOwners.length}})</h1>
Expand Down
12 changes: 9 additions & 3 deletions src/main/resources/templates/fragments/preferences.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<th:block th:fragment="preferences">

<h2 class="font-weight-bold text-dark pt-4">Preferences</h2>
<div th:text="#{screen.message.common.preferences.info}"></div>
<div id="preferences-display" class="tab-pane fade show active">
<div class="row pt-4 pb-5">
<div class="row">
<div class="col-md-8">
<h1 class="font-weight-bold text-dark pt-2 mb-0 d-inline-block">Preferences</h1>
</div>
</div>
<br/>
<div th:text="#{screen.message.common.preferences.info}"></div>

<div class="row pt-4 pb-5">
<div class="col-md-6 col-12">
<h3>User Options</h3>
<div>
Expand Down
47 changes: 25 additions & 22 deletions src/main/resources/templates/fragments/sync-destinations.html
Original file line number Diff line number Diff line change
@@ -1,34 +1,37 @@
<th:block th:fragment="sync-destinations">

<h2 class="font-weight-bold text-dark pt-4">Synchronization Destinations</h2>
<div th:text="#{screen.message.common.preferences.info}"></div>
<div id="sync-destinations-display" class="tab-pane fade show active">
<div class="row">
<div class="col-md-8">
<h1 class="font-weight-bold text-dark pt-2 mb-0 d-inline-block">Synchronization Destinations</h1>
</div>
</div>
<br/>
<div th:text="#{screen.message.common.preferences.info}"></div>

<div class="row pt-4 pb-5">
<div class="col-md-6 col-12">
<h3>Sync Destinations</h3>
<div>
<div class="form-check" ng-repeat="syncDest in syncDestArray">
<div ng-if="!syncDest.hidden">
<input class="form-check-input" type="checkbox" id="syncDest.isSynced-{{syncDest.name}}"
ng-model="syncDest.synced"
ng-change="displaySyncDestModal(syncDest.name)"
ng-keydown="clickWithEnter($event)"/>
<label class="form-check-label" for="syncDest.isSynced-{{syncDest.name}}">
{{ syncDest.description }}
</label>
<span class="fa fa-question-circle" role="button"
title="This option syncs destinations too {{ syncDest.description }}"
tooltip="{{syncDest.tooltip}}" data-placement="right"
tabindex="0"
th:attr="ng-click='displayDynamicModal(\'Sync Destinations Information\', ' +
'syncDest.tooltip)',
ng-keypress='$event.keyCode === 13 ? displayDynamicModal(\'Sync Destinations ' +
'Information\', syncDest.tooltip) : null'">
</span>
</div>
<div>
<div class="form-check" ng-repeat="syncDest in syncDestArray">
<div ng-if="!syncDest.hidden">
<input class="form-check-input" type="checkbox" id="syncDest.isSynced-{{syncDest.name}}"
ng-model="syncDest.synced"
ng-change="displaySyncDestModal(syncDest.name)"
ng-keydown="clickWithEnter($event)"/>
<label class="form-check-label" for="syncDest.isSynced-{{syncDest.name}}">
{{ syncDest.description }}
</label>
<span class="fa fa-question-circle" role="button"
title="This option syncs destinations too {{ syncDest.description }}"
tooltip="{{syncDest.tooltip}}" data-placement="right"
tabindex="0"
th:attr="ng-click='displayDynamicModal(\'Sync Destinations Information\', ' + 'syncDest.tooltip)', ng-keypress='$event.keyCode === 13 ? displayDynamicModal(\'Sync Destinations ' + 'Information\', syncDest.tooltip) : null'">
</span>
</div>
</div>
</div>
</div>
</div>
</div>
</th:block>

0 comments on commit 46c394a

Please sign in to comment.