various fixes pr

alfio-event · Jun 16, 2023 · e55ecea · e55ecea
1 parent 02ff598
commit e55ecea
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 19 deletions.
diff --git a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html
@@ -515,7 +515,7 @@ <h3 class="mt-5">
                   <div class="progress">
                     <div
                       *ngIf="ticketCategory.checkedInTickets != 0"
-                      class="progress-bar"
+                      class="progress-bar bg-success"
                       role="progressbar"
                       [style]="
                         'width: ' +
@@ -532,7 +532,7 @@ <h3 class="mt-5">
                     </div>
                     <div
                       *ngIf="ticketCategory.soldTickets != 0"
-                      class="progress-bar bg-success"
+                      class="progress-bar bg-warning"
                       role="progressbar"
                       [style]="
                         'width: ' +
@@ -584,7 +584,7 @@ <h3 class="mt-5">
                     <div
                       *ngIf="!ticketCategory.bounded"
                       type="default"
-                      class="progress-bar bg-info"
+                      class="progress-bar"
                       role="progressbar"
                       [style]="
                         'width: ' +
@@ -682,9 +682,8 @@ <h3 class="mt-5">
               *ngIf="ticketCategory.containingOrphans"
             >
               <div class="col-xs-12" data-ng-form="moveTickets">
-                <svg-icon key="warning"></svg-icon> This category contains
-                allocated tickets that cannot be sold anymore. Move them to
-                another category:
+                <svg-icon key="warning"></svg-icon>
+                <span translate="admin.event-dashboard.message-orphans"></span>
                 <select
                   class="form-control input-sm"
                   data-ng-model="targetCategoryId"
@@ -694,9 +693,8 @@ <h3 class="mt-5">
                 <button
                   class="btn btn-sm btn-warning"
                   data-ng-click="moveOrphans(ticketCategory, targetCategoryId, event.id)"
-                >
-                  apply
-                </button>
+                  translate="admin.event-dashboard-apply"
+                ></button>
                 <button
                   *ngIf="
                     eventOrganizationInfo.event.containingUnboundedCategories
@@ -708,9 +706,8 @@ <h3 class="mt-5">
                       ticketCategory
                     )
                   "
-                >
-                  Assign to dynamic categories
-                </button>
+                  translate="admin.event-dashboard-assing-to-dynamic-categories"
+                ></button>
               </div>
             </div>
             <div
@@ -770,12 +767,12 @@ <h5><strong>{{status}}</strong></h5>
               >
                 <div class="row">
                   <div class="col-xs-1">
-                    <i class="fa fa-info-circle fa-3x"></i>
-                  </div>
-                  <div class="col-xs-11">
-                    Token generation in progress. Please wait 30s and then
-                    reload the page.
+                    <svg-icon key="info"></svg-icon>
                   </div>
+                  <div
+                    class="col-xs-11"
+                    translate="admin.event-dashboard-message-token-generation"
+                  ></div>
                 </div>
               </div>
             </div>

diff --git a/frontend/projects/admin/src/app/shared/icons.ts b/frontend/projects/admin/src/app/shared/icons.ts
@@ -18,6 +18,7 @@ import { eventIcon } from '../svg/event';
 import { groupsIcon } from '../svg/groups';
 import { homeIcon } from '../svg/home';
 import { hourglassTopIcon } from '../svg/hourglass-top';
+import { infoIcon } from '../svg/info';
 import { insightsIcon } from '../svg/insights';
 import { keyIcon } from '../svg/key';
 import { lockIcon } from '../svg/lock';
@@ -81,6 +82,7 @@ const ICONS = [
   qrCodeIcon,
   warningIcon,
   closeIcon,
+  infoIcon,
 ];
 export const ICON_CONFIG = {
   sizes: {

diff --git a/frontend/projects/admin/src/app/svg/info.ts b/frontend/projects/admin/src/app/svg/info.ts
@@ -0,0 +1,4 @@
+export const infoIcon = {
+    data: `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M453-280h60v-240h-60v240Zm26.982-314q14.018 0 23.518-9.2T513-626q0-14.45-9.482-24.225-9.483-9.775-23.5-9.775-14.018 0-23.518 9.775T447-626q0 13.6 9.482 22.8 9.483 9.2 23.5 9.2Zm.284 514q-82.734 0-155.5-31.5t-127.266-86q-54.5-54.5-86-127.341Q80-397.681 80-480.5q0-82.819 31.5-155.659Q143-709 197.5-763t127.341-85.5Q397.681-880 480.5-880q82.819 0 155.659 31.5Q709-817 763-763t85.5 127Q880-563 880-480.266q0 82.734-31.5 155.5T763-197.684q-54 54.316-127 86Q563-80 480.266-80Zm.234-60Q622-140 721-239.5t99-241Q820-622 721.188-721 622.375-820 480-820q-141 0-240.5 98.812Q140-622.375 140-480q0 141 99.5 240.5t241 99.5Zm-.5-340Z"/></svg>`,
+    name: 'info' as const
+};
diff --git a/frontend/projects/admin/src/assets/svg/info.svg b/frontend/projects/admin/src/assets/svg/info.svg
diff --git a/src/main/resources/alfio/i18n/public.properties b/src/main/resources/alfio/i18n/public.properties
@@ -697,6 +697,10 @@ admin.event-dashboard.alert-message-limited-group=Access to this category has be
 admin.event-dashboard.alert-message-category-tickets-unknown-state=This category contains tickets whose reservations are in an unknown state. This could happen when we have troubles after receiving a response from the Payment Gateway. Please
 admin.event-dashboard.alert-message-category-tickets-unknown-state-link=fix them
 admin.event-dashboard.edit-category=Edit category
+admin.event-dashboard.message-orphans=This category contains allocated tickets that cannot be sold anymore. Move them to another category:
+admin.event-dashboard-apply=apply
+admin.event-dashboard-assing-to-dynamic-categories=Assign to dynamic categories
+admin.event-dashboard-message-token-generation=Token generation in progress. Please wait 30s and then reload the page.
 
 admin.event.menu.details=Details
 admin.event.menu.attendees-data-to-collect=Attendees'' data to collect
@@ -718,7 +722,7 @@ admin.event.menu.check-in=Check in
 admin.event.menu.copy-this-event=Copy this event
 admin.event.menu.download=Download
 admin.event.menu.attendees-data=Attendees'' data
-admin.event.menu.waiting-list=Waiting list
+
 admin.event.menu.sponsors-scan=Sponsors scan
 admin.event.menu.all-billing-documents-pdf=All billing documents (PDF)
-admin.event.menu.all-billing-excel=All billing (Excel)
+admin.event.menu.all-billing-excel=All Billing Documents (Excel)