CenterForOpenScience · alexschiller · Feb 12, 2018 · Aug 14, 2017 · Aug 18, 2017 · Aug 25, 2017
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -144,10 +144,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - file-browser-item now supports icons for different file extensions
 - dropzone-widget now has custom dropzone class that extends dropzone functionality to conditionally disallow folders and multiple files from being dropped
 - 'Search' button in navbar to link to search page
-- Moved ember-metrics and ember-toastr to dependencies
-- Upgraded ember-toastr to 1.7.0
 - Consolidate logic for serializing dirty relationships into `osf-serializer`
   - Override `relationshipTypes` in a serializer to include `fieldName: 'apiType'` pairs of all relationships which may be included when saving updates
+- Moved ember-metrics and ember-toastr to dependencies
+- Upgraded ember-toastr to 1.7.0
 
 ### Removed
 - toastr from bower dependencies

diff --git a/addon/components/file-widget/style.css b/addon/components/file-widget/style.css
diff --git a/addon/components/file-widget/style.scss b/addon/components/file-widget/style.scss
@@ -0,0 +1,17 @@
+.eosf-file-widget-box {
+  border: 2px solid dark-grey;
+  border-radius: 5px;
+  background-color: #EEE;
+  padding: 20px;
+
+  .dropzone-box {
+    margin: 5px;
+  }
+
+  .login-button, .select-project-button {
+    width: 100%;
+    height: 150px;
+    margin: 5px;
+    text-align: center;
+  }
+}
diff --git a/addon/components/new-navbar-auth-dropdown/template.hbs b/addon/components/new-navbar-auth-dropdown/template.hbs
@@ -1,29 +1,37 @@
 {{# if session.isAuthenticated }}
     {{! TODO: Replace display name functionality if possible- for now truncate via CSS at end of label }}
-    <a class="btn-link" data-toggle="dropdown" role="button" aria-expanded="false" aria-label={{t 'eosf.authDropdown.toggleAuthDropdown'}} onclick={{action closeOtherNavigation}}>
-        <span class="osf-gravatar">
-            <img src="{{gravatarUrl}}" alt="User gravatar">
-        </span> {{get-display-name user.fullName}}
-        <span class="caret"></span>
-    </a>
-    <ul class="dropdown-menu auth-dropdown" role="menu">
-        {{#if headline}}
-            <li style="margin-left:10%;">{{headline}}</li>
-        {{/if}}
-        <li>
-            <a href="{{serviceLinks.profile}}" onclick={{action 'click' 'link' 'Navbar - MyProfile'}}><i class="fa fa-user fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.myProfile'}}</a>
-        </li>
-        <li>
-            <a href="{{serviceLinks.osfSupport}}" onclick={{action 'click' 'link' 'Navbar - Support'}}><i class="fa fa-life-ring fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.osfSupport'}}</a>
-        </li>
+    {{#bs-dropdown as |dd|}}
+        {{#dd.toggle tagName="button" classNames="nav-user-dropdown btn-link"}}
+            <span class="osf-gravatar">
+                <img src="{{gravatarUrl}}" alt="User gravatar">
+            </span> {{get-display-name user.fullName}}
+            <span class="caret"></span>
+        {{/dd.toggle}}
 
-        <li>
-            <a href="{{serviceLinks.settings}}" onclick={{action 'click' 'link' 'Navbar - Settings'}}><i class="fa fa-cog fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.settings'}}</a>
-        </li>
-        <li>
-            <a class="logoutLink" {{action 'logout'}} onclick={{action 'click' 'link' 'Navbar - Logout'}} role="button"><i class="fa fa-sign-out fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.logOut'}}</a>
-        </li>
-    </ul>
+        {{#dd.menu align="right" as |menu|}}
+            {{#if headline}}
+                {{#menu.item style="margin-left:10%;"}}
+                    {{headline}}
+                {{/menu.item}}
+            {{/if}}
+
+            {{#menu.item}}
+                <a href="{{serviceLinks.profile}}" onclick={{action 'click' 'link' 'Navbar - MyProfile'}}><i class="fa fa-user fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.myProfile'}}</a>
+            {{/menu.item}}
+
+            {{#menu.item}}
+                <a href="{{serviceLinks.osfSupport}}" onclick={{action 'click' 'link' 'Navbar - Support'}}><i class="fa fa-life-ring fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.osfSupport'}}</a>
+            {{/menu.item}}
+
+            {{#menu.item}}
+                <a href="{{serviceLinks.settings}}" onclick={{action 'click' 'link' 'Navbar - Settings'}}><i class="fa fa-cog fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.settings'}}</a>
+            {{/menu.item}}
+
+            {{#menu.item}}
+                <a class="logoutLink" {{action 'logout'}} onclick={{action 'click' 'link' 'Navbar - Logout'}} role="button"><i class="fa fa-sign-out fa-lg p-r-xs"></i> {{t 'eosf.authDropdown.logOut'}}</a>
+            {{/menu.item}}
+        {{/dd.menu}}
+    {{/bs-dropdown}}
 {{else if allowLogin}}
     {{#if institution}}
         {{! TODO: How does the page know whether this is an institution view? Implement in the future }}

diff --git a/addon/components/new-osf-navbar/style.scss b/addon/components/new-osf-navbar/style.scss
@@ -0,0 +1,8 @@
+@import 'bootstrap/variables';
+
+
+@media (min-width: $screen-md-min) {
+  .navbar-right-md {
+    float: right;
+  }
+}
diff --git a/addon/components/search-dropdown/template.hbs b/addon/components/search-dropdown/template.hbs
@@ -21,11 +21,11 @@
 
 {{!Search help modal - appears after clicking question mark on green search dropdown}}
 <div id="ember-bootstrap-modal-container">
-    {{#bs-modal open=isOpen body=false header=false footer=false}}
-        {{#bs-modal-header}}
+    {{#bs-modal open=isOpen as |modal|}}
+        {{#modal.header}}
             <h3 class="modal-title">{{t 'eosf.searchHelpModal.searchHelp'}}</h3>
-        {{/bs-modal-header}}
-        {{#bs-modal-body}}
+        {{/modal.header}}
+        {{#modal.body}}
             <h4> {{t 'eosf.searchHelpModal.queries'}} </h4>
             <p>
                 {{t 'eosf.searchHelpModal.searchUsesThe'}} <a href="http://extensions.xwiki.org/xwiki/bin/view/Extension/Search+Application+Query+Syntax">Lucene {{t 'eosf.searchHelpModal.searchSyntax'}}</a>.
@@ -36,13 +36,9 @@
                 <li><a href="{{host}}search/?q=brian+AND+title%3Amany">brian AND title:many</a></li>
                 <li><a href="{{host}}search/?q=tags%3A%28psychology%29">tags:(psychology)</a></li>
             </ul>
-        {{/bs-modal-body}}
-
-        {{#bs-modal-footer}}
-            <div align="right">
-                <button {{action 'close'}} class="btn btn-default"> {{t 'eosf.searchHelpModal.close'}} </button>
-            </div>
-        {{/bs-modal-footer}}
+        {{/modal.body}}
+        {{#modal.footer}}
+            {{#bs-button onClick=(action modal.close)}}{{t 'eosf.searchHelpModal.close'}}{{/bs-button}}
+        {{/modal.footer}}
     {{/bs-modal}}
-
-</div>
+</div>
diff --git a/addon/components/search-help-modal/component.js b/addon/components/search-help-modal/component.js
@@ -19,9 +19,6 @@ export default Ember.Component.extend({
         this.set('currentPath', `${window.location.origin}${window.location.pathname}`);
     },
     actions: {
-        close() {
-            this.set('isOpen', false);
-        },
         toggleHelpModal() {
             this.toggleProperty('isOpen');
         },

diff --git a/addon/components/search-help-modal/template.hbs b/addon/components/search-help-modal/template.hbs
@@ -1,25 +1,23 @@
 {{!Lucene search help modal}}
 <div id="ember-bootstrap-modal-container">
-    {{#bs-modal open=isOpen body=false header=false footer=false}}
-        {{#bs-modal-header}}
+    {{#bs-modal open=isOpen as |modal|}}
+        {{#modal.header}}
             <h3 class="modal-title">{{t 'eosf.components.searchHelpModal.searchHelp'}}</h3>
-        {{/bs-modal-header}}
-        {{#bs-modal-body}}
+        {{/modal.header}}
+        {{#modal.body}}
             <h4> {{t 'eosf.components.searchHelpModal.queries'}} </h4>
             <p>
                 {{t 'eosf.components.searchHelpModal.searchUsesThe'}} <a href="http://extensions.xwiki.org/xwiki/bin/view/Extension/Search+Application+Query+Syntax">Lucene {{t 'eosf.components.searchHelpModal.searchSyntax'}}</a>.
                 {{t 'eosf.components.searchHelpModal.helpDescription'}}
             </p>
-            <ul>
+            <ul class="ex-list">
                 <li><a href={{concat currentPath '?q=repro*'}}>repro*</a></li>
                 <li><a href={{concat currentPath '?q=brian+AND+title%3Amany'}}>brian AND title:many</a></li>
                 <li><a href={{concat currentPath '?q=tags%3A%28psychology%29'}}>tags:(psychology)</a></li>
             </ul>
-        {{/bs-modal-body}}
-        {{#bs-modal-footer}}
-            <div align="right">
-                <button {{action 'close'}} class="btn btn-default"> {{t 'eosf.components.searchHelpModal.close'}} </button>
-            </div>
-        {{/bs-modal-footer}}
+        {{/modal.body}}
+        {{#modal.footer}}
+            {{#bs-button onClick=(action modal.close)}}{{t 'eosf.components.searchHelpModal.close'}}{{/bs-button}}
+        {{/modal.footer}}
     {{/bs-modal}}
-</div>
+</div>
diff --git a/addon/components/sign-up/style.css → addon/components/sign-up/style.scss b/addon/components/sign-up/style.css → addon/components/sign-up/style.scss
diff --git a/addon/helpers/build-secondary-nav-links.js b/addon/helpers/build-secondary-nav-links.js
@@ -37,6 +37,7 @@ export default Ember.Helper.extend({  // Helper defined using a class, so can in
                     href: 'https://cos.io/donate',
                     type: 'donateToCOS'
                 },
+
             ],
             PREPRINTS: [
                 {

diff --git a/addon/instance-initializers/ember-osf.js b/addon/instance-initializers/ember-osf.js
@@ -2,61 +2,10 @@
 Automatically expose translations for addon in a way that can be merged in with app
     https://github.com/jamesarosen/ember-i18n/issues/255
  */
-import Ember from 'ember';
 import en from 'ember-osf/locales/en/translations';
-import tHelper from 'ember-i18n/helper';
 
 export function initialize(appInstance) {
-    tHelper.reopen({
-        theme: Ember.inject.service(),
-        compute(_, data) {
-            // If data is defined, clone it because it is not extensible.
-            data = data ? Object.assign({}, data) : {};
-            let translations = this.get('i18n._locale.translations');
-            let preprintWord = this.get('theme.provider.preprintWord');
-            let getTerms = () => ({
-                preprint: translations[`preprintWords.${preprintWord || 'preprint'}.preprint`],
-                preprints: translations[`preprintWords.${preprintWord || 'preprint'}.preprints`],
-                Preprint: translations[`preprintWords.${preprintWord || 'preprint'}.Preprint`],
-                Preprints: translations[`preprintWords.${preprintWord || 'preprint'}.Preprints`]
-            });
-            if (!preprintWord && this.get('theme.provider')) {
-                this.get('theme.provider').then(provider => {
-                    preprintWord = provider.get('preprintWord') || 'preprint';
-                    data.preprintWords = getTerms();
-                    this.recompute();
-                });
-                return null;
-            }
-            data.preprintWords = getTerms();
-            return this._super(_, data, true);
-        }
-    });
     const i18n = appInstance.lookup('service:i18n');
-    i18n.reopen({
-        theme: Ember.inject.service(),
-        store: Ember.inject.service(),
-        t(_, data, skip) {
-            data = data || {};
-            if (typeof data.preprintWords !== 'undefined' || skip) {
-                return this._super(_, data);
-            }
-            let translations = this.get('_locale.translations');
-            let providerId = this.get('theme.id');
-            let provider = this.get('store').peekRecord('preprint-provider', providerId);
-            let preprintWord = 'default';
-            if (provider) {
-                preprintWord = provider.get('preprintWord');
-            }
-            data.preprintWords = {
-                preprint: translations[`preprintWords.${preprintWord}.preprint`],
-                preprints: translations[`preprintWords.${preprintWord}.preprints`],
-                Preprint: translations[`preprintWords.${preprintWord}.Preprint`],
-                Preprints: translations[`preprintWords.${preprintWord}.Preprints`]
-            };
-            return this._super(_, data);
-        }
-    });
     i18n.addTranslations('en', en);
 }
 

diff --git a/addon/locales/en/translations.js b/addon/locales/en/translations.js
@@ -8,37 +8,31 @@ export default {
     // },
     //
     // "key.with.interpolation": "Text with {{anInterpolation}}"
-    preprintWords: {
-        preprint: {
-            preprint: 'preprint',
-            preprints: 'preprints',
-            Preprint: 'Preprint',
-            Preprints: 'Preprints'
+    documentType: {
+        default: {
+            plural: 'documents',
+            pluralCapitalized: 'Documents',
+            singular: 'document',
+            singularCapitalized: 'Document',
         },
         paper: {
-            preprint: 'paper',
-            preprints: 'papers',
-            Preprint: 'Paper',
-            Preprints: 'Papers'
+            plural: 'papers',
+            pluralCapitalized: 'Papers',
+            singular: 'paper',
+            singularCapitalized: 'Paper',
         },
-        thesis: {
-            preprint: 'thesis',
-            preprints: 'theses',
-            Preprint: 'Thesis',
-            Preprints: 'Theses'
+        preprint: {
+            plural: 'preprints',
+            pluralCapitalized: 'Preprints',
+            singular: 'preprint',
+            singularCapitalized: 'Preprint',
         },
-        none: {
-            preprint: '',
-            preprints: '',
-            Preprint: '',
-            Preprints: ''
+        thesis: {
+            plural: 'theses',
+            pluralCapitalized: 'Theses',
+            singular: 'thesis',
+            singularCapitalized: 'Thesis',
         },
-        default: {
-            preprint: 'document',
-            preprints: 'documents',
-            Preprint: 'Document',
-            Preprints: 'Documents'
-        }
     },
     eosf: {
         signup: {

diff --git a/addon/services/preprint-word.js b/addon/services/preprint-word.js
@@ -0,0 +1,40 @@
+import Ember from 'ember';
+
+export default Ember.Service.extend({
+    i18n: Ember.inject.service(),
+    getPreprintWord() {
+        const i18n = this.get('i18n');
+        return {
+            default: {
+                plural: i18n.t('documentType.default.plural'),
+                pluralCapitalized: i18n.t('documentType.default.pluralCapitalized'),
+                singular: i18n.t('documentType.default.singular'),
+                singularCapitalized: i18n.t('documentType.default.singularCapitalized'),
+            },
+            paper: {
+                plural: i18n.t('documentType.paper.plural'),
+                pluralCapitalized: i18n.t('documentType.paper.pluralCapitalized'),
+                singular: i18n.t('documentType.paper.singular'),
+                singularCapitalized: i18n.t('documentType.paper.singularCapitalized'),
+            },
+            preprint: {
+                plural: i18n.t('documentType.preprint.plural'),
+                pluralCapitalized: i18n.t('documentType.preprint.pluralCapitalized'),
+                singular: i18n.t('documentType.preprint.singular'),
+                singularCapitalized: i18n.t('documentType.preprint.singularCapitalized'),
+            },
+            none: {
+                plural: '',
+                pluralCapitalized: '',
+                singular: '',
+                singularCapitalized: '',
+            },
+            thesis: {
+                plural: i18n.t('documentType.thesis.plural'),
+                pluralCapitalized: i18n.t('documentType.thesis.pluralCapitalized'),
+                singular: i18n.t('documentType.thesis.singular'),
+                singularCapitalized: i18n.t('documentType.thesis.singularCapitalized'),
+            },
+        }
+    }
+});
-Original file line number
+Diff line change
@@ Expand Up @@
                         href: 'https://cos.io/donate',
                         type: 'donateToCOS'
                     },
                 ],
                 PREPRINTS: [
                     {
@@ Expand Down @@