Skip to content

Commit 89b8d74

Browse files
fabmizfabmiz
committed
Merge branch 'release/21.2.0'
2 parents 155545c + 28eb4c3 commit 89b8d74

File tree

82 files changed

+794
-221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+794
-221
lines changed

‎CHANGELOG.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [21.2.0] - 2021-04-19
8+
### Added
9+
- field and relationship for custom metadata field and its schema to registration providers
10+
- a link to the registration metadata to the Internet Archive copy
11+
12+
### Removed
13+
- "powered by Share" logo on discover pages
14+
15+
### Changed
16+
- show provider description on provider's discover page
17+
- allow branded provider descriptions to have color options
18+
719
## [21.1.1] - 2021-04-12
820
### Fixed
921
- `draftRegistration.branchedFrom` node permission errors
@@ -1697,7 +1709,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
16971709
### Added
16981710
- Quick Files
16991711

1700-
[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.1.1...develop
1712+
[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.2.0...develop
1713+
[21.2.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.2.0
17011714
[21.1.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.1.1
17021715
[21.1.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.1.0
17031716
[20.13.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.13.0

‎app/dashboard/template.hbs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,14 @@
134134
@class='col-sm-12'
135135
@onClick={{action this.more}}
136136
>
137-
{{fa-icon
138-
'caret-down'
139-
class=(
137+
<FaIcon
138+
@icon='caret-down'
139+
class={{
140140
concat
141141
(local-class 'load-nodes')
142142
' text-muted m-b-xl'
143-
)
144-
}}
143+
}}
144+
/>
145145
</OsfButton>
146146
</div>
147147
{{/if}}

‎app/guid-node/registrations/controller.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export default class GuidNodeRegistrations extends Controller {
4040
let schemas = yield this.store.query('registration-schema',
4141
{
4242
'filter[active]': true,
43+
'page[size]': 100,
4344
});
4445
schemas = schemas.toArray();
4546
schemas.sort((a: RegistrationSchema, b: RegistrationSchema) => a.name.length - b.name.length);

‎app/meetings/index/-components/meetings-footer/template.hbs‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<div class='row icon-bar m-v-lg' ...attributes>
22
<div class='col-md-4 col-sm-4 text-center '>
33
<div class='p-v-md m-t-xl m-h-md'>
4-
<FaIcon
5-
data-test-eye-icon
6-
@icon='eye'
7-
local-class='blue-icon icon-circle'
8-
/>
4+
<div local-class='icon-circle'>
5+
<FaIcon
6+
data-test-eye-icon
7+
@icon='eye'
8+
local-class='blue-icon'
9+
/>
10+
</div>
911
<h3>
1012
{{t 'meetings.index.meetings-footer.discover'}}
1113
</h3>
@@ -18,11 +20,13 @@
1820
</div>
1921
<div class='col-md-4 col-sm-4 text-center'>
2022
<div class=' p-v-md m-t-xl m-h-md'>
21-
<FaIcon
22-
data-test-share-alt-icon
23-
@icon='share-alt'
24-
local-class='blue-icon icon-circle'
25-
/>
23+
<div local-class='icon-circle'>
24+
<FaIcon
25+
data-test-share-alt-icon
26+
@icon='share-alt'
27+
local-class='blue-icon'
28+
/>
29+
</div>
2630
<h3>
2731
{{t 'meetings.index.meetings-footer.share'}}
2832
</h3>
@@ -35,11 +39,13 @@
3539
</div>
3640
<div class='col-md-4 col-sm-4 text-center'>
3741
<div class='p-v-md m-t-xl m-h-md'>
38-
<FaIcon
39-
data-test-magic-icon
40-
@icon='magic'
41-
local-class='blue-icon icon-circle'
42-
/>
42+
<div local-class='icon-circle'>
43+
<FaIcon
44+
data-test-magic-icon
45+
@icon='magic'
46+
local-class='blue-icon'
47+
/>
48+
</div>
4349
<h3>
4450
{{t 'meetings.index.meetings-footer.enhance'}}
4551
</h3>

‎app/meetings/index/-components/meetings-hero-banner/styles.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
box-shadow: 0 0 10px #e0e7ec;
3030
width: 140px;
3131
height: 140px;
32+
margin-left: auto;
33+
margin-right: auto;
3234
}
3335

3436
.osf-meeting-header {

‎app/meetings/index/-components/meetings-hero-banner/template.hbs‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616
<div local-class='network-img'> </div>
1717
<div class='row'>
1818
<div class='col-md-6 col-lg-5 col-xl-4 text-center m-b-lg'>
19-
<FaIcon
20-
data-test-fa-icon-users
21-
@icon='users'
22-
class='m-v-sm'
23-
local-class='user-icon icon-circle'
24-
/>
19+
<div local-class='icon-circle'>
20+
<FaIcon
21+
data-test-fa-icon-users
22+
@icon='users'
23+
class='m-v-sm'
24+
local-class='user-icon'
25+
/>
26+
</div>
2527
<h3 class='f-w-xl'>
2628
{{t 'meetings.index.meetings-hero-banner.conference_organizers_h3'}}
2729
</h3>
@@ -48,12 +50,14 @@
4850
</CpPanel>
4951
</div>
5052
<div class='col-md-6 col-lg-5 col-lg-offset-2 col-xl-4 col-xl-offset-4 text-center m-b-lg'>
51-
<FaIcon
52-
data-test-fa-icon-cloud-upload
53-
@icon='cloud-upload'
54-
class='m-v-sm'
55-
local-class='user-icon icon-circle'
56-
/>
53+
<div local-class='icon-circle'>
54+
<FaIcon
55+
data-test-fa-icon-cloud-upload
56+
@icon='cloud-upload-alt'
57+
class='m-v-sm'
58+
local-class='user-icon'
59+
/>
60+
</div>
5761
<h3 class='f-w-xl'>
5862
{{t 'meetings.index.meetings-hero-banner.conference_participants_h3'}}
5963
</h3>

‎app/models/registration-provider.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { htmlSafe } from '@ember/string';
12
import DS from 'ember-data';
23
import ReviewActionModel from 'ember-osf-web/models/review-action';
34

@@ -42,6 +43,14 @@ export default class RegistrationProviderModel extends ProviderModel {
4243
}
4344
return false;
4445
}
46+
47+
@computed('description')
48+
get htmlSafeDescription() {
49+
if (this.description) {
50+
return htmlSafe(this.description);
51+
}
52+
return '';
53+
}
4554
}
4655

4756
declare module 'ember-data/types/registries/model' {

‎app/models/registration.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ const Validations = buildValidations({
5858
],
5959
});
6060

61+
export interface ProviderMetadata {
62+
// eslint-disable-next-line camelcase
63+
field_name: string;
64+
// eslint-disable-next-line camelcase
65+
field_value: string;
66+
}
67+
6168
export default class RegistrationModel extends NodeModel.extend(Validations) {
6269
@attr('date') dateRegistered!: Date;
6370
@attr('boolean') pendingRegistrationApproval!: boolean;
@@ -75,6 +82,8 @@ export default class RegistrationModel extends NodeModel.extend(Validations) {
7582
@attr('object') registeredMeta!: RegistrationMetadata;
7683
@attr('registration-responses') registrationResponses!: RegistrationResponse;
7784
@attr('fixstring') reviewsState!: RegistrationReviewStates;
85+
@attr('fixstring') iaUrl?: string;
86+
@attr('array') providerSpecificMetadata!: ProviderMetadata[];
7887

7988
// Write-only attributes
8089
@attr('array') includedNodeIds?: string[];

‎app/styles/_variables.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@ $color-alt: #c7ffc7;
120120
$color-select: #337ab7;
121121
$color-grey: #333;
122122
$color-filter-bg: #a4b3bd;
123+
$color-red: #f00;
124+
$color-green: #090;
125+
$color-yellow: #ff0;
126+
$color-turquoise: rgb(64, 224, 211);
127+
$color-purple: rgb(154, 0, 192);
128+
$color-black: #000;
123129

124130
.bg-color-blue {
125131
background-color: $color-blue;

‎app/support/template.hbs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@href={{this.faqPageUrl}}
2727
>
2828
{{t 'support.faq_button'}}
29-
<i class='fa fa-angle-right'></i>
29+
<FaIcon @icon='angle-right' />
3030
</OsfLink>
3131
</div>
3232
</div>
@@ -51,7 +51,7 @@
5151
@href={{this.helpUrl}}
5252
>
5353
{{t 'support.guides_button'}}
54-
<i class='fa fa-angle-right'></i>
54+
<FaIcon @icon='angle-right' />
5555
</OsfLink>
5656
</div>
5757
</div>
@@ -104,28 +104,28 @@
104104
class='btn btn-link'
105105
@href={{this.twitterUrl}}
106106
>
107-
<i class='fa fa-twitter'></i>{{t 'support.social_twitter'}}
107+
<FaIcon @icon='twitter' @prefix='fab' />{{t 'support.social_twitter'}}
108108
</OsfLink>
109109
<OsfLink
110110
data-analytics-name='social_email'
111111
class='btn btn-link'
112112
@href={{this.mailingUrl}}
113113
>
114-
<i class='fa fa-users'></i> {{t 'support.social_mailing'}}
114+
<FaIcon @icon='users' /> {{t 'support.social_mailing'}}
115115
</OsfLink>
116116
<OsfLink
117117
data-analytics-name='social_facebook'
118118
class='btn btn-link'
119119
@href={{this.facebookUrl}}
120120
>
121-
<i class='fa fa-facebook'></i> {{t 'support.social_facebook'}}
121+
<FaIcon @icon='facebook' @prefix='fab' /> {{t 'support.social_facebook'}}
122122
</OsfLink>
123123
<OsfLink
124124
data-analytics-name='social_github'
125125
class='btn btn-link'
126126
@href={{this.githubUrl}}
127127
>
128-
<i class='fa fa-github'></i> {{t 'support.social_github'}}
128+
<FaIcon @icon='github' @prefix='fab' /> {{t 'support.social_github'}}
129129
</OsfLink>
130130
</div>
131131
</div>

0 commit comments

Comments
 (0)