diff --git a/src/app/modules/calendar/calendar.module.ts b/src/app/modules/calendar/calendar.module.ts
index 7b135f1c..b28658fe 100644
--- a/src/app/modules/calendar/calendar.module.ts
+++ b/src/app/modules/calendar/calendar.module.ts
@@ -25,6 +25,7 @@ import {FormsModule} from '@angular/forms';
import {CommonModule} from '@angular/common';
import {MomentModule} from 'ngx-moment';
import {UtilModule} from '../../util/util.module';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
@NgModule({
declarations: [AddEventReviewModalComponent],
@@ -32,6 +33,7 @@ import {UtilModule} from '../../util/util.module';
IonicModule.forRoot(),
TranslateModule.forChild(),
ThingTranslateModule.forChild(),
+ IonIconModule,
FormsModule,
CommonModule,
MomentModule,
diff --git a/src/app/modules/catalog/catalog.module.ts b/src/app/modules/catalog/catalog.module.ts
index f97850a0..88644e69 100644
--- a/src/app/modules/catalog/catalog.module.ts
+++ b/src/app/modules/catalog/catalog.module.ts
@@ -1,16 +1,16 @@
/*
- * Copyright (C) 2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see .
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
*/
import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
@@ -23,6 +23,7 @@ import {DataModule} from '../data/data.module';
import {SettingsProvider} from '../settings/settings.provider';
import {CatalogComponent} from './catalog.component';
import {UtilModule} from '../../util/util.module';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
const catalogRoutes: Routes = [
{path: 'catalog', component: CatalogComponent},
@@ -39,6 +40,7 @@ const catalogRoutes: Routes = [
FormsModule,
TranslateModule.forChild(),
RouterModule.forChild(catalogRoutes),
+ IonIconModule,
CommonModule,
MomentModule,
DataModule,
diff --git a/src/app/modules/dashboard/dashboard.component.html b/src/app/modules/dashboard/dashboard.component.html
index aad37a71..f77b9756 100644
--- a/src/app/modules/dashboard/dashboard.component.html
+++ b/src/app/modules/dashboard/dashboard.component.html
@@ -1,7 +1,22 @@
+
+
-
+ {{ 'schedule.recurring' | translate }}.
+ */
+
@import '../../../theme/util/mixins';
:host ion-toolbar:last-of-type {
@@ -111,14 +126,16 @@ ion-content {
ion-icon {
margin: auto auto var(--spacing-xs);
- height: 40px;
- width: 40px;
}
ion-label {
margin: 0 auto auto;
font-size: var(--font-size-xxs);
font-weight: var(--font-weight-semi-bold);
}
+
+ &:hover ::ng-deep stapps-icon {
+ --fill: 1;
+ }
}
a:last-child {
diff --git a/src/app/modules/dashboard/dashboard.module.ts b/src/app/modules/dashboard/dashboard.module.ts
index 10bff29a..d006d773 100644
--- a/src/app/modules/dashboard/dashboard.module.ts
+++ b/src/app/modules/dashboard/dashboard.module.ts
@@ -1,16 +1,16 @@
/*
- * Copyright (C) 2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see .
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
*/
import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
@@ -33,6 +33,7 @@ import {MensaSectionContentComponent} from './sections/mensa-section/mensa-secti
import {FavoritesSectionComponent} from './sections/favorites-section/favorites-section.component';
import {ThingTranslateModule} from '../../translation/thing-translate.module';
import {UtilModule} from '../../util/util.module';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
const catalogRoutes: Routes = [
{
@@ -58,6 +59,7 @@ const catalogRoutes: Routes = [
],
imports: [
IonicModule.forRoot(),
+ IonIconModule,
FormsModule,
TranslateModule.forChild(),
RouterModule.forChild(catalogRoutes),
diff --git a/src/app/modules/dashboard/edit-modal/edit-modal.component.html b/src/app/modules/dashboard/edit-modal/edit-modal.component.html
index f0f15c30..75d527ba 100644
--- a/src/app/modules/dashboard/edit-modal/edit-modal.component.html
+++ b/src/app/modules/dashboard/edit-modal/edit-modal.component.html
@@ -1,8 +1,23 @@
+
+
{{ 'modal.settings' | translate }}
-
+
diff --git a/src/app/modules/dashboard/section/section.component.html b/src/app/modules/dashboard/section/section.component.html
index 007f653b..d4d78911 100644
--- a/src/app/modules/dashboard/section/section.component.html
+++ b/src/app/modules/dashboard/section/section.component.html
@@ -1,10 +1,32 @@
+
+
{{ title }}
-
+
diff --git a/src/app/modules/dashboard/section/section.component.scss b/src/app/modules/dashboard/section/section.component.scss
index 3399b87e..0ccc6415 100644
--- a/src/app/modules/dashboard/section/section.component.scss
+++ b/src/app/modules/dashboard/section/section.component.scss
@@ -1,3 +1,18 @@
+/*!
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
+ */
+
@import '../../../../theme/util/mixins';
:host {
@@ -20,7 +35,7 @@
&.is-extended {
padding-right: 0;
- ion-icon[name='edit'] {
+ .icon-margin-right {
margin-right: var(--spacing-md);
}
}
@@ -45,11 +60,14 @@
ion-icon {
color: var(--ion-color-medium-shade);
- width: 25px;
- height: 25px;
position: relative;
bottom: var(--spacing-sm);
+ margin-block: auto;
cursor: pointer;
+
+ &:hover ::ng-deep stapps-icon {
+ --fill: 1;
+ }
}
}
}
diff --git a/src/app/modules/dashboard/sections/navigation-section/menu-items.config.ts b/src/app/modules/dashboard/sections/navigation-section/menu-items.config.ts
index ed9a76a8..652d9f32 100644
--- a/src/app/modules/dashboard/sections/navigation-section/menu-items.config.ts
+++ b/src/app/modules/dashboard/sections/navigation-section/menu-items.config.ts
@@ -1,32 +1,48 @@
+/*
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
+ */
+
import {MenuItemInterface} from './menu-item.interface';
+import {SCIcon} from '../../../../util/ion-icon/icon';
export const MenuItems: MenuItemInterface[] = [
{
- icon: 'book',
+ icon: SCIcon`book`,
label: 'dashboard.navigation.item.catalog',
link: '/catalog',
active: true,
},
{
- icon: 'tools-kitchen',
+ icon: SCIcon`local_cafe`,
label: 'dashboard.navigation.item.canteen',
link: '/canteen',
active: true,
},
{
- icon: 'map',
+ icon: SCIcon`map`,
label: 'dashboard.navigation.item.map',
link: '/map',
active: true,
},
{
- icon: 'settings',
+ icon: SCIcon`settings`,
label: 'dashboard.navigation.item.settings',
link: '/settings',
active: true,
},
{
- icon: 'search',
+ icon: SCIcon`search`,
label: 'dashboard.navigation.item.search',
link: '/search',
active: false,
diff --git a/src/app/modules/dashboard/sections/navigation-section/navigation-section.component.html b/src/app/modules/dashboard/sections/navigation-section/navigation-section.component.html
index 4208341b..0fed2bef 100644
--- a/src/app/modules/dashboard/sections/navigation-section/navigation-section.component.html
+++ b/src/app/modules/dashboard/sections/navigation-section/navigation-section.component.html
@@ -1,3 +1,18 @@
+
+
-
+ {{ menuItem.label | translate }}
diff --git a/src/app/modules/dashboard/sections/navigation-section/navigation-section.component.scss b/src/app/modules/dashboard/sections/navigation-section/navigation-section.component.scss
index eb37fb2b..70bdc692 100644
--- a/src/app/modules/dashboard/sections/navigation-section/navigation-section.component.scss
+++ b/src/app/modules/dashboard/sections/navigation-section/navigation-section.component.scss
@@ -1,3 +1,18 @@
+/*!
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
+ */
+
.navigation-swiper.swiper {
.swiper-slide {
@@ -13,8 +28,6 @@
ion-icon {
display: block;
- width: 40px;
- height: 40px;
margin: auto;
}
}
diff --git a/src/app/modules/dashboard/sections/news-section/news-section.component.html b/src/app/modules/dashboard/sections/news-section/news-section.component.html
index 076920d0..451dede4 100644
--- a/src/app/modules/dashboard/sections/news-section/news-section.component.html
+++ b/src/app/modules/dashboard/sections/news-section/news-section.component.html
@@ -1,7 +1,22 @@
+
+
@@ -24,7 +39,7 @@
'dashboard.news.moreNews' | translate | titlecase
}}
-
+
diff --git a/src/app/modules/dashboard/sections/search-section/search-section.component.html b/src/app/modules/dashboard/sections/search-section/search-section.component.html
index 066cc8d9..2f01484a 100644
--- a/src/app/modules/dashboard/sections/search-section/search-section.component.html
+++ b/src/app/modules/dashboard/sections/search-section/search-section.component.html
@@ -1,3 +1,18 @@
+
+
.
+ */
+
.searchbar {
position: relative;
max-width: 700px;
@@ -18,7 +33,5 @@
right: var(--spacing-md);
transform: translateY(-50%);
z-index: 2;
- width: 25px;
- height: 25px;
}
}
diff --git a/src/app/modules/data/chips/data/add-event-action-chip.component.ts b/src/app/modules/data/chips/data/add-event-action-chip.component.ts
index f78eaff5..78a00d1f 100644
--- a/src/app/modules/data/chips/data/add-event-action-chip.component.ts
+++ b/src/app/modules/data/chips/data/add-event-action-chip.component.ts
@@ -25,13 +25,10 @@ import {
chipSkeletonTransition,
chipTransition,
} from '../../../../animation/skeleton-transitions/chip-loading-transition';
-
-enum AddEventStates {
- ADDED_ALL,
- ADDED_SOME,
- REMOVED_ALL,
- UNAVAILABLE,
-}
+import {
+ AddEventStates,
+ AddEventStatesMap,
+} from './add-event-action-chip.config';
/**
* Shows a horizontal list of action chips
@@ -58,6 +55,8 @@ export class AddEventActionChipComponent implements OnDestroy {
*/
icon: string;
+ iconFill: boolean;
+
/**
* Label
*/
@@ -71,28 +70,7 @@ export class AddEventActionChipComponent implements OnDestroy {
/**
* States
*/
- states = {
- [AddEventStates.ADDED_ALL]: {
- icon: 'events-all',
- label: 'data.chips.add_events.ADDED_ALL',
- disabled: false,
- },
- [AddEventStates.ADDED_SOME]: {
- icon: 'events-partial',
- label: 'data.chips.add_events.ADDED_SOME',
- disabled: false,
- },
- [AddEventStates.REMOVED_ALL]: {
- icon: 'events',
- label: 'data.chips.add_events.REMOVED_ALL',
- disabled: false,
- },
- [AddEventStates.UNAVAILABLE]: {
- icon: 'close',
- label: 'data.chips.add_events.UNAVAILABLE',
- disabled: true,
- },
- };
+ states = AddEventStatesMap;
/**
* UUIDs
@@ -115,9 +93,10 @@ export class AddEventActionChipComponent implements OnDestroy {
*/
applyState(state: AddEventStates) {
this.state = state;
- const {label, icon, disabled} = this.states[state];
+ const {label, icon, disabled, fill} = this.states[state];
this.label = label;
this.icon = icon;
+ this.iconFill = fill;
this.disabled = disabled;
}
diff --git a/src/app/modules/data/chips/data/add-event-action-chip.config.ts b/src/app/modules/data/chips/data/add-event-action-chip.config.ts
new file mode 100644
index 00000000..0d42f76c
--- /dev/null
+++ b/src/app/modules/data/chips/data/add-event-action-chip.config.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
+ */
+
+import {SCIcon} from '../../../../util/ion-icon/icon';
+
+export enum AddEventStates {
+ ADDED_ALL,
+ ADDED_SOME,
+ REMOVED_ALL,
+ UNAVAILABLE,
+}
+
+export const AddEventStatesMap = {
+ [AddEventStates.ADDED_ALL]: {
+ icon: SCIcon`event_available`,
+ fill: true,
+ label: 'data.chips.add_events.ADDED_ALL',
+ disabled: false,
+ },
+ [AddEventStates.ADDED_SOME]: {
+ icon: SCIcon`event`,
+ fill: true,
+ label: 'data.chips.add_events.ADDED_SOME',
+ disabled: false,
+ },
+ [AddEventStates.REMOVED_ALL]: {
+ icon: SCIcon`calendar_today`,
+ fill: false,
+ label: 'data.chips.add_events.REMOVED_ALL',
+ disabled: false,
+ },
+ [AddEventStates.UNAVAILABLE]: {
+ icon: SCIcon`event_busy`,
+ fill: false,
+ label: 'data.chips.add_events.UNAVAILABLE',
+ disabled: true,
+ },
+};
diff --git a/src/app/modules/data/chips/data/add-event-action-chip.html b/src/app/modules/data/chips/data/add-event-action-chip.html
index a35cd95b..fd92c720 100644
--- a/src/app/modules/data/chips/data/add-event-action-chip.html
+++ b/src/app/modules/data/chips/data/add-event-action-chip.html
@@ -1,3 +1,18 @@
+
+
-
+ {{ label | translate }}
diff --git a/src/app/modules/data/chips/data/locate-action-chip.html b/src/app/modules/data/chips/data/locate-action-chip.html
index db59071c..b5c40993 100644
--- a/src/app/modules/data/chips/data/locate-action-chip.html
+++ b/src/app/modules/data/chips/data/locate-action-chip.html
@@ -1,5 +1,20 @@
+
+
-
+ {{ 'Locate' | translate }}
diff --git a/src/app/modules/data/chips/filter/chip-filter.component.html b/src/app/modules/data/chips/filter/chip-filter.component.html
index 22027252..d8b15c6f 100644
--- a/src/app/modules/data/chips/filter/chip-filter.component.html
+++ b/src/app/modules/data/chips/filter/chip-filter.component.html
@@ -1,7 +1,22 @@
+
+
-
+ {{ displayValue }}
diff --git a/src/app/modules/data/data-icon.config.ts b/src/app/modules/data/data-icon.config.ts
new file mode 100644
index 00000000..6484e63f
--- /dev/null
+++ b/src/app/modules/data/data-icon.config.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
+ */
+
+import {SCThingType} from '@openstapps/core';
+import {SCIcon} from '../../util/ion-icon/icon';
+
+export const DataIcons: Record = {
+ 'academic event': SCIcon`school`,
+ 'assessment': SCIcon`fact_check`,
+ 'article': SCIcon`article`,
+ 'book': SCIcon`book`,
+ 'building': SCIcon`location_city`,
+ 'catalog': SCIcon`inventory_2`,
+ 'contact point': SCIcon`contact_page`,
+ 'course of study': SCIcon`school`,
+ 'date series': SCIcon`event`,
+ 'dish': SCIcon`lunch_dining`,
+ 'favorite': SCIcon`favorite`,
+ 'floor': SCIcon`foundation`,
+ 'message': SCIcon`newspaper`,
+ 'organization': SCIcon`business_center`,
+ 'periodical': SCIcon`feed`,
+ 'person': SCIcon`person`,
+ 'point of interest': SCIcon`pin_drop`,
+ 'publication event': SCIcon`campaign`,
+ 'room': SCIcon`meeting_room`,
+ 'semester': SCIcon`date_range`,
+ 'setting': SCIcon`settings`,
+ 'sport course': SCIcon`sports_soccer`,
+ 'study module': SCIcon`view_module`,
+ 'ticket': SCIcon`confirmation_number`,
+ 'todo': SCIcon`task`,
+ 'tour': SCIcon`tour`,
+ 'video': SCIcon`movie`,
+ 'diff': SCIcon`difference`,
+};
diff --git a/src/app/modules/data/data-icon.pipe.ts b/src/app/modules/data/data-icon.pipe.ts
index a7f6c9ce..d33deb3c 100644
--- a/src/app/modules/data/data-icon.pipe.ts
+++ b/src/app/modules/data/data-icon.pipe.ts
@@ -1,19 +1,20 @@
/*
- * Copyright (C) 2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see .
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
*/
import {Pipe, PipeTransform} from '@angular/core';
import {SCThingType} from '@openstapps/core';
+import {DataIcons} from './data-icon.config';
/**
* Converts the data type text into the icon name
@@ -25,40 +26,7 @@ export class DataIconPipe implements PipeTransform {
/**
* Mapping from data types to ionic icons to show
*/
- typeIconMap: {[type in SCThingType]: string};
-
- constructor() {
- this.typeIconMap = {
- 'academic event': 'school',
- 'assessment': 'file-text',
- 'article': 'file',
- 'book': 'book',
- 'building': 'location',
- 'catalog': 'folder',
- 'contact point': 'phone',
- 'course of study': 'school',
- 'date series': 'calendar',
- 'dish': 'tools-kitchen-2',
- 'favorite': 'heart',
- 'floor': 'arrow-up-circle',
- 'message': 'news',
- 'organization': 'briefcase',
- 'periodical': 'news',
- 'person': 'user',
- 'point of interest': 'location',
- 'publication event': 'speakerphone',
- 'room': 'location',
- 'semester': 'school',
- 'setting': 'settings',
- 'sport course': 'ball-football',
- 'study module': 'school',
- 'ticket': 'ticket',
- 'todo': 'checkbox',
- 'tour': 'lifebuoy',
- 'video': 'video',
- 'diff': 'arrows-left-right',
- };
- }
+ typeIconMap = DataIcons;
/**
* Provide the icon name from the data type
diff --git a/src/app/modules/data/data.module.ts b/src/app/modules/data/data.module.ts
index 58ac8efb..2e2dacbf 100644
--- a/src/app/modules/data/data.module.ts
+++ b/src/app/modules/data/data.module.ts
@@ -89,6 +89,7 @@ import {UtilModule} from '../../util/util.module';
import {TreeListComponent} from './list/tree-list.component';
import {TreeListFragmentComponent} from './list/tree-list-fragment.component';
import {SettingsProvider} from '../settings/settings.provider';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
/**
* Module for handling data
@@ -160,6 +161,7 @@ import {SettingsProvider} from '../settings/settings.provider';
LeafletModule,
MarkdownModule.forRoot(),
MenuModule,
+ IonIconModule,
MomentModule.forRoot({
relativeTimeThresholdOptions: {
m: 59,
diff --git a/src/app/modules/data/detail/data-detail-content.html b/src/app/modules/data/detail/data-detail-content.html
index 27a8da89..52b104c0 100644
--- a/src/app/modules/data/detail/data-detail-content.html
+++ b/src/app/modules/data/detail/data-detail-content.html
@@ -1,3 +1,18 @@
+
+
{{ 'name' | thingTranslate: item }}
@@ -85,7 +100,7 @@
-
+ {{ item.type | dataIcon }}
diff --git a/src/app/modules/data/detail/data-detail.html b/src/app/modules/data/detail/data-detail.html
index 8177f1e6..531ae211 100644
--- a/src/app/modules/data/detail/data-detail.html
+++ b/src/app/modules/data/detail/data-detail.html
@@ -37,7 +37,7 @@
-
+
{{ 'data.detail.NOT_FOUND' | translate }}
diff --git a/src/app/modules/data/elements/favorite-button.component.html b/src/app/modules/data/elements/favorite-button.component.html
index e4a6fc07..12f8c305 100644
--- a/src/app/modules/data/elements/favorite-button.component.html
+++ b/src/app/modules/data/elements/favorite-button.component.html
@@ -1,7 +1,23 @@
+
+
diff --git a/src/app/modules/data/elements/favorite-button.component.scss b/src/app/modules/data/elements/favorite-button.component.scss
index 14386030..d4fcffc5 100644
--- a/src/app/modules/data/elements/favorite-button.component.scss
+++ b/src/app/modules/data/elements/favorite-button.component.scss
@@ -1,3 +1,18 @@
+/*!
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
+ */
+
:host {
ion-button {
width: 50px;
@@ -5,7 +20,13 @@
--border-radius: 50%;
}
- ion-icon.filled {
+ @media (hover: hover) {
+ ion-button:hover ::ng-deep stapps-icon {
+ --fill: 1;
+ }
+ }
+
+ .selected {
color: #FBC02D;
}
}
diff --git a/src/app/modules/data/elements/offers-detail.html b/src/app/modules/data/elements/offers-detail.html
index 98e8d22f..4283cdbb 100644
--- a/src/app/modules/data/elements/offers-detail.html
+++ b/src/app/modules/data/elements/offers-detail.html
@@ -1,3 +1,18 @@
+
+
{{
'data.detail.offers.TITLE' | translate | titlecase
@@ -5,7 +20,7 @@
diff --git a/src/app/modules/data/elements/title-card.component.ts b/src/app/modules/data/elements/title-card.component.ts
index 865f8a1a..e5edd4cc 100644
--- a/src/app/modules/data/elements/title-card.component.ts
+++ b/src/app/modules/data/elements/title-card.component.ts
@@ -1,16 +1,16 @@
/*
- * Copyright (C) 2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see .
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
*/
import {
@@ -23,11 +23,12 @@ import {
ViewChild,
} from '@angular/core';
import {SCThings} from '@openstapps/core';
+import {SCIcon} from '../../../util/ion-icon/icon';
-enum AccordionButtonState {
- collapsed = 'chevron-down',
- expanded = 'chevron-up',
-}
+const AccordionButtonState = {
+ collapsed: SCIcon`expand_more`,
+ expanded: SCIcon`expand_less`,
+};
@Component({
selector: 'stapps-title-card',
diff --git a/src/app/modules/data/list/data-list-item.html b/src/app/modules/data/list/data-list-item.html
index 45c66aec..785eab6c 100644
--- a/src/app/modules/data/list/data-list-item.html
+++ b/src/app/modules/data/list/data-list-item.html
@@ -1,3 +1,18 @@
+
+
-
+
diff --git a/src/app/modules/data/list/search-page.html b/src/app/modules/data/list/search-page.html
index c23402cd..c8dcc672 100644
--- a/src/app/modules/data/list/search-page.html
+++ b/src/app/modules/data/list/search-page.html
@@ -1,3 +1,18 @@
+
+
@@ -19,7 +34,7 @@
class="filterable"
>
-
+
diff --git a/src/app/modules/data/types/date-series/date-series-detail-content.html b/src/app/modules/data/types/date-series/date-series-detail-content.html
index 22021b55..44b0b0e6 100644
--- a/src/app/modules/data/types/date-series/date-series-detail-content.html
+++ b/src/app/modules/data/types/date-series/date-series-detail-content.html
@@ -1,9 +1,24 @@
+
+
{{ 'inPlace' | propertyNameTranslate: item | titlecase }}
-
+ {{
'name' | thingTranslate: item.inPlace
}}
diff --git a/src/app/modules/data/types/date-series/date-series-list-item.html b/src/app/modules/data/types/date-series/date-series-list-item.html
index be6cad35..655e3ee4 100644
--- a/src/app/modules/data/types/date-series/date-series-list-item.html
+++ b/src/app/modules/data/types/date-series/date-series-list-item.html
@@ -1,10 +1,25 @@
+
+
-
+ {{ item.startDate | dateFormat }} -
{{ item.endDate | dateFormat }}.
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
*/
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
@@ -22,6 +22,7 @@ import {MenuModule} from '../menu/menu.module';
import {TranslateModule} from '@ngx-translate/core';
import {DataModule} from '../data/data.module';
import {UtilModule} from '../../util/util.module';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
const favoritesRoutes: Routes = [
{
@@ -39,6 +40,7 @@ const favoritesRoutes: Routes = [
MenuModule,
TranslateModule,
DataModule,
+ IonIconModule,
UtilModule,
],
declarations: [FavoritesPageComponent],
diff --git a/src/app/modules/feedback/feedback.module.ts b/src/app/modules/feedback/feedback.module.ts
index 5a39cf35..bd3d58ba 100644
--- a/src/app/modules/feedback/feedback.module.ts
+++ b/src/app/modules/feedback/feedback.module.ts
@@ -1,16 +1,16 @@
/*
- * Copyright (C) 2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see .
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
*/
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
@@ -21,6 +21,7 @@ import {RouterModule, Routes} from '@angular/router';
import {TranslateModule} from '@ngx-translate/core';
import {MarkdownModule} from 'ngx-markdown';
import {UtilModule} from '../../util/util.module';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
const feedbackRoutes: Routes = [
{
@@ -34,6 +35,7 @@ const feedbackRoutes: Routes = [
CommonModule,
FormsModule,
IonicModule,
+ IonIconModule,
RouterModule.forChild(feedbackRoutes),
TranslateModule,
MarkdownModule,
diff --git a/src/app/modules/hebis/hebis-detail/hebis-detail-content.html b/src/app/modules/hebis/hebis-detail/hebis-detail-content.html
index 14cb9475..12c8e727 100644
--- a/src/app/modules/hebis/hebis-detail/hebis-detail-content.html
+++ b/src/app/modules/hebis/hebis-detail/hebis-detail-content.html
@@ -1,3 +1,18 @@
+
+
-
+
{{ 'data.detail.NOT_FOUND' | translate }}
diff --git a/src/app/modules/hebis/hebis.module.ts b/src/app/modules/hebis/hebis.module.ts
index 0d88d08e..bc70867f 100644
--- a/src/app/modules/hebis/hebis.module.ts
+++ b/src/app/modules/hebis/hebis.module.ts
@@ -1,16 +1,16 @@
/*
- * Copyright (C) 2018-2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see .
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
*/
import {ScrollingModule} from '@angular/cdk/scrolling';
import {CommonModule} from '@angular/common';
@@ -43,6 +43,7 @@ import {HebisArticleContentComponent} from './types/hebis-article/hebis-article-
import {DataListComponent} from '../data/list/data-list.component';
import {DaiaAvailabilityComponent} from './daia-availability/daia-availability.component';
import {UtilModule} from '../../util/util.module';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
/**
* Module for handling data
@@ -66,6 +67,7 @@ import {UtilModule} from '../../util/util.module';
DataModule,
FormsModule,
HebisRoutingModule,
+ IonIconModule,
HttpClientModule,
IonicModule.forRoot(),
MarkdownModule.forRoot(),
diff --git a/src/app/modules/hebis/types/book/book-detail-content.html b/src/app/modules/hebis/types/book/book-detail-content.html
index 8a973e62..4782d948 100644
--- a/src/app/modules/hebis/types/book/book-detail-content.html
+++ b/src/app/modules/hebis/types/book/book-detail-content.html
@@ -1,3 +1,18 @@
+
+
{{
'hebisSearch.detail.title' | translate | sentencecase
@@ -81,8 +96,8 @@
'categories' | propertyNameTranslate: item | sentencecase
}}
-
-
+
+ {{ 'categories' | thingTranslate: item }}
diff --git a/src/app/modules/hebis/types/hebis-article/hebis-article-content.html b/src/app/modules/hebis/types/hebis-article/hebis-article-content.html
index 4e0f8fec..782a5b51 100644
--- a/src/app/modules/hebis/types/hebis-article/hebis-article-content.html
+++ b/src/app/modules/hebis/types/hebis-article/hebis-article-content.html
@@ -1,3 +1,18 @@
+
+
{{
'hebisSearch.detail.title' | translate | sentencecase
@@ -82,8 +97,8 @@
'categories' | propertyNameTranslate: item | sentencecase
}}
-
-
+
+ {{ 'categories' | thingTranslate: item }}
diff --git a/src/app/modules/hebis/types/periodical/periodical-detail-content.html b/src/app/modules/hebis/types/periodical/periodical-detail-content.html
index 93826c11..68e5814e 100644
--- a/src/app/modules/hebis/types/periodical/periodical-detail-content.html
+++ b/src/app/modules/hebis/types/periodical/periodical-detail-content.html
@@ -1,3 +1,18 @@
+
+
{{
'hebisSearch.detail.title' | translate | sentencecase
@@ -68,8 +83,8 @@
'categories' | propertyNameTranslate: item | sentencecase
}}
-
-
+
+ {{ 'categories' | thingTranslate: item }}
diff --git a/src/app/modules/library/account/account.page.html b/src/app/modules/library/account/account.page.html
index ef06ae89..1c3c7f30 100644
--- a/src/app/modules/library/account/account.page.html
+++ b/src/app/modules/library/account/account.page.html
@@ -1,3 +1,18 @@
+
+
@@ -17,11 +32,11 @@
- {{ 'library.account.pages.profile.title' | translate | titlecase }}
- {{ 'library.account.pages.holds.title' | translate | titlecase }}
@@ -29,7 +44,7 @@
>{{ 'library.account.pages.checked_out.title' | translate | titlecase }}
- {{ 'library.account.pages.fines.title' | translate | titlecase }}
diff --git a/src/app/modules/library/library.module.ts b/src/app/modules/library/library.module.ts
index 6f25a311..ae5a5bbb 100644
--- a/src/app/modules/library/library.module.ts
+++ b/src/app/modules/library/library.module.ts
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
+ */
+
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
@@ -17,6 +32,7 @@ import {MomentModule} from 'ngx-moment';
import {FeeItemComponent} from './account/elements/fee-item/fee-item.component';
import {DataModule} from '../data/data.module';
import {UtilModule} from '../../util/util.module';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
const routes: ProtectedRoutes | Routes = [
{
@@ -56,6 +72,7 @@ const routes: ProtectedRoutes | Routes = [
CommonModule,
FormsModule,
IonicModule,
+ IonIconModule,
RouterModule.forChild(routes),
TranslateModule,
MomentModule,
diff --git a/src/app/modules/map/item/map-item.component.html b/src/app/modules/map/item/map-item.component.html
index c1995b30..25e63a02 100644
--- a/src/app/modules/map/item/map-item.component.html
+++ b/src/app/modules/map/item/map-item.component.html
@@ -1,3 +1,18 @@
+
+
-
+
diff --git a/src/app/modules/map/map.module.ts b/src/app/modules/map/map.module.ts
index 366a1749..4638c4e5 100644
--- a/src/app/modules/map/map.module.ts
+++ b/src/app/modules/map/map.module.ts
@@ -1,16 +1,16 @@
/*
- * Copyright (C) 2019-2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see .
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
*/
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
@@ -34,6 +34,7 @@ import {MapSingleModalComponent} from './page/modals/map-single-modal.component'
import {MapItemComponent} from './item/map-item.component';
import {NgModule} from '@angular/core';
import {UtilModule} from '../../util/util.module';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
/**
* Initializes the default area to show in advance (before components are initialized)
@@ -72,6 +73,7 @@ const mapRoutes: Routes = [
CommonModule,
IonicModule.forRoot(),
LeafletModule,
+ IonIconModule,
LeafletMarkerClusterModule,
RouterModule.forChild(mapRoutes),
TranslateModule.forChild(),
diff --git a/src/app/modules/map/map.provider.ts b/src/app/modules/map/map.provider.ts
index ebc80b0f..23564dda 100644
--- a/src/app/modules/map/map.provider.ts
+++ b/src/app/modules/map/map.provider.ts
@@ -1,16 +1,16 @@
/*
- * Copyright (C) 2019-2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see .
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
*/
import {ElementRef, Injectable} from '@angular/core';
import {
@@ -27,6 +27,7 @@ import {DataProvider} from '../data/data.provider';
import {MapPosition, PositionService} from './position.service';
import {hasValidLocation} from '../data/types/place/place-types';
import {ConfigProvider} from '../config/config.provider';
+import {SCIcon} from '../../util/ion-icon/icon';
/**
* Provides methods for presenting the map
@@ -73,10 +74,19 @@ export class MapProvider {
className: className,
html:
typeof position.heading !== 'undefined'
- ? `
- `
- : '',
+ ? `${SCIcon`navigation`}`
+ : `${SCIcon`person_pin_circle`}`,
iconSize: [iconSize, iconSize],
}),
zIndexOffset: 1000,
diff --git a/src/app/modules/map/page/map-page.html b/src/app/modules/map/page/map-page.html
index 483c12c7..51121e38 100644
--- a/src/app/modules/map/page/map-page.html
+++ b/src/app/modules/map/page/map-page.html
@@ -36,7 +36,7 @@
class="filterable"
>
-
+
@@ -78,10 +78,10 @@
>
-
+