Merge branch 'release/20.10.0'

Author: fabmiz

CHANGELOG.md

@@ -4,6 +4,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [20.10.0] - 2020-09-30
+### Added
+- registry brand name to navbar
+- headTags so that favicon changes for branded registries
+- Reorder contributors through dragging and dropping
+- Add campaign queryParam for collections and registries
+
+### Changed
+- Update analytics to registries discover
+- Reduce font-size for Registry Discover search results
+- page title to have provider brand display first
+
+### Fixed
+- navbar styling to have buttons with same height
+- provider link on branded navbar
+- 404ing recent registrations links
+
+### Removed
+- color change for disabled buttons
+- old style for navbar buttons
+- tags toggle on discover pages
+
 ## [20.9.1] - 2020-09-03
 ### Changed
 - pull keen analytics from partitioned collections

app/app.ts

@@ -9,7 +9,6 @@ const { modulePrefix } = config;
 const App = Application.extend({
     modulePrefix,
     Resolver,
-
     // eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects
     engines: {
         collections: {

app/models/contributor.ts

@@ -41,9 +41,11 @@ export default class ContributorModel extends OsfModel.extend(Validations) {
     @attr('boolean') bibliographic!: boolean;
     @attr('fixstring') unregisteredContributor?: string;
     @attr('number') index!: number;
+    @attr('string') sendEmail!: 'default' | 'preprint' | 'false';
+
+    // Write-only attributes
     @attr('fixstring') fullName!: string;
     @attr('fixstring') email!: string;
-    @attr('string') sendEmail!: 'default' | 'preprint' | 'false';
 
     @belongsTo('user', { inverse: 'contributors' })
     users!: DS.PromiseObject<UserModel> & UserModel;

app/services/meta-tags.ts

@@ -48,7 +48,12 @@ export interface PropMetaTagAttrs {
     content: Content;
 }
 
-export type MetaTagAttrs = NameMetaTagAttrs | PropMetaTagAttrs;
+export interface LinkMetaTagAttrs {
+    rel: string;
+    href: string;
+}
+
+export type MetaTagAttrs = NameMetaTagAttrs | PropMetaTagAttrs | LinkMetaTagAttrs;
 
 export interface HeadTagDef {
     type: string;

app/styles/_accessibility.scss

@@ -9,6 +9,8 @@
         border-color: darken($brand-success, 15%);
     }
 
+    &[disabled],
+    &[disabled]:hover,
     :global(&.disabled),
     :global(&.disabled):hover {
         color: darken($brand-success, 85%);
@@ -31,7 +33,7 @@
     background-color: $brand-info;
     border-color: darken($brand-info, 5%);
 
-    &:hover {
+    &:hover:not([disabled]) {
         background-color: darken($brand-info, 10%);
         border-color: darken($brand-info, 15%);
     }
@@ -42,7 +44,7 @@
     background-color: $brand-danger;
     border-color: darken($brand-danger, 5%);
 
-    &:hover {
+    &:hover:not([disabled]) {
         background-color: darken($brand-danger, 10%);
         border-color: darken($brand-danger, 15%);
     }

app/styles/_components.scss

@@ -420,11 +420,20 @@
     color: rgba(255, 255, 255, 0.8);
 }
 
-#navbarScope .btn-top-login,
+#navbarScope .button-container {
+    display: flex;
+}
+
 #navbarScope .btn-top-signup {
-    padding: 2px 30px;
-    margin-top: 5px;
-    line-height: 1.7;
+    padding: 4px 13px;
+    margin-top: 3px;
+    font-size: 15px;
+}
+
+#navbarScope .btn-top-login {
+    padding: 4px 17px;
+    margin-top: 3px;
+    font-size: 15px;
 }
 
 .navbar-default {
@@ -852,20 +861,6 @@
         }
     }
 
-    /* Overrides for signup button */
-    #navbarScope .btn-top-signup {
-        padding: 4px 13px;
-        margin-top: 3px;
-        font-size: 15px;
-    }
-
-    /* Overrides for Sign in button */
-    #navbarScope .btn-top-login {
-        padding: 4px 17px;
-        margin-top: 3px;
-        font-size: 15px;
-    }
-
     /* sm screen formatting */
     @media screen and (min-width: 768px) {
 

lib/app-components/addon/components/branded-navbar/component.ts

@@ -27,6 +27,7 @@ export default class BrandedNavbar extends Component {
     signupUrl: string = this.signupUrl;
     translateKey: string = this.translateKey;
     showNavLinks: boolean = false;
+    campaign: string = `${this.theme.id}-collections`;
 
     myProjectsUrl = serviceLinks.myProjects;
 

lib/app-components/addon/components/branded-navbar/template.hbs

@@ -71,6 +71,7 @@
                         @onLinkClicked={{action (mut this.showNavLinks) false}}
                         @headline={{t 'app_components.branded_navbar.on_the_osf'}}
                         @externalLink={{true}}
+                        @campaign={{this.campaign}}
                     />
                 </ul>
             </BsCollapse>

lib/app-components/addon/components/project-contributors/list/component.ts

@@ -81,7 +81,9 @@ export default class List extends Component {
         this.contributors.removeObject(contributor);
         this.contributors.insertAt(newIndex, contributor);
 
-        contributor.set('index', newIndex);
+        contributor.setProperties({
+            index: newIndex,
+        });
 
         yield this.get('saveAndHighlight').perform(contributor);
     });

lib/app-components/addon/components/project-contributors/list/item/styles.scss

@@ -19,6 +19,7 @@
 }
 
 .row {
+    display: flex;
     border-top: 1px solid #eee !important;
     padding-top: 2px;